Update REST Samples for required behavior 29/55229/1
authorInstrumental <jonathan.gathman@att.com>
Thu, 21 Jun 2018 20:08:47 +0000 (15:08 -0500)
committerInstrumental <jonathan.gathman@att.com>
Thu, 21 Jun 2018 20:08:54 +0000 (15:08 -0500)
Issue-ID: AAF-361
Change-Id: Ia6dabfa3eeec2253c3f017ddc2d70afe4afbd54b
Signed-off-by: Instrumental <jonathan.gathman@att.com>
15 files changed:
auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/HttpCode.java
auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/UserRoleExtend.java
auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/UserRoleRemove.java
auth/auth-hello/src/main/java/org/onap/aaf/auth/hello/API_Hello.java
cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java
cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClient.java
cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
cadi/client/src/main/java/org/onap/aaf/cadi/client/Rcli.java
cadi/client/src/main/java/org/onap/aaf/cadi/locator/SingleEndpointLocator.java [new file with mode: 0644]
cadi/client/src/test/java/org/onap/aaf/cadi/client/test/JU_Rcli.java
cadi/oauth-enduser/src/main/java/org/onap/aaf/cadi/enduser/ClientFactory.java [new file with mode: 0644]
cadi/oauth-enduser/src/main/java/org/onap/aaf/cadi/enduser/SimpleRESTClient.java [new file with mode: 0644]
cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OAuthExample.java [moved from cadi/oauth-enduser/src/test/java/com/att/cadi/enduser/OAuthExample.java with 99% similarity]
cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OnapClientExample.java [moved from cadi/oauth-enduser/src/test/java/com/att/cadi/enduser/OnapClientExample.java with 99% similarity]
cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/SimpleRestClientExample.java [new file with mode: 0644]

