saving

Client/Client.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$">

Client/pom.xml

@@ -10,8 +10,20 @@
     <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.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-<dependencies>
+    <dependencies>
     <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>

Client/src/main/java/Id.java

@@ -3,6 +3,8 @@ public class Id {
     private String name;
     private String github;
 
+    public Id(){}
+
     public Id(String userid, String name, String github){
         this.userid=userid;
         this.name=name;
@@ -29,7 +31,7 @@ public class Id {
 
     @Override
     public String toString(){
-        return "User ID: " + this.userid + "Name: " + this.name +  "GitHub: " + this.github;
+        return String.format("Name: %-30s Github: %-30s ",this.name, this.github);
     }
 
 

Client/src/main/java/Mapper.java

@@ -0,0 +1,14 @@
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class Mapper {
+    public static ObjectMapper mapper;
+    private static Mapper ourInstance = new Mapper();
+
+    public static Mapper getInstance() {
+        return ourInstance;
+    }
+
+    private Mapper() {
+        mapper = new ObjectMapper();
+    }
+}

Client/src/main/java/Message.java

@@ -5,6 +5,9 @@ public class Message {
     String toid;
     String message;
 
+    public Message (){}
+
+
     public Message(String fromid, String message){
         this.sequence = "-";
         this.timestamp="2018-03-21T01:00:00.0Z";
@@ -49,5 +52,10 @@ public class Message {
         return message;
     }
 
+    @Override
+    public String toString(){
+        return String.format("TimeStamp: %-30s From: %-30s To: %-30s Message: %s ",this.timestamp, this.fromid, this.toid, this.message);
+    }
+
 
 }

Client/src/main/java/ObjectType.java

@@ -0,0 +1,6 @@
+public enum ObjectType {
+
+    MESSAGE,
+    ID;
+
+}

Client/src/main/java/SimpleShell.java

@@ -1,16 +1,54 @@
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JavaType;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class SimpleShell {
 
 
-    public static void prettyPrint(String output) {
+    public static void prettyPrint(String output, ObjectType type) {
         // yep, make an effort to format things nicely, eh?
-        System.out.println(output);
+
+        if(type.equals(ObjectType.MESSAGE)){
+            try {
+                ArrayList<Message> messages = Mapper.mapper.readValue(output, new TypeReference<ArrayList<Message>>() {});
+                System.out.println();
+                messages.forEach(System.out::println);
+            }
+            catch(IOException ioe){
+                System.out.println(ioe.getMessage());
+            }
+        }
+        else if (type.equals(ObjectType.ID)){
+            try {
+                ArrayList<Id> ids = Mapper.mapper.readValue(output, new TypeReference<ArrayList<Id>>() {});
+                System.out.println();
+                ids.forEach(System.out::println);
+            }
+            catch(IOException ioe){
+                System.out.println(ioe.getMessage());
+            }
+        }
+        else System.out.println("Something has gone wrong");
+
+//        try {
+//            ArrayList<JSONObject> messages = Mapper.mapper.readValue(output, new TypeReference<ArrayList<JSONObject>>() {});
+//            for(JSONObject j : messages){
+//                System.out.println(j);
+//            }
+//        }
+//        catch(IOException ioe){
+//            System.out.println(ioe.getMessage());
+//        }
+
     }
     public static void main(String[] args) throws java.io.IOException {
 
@@ -41,11 +79,7 @@ public class SimpleShell {
             }
 
             //loop through to see if parsing worked
-            for (int i = 0; i < commands.length; i++) {
-                //System.out.println(commands[i]); //***check to see if parsing/split worked***
-                list.add(commands[i]);
-
-            }
+            Collections.addAll(list, commands);
             System.out.print(list); //***check to see if list was added correctly***
             history.addAll(list);
             try {
@@ -59,16 +93,51 @@ 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()==3){
+                        String userName = list.get(1);
+                        String gitHub = list.get(2);
+                        String payload = Mapper.mapper.writeValueAsString(new Id(userName,gitHub));
+                        webber.MakeURLCall("/ids","POST", payload);
+                    }
+                    else if (list.size()==1) {
+                        String results = webber.get_ids();
+                        SimpleShell.prettyPrint(results, ObjectType.ID);
+                    }
+                    else System.out.println("Invalid Command");
                     continue;
                 }
 
                 // messages
-                if (list.contains("messages")) {
-                    String results = webber.get_messages();
-                    SimpleShell.prettyPrint(results);
+                if (list.get(0).equals("messages")) {
+                    if(list.size()==2){
+                        String id = list.get(1);
+                        SimpleShell.prettyPrint(webber.MakeURLCall("/ids/" + id + "/messages", "GET", ""),ObjectType.MESSAGE);
+                    }
+                    else if(list.size()==1) {
+                        String results = webber.get_messages();
+                        SimpleShell.prettyPrint(results, ObjectType.MESSAGE);
+                    }
+                    else System.out.println("Invalid Command");
+                    continue;
+                }
+
+                if(list.get(0).equals("send")){
+                    Pattern messageNoTo = Pattern.compile("'(.*)'");
+                    Pattern messageTo = Pattern.compile("'(.*)' (to) (.*)");
+                    Matcher withTo = messageTo.matcher(commandLine);
+                    Matcher noTo = messageNoTo.matcher(commandLine);
+                    String from = list.get(1);
+                    if(withTo.find()){
+                        String to = withTo.group(3);
+                        String payload = Mapper.mapper.writeValueAsString(new Message(from, to, withTo.group(1)));
+                        webber.MakeURLCall("/ids/" + to + "/messages", "POST", payload);
+                    }
+                    else if(noTo.find()) {
+                        String payload = Mapper.mapper.writeValueAsString(new Message(from, noTo.group(1)));
+                        webber.MakeURLCall("/ids/" + from + "/messages", "POST", payload);
+                    }
+                    else System.out.println("Invalid message format");
                     continue;
                 }
                 // you need to add a bunch more.

Client/src/main/java/YouAreEll.java

@@ -13,14 +13,13 @@ public class YouAreEll {
 
 
     YouAreEll() {
-
     }
 
     public static void main(String[] args) {
-        ObjectMapper mapper = new ObjectMapper();
+
         YouAreEll urlhandler = new YouAreEll();
-//        Id ericB = new Id("EricB", "EricBarnaba");
-//        Message testMessage = new Message("EricBarnaba", "Now that I've made contact with the world it's time for dinner!");
+//        Id stinkyPete = new Id("Stinky Pete", "StinkyPete");
+//        Message testMessage = new Message("EricBarnaba","JoeHendricks415", "Chicken on a BISCUIT");
 //        try {
 //            String json = mapper.writeValueAsString(testMessage);
 //            urlhandler.MakeURLCall("/ids/EricBarnaba/messages", "POST", json );
@@ -30,8 +29,8 @@ public class YouAreEll {
 //            System.out.println(jpe.getMessage());
 //        }
 
-        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() {