refactor: move method content and call this method

2 files changed, 39 insertions, 22 deletions

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 2970b4d..b7b150d 100644
--- a/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfiguration.kt
+++ b/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfiguration.kt
@@ -88,19 +88,6 @@ class AppConfiguration {
     @ConditionalOnProperty(value = ["app.pseudonymize.generator"], havingValue = "GPAS")
     @Bean
     fun gpasPseudonymGenerator(configProperties: GPasConfigProperties, retryTemplate: RetryTemplate, restTemplate: RestTemplate): Generator {
-        return GpasPseudonymGenerator(configProperties, retryTemplate, restTemplate)
-    }
-
-    @ConditionalOnProperty(value = ["app.pseudonymize.generator"], havingValue = "BUILDIN", matchIfMissing = true)
-    @Bean
-    fun buildinPseudonymGenerator(): Generator {
-        return AnonymizingGenerator()
-    }
-
-    @ConditionalOnProperty(value = ["app.pseudonymizer"], havingValue = "GPAS")
-    @ConditionalOnMissingBean
-    @Bean
-    fun gpasPseudonymGeneratorOnDeprecatedProperty(configProperties: GPasConfigProperties, retryTemplate: RetryTemplate, restTemplate: RestTemplate): Generator {
         fun getSslContext(certificateLocation: String): SSLContext? {
             val ks = KeyStore.getInstance(KeyStore.getDefaultType())
 
@@ -164,6 +151,19 @@ class AppConfiguration {
         return GpasPseudonymGenerator(configProperties, retryTemplate, restTemplate)
     }
 
+    @ConditionalOnProperty(value = ["app.pseudonymize.generator"], havingValue = "BUILDIN", matchIfMissing = true)
+    @Bean
+    fun buildinPseudonymGenerator(): Generator {
+        return AnonymizingGenerator()
+    }
+
+    @ConditionalOnProperty(value = ["app.pseudonymizer"], havingValue = "GPAS")
+    @ConditionalOnMissingBean
+    @Bean
+    fun gpasPseudonymGeneratorOnDeprecatedProperty(configProperties: GPasConfigProperties, retryTemplate: RetryTemplate, restTemplate: RestTemplate): Generator {
+        return gpasPseudonymGenerator(configProperties, retryTemplate, restTemplate)
+    }
+
     @ConditionalOnProperty(value = ["app.pseudonymizer"], havingValue = "BUILDIN")
     @ConditionalOnMissingBean
     @Bean
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 3d4827c..d3fd5a7 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,17 +3,34 @@ spring:
     compose:
       file: ./dev-compose.yml
 
+  security:
+    oauth2:
+      client:
+        registration:
+          custom:
+            client-name: App-Dev
+            client-id: app-dev
+            client-secret: 9MQWatEcgkC1WISSAFUGaFGbyEHh8rAy
+            scope:
+              - openid
+        provider:
+          custom:
+            issuer-uri: https://dnpm.dev/auth/realms/intern
+            user-name-attribute: name
+
 app:
-  #rest:
-  #  uri: http://localhost:9000/bwhc/etl/api
-  kafka:
-    topic: test
-    response-topic: test_response
-    servers: localhost:9094
-  #security:
-  #  admin-user: admin
-  #  admin-password: "{noop}very-secret"
+  rest:
+    uri: http://localhost:9000/bwhc/etl/api
+  #kafka:
+  #  topic: test
+  #  response-topic: test_response
+  #  servers: localhost:9094
+  security:
+    admin-user: admin
+    admin-password: "{noop}very-secret"
+    enable-oidc: "true"
 
 server:
   port: 8000
 
+