opendev/gerrit
Code Issues Proposed changes

GerritLauncher: Fix ErrorProne warnings

Browse Source 
- Strings are immutable, field should be named 'PKG'
- Field name is CONSTANT_CASE, but field is not static and final

Change-Id: I4237a0cd7f05dca632b909280c54e75923189e28
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2017-03-20 11:11:22 +01:00
parent f210f59764
commit ef018cbfdf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java
View File

@@ -54,7 +54,7 @@ import java.util.zip.ZipFile;
/** Main class for a JAR file to run code from "WEB-INF/lib". */ /** Main class for a JAR file to run code from "WEB-INF/lib". */
public final class GerritLauncher { public final class GerritLauncher {
private static final String pkg = "com.google.gerrit.pgm"; private static final String PKG = "com.google.gerrit.pgm";
public static final String NOT_ARCHIVED = "NOT_ARCHIVED"; public static final String NOT_ARCHIVED = "NOT_ARCHIVED";
private static ClassLoader daemonClassLoader; private static ClassLoader daemonClassLoader;
@@ -173,17 +173,17 @@ public final class GerritLauncher {
try { try {
try { try {
String cn = programClassName(name); String cn = programClassName(name);
clazz = Class.forName(pkg + "." + cn, true, loader); clazz = Class.forName(PKG + "." + cn, true, loader);
} catch (ClassNotFoundException cnfe) { } catch (ClassNotFoundException cnfe) {
if (name.equals(name.toLowerCase())) { if (name.equals(name.toLowerCase())) {
clazz = Class.forName(pkg + "." + name, true, loader); clazz = Class.forName(PKG + "." + name, true, loader);
} else { } else {
throw cnfe; throw cnfe;
} }
} }
} catch (ClassNotFoundException cnfe) { } catch (ClassNotFoundException cnfe) {
System.err.println("fatal: unknown command " + name); System.err.println("fatal: unknown command " + name);
System.err.println(" (no " + pkg + "." + name + ")"); System.err.println(" (no " + PKG + "." + name + ")");
return 1; return 1;
} }
@@ -605,7 +605,7 @@ public final class GerritLauncher {
return resolveInSourceRoot("eclipse-out"); return resolveInSourceRoot("eclipse-out");
} }
static String SOURCE_ROOT_RESOURCE = "/gerrit-launcher/workspace-root.txt"; static final String SOURCE_ROOT_RESOURCE = "/gerrit-launcher/workspace-root.txt";
/** /**
* Locate a path in the source tree. * Locate a path in the source tree.