index 0bfe310..d209ddc 100644 (file)
@@ -78,11 +78,14 @@ public abstract class HttpCode<TRANS extends Trans, CONTEXT> {
         * @return
         */
        public String pathParam(HttpServletRequest req, String key) {
-               String rv = match.param(req.getPathInfo(), key);
-               if(rv!=null) {
-                       rv = rv.trim();
-                       if(rv.endsWith("/")) {
-                               rv = rv.substring(0, rv.length()-1);
+               String rv = req.getParameter(key);
+               if(rv==null) {
+                       rv = match.param(req.getPathInfo(), key);
+                       if(rv!=null) {
+                               rv = rv.trim();
+                               if(rv.endsWith("/")) {
+                                       rv = rv.substring(0, rv.length()-1);
+                               }
                        }
                }
                return rv;
index c0ba16d..8a78fd7 100644 (file)
@@ -67,7 +67,7 @@ public class UserRoleExtend extends Page {
                                                        gui.clientAsUser(trans.getUserPrincipal(), new Retryable<Void>() {
                                                                @Override
                                                                public Void code(Rcli<?> client)throws CadiException, ConnectException, APIException {
-                                                                       Future<Void> fv = client.setQueryParams("request=true").update("/authz/userRole/extend/"+user+"/"+role);
+                                                                       Future<Void> fv = client.update("/authz/userRole/extend/"+user+"/"+role+"?request=true");
                                                                        if(fv.get(5000)) {
                                                                                // not sure if we'll ever hit this
                                                                                hgen.p("Extended User ["+ user+"] in Role [" +role+"]");
index 5f8adf2..84f3640 100644 (file)
@@ -67,8 +67,8 @@ public class UserRoleRemove extends Page {
                                                        gui.clientAsUser(trans.getUserPrincipal(), new Retryable<Void>() {
                                                                @Override
                                                                public Void code(Rcli<?> client) throws CadiException, ConnectException, APIException {
-                                                                       Future<Void> fv = client.setQueryParams("request=true").delete(
-                                                                                               "/authz/userRole/"+user+"/"+role,Void.class);
+                                                                       Future<Void> fv = client.delete(
+                                                                                               "/authz/userRole/"+user+"/"+role+"?request=true",Void.class);
                                                                        
                                                                        if(fv.get(5000)) {
                                                                                // not sure if we'll ever hit this
index e225223..2be162c 100644 (file)
@@ -52,8 +52,9 @@ public class API_Hello {
         */
        public static void init(final AAF_Hello oauthHello) throws Exception {
                ////////
-               // Overall APIs
+               // Simple "GET" API
                ///////
+               
                oauthHello.route(HttpMethods.GET,"/hello/:perm*",API.TOKEN,new HttpCode<AuthzTrans, AAF_Hello>(oauthHello,"Hello OAuth"){
                        @Override
                        public void handle(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) throws Exception {
@@ -84,5 +85,37 @@ public class API_Hello {
                        }
                }); 
 
+               ////////
+               // REST APIs
+               ///////
+               oauthHello.route(oauthHello.env,HttpMethods.GET,"/resthello/:perm*",new HttpCode<AuthzTrans, AAF_Hello>(oauthHello,"REST Hello OAuth") {
+                       @Override
+                       public void handle(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) throws Exception {
+                               resp.setStatus(200 /* OK */);
+                               StringBuilder sb = new StringBuilder("{\"resp\": \"Hello REST AAF\",\"principal\": \"");
+                               sb.append(req.getUserPrincipal().getName());
+                               sb.append('"');
+                               String perm = pathParam(req, "perm");
+                               if(perm!=null && perm.length()>0) {
+                                       TimeTaken tt = trans.start("Authorize perm", Env.REMOTE);
+                                       try {
+                                               sb.append(",\"validation\": { \"permission\" : \"");
+                                               sb.append(perm);
+                                               sb.append("\",\"has\" : \"");
+                                               sb.append(req.isUserInRole(perm));
+                                               sb.append("\"}");
+                                       } finally {
+                                               tt.done();
+                                       }
+                               }
+                               sb.append("}");
+                               ServletOutputStream os = resp.getOutputStream();
+                               os.println(sb.toString());
+                               trans.info().printf("Said 'RESTful Hello' to %s, Authentication type: %s",trans.getUserPrincipal().getName(),trans.getUserPrincipal().getClass().getSimpleName());
+                       }
+               },"application/json"); 
+               
+               
+               
        }
 }
index bcc156c..bdd95a7 100644 (file)
@@ -497,8 +497,7 @@ public class CmAgent {
                                                                cr.getFqdns().add(fqdns[i]);
                                                        }
                                                        Future<String> f = aafcon.client(CM_VER)
-                                                                       .setQueryParams("withTrust")
-                                                                       .updateRespondString("/cert/" + a.getCa(),reqDF, cr);
+                                                                       .updateRespondString("/cert/" + a.getCa()+"?withTrust",reqDF, cr);
                                                        if(f.get(TIMEOUT)) {
                                                                CertInfo capi = certDF.newData().in(TYPE.JSON).load(f.body()).asObject();
                                                                for(String type : a.getType()) {
index 0628d4d..dec0b4e 100644 (file)
@@ -130,7 +130,7 @@ public class TokenClient {
         */
        public void client_creds(final String client_id, final String client_secret) throws CadiException {
                if(client_id==null) {
-                       throw new CadiException(Config.AAF_ALT_CLIENT_ID + " is null");
+                       throw new CadiException("client_creds:client_id is null");
                }
                this.client_id = client_id;
                default_scope = FQI.reverseDomain(client_id);
index 4f3fa87..2b89576 100644 (file)
@@ -43,6 +43,7 @@ import org.onap.aaf.cadi.aaf.v2_0.AAFLocator;
 import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.config.SecurityInfoC;
 import org.onap.aaf.cadi.locator.PropertyLocator;
+import org.onap.aaf.cadi.locator.SingleEndpointLocator;
 import org.onap.aaf.cadi.oauth.TokenClient.AUTHN_METHOD;
 import org.onap.aaf.cadi.persist.Persist;
 import org.onap.aaf.cadi.principal.Kind;
@@ -173,8 +174,10 @@ public class TokenClientFactory extends Persist<Token,TimedToken> {
                }
                if(locatorURL.startsWith("https://AAF_LOCATE_URL/") || locatePattern.matcher(locatorURL).matches()) {
                        return new AAFLocator(hsi,new URI(locatorURL));
-               } else {
+               } else if(locatorURL.indexOf(',')>0) { // multiple URLs is a Property Locator
                        return new PropertyLocator(locatorURL);
+               } else {
+                       return new SingleEndpointLocator(locatorURL);
                }
                // Note: Removed DME2Locator... If DME2 client is needed, use DME2Clients
        }
index c93d233..a98feb2 100644 (file)
@@ -57,7 +57,7 @@ public abstract class Rcli<CT> {
        protected int readTimeout = 5000;
        protected int connectionTimeout = 3000;
        protected URI uri;
-       private String queryParams, fragment;
+       private String oneCallQueryParams;
        public static Pool<byte[]> buffPool = new Pool<byte[]>(new Pool.Creator<byte[]>() {
                @Override
                public byte[] create() throws APIException {
@@ -132,15 +132,15 @@ public abstract class Rcli<CT> {
        protected abstract EClient<CT> client() throws CadiException;
 
 
-       public<T> Future<T> create(String pathinfo, String contentType, final RosettaDF<T> df, final T t) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+       public<T> Future<T> create(final String pathinfo, final String contentType, final RosettaDF<T> df, final T t) throws APIException, CadiException {
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(POST);
                client.addHeader(CONTENT_TYPE,contentType);
-               client.setPathInfo(pathinfo);
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());
                client.setPayload(new EClient.Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
@@ -148,19 +148,18 @@ public abstract class Rcli<CT> {
                        }
                });
                client.send();
-               queryParams = fragment = null;
                return client.futureCreate(df.getTypeClass());
        }
 
        public<T> Future<T> create(String pathinfo, final RosettaDF<T> df, final T t) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(POST);
                client.addHeader(CONTENT_TYPE,typeString(df.getTypeClass()));
-               client.setPathInfo(pathinfo);
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());
                client.setPayload(new EClient.Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
@@ -168,19 +167,18 @@ public abstract class Rcli<CT> {
                        }
                });
                client.send();
-               queryParams = fragment = null;
                return client.futureCreate(df.getTypeClass());
        }
 
        public<T> Future<T> create(String pathinfo, Class<?> cls, final RosettaDF<T> df, final T t) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(POST);
                client.addHeader(CONTENT_TYPE,typeString(cls));
-               client.setPathInfo(pathinfo);
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());
                client.setPayload(new EClient.Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
@@ -188,37 +186,34 @@ public abstract class Rcli<CT> {
                        }
                });
                client.send();
-               queryParams = fragment = null;
                return client.futureCreate(df.getTypeClass());
        }
 
        public<T> Future<T> create(String pathinfo, Class<T> cls) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(POST);
                client.addHeader(CONTENT_TYPE,typeString(cls));
-               client.setPathInfo(pathinfo);
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());
                client.setPayload(null);
                client.send();
-               queryParams = fragment = null;
                return client.futureCreate(cls);
        }
 
        public Future<Void> create(String pathinfo, String contentType) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(POST);
                client.addHeader(CONTENT_TYPE,contentType);
-               client.setPathInfo(pathinfo);
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());
                client.setPayload(null);
                client.send();
-               queryParams = fragment = null;
                return client.futureCreate(Void.class);
        }
 
@@ -237,7 +232,7 @@ public abstract class Rcli<CT> {
         * @throws CadiException
         */
        public <T> Future<T> postForm(String pathinfo, final RosettaDF<T> df, final String ... formParam) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(POST);
@@ -252,9 +247,9 @@ public abstract class Rcli<CT> {
                        default:
                                break;
                }
-               client.setPathInfo(pathinfo);
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());
                client.setPayload(new Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
@@ -280,7 +275,6 @@ public abstract class Rcli<CT> {
                                }
                        }});
                client.send();
-               queryParams = fragment = null;
                return client.futureRead(df,TYPE.JSON);
        }
 
@@ -296,14 +290,14 @@ public abstract class Rcli<CT> {
         * @throws CadiException
         */
        public<T> Future<String> readPost(String pathinfo, final RosettaDF<T> df, final T t) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(POST);
                client.addHeader(CONTENT_TYPE,typeString(df.getTypeClass()));
-               client.setPathInfo(pathinfo);
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());
                client.setPayload(new EClient.Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
@@ -311,7 +305,6 @@ public abstract class Rcli<CT> {
                        }
                });
                client.send();
-               queryParams = fragment = null;
                return client.futureReadString();
        }
 
@@ -327,14 +320,14 @@ public abstract class Rcli<CT> {
         * @throws CadiException
         */
        public<T,R> Future<R> readPost(String pathinfo, final RosettaDF<T> df, final T t, final RosettaDF<R> resp) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
-
+               final ParsePath pp = new ParsePath(pathinfo);
+               
                EClient<CT> client = client();
                client.setMethod(POST);
                client.addHeader(CONTENT_TYPE,typeString(df.getTypeClass()));
-               client.setPathInfo(pathinfo);
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());
                client.setPayload(new EClient.Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
@@ -342,30 +335,28 @@ public abstract class Rcli<CT> {
                        }
                });
                client.send();
-               queryParams = fragment = null;
                return client.futureRead(resp,resp.getOutType());
        }
 
        public Future<String> readPost(String pathinfo, String contentType, String ... headers) throws CadiException, APIException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(POST);
                client.addHeader(CONTENT_TYPE,contentType);
-               client.setPathInfo(pathinfo);
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());
                client.setPayload(new EClient.Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
                        }});
                client.send();
-               queryParams = fragment = null;
                return client.futureReadString();
        }
 
        public Future<String> read(String pathinfo, String accept, String ... headers) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
        
                EClient<CT> client = client();
                client.setMethod(GET);
