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/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";
-    }
-}

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>

go/controllers/controllers.go

@@ -0,0 +1,155 @@
+package controllers
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+)
+
+type User struct {
+	Userid string `json:"userid"`
+	Name   string `json:"name"`
+	Github string `json:"github"`
+}
+
+type Msg struct {
+	Sequence  string `json:"sequence,omitempty"`
+	Timestamp string `json:"timestamp,omitempty"`
+	Fromid    string `json:"fromid"`
+	Toid      string `json:"toid"`
+	Message   string `json:"message"`
+}
+
+// All HTTP methods will take a slug and return a []byte.
+// The specific utility handlers will take the []byte and
+// marshal them to the proper struct.
+
+func get(slug string) []byte {
+	url := fmt.Sprintf("http://zipcode.rocks:8085/%s", slug)
+	res, err := http.Get(url)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer res.Body.Close()
+
+	resData, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return resData
+}
+
+func post(slug string, data []byte) {
+	url := fmt.Sprintf("http://zipcode.rocks:8085/%s", slug)
+	res, err := http.Post(url, "application/json", bytes.NewBuffer(data))
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer res.Body.Close()
+}
+
+func put(slug string, data []byte) {
+	var client = &http.Client{}
+	url := fmt.Sprintf("http://zipcode.rocks:8085/%s", slug)
+	req, err := http.NewRequest(http.MethodPut, url, bytes.NewBuffer(data))
+	if err != nil {
+		log.Fatal(err)
+	}
+	res, err := client.Do(req)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer res.Body.Close()
+}
+
+func doesUserExist(github string) bool {
+	resBody := get("ids/" + github)
+	s := string(resBody[:])
+	// A length of 2 denotes a user not found.
+	return len(s) != 2
+}
+
+// ids handlers
+func GetIds() []User {
+	resData := get("ids")
+	var users []User
+	json.Unmarshal(resData, &users)
+	return users
+}
+
+func PostOrPutIds(name, github string) {
+	if doesUserExist(github) {
+		PutIds(name, github)
+	} else {
+		PostIds(name, github)
+	}
+}
+
+func PostIds(name, github string) {
+	user := User{"", name, github}
+	j, err := json.Marshal(&user)
+	if err != nil {
+		log.Fatal(err)
+	}
+	post("ids", j)
+}
+
+func PutIds(name, github string) {
+	res := get("ids/" + github)
+	var id string
+	json.Unmarshal(res, &id)
+	user := User{id, name, github}
+	j, err := json.Marshal(&user)
+	if err != nil {
+		log.Fatal(err)
+	}
+	put("ids", j)
+}
+
+// messages handlers
+func GetMsg() []Msg {
+	resData := get("messages")
+	var msgs []Msg
+	json.Unmarshal(resData, &msgs)
+	return msgs
+}
+
+func ServeMsg(last []byte) ([]Msg, []byte) {
+	resData := get("messages")
+	if bytes.Equal(resData, last) {
+		return nil, nil
+	}
+	var msgs []Msg
+	json.Unmarshal(resData, &msgs)
+	return msgs, resData
+}
+
+func GetMsgById(github string) []Msg {
+	resData := get("ids/" + github + "/messages")
+	var msgs []Msg
+	json.Unmarshal(resData, &msgs)
+	return msgs
+}
+
+// send handlers
+func PostSend(github, message string) {
+	m := Msg{Fromid: github, Toid: "", Message: message}
+	j, err := json.Marshal(&m)
+	if err != nil {
+		log.Fatal(err)
+	}
+	post("ids/"+github+"/messages", j)
+}
+
+func PostSendToGithub(fromGithub, toGithub, message string) {
+	m := Msg{Fromid: fromGithub, Toid: toGithub, Message: message}
+	j, err := json.Marshal(&m)
+	if err != nil {
+		log.Fatal(err)
+	}
+	post("ids/"+fromGithub+"/messages", j)
+}

go/controllers/controllers_test.go

@@ -0,0 +1,3 @@
+package controllers
+
+import ()

go/main.go

