.gitignore

@@ -1,25 +1,25 @@
-# Compiled class file
-*.class
+/target/
+!.mvn/wrapper/maven-wrapper.jar
 
-# intellij
-.idea/
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
 
-# Log file
-*.log
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
 
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1 @@
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip

Client/Client.iml

@@ -1,18 +0,0 @@
-<?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">
-    <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" />
-  </component>
-</module>

Client/src/main/java/App.java

@@ -0,0 +1,8 @@
+import client.SimpleShell;
+
+public class App {
+    public static void main(String[] args) {
+        SimpleShell app = new SimpleShell();
+        app.start();
+    }
+}

Client/src/main/java/SimpleShell.java

@@ -1,124 +0,0 @@
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-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 main(String[] args) throws java.io.IOException {
-
-        YouAreEll webber = new YouAreEll();
-        String commandLine;
-        BufferedReader console = new BufferedReader
-                (new InputStreamReader(System.in));
-
-        ProcessBuilder pb = new ProcessBuilder();
-        List<String> history = new ArrayList<String>();
-        int index = 0;
-        //we break out with <ctrl c>
-        while (true) {
-            //read what the user enters
-            System.out.println("cmd? ");
-            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("exit")) {
-                System.out.println("bye!");
-                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;
-                }
-
-                // Specific Commands.
-
-                // ids
-                if (list.contains("ids")) {
-                    String results = webber.get_ids();
-                    SimpleShell.prettyPrint(results);
-                    continue;
-                }
-
-                // messages
-                if (list.contains("messages")) {
-                    String results = webber.get_messages();
-                    SimpleShell.prettyPrint(results);
-                    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));
-                } else {
-                    pb.command(list);
-                }
-
-                // wait, wait, what curiousness is this?
-                Process process = pb.start();
-
-                //obtain the input stream
-                InputStream is = process.getInputStream();
-                InputStreamReader isr = new InputStreamReader(is);
-                BufferedReader br = new BufferedReader(isr);
-
-                //read output of the process
-                String line;
-                while ((line = br.readLine()) != null)
-                    System.out.println(line);
-                br.close();
-
-
-            }
-
-            //catch ioexception, output appropriate message, resume waiting for input
-            catch (IOException e) {
-                System.out.println("Input Error, Please try again!");
-            }
-            // So what, do you suppose, is the meaning of this comment?
-            /** The steps are:
-             * 1. parse the input to obtain the command and any parameters
-             * 2. create a ProcessBuilder object
-             * 3. start the process
-             * 4. obtain the output stream
-             * 5. output the contents returned by the command
-             */
-
-        }
-
-
-    }
-
-}

Client/src/main/java/YouAreEll.java

@@ -1,23 +0,0 @@
-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 String get_ids() {
-        return MakeURLCall("/ids", "GET", "");
-    }
-
-    public String get_messages() {
-        return MakeURLCall("/messages", "GET", "");
-    }
-
-    public String MakeURLCall(String mainurl, String method, String jpayload) {
-        return "nada";
-    }
-}

Client/src/main/java/access/YouAreEll.java

@@ -0,0 +1,52 @@
+package access;
+
+import okhttp3.*;
+
+public class YouAreEll {
+    private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+    private OkHttpClient ok = new OkHttpClient();
+
+    public YouAreEll() {
+    }
+
+    public String get_ids() {
+        return MakeURLCall("/ids", "GET", "");
+    }
+    public String get_user_id(String url) { return MakeURLCall(url, "GET", ""); }
+    public String post_ids(String jpayload) { return MakeURLCall("/ids", "POST", jpayload); }
+    public String put_ids(String jpayload){ return MakeURLCall("/ids", "PUT", jpayload); }
+
+    public String get_messages(String url) { return MakeURLCall(url, "GET", ""); }
+    public String post_messages(String url, String jpayload) { return MakeURLCall(url, "POST", jpayload); }
+
+    private String MakeURLCall(String mainurl, String method, String jpayload) {
+        String serverUrl = "http://zipcode.rocks:8085";
+        Request okRequest;
+        Response talkBack;
+        RequestBody okBody = RequestBody.create(JSON, jpayload);
+        try {
+            switch(method) {
+                case "PUT":
+                    okRequest = new Request.Builder().url(serverUrl + mainurl).put(okBody).build();
+                    break;
+                case "POST":
+                    okRequest = new Request.Builder().url(serverUrl + mainurl).post(okBody).build();
+                    break;
+                case "GET":
+                    okRequest = new Request.Builder().url(serverUrl + mainurl).build();
+                    break;
+                default:
+                    okRequest = null;
+                    break;
+            }
+            talkBack = ok.newCall(okRequest).execute();
+            return talkBack.body().string()
+                    .replaceAll("\\\\", "")
+                    .replaceAll("\"", "");
+        }
+        catch (Exception e) {
+            System.out.println(e.getMessage());
+        }
+        return "";
+    }
+}

