Fixed isValidMapcodeFormat to trim string and check for null

Author: rijnb

README.md

@@ -477,9 +477,14 @@ Normally, one of our developers should be able to comment on them and fix.
 
 
 # Release Notes <a name="releasenotes"></a>
-
+mat
 These are the release notes for the Java library for mapcodes.
 
+### 2.4.10
+
+* Changed `Mapcode.isValidMapcodeFormat()` to return `false` if the string is `null`. Trimming the string is also
+no longer needed.
+
 ### 2.4.9
 
 * Updated dependencies for security patches.

pom.xml

@@ -8,7 +8,7 @@
     <artifactId>mapcode</artifactId>
 
     <packaging>jar</packaging>
-    <version>2.4.9</version>
+    <version>2.4.10</version>
 
     <name>Mapcode Java Library</name>
     <description>

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

@@ -23,7 +23,6 @@
 import java.util.regex.Pattern;
 
 import static com.mapcode.CheckArgs.checkMapcodeCode;
-import static com.mapcode.CheckArgs.checkNonnull;
 
 /**
  * This class defines a single mapcode encoding result, including the alphanumeric code and the
@@ -313,11 +312,13 @@ public static int getPrecisionFormat(@Nonnull final String mapcode) throws Unkno
      * actually a valid  mapcode representing a location on Earth.
      * @throws IllegalArgumentException If mapcode is null.
      */
-    public static boolean isValidMapcodeFormat(@Nonnull final String mapcode) throws IllegalArgumentException {
-        checkNonnull("mapcode", mapcode);
+    public static boolean isValidMapcodeFormat(@Nullable final String mapcode) throws IllegalArgumentException {
+        if (mapcode == null) {
+            return false;
+        }
         try {
             // Throws an exception if the format is incorrect.
-            getPrecisionFormat(mapcode.toUpperCase());
+            getPrecisionFormat(mapcode.trim().toUpperCase());
             return true;
         } catch (final UnknownPrecisionFormatException ignored) {
             return false;
@@ -333,7 +334,7 @@ public static boolean isValidMapcodeFormat(@Nonnull final String mapcode) throws
      */
     public static boolean containsTerritory(@Nonnull final String mapcode) throws IllegalArgumentException {
         checkMapcodeCode("mapcode", mapcode);
-        return PATTERN_TERRITORY.matcher(mapcode.toUpperCase().trim()).find();
+        return PATTERN_TERRITORY.matcher(mapcode.trim().toUpperCase()).find();
     }
 
     /**

src/test/java/com/mapcode/MapcodeTest.java

@@ -86,6 +86,7 @@ public void checkInvalidPrecisionFormats() {
         LOG.info("checkInvalidPrecisionFormats");
 
         // Territory code must be correct syntax.
+        assertFalse(Mapcode.isValidMapcodeFormat(null));
         assertFalse(Mapcode.isValidMapcodeFormat(""));
         assertFalse(Mapcode.isValidMapcodeFormat("NL- XX.XX"));
         assertFalse(Mapcode.isValidMapcodeFormat("US IN XX.XX"));