Minor code cleanup

Author: rijnb

deployment/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.mapcode</groupId>
         <artifactId>mapcode-rest-service</artifactId>
-        <version>2.4.12.2</version>
+        <version>2.4.12.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>deployment</artifactId>

deployment/src/main/java/com/mapcode/services/cli/Main.java

@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
+import java.util.regex.Pattern;
 
 /**
  * Stub to load CLI main from war file.
@@ -44,16 +45,14 @@ private Main() {
         // Prevent instantiation.
     }
 
-    @SuppressWarnings("OverlyBroadThrowsClause")
-    public static void main(@Nonnull final String[] args)
+    public static void main(@Nonnull final String... args)
             throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, IOException {
         assert args != null;
         final List<URL> newUrls = new ArrayList<>();
         URL.setURLStreamHandlerFactory(new NestedJarURLStreamHandlerFactory());
         final String warFile = getWarFile();
         try (final JarFile jarFile = new JarFile(warFile)) {
 
-            //noinspection ForLoopWithMissingComponent
             for (final Enumeration<JarEntry> entryEnum = jarFile.entries(); entryEnum.hasMoreElements(); ) {
                 final JarEntry entry = entryEnum.nextElement();
                 if (entry.getName().endsWith(".jar")) {
@@ -126,7 +125,8 @@ public URLStreamHandler createURLStreamHandler(@Nonnull final String protocol) {
 
     static class JarJarURLStreamHandler extends URLStreamHandler {
 
-        @SuppressWarnings("DuplicateThrows")
+        private static final Pattern PATTERN = Pattern.compile("\\~/");
+
         @Nonnull
         @Override
         protected URLConnection openConnection(@Nonnull final URL u) throws IOException {
@@ -138,7 +138,7 @@ protected URLConnection openConnection(@Nonnull final URL u) throws IOException
         protected void parseURL(@Nonnull final URL u, @Nonnull final String spec, final int start, final int limit) {
             assert u != null;
             assert spec != null;
-            final String file = "jar:" + spec.substring(start, limit).replaceFirst("\\~/", "!/");
+            final String file = "jar:" + PATTERN.matcher(spec.substring(start, limit)).replaceFirst("!/");
             setURL(u, "nestedjar", "", -1, null, null, file, null, null);
         }
     }

deployment/src/main/java/com/mapcode/services/deployment/StartupCheck.java

@@ -70,6 +70,7 @@ public final class StartupCheck {
 
         // Start JMX server.
         final SystemMetricsAgent jmxAgent = injector.getInstance(SystemMetricsAgent.class);
+        //noinspection OverlyBroadCatchBlock
         try {
             jmxAgent.register();
         }

deployment/src/test/java/com/mapcode/services/cli/MainTest.java

@@ -31,6 +31,6 @@ public void testMainFails() throws Exception {
 
         // This will fail, as it needs to run from a WAR file and we can't do that here.
         // Arguments: [--port <port>] [--silent] [--debug] [--help]
-        Main.main(new String[]{"--port", "8080", "--debug"});
+        Main.main("--port", "8080", "--debug");
     }
 }

pom.xml

@@ -24,7 +24,7 @@
     <artifactId>mapcode-rest-service</artifactId>
 
     <packaging>pom</packaging>
-    <version>2.4.12.2</version>
+    <version>2.4.12.3-SNAPSHOT</version>
 
     <name>Mapcode REST API Web Service</name>
     <description>

resources/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.mapcode</groupId>
         <artifactId>mapcode-rest-service</artifactId>
-        <version>2.4.12.2</version>
+        <version>2.4.12.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>resources</artifactId>

service/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.mapcode</groupId>
         <artifactId>mapcode-rest-service</artifactId>
-        <version>2.4.12.2</version>
+        <version>2.4.12.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>service</artifactId>

service/src/main/java/com/mapcode/services/MapcodeResource.java

@@ -30,6 +30,7 @@
 /**
  * This class handle the Mapcode REST API, which includes conversions to and from mapcodes.
  */
+@SuppressWarnings("SimplifiableAnnotation")
 @Api(value = "mapcode", description = "This resource provides the Mapcode REST API.")
 @Path("/mapcode")
 public interface MapcodeResource {

service/src/main/java/com/mapcode/services/RootResource.java

@@ -29,6 +29,7 @@
 import javax.ws.rs.container.Suspended;
 import javax.ws.rs.core.MediaType;
 
+@SuppressWarnings("SimplifiableAnnotation")
 @Api(value = "monitoring", description = "These resources are provided for monitoring purposes.")
 @Path("/mapcode")
 public interface RootResource {

service/src/main/java/com/mapcode/services/dto/AlphabetDTO.java

@@ -29,7 +29,7 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-@SuppressWarnings({"NonFinalFieldReferenceInEquals", "NonFinalFieldReferencedInHashCode", "NullableProblems", "EqualsWhichDoesntCheckParameterClass"})
+@SuppressWarnings({"NullableProblems", "InstanceVariableMayNotBeInitialized"})
 @ApiModel(
         value = "alphabet",
         description = "An alphabet definition object, such as returned by `GET /mapcode/alphabets/roman`.")