Client/src/main/java/client/SimpleShell.java

@@ -0,0 +1,76 @@
+package client;
+
+import client.view.IO;
+import client.view.ResponseListener;
+import controller.IdController;
+import controller.MessageController;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class SimpleShell {
+    private IO io;
+    private IdController idController;
+    private MessageController messageController;
+    private Pattern regex;
+    private List<String> history;
+    private List<String> list;
+    private String commandLine;
+
+    public SimpleShell(){
+        idController = new IdController();
+        messageController = new MessageController();
+        regex = Pattern.compile("[^\\s\"']+|\"([^\"]*)\"|'([^']*)'");
+        history = new ArrayList<>();
+        io = new IO();
+    }
+    public void start() {
+        Thread listener = new Thread(new ResponseListener());
+        listener.start();
+        while (true) {
+            try {
+                getInput();
+
+                if (commandLine.equals("")) continue;
+                else if (commandLine.equals("exit")) {
+                    io.print("bye!");
+                    listener.interrupt();
+                    break;
+                }
+                history.addAll(list);
+                commandRouter();
+            }
+            catch (IOException e) {
+                io.print("Input Error, Please try again!");
+            }
+        }
+    }
+    private void getInput() throws IOException {
+        commandLine = io.input("cmd?");
+        list = listMaker(commandLine, regex);
+    }
+    private List<String> listMaker(String input, Pattern p) {
+        List<String> result = new ArrayList<>();
+        Matcher m = p.matcher(input);
+        while (m.find()) {
+            result.add(m.group());
+        }
+        return result;
+    }
+    private void commandRouter() throws IOException {
+        if (list.get(list.size() - 1).equals("history")) {
+            io.printHistory(history);
+        }
+        //TODO: CALLING CONTROLLERS
+        if (list.contains("ids")) {
+            io.prettyPrint(idController.route(list));
+        }
+        else if (list.contains("messages") || list.contains("send")) {
+            io.prettyPrint(messageController.route(list));
+        }
+        //TODO: CALLING CONTROLLERS
+    }
+}

Client/src/main/java/client/view/IO.java

@@ -0,0 +1,38 @@
+package client.view;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.List;
+
+public class IO {
+    private BufferedReader console;
+
+    public IO() {
+        console = new BufferedReader(new InputStreamReader(System.in));
+    }
+
+    public void prettyPrintMessage(String msg) {
+        String[] out = msg.replaceAll("}", "").split(",");
+        print(out[out.length - 1].replace(":", ": "));
+    }
+
+    public void prettyPrint(String msg) {
+        //do some formatting
+        print(msg);
+    }
+
+    public void print(String msg) {
+        System.out.println(msg);
+    }
+
+    public void printHistory(List<String> history) {
+        print("History:");
+        history.forEach(this::print);
+    }
+
+    public String input(String msg) throws IOException {
+        print(msg);
+        return console.readLine();
+    }
+}

Client/src/main/java/client/view/ResponseListener.java

@@ -0,0 +1,51 @@
+package client.view;
+
+import access.YouAreEll;
+
+public class ResponseListener implements Runnable {
+    private IO io;
+    private YouAreEll access;
+    private String messages;
+    private String lastResponse;
+
+    public ResponseListener() {
+        io = new IO();
+        access = new YouAreEll();
+    }
+    public void run() {
+        messages = access.get_messages("/messages");
+        lastResponse = messages;
+        io.print("hello from thread, above while loop");
+        try {
+            while (true) {
+                if (Thread.interrupted()) throw new InterruptedException();
+                else Thread.sleep(2000);
+                messageHandler();
+            }
+        } catch (InterruptedException e) {
+            io.print("Thread end");
+        }
+    }
+    private void messageHandler() {
+        messages = access.get_messages("/messages");
+
+        if (isPM() && isNewMessage()) {
+            io.print("PM!!!");
+            newMessage();
+        } else if (isNewMessage()) {
+            newMessage();
+        }
+        lastResponse = messages;
+    }
+    private void newMessage() {
+        io.prettyPrintMessage(messages.split(",\\{")[0]);
+    }
+    private boolean isNewMessage() {
+        return !messages.split(",")[1]
+                        .equals(lastResponse.split(",")[1]);
+    }
+    private boolean isPM() {
+        String m = messages.split(",")[3];
+        return m.equals("toid:jard");
+    }
+}

Client/src/main/java/controller/Controller.java

@@ -0,0 +1,8 @@
+package controller;
+
+import java.io.IOException;
+import java.util.List;
+
+public interface Controller {
+    String route(List<String> commands) throws IOException;
+}

Client/src/main/java/controller/IdController.java

