Update aai-common to be spring boot 2 compatible

Issue-ID: AAI-2806
Change-Id: Idad79373209ef25bb26551253aa8ad86e4a75549
Signed-off-by: Harish Venkata Kajur <vk250x@att.com>

2 files changed, 15 insertions, 18 deletions

diff --git a/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceNoAuthClient.java b/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceNoAuthClient.java
index d373ae78..6173e4bd 100644
--- a/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceNoAuthClient.java
+++ b/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceNoAuthClient.java
@@ -26,6 +26,7 @@ import org.onap.aai.restclient.NoAuthRestClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.util.MultiValueMap;
 
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 a757d3db..fc32f859 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
@@ -47,25 +47,21 @@ public class URITools {
         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");
-                    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);
-                    }
+            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);
                 }
-            } catch (UnsupportedEncodingException e) {
-
             }
         }
         return result;