Merge 3b5226b056e5212ab42308c13bf75856a5674ca9 into 1ee920429b1ab2627f2bc0b8738939ba346daeda

Client/Client.iml

@@ -5,14 +5,22 @@
     <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" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <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: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.4" 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: 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" />
   </component>
 </module>

Client/pom.xml

@@ -10,6 +10,25 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>Client</artifactId>
+    <dependencies>
 
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.9.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mashape.unirest</groupId>
+            <artifactId>unirest-java</artifactId>
+            <version>1.4.9</version>
+        </dependency>
+
+    </dependencies>
 </project>

Client/src/main/java/Id.java

@@ -0,0 +1,46 @@
+public class Id {
+
+    private String userid;
+    private String name;
+    private String github;
+
+    public Id(String userId, String name, String github) {
+        this.userid = userId;
+        this.name = name;
+        this.github = github;
+    }
+
+    public Id(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 "UserId: " + this.userid + "Name: " + this.name + ", Github: " + this.github;
+    }
+}

Client/src/main/java/Message.java

@@ -0,0 +1,62 @@
+public class Message {
+
+    private String sequence;
+    private String timestamp;
+    private String fromid;
+    private String toid;
+    private String message;
+
+    public Message(String sequence, String timeStamp, String fromId, String toId, String message) {
+        this.sequence = sequence;
+        this.timestamp = timeStamp;
+        this.fromid = fromId;
+        this.toid = toId;
+        this.message = message;
+    }
+
+    public Message(String toId, String message, String fromId) {
+        this.toid = toId;
+        this.message = message;
+        this.fromid = fromId;
+    }
+
+    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;
+    }
+}

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,19 +12,28 @@ 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 indented = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(json);
+            System.out.println(indented);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
+
     public static void main(String[] args) throws java.io.IOException {
 
         YouAreEll webber = new YouAreEll();
         String commandLine;
-        BufferedReader console = new BufferedReader
-                (new InputStreamReader(System.in));
-
+        BufferedReader console = new BufferedReader(new InputStreamReader(System.in));
         ProcessBuilder pb = new ProcessBuilder();
         List<String> history = new ArrayList<String>();
+        ObjectMapper objectMapper = new ObjectMapper();
+
         int index = 0;
         //we break out with <ctrl c>
+
         while (true) {
             //read what the user enters
             System.out.println("cmd? ");
@@ -33,8 +44,10 @@ public class SimpleShell {
             List<String> list = new ArrayList<String>();
 
             //if the user entered a return, just loop again
-            if (commandLine.equals(""))
+            if (commandLine.equals("")) {
                 continue;
+            }
+
             if (commandLine.equals("exit")) {
                 System.out.println("bye!");
                 break;
@@ -57,7 +70,6 @@ public class SimpleShell {
                 }
 
                 // Specific Commands.
-
                 // ids
                 if (list.contains("ids")) {
                     String results = webber.get_ids();
@@ -66,12 +78,62 @@ public class SimpleShell {
                 }
 
                 // 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("ids") && list.size() == 3) {
+                    String name = list.get(1);
+                    String github = list.get(2);
+                    Id id = new Id(name, github);
+                    String idInfo = objectMapper.writeValueAsString(id);
+                    webber.MakeURLCall("/ids", "POST", idInfo);
+                    continue;
+                }
+
+                if(list.contains("messages") && list.size() == 2) {
+                    String results = webber.MakeURLCall("/ids/" + list.get(1) + "/messages", "GET", "");
+                    SimpleShell.prettyPrint(results);
+                    continue;
+                }
+
+                if(list.contains("send") && list.size() > 2 && !list.get(list.size() - 2).equals("to") && !list.get(list.size() - 3).contains("\'")) {
+                    StringBuilder message = new StringBuilder();
+                    String github = list.get(1);
+                    for(int i = 2; i < list.size(); i++) {
+                        if(i == 2) {
+                            message.append(list.get(i).substring(1) + " ");
+                        } else if(i == list.size() - 1) {
+                            message.append(list.get(i).substring(0, list.get(i).length() - 1));
+                        } else {
+                            message.append(list.get(i) + " ");
+                        }
+                    }
+                    Message messageToSend = new Message(list.get(1), message.toString(), "");
+                    String messageToString = objectMapper.writeValueAsString(messageToSend);
+                    webber.MakeURLCall("/ids/" + github + "/messages", "POST", messageToString);
+                    continue;
+                }
+                if(list.contains("send") && list.get(list.size() - 2).equals("to") && list.get(list.size() - 3).contains("\'")) {
+                    StringBuilder message = new StringBuilder();
+                    String fromid = list.get(1);
+                    String toid = list.get(list.size() - 1);
+                    for (int i = 2; i < list.size() - 2; i++) {
+                        if (i == 2) {
+                            message.append(list.get(i).substring(1) + " ");
+                        } else if (i == list.size() - 3) {
+                            message.append(list.get(i).substring(0, list.get(i).length() - 1));
+                        } else {
+                            message.append(list.get(i) + " ");
+                        }
+                    }
+                    Message messageToSend = new Message(toid, message.toString(), fromid);
+                    String messageToString = objectMapper.writeValueAsString(messageToSend);
+                    webber.MakeURLCall("/ids/" + toid + "/messages", "POST", messageToString);
+                    continue;
+                }
 
                 //!! command returns the last command in history
                 if (list.get(list.size() - 1).equals("!!")) {
@@ -87,7 +149,12 @@ public class SimpleShell {
                 }
 
                 // wait, wait, what curiousness is this?
-                Process process = pb.start();
+                Process process = null;
+                try {
+                    process = pb.start();
+                } catch(IOException e) {
+                    e.printStackTrace();
+                }
 
                 //obtain the input stream
                 InputStream is = process.getInputStream();

Client/src/main/java/YouAreEll.java

@@ -1,12 +1,36 @@
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mashape.unirest.http.Unirest;
+import com.mashape.unirest.http.exceptions.UnirestException;
+import com.mashape.unirest.request.GetRequest;
+
 public class YouAreEll {
 
     YouAreEll() {
     }
 
     public static void main(String[] args) {
+        ObjectMapper objectMapper = new ObjectMapper();
         YouAreEll urlhandler = new YouAreEll();
         System.out.println(urlhandler.MakeURLCall("/ids", "GET", ""));
         System.out.println(urlhandler.MakeURLCall("/messages", "GET", ""));
+
+        Id id = new Id("Brian", "bth1994TestAgain");
+        Message message = new Message("bth1994", "Pst", "bth1994");
+
+        try {
+            String idInfo = objectMapper.writeValueAsString(id);
+            urlhandler.MakeURLCall("/ids", "POST", idInfo);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            String messageInfo = objectMapper.writeValueAsString(message);
+            urlhandler.MakeURLCall("/ids/bth1994/messages", "POST", messageInfo);
+        } catch (JsonProcessingException e) {
+                e.printStackTrace();
+        }
     }
 
     public String get_ids() {
@@ -18,6 +42,22 @@ public class YouAreEll {
     }
 
     public String MakeURLCall(String mainurl, String method, String jpayload) {
+        String url = "http://zipcode.rocks:8085" + mainurl;
+        GetRequest request = Unirest.get(url);
+
+        if(method.equals("GET")) {
+            try {
+                return request.asJson().getBody().toString();
+            } catch (UnirestException ue) {
+                ue.printStackTrace();
+            }
+        } else if(method.equals("POST")) {
+            try {
+                return Unirest.post(url).body(jpayload).asJson().getBody().toString();
+            } catch (UnirestException ue) {
+                ue.printStackTrace();
+            }
+        }
         return "nada";
     }
 }