Client/Client.iml

@@ -1,18 +1,28 @@
 <?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_8">
     <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" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test" 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" 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" />
+    <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" 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.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20140107" level="project" />
   </component>
 </module>

Client/pom.xml

@@ -10,6 +10,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>Client</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.mashape.unirest</groupId>
+            <artifactId>unirest-java</artifactId>
+            <version>1.4.9</version>
+        </dependency>
+    </dependencies>
 
 
 </project>

Client/src/main/java/SimpleShell.java

@@ -1,8 +1,12 @@
+import com.mashape.unirest.http.exceptions.UnirestException;
+import json_objects.Message;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class SimpleShell {
@@ -20,17 +24,19 @@ public class SimpleShell {
                 (new InputStreamReader(System.in));
 
         ProcessBuilder pb = new ProcessBuilder();
-        List<String> history = new ArrayList<String>();
+        List<String> history = new ArrayList<>();
         int index = 0;
+
         //we break out with <ctrl c>
         while (true) {
+
             //read what the user enters
             System.out.println("cmd? ");
             commandLine = console.readLine();
 
             //input parsed into array of strings(command and arguments)
             String[] commands = commandLine.split(" ");
-            List<String> list = new ArrayList<String>();
+            List<String> list = new ArrayList<>();
 
             //if the user entered a return, just loop again
             if (commandLine.equals(""))
@@ -46,8 +52,10 @@ public class SimpleShell {
                 list.add(commands[i]);
 
             }
+
             System.out.print(list); //***check to see if list was added correctly***
             history.addAll(list);
+
             try {
                 //display history of shell with index
                 if (list.get(list.size() - 1).equals("history")) {
@@ -66,11 +74,37 @@ public class SimpleShell {
                 }
 
                 // messages
-                if (list.contains("messages")) {
+                if (list.contains("messages") && list.size() == 2) {
+                    String results = "";
+                    try {
+                        results = webber.get_messages_id(list.get(1));
+                        } catch (Exception e) {
+                        System.out.println("Invalid ID. Try again.");
+                        }
+                    SimpleShell.prettyPrint(results);
+                    continue;
+                }
+
+                if (list.contains("messages") && list.size() == 1) {
                     String results = webber.get_messages();
                     SimpleShell.prettyPrint(results);
                     continue;
                 }
+
+                if (list.contains("send")) {
+                    if (list.size() < 3) {
+                        System.out.println("Proper syntax is: send your_github_id 'Hello World'");
+                    } else {
+                        String toId = "";
+
+                        Message msg = new Message();
+                        msg.setMessage(getString(list));
+                        msg.setFromid(list.get(1));
+                        String results = webber.send_id_message(list.get(1), msg);
+                        SimpleShell.prettyPrint(results);
+                        continue;
+                    }
+                }
                 // you need to add a bunch more.
 
                 //!! command returns the last command in history
@@ -100,14 +134,18 @@ public class SimpleShell {
                     System.out.println(line);
                 br.close();
 
-
             }
 
             //catch ioexception, output appropriate message, resume waiting for input
             catch (IOException e) {
                 System.out.println("Input Error, Please try again!");
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+            } catch (UnirestException e) {
+                e.printStackTrace();
             }
-            // So what, do you suppose, is the meaning of this comment?
+
+            // So what do you suppose is the meaning of this comment?
             /** The steps are:
              * 1. parse the input to obtain the command and any parameters
              * 2. create a ProcessBuilder object
@@ -121,4 +159,9 @@ public class SimpleShell {
 
     }
 
+    private static String getString(List<String> list) {
+        List<String> sublist = list.subList(2, list.size());
+        return String.join(" ", sublist);
+    }
+
 }

Client/src/main/java/YouAreEll.java

@@ -1,23 +1,100 @@
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mashape.unirest.http.HttpResponse;
+import com.mashape.unirest.http.JsonNode;
+import com.mashape.unirest.http.Unirest;
+import com.mashape.unirest.http.exceptions.UnirestException;
+import json_objects.Id;
+import json_objects.Message;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.List;
+import java.util.stream.Stream;
+
 public class YouAreEll {
 
+    ObjectMapper jacksonMapper = new ObjectMapper();
+
     YouAreEll() {
+        Unirest.setObjectMapper(new com.mashape.unirest.http.ObjectMapper() {
+            com.fasterxml.jackson.databind.ObjectMapper mapper
+                    = new com.fasterxml.jackson.databind.ObjectMapper();
+
+            public String writeValue(Object value) {
+                try {
+                    return mapper.writeValueAsString(value);
+                } catch (JsonProcessingException e) {
+                    e.printStackTrace();
+                }
+                return null;
+            }
+
+            public <T> T readValue(String value, Class<T> valueType) {
+                try {
+                    return mapper.readValue(value, valueType);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                return null;
+            }
+        });
     }
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws IOException, ClassNotFoundException {
         YouAreEll urlhandler = new YouAreEll();
-        System.out.println(urlhandler.MakeURLCall("/ids", "GET", ""));
-        System.out.println(urlhandler.MakeURLCall("/messages", "GET", ""));
+        System.out.println(urlhandler.get_ids());
+        System.out.println(urlhandler.get_messages());
+    }
+
+    public String get_ids() throws IOException, ClassNotFoundException {
+        return makeUrlCall("/ids", "GET", new TypeReference<List<Id>>(){});
+    }
+
+    public String get_messages() throws IOException, ClassNotFoundException {
+        return makeUrlCall("/messages", "GET", new TypeReference<List<Message>>(){});
+    }
+
+    public String get_messages_id(String id) throws IOException, ClassNotFoundException {
+        return makeUrlCall(String.format("/" + id + "/messages"), "GET", new TypeReference<List<Id>>(){});
+    }
+
+    public String send_id_message(String id, Message message) throws IOException, ClassNotFoundException, UnirestException {
+        return makePostCall(
+                String.format("/ids/" + id + "/messages"),
+                message
+        );
+    }
+
+    public String urlConcat(String mainurl) {
+        return "http://zipcode.rocks:8085" + mainurl;
     }
 
-    public String get_ids() {
-        return MakeURLCall("/ids", "GET", "");
+    public String makeUrlCall(String mainurl, String method, TypeReference javaClass) throws IOException, ClassNotFoundException {
+        return makeGetCall(mainurl, javaClass);
     }
 
-    public String get_messages() {
-        return MakeURLCall("/messages", "GET", "");
+    public String makeGetCall(String mainurl, TypeReference javaClass) throws ClassNotFoundException, IOException {
+        List<Object> results = jacksonMapper.readValue(new URL(urlConcat(mainurl)), javaClass);
+        System.out.println(jacksonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(javaClass));
+        return jacksonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(results);
     }
 
-    public String MakeURLCall(String mainurl, String method, String jpayload) {
-        return "nada";
+    public String makePostCall(String mainurl, Message messsage) throws ClassNotFoundException, IOException, UnirestException {
+        HttpResponse<JsonNode> post = Unirest.post(urlConcat(mainurl))
+                .header("accept", "application/json")
+                .header("Content-Type", "application/json")
+                .body(messsage)
+                .asJson();
+        return jacksonMapper.writeValueAsString(messsage);
     }
-}
+
+    public <T> Stream<T> makePayloadStream(String mainUrl, TypeReference javaClass) throws IOException {
+        List<T> results = jacksonMapper.readValue(new URL(urlConcat(mainUrl)), javaClass);
+        return results.stream();
+    }
+
+
+
+}

Client/src/main/java/json_objects/Id.java

@@ -0,0 +1,31 @@
+package json_objects;
+
+public class Id {
+    String userid;
+    String name;
+    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;
+    }
+}

Client/src/main/java/json_objects/Message.java

@@ -0,0 +1,49 @@
+package json_objects;
+
+public class Message {
+    String sequence;
+    String timestamp;
+    String fromid;
+    String toid;
+    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;
+    }
+}

README.md

@@ -19,7 +19,7 @@
 
 
 
-* You can send a message to the global timeline by POSTing a Message JSON object to the URL below.
+* You can send a message to the global timeline by POSTing a json_objects.Message JSON object to the URL below.
 	* If you leave the `to id` field empty, the message is `to the world`.
 	* If you fill out the the JSON template with a valid github_id in the `to id` field of the JSON payload, then that message is addressed to that friend.
 	* Yes, all messages can be seen by users of the system.
@@ -27,8 +27,8 @@
 
 
 
-* When you send a new Message or Id JSON object to the server, it records it, and fills in one or two fields. 
-	* A Message gets an assigned sequence number and a timestamp of when it was received by the server.
+* When you send a new json_objects.Message or json_objects.Id JSON object to the server, it records it, and fills in one or two fields. 
+	* A json_objects.Message gets an assigned sequence number and a timestamp of when it was received by the server.
 	* An ID object gets a "user id" field assigned to it.
 	* Any sequence number, timestamp or userid you put into a JSON template gets overwritten by the server when you POST it. 
 
@@ -95,7 +95,7 @@ and send it as the body of a POST request to  `http://zipcode.rocks:8085/ids/`
  
 ## Messages
 
-#### Message comands in shell
+#### json_objects.Message comands in shell
 in the shell
 * `messages` should return the last 20 messages, nicely formatted.
 * `messages your_github_id` should return the last 20 messages sent to you.

YouAreEll.iml

@@ -1,6 +1,6 @@
 <?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_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -8,8 +8,17 @@
     </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: com.fasterxml.jackson.core:jackson-databind:2.9.7" 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.7" 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.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20140107" level="project" />
   </component>
 </module>

pom.xml

@@ -4,6 +4,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
     <groupId>com.zipcoder.ZipChat</groupId>
     <artifactId>YouAreEll</artifactId>
     <packaging>pom</packaging>
@@ -16,7 +21,32 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.6</version>
+            <version>2.9.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mashape.unirest</groupId>
+            <artifactId>unirest-java</artifactId>
+            <version>1.4.9</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.3.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpasyncclient</artifactId>
+            <version>4.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.3.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20140107</version>
         </dependency>
     </dependencies>
 </project>