Merge pull request #24 from estigma88/#23-conditionalonbean-issue

Updating starters to use correctly the @ConditionalOnBean features
estigma88 · Aug 21, 2018 · 8ebb388 · 8ebb388
2 parents 409e414 + 8789c07
commit 8ebb388
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/main/desktop-network-gui/build.gradle b/main/desktop-network-gui/build.gradle
@@ -8,12 +8,14 @@ repositories {
     mavenCentral()
 }
 
-version = '2.0.1'
+version = '2.0.2'
 
 dependencies {
     compile("org.springframework.boot:spring-boot-starter:1.5.10.RELEASE")
 
-    compile group: 'com.github.estigma88', name: 'jdhtuq-chord-spring-boot-starter', version: '2.0.0'
-    compile group: 'com.github.estigma88', name: 'jdhtuq-dhash-spring-boot-starter', version: '2.0.0'
+    //compile group: 'com.github.estigma88', name: 'jdhtuq-chord-spring-boot-starter', version: '2.0.0'
+    //compile group: 'com.github.estigma88', name: 'jdhtuq-dhash-spring-boot-starter', version: '2.0.0'
+    compile project(':main:starters:chord-spring-boot-starter')
+    compile project(':main:starters:dhash-spring-boot-starter')
     compile group: 'com.github.estigma88', name: 'jdhtuq-socket-communication-spring-boot-starter', version: '2.0.0'
 }
diff --git a/main/desktop-structure-gui/build.gradle b/main/desktop-structure-gui/build.gradle
@@ -8,12 +8,12 @@ repositories {
     mavenCentral()
 }
 
-version = '2.0.1'
+version = '2.0.2'
 
 dependencies {
     compile("org.springframework.boot:spring-boot-starter:1.5.10.RELEASE")
 
-    compile group: 'com.github.estigma88', name: 'jdhtuq-chord-spring-boot-starter', version: '2.0.0'
-    compile group: 'com.github.estigma88', name: 'jdhtuq-dhash-spring-boot-starter', version: '2.0.0'
+    compile project(':main:starters:chord-spring-boot-starter')
+    compile project(':main:starters:dhash-spring-boot-starter')
     compile group: 'com.github.estigma88', name: 'jdhtuq-data-structure-communication-spring-boot-starter', version: '2.0.0'
 }
diff --git a/main/starters/chord-spring-boot-starter/build.gradle b/main/starters/chord-spring-boot-starter/build.gradle
@@ -14,7 +14,7 @@ plugins {
 }
 
 group = 'com.github.estigma88'
-version = '2.0.0'
+version = '2.0.1'
 
 sourceCompatibility = 1.8
 

diff --git a/...ng-boot-starter/src/main/java/co/edu/uniquindio/chord/starter/ChordAutoConfiguration.java b/...ng-boot-starter/src/main/java/co/edu/uniquindio/chord/starter/ChordAutoConfiguration.java
@@ -43,7 +43,7 @@ public OverlayNodeFactory overlayNodeFactory(CommunicationManager communicationM
     }
 
     @Bean
-    @ConditionalOnMissingBean
+    @ConditionalOnMissingBean(name = {"communicationManagerChord"})
     public CommunicationManager communicationManagerChord(CommunicationManagerFactory communicationManagerFactory) {
         return communicationManagerFactory.newCommunicationManager("chord");
     }
@@ -73,7 +73,7 @@ public KeyFactory keyFactory(HashingGenerator hashingGenerator) {
     }
 
     @Bean
-    @ConditionalOnMissingBean
+    @ConditionalOnMissingBean(name = "scheduledStableRing")
     public ScheduledExecutorService scheduledStableRing() {
         return Executors.newScheduledThreadPool(chordProperties.getStableRingThreadPool());
     }

diff --git a/main/starters/dhash-spring-boot-starter/build.gradle b/main/starters/dhash-spring-boot-starter/build.gradle
@@ -14,7 +14,7 @@ plugins {
 }
 
 group = 'com.github.estigma88'
-version = '2.0.0'
+version = '2.0.1'
 
 sourceCompatibility = 1.8
 

diff --git a/...ng-boot-starter/src/main/java/co/edu/uniquindio/dhash/starter/DHashAutoConfiguration.java b/...ng-boot-starter/src/main/java/co/edu/uniquindio/dhash/starter/DHashAutoConfiguration.java
@@ -35,7 +35,7 @@ public StorageNodeFactory storageNodeFactory(OverlayNodeFactory overlayNodeFacto
     }
 
     @Bean
-    @ConditionalOnMissingBean
+    @ConditionalOnMissingBean(name = {"communicationManagerDHash"})
     public CommunicationManager communicationManagerDHash(CommunicationManagerFactory communicationManagerFactory) {
         return communicationManagerFactory.newCommunicationManager("dhash");
     }