X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fclient%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fclient%2FRcli.java;h=cfc52fb480402522a4c0005b8357fc7bff72d4a2;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=6b486b8e22340e65d24ca9e96adf54c50c8906c0;hpb=7e966914050e66219689001ff4ab601a49eef0ac;p=aaf%2Fauthz.git

diff --git a/cadi/client/src/main/java/org/onap/aaf/cadi/client/Rcli.java b/cadi/client/src/main/java/org/onap/aaf/cadi/client/Rcli.java
index 6b486b8e..cfc52fb4 100644
--- a/cadi/client/src/main/java/org/onap/aaf/cadi/client/Rcli.java
+++ b/cadi/client/src/main/java/org/onap/aaf/cadi/client/Rcli.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -94,9 +94,9 @@ public abstract class Rcli<CT> {
         rv.apiVersion = apiVersion;
         return rv;
     }
-    
+
     protected abstract Rcli<CT> clone(URI uri, SecuritySetter<CT> ss);
-    
+
     public abstract void invalidate() throws CadiException;
 
     public Rcli<CT> readTimeout(int millis) {
@@ -118,7 +118,7 @@ public abstract class Rcli<CT> {
         this.apiVersion = apiVersion;
         return this;
     }
-    
+
     public boolean isApiVersion(String prospective) {
         return apiVersion.equals(prospective);
     }
@@ -294,7 +294,7 @@ public abstract class Rcli<CT> {
 
     /**
      * Read String, using POST for keyInfo
-     * 
+     *
      * @param pathinfo
      * @param df
      * @param t
@@ -335,7 +335,7 @@ public abstract class Rcli<CT> {
      */
     public<T,R> Future<R> readPost(String pathinfo, final RosettaDF<T> df, final T t, final RosettaDF<R> resp) throws APIException, CadiException {
         final ParsePath pp = new ParsePath(pathinfo);
-        
+
         EClient<CT> client = client();
         client.setMethod(POST);
         client.addHeader(CONTENT_TYPE,typeString(df.getTypeClass()));
@@ -371,11 +371,11 @@ public abstract class Rcli<CT> {
 
     public Future<String> read(String pathinfo, String accept, String ... headers) throws APIException, CadiException {
         final ParsePath pp = new ParsePath(pathinfo);
-    
+
         EClient<CT> client = client();
         client.setMethod(GET);
         client.addHeader(ACCEPT, accept);
-        
+
         for (int i=1;i<headers.length;i=i+2) {
             client.addHeader(headers[i-1],headers[i]);
         }
@@ -416,7 +416,7 @@ public abstract class Rcli<CT> {
         client.setPathInfo(pp.path());
         client.setQueryParams(pp.query());
         client.setFragment(pp.frag());
-        
+
         client.setPayload(null);
         client.send();
         return client.futureRead(df,type);
@@ -430,7 +430,7 @@ public abstract class Rcli<CT> {
         client.addHeader(ACCEPT, typeString(cls));
         client.setPathInfo(pp.path());
         client.setQueryParams(pp.query());
-        client.setFragment(pp.frag());        
+        client.setFragment(pp.frag());
 
         client.setPayload(null);
         client.send();
@@ -445,7 +445,7 @@ public abstract class Rcli<CT> {
         client.addHeader(CONTENT_TYPE,contentType);
         client.setPathInfo(pp.path());
         client.setQueryParams(pp.query());
-        client.setFragment(pp.frag());        
+        client.setFragment(pp.frag());
         client.setPayload(new EClient.Transfer() {
             @Override
             public void transfer(OutputStream os) throws IOException, APIException {
@@ -455,16 +455,16 @@ public abstract class Rcli<CT> {
         client.send();
         return client.future(t);
     }
-    
+
     public<T> Future<String> updateRespondString(String pathinfo, final RosettaDF<T> df, final T t) throws APIException, CadiException {
         final ParsePath pp = new ParsePath(pathinfo);
-        
+
         EClient<CT> client = client();
         client.setMethod(PUT);
         client.addHeader(CONTENT_TYPE, typeString(df.getTypeClass()));
         client.setPathInfo(pp.path());
         client.setQueryParams(pp.query());
-        client.setFragment(pp.frag());        
+        client.setFragment(pp.frag());
 
         client.setPayload(new EClient.Transfer() {
             @Override
@@ -476,7 +476,7 @@ public abstract class Rcli<CT> {
         client.send();
         return client.futureReadString();
     }
-    
+
     public Future<String> update(String pathinfo, String contentType, EClient.Transfer content) throws APIException, CadiException {
         final ParsePath pp = new ParsePath(pathinfo);
 
@@ -502,8 +502,8 @@ public abstract class Rcli<CT> {
         client.addHeader(CONTENT_TYPE, typeString(df.getTypeClass()));
         client.setPathInfo(pp.path());
         client.setQueryParams(pp.query());
-        client.setFragment(pp.frag());    
-        
+        client.setFragment(pp.frag());
+
         client.setPayload(new EClient.Transfer() {
             @Override
             public void transfer(OutputStream os) throws IOException, APIException {
@@ -513,16 +513,16 @@ public abstract class Rcli<CT> {
         client.send();
         return client.future(t);
     }
-    
+
     public<T> Future<T> update(String pathinfo, Class<?> cls, final RosettaDF<T> df, final T t) throws APIException, CadiException {
         final ParsePath pp = new ParsePath(pathinfo);
-        
+
         EClient<CT> client = client();
         client.setMethod(PUT);
         client.addHeader(CONTENT_TYPE, typeString(cls));
         client.setPathInfo(pp.path());
         client.setQueryParams(pp.query());
-        client.setFragment(pp.frag());    
+        client.setFragment(pp.frag());
 
         client.setPayload(new EClient.Transfer() {
             @Override
@@ -533,7 +533,7 @@ public abstract class Rcli<CT> {
         client.send();
         return client.future(t);
     }
-    
+
 
 
     /**
@@ -553,7 +553,7 @@ public abstract class Rcli<CT> {
         client.addHeader(CONTENT_TYPE, typeString(Void.class));
         client.setPathInfo(pp.path());
         client.setQueryParams(pp.query());
-        client.setFragment(pp.frag());    
+        client.setFragment(pp.frag());
 
 //        client.setPayload(new EClient.Transfer() {
 //            @Override
@@ -563,7 +563,7 @@ public abstract class Rcli<CT> {
         client.send();
         return client.future(null);
     }
-    
+
 
     public<T> Future<T> delete(String pathinfo, String contentType, final RosettaDF<T> df, final T t) throws APIException, CadiException {
         final ParsePath pp = new ParsePath(pathinfo);
@@ -573,7 +573,7 @@ public abstract class Rcli<CT> {
         client.addHeader(CONTENT_TYPE, contentType);
         client.setPathInfo(pp.path());
         client.setQueryParams(pp.query());
-        client.setFragment(pp.frag());    
+        client.setFragment(pp.frag());
 
         client.setPayload(new EClient.Transfer() {
             @Override
@@ -593,7 +593,7 @@ public abstract class Rcli<CT> {
         client.addHeader(CONTENT_TYPE, typeString(cls));
         client.setPathInfo(pp.path());
         client.setQueryParams(pp.query());
-        client.setFragment(pp.frag());    
+        client.setFragment(pp.frag());
         client.setPayload(new EClient.Transfer() {
             @Override
             public void transfer(OutputStream os) throws IOException, APIException {
@@ -612,7 +612,7 @@ public abstract class Rcli<CT> {
         client.addHeader(CONTENT_TYPE, typeString(df.getTypeClass()));
         client.setPathInfo(pp.path());
         client.setQueryParams(pp.query());
-        client.setFragment(pp.frag());    
+        client.setFragment(pp.frag());
         client.setPayload(new EClient.Transfer() {
             @Override
             public void transfer(OutputStream os) throws IOException, APIException {
@@ -633,7 +633,7 @@ public abstract class Rcli<CT> {
         client.addHeader(CONTENT_TYPE, typeString(cls));
         client.setPathInfo(pp.path());
         client.setQueryParams(pp.query());
-        client.setFragment(pp.frag());    
+        client.setFragment(pp.frag());
 
         client.setPayload(null);
         client.send();
@@ -648,7 +648,7 @@ public abstract class Rcli<CT> {
         client.addHeader(CONTENT_TYPE, contentType);
         client.setPathInfo(pp.path());
         client.setQueryParams(pp.query());
-        client.setFragment(pp.frag());    
+        client.setFragment(pp.frag());
 
         client.setPayload(null);
         client.send();
@@ -681,7 +681,7 @@ public abstract class Rcli<CT> {
                     int read;
                     // reuse Buffers
                     Pooled<byte[]> pbuff = buffPool.get();
-                    try { 
+                    try {
                         while ((read=is.read(pbuff.content))>=0) {
                             os.write(pbuff.content,0,read);
                         }
@@ -713,13 +713,13 @@ public abstract class Rcli<CT> {
                 queryEnd = pound>=0?pound:path.length();
                 if (oneCallQueryParams==null) {
                     if (query>=0) {
-                        queryParams = path.substring(query+1,queryEnd); 
+                        queryParams = path.substring(query+1,queryEnd);
                     } else {
                         queryParams=null;
                     }
                 } else {
                     if (query>=0) {
-                        queryParams = oneCallQueryParams + '&' + path.substring(query+1,queryEnd); 
+                        queryParams = oneCallQueryParams + '&' + path.substring(query+1,queryEnd);
                     } else {
                         queryParams = oneCallQueryParams;
                     }
@@ -727,7 +727,7 @@ public abstract class Rcli<CT> {
                 }
             }
         }
-        
+
         public String path() {
             if (query>=0) {
                 if (pound>=0) {
@@ -740,11 +740,11 @@ public abstract class Rcli<CT> {
                 return path;
             }
         }
-        
+
         public String query() {
             return queryParams;
         }
-        
+
         public String frag() {
             if (pound>=0) {
                 return path.substring(pound+1);