Merge 8492ca235ecb795c800d3bd9d36c64182316753b into bd1fca498ef63809a3a7a9e8867a8c20219bafbb

Client/Client.iml

@@ -1,18 +1,18 @@
 <?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: 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-core:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.10.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
   </component>
 </module>

Client/pom.xml

@@ -10,6 +10,25 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>Client</artifactId>
-
-
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.9.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.9.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.10.0</version>
+        </dependency>
+    </dependencies>
 </project>

Client/src/main/java/Id.java

@@ -0,0 +1,49 @@
+
+
+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 void setId(String id) {
+        this.userid = id;
+    }
+
+    public String getuserid() {
+        return userid;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setGithub(String github) {
+        this.github = github;
+    }
+
+    public String getGithub() {
+        return github;
+    }
+
+    @Override
+    public String toString(){
+        return "userid: " + getuserid() + ", name: " + getName() + ", github: " + getGithub();
+    }
+
+}
+

Client/src/main/java/IdController.java

@@ -0,0 +1,31 @@
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+public class IdController implements IdInterface {
+    ObjectMapper objectMapper = new ObjectMapper();
+    YouAreEll youAreEll = new YouAreEll();
+
+    @Override
+    public String get_ids(ArrayList<String> list) throws com.fasterxml.jackson.core.JsonProcessingException {
+        Id id = new Id("-","","");
+        String payload = objectMapper.writeValueAsString(id);
+        return youAreEll.makeURLCall("/ids", "GET", payload);
+    }
+
+    @Override
+    public String saveId(ArrayList<String> list) throws com.fasterxml.jackson.core.JsonProcessingException {
+        String name = list.get(1);
+        String github = list.get(2);
+        Id id = new Id("-", name, github);
+        String payload = objectMapper.writeValueAsString(id);
+       return youAreEll.makeURLCall("/ids", "POST", payload);
+    }
+
+
+}
+//    String me = list.get(1);
+//    Message message = new Message("-", me,"","");
+//    String payload = objectMapper.writeValueAsString(message);
+//        return youAreEll.makeURLCall("/messages", "GET", payload);

Client/src/main/java/IdInterface.java

@@ -0,0 +1,7 @@
+import java.io.IOException;
+import java.util.ArrayList;
+
+public interface IdInterface {
+    String get_ids(ArrayList<String> list) throws IOException;
+    String saveId(ArrayList<String> list) throws IOException;
+}

Client/src/main/java/Message.java

