Merge pull request #20 from iot-dsa-v2/develop

1.1.5

Author: d-shapiro

dslink.json

@@ -1,6 +1,6 @@
 {
   "name": "dslink-java-v2-restadapter",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Java DSA to REST adpater DSLink",
   "main": "bin/dslink-java-v2-restadapter",
   "configs": {

src/main/java/org/iot/dsa/dslink/restadapter/Util.java

@@ -8,6 +8,7 @@
 import org.etsdb.DatabaseFactory;
 import org.etsdb.QueryCallback;
 import org.etsdb.util.DbPurger;
+import org.etsdb.util.PurgeSettings;
 import org.iot.dsa.DSRuntime;
 import org.iot.dsa.io.json.JsonReader;
 import org.iot.dsa.node.DSElement;
@@ -17,6 +18,7 @@
 public class Util {
 
     private static Database<SubUpdate> buffer = null;
+    private static PurgeSettings bufferPurgesSettings = MainNode.instance;
 
     public enum AUTH_SCHEME {
         NO_AUTH,
@@ -80,11 +82,15 @@ public static double getDouble(DSMap map, String key, double def) {
         }
     }
 
+    public static void setBufferPurgeSettings(PurgeSettings purgeSettings) {
+        bufferPurgesSettings = purgeSettings;
+    }
+    
     private static void initBuffer() {
         File f = new File(Constants.BUFFER_PATH);
         buffer = DatabaseFactory.createDatabase(f, new SubUpdateSerializer());
         DbPurger purger = DbPurger.getInstance();
-        purger.addDb(buffer, MainNode.instance);
+        purger.addDb(buffer, bufferPurgesSettings);
         Runnable purgeRunner = purger.setupPurger();
         DSRuntime.runAfterDelay(purgeRunner, 30000, 30000);
     }