Use URI to decode curly braces

Author: ZakarFin

service-capabilities/src/main/java/org/oskari/capabilities/MetadataHelper.java

@@ -15,7 +15,8 @@
 
 public class MetadataHelper {
     private static final Logger LOG = LogFactory.getLogger(MetadataHelper.class);
-    private static final Pattern HEX_UPPER_GROUPED = Pattern.compile("^[0-9A-Fa-f]+(?:-[0-9A-Fa-f]+)*$");
+    // dash separated hex char sequences
+    private static final Pattern METADATA_ID_VALIDATOR = Pattern.compile("^[0-9A-Fa-f]+(?:-[0-9A-Fa-f]+)*$");
     /**
      * Helper for parsing metadata uuid from url.
      * @param url
@@ -62,13 +63,18 @@ private static String tryParsingIdFromPath(String url) {
         if (url == null || !url.startsWith("http") || url.length() < 11) {
             return null;
         }
-        // remove possible protocol, we don't care if part of the domain is removed as well
-        String[] pathParts = url.substring(10).split("/");
-
-        for (String possibleId : pathParts) {
-            if(couldBeMetadataId(possibleId)) {
-                return possibleId;
+        // Parse with URI and getPath() to remove params etc
+        // the url-encoded curly braces will be decoded and saved to db as decoded
+        try {
+            String[] pathParts = new URI(url).getPath().split("/");
+            for (String possibleId : pathParts) {
+                if(couldBeMetadataId(possibleId)) {
+                    return possibleId;
+                }
             }
+
+        } catch (Exception e) {
+            LOG.debug("Unexpected error converting url-string to uri:", e);
         }
 
        return null;
@@ -79,11 +85,12 @@ private static boolean couldBeMetadataId(String possibleId) {
             // usually 30+ chars
             return false;
         }
-        if (possibleId.startsWith("%7B") && possibleId.endsWith("%7D")) {
-            possibleId = possibleId.substring(3, possibleId.length() - 3);
+        // URI decodes any URL-encoded bits so we can assume decoded chars here
+        if (possibleId.startsWith("{") && possibleId.endsWith("}")) {
+            possibleId = possibleId.substring(1, possibleId.length() - 1);
         }
 
-        return HEX_UPPER_GROUPED.matcher(possibleId).matches();
+        return METADATA_ID_VALIDATOR.matcher(possibleId).matches();
     }
 
     public static ArrayList<String> getAllowedDomainsList()  {

service-capabilities/src/test/java/org/oskari/capabilities/MetadataHelperTest.java

@@ -38,7 +38,7 @@ public void testGetIdFromMetadataUrl() {
         expected.put("http://mydomain.org?test=test&Id=key&post=test", "key");
         expected.put("http://mydomain.org?test=test&uuId=Key&post=test", "Key");
         expected.put("http://mydomain.org/dataset/C73BC2C1-C2CA-4FCA-9171-B8074F2BC2A3", "C73BC2C1-C2CA-4FCA-9171-B8074F2BC2A3");
-        expected.put("http://mydomain.org/dataset/%7BC73BC2C1-C2CA-4FCA-9171-B8074F2BC2A3%7D", "%7BC73BC2C1-C2CA-4FCA-9171-B8074F2BC2A3%7D");
+        expected.put("http://mydomain.org/dataset/%7BC73BC2C1-C2CA-4FCA-9171-B8074F2BC2A3%7D", "{C73BC2C1-C2CA-4FCA-9171-B8074F2BC2A3}");
         // java.net.URI breaks at {}
         expected.put("http://mydomain.org/dataset/{C73BC2C1-C2CA-4FCA-9171-B8074F2BC2A3}", null);