@@ -0,0 +1,89 @@
+package main
+
+import (
+	"fmt"
+	prompt "github.com/c-bata/go-prompt"
+	cont "github.com/woat/youareell/controllers"
+	out "github.com/woat/youareell/output"
+	srv "github.com/woat/youareell/service"
+	"strings"
+)
+
+func completer(d prompt.Document) []prompt.Suggest {
+	if len(strings.Split(d.GetWordBeforeCursorUntilSeparator(">"), " ")) > 2 {
+		return nil
+	}
+	s := []prompt.Suggest{
+		{Text: "ids", Description: "[<your_name> <github_id]"},
+		{Text: "messages", Description: "[<github_id>]"},
+		{Text: "send", Description: "{<your_name> <message_body> | <your_name> <message_body> to <your_friend>}"},
+	}
+	return prompt.FilterHasPrefix(s, d.GetWordBeforeCursor(), true)
+}
+
+func start(origin chan bool) {
+	for {
+		x := prompt.Input(">>> ", completer,
+			prompt.OptionPrefixTextColor(prompt.Cyan),
+			prompt.OptionSuggestionBGColor(prompt.Red),
+			prompt.OptionDescriptionBGColor(prompt.Green),
+			prompt.OptionSelectedSuggestionBGColor(prompt.DarkRed),
+			prompt.OptionSuggestionTextColor(prompt.Black),
+			prompt.OptionSelectedDescriptionBGColor(prompt.DarkGreen),
+			prompt.OptionPreviewSuggestionTextColor(prompt.Red),
+		)
+		s := out.ParseArgs(x)
+		if len(s) == 0 {
+			continue
+		}
+		if s[0] == "ids" {
+			// Post the NAME :: GITHUB
+			if len(s) > 1 {
+				cont.PostOrPutIds(s[1], s[2])
+				continue
+			}
+			// Get DBs if they didn't pass anything more.
+			out.PrintUsers(cont.GetIds())
+			continue
+		}
+		if s[0] == "messages" {
+			// Get id messages
+			if len(s) == 2 {
+				out.PrintMsgs(cont.GetMsgById(s[1]))
+				continue
+			}
+			out.PrintMsgs(cont.GetMsg())
+			continue
+		}
+		if s[0] == "send" {
+			// Send to main timeline
+			if len(s) == 3 {
+				cont.PostSend(s[1], s[2])
+				origin <- true
+			}
+			// Send to another github id
+			if len(s) == 5 {
+				cont.PostSendToGithub(s[1], s[4], s[2])
+				origin <- true
+			}
+			continue
+		}
+		if s[0] == "cmd" {
+			fmt.Printf("Available commands:\n")
+			fmt.Printf("%5s ids [<your_name> <github_id>]\n", "")
+			fmt.Printf("%5s messages [<github_id>]\n", "")
+			fmt.Printf("%5s send {<your_name> <message_body> | <your_name> <message_body> to <your_friend>}\n", "")
+			continue
+		}
+		if s[0] == "quit" {
+			break
+		}
+		fmt.Printf("Command: %s not recognized. Type \"cmd\" for a list of commands.\n", s)
+	}
+}
+
+func main() {
+	origin := make(chan bool, 1)
+	go srv.NotificationService(origin)
+	start(origin)
+}

go/output/output.go

@@ -0,0 +1,49 @@
+package output
+
+import (
+	"bytes"
+	"fmt"
+	c "github.com/woat/youareell/controllers"
+	"regexp"
+)
+
+func ParseArgs(s string) []string {
+	r := regexp.MustCompile("'.+'|\".+\"|\\S+")
+	arr := r.FindAllString(s, -1)
+	return arr
+}
+
+func ParseMsg(m c.Msg) string {
+	var pm string
+	if m.Fromid == m.Toid || m.Toid == "" {
+		pm = fmt.Sprintf("%v: %v", m.Fromid, m.Message)
+	} else {
+		pm = fmt.Sprintf("%v: @%v %v", m.Fromid, m.Toid, m.Message)
+	}
+	return pm
+}
+
+func ParseUser(u c.User) string {
+	pu := fmt.Sprintf("Name: %v - Github: %v", u.Name, u.Github)
+	return pu
+}
+
+func PrintUsers(u []c.User) string {
+	var buffer bytes.Buffer
+	for _, e := range u {
+		buffer.WriteString(ParseUser(e) + "\n")
+	}
+
+	fmt.Println(buffer.String())
+	return buffer.String()
+}
+
+func PrintMsgs(m []c.Msg) string {
+	var buffer bytes.Buffer
+	for _, e := range m {
+		buffer.WriteString(ParseMsg(e) + "\n")
+	}
+
+	fmt.Println(buffer.String())
+	return buffer.String()
+}

go/output/output_test.go

