Merge 21d0ecac4bdee23d0bb0d3023448991063a5d37a into bd1fca498ef63809a3a7a9e8867a8c20219bafbb

Client/Client.iml

@@ -1,16 +1,22 @@
 <?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" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.9" 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.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient-cache:4.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:fluent-hc:4.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20140107" level="project" />
     <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" />

Client/pom.xml

@@ -10,6 +10,51 @@
     <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>
+    <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>4.5.5</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient-cache</artifactId>
+        <version>4.5.5</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpmime</artifactId>
+        <version>4.5.5</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>fluent-hc</artifactId>
+        <version>4.5.5</version>
+    </dependency>
+    <dependency>
+        <groupId>org.json</groupId>
+        <artifactId>json</artifactId>
+        <version>20140107</version>
+    </dependency>
+    <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>2.8.6</version>
+    </dependency>
+</dependencies>
 
 
 </project>

Client/src/main/java/Id.java

@@ -0,0 +1,40 @@
+public class Id {
+    private String userid;
+    private String name;
+    private String github;
+
+    public Id(){}
+
+    public Id(String userid, String name, String github){
+        this.userid=userid;
+        this.name=name;
+        this.github=github;
+    }
+
+    public Id(String name, String github){
+        this.userid="-";
+        this.name=name;
+        this.github=github;
+    }
+
+    public String getUserid() {
+        return userid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getGithub() {
+        return github;
+    }
+
+    @Override
+    public String toString(){
+        return String.format("Name: %-30s Github: %-30s ",this.name, this.github);
+    }
+
+
+
+
+}

Client/src/main/java/IdCommand.java

@@ -0,0 +1,11 @@
+public enum IdCommand {
+
+    GET_ALL,
+    POST_ID;
+
+
+
+
+
+
+}

Client/src/main/java/IdController.java

@@ -0,0 +1,47 @@
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+public class IdController implements Runnable {
+
+    private IdCommand command;
+    private String[] commands;
+
+
+    public IdController(IdCommand command, String commandLine){
+        this.command = command;
+        this.commands = commandLine.split(" ");
+    }
+
+    public IdController(IdCommand command){
+        this.command = command;
+    }
+
+
+    @Override
+    public void run() {
+        if(this.command.equals(IdCommand.GET_ALL)){
+            getAll();
+        }
+        else if (this.command.equals(IdCommand.POST_ID)){
+            postId();
+        }
+    }
+
+    private void getAll(){
+        SimpleShell.prettyPrint(YouAreEll.get_ids(), ObjectType.ID);
+    }
+
+    private void postId(){
+        String userName = commands[1];
+        String gitHub = commands[2];
+        try {
+            String payload = Mapper.mapper.writeValueAsString(new Id(userName, gitHub));
+            YouAreEll.MakeURLCall("/ids", "POST", payload);
+        }
+        catch(JsonProcessingException jpe){
+            System.out.println(jpe.getMessage());
+        }
+    }
+
+
+
+}

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

@@ -0,0 +1,61 @@
+public class Message {
+    String sequence;
+    String timestamp;
+    String fromid;
+    String toid;
+    String message;
+
+    public Message (){}
+
+
+    public Message(String fromid, String message){
+        this.sequence = "-";
+        this.timestamp="2018-03-21T01:00:00.0Z";
+        this.fromid = fromid;
+        this.toid = "";
+        this.message = message;
+    }
+
+    public Message(String fromid, String toid, String message){
+        this.sequence = "-";
+        this.timestamp="2018-03-21T01:00:00.0Z";
+        this.fromid = fromid;
+        this.toid = toid;
+        this.message = 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.message = message;
+    }
+
+    public String getSequence() {
+        return sequence;
+    }
+
+    public String getTimestamp() {
+        return timestamp;
+    }
+
+    public String getFromid() {
+        return fromid;
+    }
+
+    public String getToid() {
+        return toid;
+    }
+
+    public String getMessage() {
+        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/MessageCommand.java

@@ -0,0 +1,9 @@
+public enum MessageCommand {
+
+    GET_ALL,
+    GET_TO_SPECIFIC,
+    SEND,
+    WAIT;
+
+
+}

Client/src/main/java/MessageController.java

@@ -0,0 +1,76 @@
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class MessageController implements Runnable {
+
+    private MessageCommand command;
+    private String commandLine;
+    private String[] commands;
+
+    public MessageController(MessageCommand command, String commandLine){
+        this.command = command;
+        this.commandLine = commandLine;
+        this.commands = commandLine.split(" ");
+    }
+
+    @Override
+    public void run() {
+        if(command.equals(MessageCommand.GET_ALL)){
+            getAll();
+        }
+        else if (command.equals(MessageCommand.GET_TO_SPECIFIC)){
+            getToSpecific();
+        }
+        else if (command.equals(MessageCommand.SEND)){
+            sendMessage();
+        }
+        else if (command.equals(MessageCommand.WAIT)){
+            waitTest();
+        }
+
+    }
+
+    private void getAll(){
+        SimpleShell.prettyPrint(YouAreEll.get_messages(),ObjectType.MESSAGE);
+    }
+
+    private void getToSpecific(){
+        String id = commands[1];
+        SimpleShell.prettyPrint(YouAreEll.MakeURLCall("/ids/" + id + "/messages", "GET", ""), ObjectType.MESSAGE);
+    }
+
+    private void sendMessage(){
+        Pattern messageNoTo = Pattern.compile("'(.*)'");
+        Pattern messageTo = Pattern.compile("'(.*)' (to) (.*)");
+        Matcher withTo = messageTo.matcher(commandLine);
+        Matcher noTo = messageNoTo.matcher(commandLine);
+        String from = commands[1];
+        try {
+            if (withTo.find()) {
+                String to = withTo.group(3);
+                String payload = Mapper.mapper.writeValueAsString(new Message(from, to, withTo.group(1)));
+                YouAreEll.MakeURLCall("/ids/" + to + "/messages", "POST", payload);
+            } else if (noTo.find()) {
+                String payload = Mapper.mapper.writeValueAsString(new Message(from, noTo.group(1)));
+                YouAreEll.MakeURLCall("/ids/" + from + "/messages", "POST", payload);
+            } else System.out.println("Invalid message format");
+        }
+        catch(JsonProcessingException jpe){
+            System.out.println(jpe.getMessage());
+        }
+    }
+
+    private void waitTest(){
+        try {
+            Thread.sleep(20000);
+            System.out.println("Waking Up");
+        }
+        catch(InterruptedException ie){
+            System.out.println(ie.getMessage());
+        }
+    }
+
+
+}

Client/src/main/java/ObjectType.java

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

Client/src/main/java/SimpleShell.java

@@ -1,20 +1,46 @@
+import com.fasterxml.jackson.core.type.TypeReference;
+
 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");
+
     }
+
     public static void main(String[] args) throws java.io.IOException {
 
-        YouAreEll webber = new YouAreEll();
+        //YouAreEll webber = new YouAreEll();
         String commandLine;
         BufferedReader console = new BufferedReader
                 (new InputStreamReader(System.in));
@@ -41,11 +67,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,18 +81,33 @@ 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) {
+                        new Thread(new IdController(IdCommand.POST_ID,commandLine)).start();
+                    } else if (list.size() == 1) {
+                        new Thread(new IdController(IdCommand.GET_ALL)).start();
+                    } 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) {
+                        new Thread(new MessageController(MessageCommand.GET_TO_SPECIFIC, commandLine)).start();
+                    } else if (list.size() == 1) {
+                        new Thread(new MessageController(MessageCommand.GET_ALL, commandLine)).start();
+                    } else System.out.println("Invalid Command");
+                    continue;
+                }
+
+                if (list.get(0).equals("send")) {
+                    new Thread(new MessageController(MessageCommand.SEND, commandLine)).start();
                     continue;
                 }
