even closer, almost finished

Client/Client.iml

     <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: org.apache.httpcomponents:fluent-hc:4.5.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" 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" />
     <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" />
   </component>
 </module>

Client/pom.xml

             <artifactId>jackson-databind</artifactId>
             <version>2.9.4</version>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.httpcomponents</groupId>-->
+            <!--<artifactId>fluent-hc</artifactId>-->
+            <!--<version>4.5.5</version>-->
+        <!--</dependency>-->
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>fluent-hc</artifactId>
-            <version>4.5.5</version>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.10.0</version>
         </dependency>
+
     </dependencies>
 </project>

Client/src/main/java/SimpleShell.java

                 MessageController mesCont = new MessageController();
                 IdController idCont = new IdController();
 
-
                 if (commandLine.equalsIgnoreCase("ids")) {
-                    System.out.println("To retrieve all registered github ids, press enter\nTo register a new id " +
-                            "or change the name associated, type the name followed by the github id");
+                    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("\n")) {
-                        String results = idCont.get_ids(commandList);
-                        SimpleShell.prettyPrint(results);
-                        continue;
+                    if(specificCommand.equals("")) {
+                        results = idCont.get_ids(commandList);
                     } else {
-                        String [] c = specificCommand.split(" ");
-                        commandList.addAll(Arrays.asList(c));
-                        String save = idCont.saveId(commandList);
-                        SimpleShell.prettyPrint(save);
+                        commandList.add(specificCommand);
+                        System.out.println("Please enter your github id");
+                        specificCommand = console.readLine();
+                        commandList.add(specificCommand);
+                        results = idCont.saveId(commandList);
                     }
+                    SimpleShell.prettyPrint(results);
+                    continue;
                 }
 
                 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")) {
-                        String results = mesCont.get_messages(commandList);
-                        SimpleShell.prettyPrint(results);
-                        continue;
+                    if(specificCommand.equals("\n") || specificCommand.equals("")) {
+                        results = mesCont.get_messages(commandList);
                     } else {
                         commandList.add(specificCommand);
-                        String results = mesCont.get_my_messages(commandList);
-                        SimpleShell.prettyPrint(results);
+                        results = mesCont.get_my_messages(commandList);
                     }
+                    SimpleShell.prettyPrint(results);
+                    continue;
                 }
 
 
                 if(commandLine.equalsIgnoreCase("send")){
-                    System.out.println("To send a message on the timeline type in 'your message' and your github id.\n" +
-                            "To send a message to a friend, type 'your message', within single quotes, followed by your github id and then the");
+                    String results = "";
+                    System.out.println("Please enter your message");
                     specificCommand = console.readLine();
-                    Pattern pattern = Pattern.compile("'.+'");
-                    Matcher matcher = pattern.matcher(specificCommand);
-                    if(matcher.find()){
-                        String one = matcher.group();
-                        String two = specificCommand.substring(matcher.end());
-                        String[] twoSplit = two.split(" ");
-                        commandList.add(one);
-                        if(twoSplit.length == 1){
-                            commandList.add(twoSplit[0]);
-                            String results = mesCont.post_world(commandList);
-                            SimpleShell.prettyPrint(results);
-                        }
-                        if(twoSplit.length == 2){
-                            commandList.add(twoSplit[0]);
-                            commandList.add(twoSplit[1]);
-                            String results = mesCont.post_friend(commandList);
-                            SimpleShell.prettyPrint(results);
-                        }
+                    if(!specificCommand.equals("")) {
+                        commandList.add(specificCommand);
+                    }
+                    System.out.println(("Enter your github id"));
+                    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.prettyPrint(results);
+                    continue;
                     }
-                }
 
 
                 //print history, moved it here so full commands will be in history

Client/src/main/java/YouAreEll.java

 import org.apache.http.client.fluent.*;
 import com.fasterxml.jackson.databind.*;
 import java.io.IOException;
+import javax.swing.*;
 
 
 public class YouAreEll {
         } catch (JsonProcessingException e) {
             e.printStackTrace();
         }
-        System.out.println(urlhandler.makeURLCall("/ids", "GET", payload));
+        System.out.println(urlhandler.makeURLCall("/ids", "POST", payload));
 //        System.out.println(urlhandler.makeURLCall("/messages", "GET", ""));
     }
 
     public String makeURLCall(String mainurl, String method, String jpayload) {
-        ProcessBuilder processBuilder = new ProcessBuilder();
         String fullUrl = "http://zipcode.rocks:8085" + mainurl;
         String requestReturn = "";
-        if(mainurl.equalsIgnoreCase("/ids") && method.equalsIgnoreCase("get")){
-            try {
-                requestReturn = Request.Get(fullUrl).execute().returnContent().asString();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        if(mainurl.equalsIgnoreCase("/ids") && method.equalsIgnoreCase("post")){
-            requestReturn = Request.Post(jpayload).toString();
-        }
-        if(mainurl.equalsIgnoreCase("/messages")){
-            try {
-                Request.Get(fullUrl).execute().returnContent();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
+//        if(mainurl.equalsIgnoreCase("/ids") && method.equalsIgnoreCase("get")){
+//            try {
+//                requestReturn = Request.Get(fullUrl).execute().returnContent().asString();
+//
+//            } catch (IOException e) {
+//                e.printStackTrace();
+//            }
+//        }
+//        if(mainurl.equalsIgnoreCase("/ids") && method.equalsIgnoreCase("post")){
+//            requestReturn = Request.Post(jpayload).toString();
+//        }
+//        if(mainurl.equalsIgnoreCase("/messages")){
+//            try {
+//                Request.Get(fullUrl).execute().returnContent();
+//            } catch (IOException e) {
+//                e.printStackTrace();
+//            }
+//        }
         return requestReturn;
     }