make all non-secmgr src 100% styled correctly
left secmgr sources non-compliant because
those are from a fork and so didn't want
to potentially make a future merge hard.
diff --git a/src/com/google/enterprise/adaptor/Application.java b/src/com/google/enterprise/adaptor/Application.java
index 92fd366..49d96b0 100644
--- a/src/com/google/enterprise/adaptor/Application.java
+++ b/src/com/google/enterprise/adaptor/Application.java
@@ -14,8 +14,6 @@
package com.google.enterprise.adaptor;
-import com.google.common.annotations.VisibleForTesting;
-
import com.sun.net.httpserver.HttpServer;
import com.sun.net.httpserver.HttpsConfigurator;
import com.sun.net.httpserver.HttpsParameters;
diff --git a/src/com/google/enterprise/adaptor/CommandStreamParser.java b/src/com/google/enterprise/adaptor/CommandStreamParser.java
index a420255..5d49507 100644
--- a/src/com/google/enterprise/adaptor/CommandStreamParser.java
+++ b/src/com/google/enterprise/adaptor/CommandStreamParser.java
@@ -425,13 +425,14 @@
try {
authzStatus = AuthzStatus.valueOf(authzStatusString);
} catch (IllegalArgumentException ex) {
- log.warning("Unrecognized authz-status of '" + authzStatusString + "' for document: '" +
- docId + "'");
+ log.warning("Unrecognized authz-status of '" + authzStatusString + "' for document: '"
+ + docId + "'");
}
break;
default:
- throw new IOException("Authorizer Error: invalid operation: '" + command.getOperation() +
- (command.hasArgument() ? "' with argument: '" + command.getArgument() + "'" : "'"));
+ throw new IOException("Authorizer Error: invalid operation: '" + command.getOperation()
+ + (command.hasArgument() ? "' with argument: '" + command.getArgument() : "")
+ + "'");
}
command = readCommand();
}
@@ -569,8 +570,9 @@
aclBuilder.setEverythingCaseInsensitive();
break;
default:
- throw new IOException("Retriever Error: invalid operation: '" + command.getOperation() +
- (command.hasArgument() ? "' with argument: '" + command.getArgument() + "'" : "'"));
+ throw new IOException("Retriever Error: invalid operation: '" + command.getOperation()
+ + (command.hasArgument() ? "' with argument: '" + command.getArgument() : "")
+ + "'");
}
command = readCommand();
}
@@ -647,8 +649,9 @@
builder.setDeleteFromIndex(true);
break;
default:
- throw new IOException("Lister Error: invalid operation: '" + command.getOperation() +
- (command.hasArgument() ? "' with argument: '" + command.getArgument() + "'" : "'"));
+ throw new IOException("Lister Error: invalid operation: '" + command.getOperation()
+ + (command.hasArgument() ? "' with argument: '" + command.getArgument() : "'")
+ + "'");
}
command = readCommand();
}
@@ -725,15 +728,16 @@
}
String line = readCharsUntilMarker("[");
- if ((line == null) || (line.length() < HEADER_PREFIX.length()) ||
- !line.substring(0, HEADER_PREFIX.length()).equals(HEADER_PREFIX)) {
+ if ((line == null) || (line.length() < HEADER_PREFIX.length())
+ || !line.substring(0, HEADER_PREFIX.length()).equals(HEADER_PREFIX)) {
throw new IOException("Adaptor data must begin with '" + HEADER_PREFIX + "'");
}
String versionNumberString = line.substring(HEADER_PREFIX.length());
if (versionNumberString.length() < 3) {
- throw new IOException("Format version '" + versionNumberString + "' is invalid. " +
- "The version must be at least one digit with one leading space and one trailing space.");
+ throw new IOException("Format version '" + versionNumberString + "' is invalid. "
+ + "The version must be at least one digit with one leading space"
+ + " and one trailing space.");
}
delimiter = readCharsUntilMarker("]");
diff --git a/src/com/google/enterprise/adaptor/Config.java b/src/com/google/enterprise/adaptor/Config.java
index 5203931..dd187ea 100644
--- a/src/com/google/enterprise/adaptor/Config.java
+++ b/src/com/google/enterprise/adaptor/Config.java
@@ -15,10 +15,10 @@
package com.google.enterprise.adaptor;
import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
import java.io.File;
import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.io.Reader;
import java.net.InetAddress;
import java.net.URI;
@@ -292,7 +292,7 @@
*/
String getGsaAdminHostname() {
String hostname = getValue("gsa.admin.hostname").trim();
- return (hostname.length() > 0)? hostname : getGsaHostname();
+ return (hostname.length() > 0) ? hostname : getGsaHostname();
}
String getFeedArchiveDirectory() {
diff --git a/src/com/google/enterprise/adaptor/DocIdSender.java b/src/com/google/enterprise/adaptor/DocIdSender.java
index 9776094..dbc4a2c 100644
--- a/src/com/google/enterprise/adaptor/DocIdSender.java
+++ b/src/com/google/enterprise/adaptor/DocIdSender.java
@@ -425,8 +425,9 @@
if (null != o && this.getClass().equals(o.getClass())) {
AclItem other = (AclItem) o;
same = id.equals(other.id) && acl.equals(other.acl)
- && (docIdFragment == null ? other.docIdFragment == null :
- docIdFragment.equals(other.docIdFragment));
+ && (docIdFragment == null
+ ? other.docIdFragment == null
+ : docIdFragment.equals(other.docIdFragment));
}
return same;
}
diff --git a/src/com/google/enterprise/adaptor/DownloadDumpHandler.java b/src/com/google/enterprise/adaptor/DownloadDumpHandler.java
index 5836310..86bef9c 100644
--- a/src/com/google/enterprise/adaptor/DownloadDumpHandler.java
+++ b/src/com/google/enterprise/adaptor/DownloadDumpHandler.java
@@ -23,8 +23,8 @@
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
@@ -144,7 +144,7 @@
log.log(Level.FINER, "Unable to find logs directory {0}", logsDir);
return;
}
- for (File f: files) {
+ for (File f : files) {
// avoid zipping the (empty) lock file
if (f.getName().endsWith(".lck")) {
log.log(Level.FINEST, "Skipping lock file: {0}", f.getName());
diff --git a/src/com/google/enterprise/adaptor/GsaVersion.java b/src/com/google/enterprise/adaptor/GsaVersion.java
index d9ae004..b3529fb 100644
--- a/src/com/google/enterprise/adaptor/GsaVersion.java
+++ b/src/com/google/enterprise/adaptor/GsaVersion.java
@@ -56,7 +56,7 @@
URLConnection conn = url.openConnection();
InputStream in = conn.getInputStream();
String ver = IOHelper.readInputStreamToString(in, charset);
- ver = ver.replaceAll("\\s","");
+ ver = ver.replaceAll("\\s", "");
return new GsaVersion(ver);
}
diff --git a/src/com/google/enterprise/adaptor/StatRpcMethod.java b/src/com/google/enterprise/adaptor/StatRpcMethod.java
index ae1e519..a7f3c7b 100644
--- a/src/com/google/enterprise/adaptor/StatRpcMethod.java
+++ b/src/com/google/enterprise/adaptor/StatRpcMethod.java
@@ -16,7 +16,6 @@
import java.io.File;
import java.io.IOException;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
@@ -142,13 +141,13 @@
private String getAdaptorLibraryVersion(Locale locale) {
String version = this.getClass().getPackage().getImplementationVersion();
- return version == null ?
- Translation.STATS_VERSION_UNKNOWN.toString(locale) : version;
+ return version == null
+ ? Translation.STATS_VERSION_UNKNOWN.toString(locale) : version;
}
private String getAdaptorVersion(Locale locale) {
- return adaptorVersion == null ?
- Translation.STATS_VERSION_UNKNOWN.toString(locale) : adaptorVersion;
+ return adaptorVersion == null
+ ? Translation.STATS_VERSION_UNKNOWN.toString(locale) : adaptorVersion;
}
private String getConfigFilename(Locale locale) {
@@ -163,8 +162,8 @@
// treat file as if it were not specified -- leave it null below
}
- return canonicalConfigFile == null ?
- Translation.STATS_CONFIG_NONE.toString(locale) :
- canonicalConfigFile.toString();
+ return canonicalConfigFile == null
+ ? Translation.STATS_CONFIG_NONE.toString(locale)
+ : canonicalConfigFile.toString();
}
}
diff --git a/src/com/google/enterprise/adaptor/UnsupportedPlatformException.java b/src/com/google/enterprise/adaptor/UnsupportedPlatformException.java
index 3a2de56..c004f36 100644
--- a/src/com/google/enterprise/adaptor/UnsupportedPlatformException.java
+++ b/src/com/google/enterprise/adaptor/UnsupportedPlatformException.java
@@ -22,8 +22,8 @@
* Constructs a new UnsupportedPlatformException with a default message.
*/
public UnsupportedPlatformException() {
- this(System.getProperty("os.name") +
- " is not a supported platform for this adaptor.");
+ this(System.getProperty("os.name")
+ + " is not a supported platform for this adaptor.");
}
/**
diff --git a/src/com/google/enterprise/adaptor/examples/GroupDefinitionsScaleTester.java b/src/com/google/enterprise/adaptor/examples/GroupDefinitionsScaleTester.java
index 7824547..23a3c09 100644
--- a/src/com/google/enterprise/adaptor/examples/GroupDefinitionsScaleTester.java
+++ b/src/com/google/enterprise/adaptor/examples/GroupDefinitionsScaleTester.java
@@ -25,14 +25,13 @@
import com.google.enterprise.adaptor.UserPrincipal;
import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Random;
-import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/** Creates groups and users and pushes some number of principals per group. */
public class GroupDefinitionsScaleTester extends AbstractAdaptor {
diff --git a/src/com/google/enterprise/adaptor/experimental/Sim.java b/src/com/google/enterprise/adaptor/experimental/Sim.java
index 8900c52..a682603 100644
--- a/src/com/google/enterprise/adaptor/experimental/Sim.java
+++ b/src/com/google/enterprise/adaptor/experimental/Sim.java
@@ -26,7 +26,6 @@
import org.apache.commons.fileupload.RequestContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
@@ -360,7 +359,7 @@
FileItemIterator iterator = upload.getItemIterator(req);
while (iterator.hasNext()) {
FileItemStream item = iterator.next();
- String field = item.getFieldName();
+ String field = item.getFieldName();
byte value[] =
IOHelper.readInputStreamToByteArray(item.openStream());
parts.put(field, value);
@@ -373,11 +372,11 @@
private static int hexToInt(byte b) {
if (b >= '0' && b <= '9') {
- return (byte)(b - '0');
+ return (byte) (b - '0');
} else if (b >= 'a' && b <= 'f') {
- return (byte)(b - 'a') + 10;
+ return (byte) (b - 'a') + 10;
} else if (b >= 'A' && b <= 'F') {
- return (byte)(b - 'A') + 10;
+ return (byte) (b - 'A') + 10;
} else {
throw new IllegalArgumentException("invalid hex byte: " + b);
}
