messages and ids sendable

Client/Client.iml

@@ -12,14 +12,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.6" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.4.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.10.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
   </component>
 </module>

Client/pom.xml

@@ -17,9 +17,9 @@
             <version>2.8.6</version>
         </dependency>
         <dependency>
-            <groupId>com.mashape.unirest</groupId>
-            <artifactId>unirest-java</artifactId>
-            <version>1.4.9</version>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.10.0</version>
         </dependency>
     </dependencies>
 

Client/src/main/java/Message.java

@@ -12,7 +12,11 @@ public class Message {
         this.toId = toId;
         this.message = message;
     }
-
+    public Message(String fromId, String toId, String message){
+        this.fromId = fromId;
+        this.toId = toId;
+        this.message = message;
+    }
     public String getSequence() {
         return sequence;
     }

Client/src/main/java/SimpleShell.java

@@ -1,3 +1,5 @@
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -8,9 +10,11 @@ import java.util.List;
 public class SimpleShell {
 
 
-    public static void prettyPrint(String output) {
+    public static void prettyPrint(String output) throws IOException {
         // yep, make an effort to format things nicely, eh?
-        System.out.println(output);
+        ObjectMapper objectMapper = new ObjectMapper();
+        Object json = objectMapper.readValue(output, Object.class);
+        System.out.println(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(json));
     }
     public static void main(String[] args) throws java.io.IOException {
 

Client/src/main/java/UserId.java

@@ -9,7 +9,10 @@ public class UserId {
         this.name = name;
         this.gitHub = gitHub;
     }
-
+    public UserId(String name, String gitHub){
+        this.name = name;
+        this.gitHub = gitHub;
+    }
     public String getUserId() {
         return userId;
     }

Client/src/main/java/YouAreEll.java

@@ -1,43 +1,78 @@
-import com.mashape.unirest.http.Unirest;
-import com.mashape.unirest.http.exceptions.UnirestException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import okhttp3.*;
+
+import java.io.IOException;
 
 public class YouAreEll {
 
     private String url = "http://zipcode.rocks:8085";
+    OkHttpClient client;
+    public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+    ObjectMapper objectMapper;
 
     YouAreEll() {
+        objectMapper = new ObjectMapper();
+         client = new OkHttpClient();
     }
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws IOException {
         YouAreEll urlhandler = new YouAreEll();
+        ObjectMapper mapper = new ObjectMapper();
+        UserId me = new UserId("Larry", "wulawrence");
+        String payload = mapper.writeValueAsString(me);
+//        urlhandler.MakeURLCall("/ids", "POST", payload);
+        Message message = new Message("wulawrence", "JoeHendricks415", "Look behind you");
+        String messageload = mapper.writeValueAsString(message);
+//        urlhandler.MakeURLCall("/ids/wulawrence/messages", "POST", messageload);
+
         System.out.println(urlhandler.MakeURLCall("/ids", "GET", ""));
         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 postName(String payload) throws IOException {
+        return MakeURLCall("/ids", "POST", payload);
+    }
+    public String postMessage(String payload) throws IOException {
+        return MakeURLCall("/ids/wulawrence/messages", "POST", payload);
+    }
+    public String putName(String payload) throws IOException {
+        return MakeURLCall("/ids", "PUT", payload);
+    }
+    public String putMessage(String payload) throws IOException {
+        return MakeURLCall("/ids/wulawrence/messages", "PUT", payload);
+    }
 
-    public String MakeURLCall(String mainurl, String method, String jpayload) {
+    public String MakeURLCall(String mainurl, String method, String jpayload) throws IOException{
         String fullUrl = url + mainurl;
 
-        if (method.equalsIgnoreCase("get")){
-            try {
-                return String.valueOf(Unirest.get(fullUrl).asString());
-            } catch (UnirestException e) {
-                e.printStackTrace();
-            }
+
+        if (method.equalsIgnoreCase("GET")){
+            RequestBody body = RequestBody.create(JSON, jpayload);
+            Request request = new Request.Builder().url(fullUrl).build();
+            Response response = client.newCall(request).execute();
+            return response.body().string();
         }
-        if (method.equalsIgnoreCase("put")){
+        if (method.equalsIgnoreCase("POST")){
+            RequestBody body = RequestBody.create(JSON, jpayload);
+            Request request = new Request.Builder().url(fullUrl).post(body).build();
+            Response response = client.newCall(request).execute();
+            return response.body().string();
 
         }
-        if (method.equalsIgnoreCase("post")){
+
+        if (method.equalsIgnoreCase("PUT")){
+            RequestBody body = RequestBody.create(JSON, jpayload);
+            Request request = new Request.Builder().url(fullUrl).put(body).build();
+            Response response = client.newCall(request).execute();
+            return response.body().string();
 
         }
-        return "nada";
+        return "invald method: " + method;
     }
 }