Merge eede5e792647a411f384af78da7169863fad409e 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_7">
     <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,14 @@
     <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" />
   </component>
 </module>

Client/pom.xml

@@ -10,6 +10,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>Client</artifactId>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 
 </project>

Client/src/main/java/IDs.java

@@ -0,0 +1,35 @@
+public class IDs {
+
+    private String userid;
+    private String name;
+    private String 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 "\n\nUserId = " + userid + "\nName = " + name + "\nGitHub = " + github;
+    }
+}

Client/src/main/java/Messages.java

@@ -0,0 +1,54 @@
+public class Messages {
+
+    private String sequence;
+    private String timestamp;
+    private String fromid;
+    private String toid;
+    private String 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 "\n\nSequence = " + sequence + "\nTime Stamp = " + timestamp + "\nFrom Id = " + fromid + "\nTo Id = " + toid
+                + "\nMessage = " + message;
+    }
+}

Client/src/main/java/SimpleShell.java

@@ -59,19 +59,48 @@ public class SimpleShell {
                 // Specific Commands.
 
                 // ids
-                if (list.contains("ids")) {
-                    String results = webber.get_ids();
-                    SimpleShell.prettyPrint(results);
+                if (list.get(0).equals("ids")) {
+                    if (list.size() > 1){
+                        webber.postID(list.get(1), list.get(2));
+                    } else {
+                        String results = webber.get_ids();
+                        SimpleShell.prettyPrint(results);
+                    }
                     continue;
                 }
 
                 // messages
-                if (list.contains("messages")) {
-                    String results = webber.get_messages();
-                    SimpleShell.prettyPrint(results);
+                if (list.get(0).equals("messages")) {
+                    if (list.size() >1) {
+                        String results = webber.get_messagesForId(list.get(1));
+                        SimpleShell.prettyPrint(results);
+                    } else {
+                        String results = webber.get_messages();
+                        SimpleShell.prettyPrint(results);
+                    }
                     continue;
                 }
+
                 // you need to add a bunch more.
+                if (list.get(0).equals("send") && list.get(list.size()-2).equals("to")) {
+                    StringBuilder message = new StringBuilder();
+                    for (int i = 2; i < list.size()-2; i++){
+                        message.append(list.get(i) + " ");
+                    }
+                    String results = webber.sendMessageToId(list.get(1), message.toString(), list.get(list.size()-1));
+                    SimpleShell.prettyPrint(results);
+                    continue;
+                }else if (list.get(0).equals("send")) {
+                    if (list.size() >1) {
+                        StringBuilder message = new StringBuilder();
+                        for (int i = 2; i < list.size(); i++){
+                            message.append(list.get(i) + " ");
+                        }
+                        String results = webber.sendMessage(list.get(1), message.toString());
+                        SimpleShell.prettyPrint(results);
+                    }
+                    continue;
+                }
 
                 //!! command returns the last command in history
                 if (list.get(list.size() - 1).equals("!!")) {

Client/src/main/java/YouAreEll.java

@@ -1,3 +1,11 @@
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mashape.unirest.http.Unirest;
+import com.mashape.unirest.http.exceptions.UnirestException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+
 public class YouAreEll {
 
     YouAreEll() {
@@ -10,14 +18,97 @@ public class YouAreEll {
     }
 
     public String get_ids() {
-        return MakeURLCall("/ids", "GET", "");
+        ObjectMapper jsonMapper = new ObjectMapper();
+        String jsonString = MakeURLCall("/ids", "GET", "");
+        try {
+            IDs[] iDSList = jsonMapper.readValue(jsonString, IDs[].class);
+            return Arrays.toString(iDSList);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public void postID(String name, String gitHubID){
+        String jsonPackage = "{ \"userid\": \"-\", \"name\": \"" + name + "\", \"github\": \"" + gitHubID + "\"}";
+        MakeURLCall("/ids", "PUT", jsonPackage);
     }
 
     public String get_messages() {
-        return MakeURLCall("/messages", "GET", "");
+        String jsonString = MakeURLCall("/messages", "GET", "");
+        String last20 = convertMessagesToString(jsonString);
+        if (last20 != null) return last20;
+        return null;
+    }
+
+    private String convertMessagesToString(String jsonString) {
+        ObjectMapper jsonMapper = new ObjectMapper();
+        try {
+            Messages[] messagesList = jsonMapper.readValue(jsonString, Messages[].class);
+            if (messagesList!=null) {
+                Messages[] last20 = Arrays.copyOf(messagesList, 20);
+                return getRidOfNulls(last20);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private String convertSingeMessageToString(String jsonString) {
+        ObjectMapper jsonMapper = new ObjectMapper();
+        try {
+            Messages message = jsonMapper.readValue(jsonString, Messages.class);
+            return message.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String get_messagesForId(String id) {
+        String jsonString = MakeURLCall("/ids/"+id+"/messages", "GET", "");
+        String last20 = convertMessagesToString(jsonString);
+        if (last20 != null) return last20;
+        return null;
+    }
+
+    public String sendMessage(String id, String message){
+        String jsonPackage = "{ \"sequence\": \"-\", \"timestamp\": \"2018-03-21T01:00:00.0Z\", \"fromid\": \"" +id + "\"," +
+                "\"toid\": \"\", \"message\": \"" + message + "\"}";
+        String returnedMessage = MakeURLCall("/ids/" + id + "/messages", "PUT", jsonPackage);
+        return convertSingeMessageToString(returnedMessage);
+    }
+
+    public String sendMessageToId(String fromId, String message, String toId){
+        String jsonPackage = "{ \"sequence\": \"-\", \"timestamp\": \"2018-03-21T01:00:00.0Z\", \"fromid\": \"" + fromId + "\"," +
+                "\"toid\": \""+toId+ "\", \"message\": \"" + message + "\"}";
+        String returnedString = MakeURLCall("/ids/" + fromId + "/messages", "PUT", jsonPackage);
+        return convertSingeMessageToString(returnedString);
     }
 
     public String MakeURLCall(String mainurl, String method, String jpayload) {
-        return "nada";
+
+        try {
+            if (method.equals("GET")) {
+                return Unirest.get("http://zipcode.rocks:8085" + mainurl).asString().getBody();
+            }
+            if (method.equals("PUT")){
+                return Unirest.post("http://zipcode.rocks:8085" + mainurl).body(jpayload).asString().getBody();
+            }
+        }catch (UnirestException e){
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private String getRidOfNulls(Messages[] messages){
+        ArrayList<Messages> returnArrayList = new ArrayList<>();
+        for (Messages message: messages) {
+            if (message!=null){
+                returnArrayList.add(message);
+            }
+        }
+        return returnArrayList.toString();
     }
 }

YouAreEll.iml

@@ -11,5 +11,14 @@
     <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" />
   </component>
 </module>

pom.xml

@@ -18,5 +18,10 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.8.6</version>
         </dependency>
+        <dependency>
+            <groupId>com.mashape.unirest</groupId>
+            <artifactId>unirest-java</artifactId>
+            <version>1.4.9</version>
+        </dependency>
     </dependencies>
 </project>