eiffel-intelligence listed issues are resolved (#63)

* mongoclient removed deprecated method usage
added code for create database and collection if missed in mongo
resolved unchecked or unsafe operations

* travis-ci build issues fixed

Author: Raja Maragani

src/main/java/com/ericsson/ei/controller/MissedNotificationControllerImpl.java

@@ -14,6 +14,7 @@
 package com.ericsson.ei.controller;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,7 +51,7 @@ public class MissedNotificationControllerImpl implements MissedNotificationContr
      */
     public ResponseEntity<QueryResponse> getQueryMissedNotifications(
             @RequestParam("SubscriptionName") final String subscriptionName) {
-        ArrayList response = processMissedNotification.processQueryMissedNotification(subscriptionName);
+        List<String> response = processMissedNotification.processQueryMissedNotification(subscriptionName);
         log.info("The response is : " + response.toString());
         return new ResponseEntity(response.toString(), HttpStatus.OK);
     }

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

@@ -57,7 +57,7 @@ public void runExtraction(RulesObject rulesObject, String mergeId, String event,
 
         if(aggregatedDbObject != null) {
             String objectId = objectHandler.extractObjectId(aggregatedDbObject);
-            String mergedContent = mergeHandler.mergeObject(objectId, mergeId, rulesObject, event, extractedContent);
+            mergeHandler.mergeObject(objectId, mergeId, rulesObject, event, extractedContent);
         }
     }
 

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

@@ -16,7 +16,6 @@
 */
 package com.ericsson.ei.handlers;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.slf4j.Logger;

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

@@ -19,23 +19,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.core.ChannelAwareMessageListener;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
 import com.ericsson.ei.rules.RulesHandler;
 import com.ericsson.ei.rules.RulesObject;
-
 import com.rabbitmq.client.Channel;
 
-import java.util.concurrent.Executor;
-
-import javax.annotation.PostConstruct;
-
 @Component
 public class EventHandler {
 
@@ -75,6 +66,5 @@ public void onMessage(Message message, Channel channel) throws Exception {
         eventReceived(messageBody);
         long deliveryTag = message.getMessageProperties().getDeliveryTag();
         channel.basicAck(deliveryTag, false);
-        int breakHere = 1;
     }
 }

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

@@ -16,11 +16,7 @@
 */
 package com.ericsson.ei.handlers;
 
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,11 +26,8 @@
 
 import com.ericsson.ei.jmespath.JmesPathInterface;
 import com.ericsson.ei.mongodbhandler.MongoDBHandler;
-import com.ericsson.ei.rules.RulesHandler;
 import com.ericsson.ei.rules.RulesObject;
-import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;

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

@@ -100,7 +100,7 @@ public String runHistoryExtraction(String aggregatedObjectId, RulesObject rules,
     private String getRulePath(String stringRule) {
         String flattenRule = JsonFlattener.flatten(stringRule);
         String[] rulePair = flattenRule.split(":");
-        String ruleKey = mergePrepare.destringify(rulePair[0]);
+        String ruleKey = MergePrepare.destringify(rulePair[0]);
         return ruleKey;
     }
 

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

@@ -19,10 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.ericsson.ei.subscriptionhandler.SubscriptionHandler;
-import com.mongodb.DBObject;
-import lombok.Getter;
-import lombok.Setter;
+import org.bson.Document;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,9 +29,14 @@
 import com.ericsson.ei.jmespath.JmesPathInterface;
 import com.ericsson.ei.mongodbhandler.MongoDBHandler;
 import com.ericsson.ei.rules.RulesObject;
+import com.ericsson.ei.subscriptionhandler.SubscriptionHandler;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mongodb.util.JSON;
+
+import lombok.Getter;
+import lombok.Setter;
 
 @Component
 public class ObjectHandler {
@@ -186,12 +188,13 @@ public String lockDocument(String id){
                 JsonNode documentJson = mapper.readValue(setLock, JsonNode.class);
                 JsonNode queryCondition = mapper.readValue(conditionId, JsonNode.class);
                 ((ObjectNode) queryCondition).set("$or", mapper.readValue(conditionLock, JsonNode.class));
-                DBObject result = mongoDbHandler.findAndModify(databaseName, collectionName, queryCondition.toString(), documentJson.toString());
-                if(result != null){
+                Document result = mongoDbHandler.findAndModify(databaseName, collectionName, queryCondition.toString(), documentJson.toString());
+                if (result != null) {
                     log.info("DB locked by " + Thread.currentThread().getId() + " thread");
                     documentLocked = false;
-                    return result.toString();}
-//              To Remove
+                    return JSON.serialize(result);
+                }
+                // To Remove
                 log.info("Waiting by " + Thread.currentThread().getId() + " thread");
             } catch (Exception e) {
                 log.info(e.getMessage(),e); }

src/main/java/com/ericsson/ei/jsonmerge/MergePrepare.java

@@ -137,7 +137,7 @@ public String getMergePathFromArrayMergeRules(String originObject, String mergeR
                 if (!firstPath.isEmpty()) {
                     String firstPathNoIndexes = StringUtils.removePattern(firstPath, "(\\.0|\\.[1-9][0-9]*)");
                     String[] firstPathSubstrings = firstPathNoIndexes.split("\\.");
-                    ArrayList<String> fp = new ArrayList(Arrays.asList(firstPathSubstrings));
+                    ArrayList<String> fp = new ArrayList<String>(Arrays.asList(firstPathSubstrings));
                     fp.remove(fp.size() - 1);
                     firstPathTrimmed = StringUtils.join(fp, ":{");
                     String secondRuleComplete = "{" + firstPathTrimmed + ":" + secondRule + "}";
@@ -167,7 +167,7 @@ public String getMergePathFromArrayMergeRules(String originObject, String mergeR
 
     public String trimLastInPath(String path, String delimiter) {
         String[] firstPathSubstrings = path.split("\\.");
-        ArrayList<String> fp = new ArrayList(Arrays.asList(firstPathSubstrings));
+        ArrayList<String> fp = new ArrayList<String>(Arrays.asList(firstPathSubstrings));
         fp.remove(fp.size() - 1);
         return StringUtils.join(fp, delimiter);
     }