CHANGE: routingKey to bindingKey (#79)

* FIX: wrong merge

* CHANGE: routing to binding

Author: ned29

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

@@ -101,8 +101,8 @@ public class RmqHandler {
 
 	@Getter
 	@Setter
-	@Value("${rabbitmq.routing.key}")
-	private String routingKey;
+	@Value("${rabbitmq.binding.key}")
+	private String bindingKey;
 
 	@Getter
 	@Setter
@@ -156,7 +156,7 @@ TopicExchange exchange() {
 
 	@Bean
 	Binding binding(Queue queue, TopicExchange exchange) {
-		return BindingBuilder.bind(queue).to(exchange).with(routingKey);
+		return BindingBuilder.bind(queue).to(exchange).with(bindingKey);
 	}
 
 	@Bean
@@ -191,7 +191,7 @@ public RabbitTemplate rabbitMqTemplate() {
 			}
 
 			rabbitTemplate.setExchange(exchangeName);
-			rabbitTemplate.setRoutingKey(routingKey);
+			rabbitTemplate.setRoutingKey(bindingKey);
 			rabbitTemplate.setQueue(getQueueName());
 			rabbitTemplate.setConfirmCallback(new ConfirmCallback() {
 				@Override

src/main/resources/application.properties

@@ -22,7 +22,7 @@ rabbitmq.domainId: er001-eiffelxxx
 rabbitmq.componentName: eiffelintelligence
 rabbitmq.consumerName: messageConsumer
 rabbitmq.queue.durable:true
-rabbitmq.routing.key:#
+rabbitmq.binding.key:#
 rabbitmq.waitlist.queue.suffix:waitlist
 
 mergeidmarker: %IdentifyRules%

src/main/resources/public/raml/info_instance-schema.raml

@@ -33,7 +33,7 @@ information: |
           "waitlistSufix" : {
               "type":"string"
           },
-          "routingKey" : {
+          "bindingKey" : {
               "type":"string"
           },
           "consumerName" : {

src/test/java/com/ericsson/ei/rmqhandler/RmqHandlerTest.java

@@ -26,13 +26,9 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.ericsson.ei.handlers.EventHandler;
-import com.ericsson.ei.rmqhandler.RmqHandler;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
 public class RmqHandlerTest {
@@ -43,15 +39,16 @@ public class RmqHandlerTest {
     private Integer port = 5672;
     private String domainId = "EN1";
     private String componentName = "eiffelintelligence";
-    private String routingKey = "#";
+    private String bindingKey = "#";
     private String consumerName = "messageConsumer";
 
     @InjectMocks
-    RmqHandler rmqHandler;
+    private RmqHandler rmqHandler;
 
-    @Mock ConnectionFactory factory;
+    @Mock
+    private ConnectionFactory factory;
 
-    @Before public void setUp() throws Exception {
+    @Before public void setUp() {
         MockitoAnnotations.initMocks(this);
         initProperties();
     }
@@ -64,7 +61,7 @@ public void initProperties()
         rmqHandler.setPort(port);
         rmqHandler.setDomainId(domainId);
         rmqHandler.setComponentName(componentName);
-        rmqHandler.setRoutingKey(routingKey);
+        rmqHandler.setBindingKey(bindingKey);
         rmqHandler.setConsumerName(consumerName);
     }
 
@@ -100,7 +97,7 @@ public void getComponentNameTest() {
 
     @Test
     public void getRoutingKeyTest() {
-        assertTrue(rmqHandler.getRoutingKey().equals(routingKey));
+        assertTrue(rmqHandler.getBindingKey().equals(bindingKey));
     }
 
     @Test