diff options
Diffstat (limited to 'src/main/kotlin/dev/dnpm')
5 files changed, 14 insertions, 11 deletions
diff --git a/src/main/kotlin/dev/dnpm/etl/processor/EtlProcessorApplication.kt b/src/main/kotlin/dev/dnpm/etl/processor/EtlProcessorApplication.kt index 4b9b307..75147ea 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/EtlProcessorApplication.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/EtlProcessorApplication.kt @@ -20,8 +20,8 @@ package dev.dnpm.etl.processor import org.springframework.boot.autoconfigure.SpringBootApplication -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration import org.springframework.boot.runApplication +import org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration @SpringBootApplication(exclude = [SecurityAutoConfiguration::class]) class EtlProcessorApplication 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 40c290a..cb04db3 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfiguration.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfiguration.kt @@ -40,7 +40,7 @@ import org.springframework.boot.autoconfigure.condition.AnyNestedCondition import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.boot.context.properties.EnableConfigurationProperties -import org.springframework.boot.web.client.RestTemplateBuilder +import org.springframework.boot.restclient.RestTemplateBuilder import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Conditional import org.springframework.context.annotation.Configuration diff --git a/src/main/kotlin/dev/dnpm/etl/processor/config/AppKafkaConfiguration.kt b/src/main/kotlin/dev/dnpm/etl/processor/config/AppKafkaConfiguration.kt index 2f89dea..24fc58c 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/config/AppKafkaConfiguration.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/config/AppKafkaConfiguration.kt @@ -70,7 +70,7 @@ class AppKafkaConfiguration { kafkaResponseProcessor: KafkaResponseProcessor, ): KafkaMessageListenerContainer<String, String> { val containerProperties = ContainerProperties(kafkaProperties.outputResponseTopic) - containerProperties.messageListener = kafkaResponseProcessor + containerProperties.setMessageListener(kafkaResponseProcessor) return KafkaMessageListenerContainer(consumerFactory, containerProperties) } @@ -87,8 +87,11 @@ class AppKafkaConfiguration { kafkaProperties: KafkaProperties, kafkaInputListener: KafkaInputListener, ): KafkaMessageListenerContainer<String, String> { + if (null == kafkaProperties.inputTopic) { + throw IllegalArgumentException("Kafka input topic cannot be null") + } val containerProperties = ContainerProperties(kafkaProperties.inputTopic) - containerProperties.messageListener = kafkaInputListener + containerProperties.setMessageListener(kafkaInputListener) return KafkaMessageListenerContainer(consumerFactory, containerProperties) } diff --git a/src/main/kotlin/dev/dnpm/etl/processor/config/AppSecurityConfiguration.kt b/src/main/kotlin/dev/dnpm/etl/processor/config/AppSecurityConfiguration.kt index e0f24cf..9b48d22 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/config/AppSecurityConfiguration.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/config/AppSecurityConfiguration.kt @@ -95,12 +95,12 @@ class AppSecurityConfiguration(private val securityConfigProperties: SecurityCon authorize("/mtb/**", hasAnyRole("MTBFILE", "ADMIN", "USER")) authorize("/report/**", hasAnyRole("ADMIN", "USER")) authorize("/submission/**", hasAnyRole("ADMIN", "USER")) - authorize("*.css", permitAll) - authorize("*.ico", permitAll) - authorize("*.jpeg", permitAll) - authorize("*.js", permitAll) - authorize("*.svg", permitAll) - authorize("*.css", permitAll) + authorize("/**/*.css", permitAll) + authorize("/**/*.ico", permitAll) + authorize("/**/*.jpeg", permitAll) + authorize("/**/*.js", permitAll) + authorize("/**/*.svg", permitAll) + authorize("/**/*.css", permitAll) authorize("/login/**", permitAll) authorize(anyRequest, permitAll) } diff --git a/src/main/kotlin/dev/dnpm/etl/processor/web/LoginController.kt b/src/main/kotlin/dev/dnpm/etl/processor/web/LoginController.kt index 7821bf9..9b49f5a 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/web/LoginController.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/web/LoginController.kt @@ -20,7 +20,7 @@ package dev.dnpm.etl.processor.web import dev.dnpm.etl.processor.config.SecurityConfigProperties -import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientProperties import org.springframework.stereotype.Controller import org.springframework.ui.Model import org.springframework.web.bind.annotation.GetMapping |