diff options
Diffstat (limited to 'src')
3 files changed, 12 insertions, 6 deletions
diff --git a/src/integrationTest/kotlin/dev/dnpm/etl/processor/web/ConfigControllerTest.kt b/src/integrationTest/kotlin/dev/dnpm/etl/processor/web/ConfigControllerTest.kt index 6e6a25e..7fc0121 100644 --- a/src/integrationTest/kotlin/dev/dnpm/etl/processor/web/ConfigControllerTest.kt +++ b/src/integrationTest/kotlin/dev/dnpm/etl/processor/web/ConfigControllerTest.kt @@ -19,11 +19,14 @@ package dev.dnpm.etl.processor.web +import dev.dnpm.etl.processor.config.AppConfiguration import dev.dnpm.etl.processor.config.AppSecurityConfiguration import dev.dnpm.etl.processor.monitoring.ConnectionCheckService +import dev.dnpm.etl.processor.monitoring.RestConnectionCheckService import dev.dnpm.etl.processor.output.MtbFileSender import dev.dnpm.etl.processor.pseudonym.Generator import dev.dnpm.etl.processor.services.RequestProcessor +import dev.dnpm.etl.processor.services.TokenRepository import dev.dnpm.etl.processor.services.TransformationService import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test @@ -50,6 +53,7 @@ abstract class MockSink : Sinks.Many<Boolean> @ContextConfiguration( classes = [ ConfigController::class, + AppConfiguration::class, AppSecurityConfiguration::class ] ) @@ -67,7 +71,9 @@ abstract class MockSink : Sinks.Many<Boolean> MtbFileSender::class, ConnectionCheckService::class, RequestProcessor::class, - TransformationService::class + TransformationService::class, + TokenRepository::class, + RestConnectionCheckService::class ) class ConfigControllerTest { diff --git a/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfiguration.kt b/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfiguration.kt index 6e1240b..0ae2c2f 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfiguration.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfiguration.kt @@ -63,6 +63,11 @@ class AppConfiguration { private val logger = LoggerFactory.getLogger(AppConfiguration::class.java) + @Bean + fun restTemplate(): RestTemplate { + return RestTemplate() + } + @ConditionalOnProperty(value = ["app.pseudonymize.generator"], havingValue = "GPAS") @Bean fun gpasPseudonymGenerator(configProperties: GPasConfigProperties, retryTemplate: RetryTemplate): Generator { diff --git a/src/main/kotlin/dev/dnpm/etl/processor/config/AppRestConfiguration.kt b/src/main/kotlin/dev/dnpm/etl/processor/config/AppRestConfiguration.kt index 582d530..fc2676b 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/config/AppRestConfiguration.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/config/AppRestConfiguration.kt @@ -49,11 +49,6 @@ class AppRestConfiguration { private val logger = LoggerFactory.getLogger(AppRestConfiguration::class.java) @Bean - fun restTemplate(): RestTemplate { - return RestTemplate() - } - - @Bean fun restMtbFileSender( restTemplate: RestTemplate, restTargetProperties: RestTargetProperties, |