@@ -374,19 +365,16 @@ public abstract class Rcli<CT> {
                for(int i=1;i<headers.length;i=i+2) {
                        client.addHeader(headers[i-1],headers[i]);
                }
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-       
-               client.setPathInfo(pathinfo);
-               
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());
                client.setPayload(null);
                client.send();
-               queryParams = fragment = null;
                return client.futureReadString();
        }
 
        public<T> Future<T> read(String pathinfo, String accept, RosettaDF<T> df, String ... headers) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(GET);
@@ -394,18 +382,16 @@ public abstract class Rcli<CT> {
                for(int i=1;i<headers.length;i=i+2) {
                        client.addHeader(headers[i-1],headers[i]);
                }
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-               client.setPathInfo(pathinfo);
-               
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());
                client.setPayload(null);
                client.send();
-               queryParams = fragment = null;
                return client.futureRead(df,type);
        }
 
        public<T> Future<T> read(String pathinfo, RosettaDF<T> df,String ... headers) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(GET);
@@ -413,41 +399,39 @@ public abstract class Rcli<CT> {
                for(int i=1;i<headers.length;i=i+2) {
                        client.addHeader(headers[i-1],headers[i]);
                }
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-               client.setPathInfo(pathinfo);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());
                
                client.setPayload(null);
                client.send();
