messing with the methods

Client/src/main/java/CmdBuilder.java

@@ -8,7 +8,7 @@ public class  CmdBuilder {
         String name = cmdArr[1];
         String gitName = cmdArr[cmdArr.length-1];
 
-        return new JSONObject("{\"name\": \"" + name + "\",\"githubName\": \"" + gitName + "\"}");
+        return new JSONObject("{\"name\": \"" + name + "\",\"github\": \"" + gitName + "\"}");
 
     }
 }

Client/src/main/java/PrettyPrint.java

@@ -0,0 +1,35 @@
+import com.fasterxml.jackson.core.PrettyPrinter;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
+import ids.Id;
+
+import java.io.IOException;
+import java.util.List;
+
+public class PrettyPrint {
+
+    public PrettyPrint() {
+    }
+
+    public static void prettyPrintJsonArray(String output) throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.registerModule(new JsonOrgModule());
+
+        List<Id> idArray = mapper.readValue(output, new TypeReference<List<Id>>(){});
+
+        //Id idArray = mapper.readValue(output, Id.class);
+
+        System.out.println(idArray.toString());
+    }
+
+    public static void prettyPrintSingle(String output) throws IOException {
+
+        // Deserialize JSON string into Java class objects; assume JSONArray
+        ObjectMapper mapper = new ObjectMapper();
+        Object json = mapper.readValue(output, Id.class);
+        System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(json));
+//        mapper.registerModule(new JsonOrgModule());
+
+    }
+}

Client/src/main/java/SimpleShell.java

