Merge 3b16646eb0c4f3a4c974eb00e08c5e8309bfec19 into 1ee920429b1ab2627f2bc0b8738939ba346daeda

Client/Client.iml

@@ -5,8 +5,6 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -14,5 +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.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

@@ -10,6 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>Client</artifactId>
-
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.8.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.10.0</version>
+        </dependency>
+    </dependencies>
 
 </project>

Client/src/main/java/Message.java

@@ -0,0 +1,68 @@
+public class Message {
+
+    private String sequence;
+    private String timeStamp;
+    private String fromId;
+    private String toId;
+    private String message;
+
+    public Message(String sequence, String fromId, String toId, String message) {
+        this.sequence = sequence;
+        this.fromId = fromId;
+        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;
+    }
+
+    public void setSequence(String sequence) {
+        this.sequence = sequence;
+    }
+
+    public String getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(String timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getFromId() {
+        return fromId;
+    }
+
+    public void setFromId(String fromId) {
+        this.fromId = fromId;
+    }
+
+    public String getToId() {
+        return toId;
+    }
+
+    public void setToId(String toId) {
+        this.toId = toId;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    @Override
+    public String toString(){
+        return "sequence: " + this.sequence +
+                "\ntimestamp: " + timeStamp +
+                "\nfromid: " + this.fromId +
+                "\ntoid: " + this.toId +
+                "\nmessage: " + this.message;
+    }
+}

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 {
 
@@ -25,7 +29,7 @@ public class SimpleShell {
         //we break out with <ctrl c>
         while (true) {
             //read what the user enters
-            System.out.println("cmd? ");
+            System.out.println("cmd?");
             commandLine = console.readLine();
 
             //input parsed into array of strings(command and arguments)
@@ -71,6 +75,34 @@ public class SimpleShell {
                     SimpleShell.prettyPrint(results);
                     continue;
                 }
+                if (list.get(0).equals("send")){
+                    if (list.get(2).equals("to")){
+                        ObjectMapper mapper = new ObjectMapper();
+                        String friend = list.get(3);
+                        String message = "";
+                        for (int i = 4; i < list.size(); i++){
+                            message += list.get(i) + " ";
+                        }
+                        String fromId = list.get(1);
+                        Message sendMessage = new Message(fromId, friend, message);
+                        String messageload = mapper.writeValueAsString(sendMessage);
+                        String results = webber.postMessage(messageload);
+                        SimpleShell.prettyPrint(results);
+                    }
+                    else {
+                        ObjectMapper mapper = new ObjectMapper();
+                        String message = "";
+                        for (int i = 2; i < list.size(); i++) {
+                            message += list.get(i) + " ";
+                        }
+                        String fromId = list.get(1);
+                        Message messages = new Message(fromId, "", message);
+                        String messageload = mapper.writeValueAsString(messages);
+                        String results = webber.postMessage(messageload);
+                        SimpleShell.prettyPrint(results);
+                    }
+                }
+
                 // you need to add a bunch more.
 
                 //!! command returns the last command in history

Client/src/main/java/UserId.java

@@ -0,0 +1,44 @@
+public class UserId {
+
+    private String userId;
+    private String name;
+    private String gitHub;
+
+    public UserId(String userId, String name, String gitHub) {
+        this.userId = userId;
+        this.name = name;
+        this.gitHub = gitHub;
+    }
+    public UserId(String name, String gitHub){
+        this.name = name;
+        this.gitHub = gitHub;
+    }
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getGitHub() {
+        return gitHub;
+    }
+
+    public void setGitHub(String gitHub) {
+        this.gitHub = gitHub;
+    }
+
+    @Override
+    public String toString(){
+        return String.format("User ID: %s, Name: %s, GitHub: %s", this.userId, this.name, this.gitHub);
+    }
+}

Client/src/main/java/YouAreEll.java

@@ -1,23 +1,78 @@
+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) throws IOException{
+        String fullUrl = url + mainurl;
+
+
+        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("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("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();
 
-    public String MakeURLCall(String mainurl, String method, String jpayload) {
-        return "nada";
+        }
+        return "invald method: " + method;
     }
 }