-               queryParams = fragment = null;
                return client.futureRead(df,type);
        }
 
        public<T> Future<T> read(String pathinfo, Class<?> cls, RosettaDF<T> df) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(GET);
                client.addHeader(ACCEPT, typeString(cls));
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-               client.setPathInfo(pathinfo);
-               
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());          
+
                client.setPayload(null);
                client.send();
-               queryParams = fragment = null;
                return client.futureRead(df,type);
        }
 
        public<T> Future<T> update(String pathinfo, String contentType, final RosettaDF<T> df, final T t) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(PUT);
                client.addHeader(CONTENT_TYPE,contentType);
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-               client.setPathInfo(pathinfo);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());          
                client.setPayload(new EClient.Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
@@ -455,19 +439,19 @@ public abstract class Rcli<CT> {
                        }
                });
                client.send();
-               queryParams = fragment = null;
                return client.future(t);
        }
        
        public<T> Future<String> updateRespondString(String pathinfo, final RosettaDF<T> df, final T t) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
-
+               final ParsePath pp = new ParsePath(pathinfo);
+               
                EClient<CT> client = client();
                client.setMethod(PUT);
                client.addHeader(CONTENT_TYPE, typeString(df.getTypeClass()));
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-               client.setPathInfo(pathinfo);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());          
+
                client.setPayload(new EClient.Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
@@ -475,20 +459,20 @@ public abstract class Rcli<CT> {
                        }
                });
                client.send();
-               queryParams = fragment = null;
                return client.futureReadString();
        }
 
 
        public<T> Future<T> update(String pathinfo, final RosettaDF<T> df, final T t) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(PUT);
                client.addHeader(CONTENT_TYPE, typeString(df.getTypeClass()));
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-               client.setPathInfo(pathinfo);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());  
+               
                client.setPayload(new EClient.Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
@@ -496,19 +480,19 @@ public abstract class Rcli<CT> {
                        }
                });
                client.send();
-               queryParams = fragment = null;
                return client.future(t);
        }
        
        public<T> Future<T> update(String pathinfo, Class<?> cls, final RosettaDF<T> df, final T t) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
-
+               final ParsePath pp = new ParsePath(pathinfo);
+               
                EClient<CT> client = client();
                client.setMethod(PUT);
                client.addHeader(CONTENT_TYPE, typeString(cls));
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-               client.setPathInfo(pathinfo);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());  
+
                client.setPayload(new EClient.Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
@@ -516,7 +500,6 @@ public abstract class Rcli<CT> {
                        }
                });
                client.send();
-               queryParams = fragment = null;
                return client.future(t);
        }
 
