Merge pull request #4174 from kwvanderlinde/feature/3852-fix-fallback…

…-exception

Handle invalid hex representations of GUIDs

src/main/java/net/rptools/maptool/model/GUID.java

@@ -42,27 +42,23 @@ public GUID() {
     validateGUID();
   }
 
-  /**
-   * Creates a new GUID based on the specified GUID value.
-   *
-   * @param baGUID the new GUID
-   * @throws InvalidGUIDException if the GUID is invalid
-   */
-  public GUID(byte[] baGUID) throws InvalidGUIDException {
-    this.baGUID = baGUID;
-    validateGUID();
-  }
-
   /**
    * Creates a new GUID based on the specified hexadecimal-code string.
    *
    * @param strGUID the guid as a hexadecimal-code string
    * @throws InvalidGUIDException if the GUID is invalid
    */
   public GUID(String strGUID) {
-    if (strGUID == null) throw new InvalidGUIDException("GUID is null");
+    if (strGUID == null) {
+      throw new InvalidGUIDException("GUID is null");
+    }
+
+    try {
+      this.baGUID = HexFormat.of().parseHex(strGUID);
+    } catch (Exception e) {
+      throw new InvalidGUIDException("Invalid format for GUID");
+    }
 
-    this.baGUID = HexFormat.of().parseHex(strGUID);
     validateGUID();
   }
 
@@ -77,17 +73,6 @@ private void validateGUID() throws InvalidGUIDException {
       throw new InvalidGUIDException("GUID length is invalid: " + baGUID.length);
   }
 
-  /**
-   * Returns the GUID representation of the {@link byte} array argument.
-   *
-   * @param bits the {@link byte} array of the GUID
-   * @return a new GUID instance
-   */
-  public static GUID valueOf(byte[] bits) {
-    if (bits == null) return null;
-    return new GUID(bits);
-  }
-
   /**
    * Returns the GUID representation of the {@link String} argument.
    *