@@ -0,0 +1,79 @@
+
+
+public class Message {
+
+    private String sequence;
+    private String timestamp;
+    private String fromid;
+    private String toid;
+    private String message;
+
+    public Message(){
+    }
+
+    public Message(String sequence, String fromid, String toid, String message) {
+        this.sequence = sequence;
+        this.timestamp = "2018-03-22T01:00:00.0Z";
+        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 Message(String fromid, String message){
+        this.fromid = fromid;
+        this.message = message;
+    }
+
+    public void setSequence(String sequence) {
+        this.sequence = sequence;
+    }
+
+    public String getSequence() {
+        return sequence;
+    }
+
+    public void setTimestamp(String timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getTimestamp() {
+        return timestamp;
+    }
+
+    public void setFromid(String fromid) {
+        this.fromid = fromid;
+    }
+
+    public String getFromid() {
+        return fromid;
+    }
+
+    public void setToid(String toid) {
+        this.toid = toid;
+    }
+
+    public String getToid() {
+        return toid;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    @Override
+    public String toString(){
+        return "sequence: " + getSequence() + ", timestamp: " + getTimestamp()+ ", from: " + getFromid() + ", to: " + getToid() + ", message: " + getMessage();
+    }
+}
+
+

Client/src/main/java/MessageController.java

@@ -0,0 +1,74 @@
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+public class MessageController implements MessageInterface {
+
+    private YouAreEll youAreEll = new YouAreEll();
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+
+    @Override
+    public String get_messages(ArrayList<String> list) throws JsonProcessingException {
+        String payload = "";
+        Message message = new Message("-", "","","");
+        try {
+            payload = objectMapper.writeValueAsString(message);
+        } catch(JsonProcessingException e){
+            e.printStackTrace();
+        }
+        return youAreEll.makeURLCall("/messages", "GET", payload);
+    }
+
+    @Override
+    public String get_from_friend(ArrayList<String> list) throws JsonProcessingException  {
+//         /ids/:mygithubid/from/:friendgithubid
+        return null;
+    }
+
+    @Override
+    public String get_my_messages(ArrayList<String> list) {
+       String payload = "";
+        String me = list.get(1);
+        Message message = new Message("-", me, "", "");
+        String url = "/ids/:" + me + "/messages";
+        try {
+            payload = objectMapper.writeValueAsString(message);
+        } catch(JsonProcessingException e){
+            e.printStackTrace();
+        }
+        return youAreEll.makeURLCall(url, "GET", payload);
+    }
+
+    @Override
+    public String post_world(ArrayList<String> list){
+        String payload = "";
+        String mess = list.get(1);
+        String me = list.get(2);
+        Message message = new Message("-", me, "", mess);
+        String url = "/ids/:" + me + "/messages";
+        try {
+            payload = objectMapper.writeValueAsString(message);
+        } catch (com.fasterxml.jackson.core.JsonProcessingException e){
+            e.printStackTrace();
+        }
+        return youAreEll.makeURLCall(url, "POST", payload);
+    }
+
+    @Override
+    public String post_friend(ArrayList<String> list) {
+        String mess = list.get(1);
+        String me = list.get(2);
+        String friend = list.get(3);
+        String payload = "";
+        Message message = new Message("-", me, friend, mess);
+        try {
+            payload = objectMapper.writeValueAsString(message);
+        } catch(JsonProcessingException e){
+            e.printStackTrace();
+        }
+        return youAreEll.makeURLCall("/messages","POST", payload);
+    }
+}

Client/src/main/java/MessageInterface.java

@@ -0,0 +1,12 @@
+import java.io.IOException;
+import java.util.ArrayList;
+
+public interface MessageInterface {
+
+    String get_messages(ArrayList<String> list)throws IOException;
+    String get_from_friend(ArrayList<String> list)throws IOException;
+    String get_my_messages(ArrayList<String> list)throws IOException;
+    String post_world(ArrayList<String> list)throws IOException;
+    String post_friend(ArrayList<String> list)throws IOException;
+
+}

Client/src/main/java/SimpleShell.java

@@ -3,15 +3,51 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class SimpleShell {
 
 
-    public static void prettyPrint(String output) {
-        // yep, make an effort to format things nicely, eh?
-        System.out.println(output);
+    public static void prettyPrintId(String output) {
+        ObjectMapper objectMapper = new ObjectMapper();
+        String result = "";
+        Id[] users = null;
+        try {
+             users= objectMapper.readValue(output, Id[].class);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        for(Id user: users){
+            result += "name: " + user.getName() + ", github: " + user.getGithub() + "\n";
+        }
+        System.out.println(result);
     }
+
+    public static void prettyPrintMessage(String output){
+        ObjectMapper objectMapper = new ObjectMapper();
+        String result = "";
+        Message[] messages = null;
+        try {
+            messages = objectMapper.readValue(output, Message[].class);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        for(Message mess: messages){
+            if(mess.getToid().equals("")) {
+                result += "from: " + mess.getFromid() + ", message: " + mess.getMessage() + "\n";
+            }
+            if(!mess.getToid().equals("")) {
+                result += "from: " + mess.getFromid() + ", to: " + mess.getToid() + ", message: " + mess.getMessage() + "\n";
+            }
+        }
+        System.out.println(result);
+    }
+    
     public static void main(String[] args) throws java.io.IOException {
 
         YouAreEll webber = new YouAreEll();
@@ -19,86 +55,144 @@ public class SimpleShell {
         BufferedReader console = new BufferedReader
                 (new InputStreamReader(System.in));
 
-        ProcessBuilder pb = new ProcessBuilder();
-        List<String> history = new ArrayList<String>();
+        ProcessBuilder processBuilder = new ProcessBuilder();
+        List<String> userInputHistory = new ArrayList<>();
         int index = 0;
+
         //we break out with <ctrl c>
         while (true) {
-            //read what the user enters
-            System.out.println("cmd? ");
+            System.out.println("To receive all registered github ids, register a new id, or change the associated name, type 'ids'.\n" +
+                    "To get messages, type 'messages'. \nTo send a message, type 'send'.\n" +
+                    "To receive a history of previous commands, type 'history'.\n" +
+                    "To exit, type exit. ");
             commandLine = console.readLine();
-
-            //input parsed into array of strings(command and arguments)
-            String[] commands = commandLine.split(" ");
-            List<String> list = new ArrayList<String>();
-
-            //if the user entered a return, just loop again
-            if (commandLine.equals(""))
-                continue;
+            if (commandLine.equals("")) continue;
             if (commandLine.equals("exit")) {
-                System.out.println("bye!");
+                System.out.println("Goodbye");
                 break;
             }
 
-            //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]);
-
-            }
-            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")) {
-                    for (String s : history)
-                        System.out.println((index++) + " " + s);
-                    continue;
+                String specificCommand = "";
+                ArrayList<String> commandList = new ArrayList<>();
+                commandList.add(commandLine);
+                MessageController mesCont = new MessageController();
+                IdController idCont = new IdController();
+
+                if (commandLine.equalsIgnoreCase("ids")) {
+                    String results = "";
+                    System.out.println("To retrieve all registered github ids, press enter\n" +
+                            "To register a new id or change the name associated, type your name");
+                    specificCommand = console.readLine();
+                    if(specificCommand.equals("")) {
+                        results = idCont.get_ids(commandList);
+                    } else {
+                        commandList.add(specificCommand);
+                        System.out.println("Please enter your github id");
+                        specificCommand = console.readLine();
+                        commandList.add(specificCommand);
+                        results = idCont.saveId(commandList);
+                    }
+                    SimpleShell.prettyPrintId(results);
+                    System.out.println("To enter another command, press enter.  To exit, type exit.");
+                    commandLine = console.readLine();
+                    if (commandLine.equals("")) continue;
+                    if (commandLine.equals("exit")) {
+                        System.out.println("Goodbye");
+                        break;
+                    }
                 }
 
-                // Specific Commands.
+                if (commandLine.equals("messages")) {
+                    String results = "";
+                    System.out.println("To retrieve the last 20 messages posted on the timeline, press enter\n" +
+                            "To retrieve the last twenty messages sent to you enter your github id");
+                    specificCommand = console.readLine();
+                    if(specificCommand.equals("\n") || specificCommand.equals("")) {
+                        results = mesCont.get_messages(commandList);
+                    } else {
+                        commandList.add(specificCommand);
+                        results = mesCont.get_my_messages(commandList);
+                    }
+                    SimpleShell.prettyPrintMessage(results);
+                    System.out.println("To enter another command, press enter.  To exit, type exit.");
+                    commandLine = console.readLine();
+                    if (commandLine.equals("")) continue;
+                    if (commandLine.equals("exit")) {
+                        System.out.println("Goodbye");
+                        break;
+                    }
+                }
 
-                // ids
-                if (list.contains("ids")) {
-                    String results = webber.get_ids();
-                    SimpleShell.prettyPrint(results);
-                    continue;
+
+                if(commandLine.equalsIgnoreCase("send")){
+                    String results = "";
+                    System.out.println("Please enter your message");
+                    specificCommand = console.readLine();
+                    if(!specificCommand.equals("")) {
+                        commandList.add(specificCommand);
+                    }
+                    System.out.println(("Enter your github id"));
+                    specificCommand = console.readLine();
+                    if(!specificCommand.equals("")) {
+                        commandList.add(specificCommand);
+                        results = mesCont.post_world(commandList);
+                    }
+                    System.out.println(("If you wish to send your message to another github user, enter their github id." +
+                            "If you wish to send a general message to the timeline, press enter"));
+                    if (specificCommand.equals("")) {
+                        results = mesCont.post_world(commandList);
+                    }
+                    if(!specificCommand.equals("")) {
+                        commandList.add(specificCommand);
+                        results = mesCont.post_friend(commandList);
+                    }
+                    SimpleShell.prettyPrintMessage(results);
+                    System.out.println("To enter another command, press enter.  To exit, type exit.");
+                    commandLine = console.readLine();
+                    if (commandLine.equals("")) continue;
+                    if (commandLine.equals("exit")) {
+                        System.out.println("Goodbye");
+                        break;
+                    }
                 }
 
-                // messages
-                if (list.contains("messages")) {
-                    String results = webber.get_messages();
-                    SimpleShell.prettyPrint(results);
+
+                //print history, moved it here so full commands will be in history
+                userInputHistory.addAll(commandList);
+                if (commandLine.equalsIgnoreCase("history")) {
+                    for (String s : userInputHistory)
+                        System.out.println((index++) + " " + s);
                     continue;
                 }
-                // you need to add a bunch more.
 
-                //!! command returns the last command in history
-                if (list.get(list.size() - 1).equals("!!")) {
-                    pb.command(history.get(history.size() - 2));
 
-                }//!<integer value i> command
-                else if (list.get(list.size() - 1).charAt(0) == '!') {
-                    int b = Character.getNumericValue(list.get(list.size() - 1).charAt(1));
-                    if (b <= history.size())//check if integer entered isn't bigger than history size
-                        pb.command(history.get(b));
+                //the !! command returns the last command in userInputHistory
+                if (commandList.get(commandList.size() - 1).equals("!!")) {
+                    processBuilder.command(userInputHistory.get(userInputHistory.size() - 2));
+                }
+                // !<integer value i> command
+                else if (commandList.get(commandList.size() - 1).charAt(0) == '!') {
+                    int b = Character.getNumericValue(commandList.get(commandList.size() - 1).charAt(1));
+                    if (b <= userInputHistory.size())
+                        processBuilder.command(userInputHistory.get(b));
                 } else {
-                    pb.command(list);
+                    processBuilder.command(commandList);
                 }
 
                 // wait, wait, what curiousness is this?
-                Process process = pb.start();
+                Process process = processBuilder.start();
 
                 //obtain the input stream
                 InputStream is = process.getInputStream();
                 InputStreamReader isr = new InputStreamReader(is);
-                BufferedReader br = new BufferedReader(isr);
+                BufferedReader reader = new BufferedReader(isr);
 
                 //read output of the process
                 String line;
-                while ((line = br.readLine()) != null)
+                while ((line = reader.readLine()) != null)
                     System.out.println(line);
-                br.close();
+                reader.close();
 
 
             }

Client/src/main/java/YouAreEll.java

@@ -1,23 +1,54 @@
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.*;
+import okhttp3.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+
+import java.io.IOException;
+
+
+
 public class YouAreEll {
+    private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
 
     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", ""));
+        ObjectMapper objectMapper = new ObjectMapper();
+        String payload = "";
+        Id id = new Id("-", "Carolynn", "me");
+        try {
+            payload = objectMapper.writeValueAsString(id);
+            urlhandler.makeURLCall("/ids", "POST", payload);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+//        System.out.println(urlhandler.makeURLCall("/ids", "POST", payload));
+//        System.out.println(urlhandler.makeURLCall("/messages", "GET", ""));
     }
 
-    public String get_ids() {
-        return MakeURLCall("/ids", "GET", "");
-    }
 
-    public String get_messages() {
-        return MakeURLCall("/messages", "GET", "");
-    }
+    public String makeURLCall(String mainurl, String method, String jpayload) {
+        OkHttpClient okHttpClient = new OkHttpClient();
+        String fullUrl = "http://zipcode.rocks:8085" + mainurl;
+        Request request = null;
+        if (method.equalsIgnoreCase("get")) {
+            request = new Request.Builder().url(fullUrl).build();
+        }
+        if (method.equalsIgnoreCase("post")) {
+            RequestBody requestBody = RequestBody.create(JSON, jpayload);
+            request = new Request.Builder().url(fullUrl).post(requestBody).build();
+        }
 
-    public String MakeURLCall(String mainurl, String method, String jpayload) {
-        return "nada";
+        if (request != null) {
+            try (Response response = okHttpClient.newCall(request).execute()) {
+                return response.body().string();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return "" + method;
     }
-}
+}

YouAreEll.iml

@@ -8,8 +8,8 @@
     </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-core:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.10.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
   </component>
 </module>

pom.xml

@@ -13,10 +13,21 @@
     </modules>
 
     <dependencies>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.8.6</version>
+            <artifactId>jackson-core</artifactId>
+            <version>2.9.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.10.0</version>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.httpcomponents</groupId>-->
+            <!--<artifactId>httpclient</artifactId>-->
+            <!--<version>4.5.5</version>-->
+        <!--</dependency>-->
     </dependencies>
 </project>