Merge 157716d57c00b9a6c8cb21e4a25dba3568ffbc8e into bd1fca498ef63809a3a7a9e8867a8c20219bafbb

Client/Client.iml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_9">
     <output url="file://$MODULE_DIR$/target/classes" />
     <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,11 @@
     <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" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:mockwebserver:3.10.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.bouncycastle:bcprov-jdk15on:1.50" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>

Client/src/main/java/Id.java

@@ -0,0 +1,60 @@
+
+public class Id {
+
+    private String id;
+    private String name;
+    private String github;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    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;
+    }
+
+    public Id(String id, String name, String github) {
+
+        this.id = id;
+        this.name = name;
+        this.github = github;
+
+    }
+
+    public Id(String name, String github) {
+        this.name = name;
+        this.github = github;
+    }
+
+    public Id() {
+
+    }
+
+    @Override
+    public String toString() {
+        return "Id{" +
+                "id='" + this.id + '\'' +
+                ", name='" + this.name + '\'' +
+                ", gitHubId='" + this.github + '\'' +
+                '}';
+    }
+}
+
+
+

Client/src/main/java/Message.java

@@ -0,0 +1,86 @@
+public class Message {
+
+    private String sequence;
+    private String timestamp;
+    private String fromid;
+    private String toid;
+    private String message;
+
+    public Message(String sequence) {
+        this.sequence = sequence;
+        this.timestamp = timestamp;
+        this.fromid = fromid;
+        this.toid = toid;
+        this.message = message;
+
+    }
+
+    public Message() {
+
+    }
+
+    public Message(String fromid, String toid, String message) {
+        this.fromid = fromid;
+        this.toid = toid;
+        this.message = message;
+    }
+
+    @Override
+    public String toString() {
+        return "Message{" +
+                "sequence='" + sequence + '\'' +
+                ", timestamp='" + timestamp + '\'' +
+                ", fromid='" + fromid + '\'' +
+                ", toid='" + toid + '\'' +
+                ", message='" + message + '\'' +
+                '}';
+    }
+
+    public Message(String fromid, String message) {
+        this.fromid = fromid;
+        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 getFormid() {
+        return fromid;
+    }
+
+    public void setFormid(String formid) {
+        this.fromid = formid;
+    }
+
+    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;
+    }
+}
+
+

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;
@@ -10,7 +12,15 @@ public class SimpleShell {
 
     public static void prettyPrint(String output) {
         // yep, make an effort to format things nicely, eh?
-        System.out.println(output);
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            Object json = mapper.readValue(output, Object.class);
+            String prettyPrintSets = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(json);
+            System.out.println(prettyPrintSets);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
     }
     public static void main(String[] args) throws java.io.IOException {
 
@@ -18,7 +28,7 @@ public class SimpleShell {
         String commandLine;
         BufferedReader console = new BufferedReader
                 (new InputStreamReader(System.in));
-
+        ObjectMapper objectMapper = new ObjectMapper();
         ProcessBuilder pb = new ProcessBuilder();
         List<String> history = new ArrayList<String>();
         int index = 0;
@@ -59,20 +69,50 @@ public class SimpleShell {
                 // Specific Commands.
 
                 // ids
-                if (list.contains("ids")) {
+                if (list.contains("ids") && list.size() == 1) {
                     String results = webber.get_ids();
                     SimpleShell.prettyPrint(results);
                     continue;
                 }
 
                 // messages
-                if (list.contains("messages")) {
+                if (list.contains("messages") && list.size() == 1) {
                     String results = webber.get_messages();
                     SimpleShell.prettyPrint(results);
                     continue;
                 }
                 // you need to add a bunch more.
 
+                if (list.contains("messages") && list.size() == 2) {
+                    String myGithub = list.get(1);
+                    String results = webber.MakeURLCall("/ids/" +  myGithub + "/messages",
+                            "GET", "");
+                    SimpleShell.prettyPrint(results);
+                    continue;
+                }
+
+                if (list.contains("send")) {
+                    String groupedMessage = "";
+                    if (list.get(list.size()-2).equals("to"));
+                    for (int i = 2; i < list.size()-2; i++) {
+                        groupedMessage += list.get(i) + " ";
+                    }
+                    String trimmedMessage = groupedMessage.trim();
+                    Message newMessage = new Message(list.get(1), list.get(list.size()-1), trimmedMessage);
+                    String newMessageInfo = objectMapper.writeValueAsString(newMessage);
+                    webber.MakeURLCall("/ids/" + list.get(1) + "/messages", "POST", newMessageInfo);
+                    SimpleShell.prettyPrint(newMessageInfo);
+                    continue;
+                }
+
+                if (list.contains("ids") && list.size() == 3) {
+                    String name = list.get(1);
+                    String gitHubId = list.get(2);
+                    Id newUserId = new Id(name, gitHubId);
+                    String newIdInfo = objectMapper.writeValueAsString(newUserId);
+                    webber.MakeURLCall("/ids", "POST", newIdInfo);
+                    continue;
+                }
                 //!! command returns the last command in history
                 if (list.get(list.size() - 1).equals("!!")) {
                     pb.command(history.get(history.size() - 2));
@@ -121,4 +161,5 @@ public class SimpleShell {
 
     }
 
-}
+}
+

Client/src/main/java/YouAreEll.java

@@ -1,5 +1,11 @@
+import okhttp3.*;
+
+import java.io.IOException;
+
 public class YouAreEll {
 
+    private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+
     YouAreEll() {
     }
 
@@ -17,7 +23,40 @@ public class YouAreEll {
         return MakeURLCall("/messages", "GET", "");
     }
 
-    public String MakeURLCall(String mainurl, String method, String jpayload) {
+    public String MakeURLCall (String mainurl, String method, String jpayload) {
+        String url = "http://zipcode.rocks:8085" + mainurl;
+        OkHttpClient client = new OkHttpClient();
+
+        if (method.equals("GET")) {
+            Request request = new Request.Builder().url(url).build();
+            try (Response response = client.newCall(request).execute()) {
+                return response.body().string();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        else if (method.equals("POST")) {
+            RequestBody body = RequestBody.create(JSON, jpayload);
+            Request request = new Request.Builder().url(url).post(body).build();
+            try (Response response = client.newCall(request).execute()) {
+                return response.body().string();
+            } catch (IOException e){
+                e.printStackTrace();
+            }
+        }
+        else if (method.equals("PUT")) {
+            RequestBody body = RequestBody.create(JSON, jpayload);
+            Request request = new Request.Builder().url(url).post(body).build();
+            try (Response response = client.newCall(request).execute()) {
+                return response.body().string();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
         return "nada";
     }
+
+
 }
+
+

YouAreEll.iml

@@ -11,5 +11,11 @@
     <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" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:mockwebserver:3.10.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.bouncycastle:bcprov-jdk15on:1.50" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>

pom.xml

@@ -18,5 +18,16 @@
             <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>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <version>3.10.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>