cmd works, but have to reformat with Pattern class

Client/src/main/java/Message.java

@@ -1,18 +1,14 @@
-import com.mashape.unirest.http.HttpResponse;
-import com.mashape.unirest.http.Unirest;
 import com.mashape.unirest.http.exceptions.UnirestException;
 
-import java.sql.Time;
-
 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 timestamp;
+    private String fromid;
+    private String toid;
     private String message;
 
 
@@ -20,17 +16,17 @@ public class Message {
     public Message() throws UnirestException {
     }
 
-    public Message(String sequence, String timeStamp, String fromId, String toId, 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.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;
+    public Message(String fromId, String toid, String message) {
+        this.fromid = fromId;
+        this.toid = toid;
         this.message = message;
     }
 
@@ -42,28 +38,28 @@ public class Message {
         this.sequence = sequence;
     }
 
-    public String getTimeStamp() {
-        return timeStamp;
+    public String getTimestamp() {
+        return timestamp;
     }
 
-    public void setTimeStamp(String timeStamp) {
-        this.timeStamp = timeStamp;
+    public void setTimestamp(String timestamp) {
+        this.timestamp = timestamp;
     }
 
-    public String getFromId() {
-        return fromId;
+    public String getFromid() {
+        return fromid;
     }
 
-    public void setFromId(String fromId) {
-        this.fromId = fromId;
+    public void setFromid(String fromid) {
+        this.fromid = fromid;
     }
 
-    public String getToId() {
-        return toId;
+    public String getToid() {
+        return toid;
     }
 
-    public void setToId(String toId) {
-        this.toId = toId;
+    public void setToid(String toid) {
+        this.toid = toid;
     }
 
     public String getMessage() {
@@ -78,9 +74,9 @@ public class Message {
     public String toString() {
         return "Message{" +
                 "sequence:'" + sequence + '\'' +
-                ", timeStamp:'" + timeStamp + '\'' +
-                ", fromId:'" + fromId + '\'' +
-                ", toId:'" + toId + '\'' +
+                ", timestamp:'" + timestamp + '\'' +
+                ", fromid:'" + fromid + '\'' +
+                ", toid:'" + toid + '\'' +
                 ", message:'" + message + '\'' +
                 '}';
     }

Client/src/main/java/SimpleShell.java

@@ -10,6 +10,8 @@ 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 {
 
@@ -20,11 +22,8 @@ public class SimpleShell {
 
 
     public static void prettyPrint(String output) throws IOException {
-        ObjectMapper objectMapper = new ObjectMapper();
-        Map<String, String> map = objectMapper.readValue(output, new TypeReference<Map<String, String>>(){});
-
         // yep, make an effort to format things nicely, eh?
-        System.out.println(map.toString());
+        System.out.println(output);
     }
     public static void main(String[] args) throws java.io.IOException {
 
@@ -35,12 +34,20 @@ public class SimpleShell {
         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>();
@@ -85,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("!!")) {

Client/src/main/java/YouAreEll.java

@@ -1,10 +1,14 @@
 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() {
@@ -12,13 +16,14 @@ public class YouAreEll {
 
 
 
-    public static void main(String[] args) throws JsonProcessingException {
+    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("/messages", "GET", ""));
      //   urlhandler.postId("Bo", "bell7692");
      //   urlhandler.postMessage("bell7692", "kfennimore", "The best is yet to come");
-        urlhandler.get_messages();
+     // urlhandler.get_messages();
+        urlhandler.messageParse();
 
 
     }
@@ -30,20 +35,34 @@ public class YouAreEll {
 
     }
 
-    public void postMessage(String fromId, String toId, String message) throws JsonProcessingException {
+    public void postMessage(String fromid, String toid, String message) throws JsonProcessingException {
         ObjectMapper objectMapper = new ObjectMapper();
-        Message myMessage = new Message(fromId, toId, message);
+        Message myMessage = new Message(fromid, toid, message);
         String payload = objectMapper.writeValueAsString(myMessage);
-        String url = "/ids/" +toId +"/messages";
+        String url = "/ids/" +toid +"/messages";
         MakeURLCall(url, "POST", payload);
     }
     public String get_ids() {
         return MakeURLCall("/ids", "GET", "");
     }
 
-//    public String get_20_messages(){
-//
-//    }
+
+    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", "");
     }