Ttl update for aggregation (#103)

* JMESPath REST API

* JMESPath  API with fixed reviews

* partial work jmespath rest

* JMESPath API with RAML 0.8 specification

* remove componet comment

* replace tab with spaces

* fix usage examples

* prepare for new asserts in flow test

* fix unit tests

* Subscription for individual events

* pom file

* subscription individual objects

* pom

* error removal

* Subscription Individual Object

* deleting unused import

* jmespath comment correction

* space removal and new clean build

* review changes

* review change file deleted

* review change

* review changes

* log.info to log.error

* required changes

* raml

* raml files

* resolving conflict

* self generated code raml

* controllers auto generated

* auto generated

* removing ttl

* adding ttl

* copied pom

* changes in app.properties

* resolving conflict with upstream

* adding more files

* added time lapse variable

* rebased...

* new clone and update

* reviewed changes

* review changes-evasiba

* review changes 2:evasiba

* handling of authorization by Subscription REST API: 9584

* changing property name

* pom updated

* method change

* reviewed changes-1

* some review changes regarding comments

* some changes ´to get pass throguh tests

* review changes

* Update application.properties

* Fix test

* Update to check ttl value

* updating ttl values

* removed a comment

* handling empty ttl

* added try/catch block to ttl

* reviewed change in properties file

Author: saif-ericsson

pom.xml

@@ -338,4 +338,4 @@
 
         </plugins>
     </build>
-</project>
+</project>

src/main/java/com/ericsson/ei/handlers/ObjectHandler.java

@@ -48,7 +48,8 @@ public class ObjectHandler {
     @Value("${aggregated.collection.name}")
     private String collectionName;
 
-    @Getter @Setter
+    @Getter
+    @Setter
     @Value("${spring.data.mongodb.database}")
     private String databaseName;
 
@@ -70,7 +71,7 @@ public class ObjectHandler {
 
     @Getter
     @Value("${aggregated.collection.ttlValue}")
-    private int ttlValue;
+    private String ttlValue;
 
     public boolean insertObject(String aggregatedObject, RulesObject rulesObject, String event, String id) {
         if (id == null) {
@@ -81,7 +82,9 @@ public boolean insertObject(String aggregatedObject, RulesObject rulesObject, St
         JsonNode document = prepareDocumentForInsertion(id, aggregatedObject);
         log.debug("ObjectHandler: Aggregated Object document to be inserted: " + document.toString());
 
-        mongoDbHandler.createTTLIndex(databaseName, collectionName, "Time", ttlValue);
+        if (getTtl() > 0) {
+            mongoDbHandler.createTTLIndex(databaseName, collectionName, "Time", getTtl());
+        }
 
         boolean result = mongoDbHandler.insertDocument(databaseName, collectionName, document.toString());
         if (result)
@@ -96,9 +99,9 @@ public boolean insertObject(JsonNode aggregatedObject, RulesObject rulesObject,
     }
 
     /**
-     * This method uses previously locked in database aggregatedObject (lock was
-     * set in lockDocument method) and modifies this document with the new
-     * values and removes the lock in one query
+     * This method uses previously locked in database aggregatedObject (lock was set
+     * in lockDocument method) and modifies this document with the new values and
+     * removes the lock in one query
      * 
      * @param aggregatedObject
      *            String to insert in database
@@ -185,8 +188,7 @@ public String extractObjectId(JsonNode aggregatedDbObject) {
 
     /**
      * Locks the document in database to achieve pessimistic locking. Method
-     * findAndModify is used to optimize the quantity of requests towards
-     * database.
+     * findAndModify is used to optimize the quantity of requests towards database.
      * 
      * @param id
      *            String to search
@@ -218,4 +220,16 @@ public String lockDocument(String id) {
         }
         return null;
     }
+
+    public int getTtl() {
+        int ttl = 0;
+        if (ttlValue != null && !ttlValue.isEmpty()) {
+            try {
+                ttl = Integer.parseInt(ttlValue);
+            } catch (NumberFormatException e) {
+                log.error(e.getMessage(), e);
+            }
+        }
+        return ttl;
+    }
 }

src/main/resources/application.properties

@@ -39,7 +39,7 @@ spring.data.mongodb.database: eiffel_intelligence
 server.session-timeout: 1200
 
 aggregated.collection.name: aggregated_objects
-aggregated.collection.ttlValue: 600
+aggregated.collection.ttlValue: 
 event_object_map.collection.name: event_object_map
 waitlist.collection.name: wait_list
 waitlist.collection.ttlValue: 600