@@ -530,33 +513,34 @@ public abstract class Rcli<CT> {
         * @throws CadiException
         */
        public<T> Future<Void> update(String pathinfo) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(PUT);
                client.addHeader(CONTENT_TYPE, typeString(Void.class));
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-               client.setPathInfo(pathinfo);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());  
+
 //             client.setPayload(new EClient.Transfer() {
 //                     @Override
 //                     public void transfer(OutputStream os) throws IOException, APIException {
 //                     }
 //             });
                client.send();
-               queryParams = fragment = null;
                return client.future(null);
        }
 
        public<T> Future<T> delete(String pathinfo, String contentType, final RosettaDF<T> df, final T t) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(DELETE);
                client.addHeader(CONTENT_TYPE, contentType);
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-               client.setPathInfo(pathinfo);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());  
+
                client.setPayload(new EClient.Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
@@ -564,19 +548,18 @@ public abstract class Rcli<CT> {
                        }
                });
                client.send();
-               queryParams = fragment = null;
                return client.future(t);
        }
 
        public<T> Future<T> delete(String pathinfo, Class<?> cls, final RosettaDF<T> df, final T t) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(DELETE);
                client.addHeader(CONTENT_TYPE, typeString(cls));
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-               client.setPathInfo(pathinfo);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());  
                client.setPayload(new EClient.Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
@@ -584,19 +567,18 @@ public abstract class Rcli<CT> {
                        }
                });
                client.send();
-               queryParams = fragment = null;
                return client.future(t);
        }
 
        public<T> Future<T> delete(String pathinfo, final RosettaDF<T> df, final T t) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(DELETE);
                client.addHeader(CONTENT_TYPE, typeString(df.getTypeClass()));
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-               client.setPathInfo(pathinfo);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());  
                client.setPayload(new EClient.Transfer() {
                        @Override
                        public void transfer(OutputStream os) throws IOException, APIException {
@@ -605,38 +587,37 @@ public abstract class Rcli<CT> {
                });
 
                client.send();
-               queryParams = fragment = null;
                return client.future(t);
        }
 
 
        public<T> Future<T> delete(String pathinfo, Class<T> cls) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(DELETE);
                client.addHeader(CONTENT_TYPE, typeString(cls));
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-               client.setPathInfo(pathinfo);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());  
+
                client.setPayload(null);
                client.send();
-               queryParams = fragment = null;
                return client.future((T)null);
        }
 
        public Future<Void> delete(String pathinfo, String contentType) throws APIException, CadiException {
-               final String qp = setupParams(pathinfo);
+               final ParsePath pp = new ParsePath(pathinfo);
 
                EClient<CT> client = client();
                client.setMethod(DELETE);
                client.addHeader(CONTENT_TYPE, contentType);
-               client.setQueryParams(qp);
-               client.setFragment(fragment);
-               client.setPathInfo(pathinfo);
+               client.setPathInfo(pp.path());
+               client.setQueryParams(pp.query());
+               client.setFragment(pp.frag());  
+
                client.setPayload(null);
                client.send();
-               queryParams = fragment = null;
                return client.future(null);
        }
 
@@ -680,47 +661,75 @@ public abstract class Rcli<CT> {
                return client.future(resp, expected);
        }
 
