Upgrade parent version

Author: peacekeeper

pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>decentralized-identity</groupId>
 		<artifactId>uni-resolver</artifactId>
-		<version>0.34.0</version>
+		<version>0.41.0</version>
 	</parent>
 
 	<scm>

src/main/java/uniresolver/driver/did/btc1/crud/read/ResolveInitialDocument.java

@@ -174,7 +174,7 @@ private DIDDocument sidecarInitialDocumentValidation(DID identifier, IdentifierC
         // If hashBytes does not equal identifierComponents.genesisBytes MUST throw an invalidDid error.
 
         if (! Arrays.equals(hashBytes, identifierComponents.genesisBytes())) {
-            throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Initial document cannot be validated");
+            throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Initial document cannot be validated");
         }
 
         // DID DOCUMENT METADATA

src/main/java/uniresolver/driver/did/btc1/crud/read/ResolveTargetDocument.java

@@ -441,7 +441,7 @@ private static DIDDocument applyDIDUpdate(DIDDocument contemporaryDIDDocument, D
 
         DataIntegrityProof dataIntegrityProof = DataIntegrityProof.getFromJsonLDObject(update);
         String capabilityId = JsonLDUtils.jsonLdGetString(dataIntegrityProof.getJsonObject(), "capability");
-        if (capabilityId == null) throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "No 'capability' found in update proof: " + update);
+        if (capabilityId == null) throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "No 'capability' found in update proof: " + update);
 
         RootCapability rootCapability = RootDidBtc1UpdateCapabilities.dereferenceRootCapabilityIdentifier(capabilityId);
 

src/main/java/uniresolver/driver/did/btc1/syntax/DidBtc1IdentifierDecoding.java

@@ -34,9 +34,9 @@ public static IdentifierComponents didBtc1IdentifierDecoding(DID identifier) thr
         // If components[0] is not “did”, raise invalidDid error.
         // If components[1] is not “btc1”, raise methodNotSupported error.
 
-        if (components.length != 3) throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Invalid number of ':' characters (must be 3): " + identifier.getDidString());
-        if (! "did".equals(components[0])) throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Invalid URI scheme (must be 'did'): " + identifier.getDidString());
-        if (! "btc1".equals(components[1])) throw new ResolutionException(ResolutionException.ERROR_METHODNOTSUPPORTED, "Unsupported DID method (must be 'btc1'): " + identifier.getDidString());
+        if (components.length != 3) throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Invalid number of ':' characters (must be 3): " + identifier.getDidString());
+        if (! "did".equals(components[0])) throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Invalid URI scheme (must be 'did'): " + identifier.getDidString());
+        if (! "btc1".equals(components[1])) throw new ResolutionException(ResolutionException.ERROR_METHOD_NOT_SUPPORTED, "Unsupported DID method (must be 'btc1'): " + identifier.getDidString());
 
         // Set encodedString to components[2].
 
@@ -49,7 +49,7 @@ public static IdentifierComponents didBtc1IdentifierDecoding(DID identifier) thr
         try {
             bech32Data = Bech32mDecoding.bech32Decode(encodedString);
         } catch (AddressFormatException ex) {
-            throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Cannot bech32m-decode identifier: " + encodedString, ex);
+            throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Cannot bech32m-decode identifier: " + encodedString, ex);
         }
         String hrp = bech32Data.hrp;
         byte[] dataBytes = bech32Data.decode5to8();
@@ -59,7 +59,7 @@ public static IdentifierComponents didBtc1IdentifierDecoding(DID identifier) thr
         String idType = switch(hrp) {
             case "k" -> "key";
             case "x" -> "external";
-            default -> throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Invalid 'hrp' value in " + encodedString + ": " + bech32Data.hrp);
+            default -> throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Invalid 'hrp' value in " + encodedString + ": " + bech32Data.hrp);
         };
 
         // Set version to 1.
@@ -89,7 +89,7 @@ public static IdentifierComponents didBtc1IdentifierDecoding(DID identifier) thr
 
         // If version is greater than 1, raise invalidDid error.
 
-        if (version > 1) throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Unsupported 'version' value in " + encodedString + ": " + version);
+        if (version > 1) throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Unsupported 'version' value in " + encodedString + ": " + version);
 
         // Advance to the next nibble and set networkValue to its value.
 