+
+                if (list.get(0).equals("wait")) {
+                    new Thread(new MessageController(MessageCommand.WAIT, commandLine)).start();
+                }
                 // you need to add a bunch more.
 
                 //!! command returns the last command in history
@@ -86,7 +123,6 @@ public class SimpleShell {
                     pb.command(list);
                 }
 
-                // wait, wait, what curiousness is this?
                 Process process = pb.start();
 
                 //obtain the input stream
@@ -96,6 +132,7 @@ public class SimpleShell {
 
                 //read output of the process
                 String line;
+
                 while ((line = br.readLine()) != null)
                     System.out.println(line);
                 br.close();

Client/src/main/java/YouAreEll.java

@@ -1,23 +1,72 @@
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.http.client.fluent.Request;
+import org.apache.http.entity.ContentType;
+import java.io.IOException;
+
 public class YouAreEll {
 
+
+
     YouAreEll() {
     }
 
-    public static void main(String[] args) {
-        YouAreEll urlhandler = new YouAreEll();
-        System.out.println(urlhandler.MakeURLCall("/ids", "GET", ""));
-        System.out.println(urlhandler.MakeURLCall("/messages", "GET", ""));
-    }
+//    public static void main(String[] args) {
+//
+//        YouAreEll urlhandler = new YouAreEll();
+//        Id stinkyPete = new Id("Stinky Pete", "StinkyPete");
+//        try {
+//            String json = Mapper.mapper.writeValueAsString(stinkyPete);
+//            urlhandler.MakeURLCall("/ids", "PUT", json );
+//        }
+//        catch(JsonProcessingException jpe){
+//            System.out.println(jpe.getMessage());
+//        }
+//
+////        System.out.println(urlhandler.get_ids());
+////        System.out.println(urlhandler.get_messages());
+//    }
 
-    public String get_ids() {
+    public static String get_ids() {
         return MakeURLCall("/ids", "GET", "");
     }
 
-    public String get_messages() {
+    public static String get_messages() {
         return MakeURLCall("/messages", "GET", "");
     }
 
-    public String MakeURLCall(String mainurl, String method, String jpayload) {
+    public static String MakeURLCall(String mainurl, String method, String jpayload) {
+        String url = "http://zipcode.rocks:8085" + mainurl;
+
+        if(method.equals("GET")){
+            try{
+                return Request.Get(url).execute().returnContent().asString();
+            }
+            catch(IOException ioe){
+                System.out.println(ioe.getMessage());
+            }
+
+        }
+        else if (method.equals("POST")){
+            try {
+                return Request.Post(url)
+                        .bodyString(jpayload, ContentType.APPLICATION_JSON)
+                        .execute().returnContent().asString();
+            }
+            catch(IOException ioe){
+                System.out.println(ioe.getMessage());
+            }
+        }
+
+        else if (method.equals("PUT")){
+            try {
+                return Request.Put(url)
+                        .useExpectContinue().bodyString(jpayload, ContentType.APPLICATION_JSON)
+                        .execute().returnContent().asString();
+            }
+            catch(IOException ioe){
+                System.out.println(ioe.getMessage());
+            }
+        }
         return "nada";
     }
 }