Update REST Samples for required behavior

Issue-ID: AAF-361
Change-Id: Ia6dabfa3eeec2253c3f017ddc2d70afe4afbd54b
Signed-off-by: Instrumental <jonathan.gathman@att.com>

3 files changed, 93 insertions, 2 deletions

diff --git a/cadi/oauth-enduser/src/test/java/com/att/cadi/enduser/OAuthExample.java b/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OAuthExample.java
index c79c2fe6..39e7b5b6 100644
--- a/cadi/oauth-enduser/src/test/java/com/att/cadi/enduser/OAuthExample.java
+++ b/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OAuthExample.java
@@ -19,7 +19,7 @@
  *
  */
 
-package com.att.cadi.enduser;
+package org.onap.aaf.cadi.enduser.test;
 
 import java.io.IOException;
 import java.net.ConnectException;
diff --git a/cadi/oauth-enduser/src/test/java/com/att/cadi/enduser/OnapClientExample.java b/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OnapClientExample.java
index ca1bb948..441be4d2 100644
--- a/cadi/oauth-enduser/src/test/java/com/att/cadi/enduser/OnapClientExample.java
+++ b/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OnapClientExample.java
@@ -19,7 +19,7 @@
  *
  */
 
-package com.att.cadi.enduser;
+package org.onap.aaf.cadi.enduser.test;
 
 import java.io.IOException;
 import java.net.ConnectException;
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
index 00000000..7340618f
--- /dev/null
+++ b/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/SimpleRestClientExample.java
@@ -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;
+				}
+				
+			};
+		}
+	}
+}