Merge da6d49232baf3bfb82c433a115458683aff9699b into bd1fca498ef63809a3a7a9e8867a8c20219bafbb

Client/Client.iml

@@ -5,14 +5,25 @@
     <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" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/Test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.testng:testng:6.14.2" level="project" />
+    <orderEntry type="library" name="Maven: com.beust:jcommander:1.72" level="project" />
+    <orderEntry type="library" name="Maven: org.apache-extras.beanshell:bsh:2.0b6" 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" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.2" 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" />
   </component>
 </module>

Client/pom.xml

@@ -10,6 +10,34 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>Client</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.5</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20140107</version>
+        </dependency>
+    </dependencies>
 
 
 </project>

Client/src/main/Test/AIMTest.java

@@ -0,0 +1,2 @@
+public class AIMTest {
+}

Client/src/main/Test/UserTest.java

@@ -0,0 +1 @@
+//TESTING TESTING TESTING

Client/src/main/java/AIM.java

@@ -0,0 +1,62 @@
+/**
+ * @TODO
+ * Getters and setters for my Instant messenger class
+ * If she doesn't remember "America Online" (AOL)
+ * She's too young for you bro
+ */
+
+public class AIM {
+    //fields
+    private String message;
+    private String timeStamp;
+    private String toId;
+    private String fromId;
+    private String sequence;
+    //constructor
+    public AIM(String sequence, String fromId, String toId, String message) {
+        this.sequence = sequence;
+        this.fromId = fromId;
+        this.toId = toId;
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(String timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getToId() {
+        return toId;
+    }
+
+    public void setToId(String toId) {
+        this.toId = toId;
+    }
+
+    public String getFromId() {
+        return fromId;
+    }
+
+    public void setFromId(String fromId) {
+        this.fromId = fromId;
+    }
+
+    public String getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(String sequence) {
+        this.sequence = sequence;
+    }
+}

Client/src/main/java/SimpleShell.java

@@ -1,3 +1,7 @@
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import sun.tools.java.Identifier;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -5,22 +9,48 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 
-public class SimpleShell {
+/**
+ * ============JACKSON============ vs ==============GSON==============
+ * @JACKSON
+ * Consistent multipurpose library for processing JSON formatted data
+ * Not as simple as Gson(my baby)
+ * Fast and ergonomic
+ * Reads and writes JSON as discrete events
+ * Provides a mutable internal memory tree interpretation of JSON data
+ * Converts JSON to and from POJO's
+ * @GSON
+ * Does the same as jackson minus the need for replacing java annotations within classes
+ * Simple method calls
+ * Supports complex objects
+ * Long range support of java generics
+ * Allows custom representation for objects
+ * Allows pre-existing static objects can be converted
+ * Its just better bruh
+ */
 
+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 prettyPrint(String output) throws IOException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            Object jsonFormat = objectMapper.readValue(output, Object.class);
+            String formatted = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonFormat);
+            System.out.println(formatted);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        //System.out.println(output);
     }
-    public static void main(String[] args) throws java.io.IOException {
 
-        YouAreEll webber = new YouAreEll();
+    public static void main(String[] args) throws java.io.IOException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        YouAreEll url = new YouAreEll();
         String commandLine;
         BufferedReader console = new BufferedReader
                 (new InputStreamReader(System.in));
 
         ProcessBuilder pb = new ProcessBuilder();
-        List<String> history = new ArrayList<String>();
+        List<String> commandHistory = new ArrayList<String>();
         int index = 0;
         //we break out with <ctrl c>
         while (true) {
@@ -29,8 +59,8 @@ public class SimpleShell {
             commandLine = console.readLine();
 
             //input parsed into array of strings(command and arguments)
-            String[] commands = commandLine.split(" ");
-            List<String> list = new ArrayList<String>();
+            String[] commandWords = commandLine.split(" ");
+            List<String> commandList = new ArrayList<String>();
 
             //if the user entered a return, just loop again
             if (commandLine.equals(""))
@@ -41,49 +71,47 @@ public class SimpleShell {
             }
 
             //loop through to see if parsing worked
-            for (int i = 0; i < commands.length; i++) {
+            for (int i = 0; i < commandWords.length; i++) {
                 //System.out.println(commands[i]); //***check to see if parsing/split worked***
-                list.add(commands[i]);
-
+                commandList.add(commandWords[i]);
             }
-            System.out.print(list); //***check to see if list was added correctly***
-            history.addAll(list);
+            System.out.print(commandList); //***check to see if list was added correctly***
+            commandHistory.addAll(commandList);
             try {
                 //display history of shell with index
-                if (list.get(list.size() - 1).equals("history")) {
-                    for (String s : history)
+                if (commandList.get(commandList.size() - 1).equals("history")) {
+                    for (String s : commandHistory)
                         System.out.println((index++) + " " + s);
                     continue;
                 }
-
-                // Specific Commands.
+                //Specific commands
 
                 // ids
-                if (list.contains("ids")) {
-                    String results = webber.get_ids();
+                if (commandList.contains("ids")) {
+                    String results = url.get_ids();
                     SimpleShell.prettyPrint(results);
                     continue;
                 }
 
                 // messages
-                if (list.contains("messages")) {
-                    String results = webber.get_messages();
+                if (commandList.contains("messages")) {
+                    String results = url.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));
+                if (commandList.get(commandList.size() - 1).equals("!!")) {
+                    pb.command(commandHistory.get(commandHistory.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 if (commandList.get(commandList.size() - 1).charAt(0) == '!') {
+                    int b = Character.getNumericValue(commandList.get(commandList.size() - 1).charAt(1));
+                    if (b <= commandHistory.size())//check if integer entered isn't bigger than history size
+                        pb.command(commandHistory.get(b));
                 } else {
-                    pb.command(list);
+                    pb.command(commandList);
                 }
 
                 // wait, wait, what curiousness is this?
@@ -99,8 +127,6 @@ public class SimpleShell {
                 while ((line = br.readLine()) != null)
                     System.out.println(line);
                 br.close();
-
-
             }
 
             //catch ioexception, output appropriate message, resume waiting for input
@@ -108,7 +134,8 @@ public class SimpleShell {
                 System.out.println("Input Error, Please try again!");
             }
             // So what, do you suppose, is the meaning of this comment?
-            /** The steps are:
+            /**@TODO
+             * The steps are:
              * 1. parse the input to obtain the command and any parameters
              * 2. create a ProcessBuilder object
              * 3. start the process
@@ -117,8 +144,5 @@ public class SimpleShell {
              */
 
         }
-
-
     }
-
 }

Client/src/main/java/User.java

@@ -0,0 +1,46 @@
+/**
+ * @TODO
+ * I am POJO-JOJO!
+ */
+
+public class User {
+    //fields
+    private String userId;
+    private String name;
+    private String githubHandle;
+    //Constructor
+    public User(String userId, String name, String githubHandle) {
+        this.userId = userId;
+        this.name = name;
+        this.githubHandle = githubHandle;
+    }
+
+    @Override //custom toString method that appends the userID after username to a string with the associated github ID
+    public String toString() {
+        return this.name + " - " + this.userId + " - " + this.githubHandle;
+    }
+
+    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 getGithubHandle() {
+        return githubHandle;
+    }
+
+    public void setGithubHandle(String githubHandle) {
+        this.githubHandle = githubHandle;
+    }
+}

Client/src/main/java/YouAreEll.java

@@ -1,12 +1,42 @@
-public class YouAreEll {
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sun.org.apache.bcel.internal.generic.GETFIELD;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.json.JSONString;
+
+/**
+ * @GOOD&BAD
+ * Deserialization is performed by specialized libraries like Jackson
+ * 1.)Apache is easiest to use for building your own REST client
+ * 2.)Using jackson for json parsing instead of Gson
+ * 3.)Apache has HTTP2 and NIO support
+ * 4.)Apache can establish a pool connection for a host
+ * 5.)Apache has just about every useful function you will ever need
+ * 6.)Apache is one of the fastest asynchronous (non-blocking) clients out there
+ * 7.)Apache is very reliable, basic, portable, and usable
+ * 8.)Apache has it's own middleware stack (API) and implements a Fetch API
+ * 9.)Apache is not a browser compatible as other clients
+ * 10.)Very High latency
+ */
 
+public class YouAreEll {
     YouAreEll() {
     }
 
     public static void main(String[] args) {
+        ObjectMapper mapper = new ObjectMapper();
         YouAreEll urlhandler = new YouAreEll();
+
         System.out.println(urlhandler.MakeURLCall("/ids", "GET", ""));
         System.out.println(urlhandler.MakeURLCall("/messages", "GET", ""));
+        //StringEntity requestEntity = new StringEntity(JSONString,ContentType.APPLICATION_JSON);
+        //HttpPost postMethod = new HttpPost("http://zipcode.rocks:8085");
+        //postMethod.setEntity(requestEntity);
     }
 
     public String get_ids() {
@@ -18,6 +48,6 @@ public class YouAreEll {
     }
 
     public String MakeURLCall(String mainurl, String method, String jpayload) {
-        return "nada";
-    }
-}
+        return "wtf";
+        }
+    }