Add more client rest methods

Author: MoeweX

src/main/java/client/Client.java

@@ -45,8 +45,6 @@ public static void main(String[] args) throws UnirestException, FBaseEncryptionE
 		c.getScenario(address, port);
 	}
 
-
-
 //	public boolean keygroupConfig_create(String address, int port, KeygroupConfig keygroupConfig)
 //			throws UnirestException, FBaseEncryptionException {
 //		

src/main/java/client/KeygroupRequest.java

@@ -0,0 +1,70 @@
+package client;
+
+import org.apache.log4j.Logger;
+
+import com.mashape.unirest.http.HttpResponse;
+import com.mashape.unirest.http.Unirest;
+import com.mashape.unirest.http.exceptions.UnirestException;
+
+import model.JSONable;
+import model.config.KeygroupConfig;
+import model.config.ReplicaNodeConfig;
+import model.config.TriggerNodeConfig;
+import model.data.ClientID;
+import model.data.KeygroupID;
+
+public class KeygroupRequest extends RessourceRequest {
+
+	private static final String PATH = "keygroups";
+	private static Logger logger = Logger.getLogger(KeygroupRequest.class.getName());
+
+	public KeygroupRequest(String address, int port) {
+		super(address, port, PATH);
+	}
+
+	public boolean createKeygroup(KeygroupConfig keygroupConfig) throws UnirestException {
+		String target = target();
+		logger.info("Running post request targeting " + target);
+
+		HttpResponse<String> response =
+				Unirest.post(target).header("Content-Type", "application/json")
+						.body(JSONable.toJSON(keygroupConfig)).asString();
+
+		return handleBoolResponse(response, logger);
+	}
+	
+	public boolean addClient(KeygroupID keygroupID, ClientID clientID) throws UnirestException {
+		String target = target(keygroupID.getApp(), keygroupID.getTenant(), keygroupID.getGroup(), "addClient");
+		logger.info("Running put request targeting " + target);
+
+		HttpResponse<String> response =
+				Unirest.put(target).header("Content-Type", "application/json")
+						.body(JSONable.toJSON(clientID)).asString();
+
+		return handleBoolResponse(response, logger);
+	}
+	
+	public boolean addReplicaNode(KeygroupID keygroupID, ReplicaNodeConfig repNC) throws UnirestException {
+		String target = target(keygroupID.getApp(), keygroupID.getTenant(), keygroupID.getGroup(), "addReplicaNode");
+		logger.info("Running put request targeting " + target);
+
+		HttpResponse<String> response =
+				Unirest.put(target).header("Content-Type", "application/json")
+						.body(JSONable.toJSON(repNC)).asString();
+
+		return handleBoolResponse(response, logger);
+	}
+	
+	public boolean addTriggerNode(KeygroupID keygroupID, TriggerNodeConfig triggerNC) throws UnirestException {
+		String target = target(keygroupID.getApp(), keygroupID.getTenant(), keygroupID.getGroup(), "addTriggerNode");
+		logger.info("Running put request targeting " + target);
+
+		HttpResponse<String> response =
+				Unirest.put(target).header("Content-Type", "application/json")
+						.body(JSONable.toJSON(triggerNC)).asString();
+
+		return handleBoolResponse(response, logger);
+	}
+
+	
+}

src/main/java/client/NodeRequest.java

@@ -0,0 +1,40 @@
+package client;
+
+import org.apache.log4j.Logger;
+
+import com.mashape.unirest.http.HttpResponse;
+import com.mashape.unirest.http.Unirest;
+import com.mashape.unirest.http.exceptions.UnirestException;
+
+import model.JSONable;
+import model.config.NodeConfig;
+
+public class NodeRequest extends RessourceRequest {
+
+	private static final String PATH = "nodes";
+	private static Logger logger = Logger.getLogger(NodeRequest.class.getName());
+
+	public NodeRequest(String address, int port) {
+		super(address, port, PATH);
+	}
+
+	public NodeConfig getNodeConfig() throws UnirestException {
+		String target = target();
+		logger.info("Running get request targeting " + target);
+
+		HttpResponse<String> response = Unirest.get(target).asString();
+		return handleObjectResponse(response, NodeConfig.class, logger);
+	}
+
+	public boolean createNodeConfig(NodeConfig nodeConfig) throws UnirestException {
+		String target = target();
+		logger.info("Running post request targeting " + target);
+
+		HttpResponse<String> response =
+				Unirest.post(target).header("Content-Type", "application/json")
+						.body(JSONable.toJSON(nodeConfig)).asString();
+
+		return handleBoolResponse(response, logger);
+	}
+	
+}

src/main/java/client/RessourceRequest.java

@@ -40,6 +40,10 @@ protected String target(String a, String b) {
 	protected String target(String a, String b, String c) {
 		return target(a, b) + "/" + c;
 	}
+	
+	protected String target(String a, String b, String c, String d) {
+		return target(a, b, c) + "/" + d;
+	}
 
 	protected <T> T handleObjectResponse(HttpResponse<String> response, Class<T> targetClass,
 			Logger logger) {

src/main/java/control/Starter.java

@@ -19,7 +19,7 @@ public static void main(String[] args)
 			fbase = new FBase("local.properties");
 		}
 		fbase.startup(true, true); // TODO 2: parse from args
-		fbase.fillWithData();
+		//fbase.fillWithData();
 	}
 
 }

src/main/java/de/hasenburg/fbase/rest/jersey/NodesResource.java

@@ -1,7 +1,9 @@
 package de.hasenburg.fbase.rest.jersey;
 
 import javax.inject.Inject;
+import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
@@ -18,9 +20,8 @@
 import model.messages.Message;
 
 /**
- * The only supported node method is get. The client should not be able to run any other
- * operations.
  * 
+ * TODO C: add update and delete
  * 
  * @author jonathanhasenburg
  *
@@ -54,5 +55,27 @@ public Response getNodeConfig() {
 		m.setContent(JSONable.toJSON(config));
 		return Response.ok(JSONable.toJSON(m)).build();
 	}
+	
+	@POST
+	@Produces(MediaType.TEXT_PLAIN)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public Response createNodeConfig(String json) {
+
+		NodeConfig nodeConfig = JSONable.fromJSON(json, NodeConfig.class);
+		if (nodeConfig == null) {
+			return Response.status(400, "Body is not a node config").build();
+		}
+
+		try {
+			fBase.namingServiceSender.sendNodeConfigCreate(nodeConfig);
+			fBase.connector.nodeConfig_put(nodeConfig.getNodeID(), nodeConfig);
+		} catch (FBaseCommunicationException | FBaseNamingServiceException
+				| FBaseStorageConnectorException e) {
+			logger.warn(e);
+			return Response.status(500, e.getMessage()).build();
+		}
+
+		return Response.ok().build();
+	}
 
 }