diff --git a/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java b/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java index 812c782d6946c975855a27cc5d9282137538f294..e98bc4b43da8940e5a12c6bee1324e18642cb4f6 100644 --- a/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java +++ b/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java @@ -31,7 +31,7 @@ class KeycloakApiService { @Inject KeycloakApiProperties properties; - @ConfigProperty(name = "kop.keycloak.url") + @ConfigProperty(name = "keycloak.url") String keycloakUrl; public Stream<User> findAllUser() { diff --git a/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java b/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java index 8bc5475feb98ee3e7a42c9f45b1c39dbe255fea7..70e1355f6a6e6f7c031d481a61460fe5ee9931d3 100644 --- a/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java +++ b/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java @@ -15,7 +15,7 @@ public class KeycloakProvider { @Inject KeycloakApiProperties keycloakConfiguration; - @ConfigProperty(name = "kop.keycloak.url") + @ConfigProperty(name = "keycloak.url") String keycloakUrl; @ApplicationScoped diff --git a/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java b/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java index 7b35df466182e5811cf57c8df67306b7476b6200..1ae30cef9eb1f7245afaceec2a1d8e86133a4bfe 100644 --- a/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java +++ b/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java @@ -3,8 +3,6 @@ package de.itvsh.kop.user.sync; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.eclipse.microprofile.config.inject.ConfigProperty; - import io.quarkus.scheduler.Scheduled; import lombok.extern.log4j.Log4j2; @@ -17,18 +15,8 @@ public class SyncScheduler { @Inject LockService syncLockService; - @ConfigProperty(name = "quarkus.mongodb.connection-string") - String mongodbConnectioString; - - @ConfigProperty(name = "quarkus.mongodb.database") - String mongodbDatabase; - @Scheduled(cron = "{kop.keycloak.sync.cron}") public void start() { - LOG.info("Environment variables(Key-Value):"); - LOG.info("----------------------------"); - LOG.info("quarkus.mongodb.connection-string: ", mongodbConnectioString); - LOG.info("quarkus.mongodb.database: ", mongodbDatabase); if (syncLockService.isNotLocked()) { syncService.sync(); } else { diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index 525632a2d0f84ae8100408953b9d20c55bfdb577..4903f6e52828de5f78ce918eb2957f8c609c3d61 100644 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -8,7 +8,6 @@ quarkus: realm-path: dev-realm.json kop: keycloak: - url: https://sso.dev.ozg-sh.de/auth sync: cron: "0 */10 * * * ?" api: @@ -16,3 +15,5 @@ kop: password: S9UEMuLG9y9ev99 realm: dev organisations-einheit-id-key: organisationsEinheitId +keycloak: + url: https://sso.dev.ozg-sh.de/auth \ No newline at end of file diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 2a828b47de59c406635625d1b79a23f613b702b0..48aa8ca000eb259c7aa61d0bee042033e55ac35d 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -17,7 +17,6 @@ quarkus: field-name: log.level kop: keycloak: - url: https://sso.dev.ozg-sh.de/auth sync: cron: "0 15 13 * * ?" api: @@ -26,4 +25,6 @@ kop: realm: sh-kiel-dev organisations-einheit-id-key: organisationseinheitId ldap-id-key: LDAP_ID - client: sh-kiel-dev-goofy \ No newline at end of file + client: sh-kiel-dev-goofy +keycloak: + url: https://sso.dev.ozg-sh.de/auth \ No newline at end of file