created a functional configuration system

Author: coachdetoni

src/de/sveh/simpleserverclient/client/Client.java

@@ -2,9 +2,10 @@
 
 import java.io.*;
 import java.net.Socket;
-import java.util.Properties;
 
 import de.sveh.simpleserverclient.annotations.Authorized;
+import de.sveh.simpleserverclient.config.IConfiguration;
+import de.sveh.simpleserverclient.config.PropertyConfiguration;
 import de.sveh.simpleserverclient.datapackage.AbstractDataPackage;
 import de.sveh.simpleserverclient.datapackage.MessageDataPackage;
 import de.sveh.simpleserverclient.encoding.AESEncoding;
@@ -29,42 +30,40 @@ public abstract class Client {
     private ClientState clientState;
     private AESEncoding aesEncoding;
 
-    private Properties properties;
+    private IConfiguration properties;
 
     public Client(String host, int port) {
         createClient(host, port);
     }
 
     public Client(String host, int port, String propertyFilename) {
-        boolean read = readProperties(propertyFilename);
-        if (!read)
-            ILogger.log(LogType.ERROR, "Could not read the property file");
+        properties = new PropertyConfiguration(propertyFilename);
 
         createClient(host, port);
     }
 
     public Client(String propertyFilename) {
-        boolean read = readProperties(propertyFilename);
-        if (read) {
-            String hostProp = properties.getProperty("host");
-            String portProp = properties.getProperty("port");
-
-            if (hostProp == null) {
-                ILogger.log(LogType.ERROR, "No host property found");
-                return;
-            } else if (portProp == null) {
-                ILogger.log(LogType.ERROR, "No port property found");
-                return;
-            }
+        properties = new PropertyConfiguration(propertyFilename);
 
-            try {
-                int portNo = Integer.parseInt(portProp);
-                createClient(hostProp, portNo);
-            } catch (Exception e) {
-                ILogger.log(LogType.ERROR, "Port property is not a number");
-            }
+        String hostProp = properties.getProperty("host");
+        String portProp = properties.getProperty("port");
 
+        if (hostProp == null) {
+            ILogger.log(LogType.ERROR, "No host property found");
+            return;
+        } else if (portProp == null) {
+            ILogger.log(LogType.ERROR, "No port property found");
+            return;
         }
+
+        try {
+            int portNo = Integer.parseInt(portProp);
+            createClient(hostProp, portNo);
+        } catch (Exception e) {
+            ILogger.log(LogType.ERROR, "Port property is not a number");
+        }
+
+
     }
 
     private void createClient(String host, int port) {
@@ -76,25 +75,10 @@ private void createClient(String host, int port) {
         init();
     }
 
-
-    private boolean readProperties(String propertyFilename) {
-        properties = new Properties();
-        File propertyFile = new File(propertyFilename);
-        if (!propertyFile.exists() || propertyFile.isDirectory()) return false;
-
-        try {
-            properties.load(new FileInputStream(propertyFile));
-        } catch (IOException e) {
-            return false;
-        }
-        return true;
-    }
-
     public String getProperty(String key) {
         return properties.getProperty(key);
     }
 
-
     public abstract void onConnected();
 
     public abstract void onDisconnected();
@@ -121,7 +105,7 @@ public void connect() {
                 in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
                 out = new PrintWriter(socket.getOutputStream(), true);
 
-                new Thread(() -> onConnected()).start();
+                new Thread(this::onConnected).start();
 
                 String line;
                 while ((line = in.readLine()) != null) {
@@ -143,7 +127,7 @@ public void connect() {
                     System.out.println("Could not connect to the server!");
                 }
 
-                new Thread(() -> onDisconnected()).start();
+                new Thread(this::onDisconnected).start();
             }
         }).start();
 

src/de/sveh/simpleserverclient/config/AbstractFileConfiguration.java

@@ -0,0 +1,7 @@
+package de.sveh.simpleserverclient.config;
+
+public interface IConfiguration {
+    boolean save();
+    boolean addProperty(String key, String value);
+    String getProperty(String key);
+}

src/de/sveh/simpleserverclient/config/IConfiguration.java

@@ -0,0 +1,49 @@
+package de.sveh.simpleserverclient.config;
+
+import java.io.*;
+import java.util.Properties;
+
+public class PropertyConfiguration implements IConfiguration {
+
+    private Properties properties;
+    private File file;
+
+    public PropertyConfiguration(String fileName) {
+        this.file = new File(fileName);
+        properties = new Properties();
+        InputStream in;
+        try {
+            in = new FileInputStream(file);
+            properties.load(in);
+            in.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @Override
+    public boolean addProperty(String key, String value) {
+        if(properties.contains(key)) return false;
+
+        properties.put(key, value);
+        return true;
+    }
+
+    @Override
+    public boolean save(){
+        try {
+            properties.store(new FileOutputStream(file), null);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public String getProperty(String key) {
+        return properties.getProperty(key);
+    }
+}