Minor code cleanup

Author: rijnb

README.md

@@ -480,6 +480,10 @@ Normally, one of our developers should be able to comment on them and fix.
 mat
 These are the release notes for the Java library for mapcodes.
 
+### 2.4.13
+
+* Minor code cleanup.
+
 ### 2.4.12
 
 * Added unit tests to check internal data structures.

pom.xml

@@ -8,7 +8,7 @@
     <artifactId>mapcode</artifactId>
 
     <packaging>jar</packaging>
-    <version>2.4.12</version>
+    <version>2.4.13-SNAPSHOT</version>
 
     <name>Mapcode Java Library</name>
     <description>

src/main/java/com/mapcode/Common.java

@@ -90,7 +90,6 @@ private Common() {
 
     // This method returns a divider for longitude (multiplied by 4), for a given latitude.
     // TODO: Need better names for minY and maxY.
-    @SuppressWarnings("ConstantConditions")
     static int xDivider(final int latMin, final int latMax) {
         assert latMin < latMax;
         if (latMin >= 0) {

src/main/java/com/mapcode/DataModel.java

@@ -86,7 +86,7 @@ private static int readLongLoHi(final int lo, final int mid1, final int mid2, fi
     private static final Object mutex = new Object();
 
     @SuppressWarnings({"DoubleCheckedLocking", "SynchronizationOnStaticField"})
-    public static DataModel getInstance() {
+    static DataModel getInstance() {
         if (instance == null) {
             synchronized (mutex) {
                 if (instance == null) {

src/main/java/com/mapcode/Encoder.java

@@ -338,8 +338,7 @@ private static String encodeAutoHeader(
             if (Data.getTerritoryRecordType(i) == Data.TERRITORY_RECORD_TYPE_PLUS) // plus pipe
             {
                 final int goodRounder = (codexm >= 23) ? (961 * 961 * 31) : (961 * 961);
-                product =
-                        ((((storageStart + product + goodRounder) - 1) / goodRounder) * goodRounder) - storageStart;
+                product = ((((storageStart + product + goodRounder) - 1) / goodRounder) * goodRounder) - storageStart;
             }
 
             if (i == territoryRecord) {

src/main/java/com/mapcode/Mapcode.java

@@ -249,13 +249,13 @@ public Territory getTerritory() {
      * provided as statics to only compile these patterns once.
      */
     @Nonnull
-    static final String REGEX_TERRITORY = "[\\p{L}\\p{N}]{2,3}+([-_][\\p{L}\\p{N}]{2,3}+)?";
+    private static final String REGEX_TERRITORY = "[\\p{L}\\p{N}]{2,3}+([-_][\\p{L}\\p{N}]{2,3}+)?";
     @Nonnull
-    static final String REGEX_CODE_PREFIX = "[\\p{L}\\p{N}]{2,5}+";
+    private static final String REGEX_CODE_PREFIX = "[\\p{L}\\p{N}]{2,5}+";
     @Nonnull
-    static final String REGEX_CODE_POSTFIX = "[\\p{L}\\p{N}]{2,4}+";
+    private static final String REGEX_CODE_POSTFIX = "[\\p{L}\\p{N}]{2,4}+";
     @Nonnull
-    static final String REGEX_CODE_PRECISION = "[-][\\p{L}\\p{N}&&[^zZ]]{1,8}+";
+    private static final String REGEX_CODE_PRECISION = "[-][\\p{L}\\p{N}&&[^zZ]]{1,8}+";
 
     /**
      * This patterns/regular expressions is used for checking mapcode format strings.