Refactored creation of RabbitManager

build.gradle

@@ -7,6 +7,7 @@ buildscript {
     }
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+        classpath group: 'com.cinnober.gradle', name: 'semver-git', version: '2.3.1'
     }
 }
 
@@ -27,14 +28,14 @@ plugins {
     id "maven-publish"
 }
 
+apply plugin: 'com.cinnober.gradle.semver-git'
+
 group = 'eu.h2020.symbiote'
-version = '0.3.1'
 
 // this is needed for starter to not create fat jar
 bootRepackage.enabled = false
 
 jar {
-    baseName = 'rap-plugin'
     version =  project.version
 }
 
@@ -100,14 +101,13 @@ dependencies {
 
 dependencyManagement {
     imports {
-        mavenBom "org.springframework.cloud:spring-cloud-dependencies:Dalston.SR2"
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:Dalston.SR5"
     }
 }
 
 // creating source jar
 task sourceJar(type: Jar) {
     from sourceSets.main.allJava
-    baseName = 'rap-plugin'
     version =  project.version
 }
 

src/integration-test/java/eu/h2020/symbiote/rapplugin/rap/plugin/RapPluginRegistrationTest.java

@@ -40,8 +40,7 @@
 import eu.h2020.symbiote.rapplugin.TestingRabbitConfig;
 
 @RunWith(SpringRunner.class)
-@Import({RabbitManager.class,
-    TestingRabbitConfig.class,
+@Import({TestingRabbitConfig.class,
     RapPluginProperties.class})
 @EnableConfigurationProperties({RabbitConnectionProperties.class, RapProperties.class})
 @DirtiesContext
@@ -59,6 +58,11 @@ public static class TestConfiguration {
         public RapPlugin rapPlugin(RabbitManager manager) {
             return new RapPlugin(manager, "platId", false, true);
         }
+
+        @Bean
+        public RabbitManager rapRabbitManager(RabbitTemplate template) {
+        	return new RabbitManager(template);
+        }
     }
 
     @Autowired

src/main/java/eu/h2020/symbiote/rapplugin/RapPluginConfiguration.java

@@ -7,15 +7,18 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
+import eu.h2020.symbiote.rapplugin.messaging.RabbitManager;
 import eu.h2020.symbiote.rapplugin.properties.RabbitConnectionProperties;
 import eu.h2020.symbiote.rapplugin.properties.RapProperties;
 
@@ -28,6 +31,11 @@
 public class RapPluginConfiguration implements ApplicationContextAware {
     private static final Logger LOG = LoggerFactory.getLogger(RapPluginConfiguration.class);
 
+    @Bean
+    public RabbitManager rapRabbitManager(RabbitTemplate template) {
+    	return new RabbitManager(template);
+    }
+
     @Autowired
     private SimpleRabbitListenerContainerFactory simpleRabbitListenerContainerFactory;
 

src/main/java/eu/h2020/symbiote/rapplugin/messaging/RabbitManager.java

@@ -23,7 +23,6 @@
  *
  * @author mateuszl, Petar Krivic, Mario Kusek
  */
-@Component
 public class RabbitManager {
     private static final Logger LOG = LoggerFactory.getLogger(RabbitManager.class);
     private static final int REPLY_TIMEOUT = 20_000;