Simplify quickstart

Author: MoeweX

README.md

@@ -16,14 +16,11 @@ For some of the tests, a running naming service is required. The naming service
 
 ## Current ToDos not listed in code
 
-### One to One Communication
-- [ ] Add one to one communication for datarecords
-
 ### Storage
-- [ ] Remove data that is expired
+- [ ] Remove data that is expired.
 
 ### Handling Missed Messages
-- [ ] Add message history cleanup functionality (on receiver and sender side)
+- [ ] Add message history cleanup functionality (on receiver and sender side). Currently, the message history is never cleaned.
 
 ### Controlling FBase with Clients
- - [ ] Enable encryption and authentication
+ - [ ] Enable encryption and authentication (Currently, everyone can use the rest API of a node and do everything. However, the node has to check whether the requesting client is already registered with the naming service.)

src/main/java/client/Client.java

@@ -1,5 +1,7 @@
 package client;
 
+import crypto.CryptoProvider;
+import model.config.KeygroupConfig;
 import org.apache.log4j.Logger;
 
 import com.mashape.unirest.http.exceptions.UnirestException;
@@ -19,8 +21,13 @@ public class Client {
 
 	private static Logger logger = Logger.getLogger(Client.class.getName());
 
-	public void getScenario(String address, int port) throws UnirestException {
+	public void quickstart_clientAction(String address, int port) throws UnirestException {
 		KeygroupID keygroupID = new KeygroupID("smartlight", "h1", "brightness");
+
+		KeygroupConfig config = new KeygroupConfig(keygroupID, "a secret password", CryptoProvider.EncryptionAlgorithm.AES);
+		KeygroupRequest keygroups = new KeygroupRequest(address, port);
+		logger.info("Created keygroup: " + keygroups.createKeygroup(config));
+
 		DataIdentifier dataID = new DataIdentifier(keygroupID, "M-1");
 
 		DataRecord newRecord = new DataRecord(new DataIdentifier(keygroupID, "M-2"), null);
@@ -42,7 +49,7 @@ public static void main(String[] args) throws UnirestException, FBaseEncryptionE
 		int port = 8081;
 
 		Client c = new Client();
-		c.getScenario(address, port);
+		c.quickstart_clientAction(address, port);
 	}
 
 //	public boolean keygroupConfig_create(String address, int port, KeygroupConfig keygroupConfig)

src/main/java/communication/MessageIdEvaluator.java

@@ -104,9 +104,10 @@ private TreeSet<Integer> getIDSet(TreeMap<String, TreeSet<Integer>> machineMap,
 	}
 
 	private Runnable evaluateIDs = () -> {
-		logger.debug("Running through all messageIDs");
 		List<MessageID> missingIDs = getMissingMessageIDs();
-		logger.debug("Found " + missingIDs.size() + " missing IDs");
+		if (!missingIDs.isEmpty()) {
+			logger.debug("Found " + missingIDs.size() + " missing IDs");
+		}
 		if (fBase != null) {
 			NodeID nodeID = null;
 			DirectMessageSender directMessageSender = null;

src/main/java/control/Starter.java

@@ -17,7 +17,7 @@ public static void main(String[] args)
 		if (args.length == 1) {
 			fbase = new FBase(args[0]);
 		} else {
-			fbase = new FBase("local.properties");
+			fbase = new FBase("quickstart_local.properties");
 		}
 		fbase.startup(true, true); // TODO 2: parse from args
 		//fbase.fillWithData();

src/main/java/tasks/background/CheckKeygroupConfigurationsOnUpdatesTask.java

@@ -72,7 +72,7 @@ public CheckKeygroupConfigurationsOnUpdatesTask(FBase fBase, int checkInterval)
 	public Boolean executeFunctionality() {
 
 		while (!Thread.currentThread().isInterrupted()) {
-			logger.info("Checking keygroup configurations on updates");
+			logger.debug("Checking keygroup configurations on updates");
 
 			currentResponsibleKeygroups.clear();
 			currentKeygroupConfigurations.clear();

src/main/java/tasks/background/DetectLostResponsibility.java

@@ -52,7 +52,7 @@ public DetectLostResponsibility(FBase fBase, int checkInterval) {
 	public Boolean executeFunctionality() {
 
 		while (!Thread.currentThread().isInterrupted()) {
-			logger.info("Looking for lost responsibilities");
+			logger.debug("Looking for lost responsibilities");
 
 			try {
 				Set<KeygroupID> subscribedKeygroups =

src/main/java/tasks/background/DetectMissingHeartbeats.java

@@ -56,7 +56,7 @@ public DetectMissingHeartbeats(FBase fBase, int checkInterval, int toleratedMiss
 	public Boolean executeFunctionality() {
 
 		while (!Thread.currentThread().isInterrupted()) {
-			logger.info("Looking for missing heartbeats");
+			logger.debug("Looking for missing heartbeats");
 
 			try {
 				Map<String, Pair<String, Long>> heartbeats = fBase.connector.heartbeats_listAll();

src/main/java/tasks/background/DetectMissingResponsibility.java

@@ -49,7 +49,7 @@ public DetectMissingResponsibility(FBase fBase, int checkInterval) {
 	public Boolean executeFunctionality() {
 
 		while (!Thread.currentThread().isInterrupted()) {
-			logger.info("Looking for missing responsibilities");
+			logger.debug("Looking for missing responsibilities");
 
 			try {
 				Map<KeygroupID, Pair<String, Integer>> responsibilities =

src/main/java/tasks/background/PollLatestConfigurationDataForResponsibleKeygroupsTask.java

@@ -47,7 +47,7 @@ public class PollLatestConfigurationDataForResponsibleKeygroupsTask extends Task
 			Logger.getLogger(PollLatestConfigurationDataForResponsibleKeygroupsTask.class.getName());
 
 	static {
-		logger.setLevel(Level.INFO);
+		logger.setLevel(Level.WARN);
 	}
 
 	/**
@@ -71,7 +71,7 @@ public Boolean executeFunctionality() {
 
 		while (!Thread.currentThread().isInterrupted()) {
 
-			logger.info("Polling latest configuration data");
+			logger.debug("Polling latest configuration data");
 
 			try {
 				// get responsible keygroupIDs

src/main/java/tasks/background/PutHeartbeatTask.java

@@ -42,7 +42,7 @@ public PutHeartbeatTask(FBase fBase, int pulse) {
 	public Boolean executeFunctionality() {
 
 		while (!Thread.currentThread().isInterrupted()) {
-			logger.info("Putting heartbeat");
+			logger.debug("Putting heartbeat");
 
 			try {
 				fBase.connector.heartbeats_update(fBase.configuration.getMachineName(),

src/main/resources/log4j.properties

@@ -17,4 +17,4 @@ log4j.appender.file.layout.ConversionPattern=%-5p [%d{HH:mm:ss, SSS}] %-25c %x -
 
 # log-level config
 log4j.logger.com.amazonaws=WARN
-log4j.logger.org.apache.http=WARN
+log4j.logger.org.apache.http=WARN