Merge 48723bff627630717c958dfaa616b7b777a45abc 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,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.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

@@ -11,5 +11,37 @@
 
     <artifactId>Client</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <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>
+        <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>

Client/src/main/java/Id.java

@@ -0,0 +1,58 @@
+import com.mashape.unirest.http.HttpResponse;
+import com.mashape.unirest.http.Unirest;
+import com.mashape.unirest.http.exceptions.UnirestException;
+
+public class Id {
+
+    private String userId;
+    private String name;
+    private String github;
+
+
+    public Id() throws UnirestException {
+    }
+
+    public Id(String name, String github) {
+        this.name = name;
+        this.github = github;
+    }
+
+    public Id(String userId, String name, String github) {
+        this.userId = userId;
+        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 "Id{" +
+                "userId:'" + userId + '\'' +
+                ", name:'" + name + '\'' +
+                ", github:'" + github + '\'' +
+                '}';
+    }
+}

Client/src/main/java/Message.java

@@ -0,0 +1,83 @@
+import com.mashape.unirest.http.exceptions.UnirestException;
+
+public class Message {
+
+
+    //final HttpResponse<String> MESSAGES = Unirest.get("http://zipcode.rocks:8085/messages").asString();
+
+    private String sequence;
+    private String timestamp;
+    private String fromid;
+    private String toid;
+    private String message;
+
+
+
+    public Message() throws UnirestException {
+    }
+
+    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 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 "Message{" +
+                "sequence:'" + sequence + '\'' +
+                ", timestamp:'" + timestamp + '\'' +
+                ", fromid:'" + fromid + '\'' +
+                ", toid:'" + toid + '\'' +
+                ", message:'" + message + '\'' +
+                '}';
+    }
+}

Client/src/main/java/SimpleShell.java