@@ -14,21 +14,6 @@ import java.util.List;
 public class SimpleShell {
 
 
-    public static void prettyPrint(String output) throws IOException {
-        // Assume it's a String
-        // yep, make an effort to format things nicely, eh?
-
-        // Deserialize JSON string into Java class objects; assume JSONArray
-
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.registerModule(new JsonOrgModule());
-
-        List<Id> idArray = mapper.readValue(output, new TypeReference<List<Id>>(){});
-
-        //Id idArray = mapper.readValue(output, Id.class);
-
-        System.out.println(idArray.toString());
-    }
     public static void main(String[] args) throws java.io.IOException {
 
         YouAreEll webber = new YouAreEll();
@@ -81,14 +66,14 @@ public class SimpleShell {
                 // ids
                 if (list.contains("ids")) {
                     String results = webber.get_ids();
-                    SimpleShell.prettyPrint(results);
+                    PrettyPrint.prettyPrintJsonArray(results);
                     continue;
                 }
 
                 // messages
                 if (list.contains("messages")) {
                     String results = webber.get_messages();
-                    SimpleShell.prettyPrint(results);
+                    PrettyPrint.prettyPrintJsonArray(results);
                     continue;
                 }
                 // you need to add a bunch more.

Client/src/main/java/YouAreEll.java

@@ -1,6 +1,6 @@
-import com.fasterxml.jackson.annotation.JsonValue;
 import ids.Id;
 import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
@@ -15,57 +15,60 @@ import java.io.InputStreamReader;
 public class YouAreEll {
     private HttpClient client;
     private final String baseUrl = "http://zipcode.rocks:8085";
+
     YouAreEll() {
         this.client = HttpClientBuilder.create().build();
     }
 
 
-
     public static void main(String[] args) throws IOException {
         YouAreEll urlhandler = new YouAreEll();
-        Id luna = new Id("ea795ee660116450ae935a1374166a142b263e64", "new-name", "new-github");
+        Id luna = new Id("ea795ee660116450ae935a1374166a142b263e64", "Reset-Me", "new-github");
 //        String response = urlhandler.MakeURLCall("/ids", "GET", "");
-        System.out.println(luna.toString());
-        String postResponse = urlhandler.MakeURLCall("/ids", "PUT", luna.toString());
+//        System.out.println(luna.toString());
+        String getResponse = urlhandler.get_ids();
+        PrettyPrint.prettyPrintJsonArray(getResponse);
         // this should be dematerialized to obtain info inside the json object
-        System.out.println(postResponse);
+//        PrettyPrint.prettyPrintSingle(postResponse);
         // multiple ids with the same github
         // with the put, how to update without knowing the id?
 //        SimpleShell.prettyPrint(postResponse);
-//      SimpleShell.prettyPrint("{\"userid\":\"\\\"\\\"\",\"name\":\"uhaushasuh\",\"githubName\":\"hasdhadhdash\"}");
-       // System.out.println(urlhandler.MakeURLCall("/messages", "GET", ""));
+//      SimpleShell.prettyPrint("{\"userid\":\"\\\"\\\"\",\"name\":\"uhaushasuh\",\"github\":\"hasdhadhdash\"}");
+        // System.out.println(urlhandler.MakeURLCall("/messages", "GET", ""));
     }
 
-    public String get_ids() {
+    public String get_ids() throws IOException {
         return MakeURLCall("/ids", "GET", "");
     }
 
-    public String get_messages() {
+    public String get_messages() throws IOException {
         return MakeURLCall("/messages", "GET", "");
     }
 
-    public String MakeURLCall(String mainurl, String method, String jpayload) {
-        switch(method) {
+    public String MakeURLCall(String mainurl, String method, String jpayload) throws IOException {
+        switch (method) {
             case "GET":
+
                 HttpGet request = new HttpGet(baseUrl + mainurl);
                 try {
+//                    request.setEntity(new StringEntity(jpayload));
                     HttpResponse response = client.execute(request);
-                    // response.getStatusLine().getStatusCode(); // 200 OK, 404 Not Found, etc.
-
                     BufferedReader rd = new BufferedReader(
                             new InputStreamReader(response.getEntity().getContent()));
 
+                    // response.getStatusLine().getStatusCode(); // 200 OK, 404 Not Found, etc.
                     StringBuilder responseString = new StringBuilder();
                     String line;
 
                     while ((line = rd.readLine()) != null) {
                         responseString.append(line);
                     }
-                    //System.out.println("response: " + responseString);
+
                     return responseString.toString();
-                } catch(IOException e) {
+                } catch (IOException e) {
                     return ("An unexpected IO error occurred: " + e.getMessage());
                 }
+
             case "POST":
                 HttpPost postReq = new HttpPost(baseUrl + mainurl);
                 try {
@@ -85,6 +88,7 @@ public class YouAreEll {
                 } catch (IOException e) {
                     return ("An unexpected IO error occurred: " + e.getMessage());
                 }
+
             case "PUT":
                 HttpPut putReq = new HttpPut(baseUrl + mainurl);
                 try {
@@ -108,4 +112,49 @@ public class YouAreEll {
                 return "nada";
         }
     }
+
+
+    private String getCall(String url) {
+
+        HttpGet request = new HttpGet("http://zipcode.rocks:8085/ids");
+        try {
+            HttpResponse response = client.execute(request);
+            return readCalls(response);
+        } catch (IOException e) {
+            return ("Unhandled Exception error");
+        }
+    }
+
+
+    public String postCall(HttpPost post, String payload) throws IOException {
+        try {
+            post.setEntity(new StringEntity(payload));
+            HttpResponse response = client.execute(post);
+            return readCalls(response);
+        } catch (IOException e) {
+            return ("An unexpected IO error occurred: " + e.getMessage());
+        }
+    }
+
+    private String readCalls(HttpResponse response) throws IOException {
+        try {
+        BufferedReader rd = new BufferedReader(
+                new InputStreamReader(response.getEntity().getContent()));
+
+        StringBuilder responseString = new StringBuilder();
+        String line;
+
+        while ((line = rd.readLine()) != null) {
+            responseString.append(line);
+        }
+
+            return responseString.toString();
+
+        } catch (IOException e) {
+            return ("An unexpected IO error occurred: " + e.getMessage());
+    }
+
+    }
 }
+
+

Client/src/main/java/ids/Id.java

@@ -1,7 +1,7 @@
 package ids;
 
 public class Id {
-    public String userid, name, githubName;
+    public String userid, name, github;
 
     public Id() {
         super();
@@ -10,7 +10,7 @@ public class Id {
     public Id(String userId, String name, String github) {
         this.userid = userId;
         this.name = name;
-        this.githubName = github;
+        this.github = github;
     }
 
     @Override
@@ -18,7 +18,7 @@ public class Id {
         return "\n{" +
                 "\n\t\"userid\": \"" + this.userid + "\"," +
                 "\n\t\"name\": \"" + this.name + "\"," +
-                "\n\t\"github\": \"" + this.githubName + "\"" +
+                "\n\t\"github\": \"" + this.github + "\"" +
                 "\n}";
     }
 }

Client/src/test/CmdBuilderTest.java

@@ -12,7 +12,7 @@ public class CmdBuilderTest {
 
         String[] cmdLine = cmd.split(" ");
 
-        String expected = (new JSONObject("{\"name\": \"" + cmdLine[1] + "\",\"githubName\": \"" + cmdLine[2] + "\"}")).toString();
+        String expected = (new JSONObject("{\"name\": \"" + cmdLine[1] + "\",\"github\": \"" + cmdLine[2] + "\"}")).toString();
         String actual = CmdBuilder.toPayload(cmdLine).toString();
 
         System.out.println(actual);