@@ -101,14 +101,14 @@ public static IdentifierComponents didBtc1IdentifierDecoding(DID identifier) thr
         try {
             network = Network.valueOf(networkValue);
         } catch (Exception ex) {
-            throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Unsupported 'network' value in " + encodedString + ": " + networkValue);
+            throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Unsupported 'network' value in " + encodedString + ": " + networkValue);
         }
 
         // If the number of nibbles consumed is odd:
 
         if (nibbleStream.isOdd()) {
             byte fillerNibble = nibbleStream.nextNibble();
-            if (fillerNibble != 0) throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Invalid filler nibble in " + encodedString + ": " + fillerNibble);
+            if (fillerNibble != 0) throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Invalid filler nibble in " + encodedString + ": " + fillerNibble);
         }
 
         // Set genesisBytes to the remaining dataBytes.
@@ -151,7 +151,7 @@ public byte nextNibble() throws ResolutionException {
             byte nextNibble = this.nextHighNibble ? higherNibble(this.dataBytes[this.nextByteIndex]) : lowerNibble(this.dataBytes[this.nextByteIndex]);
             this.nextHighNibble = ! this.nextHighNibble;
             if (this.nextHighNibble) this.nextByteIndex++;
-            if (this.nextByteIndex >= this.dataBytes.length) throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Mot enough bytes left at index " + this.nextByteIndex + ": " + Hex.encodeHexString(this.dataBytes));
+            if (this.nextByteIndex >= this.dataBytes.length) throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Mot enough bytes left at index " + this.nextByteIndex + ": " + Hex.encodeHexString(this.dataBytes));
             return nextNibble;
         }
 

src/main/java/uniresolver/driver/did/btc1/syntax/DidBtc1IdentifierEncoding.java

@@ -29,27 +29,27 @@ public static DID didBtc1IdentifierEncoding(String idType, Integer version, Obje
         // If idType is not a valid value per above, raise invalidDid error.
 
         if (! "key".equals(idType) && ! "external".equals(idType)) {
-            throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Invalid 'idType' value: " + idType);
+            throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Invalid 'idType' value: " + idType);
         }
 
         // If version is greater than 1, raise invalidDid error.
 
         if (version > 1) {
-            throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Unsupported 'version' value: " + version);
+            throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Unsupported 'version' value: " + version);
         }
 
         // If network is not a valid value per above, raise invalidDid error.
 
         if (networkValue instanceof Network) networkValue = networkValue.toString();
 
         if (! (networkValue instanceof String networkValueString && Arrays.asList(Network.values()).contains(Network.valueOf(networkValueString))) && ! (networkValue instanceof Number)) {
-            throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Unsupported 'network' value: " + networkValue);
+            throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Unsupported 'network' value: " + networkValue);
         }
 
         // if network is a number and is outside the range of 1-8, raise invalidDid error.
 
         if (networkValue instanceof Number networkValueNumber && (networkValueNumber.intValue() < 1 || networkValueNumber.intValue() > 8)) {
-            throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Unsupported 'network' number value: " + networkValueNumber);
+            throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Unsupported 'network' number value: " + networkValueNumber);
         }
 
         // If idType is “key” and genesisBytes is not a valid compressed secp256k1 public key, raise invalidDid error.
@@ -68,7 +68,7 @@ public static DID didBtc1IdentifierEncoding(String idType, Integer version, Obje
         String hrp = switch (idType) {
             case "key" -> "k";
             case "external" -> "x";
-            default -> throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Invalid 'idType' value in: " + idType);
+            default -> throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Invalid 'idType' value in: " + idType);
         };
 
         // Create an empty nibbles numeric array.
@@ -118,7 +118,7 @@ public static DID didBtc1IdentifierEncoding(String idType, Integer version, Obje
         try {
             dataBytes.write(genesisBytes);
         } catch (IOException ex) {
-            throw new ResolutionException(ResolutionException.ERROR_INVALIDDID, "Cannot write genesis bytes " + Hex.encodeHexString(genesisBytes) + ": " + ex.getMessage(), ex);
+            throw new ResolutionException(ResolutionException.ERROR_INVALID_DID, "Cannot write genesis bytes " + Hex.encodeHexString(genesisBytes) + ": " + ex.getMessage(), ex);
         }
 
         // Set identifier to “did:btc1:”.