RabbitMQ queue bindings missing due to update in spring boot version (#513)

* Modified code to support binding key generation to EI queue

* Changed logger statement from info to debug

* Changed some logger statements

* Updated pom.xml for new release

Co-authored-by: SANTOSH NC <[email protected]>

Author: SantoshNC68

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.ericsson</groupId>
     <artifactId>eiffel-intelligence</artifactId>
-    <version>3.2.1</version>
+    <version>3.2.2</version>
     <packaging>war</packaging>
 
     <parent>

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

@@ -183,14 +183,14 @@ public ArrayList<String> getEventToObjectList(String eventId) {
     public boolean deleteEventObjectMap(String templateName) {
         String queryString = "{\"objects\": { \"$in\" : [/.*" + templateName + "/]} }";
         MongoStringQuery query = new MongoStringQuery(queryString);
-        LOGGER.info("The JSON query for deleting aggregated object is : {}", query);
+        LOGGER.debug("The JSON query for deleting aggregated object is : {}", query);
         return mongodbhandler.dropDocument(databaseName, collectionName, query);
     }
 
     public boolean isEventInEventObjectMap(String eventId) {
     	String condition = "{\"objects\": { \"$in\" : [\"" + eventId + "\"]} }";
         MongoStringQuery query = new MongoStringQuery(condition);
-        LOGGER.info("The JSON query for isEventInEventObjectMap is : {}", query);
+        LOGGER.debug("The JSON query for isEventInEventObjectMap is : {}", query);
         List<String> documents = mongodbhandler.find(databaseName, collectionName, query);
         return !documents.isEmpty();
     }

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

@@ -313,7 +313,7 @@ private boolean isInvalidId(String id) {
 
     private void postInsertActions(String aggregatedObject, RulesObject rulesObject, String event,
             String id) {
-    	LOGGER.info("Updating the event object map with event id: " + id + " event is : " + event);
+    	LOGGER.debug("Updating the event object map with event id: " + id + " event is : " + event);
         eventToObjectMap.updateEventToObjectMapInMemoryDB(rulesObject, event, id, getTtl());
     }
 

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

@@ -29,6 +29,8 @@
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.Binding.DestinationType;
 import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.Declarable;
+import org.springframework.amqp.core.Declarables;
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.core.TopicExchange;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
@@ -198,14 +200,16 @@ protected Binding binding() {
     }
 
     @Bean
-    public List<Binding> bindings() {
+    public Declarables bindings() {
         String[] bindingKeysArray = splitBindingKeys(rmqProperties.getBindingKeys());
-        List<Binding> bindingList = new ArrayList<Binding>();
+        List<Binding> bindingsList = new ArrayList<Binding>();
+        List<Declarable> bindingList = new ArrayList<Declarable>();
         for (String bindingKey : bindingKeysArray) {
+            bindingsList.add(BindingBuilder.bind(externalQueue()).to(exchange()).with(bindingKey));
             bindingList.add(BindingBuilder.bind(externalQueue()).to(exchange()).with(bindingKey));
         }
-        deleteBindings(bindingKeysArray,bindingList);
-        return bindingList;
+        deleteBindings(bindingKeysArray,bindingsList);
+        return new Declarables(bindingList);
     }
 
     private boolean isRMQCredentialsSet() {
@@ -225,7 +229,7 @@ private String[] splitBindingKeys(String bindingKeys) {
      * Binding key which is not present in the current AMQPBindingObjectList gets deleted and removed from mongoDB.
      * @return
      */
-    private void deleteBindings(String[] newBindingKeysArray, List<Binding> AMQPBindingObjectList) {
+    private void deleteBindings(String[] newBindingKeysArray, List<Binding> amqpBindingObjectList) {
         // Creating BindingKeys Collection in mongoDB
         ArrayList<String> allDocuments = mongoDBHandler.getAllDocuments(dataBaseName, collectionName);
         ArrayList<String> existingBindingsData = new ArrayList<String>();
@@ -250,16 +254,16 @@ private void deleteBindings(String[] newBindingKeysArray, List<Binding> AMQPBind
             }
         }
         // to store the binding keys used for rabbitMQ, in mongo db.
-        storeNewBindingKeys(existingBindingsData, AMQPBindingObjectList);
+        storeNewBindingKeys(existingBindingsData, amqpBindingObjectList);
     }
 
 	/**
      * This method is used to store the binding keys used for rabbitMQ, in mongoDB.
      * @return
      */
-    private void storeNewBindingKeys(ArrayList<String> existingBindingsData, List<Binding> AMQPBindingObjectList){
+    private void storeNewBindingKeys(ArrayList<String> existingBindingsData, List<Binding> amqpBindingObjectList){
     // comparing with the stored key and adding the new binding key into the mongoDB.
-       for(final Binding bindingKey:AMQPBindingObjectList){
+       for(final Binding bindingKey:amqpBindingObjectList){
             if(existingBindingsData.contains(bindingKey.getRoutingKey())){
                 LOGGER.info("Binding already present in mongoDB");
             }else{

src/main/java/com/ericsson/ei/subscription/RunSubscription.java

@@ -94,7 +94,7 @@ public boolean runSubscriptionOnObject(String aggregatedObject, Iterator<JsonNod
 
             JsonNode requirement = requirementIterator.next();
 
-            LOGGER.info("The fulfilled requirement which condition will check is : {}", requirement.toString());
+            LOGGER.debug("The fulfilled requirement which condition will check is : {}", requirement.toString());
             ArrayNode conditions = (ArrayNode) requirement.get("conditions");
 
             count_condition_fulfillment = 0;
@@ -141,7 +141,7 @@ public boolean runSubscriptionOnObject(String aggregatedObject, Iterator<JsonNod
         }
 
         LOGGER.info("The final value of conditionFulfilled is : {} for aggregation object id: {} and Subscription: {}",
-                conditionFulfilled, id);
+                conditionFulfilled, id, subscriptionName);
 
         return conditionFulfilled;
     }