From 659f79a0d9155da76414eeb51cd6342667f0e89d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 4 Dec 2023 13:10:15 +0100
Subject: [PATCH] OZG-4589 OZG-4645 use ozgcloud common 3
---
pom.xml | 14 +++++++-------
user-manager-server/pom.xml | 4 ++--
.../de/ozgcloud/user/UserProfileResource.java | 15 +++++++--------
.../java/de/ozgcloud/user/UserRepository.java | 7 +++----
.../java/de/ozgcloud/user/UserService.java | 13 ++++++-------
.../AccessForbiddenException.java | 2 +-
.../common/errorhandling/ApiErrorUtil.java | 3 +--
.../errorhandling/FunctionalException.java | 8 ++++----
.../ResourceNotFoundException.java | 2 +-
.../user/common/lock/LockRepository.java | 7 +++----
.../user/common/lock/LockService.java | 5 ++---
.../user/keycloak/KeycloakApiService.java | 19 +++++++++----------
.../keycloak/KeycloakUserRemoteService.java | 7 +++----
.../OrganisationsEinheitRepository.java | 7 +++----
.../user/recipient/RecipientRepository.java | 9 ++++-----
.../user/settings/UserSettingsRepository.java | 7 +++----
.../de/ozgcloud/user/sync/SyncService.java | 11 +++++------
17 files changed, 64 insertions(+), 76 deletions(-)
diff --git a/pom.xml b/pom.xml
index b5ab986f..a1dd5835 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,9 +27,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -44,7 +44,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>
@@ -135,9 +135,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/user-manager-server/pom.xml b/user-manager-server/pom.xml
index 2d8abe44..2fcd6276 100644
--- a/user-manager-server/pom.xml
+++ b/user-manager-server/pom.xml
@@ -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 6e940220..7109effb 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 b13ef3cf..56f1b35b 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 ee505dd9..deab5720 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 471b24a9..20867afe 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 ae340c42..957dbdb5 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 f6a5819e..22829670 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 dda73e7f..dba1b68a 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 bfc94d6c..64c9dd71 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 50c50047..23a2f0e7 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 3cc6c2de..e46070b2 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 bf0508c2..555b33c1 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 896fc8eb..fe0e7a35 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 b64ac4c6..417e715d 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 b54e4c75..01edbf38 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 ad9ad6fa..498cde45 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
--
GitLab