-       private String setupParams(String pathinfo) {
-               final String qp;
-               if(pathinfo==null) {
-                       qp=queryParams;
-               } else {
-                       final int idx = pathinfo.indexOf('?');
-                       if(idx>=0) {
-                               qp=pathinfo.substring(idx+1);
-                               pathinfo=pathinfo.substring(0,idx);
+       private class ParsePath {
+               private final String path;
+               private final int query;
+               private final int queryEnd;
+               private final int pound;
+               private final String queryParams;
+
+               public ParsePath(final String origPath) {
+                       path = origPath;
+                       if(origPath==null) {
+                               query=queryEnd=pound=-1;
+                               queryParams=null;
                        } else {
-                               qp=queryParams;
+                               query = origPath.indexOf('?');
+                               pound = origPath.indexOf('#');
+                               queryEnd = pound>=0?pound:path.length();
+                               if(oneCallQueryParams==null) {
+                                       if(query>=0) {
+                                               queryParams = path.substring(query+1,queryEnd); 
+                                       } else {
+                                               queryParams=null;
+                                       }
+                               } else {
+                                       if(query>=0) {
+                                               queryParams = oneCallQueryParams + '&' + path.substring(query+1,queryEnd); 
+                                       } else {
+                                               queryParams = oneCallQueryParams;
+                                       }
+                                       oneCallQueryParams = null;
+                               }
+                       }
+               }
+               
+               public String path() {
+                       if(query>=0) {
+                               if(pound>=0) {
+                                       return path.substring(pound+1);
+                               }
+                               return path.substring(0,query);
+                       } else if(pound>=0) {
+                               return path.substring(0,pound);
+                       } else {
+                               return path;
+                       }
+               }
+               
+               public String query() {
+                       return queryParams;
+               }
+               
+               public String frag() {
+                       if(pound>=0) {
+                               return path.substring(pound+1);
+                       } else {
+                               return null;
                        }
                }
-               return qp;
        }
 
        public String toString() {
                return uri.toString();
        }
 
-       /**
-        * @param queryParams the queryParams to set
-        * @return 
-        */
-       public Rcli<CT> setQueryParams(String queryParams) {
-               this.queryParams = queryParams;
-               return this;
-       }
-       
-
-       /**
-        * @param fragment the fragment to set
-        * @return 
-        */
-       public Rcli<CT> setFragment(String fragment) {
-               this.fragment = fragment;
-               return this;
-       }
-
        public URI getURI() {
                return uri;
        }
 
+       public void setQueryParams(final String queryParams) {
+               oneCallQueryParams=queryParams;
+       }
+
 }
\ No newline at end of file
diff --git a/cadi/client/src/main/java/org/onap/aaf/cadi/locator/SingleEndpointLocator.java b/cadi/client/src/main/java/org/onap/aaf/cadi/locator/SingleEndpointLocator.java
new file mode 100644 (file)
index 0000000..b0c830f
--- /dev/null
@@ -0,0 +1,82 @@
+/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * ===========================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END====================================================
+ *
+ */
+package org.onap.aaf.cadi.locator;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.onap.aaf.cadi.Locator;
+import org.onap.aaf.cadi.LocatorException;
+
+public class SingleEndpointLocator implements Locator<URI> {
+       private final URI uri;
+       private final static Item item = new Item() {};  
+       
+       public SingleEndpointLocator(final URI uri) {
+               this.uri = uri;
+       }
+       
+       public SingleEndpointLocator(final String endpoint) throws URISyntaxException {
+               this.uri = new URI(endpoint);
+       }
+
+       @Override
+       public URI get(Item item) throws LocatorException {
+               return uri;
+       }
+
+       @Override
+       public boolean hasItems() {
+               return true;
+       }
+
+       @Override
+       public void invalidate(Item item) throws LocatorException {
+               // Endpoints cannot be invalidated
+       }
+
+       @Override
+       public Item best() throws LocatorException {
+               return item;
+       }
+
+       @Override
+       public Item first() throws LocatorException {
+               return item;
+       }
+
+       @Override
+       public Item next(Item inItem) throws LocatorException {
+               // only one item
+               return null;
+       }
+
+       @Override
+       public boolean refresh() {
+               // Never refreshed
+               return true;
+       }
+
+       @Override
+       public void destroy() {
+               // Nothing to do here
+       }
+}
index f957878..886c5d8 100644 (file)
 
 package org.onap.aaf.cadi.client.test;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-import static org.hamcrest.CoreMatchers.*;
-import org.junit.*;
-import org.mockito.*;
-
-import org.onap.aaf.cadi.CadiException;
-import org.onap.aaf.cadi.SecuritySetter;
-import org.onap.aaf.cadi.client.EClient;
-import org.onap.aaf.cadi.client.Future;
-import org.onap.aaf.cadi.client.Rcli;
-import org.onap.aaf.misc.env.APIException;
-import org.onap.aaf.misc.env.Data;
-import org.onap.aaf.misc.env.Data.TYPE;
-import org.onap.aaf.misc.rosetta.env.RosettaDF;
-import org.onap.aaf.misc.rosetta.env.RosettaData;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -50,6 +38,21 @@ import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.SecuritySetter;
+import org.onap.aaf.cadi.client.EClient;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.client.Rcli;
+import org.onap.aaf.misc.env.APIException;
+import org.onap.aaf.misc.env.Data;
+import org.onap.aaf.misc.env.Data.TYPE;
+import org.onap.aaf.misc.rosetta.env.RosettaDF;
+import org.onap.aaf.misc.rosetta.env.RosettaData;
+
 public class JU_Rcli {
 
        @Mock RosettaDF<HttpURLConnection> dfMock;
@@ -61,8 +64,6 @@ public class JU_Rcli {
        
        private final static String uriString = "example.com";
        private final static String apiVersion = "v1.0";
-       private final static String fragment = "framgent";
-       private final static String queryParams = "queryParams";
        private final static String contentType = "contentType";
        
        private static URI uri;
@@ -224,9 +225,6 @@ public class JU_Rcli {
                rcli.apiVersion(null);
                assertThat(rcli.typeString(HttpURLConnection.class), is("application/HttpURLConnection+xml"));
                
-               rcli.setFragment(fragment);
-               rcli.setQueryParams(queryParams);
-
                rcliClone = rcli.forUser(null);
                assertThat(rcliClone.toString(), is(uriString));
        }
diff --git a/cadi/oauth-enduser/src/main/java/org/onap/aaf/cadi/enduser/ClientFactory.java b/cadi/oauth-enduser/src/main/java/org/onap/aaf/cadi/enduser/ClientFactory.java
new file mode 100644 (file)
index 0000000..50eaa75
--- /dev/null
@@ -0,0 +1,56 @@
+/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * ===========================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END====================================================
+ *
+ */
+package org.onap.aaf.cadi.enduser;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.security.GeneralSecurityException;
+
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.LocatorException;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.oauth.TokenClientFactory;
+import org.onap.aaf.misc.env.APIException;
+
+public class ClientFactory {
+       private final TokenClientFactory tcf;
+       public ClientFactory(final PropAccess access) throws APIException, CadiException {
+               try {
+                       tcf = TokenClientFactory.instance(access);
+               } catch (GeneralSecurityException | IOException e) {
+                       throw new CadiException(e);
+               }
+       }
+       
+       public ClientFactory(String[] args) throws APIException, CadiException {
+               this(new PropAccess(args));
+       }
+
+       public SimpleRESTClient simpleRESTClient(final String endpoint, final String ... scopes) throws URISyntaxException, LocatorException, CadiException, APIException {
+               return new SimpleRESTClient(tcf, Config.AAF_OAUTH2_TOKEN_URL, endpoint, scopes);
+       }
+
+       public Access getAccess() {
+               return tcf.access;
+       }
+}
diff --git a/cadi/oauth-enduser/src/main/java/org/onap/aaf/cadi/enduser/SimpleRESTClient.java b/cadi/oauth-enduser/src/main/java/org/onap/aaf/cadi/enduser/SimpleRESTClient.java
new file mode 100644 (file)
index 0000000..9535ad6
--- /dev/null
@@ -0,0 +1,133 @@
+/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * ===========================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END====================================================
+ *
+ */
+package org.onap.aaf.cadi.enduser;
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.security.Principal;
+
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.LocatorException;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.client.Rcli;
+import org.onap.aaf.cadi.client.Result;
+import org.onap.aaf.cadi.client.Retryable;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.oauth.TimedToken;
+import org.onap.aaf.cadi.oauth.TokenClient;
+import org.onap.aaf.cadi.oauth.TokenClientFactory;
+import org.onap.aaf.cadi.oauth.TzClient;
+import org.onap.aaf.cadi.principal.TaggedPrincipal;
+import org.onap.aaf.misc.env.APIException;
+
+public class SimpleRESTClient {
+       private static final String[] EMPTY = new String[0];
+       private final TokenClient tokenClient;
+       private final TzClient restClient;
+       private int callTimeout;
+       private String client_id;
+       private String app;
+       private String chain;
+       private Headers headers = new Headers() {
+               @Override
+               public String[] headers() {
+                       return EMPTY;
+               }};
+       
+       public SimpleRESTClient(final TokenClientFactory tcf, final String tokenURL, final String endpoint, final String[] scope) throws CadiException, LocatorException, APIException {
+               callTimeout = Integer.parseInt(tcf.access.getProperty(Config.AAF_CALL_TIMEOUT,Config.AAF_CALL_TIMEOUT_DEF));
+               tokenClient = tcf.newClient(tokenURL);
+               Result<TimedToken> rtt = tokenClient.getToken(scope);
+               if(rtt.isOK()) {
+                       restClient = tcf.newTzClient(endpoint);
+                       
+                       if((client_id = tcf.access.getProperty(Config.AAF_APPID, null))==null) {
+                               if((client_id = tcf.access.getProperty(Config.CADI_ALIAS, null))==null) {
+                                       throw new CadiException(Config.AAF_APPID + " or " + Config.CADI_ALIAS + " needs to be defined");
+                               }                               
+                       }
+                       try {
+                               restClient.setToken(client_id,rtt.value);
+                       } catch (IOException e) {
+                               throw new CadiException(e);
+                       }
+               } else {
+                       throw new CadiException(rtt.error);
+               }
+       }
+       
+       public SimpleRESTClient timeout(int newTimeout) {
+               callTimeout = newTimeout;
+               return this;
+       }
+
+       //Format:<ID>:<APP>:<protocol>[:AS][,<ID>:<APP>:<protocol>]*
+       public SimpleRESTClient as(Principal principal) {
+               if(principal==null) {
+                       chain = null;
+               } else {
+                       if(principal instanceof TaggedPrincipal) {
+                               TaggedPrincipal tp = (TaggedPrincipal)principal;
+                               chain = tp.getName() + ':' + (app==null?"":app) + ':' + tp.tag() + ":AS";
+                       } else {
+                               chain = principal.getName() + (app==null?"":':'+app);
+                       }
+               }
+               return this;
+       }
+       
+       public String get(final String path) throws CadiException, LocatorException, APIException  {
+               return get(path,"application/json");
+       }
+
+       public String get(final String path, final String accepts) throws CadiException, LocatorException, APIException  {
+               return restClient.best(new Retryable<String>() {
+                       @Override
+                       public String code(Rcli<?> client) throws CadiException, ConnectException, APIException {
+                               Future<String> future = client.read(path,accepts, headers());
+                               if(future.get(callTimeout)) {
+                                       return future.value;
+                               } else {
+                                       throw new APIException(future.code()  + future.body());
+                               }                                       
+                       }
+               });
+       }
+       
+       public interface Headers {
+               String[] headers();
+       }
+       
+       public String[] headers() {
+               if(chain==null) {
+                       return headers.headers();
+               } else {
+                       String[] strs = headers.headers();
+                       String[] rv = new String[strs.length+2];
+                       rv[0]=Config.CADI_USER_CHAIN;
+                       rv[1]=chain;
+                       for(int i = 0;i<strs.length;++i) {
+                               rv[i+2]=strs[i];
+                       }
+                       return rv;
+               }
+       }
+}
diff --git a/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/SimpleRestClientExample.java b/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/SimpleRestClientExample.java
new file mode 100644 (file)
index 0000000..7340618
--- /dev/null
@@ -0,0 +1,91 @@
+/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * ===========================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END====================================================
+ *
+ */
+
+package org.onap.aaf.cadi.enduser.test;
+
+import java.net.URISyntaxException;
+import java.security.Principal;
+
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.LocatorException;
+import org.onap.aaf.cadi.enduser.ClientFactory;
+import org.onap.aaf.cadi.enduser.SimpleRESTClient;
+import org.onap.aaf.misc.env.APIException;
+
+
+public class SimpleRestClientExample {
+       public final static void main(final String args[]) throws URISyntaxException, LocatorException {
+               try {
+                       // Note: Expect ClientFactory to be long-lived... do NOT create more than once.
+                       ClientFactory cf = new ClientFactory(args);
+                       
+       
+                       String urlString = cf.getAccess().getProperty("myurl", null);
+                       if(urlString==null) {
+                               System.out.println("Note: In your startup, add \"myurl=https://<aaf hello machine>:8130\" to command line\n\t"
+                                               + "OR\n\t" 
+                                               + " add -Dmyurl=https://<aaf hello machine>:8130 to VM Args\n\t"
+                                               + "where \"aaf hello machine\" is an aaf Installation you know about.");
+                       } else {
+                               SimpleRESTClient restClient = cf.simpleRESTClient(urlString,"org.osaaf.aaf");
+                               
+                               // Make some calls
+                               
+                               // Call with no Queries
+                               String rv = restClient.get("resthello");
+                               System.out.println(rv);
+                               
+                               // Call with Queries
+                               rv = restClient.get("resthello?perm=org.osaaf.people|*|read");
+                               System.out.println(rv);
+                               
+                               // Call setting ID from principal coming from Trans
+                               // Pretend Transaction
+                               HRequest req = new HRequest("demo@people.osaaf.org"); // Pretend Trans has Jonathan as Identity
+                               
+                               rv = restClient.as(req.userPrincipal()).get("resthello?perm=org.osaaf.people|*|read");
+                               System.out.println(rv);
+                       }                       
+               } catch (CadiException | APIException e) {
+                       e.printStackTrace();
+               }
+       }
+       
+       private static class HRequest { 
+               
+               public HRequest(String fqi) {
+                       name = fqi;
+               }
+               protected final String name;
+
+       // fake out HttpServletRequest, only for get Principal
+               public Principal userPrincipal() {
+                       return new Principal() {
+
+                               @Override
+                               public String getName() {
+                                       return name;
+                               }
+                               
+                       };
+               }
+       }
+}