bugfix: IdRulesHandler, objects null check added. RmqHandler rabbit user & password activated. (#18)

Author: emichaf

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

@@ -38,24 +38,26 @@ public void setJmesPathInterface(JmesPathInterface jmesPathInterface) {
     }
 
     public void runIdRules(RulesObject rulesObject, String event) {
-        JsonNode idsJsonObj = getIds(rulesObject, event);
-        ArrayList<String> objects = null;
-        String id;
-        if (idsJsonObj.isArray()) {
-            for (final JsonNode idJsonObj : idsJsonObj) {
-                id = idJsonObj.textValue();
-                objects = matchIdRulesHandler.fetchObjectsById(rulesObject, id);
-                for (String object:objects) {
-                    extractionHandler.runExtraction(rulesObject, id, event, object);
-                }
-                if (objects.size() == 0){
-                    if (rulesObject.isStartEventRules()) {
-                        extractionHandler.runExtraction(rulesObject, id, event, (JsonNode)null);
-                    } else {
-                        try {
-                            waitListStorageHandler.addEventToWaitList(event, rulesObject);
-                        } catch (Exception e) {
-                            log.info(e.getMessage(),e);
+        if (rulesObject != null && event != null) {
+            JsonNode idsJsonObj = getIds(rulesObject, event);
+            ArrayList<String> objects = null;
+            String id;
+            if (idsJsonObj != null && idsJsonObj.isArray()) {
+                for (final JsonNode idJsonObj : idsJsonObj) {
+                    id = idJsonObj.textValue();
+                    objects = matchIdRulesHandler.fetchObjectsById(rulesObject, id);
+                    for (String object : objects) {
+                        extractionHandler.runExtraction(rulesObject, id, event, object);
+                    }
+                    if (objects.size() == 0) {
+                        if (rulesObject.isStartEventRules()) {
+                            extractionHandler.runExtraction(rulesObject, id, event, (JsonNode) null);
+                        } else {
+                            try {
+                                waitListStorageHandler.addEventToWaitList(event, rulesObject);
+                            } catch (Exception e) {
+                                log.info(e.getMessage(), e);
+                            }
                         }
                     }
                 }

src/main/java/com/ericsson/ei/rmqhandler/RmqHandler.java

@@ -151,8 +151,10 @@ ConnectionFactory connectionFactory() {
         factory = new CachingConnectionFactory(host, port);
         factory.setPublisherConfirms(true);
         factory.setPublisherReturns(true);
-        // factory.setUsername("guest");
-        // factory.setPassword("guest");
+        if(user != null && user.length() !=0 && password != null && password.length() !=0) {
+            factory.setUsername(user);
+            factory.setPassword(password);
+        }
         return factory;
     }