@@ -0,0 +1,82 @@
+package output
+
+import (
+	c "github.com/woat/youareell/controllers"
+	"testing"
+)
+
+type Msg struct {
+	Sequence  string `json:"sequence"`
+	Timestamp string `json:"timestamp"`
+	Fromid    string `json:"fromid"`
+	Toid      string `json:"toid"`
+	Message   string `json:"message"`
+}
+
+func TestParseArgs(t *testing.T) {
+	var stdargs = []struct {
+		in       string
+		expected int
+	}{
+		{"ids", 1},
+		{"messages your_github_id", 2},
+		{"ids your_name your_github_id", 3},
+		{"send your_github_id 'my string message' to some_friend_githubid", 5},
+	}
+	for _, arg := range stdargs {
+		actual := len(ParseArgs(arg.in))
+		if actual != arg.expected {
+			t.Errorf("ParseArgs(%s) got: %v, want: %v => arr: %v", arg.in, actual, arg.expected, ParseArgs(arg.in)[3])
+		}
+	}
+}
+
+func TestParseMsg(t *testing.T) {
+	var stdargs = []struct {
+		in       c.Msg
+		expected string
+	}{
+		{c.Msg{Fromid: "fromid", Toid: "toid", Message: "msg"}, "fromid: @toid msg"},
+		{c.Msg{Fromid: "sameid", Toid: "sameid", Message: "msg"}, "sameid: msg"},
+		{c.Msg{Fromid: "sameid", Toid: "", Message: "msg"}, "sameid: msg"},
+	}
+	for _, arg := range stdargs {
+		actual := ParseMsg(arg.in)
+		if actual != arg.expected {
+			t.Errorf("ParseMsg(%v) got: '%v', want: '%v'", arg.in, actual, arg.expected)
+		}
+	}
+}
+
+func TestParseUser(t *testing.T) {
+	var stdargs = []struct {
+		in       c.User
+		expected string
+	}{
+		{c.User{Name: "test", Github: "test"}, "Name: test - Github: test"},
+	}
+
+	for _, arg := range stdargs {
+		actual := ParseUser(arg.in)
+		if actual != arg.expected {
+			t.Errorf("ParseUser(%v) got: '%v', want: '%v'", arg.in, actual, arg.expected)
+		}
+	}
+}
+
+func TestPrintUser(t *testing.T) {
+	var stdargs = []struct {
+		in       []c.User
+		expected string
+	}{
+		{[]c.User{{Name: "test", Github: "test"}}, "Name: test - Github: test\n"},
+		{[]c.User{{Name: "test", Github: "test"}, {Name: "test1", Github: "test1"}}, "Name: test - Github: test\nName: test1 - Github: test1\n"},
+	}
+
+	for _, arg := range stdargs {
+		actual := PrintUsers(arg.in)
+		if actual != arg.expected {
+			t.Errorf("ParseUser(%v) got: '%v', want: '%v'", arg.in, actual, arg.expected)
+		}
+	}
+}

go/service/service.go

@@ -0,0 +1,44 @@
+package service
+
+import (
+	"fmt"
+	c "github.com/woat/youareell/controllers"
+	"time"
+)
+
+var last []byte
+
+func SetLastBytes() {
+	_, bytes := c.ServeMsg(last)
+	last = bytes
+}
+
+func NotificationService(originIp chan bool) {
+	SetLastBytes()
+	for {
+		select {
+		case <-originIp:
+			_, bytes := c.ServeMsg(last)
+			if bytes == nil {
+				continue
+			}
+			fmt.Print("\033[s")
+			fmt.Print("Message sent.")
+			fmt.Print("\033[u")
+			last = bytes
+			continue
+		default:
+		}
+
+		_, bytes := c.ServeMsg(last)
+		if bytes == nil {
+			time.Sleep(time.Second * 2)
+			continue
+		}
+		last = bytes
+		fmt.Print("\033[s")
+		fmt.Print("\033[A\r" + "New unread message!")
+		fmt.Print("\033[u")
+		time.Sleep(time.Second * 2)
+	}
+}

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

