Collection syntax change because of Sonar
[aaf/authz.git] / cadi / client / src / main / java / org / onap / aaf / cadi / http / HClient.java
index 456184c..a3dac7d 100644 (file)
@@ -93,7 +93,7 @@ public class HClient implements EClient<HttpURLConnection> {
        @Override
        public void addHeader(String tag, String value) {
                if (headers == null)
-                       headers = new ArrayList<Header>();
+                       headers = new ArrayList<>();
                headers.add(new Header(tag, value));
        }
 
@@ -122,11 +122,16 @@ public class HClient implements EClient<HttpURLConnection> {
                                }
                                pi.append(pathinfo);
                        }
-                       pathinfo=null;
-                       query=null;
-                       fragment=null;
-                       //huc = (HttpURLConnection) url.openConnection();
-                       huc = getConnection(uri, pi);
+                       URI sendURI = new URI(
+                                       uri.getScheme(),
+                                       uri.getUserInfo(),
+                                       uri.getHost(),
+                                       uri.getPort(),
+                                       pi==null?uri.getPath():pi.toString(),
+                                       query==null?uri.getQuery():query,
+                                       fragment==null?uri.getFragment():fragment
+                                       );
+                       huc = getConnection(sendURI, pi);
                        huc.setRequestMethod(meth);
                        if(ss!=null) {
                                ss.setSecurity(huc);