diff --git a/Jenkinsfile b/Jenkinsfile
index c4b3d95b627f0dd4a29787b6aa0f8223d04ddc6c..d6819e5cac43482fdd4701a1a06d298555e55806 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
pipeline {
agent {
node {
- label 'jenkins-quarkus-build-agent'
+ label 'ozgcloud-jenkins-build-agent'
}
}
@@ -63,7 +63,7 @@ pipeline {
}
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- sh './mvnw -pl user-manager-interface -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3'
+ sh 'mvn -pl user-manager-interface -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3'
}
}
}
@@ -74,7 +74,7 @@ pipeline {
FAILED_STAGE=env.STAGE_NAME
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- sh './mvnw -pl user-manager-server -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3'
+ sh 'mvn -pl user-manager-server -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3'
junit testResults: '**/target/surefire-reports/*.xml', skipPublishingChecks: true
}
}
@@ -88,7 +88,7 @@ pipeline {
withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- sh './mvnw -pl user-manager-server -s $MAVEN_SETTINGS clean verify -Pnative -Dquarkus.container-image.registry=docker.ozg-sh.de -Dquarkus.container-image.username=${USER} -Dquarkus.container-image.password=${PASSWORD} -Dquarkus.container-image.push=true -Dquarkus.container-image.build=true -Dquarkus.native.remote-container-build=true -Dmaven.wagon.http.retryHandler.count=3'
+ sh 'mvn -pl user-manager-server -s $MAVEN_SETTINGS clean verify -Pnative -Dquarkus.container-image.registry=docker.ozg-sh.de -Dquarkus.container-image.username=${USER} -Dquarkus.container-image.password=${PASSWORD} -Dquarkus.container-image.push=true -Dquarkus.container-image.build=true -Dquarkus.native.remote-container-build=true -Dmaven.wagon.http.retryHandler.count=3'
}
}
}
@@ -96,9 +96,6 @@ pipeline {
}
stage ('OWASP Dependency-Check Vulnerabilities') {
- when {
- branch 'master'
- }
steps {
dependencyCheck additionalArguments: '''
-o "./"
@@ -107,6 +104,7 @@ pipeline {
-d /dependency-check-data
--suppression dependency-check-supressions.xml
--disableKnownExploited
+ --noupdate
--disableArchive
--prettyPrint''', odcInstallation: 'dependency-check-owasp'
@@ -126,7 +124,7 @@ pipeline {
dir('user-manager-server') {
try {
withSonarQubeEnv('sonarqube-ozg-sh'){
- sh "./mvnw -s $MAVEN_SETTINGS package sonar:sonar -Dsonar.coverage.jacoco.xmlReportPaths=${env.WORKSPACE}/user-manager-server/target/jacoco-report/jacoco.xml"
+ sh "mvn -s $MAVEN_SETTINGS package sonar:sonar -Dsonar.coverage.jacoco.xmlReportPaths=${env.WORKSPACE}/user-manager-server/target/jacoco-report/jacoco.xml"
}
} catch (Exception e) {
unstable("SonarQube failed")
diff --git a/pom.xml b/pom.xml
index edf02f448e14745fe9311e823868dfe85f63b474..d7ed9abe2cc7607a2640e3e17b7a855fd48fd430 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-dependencies</artifactId>
- <version>2.3.1</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-dependencies</artifactId>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>de.ozgcloud.user</groupId>
<artifactId>user-manager</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>OZG-Cloud User Manager</name>
<packaging>pom</packaging>
@@ -46,7 +46,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.version>3.5.0</quarkus.platform.version>
- <kop.license.version>1.3.0</kop.license.version>
+ <ozgcloud.license.version>1.3.0</ozgcloud.license.version>
<jakarta.interceptor.version>2.1.0</jakarta.interceptor.version>
<jakarta.annotatioin.version>2.1.1</jakarta.annotatioin.version>
<lombok.version>1.18.24</lombok.version>
@@ -138,9 +138,9 @@
</configuration>
<dependencies>
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-license</artifactId>
- <version>${kop.license.version}</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-license</artifactId>
+ <version>${ozgcloud.license.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index 104939f0714adf8706a379ca0e686ff762453c8d..e8a339f4fd8344ec1e426ecc3b7fc6452eb06fb3 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -45,7 +45,7 @@ spec:
- to:
- podSelector:
matchLabels:
- component: ozg-mongodb
+ component: ozgcloud-mongodb
ports:
- port: 27017
protocol: TCP
diff --git a/src/main/helm/templates/ozg_operator_secrets_read_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
similarity index 84%
rename from src/main/helm/templates/ozg_operator_secrets_read_role.yaml
rename to src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
index 72c233c8a71e1f20c4cb36e6632011775c20c193..02f30c4d6e6e6e12209b0832495852dbc4f58497 100644
--- a/src/main/helm/templates/ozg_operator_secrets_read_role.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
@@ -2,7 +2,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
- name: ozg-operator-secrets-read-role-user-manager
+ name: ozgcloud-keycloak-operator-secrets-read-role-user-manager
namespace: {{ include "app.namespace" $ }}
rules:
- apiGroups:
diff --git a/src/main/helm/templates/ozg_operator_secrets_read_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
similarity index 64%
rename from src/main/helm/templates/ozg_operator_secrets_read_role_binding.yaml
rename to src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
index eeb9eb0c9592ba8a8c461dacbbe9451971c80aba..fdcf591e4bce23591d62e06622edccaaf81e7821 100644
--- a/src/main/helm/templates/ozg_operator_secrets_read_role_binding.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
@@ -2,14 +2,14 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
- name: ozg-operator-secrets-read-role-binding-user-manager
+ name: ozgcloud-keycloak-operator-secrets-read-role-binding-user-manager
namespace: {{ include "app.namespace" . }}
subjects:
- kind: ServiceAccount
- name: ozg-operator-serviceaccount
+ name: ozgcloud-keycloak-operator-serviceaccount
namespace: {{ required "sso.operatorNamespace muss angegeben sein" .Values.sso.operatorNamespace }}
roleRef:
kind: Role
- name: ozg-operator-secrets-read-role-user-manager
+ name: ozgcloud-keycloak-operator-secrets-read-role-user-manager
apiGroup: rbac.authorization.k8s.io
{{- end }}
\ No newline at end of file
diff --git a/src/main/helm/templates/ozg_operator_secrets_write_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
similarity index 78%
rename from src/main/helm/templates/ozg_operator_secrets_write_role.yaml
rename to src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
index b4b25822f9f5495046a47aff5c20859e389fc253..f5f02cf36921c472bee3e8ad5a33cc90ee69c9b1 100644
--- a/src/main/helm/templates/ozg_operator_secrets_write_role.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
@@ -2,7 +2,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
- name: ozg-operator-secrets-write-role-user-manager
+ name: ozgcloud-keycloak-operator-secrets-write-role-user-manager
namespace: {{ include "app.namespace" $ }}
rules:
- apiGroups:
diff --git a/src/main/helm/templates/ozg_operator_secrets_write_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
similarity index 64%
rename from src/main/helm/templates/ozg_operator_secrets_write_role_binding.yaml
rename to src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
index 84d879684ce3e7ddc07a5f378c576c9aeaab90c5..ad6a1e1141feb98aa4e9df6eda829149347dd4f4 100644
--- a/src/main/helm/templates/ozg_operator_secrets_write_role_binding.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
@@ -2,14 +2,14 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
- name: ozg-operator-secrets-write-role-binding-user-manager
+ name: ozgcloud-keycloak-operator-secrets-write-role-binding-user-manager
namespace: {{ include "app.namespace" . }}
subjects:
- kind: ServiceAccount
- name: ozg-operator-serviceaccount
+ name: ozgcloud-keycloak-operator-serviceaccount
namespace: {{ required "sso.operatorNamespace muss angegeben sein" .Values.sso.operatorNamespace }}
roleRef:
kind: Role
- name: ozg-operator-secrets-write-role-user-manager
+ name: ozgcloud-keycloak-operator-secrets-write-role-user-manager
apiGroup: rbac.authorization.k8s.io
{{- end }}
\ No newline at end of file
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index a4c438630fadb4c135c8f1ca774d0be14e136254..ed301b85485858a7b7c41b758b8a9adda4f12001 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -61,7 +61,7 @@ tests:
- to:
- podSelector:
matchLabels:
- component: ozg-mongodb
+ component: ozgcloud-mongodb
ports:
- port: 27017
protocol: TCP
diff --git a/src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml
similarity index 79%
rename from src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml
rename to src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml
index 3074359a849c64ed470424e5e1535f2c6b984b7d..3acc4647aae75a30637491d988d399085b6a276a 100644
--- a/src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml
+++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml
@@ -1,9 +1,9 @@
-suite: test ozg_operator_secrets_role_binding
+suite: test ozgcloud_keycloak_operator_secrets_read_role_binding
release:
name: alfa
namespace: by-helm-test
templates:
- - templates/ozg_operator_secrets_write_role_binding.yaml
+ - templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
tests:
- it: should contain header data
set:
@@ -25,7 +25,7 @@ tests:
asserts:
- equal:
path: metadata.name
- value: ozg-operator-secrets-write-role-binding-user-manager
+ value: ozgcloud-keycloak-operator-secrets-read-role-binding-user-manager
- equal:
path: metadata.namespace
value: by-helm-test
@@ -40,7 +40,7 @@ tests:
path: subjects
content:
kind: ServiceAccount
- name: ozg-operator-serviceaccount
+ name: ozgcloud-keycloak-operator-serviceaccount
namespace: test-operator-namespace
- it: should have roleRef values
set:
@@ -54,7 +54,7 @@ tests:
value: Role
- equal:
path: roleRef.name
- value: ozg-operator-secrets-write-role-user-manager
+ value: ozgcloud-keycloak-operator-secrets-read-role-user-manager
- equal:
path: roleRef.apiGroup
value: rbac.authorization.k8s.io
diff --git a/src/test/helm/ozg_operator_secrets_read_role_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml
similarity index 84%
rename from src/test/helm/ozg_operator_secrets_read_role_test.yaml
rename to src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml
index 2f1468152fbfe6bfbde2f651208cbac7dca7ec46..4464f2f2ede235ba32da45a0dcfc10e2aa582c9b 100644
--- a/src/test/helm/ozg_operator_secrets_read_role_test.yaml
+++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml
@@ -1,9 +1,9 @@
-suite: test ozg_operator_secrets_read_role
+suite: test ozgcloud_keycloak_operator_secrets_read_role
release:
name: alfa
namespace: by-helm-test
templates:
- - templates/ozg_operator_secrets_read_role.yaml
+ - templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
tests:
- it: should contain header data
set:
@@ -23,7 +23,7 @@ tests:
asserts:
- equal:
path: metadata.name
- value: ozg-operator-secrets-read-role-user-manager
+ value: ozgcloud-keycloak-operator-secrets-read-role-user-manager
- equal:
path: metadata.namespace
value: by-helm-test
diff --git a/src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml
similarity index 79%
rename from src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml
rename to src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml
index 0f5af4d7917005c4a75a99aa646e35b61de4a33d..0522ac029b8512e76e162023cbaa0d5ade5d9af2 100644
--- a/src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml
+++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml
@@ -1,9 +1,9 @@
-suite: test ozg_operator_secrets_read_role_binding
+suite: test ozgcloud_keycloak_operator_secrets_role_binding
release:
name: alfa
namespace: by-helm-test
templates:
- - templates/ozg_operator_secrets_read_role_binding.yaml
+ - templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
tests:
- it: should contain header data
set:
@@ -25,7 +25,7 @@ tests:
asserts:
- equal:
path: metadata.name
- value: ozg-operator-secrets-read-role-binding-user-manager
+ value: ozgcloud-keycloak-operator-secrets-write-role-binding-user-manager
- equal:
path: metadata.namespace
value: by-helm-test
@@ -40,7 +40,7 @@ tests:
path: subjects
content:
kind: ServiceAccount
- name: ozg-operator-serviceaccount
+ name: ozgcloud-keycloak-operator-serviceaccount
namespace: test-operator-namespace
- it: should have roleRef values
set:
@@ -54,7 +54,7 @@ tests:
value: Role
- equal:
path: roleRef.name
- value: ozg-operator-secrets-read-role-user-manager
+ value: ozgcloud-keycloak-operator-secrets-write-role-user-manager
- equal:
path: roleRef.apiGroup
value: rbac.authorization.k8s.io
diff --git a/src/test/helm/ozg_operator_secrets_write_role_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml
similarity index 82%
rename from src/test/helm/ozg_operator_secrets_write_role_test.yaml
rename to src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml
index 215f844ac8bf083005d8ca12441e0fcd9d58cf4e..f5a365040075125f0a02784ee1e800f97561456f 100644
--- a/src/test/helm/ozg_operator_secrets_write_role_test.yaml
+++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml
@@ -1,9 +1,9 @@
-suite: test ozg_operator_secrets_write_role
+suite: test ozgcloud_keycloak_operator_secrets_write_role
release:
name: alfa
namespace: by-helm-test
templates:
- - templates/ozg_operator_secrets_write_role.yaml
+ - templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
tests:
- it: should contain header data
set:
@@ -23,7 +23,7 @@ tests:
asserts:
- equal:
path: metadata.name
- value: ozg-operator-secrets-write-role-user-manager
+ value: ozgcloud-keycloak-operator-secrets-write-role-user-manager
- equal:
path: metadata.namespace
value: by-helm-test
diff --git a/user-manager-interface/pom.xml b/user-manager-interface/pom.xml
index 2ea405736404bf88977ee35d129ea524dcdd2777..045d03c48e421c37518e571da88ab350a76dc283 100644
--- a/user-manager-interface/pom.xml
+++ b/user-manager-interface/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>de.ozgcloud.user</groupId>
<artifactId>user-manager</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>user-manager-interface</artifactId>
diff --git a/user-manager-server/pom.xml b/user-manager-server/pom.xml
index 8f8d0a46a0a9321c25b1bcf0b49af305247c9de5..578993752d7ae2fa1307629afb210f00d35c69ad 100644
--- a/user-manager-server/pom.xml
+++ b/user-manager-server/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.ozgcloud.user</groupId>
<artifactId>user-manager</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>user-manager-server</artifactId>
@@ -47,8 +47,8 @@
<artifactId>user-manager-interface</artifactId>
</dependency>
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-lib</artifactId>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-lib</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResource.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResource.java
index 6e94022046153760096a9b1dfaa8643ee849b6da..7109effbb68ce67c4608278f232c4cd05a85aeed 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResource.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResource.java
@@ -26,6 +26,12 @@ package de.ozgcloud.user;
import java.util.Optional;
import java.util.stream.Stream;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.resteasy.reactive.common.util.RestMediaType;
+
+import de.ozgcloud.common.logging.OzgCloudLogging;
+import io.quarkus.hal.HalCollectionWrapper;
+import io.quarkus.hal.HalEntityWrapper;
import jakarta.inject.Inject;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
@@ -34,14 +40,7 @@ import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.jboss.resteasy.reactive.common.util.RestMediaType;
-
-import de.itvsh.kop.common.logging.KopLogging;
-import io.quarkus.hal.HalCollectionWrapper;
-import io.quarkus.hal.HalEntityWrapper;
-
-@KopLogging
+@OzgCloudLogging
@Path(UserProfileResource.USERS_PATH)
public class UserProfileResource {
static final String PARAM_SEARCH_BY = "searchBy";
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
index b13ef3cf5b5cfd05f4dc037e426abaa693d1f624..56f1b35b720162cdefd35edec85cc220787990de 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
@@ -28,17 +28,16 @@ import static de.ozgcloud.user.User.*;
import java.util.Optional;
import java.util.stream.Stream;
-import jakarta.enterprise.context.ApplicationScoped;
-
import org.bson.types.ObjectId;
-import de.itvsh.kop.common.logging.KopLogging;
+import de.ozgcloud.common.logging.OzgCloudLogging;
import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException;
import io.quarkus.mongodb.panache.PanacheMongoRepository;
import io.quarkus.panache.common.Parameters;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
-@KopLogging
+@OzgCloudLogging
class UserRepository implements PanacheMongoRepository<User> {
static final String PARAM_NAME_SEARCH_BY = "searchBy";
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/UserService.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserService.java
index ee505dd992fbf2213a40b930c520b0c2183388c3..deab57205f2d89612c0bbe2b5d8f5f71f69a02d4 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/UserService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserService.java
@@ -26,20 +26,19 @@ package de.ozgcloud.user;
import java.util.Optional;
import java.util.stream.Stream;
-import de.ozgcloud.user.common.errorhandling.TechnicalException;
-import de.ozgcloud.user.keycloak.KeycloakUserRemoteService;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
import org.apache.commons.lang3.StringUtils;
-import de.itvsh.kop.common.logging.KopLogging;
+import de.ozgcloud.common.logging.OzgCloudLogging;
import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException;
+import de.ozgcloud.user.common.errorhandling.TechnicalException;
+import de.ozgcloud.user.keycloak.KeycloakUserRemoteService;
import io.smallrye.mutiny.Uni;
import io.smallrye.mutiny.infrastructure.Infrastructure;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
@ApplicationScoped
-@KopLogging
+@OzgCloudLogging
public class UserService {
@Inject
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/AccessForbiddenException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/AccessForbiddenException.java
index 471b24a9d961702a0230f771822b8490c9483ea4..20867afe2873e5510fb909ce904b4bd8ea77d11f 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/AccessForbiddenException.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/AccessForbiddenException.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.user.common.errorhandling;
-import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
+import de.ozgcloud.common.errorhandling.FunctionalErrorCode;
public class AccessForbiddenException extends FunctionalException {
private static final long serialVersionUID = 1L;
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtil.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtil.java
index ae340c425aa2406be44476251ea6bfbb32f9790f..957dbdb5eaeceba0c05a896b86e34de9faa7d1b4 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtil.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtil.java
@@ -25,10 +25,9 @@ package de.ozgcloud.user.common.errorhandling;
import java.util.UUID;
+import de.ozgcloud.common.errorhandling.ExceptionUtil;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.ws.rs.NotFoundException;
-
-import de.itvsh.kop.common.errorhandling.ExceptionUtil;
import lombok.extern.log4j.Log4j2;
@Log4j2
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/FunctionalException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/FunctionalException.java
index f6a5819ec2d399e911c7c29bd2b5682184154522..22829670b0d70d3891c57fd4ab23e1a9bca74109 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/FunctionalException.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/FunctionalException.java
@@ -23,12 +23,12 @@
*/
package de.ozgcloud.user.common.errorhandling;
-import de.itvsh.kop.common.errorhandling.ExceptionUtil;
-import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
-import de.itvsh.kop.common.errorhandling.IdentifiableException;
-
import java.util.UUID;
+import de.ozgcloud.common.errorhandling.ExceptionUtil;
+import de.ozgcloud.common.errorhandling.FunctionalErrorCode;
+import de.ozgcloud.common.errorhandling.IdentifiableException;
+
public class FunctionalException extends RuntimeException implements IdentifiableException {
private static final long serialVersionUID = 1L;
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ResourceNotFoundException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ResourceNotFoundException.java
index dda73e7fbbf3af9cedffd1126f05120f5730aded..dba1b68a1022debfb503898f8d5fdec43c86ceb8 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ResourceNotFoundException.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ResourceNotFoundException.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.user.common.errorhandling;
-import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
+import de.ozgcloud.common.errorhandling.FunctionalErrorCode;
import lombok.Getter;
@Getter
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockRepository.java
index bfc94d6c96053ce7bf2a217bc033003b34688934..64c9dd71186b04be92ac49cf9e8563f10cbcb613 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockRepository.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockRepository.java
@@ -26,13 +26,12 @@ package de.ozgcloud.user.common.lock;
import java.time.Instant;
import java.util.Optional;
-import jakarta.enterprise.context.ApplicationScoped;
-
-import de.itvsh.kop.common.logging.KopLogging;
+import de.ozgcloud.common.logging.OzgCloudLogging;
import io.quarkus.mongodb.panache.PanacheMongoRepository;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
-@KopLogging
+@OzgCloudLogging
class LockRepository implements PanacheMongoRepository<Lock> {
Optional<Lock> findLockBefore(Instant timestamp) {
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java
index 50c500471012f14332b7e521bb3ee10f2e83b48f..23a2f0e73209f6d563a0584e026e4d2c64053aae 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java
@@ -26,16 +26,15 @@ package de.ozgcloud.user.common.lock;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
+import de.ozgcloud.common.logging.OzgCloudLogging;
import de.ozgcloud.user.common.errorhandling.LockCreationException;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-
-import de.itvsh.kop.common.logging.KopLogging;
import lombok.extern.log4j.Log4j2;
@Log4j2
@ApplicationScoped
-@KopLogging
+@OzgCloudLogging
public class LockService {
@Inject
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiService.java b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiService.java
index 3cc6c2de9a8230b52459a97d17e3810444bd5b2d..e46070b2b70cb89ed772310d490d513d16fe8f1d 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiService.java
@@ -29,28 +29,27 @@ import java.util.function.Supplier;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-import de.ozgcloud.user.common.errorhandling.KeycloakUnavailableException;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import jakarta.ws.rs.BadRequestException;
-import jakarta.ws.rs.ClientErrorException;
-import jakarta.ws.rs.NotFoundException;
-import jakarta.ws.rs.ProcessingException;
-
import org.apache.commons.lang3.ObjectUtils;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.representations.idm.UserRepresentation;
-import de.itvsh.kop.common.logging.KopLogging;
+import de.ozgcloud.common.logging.OzgCloudLogging;
import de.ozgcloud.user.RemoteUserIterator;
import de.ozgcloud.user.User;
import de.ozgcloud.user.UserResourceMapper;
+import de.ozgcloud.user.common.errorhandling.KeycloakUnavailableException;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.ClientErrorException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.ProcessingException;
import lombok.extern.log4j.Log4j2;
@ApplicationScoped
-@KopLogging
+@OzgCloudLogging
@Log4j2
class KeycloakApiService {
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteService.java b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteService.java
index bf0508c2904bac2a2f30e6b02b4b28a5aaa43e48..555b33c141b6d1b097db972028e25248bf9eeb68 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteService.java
@@ -26,14 +26,13 @@ package de.ozgcloud.user.keycloak;
import java.util.Optional;
import java.util.stream.Stream;
+import de.ozgcloud.common.logging.OzgCloudLogging;
+import de.ozgcloud.user.User;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import de.itvsh.kop.common.logging.KopLogging;
-import de.ozgcloud.user.User;
-
@ApplicationScoped
-@KopLogging
+@OzgCloudLogging
public class KeycloakUserRemoteService {
static final String ATTRIBUTE_NAME_OZG_CLOUD_USER_ID = "ozgCloudUserId";
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepository.java
index 896fc8eb6f9be516e457a33fc6dafa63021092b6..fe0e7a35ccc0a4d9d289c6dc3fa6a093bbf32fd8 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepository.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepository.java
@@ -28,16 +28,15 @@ import static org.apache.commons.collections4.IterableUtils.*;
import java.util.Collection;
-import jakarta.enterprise.context.ApplicationScoped;
-
import com.mongodb.client.model.Filters;
-import de.itvsh.kop.common.logging.KopLogging;
+import de.ozgcloud.common.logging.OzgCloudLogging;
import de.ozgcloud.user.User;
import io.quarkus.mongodb.panache.PanacheMongoRepository;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
-@KopLogging
+@OzgCloudLogging
class OrganisationsEinheitRepository implements PanacheMongoRepository<User> {
public Collection<String> findAllOrganisationsEinheitIds() {
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientRepository.java
index b64ac4c682be248505964150d4417d7cab5835b3..417e715de7e0aedead84a84a4484ee123c796f55 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientRepository.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientRepository.java
@@ -4,15 +4,14 @@ import static de.ozgcloud.user.User.*;
import java.util.List;
-import de.ozgcloud.user.settings.NotificationsSendFor;
-import jakarta.enterprise.context.ApplicationScoped;
-
-import de.itvsh.kop.common.logging.KopLogging;
+import de.ozgcloud.common.logging.OzgCloudLogging;
import de.ozgcloud.user.User;
+import de.ozgcloud.user.settings.NotificationsSendFor;
import io.quarkus.mongodb.panache.PanacheMongoRepository;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
-@KopLogging
+@OzgCloudLogging
class RecipientRepository implements PanacheMongoRepository<User> {
private static final String SEARCH_RECIPIENT_QUERY = ORGANISATIONS_EINHEIT_IDS_FIELD + " = ?1 and " + NOTIFICATION_SEND_FOR_FIELD + " = ?2";
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsRepository.java
index b54e4c75fa6efa45c0c9b354e6d52a41751a4ce0..01edbf382d2f5a7084f038a03701df88fca96afb 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsRepository.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsRepository.java
@@ -25,16 +25,15 @@ package de.ozgcloud.user.settings;
import java.util.Optional;
-import jakarta.enterprise.context.ApplicationScoped;
-
import org.bson.types.ObjectId;
-import de.itvsh.kop.common.logging.KopLogging;
+import de.ozgcloud.common.logging.OzgCloudLogging;
import de.ozgcloud.user.User;
import io.quarkus.mongodb.panache.PanacheMongoRepository;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
-@KopLogging
+@OzgCloudLogging
class UserSettingsRepository implements PanacheMongoRepository<User> {
public Optional<UserSettings> updateByUserId(String userId, UserSettings userSettings) {
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncService.java b/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncService.java
index ad9ad6fa048f7e19cdcdf8fa0f6ba44c3744d4ad..498cde4566d1679d0f6ade9aa89ad8c9d5c22129 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncService.java
@@ -25,18 +25,17 @@ package de.ozgcloud.user.sync;
import java.util.function.Predicate;
-import de.ozgcloud.user.keycloak.KeycloakUserRemoteService;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
import org.apache.commons.collections4.CollectionUtils;
-import de.itvsh.kop.common.logging.KopLogging;
+import de.ozgcloud.common.logging.OzgCloudLogging;
import de.ozgcloud.user.User;
import de.ozgcloud.user.UserService;
+import de.ozgcloud.user.keycloak.KeycloakUserRemoteService;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
@ApplicationScoped
-@KopLogging
+@OzgCloudLogging
class SyncService {
private final Predicate<User> HAS_ANY_ROLE = user -> CollectionUtils.isNotEmpty(user.getRoles());// NOSONAR