diff --git a/dbrepo-metadata-service/rest-service/src/test/resources/application.properties b/dbrepo-metadata-service/rest-service/src/test/resources/application.properties index d96b44310278aa87e9862990dcfb5f4c74269063..b06fa0e5dc84645fb315a036081eb80dd6af1d78 100644 --- a/dbrepo-metadata-service/rest-service/src/test/resources/application.properties +++ b/dbrepo-metadata-service/rest-service/src/test/resources/application.properties @@ -1,6 +1,3 @@ -# enable local spring profile -spring.profiles.active=local,junit - # disable discovery spring.cloud.discovery.enabled=false diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/config/GatewayConfig.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/config/GatewayConfig.java index be7eabb939e17ef8c6b7ac5fab9f0006afed5e4e..1737650d9e504faa504bef1eaa32e9575a7d415a 100644 --- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/config/GatewayConfig.java +++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/config/GatewayConfig.java @@ -6,7 +6,8 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.*; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.DefaultUriBuilderFactory; @@ -50,7 +51,7 @@ public class GatewayConfig { @Value("${dbrepo.system.password}") private String systemPassword; - + private final CredentialService credentialService; @Autowired @@ -58,7 +59,6 @@ public class GatewayConfig { this.credentialService = credentialService; } - @Profile("!junit") @Bean("brokerRestTemplate") public RestTemplate brokerRestTemplate() { final RestTemplate restTemplate = new RestTemplate();