OZG-2652 move properties from usermanager.keycloak.* -> kop.keycloak.*

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

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() {

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

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();

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:

src/main/resources/application-local.yaml

@@ -2,5 +2,6 @@ quarkus:
   port: 8082
   mongodb:
     connection-string: mongodb://localhost:27017
+kop:
   keycloak:
     url: http://localhost:8088 
\ No newline at end of file

src/main/resources/application-remotekc.yaml

-usermanager:
+kop:
   keycloak:
+    url: https://sso.dev.ozg-sh.de/auth
     sync:
       cron: "* */10 * * * ?"
     api:
@@ -7,5 +8,3 @@ usermanager:
       password: S9UEMuLG9y9ev99
       realm: sh-kiel-dev
       organisations-einheit-id-key: organisationseinheitId
\ No newline at end of file
-keycloak:
-  url: https://sso.dev.ozg-sh.de/auth
\ No newline at end of file

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:
@@ -26,5 +27,3 @@ usermanager:
    organisations-einheit-id-key: organisationseinheitId
    ldap-id-key: LDAP_ID
    client: sh-kiel-dev-goofy
\ No newline at end of file
-keycloak:
-  url: https://sso.dev.ozg-sh.de/auth
\ No newline at end of file

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