@@ -0,0 +1,39 @@
+package controller;
+
+import access.YouAreEll;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import model.Id;
+
+import java.io.IOException;
+import java.util.List;
+
+public class IdController implements Controller {
+    private YouAreEll access = new YouAreEll();
+    private ObjectMapper om = new ObjectMapper();
+    private List<String> commands;
+    private Id id;
+    //--------------------------------------------------------------------------------------
+    //master routing
+    @Override
+    public String route(List<String> commands) throws IOException {
+        this.commands = commands;
+
+        if (commands.size() == 1) return listAll();
+        else return postId();
+    }
+    //--------------------------------------------------------------------------------------
+    //access methods
+    private String listAll() {
+        return access.get_ids();
+    }
+    private String postId() throws IOException {
+        id = new Id(commands.get(1), commands.get(2));
+        String idHash = access.get_user_id("/ids/" + id.getGithub());
+
+        if (!idHash.equals("")) {
+            id.setUserid(idHash);
+            return access.put_ids(om.writeValueAsString(id));
+        }
+        else return access.post_ids(om.writeValueAsString(id));
+    }
+}

Client/src/main/java/controller/MessageController.java

@@ -0,0 +1,58 @@
+package controller;
+
+import access.YouAreEll;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import model.Message;
+import java.io.IOException;
+import java.util.List;
+
+public class MessageController implements Controller {
+    private YouAreEll access = new YouAreEll();
+    private ObjectMapper om = new ObjectMapper();
+    private List<String> commands;
+    private Message message;
+    //--------------------------------------------------------------------------------------
+    //master routing
+    @Override
+    public String route(List<String> commands) throws IOException {
+        this.commands = commands;
+        switch(commands.get(0)) {
+            case "send":
+                return routeSendMessages();
+            case "messages":
+                return routeGetMessages();
+            default:
+                return "";
+        }
+    }
+    //--------------------------------------------------------------------------------------
+    //sub routing
+    private String routeGetMessages() {
+        switch(commands.size()) {
+            case 1:
+                return listLastTwenty("");
+            case 2:
+                return listLastTwenty("/ids/" + commands.get(1));
+            default:
+                return "";
+        }
+    }
+    private String routeSendMessages() throws IOException {
+        switch(commands.size()) {
+            case 3:
+                message = new Message(commands.get(1), commands.get(2), "");
+                break;
+            case 5:
+                message = new Message(commands.get(1), commands.get(2), commands.get(4));
+        }
+        return sendMessage("/ids/" + message.getFromid() + "/messages");
+    }
+    //--------------------------------------------------------------------------------------
+    //access methods
+    private String listLastTwenty(String name) {
+        return access.get_messages(name + "/messages");
+    }
+    private String sendMessage(String url) throws IOException {
+        return access.post_messages(url, om.writeValueAsString(message));
+    }
+}

Client/src/main/java/model/Id.java

@@ -0,0 +1,22 @@
+package model;
+
+public class Id {
+    String userid = "_";
+    private String name;
+    private String github;
+
+    public Id(String name, String github) {
+        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;
+    }
+}

Client/src/main/java/model/Message.java

@@ -0,0 +1,34 @@
+package model;
+
+public class Message {
+    private String sequence = "_";
+    private String timestamp = "_";
+    private String fromid;
+    private String message;
+    private String toid;
+
+    public Message(String fromid, String message, String toid) {
+        this.fromid = fromid;
+        this.message = message;
+        this.toid = toid;
+    }
+
+    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;
+    }
+}

README.md

@@ -4,7 +4,7 @@
 
 
 ### The Point
-* You are to write a command interpreter using the provided `SimpleShell` class.
+* You are to write a command interpreter using the provided `view.SimpleShell` class.
 * You're going to create a way
 	* for commands to be typed into your shell,
 	* to read the typed commands and arguments,
@@ -162,7 +162,7 @@ and send it as the body of a POST request to  `http://zipcode.rocks:8085/ids/xt0
 
 ## Part Two
 
-What's that ProcessBuilder stuff about? In the SimpleShell class, take a look. How can that be used
+What's that ProcessBuilder stuff about? In the view.SimpleShell class, take a look. How can that be used
 as a pattern to use threads to make the API calls and wait for the response? Maybe launch a new thread on every request?
 
 ## Part Three

YouAreEll.iml

@@ -1,15 +0,0 @@
-<?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">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <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" />
-  </component>
-</module>

pom.xml

@@ -5,18 +5,39 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.zipcoder.ZipChat</groupId>
-    <artifactId>YouAreEll</artifactId>
+    <artifactId>access.YouAreEll</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
     <modules>
         <module>Client</module>
     </modules>
 
+    <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>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <version>2.8.6</version>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.10.0</version>
+        </dependency>
+
     </dependencies>
 </project>