@@ -0,0 +1,64 @@
+public class Message implements SimplePrint {
+    private String sequence;
+    private String timestamp;
+    private String fromid;
+    private String toid;
+    private String message;
+
+    public Message() {}
+
+    public Message(String fromid, String message) {
+        this.fromid = fromid;
+        this.message = message;
+    }
+
+    public Message(String fromid, String toid, String message) {
+        this.fromid = fromid;
+        this.toid = toid;
+        this.message = message;
+    }
+
+    public String getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(String sequence) {
+        this.sequence = sequence;
+    }
+
+    public String getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(String timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    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;
+    }
+
+    public void print() {
+        System.out.println("From: " + getFromid() + " To: " + getToid() + " Message: " + getMessage());
+    }
+}

java/Client/src/main/java/SimplePrint.java

@@ -0,0 +1,3 @@
+public interface SimplePrint {
+    void print();
+}

Client/src/main/java/SimpleShell.java → java/Client/src/main/java/SimpleShell.java

@@ -1,16 +1,35 @@
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import sun.java2d.pipe.SpanShapeRenderer;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class SimpleShell {
 
 
-    public static void prettyPrint(String output) {
-        // yep, make an effort to format things nicely, eh?
-        System.out.println(output);
+    public static <T> void prettyPrint(String output, Class<T> data) throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+        if (data.getSimpleName().equals("User")) {
+            List<User> myObjects = mapper.readValue(output, new TypeReference<List<User>>(){});
+            for (User e : myObjects) {
+                e.print();
+            }
+        }
+        if (data.getSimpleName().equals("Message")) {
+            List<Message> myObjects = mapper.readValue(output, new TypeReference<List<Message>>(){});
+            for (Message e : myObjects) {
+                e.print();
+            }
+        }
     }
     public static void main(String[] args) throws java.io.IOException {
 
@@ -22,17 +41,19 @@ public class SimpleShell {
         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(" ");
+            commandLine = console.readLine();
             List<String> list = new ArrayList<String>();
+            Pattern regex = Pattern.compile("[^\\s\"']+|\"[^\"]*\"|'[^']*'");
+            Matcher regexMatcher = regex.matcher(commandLine);
+            while (regexMatcher.find()) {
+                list.add(regexMatcher.group());
+            }
+
+            history.addAll(list);
 
-            //if the user entered a return, just loop again
             if (commandLine.equals(""))
                 continue;
             if (commandLine.equals("exit")) {
@@ -40,38 +61,43 @@ public class SimpleShell {
                 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);
+                if (list.get(0).equals("ids")) {
+                    if (list.size() > 1) {
+                        User u = new User(list.get(1), list.get(2));
+                        prettyPrint(webber.postOrPutIds(u), User.class);
+                        continue;
+                    }
+                    prettyPrint(webber.getIds(), User.class);
                     continue;
                 }
 
-                // messages
-                if (list.contains("messages")) {
-                    String results = webber.get_messages();
-                    SimpleShell.prettyPrint(results);
+                if (list.get(0).equals("messages")) {
+                    if (list.size() == 2) {
+                        prettyPrint(webber.getMessagesMine(list.get(1)), Message.class);
+                        continue;
+                    }
+                    prettyPrint(webber.getMessages(), Message.class);
                     continue;
                 }
-                // you need to add a bunch more.
+
+                if (list.get(0).equals("send")) {
+                    if (list.size() == 3) {
+                        Message m = new Message(list.get(1), list.get(2));
+                        prettyPrint(webber.postMessages(m), Message.class);
+                        continue;
+                    } else {
+                        Message m = new Message(list.get(1), list.get(4), list.get(2));
+                        prettyPrint(webber.postMessages(m), Message.class);
+                        continue;
+                    }
+                }
 
                 //!! command returns the last command in history
                 if (list.get(list.size() - 1).equals("!!")) {
@@ -106,6 +132,7 @@ public class SimpleShell {
             //catch ioexception, output appropriate message, resume waiting for input
             catch (IOException e) {
                 System.out.println("Input Error, Please try again!");
+                System.out.println(e);
             }
             // So what, do you suppose, is the meaning of this comment?
             /** The steps are:

java/Client/src/main/java/User.java

@@ -0,0 +1,46 @@
+public class User implements SimplePrint {
+    private String userid;
+    private String name;
+    private String github;
+
+    public User() {}
+
+    public User(String name, String github) {
+        this.name = name;
+        this.github = github;
+    }
+
+    public User(String userid, String name, String github) {
+        this.userid = userid;
+        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;
+    }
+
+    public void print() {
+        System.out.println("Name : " + getName() + " Github: " + getGithub());
+    }
+}

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

@@ -0,0 +1,92 @@
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sun.xml.internal.ws.policy.privateutil.PolicyUtils;
+import okhttp3.*;
+
+import java.io.IOException;
+
+public class YouAreEll {
+    private OkHttpClient client = new OkHttpClient();
+    private final String BASE_URL = "http://zipcode.rocks:8085/";
+    private final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    YouAreEll() {
+    }
+
+    public ResponseBody get(String slug) throws IOException {
+        Response res = client.newCall(
+                new Request
+                        .Builder()
+                        .url(BASE_URL + slug)
+                        .build()
+        ).execute();
+        return res.body();
+    }
+
+    public ResponseBody post(String slug, String payload) throws IOException {
+        Response res = client.newCall(
+                new Request
+                        .Builder()
+                        .url(BASE_URL + slug)
+                        .post(RequestBody.create(JSON, payload))
+                        .build()
+        ).execute();
+        return res.body();
+    }
+
+    public ResponseBody put(String slug, String payload) throws IOException {
+        Response res = client.newCall(
+                new Request
+                        .Builder()
+                        .url(BASE_URL + slug)
+                        .put(RequestBody.create(JSON, payload))
+                        .build()
+        ).execute();
+        return res.body();
+    }
+
+    public String getIds() throws IOException {
+        return get("/ids").string();
+    }
+
+    public String postIds(User payload) throws IOException {
+        ResponseBody res = post("ids", objectMapper.writeValueAsString(payload));
+        return res.string();
+    }
+
+    public String putIds(User payload) throws IOException {
+        ResponseBody b = get("ids/" + payload.getGithub());
+        String bod = b.string();
+        payload.setUserid(bod);
+        ResponseBody res = put("ids", objectMapper.writeValueAsString(payload));
+        return res.string();
+    }
+
+    public Boolean doesUserExist(String github) throws IOException {
+        ResponseBody b = get("ids/" + github);
+        return b.string().length() > 2;
+    }
+
+    public String postOrPutIds(User payload) throws IOException {
+        if (doesUserExist(payload.getGithub())) return putIds(payload);
+        return postIds(payload);
+    }
+
+    public String getMessages() throws IOException {
+        return get("messages").string();
+    }
+
+    public String getMessagesMine(String github) throws IOException {
+        return get("ids/"+github+"/messages").string();
+    }
+
+    public String getMessagesFromFriend(String from, String to) throws IOException {
+        return get("ids/"+from+"/from/"+to).string();
+    }
+
+    public String postMessages(Message payload) throws IOException {
+        return post("ids/"+payload.getFromid()+"/messages", objectMapper.writeValueAsString(payload)).string();
+    }
+}

README.md → java/README.md

@@ -23,7 +23,7 @@
 	* If you leave the `to id` field empty, the message is `to the world`.
 	* If you fill out the the JSON template with a valid github_id in the `to id` field of the JSON payload, then that message is addressed to that friend.
 	* Yes, all messages can be seen by users of the system.
-	* There are JSON templates below for both Ids and Messages.
+	* There are JSON templates below for both Ids and Message.
 
 
 
@@ -39,7 +39,7 @@ specific command.
 	* Each one of the command methods will then call a even lower-level method that makes a certain kind of HTTP request (GET, POST, PUT) to specific filled-in URL.
 
 * The Under-A-Rock Server can be reached at `http://zipcode.rocks:8085` Everyone uses the same server. 		
-	* There are two segments to the API and two kinds of commands in the shell, the ID segment and the Messages segment.
+	* There are two segments to the API and two kinds of commands in the shell, the ID segment and the Message segment.
 
 
 * You can explore several ways of doing the HTTP URL calls to the server, using the one of these:
@@ -93,7 +93,7 @@ If I type `cmd? ids Kris xt0fer` into the shell, your command processor creates
 and send it as the body of a POST request to  `http://zipcode.rocks:8085/ids/`
 
  
-## Messages
+## Message
 
 #### Message comands in shell
 in the shell
@@ -102,7 +102,7 @@ in the shell
 * `send your_github_id 'Hello World' ` should post a new message in the timeline
 * `send your_github_id 'my string message' to some_friend_githubid` should post a message to your friend from you on the timeline.
 
-the Messages API is:
+the Message API is:
 
 #### URL: /messages/
 * `GET` : Get last 20 msgs - returns an JSON array of message objects

pom.xml → java/pom.xml

@@ -14,6 +14,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.10.0</version>
+        </dependency>
+        <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <version>2.8.6</version>