resolve PR comments

luisgoncalves · Dec 4, 2023 · 457904f · 457904f
1 parent 1389d7d
commit 457904f
Show file tree

Hide file tree

Showing 7 changed files with 286 additions and 276 deletions.
diff --git a/src/main/java/xades4j/production/DataObjectReference.java b/src/main/java/xades4j/production/DataObjectReference.java
@@ -49,9 +49,6 @@ public DataObjectReference(String uri)
         {
             throw new NullPointerException("Reference URI cannot be null");
         }
-
-        uri = uri.trim();
-
         this.uri = URI.create(uri.trim()).toString();
     }
 

diff --git a/src/main/java/xades4j/properties/IdentifierType.java b/src/main/java/xades4j/properties/IdentifierType.java
@@ -45,8 +45,12 @@ public enum IdentifierType
      * The identifier is an Object Identifier encoded as a URI
      */
     OID_AS_URI,
+    @Deprecated(since="2.2.2")
+    OIDAsURI,
     /**
      * The identifier is an Object Identifier encoded as a URN
      */
-    OID_AS_URN
+    OID_AS_URN,
+    @Deprecated(since="2.2.2")
+    OIDAsURN
 }
diff --git a/src/main/java/xades4j/xml/bind/xades/ObjectFactory.java b/src/main/java/xades4j/xml/bind/xades/ObjectFactory.java
diff --git a/src/main/java/xades4j/xml/bind/xades/XmlQualifierType.java b/src/main/java/xades4j/xml/bind/xades/XmlQualifierType.java
@@ -35,7 +35,13 @@ public enum XmlQualifierType {
     @XmlEnumValue("OIDAsURI")
     OID_AS_URI("OIDAsURI"),
     @XmlEnumValue("OIDAsURN")
-    OID_AS_URN("OIDAsURN");
+    OID_AS_URN("OIDAsURN"),
+    @Deprecated(since="2.2.2")
+    @XmlEnumValue("OIDAsURI")
+    OIDAsURI("OIDAsURI"),
+    @Deprecated(since="2.2.2")
+    @XmlEnumValue("OIDAsURN")
+    OIDAsURN("OIDAsURN");
     private final String value;
 
     XmlQualifierType(String v) {

diff --git a/src/main/java/xades4j/xml/bind/xmldsig/ObjectFactory.java b/src/main/java/xades4j/xml/bind/xmldsig/ObjectFactory.java
diff --git a/src/main/java/xades4j/xml/marshalling/ToXmlUtils.java b/src/main/java/xades4j/xml/marshalling/ToXmlUtils.java
@@ -46,6 +46,8 @@ class ToXmlUtils
         identifierTypeConv = new EnumMap<>(IdentifierType.class);
         identifierTypeConv.put(IdentifierType.OID_AS_URI, XmlQualifierType.OID_AS_URI);
         identifierTypeConv.put(IdentifierType.OID_AS_URN, XmlQualifierType.OID_AS_URN);
+        identifierTypeConv.put(IdentifierType.OIDAsURI, XmlQualifierType.OIDAsURI);
+        identifierTypeConv.put(IdentifierType.OIDAsURN, XmlQualifierType.OIDAsURN);
     }
 
     static XmlObjectIdentifierType getXmlObjectId(ObjectIdentifier objId)

diff --git a/src/main/java/xades4j/xml/unmarshalling/FromXmlUtils.java b/src/main/java/xades4j/xml/unmarshalling/FromXmlUtils.java
@@ -69,6 +69,8 @@ static void createAndCertificateRefs(
         identifierTypeConv.put(null, IdentifierType.URI);
         identifierTypeConv.put(XmlQualifierType.OID_AS_URI, IdentifierType.OID_AS_URI);
         identifierTypeConv.put(XmlQualifierType.OID_AS_URN, IdentifierType.OID_AS_URN);
+        identifierTypeConv.put(XmlQualifierType.OIDAsURI, IdentifierType.OIDAsURI);
+        identifierTypeConv.put(XmlQualifierType.OIDAsURN, IdentifierType.OIDAsURN);
     }
 
     static ObjectIdentifier getObjectIdentifier(XmlObjectIdentifierType xmlObjId)
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,9 +49,6 @@ public DataObjectReference(String uri) @@
             {
                 throw new NullPointerException("Reference URI cannot be null");
             }
-            uri = uri.trim();
             this.uri = URI.create(uri.trim()).toString();
         }
@@ Expand Down @@