From 3a4fbcffacb68660188424a4a3ba5ddedf43a9f4 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 15 Sep 2022 10:10:54 +0200
Subject: [PATCH] OZG-2652 move properties from usermanager.keycloak.* ->
kop.keycloak.*
---
.../de/itvsh/kop/user/keycloak/KeycloakApiProperties.java | 2 +-
.../de/itvsh/kop/user/keycloak/KeycloakApiService.java | 2 +-
.../java/de/itvsh/kop/user/keycloak/KeycloakProvider.java | 2 +-
src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java | 2 +-
src/main/resources/application-dev.yaml | 3 ++-
src/main/resources/application-local.yaml | 5 +++--
src/main/resources/application-remotekc.yaml | 7 +++----
src/main/resources/application.yaml | 7 +++----
.../de/itvsh/kop/user/keycloak/KeycloakTestProfile.java | 8 ++++----
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java b/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java
index b6b1776e..71a5f3fc 100644
--- a/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java
+++ b/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java
@@ -4,7 +4,7 @@ import javax.validation.constraints.NotBlank;
import io.smallrye.config.ConfigMapping;
-@ConfigMapping(prefix = "usermanager.keycloak.api")
+@ConfigMapping(prefix = "kop.keycloak.api")
public interface KeycloakApiProperties {
@NotBlank
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 e98bc4b4..812c782d 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 = "keycloak.url")
+ @ConfigProperty(name = "kop.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 70e1355f..8bc5475f 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 = "keycloak.url")
+ @ConfigProperty(name = "kop.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 d72afb46..1ae30cef 100644
--- a/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java
+++ b/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java
@@ -15,7 +15,7 @@ public class SyncScheduler {
@Inject
LockService syncLockService;
- @Scheduled(cron = "{usermanager.keycloak.sync.cron}")
+ @Scheduled(cron = "{kop.keycloak.sync.cron}")
public void start() {
if (syncLockService.isNotLocked()) {
syncService.sync();
diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml
index ef51b4d9..525632a2 100644
--- a/src/main/resources/application-dev.yaml
+++ b/src/main/resources/application-dev.yaml
@@ -6,8 +6,9 @@ quarkus:
create-realm: true
realm-name: dev
realm-path: dev-realm.json
-usermanager:
+kop:
keycloak:
+ url: https://sso.dev.ozg-sh.de/auth
sync:
cron: "0 */10 * * * ?"
api:
diff --git a/src/main/resources/application-local.yaml b/src/main/resources/application-local.yaml
index d3116f7d..f8ac28ec 100644
--- a/src/main/resources/application-local.yaml
+++ b/src/main/resources/application-local.yaml
@@ -2,5 +2,6 @@ quarkus:
port: 8082
mongodb:
connection-string: mongodb://localhost:27017
-keycloak:
- url: http://localhost:8088
\ No newline at end of file
+kop:
+ keycloak:
+ url: http://localhost:8088
\ No newline at end of file
diff --git a/src/main/resources/application-remotekc.yaml b/src/main/resources/application-remotekc.yaml
index f16c633e..cfc3e79a 100644
--- a/src/main/resources/application-remotekc.yaml
+++ b/src/main/resources/application-remotekc.yaml
@@ -1,11 +1,10 @@
-usermanager:
+kop:
keycloak:
+ url: https://sso.dev.ozg-sh.de/auth
sync:
cron: "* */10 * * * ?"
api:
user: goofyApiUser
password: S9UEMuLG9y9ev99
realm: sh-kiel-dev
- organisations-einheit-id-key: organisationseinheitId
-keycloak:
- url: https://sso.dev.ozg-sh.de/auth
\ No newline at end of file
+ organisations-einheit-id-key: organisationseinheitId
\ No newline at end of file
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 6fe7ae0c..2a828b47 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -15,8 +15,9 @@ quarkus:
fields:
level:
field-name: log.level
-usermanager:
+kop:
keycloak:
+ url: https://sso.dev.ozg-sh.de/auth
sync:
cron: "0 15 13 * * ?"
api:
@@ -25,6 +26,4 @@ usermanager:
realm: sh-kiel-dev
organisations-einheit-id-key: organisationseinheitId
ldap-id-key: LDAP_ID
- client: sh-kiel-dev-goofy
-keycloak:
- url: https://sso.dev.ozg-sh.de/auth
\ No newline at end of file
+ client: sh-kiel-dev-goofy
\ No newline at end of file
diff --git a/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java b/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java
index e47cb32c..c8fa8a19 100644
--- a/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java
+++ b/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java
@@ -6,16 +6,16 @@ import io.quarkus.test.junit.QuarkusTestProfile;
public class KeycloakTestProfile implements QuarkusTestProfile {
- private final String userKey = "usermanager.keycloak.api.user";
+ private final String userKey = "kop.keycloak.api.user";
private final String userValue = "goofyApiUser";
- private final String passwordKey = "usermanager.keycloak.api.password";
+ private final String passwordKey = "kop.keycloak.api.password";
private final String passwordValue = "S9UEMuLG9y9ev99";
- private final String realmKey = "usermanager.keycloak.api.realm";
+ private final String realmKey = "kop.keycloak.api.realm";
private final String realmValue = "sh-kiel-dev";
- private final String urlKey = "keycloak.url";
+ private final String urlKey = "kop.keycloak.url";
private final String urlValue = "https://sso.dev.ozg-sh.de/auth";
@Override
--
GitLab