From 57e79d7f6f1ed3e31de74eb6ab1ff8ba498833b6 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 15 Sep 2022 17:17:39 +0200
Subject: [PATCH] remove log and moving property
---
.../itvsh/kop/user/keycloak/KeycloakApiService.java | 2 +-
.../de/itvsh/kop/user/keycloak/KeycloakProvider.java | 2 +-
.../java/de/itvsh/kop/user/sync/SyncScheduler.java | 12 ------------
src/main/resources/application-dev.yaml | 3 ++-
src/main/resources/application.yaml | 5 +++--
5 files changed, 7 insertions(+), 17 deletions(-)
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 812c782d..e98bc4b4 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 8bc5475f..70e1355f 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 7b35df46..1ae30cef 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 525632a2..4903f6e5 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 2a828b47..48aa8ca0 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
--
GitLab