X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Frestcore%2Futil%2FURITools.java;h=962d2e990c4ab280ade7fb931f7bdd00a7c211a4;hb=fbb02159b84435cf37221ae8ae5e0045167be15a;hp=8e8af55b7981c12fcbd8cd2fe6529ea41ba28034;hpb=a9275b0c30881dac42f364ffca6f0d9cbff1b614;p=aai%2Faai-common.git

diff --git a/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java b/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java
index 8e8af55b..962d2e99 100644
--- a/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java
+++ b/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java
@@ -17,9 +17,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai.restcore.util;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
@@ -33,80 +33,81 @@ import java.util.regex.Pattern;
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
 
-import org.springframework.web.util.UriUtils;
-
 import org.onap.aai.introspection.Introspector;
 import org.onap.aai.introspection.sideeffect.exceptions.AAIMissingRequiredPropertyException;
 import org.onap.aai.schema.enums.PropertyMetadata;
+import org.springframework.web.util.UriUtils;
 
 public class URITools {
 
-	protected static final Pattern template = Pattern.compile("\\{(.*?)\\}");
+    protected static final Pattern template = Pattern.compile("\\{(.*?)\\}");
+
+    public static MultivaluedMap<String, String> getQueryMap(URI uri) {
+        MultivaluedMap<String, String> result = new MultivaluedHashMap<>();
+        String queryParams = uri.getRawQuery();
+        if (queryParams != null) {
+            String[] sections = queryParams.split("&");
+            String[] query = null;
+            String key, value = "";
+            for (String section : sections) {
+                query = section.split("=");
+                key = UriUtils.decode(query[0], "UTF-8");
+                if (query[1] != null) {
+                    query[1] = query[1].replaceAll("\\+", "%20");
+                }
+                value = UriUtils.decode(query[1], "UTF-8");
+                if (result.containsKey(key)) {
+                    result.add(key, value);
+                } else {
+                    result.putSingle(key, value);
+                }
+            }
+        }
+        return result;
+
+    }
+
+    public static Optional<String> replaceTemplates(Introspector obj, String uriString, PropertyMetadata metadata,
+            boolean replaceWithWildcard) throws AAIMissingRequiredPropertyException {
+        String result = uriString;
+        final Map<String, String> propMap = URITools.findProperties(obj, uriString, metadata, replaceWithWildcard);
+        if (propMap.isEmpty()) {
+            return Optional.empty();
+        }
+        for (Entry<String, String> entry : propMap.entrySet()) {
+            result = result.replaceAll("\\{" + entry.getKey() + "\\}", entry.getValue());
+        }
+        // drop out wildcards if they exist
+        result = result.replaceFirst("/[^/]+?(?:/\\*)+", "");
+        return Optional.of(result);
+    }
+
+    private static Map<String, String> findProperties(Introspector obj, String uriString, PropertyMetadata metadata,
+            boolean replaceWithWildcard) throws AAIMissingRequiredPropertyException {
+
+        final Map<String, String> result = new HashMap<>();
+        final Set<String> missing = new LinkedHashSet<>();
+        Matcher m = template.matcher(uriString);
+        int properties = 0;
+        while (m.find()) {
+            String propName = m.group(1);
+            String value = obj.getValue(propName);
+            properties++;
+            if (value != null) {
+                result.put(propName, value);
+            } else {
+                if (replaceWithWildcard) {
+                    result.put(propName, "*");
+                }
+                missing.add(propName);
+            }
+        }
+
+        if (!missing.isEmpty() && (properties != missing.size())) {
+            throw new AAIMissingRequiredPropertyException(
+                    "Cannot complete " + metadata.toString() + " uri. Missing properties " + missing);
+        }
+        return result;
+    }
 
-	public static MultivaluedMap<String, String> getQueryMap(URI uri) {
-		MultivaluedMap<String, String> result = new MultivaluedHashMap<>();
-		String queryParams = uri.getRawQuery();
-		if (queryParams != null) {
-			try {
-				String[] sections = queryParams.split("&");
-				String[] query = null;
-				String key, value = "";
-				for (String section : sections) {
-					query = section.split("=");
-					key = UriUtils.decode(query[0], "UTF-8");
-					value = UriUtils.decode(query[1], "UTF-8");
-					if (result.containsKey(key)) {
-						result.add(key, value);
-					} else {
-						result.putSingle(key, value);
-					}
-				}
-			} catch (UnsupportedEncodingException e ) {
-				
-			}
-		}
-		return result;
-		
-	}
-	
-	public static Optional<String> replaceTemplates(Introspector obj, String uriString, PropertyMetadata metadata, boolean replaceWithWildcard) throws AAIMissingRequiredPropertyException {
-		String result = uriString;
-		final Map<String, String> propMap = URITools.findProperties(obj, uriString, metadata, replaceWithWildcard);
-		if (propMap.isEmpty()) {
-			return Optional.empty();
-		}
-		for (Entry<String, String> entry : propMap.entrySet()) {
-			result = result.replaceAll("\\{" + entry.getKey() + "\\}", entry.getValue());
-		}
-		//drop out wildcards if they exist
-		result = result.replaceFirst("/[^/]+?(?:/\\*)+", "");
-		return Optional.of(result);
-	}
-	
-	private static Map<String, String> findProperties(Introspector obj, String uriString, PropertyMetadata metadata, boolean replaceWithWildcard) throws AAIMissingRequiredPropertyException {
-		
-		final Map<String, String> result = new HashMap<>();
-		final Set<String> missing = new LinkedHashSet<>();
-		Matcher m = template.matcher(uriString);
-		int properties = 0;
-		while (m.find()) {
-			String propName = m.group(1);
-			String value = obj.getValue(propName);
-			properties++;
-			if (value != null) {
-				result.put(propName, value);
-			} else {
-				if (replaceWithWildcard) {
-					result.put(propName, "*");
-				}
-				missing.add(propName);
-			}
-		}
-		
-		if (!missing.isEmpty() && (properties != missing.size())) {
-			throw new AAIMissingRequiredPropertyException("Cannot complete " + metadata.toString() + " uri. Missing properties " + missing);
-		}
-		return result;
-	}
-	
 }