@@ -1,14 +1,27 @@
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mashape.unirest.http.HttpResponse;
+import com.mashape.unirest.http.Unirest;
+import com.mashape.unirest.http.exceptions.UnirestException;
+
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class SimpleShell {
 
 
-    public static void prettyPrint(String output) {
+
+    public SimpleShell() throws UnirestException {
+    }
+
+
+    public static void prettyPrint(String output) throws IOException {
         // yep, make an effort to format things nicely, eh?
         System.out.println(output);
     }
@@ -16,18 +29,25 @@ public class SimpleShell {
 
         YouAreEll webber = new YouAreEll();
         String commandLine;
-        BufferedReader console = new BufferedReader
-                (new InputStreamReader(System.in));
-
+        BufferedReader console = new BufferedReader(new InputStreamReader(System.in));
+        //ProcessBuilder class used to help create operating system process
         ProcessBuilder pb = new ProcessBuilder();
         List<String> history = new ArrayList<String>();
         int index = 0;
+        //REGEX
+        String post = "\\bPOST\\b.\\w\\w [a-z0-9_-]{3,16}$";
+        Pattern postPattern = Pattern.compile(post);
+        Matcher postMatcher = postPattern.matcher(post);
         //we break out with <ctrl c>
         while (true) {
             //read what the user enters
             System.out.println("cmd? ");
             commandLine = console.readLine();
 
+            if(commandLine.equals("help")){
+                System.out.println("history\t\t\tids\t\t\tmessages\nmessage-log\t\tPOST-id\t\tPOST-message\n");
+                continue;
+            }
             //input parsed into array of strings(command and arguments)
             String[] commands = commandLine.split(" ");
             List<String> list = new ArrayList<String>();
@@ -72,6 +92,32 @@ public class SimpleShell {
                     continue;
                 }
                 // you need to add a bunch more.
+                if(list.contains("message-log")){
+                    String results = webber.messageParse();
+                    SimpleShell.prettyPrint(results);
+                    continue;
+                }
+
+                if (list.contains("POST-id")) {
+                    System.out.println("What is your name?");
+                    String name = console.readLine();;
+                    System.out.println("What is your GitHub User ID?");
+                    String gitID = console.readLine();;
+                    webber.postId(name, gitID);
+                    continue;
+
+                }
+                if(list.contains("POST-message")){
+                    System.out.println("What is your GitHub User Id?");
+                    String fromGitID = console.readLine();;
+                    System.out.println("Who are you sending the message to?");
+                    String toGitID = console.readLine();;
+                    System.out.println("What is your message?");
+                    String message = console.readLine();;
+                    webber.postMessage(fromGitID, toGitID, message);
+                    continue;
+                }
+
 
                 //!! command returns the last command in history
                 if (list.get(list.size() - 1).equals("!!")) {
@@ -87,6 +133,9 @@ public class SimpleShell {
                 }
 
                 // wait, wait, what curiousness is this?
+                //Process class is an executing program
+                //Used to perform input, output, waiting for the process to complete,
+                //checking exit status of the pocess and destroying process
                 Process process = pb.start();
 
                 //obtain the input stream
@@ -116,6 +165,18 @@ public class SimpleShell {
              * 5. output the contents returned by the command
              */
 
+//            ProcessBuilder pb1 = new ProcessBuilder();
+//            pb1.start();
+//            OutputStream outputStream = new OutputStream() {
+//                @Override
+//                public void write(int b) throws IOException {
+//
+//                }
+//            };
+
+
+
+
         }
 
 

Client/src/main/java/YouAreEll.java

@@ -1,23 +1,102 @@
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+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;
+import com.mashape.unirest.request.HttpRequestWithBody;
+
+import java.io.IOException;
+import java.util.List;
+
 public class YouAreEll {
 
     YouAreEll() {
     }
 
-    public static void main(String[] args) {
+
+
+    public static void main(String[] args) throws IOException {
         YouAreEll urlhandler = new YouAreEll();
-        System.out.println(urlhandler.MakeURLCall("/ids", "GET", ""));
-        System.out.println(urlhandler.MakeURLCall("/messages", "GET", ""));
+     //   System.out.println(urlhandler.MakeURLCall("/ids", "GET", ""));
+      //  System.out.println(urlhandler.MakeURLCall("/messages", "GET", ""));
+     //   urlhandler.postId("Bo", "bell7692");
+     //   urlhandler.postMessage("bell7692", "kfennimore", "The best is yet to come");
+     // urlhandler.get_messages();
+        urlhandler.messageParse();
+
+
+    }
+    public void postId (String name, String githubID) throws JsonProcessingException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        Id myId = new Id(name, githubID);
+        String payload = objectMapper.writeValueAsString(myId);
+        MakeURLCall("/ids", "POST", payload);
+
     }
 
+    public void postMessage(String fromid, String toid, String message) throws JsonProcessingException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        Message myMessage = new Message(fromid, toid, message);
+        String payload = objectMapper.writeValueAsString(myMessage);
+        String url = "/ids/" +toid +"/messages";
+        MakeURLCall(url, "POST", payload);
+    }
     public String get_ids() {
         return MakeURLCall("/ids", "GET", "");
     }
 
+
+    public String messageParse() throws IOException {
+        String str = MakeURLCall("/messages", "GET", "");
+        ObjectMapper objectMapper = new ObjectMapper();
+        List<Message> message = objectMapper.readValue(str, new TypeReference<List<Message>>(){});
+
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < message.size(); i++) {
+            sb.append("Time: " +message.get(i).getTimestamp() + "\n");
+            sb.append("From: " +message.get(i).getFromid() + "\n");
+            sb.append("To: " +message.get(i).getToid() + "\n");
+            sb.append("Message: " +message.get(i).getMessage() + "\n\n");
+        }
+        System.out.println(sb.toString());
+        return sb.toString();
+
+    }
     public String get_messages() {
         return MakeURLCall("/messages", "GET", "");
     }
 
     public String MakeURLCall(String mainurl, String method, String jpayload) {
+        String url= "http://zipcode.rocks:8085" + mainurl;
+        GetRequest request = Unirest.get(url);
+        HttpRequestWithBody requestWithBody = Unirest.post(url);
+        HttpRequestWithBody requestWithBody1 = Unirest.put(url);
+
+        if(method.equals("GET")){
+            try {
+                return request.asJson().getBody().toString();
+            } catch (UnirestException e) {
+                e.printStackTrace();
+            }
+        }
+
+        else if(method.equals("POST")){
+            try {
+                return requestWithBody.body(jpayload).asJson().getBody().toString();
+            } catch (UnirestException e) {
+                e.printStackTrace();
+            }
+        }
+
+//        else if (method.equals("PUT")){
+//            try {
+//                return requestWithBody1.body(jpayload).asJson().getBody().toString();
+//            } catch (UnirestException e) {
+//                e.printStackTrace();
+//            }
+//        }
+
         return "nada";
     }
 }

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.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

@@ -18,5 +18,30 @@
             <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>
+        <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>