fixes

hmcts · Dec 3, 2019 · d784831 · d784831
1 parent ecca861
commit d784831
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/uk/gov/hmcts/reform/em/EmTestConfig.java b/src/main/java/uk/gov/hmcts/reform/em/EmTestConfig.java
@@ -1,7 +1,6 @@
 package uk.gov.hmcts.reform.em;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -11,7 +10,6 @@
 @Configuration
 @ComponentScan({"uk.gov.hmcts.reform.em.test.**"})
 @EnableAutoConfiguration
-@EnableFeignClients(basePackages = {"uk.gov.hmcts.reform.**"})
 public class EmTestConfig {
 
     @Bean

diff --git a/src/main/java/uk/gov/hmcts/reform/em/test/ccddata/CcdDataConfiguration.java b/src/main/java/uk/gov/hmcts/reform/em/test/ccddata/CcdDataConfiguration.java
@@ -1,8 +1,8 @@
 package uk.gov.hmcts.reform.em.test.ccddata;
 
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import uk.gov.hmcts.reform.ccd.client.CoreCaseDataApi;
@@ -11,7 +11,7 @@
 
 @Configuration
 @ConditionalOnProperty({"core_case_data.api.url", "ccd-def.api.url"})
-@ConditionalOnBean(name = {"ccdS2sHelper", "idamHelper"})
+@EnableFeignClients(basePackages = {"uk.gov.hmcts.reform.ccd.client"})
 public class CcdDataConfiguration {
 
     @Bean

diff --git a/...main/java/uk/gov/hmcts/reform/em/test/ccddefinition/CcdDefinitionHelperConfiguration.java b/...main/java/uk/gov/hmcts/reform/em/test/ccddefinition/CcdDefinitionHelperConfiguration.java
@@ -2,13 +2,15 @@
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import uk.gov.hmcts.reform.em.test.idam.IdamHelper;
 import uk.gov.hmcts.reform.em.test.s2s.S2sHelper;
 
 @Configuration
 @ConditionalOnProperty({"ccd-def.api.url", "s2s.api.url", "idam.api.url"})
+@EnableFeignClients(basePackages = "uk.gov.hmcts.reform.em.test.ccddefinition")
 public class CcdDefinitionHelperConfiguration {
 
     @Bean

diff --git a/src/main/java/uk/gov/hmcts/reform/em/test/dm/DmConfiguration.java b/src/main/java/uk/gov/hmcts/reform/em/test/dm/DmConfiguration.java
@@ -1,5 +1,6 @@
 package uk.gov.hmcts.reform.em.test.dm;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -9,7 +10,8 @@
 import uk.gov.hmcts.reform.em.test.s2s.S2sHelper;
 
 @Configuration
-@ConditionalOnProperty({"document_management.url", "s2s.api.url"})
+@ConditionalOnProperty(prefix = "document_management", value = "url")
+@ConditionalOnBean(name = {"documentUploadClientApi"})
 public class DmConfiguration {
 
     @Bean

diff --git a/src/main/java/uk/gov/hmcts/reform/em/test/idam/IdamConfiguration.java b/src/main/java/uk/gov/hmcts/reform/em/test/idam/IdamConfiguration.java
@@ -1,6 +1,7 @@
 package uk.gov.hmcts.reform.em.test.idam;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -10,6 +11,7 @@
 @Configuration
 @ConditionalOnProperty("idam.api.url")
 @ComponentScan(basePackages = "uk.gov.hmcts.reform.idam.client")
+@EnableFeignClients(basePackages = {"uk.gov.hmcts.reform.em.test.idam", "uk.gov.hmcts.reform.idam.client"})
 public class IdamConfiguration {
 
     @Bean