Finish RESTful Client API

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

1 files changed, 130 insertions, 20 deletions

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
index 7d251bad..6cabc654 100644
--- 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
@@ -21,6 +21,7 @@
 
 package org.onap.aaf.cadi.enduser.test;
 
+import java.io.PrintWriter;
 import java.net.URISyntaxException;
 import java.security.Principal;
 
@@ -29,6 +30,7 @@ import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.enduser.ClientFactory;
 import org.onap.aaf.cadi.enduser.RESTException;
 import org.onap.aaf.cadi.enduser.SimpleRESTClient;
+import org.onap.aaf.cadi.enduser.SimpleRESTClient.Input;
 import org.onap.aaf.misc.env.APIException;
 
 
@@ -46,32 +48,93 @@ public class SimpleRestClientExample {
 						+ " 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);
-				
-				// Same call with "read" style
-				rv = restClient.read("resthello");
-				System.out.println(rv);
+				SimpleRESTClient restClient = cf.simpleRESTClient(urlString,"org.osaaf.aaf");
+
+				/////////////////////////////////////////////////////////////
+				//  
+				// Creating Content for CREATE/UPDATE
+				//
+				/////////////////////////////////////////////////////////////
+				// Create an object that can be reusable IN THIS THREAD ONLY... Not Thread-safe on purpose
+				Input input = new SimpleRESTClient.Input();
 				
+				// Note: alternate use is to set the input object to an already created String
+				// Input input = new SimpleRESTClient.Input(aString);
 				
-				// Call with Queries
-				rv = restClient.get("resthello?perm=org.osaaf.people|*|read");
-				System.out.println(rv);
+				PrintWriter pw = input.writer();
+				pw.print("{\"something\": [");
+				for(int i=0;i<4;++i) {
+					if(i>0) {
+						pw.print(',');
+					}
+					pw.print("{\"myint\":");
+					pw.print(i);
+					pw.print('}');
+				}
+				pw.println("]}");
 				
-				// Call setting ID from principal coming from Trans
-				// Pretend Transaction
-				HRequest req = new HRequest("demo@people.osaaf.org"); // Pretend Trans has Jonathan as Identity
+				// You can check or log the content
+				String content = input.toString();
+				System.out.println(content);
 				
-				// Call with RESTException, which allows obtaining HTTPCode and any Error message sent
-				rv = restClient.endUser(req.userPrincipal()).get("resthello?perm=org.osaaf.people|*|read");
-				System.out.println(rv);
+				// Good form for Writers is that you should close it... 
+				pw.close();
+
+				/////////////////////////////////////////////////////////////
+				//  
+				// CREATE/POST
+				//
+				/////////////////////////////////////////////////////////////
+				System.out.println("-------- START REST CREATE/UPDATE --------");
+				try {
+					restClient.create("resthello/rest_id", input);
+					// No Error code, it worked.
+					System.out.println("No Error Code, Create worked...");
+				} catch (RESTException e) {
+					System.out.println(e.getCode());
+					System.out.println(e.getMsg());
+				} finally {
+					System.out.println("-------- END REST CREATE/UPDATE --------");
+				}
 
+
+				/////////////////////////////////////////////////////////////
+				//  
+				// READ/GET
+				//
+				/////////////////////////////////////////////////////////////
+
+				// Make some calls.  Note that RESTException is thrown if Call does not complete.
+				// RESTException has HTTP Code and any Message sent from Server
+				System.out.println("-------- START REST READ/GET --------");
+				boolean expectException = false;
 				try {
+					
+					// Call with no Queries
+					String rv = restClient.get("resthello/rest_id");
+					System.out.println(rv);
+					
+					// Same call with "read" style
+					rv = restClient.read("resthello/rest_id");
+					System.out.println(rv);
+					
+					
+					// Call with Queries
+					rv = restClient.get("resthello/rest_id?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
+					
+					// Call with RESTException, which allows obtaining HTTPCode and any Error message sent
+					rv = restClient.endUser(req.userPrincipal()).get("resthello/rest_id?perm=org.osaaf.people|*|read");
+					System.out.println(rv);
+
+					// Expect Exception here.
+					System.out.println("-------- START Expecting Exception starting here --------");
+					expectException = true;
 					restClient.get("notAnAPI");
 				} catch(RESTException e) {
 					System.out.println(e.getCode());
@@ -79,10 +142,57 @@ public class SimpleRestClientExample {
 					System.out.println(e.getMessage());
 					System.out.println(e.getLocalizedMessage());
 					System.out.println(e);
+				} finally {
+					if(expectException) {
+						System.out.println("-------- END Expecting Exception starting here --------");
+					}
+					System.out.println("-------- END REST READ/GET --------");
 				}
 
+				/////////////////////////////////////////////////////////////
+				//  
+				// UPDATE/PUT
+				//
+				/////////////////////////////////////////////////////////////
+
+				
+				// If you use "input" object again as a writer, you can clear it on the same thread, and go again
+				input.clear();
+				// Here we just set to a String, instead of Writing
+				input.set("{\"something\" : []}");
+				
+				System.out.println("-------- END REST UPDATE/PUT --------");
+				try {
+					String rv = restClient.update("resthello/rest_id", input);
+					// No Error code, it worked.  REST Update will return the updated Data
+					System.out.println("Update worked");
+					System.out.println(rv);
+				} catch (RESTException e) {
+					System.out.println(e.getCode());
+					System.out.println(e.getMsg());
+				} finally {
+					System.out.println("-------- END REST UPDATE/PUT --------");
+				}
+
+				/////////////////////////////////////////////////////////////
+				//  
+				// DELETE
+				//
+				/////////////////////////////////////////////////////////////
+
+				System.out.println("-------- START REST DELETE --------");
+				try {
+					restClient.delete("resthello/rest_id");
+					// No Error code, it worked.  REST Update will return the updated Data
+					System.out.println("Delete worked");
+				} catch (RESTException e) {
+					System.out.println(e.getCode());
+					System.out.println(e.getMsg());
+				} finally {
+					System.out.println("-------- END REST DELETE --------");
+				}
 			}			
-		} catch (CadiException | APIException | RESTException e) {
+		} catch (CadiException | APIException e) {
 			e.printStackTrace();
 		}
 	}