diff --git a/Jenkinsfile b/Jenkinsfile
index 2a5922706afb8068ae66bdee61a5c99a05c38da9..b757440f2a49270592da5c7ca3be65b6a61a583a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,22 +30,28 @@ pipeline {
script {
FAILED_STAGE = env.STAGE_NAME
def rootVersion = getPomVersion('pom.xml')
- def userManagerVersion = getPomVersion('user-manager-server/pom.xml')
- def interfaceVersion = getPomVersion('user-manager-interface/pom.xml')
if(env.BRANCH_NAME == 'release'){
- if ( !(rootVersion ==~ RELEASE_REGEX) || !(userManagerVersion ==~ RELEASE_REGEX) || !(interfaceVersion ==~ RELEASE_REGEX)) {
+ if ( !(rootVersion ==~ RELEASE_REGEX)) {
error("Keine Release Version für Branch ${env.BRANCH_NAME}.")
}
} else {
- if ( !(rootVersion ==~ SNAPSHOT_REGEX) || !(userManagerVersion ==~ SNAPSHOT_REGEX) || !(interfaceVersion ==~ SNAPSHOT_REGEX)) {
+ if ( !(rootVersion ==~ SNAPSHOT_REGEX) ) {
error("Keine Snapshot Version für Branch ${env.BRANCH_NAME}.")
}
}
+ }
+ }
+ }
- if( !(rootVersion == userManagerVersion && rootVersion == interfaceVersion )){
- error("Versionen sind nicht identisch")
- }
+ stage('Build UserManager parent pom') {
+ steps {
+ script {
+ FAILED_STAGE=env.STAGE_NAME
+ }
+
+ configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+ sh './mvnw -N -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3'
}
}
}
diff --git a/pom.xml b/pom.xml
index 303ed86fe1de7537845b0375f4953fe25138414c..b5ab986f306a2144d42bc41f1807d207613b39f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,22 +26,90 @@
-->
<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>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>de.itvsh.kop</groupId>
+ <groupId>de.ozgcloud.user</groupId>
<artifactId>user-manager</artifactId>
- <version>1.14.0-SNAPSHOT</version>
-
- <name>User Manager Parent</name>
+ <version>2.0.0-SNAPSHOT</version>
+ <name>OZG-Cloud User Manager</name>
<packaging>pom</packaging>
<properties>
- <kop.license.version>1.8.0</kop.license.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <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>
+ <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>
+ <keycloak-adapter.version>22.0.5</keycloak-adapter.version>
+
+ <!-- plugins -->
+ <maven.compiler.release>17</maven.compiler.release>
+ <jandex-maven-plugin-version>1.2.3</jandex-maven-plugin-version>
+ <compiler-plugin.version>3.8.1</compiler-plugin.version>
+ <jacoco.plugin.version>0.8.8</jacoco.plugin.version>
+ <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
+ <maven-failsafe-plugin.version>3.0.0-M7</maven-failsafe-plugin.version>
+ <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
</properties>
<modules>
- <module>user-manager-server</module>
<module>user-manager-interface</module>
+ <module>user-manager-server</module>
</modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Modules -->
+ <dependency>
+ <groupId>de.ozgcloud.user</groupId>
+ <artifactId>user-manager-interface</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Quarkus -->
+ <dependency>
+ <groupId>io.quarkus.platform</groupId>
+ <artifactId>quarkus-bom</artifactId>
+ <version>${quarkus.platform.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- Jakarta -->
+ <dependency>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <version>${jakarta.interceptor.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotatioin.version}</version>
+ </dependency>
+
+ <!-- Mapstruct -->
+ <dependency>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>mapstruct</artifactId>
+ <version>${mapstruct.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>mapstruct-processor</artifactId>
+ <version>${mapstruct.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<pluginManagement>
@@ -51,6 +119,9 @@
<artifactId>license-maven-plugin</artifactId>
<version>4.1</version>
<configuration>
+ <mapping>
+ <config>SCRIPT_STYLE</config>
+ </mapping>
<licenseSets>
<licenseSet>
<header>license/eupl_v1_2_de/header.txt</header>
@@ -70,20 +141,89 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>io.quarkus.platform</groupId>
+ <artifactId>quarkus-maven-plugin</artifactId>
+ <version>${quarkus.platform.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build</goal>
+ <goal>generate-code</goal>
+ <goal>generate-code-tests</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.jandex</groupId>
+ <artifactId>jandex-maven-plugin</artifactId>
+ <version>${jandex-maven-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>make-index</id>
+ <goals>
+ <goal>jandex</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${compiler-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <version>${git-commit-id-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>get-the-git-infos</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <offline>true</offline>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>start-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <propertyName>surefire.jacoco.args</propertyName>
+ <exclClassLoaders>*QuarkusClassLoader</exclClassLoaders>
+ <destFile>${project.build.directory}/jacoco-quarkus.exec</destFile>
+ <append>true</append>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-report</id>
+ <phase>package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
-
- <distributionManagement>
- <repository>
- <id>ozg-nexus</id>
- <name>ozg-releases</name>
- <url>https://nexus.ozg-sh.de/repository/ozg-releases/</url>
- </repository>
- <snapshotRepository>
- <id>ozg-snapshots-nexus</id>
- <name>ozg-snapshots</name>
- <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
</project>
diff --git a/run_local.sh b/run_local.sh
index 2115b363771d1abd309380119e8b2c843335f04a..aa82ca615597e4637c14755f1b48f841ed944c8a 100755
--- a/run_local.sh
+++ b/run_local.sh
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
-./mvnw -f user-manager-server/pom.xml quarkus:dev -Dquarkus.profile=local,remotekc
\ No newline at end of file
+./mvnw -pl user-manager-server quarkus:dev -Dquarkus.profile=local,remotekc
\ No newline at end of file
diff --git a/user-manager-interface/pom.xml b/user-manager-interface/pom.xml
index a249d3ea3591c7f6494e042723556e83e3dacb27..c97d160968ecd2cc47ff9dca0af7006e584cf9f0 100644
--- a/user-manager-interface/pom.xml
+++ b/user-manager-interface/pom.xml
@@ -28,26 +28,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-dependencies</artifactId>
- <version>1.7.1</version>
- <relativePath/>
+ <groupId>de.ozgcloud.user</groupId>
+ <artifactId>user-manager</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
- <groupId>de.itvsh.kop.user</groupId>
<artifactId>user-manager-interface</artifactId>
- <version>1.14.0-SNAPSHOT</version>
-
- <name>UserManager Interface</name>
+ <name>OZG-Cloud User Manager Interface</name>
<description>gRPC Interface for User Manager</description>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <jandex-maven-plugin-version>1.2.3</jandex-maven-plugin-version>
- <quarkus.platform.version>3.5.0</quarkus.platform.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
@@ -64,74 +53,23 @@
<build>
<plugins>
<plugin>
- <groupId>io.quarkus</groupId>
+ <groupId>io.quarkus.platform</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
- <version>${quarkus.platform.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>build</goal>
- <goal>generate-code</goal>
- <goal>generate-code-tests</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
- <version>${jandex-maven-plugin-version}</version>
- <executions>
- <execution>
- <id>make-index</id>
- <goals>
- <goal>jandex</goal>
- </goals>
- </execution>
- </executions>
</plugin>
-
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>4.1</version>
<configuration>
<mapping>
<proto>SLASHSTAR_STYLE</proto>
<config>SCRIPT_STYLE</config>
</mapping>
- <licenseSets>
- <licenseSet>
- <header>license/eupl_v1_2_de/header.txt</header>
- <excludes>
- <exclude>**/*.yaml</exclude>
- <exclude>**/*.yml</exclude>
- <exclude>README.md</exclude>
- </excludes>
- </licenseSet>
- </licenseSets>
</configuration>
- <dependencies>
- <dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-license</artifactId>
- <version>${kop.license.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
-
- <distributionManagement>
- <repository>
- <id>ozg-nexus</id>
- <name>ozg-releases</name>
- <url>https://nexus.ozg-sh.de/repository/ozg-releases/</url>
- </repository>
- <snapshotRepository>
- <id>ozg-snapshots-nexus</id>
- <name>ozg-snapshots</name>
- <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
</project>
diff --git a/user-manager-interface/src/main/proto/organisationseinheit.model.proto b/user-manager-interface/src/main/proto/organisationseinheit.model.proto
index 15d2538614d20e5a3d3d787568a3c810f06f39f3..94aeb3cdf52069f51014137801a91bc01f476436 100644
--- a/user-manager-interface/src/main/proto/organisationseinheit.model.proto
+++ b/user-manager-interface/src/main/proto/organisationseinheit.model.proto
@@ -23,10 +23,10 @@
*/
syntax = "proto3";
-package de.itvsh.kop.user.grpc;
+package de.ozgcloud.user.grpc;
option java_multiple_files = true;
-option java_package = "de.itvsh.kop.user.organisationseinheit";
+option java_package = "de.ozgcloud.user.organisationseinheit";
option java_outer_classname = "OrganisationsEinheitModelProto";
message GrpcOrganisationsEinheit {
diff --git a/user-manager-interface/src/main/proto/organisationseinheit.proto b/user-manager-interface/src/main/proto/organisationseinheit.proto
index e02b76915050bb28ac7acac333b3c87cb160e330..6303fbfef6b6f40b778368acef0dd1b5071b5488 100644
--- a/user-manager-interface/src/main/proto/organisationseinheit.proto
+++ b/user-manager-interface/src/main/proto/organisationseinheit.proto
@@ -25,10 +25,10 @@ syntax = "proto3";
import "google/protobuf/empty.proto";
import "organisationseinheit.model.proto";
-package de.itvsh.kop.user.grpc;
+package de.ozgcloud.user.grpc;
option java_multiple_files = true;
-option java_package = "de.itvsh.kop.user.grpc.organisationseinheit";
+option java_package = "de.ozgcloud.user.grpc.organisationseinheit";
option java_outer_classname = "OrganisationsEinheitProto";
service OrganisationsEinheitService {
diff --git a/user-manager-interface/src/main/proto/recipient.model.proto b/user-manager-interface/src/main/proto/recipient.model.proto
index c2bce6ae000dc7dab106b60131f34f1b2a00fae9..5c286982bd5d030560df4ada71454fefcec937b8 100644
--- a/user-manager-interface/src/main/proto/recipient.model.proto
+++ b/user-manager-interface/src/main/proto/recipient.model.proto
@@ -23,10 +23,10 @@
*/
syntax = "proto3";
-package de.itvsh.kop.user.grpc;
+package de.ozgcloud.user.grpc;
option java_multiple_files = true;
-option java_package = "de.itvsh.kop.user.recipient";
+option java_package = "de.ozgcloud.user.recipient";
option java_outer_classname = "RecipientModelProto";
message GrpcRecipient {
diff --git a/user-manager-interface/src/main/proto/recipient.proto b/user-manager-interface/src/main/proto/recipient.proto
index b27457089d35fda245eaf8bfdd0873a1fdee710e..bbaae80c221116bf348bba49aa67a1da12c6f02e 100644
--- a/user-manager-interface/src/main/proto/recipient.proto
+++ b/user-manager-interface/src/main/proto/recipient.proto
@@ -23,12 +23,12 @@
*/
syntax = "proto3";
-package de.itvsh.kop.user.grpc;
+package de.ozgcloud.user.grpc;
import "recipient.model.proto";
option java_multiple_files = true;
-option java_package = "de.itvsh.kop.user.grpc.recipient";
+option java_package = "de.ozgcloud.user.grpc.recipient";
option java_outer_classname = "RecipientProto";
service RecipientService {
diff --git a/user-manager-interface/src/main/proto/userprofile.model.proto b/user-manager-interface/src/main/proto/userprofile.model.proto
index d5641c6254d43ce22539ff8d4a9685a01d5a3980..f4e97598853a044e31dc5d56819e61019243bb3e 100644
--- a/user-manager-interface/src/main/proto/userprofile.model.proto
+++ b/user-manager-interface/src/main/proto/userprofile.model.proto
@@ -23,10 +23,10 @@
*/
syntax = "proto3";
-package de.itvsh.kop.user.grpc;
+package de.ozgcloud.user.grpc;
option java_multiple_files = true;
-option java_package = "de.itvsh.kop.user.userprofile";
+option java_package = "de.ozgcloud.user.userprofile";
option java_outer_classname = "UserProfileModelProto";
message GrpcUserProfile {
diff --git a/user-manager-interface/src/main/proto/userprofile.proto b/user-manager-interface/src/main/proto/userprofile.proto
index d5448cdb8ea61ca1855e4bfb9f485e51d5450709..8bdaf438dd546ff271e1cb723858ed8ad9d120d4 100644
--- a/user-manager-interface/src/main/proto/userprofile.proto
+++ b/user-manager-interface/src/main/proto/userprofile.proto
@@ -23,13 +23,13 @@
*/
syntax = "proto3";
-package de.itvsh.kop.user.grpc;
+package de.ozgcloud.user.grpc;
import "userprofile.model.proto";
import "google/protobuf/empty.proto";
option java_multiple_files = true;
-option java_package = "de.itvsh.kop.user.grpc.userprofile";
+option java_package = "de.ozgcloud.user.grpc.userprofile";
option java_outer_classname = "UserProfileProto";
service UserProfileService {
diff --git a/user-manager-server/pom.xml b/user-manager-server/pom.xml
index 0f9a4f359f11b80c1be49d1d7c006212601b3e1a..2d8abe44efc0e5fb7692457456eae1709a586f4a 100644
--- a/user-manager-server/pom.xml
+++ b/user-manager-server/pom.xml
@@ -24,73 +24,31 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-dependencies</artifactId>
- <version>2.3.1</version>
- <relativePath/>
+ <groupId>de.ozgcloud.user</groupId>
+ <artifactId>user-manager</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
- <groupId>de.itvsh.kop.user</groupId>
<artifactId>user-manager-server</artifactId>
- <version>1.14.0-SNAPSHOT</version>
- <name>User Manager</name>
+ <name>OZG-Cloud User Manager Server</name>
<properties>
<skipITs>false</skipITs>
-
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <compiler-plugin.version>3.8.1</compiler-plugin.version>
- <maven.compiler.release>17</maven.compiler.release>
-
- <jacoco.plugin.version>0.8.8</jacoco.plugin.version>
- <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
- <maven-failsafe-plugin.version>3.0.0-M7</maven-failsafe-plugin.version>
- <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
-
- <lombok.version>1.18.24</lombok.version>
-
- <jakarta.interceptor.version>2.1.0</jakarta.interceptor.version>
- <jakarta.annotatioin.version>2.1.1</jakarta.annotatioin.version>
-
- <keycloak-adapter.version>22.0.5</keycloak-adapter.version>
-
- <quarkus.platform.version>3.5.0</quarkus.platform.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>io.quarkus.platform</groupId>
- <artifactId>quarkus-bom</artifactId>
- <version>${quarkus.platform.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-dependencies</artifactId>
- <version>${kop-common.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
- <groupId>de.itvsh.kop.user</groupId>
+ <groupId>de.ozgcloud.user</groupId>
<artifactId>user-manager-interface</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.itvsh.kop.common</groupId>
<artifactId>kop-common-lib</artifactId>
- <version>${kop-common.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
@@ -188,7 +146,6 @@
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
@@ -200,8 +157,6 @@
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
- <version>${mapstruct.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.thedeanda</groupId>
@@ -213,7 +168,6 @@
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
- <version>${jakarta.interceptor.version}</version>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
@@ -230,7 +184,6 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
- <version>${jakarta.annotatioin.version}</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
@@ -280,51 +233,61 @@
<plugin>
<groupId>io.quarkus.platform</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
- <version>${quarkus.platform.version}</version>
<extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ </plugin>
+ <!-- Core plugins -->
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
+ <id>default-compile1</id>
+ <phase>compile</phase>
<goals>
- <goal>build</goal>
- <goal>generate-code</goal>
- <goal>generate-code-tests</goal>
+ <goal>compile</goal>
</goals>
+ <configuration>
+ <fork>true</fork>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ <path>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>mapstruct-processor</artifactId>
+ <version>${mapstruct.version}</version>
+ </path>
+ <!-- other annotation processors -->
+ </annotationProcessorPaths>
+ <showWarnings>true</showWarnings>
+ <compilerArgs>
+ <arg>-parameters</arg>
+ <compilerArg>
+ -Amapstruct.defaultComponentModel=jakarta
+ </compilerArg>
+ <compilerArg>
+ -Amapstruct.unmappedTargetPolicy=WARN
+ </compilerArg>
+ </compilerArgs>
+ </configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler-plugin.version}</version>
- <configuration>
- <fork>true</fork>
- <annotationProcessorPaths>
- <path>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </path>
- <path>
- <groupId>org.mapstruct</groupId>
- <artifactId>mapstruct-processor</artifactId>
- <version>${mapstruct.version}</version>
- </path>
- <!-- other annotation processors -->
- </annotationProcessorPaths>
- <showWarnings>true</showWarnings>
- <compilerArgs>
- <arg>-parameters</arg>
- <compilerArg>
- -Amapstruct.defaultComponentModel=jakarta
- </compilerArg>
- <compilerArg>
- -Amapstruct.unmappedTargetPolicy=WARN
- </compilerArg>
- </compilerArgs>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-plugin.version}</version>
<configuration>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
@@ -336,7 +299,6 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${maven-failsafe-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -357,77 +319,6 @@
<classesDirectory>${project.build.outputDirectory}</classesDirectory>
</configuration>
</plugin>
- <plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- <version>${git-commit-id-plugin.version}</version>
- <executions>
- <execution>
- <id>get-the-git-infos</id>
- <phase>initialize</phase>
- <goals>
- <goal>revision</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <offline>true</offline>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.plugin.version}</version>
- <executions>
- <execution>
- <id>start-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <propertyName>surefire.jacoco.args</propertyName>
- <exclClassLoaders>*QuarkusClassLoader</exclClassLoaders>
- <destFile>${project.build.directory}/jacoco-quarkus.exec</destFile>
- <append>true</append>
- </configuration>
- </execution>
- <execution>
- <id>generate-report</id>
- <phase>package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>4.1</version>
- <configuration>
- <mapping>
- <config>SCRIPT_STYLE</config>
- </mapping>
- <licenseSets>
- <licenseSet>
- <header>license/eupl_v1_2_de/header.txt</header>
- <excludes>
- <exclude>**/README</exclude>
- <exclude>src/test/resources/**</exclude>
- <exclude>src/main/resources/**</exclude>
- </excludes>
- </licenseSet>
- </licenseSets>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-license</artifactId>
- <version>${kop.license.version}</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
@@ -446,17 +337,4 @@
</properties>
</profile>
</profiles>
-
- <distributionManagement>
- <repository>
- <id>ozg-nexus</id>
- <name>ozg-releases</name>
- <url>https://nexus.ozg-sh.de/repository/ozg-releases/</url>
- </repository>
- <snapshotRepository>
- <id>ozg-snapshots-nexus</id>
- <name>ozg-snapshots</name>
- <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
</project>
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/FindUserProfilesQuery.java b/user-manager-server/src/main/java/de/ozgcloud/user/FindUserProfilesQuery.java
similarity index 93%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/FindUserProfilesQuery.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/FindUserProfilesQuery.java
index 9489b7ba1e998e1489c56d4e485fc6cc343a29ce..93e4b0ff59118602cbb80a4e7becc5be3595a87f 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/FindUserProfilesQuery.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/FindUserProfilesQuery.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/RemoteUserIterator.java b/user-manager-server/src/main/java/de/ozgcloud/user/RemoteUserIterator.java
similarity index 98%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/RemoteUserIterator.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/RemoteUserIterator.java
index a336f04d164776a9ba85044b3fde36dfd4e36708..2af5b34a76dd98a9cc7e31539f27b43ffe53be14 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/RemoteUserIterator.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/RemoteUserIterator.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import java.util.Iterator;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/RoleHierarchy.java b/user-manager-server/src/main/java/de/ozgcloud/user/RoleHierarchy.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/RoleHierarchy.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/RoleHierarchy.java
index 73eb833741891a50fbaa94c0ed2f1a8c0b9feae4..f09047a2442a794591d01301e761011f4aa42ccd 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/RoleHierarchy.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/RoleHierarchy.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import java.util.ArrayDeque;
import java.util.Deque;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/User.java b/user-manager-server/src/main/java/de/ozgcloud/user/User.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/User.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/User.java
index 2f9a17ac7f91003b55438437e371037d99c14174..0d645513f212f4958a4b2e712c0428046d63e995 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/User.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/User.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import java.util.Collection;
import java.util.Date;
@@ -31,7 +31,7 @@ import org.bson.types.ObjectId;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.itvsh.kop.user.settings.UserSettings;
+import de.ozgcloud.user.settings.UserSettings;
import io.quarkus.runtime.annotations.RegisterForReflection;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserIdProjection.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserIdProjection.java
similarity index 98%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserIdProjection.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/UserIdProjection.java
index 330046cd2d79c284e4aed6083c93109e974fbbfa..1ccc0aa625265d33fa0733dc49799307b782a401 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserIdProjection.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserIdProjection.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import org.bson.codecs.pojo.annotations.BsonIgnore;
import org.bson.types.ObjectId;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserProfileResource.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResource.java
similarity index 99%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserProfileResource.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResource.java
index 75135331fbdd58761575a3ba80da234c817f7b78..6e94022046153760096a9b1dfaa8643ee849b6da 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserProfileResource.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResource.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import java.util.Optional;
import java.util.stream.Stream;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserProfileResourceAssembler.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResourceAssembler.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserProfileResourceAssembler.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResourceAssembler.java
index ebfcc495e253932c32d6c05428322aa2b36b382e..57c96412902115550b74b319b1a907396055fc88 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserProfileResourceAssembler.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserProfileResourceAssembler.java
@@ -21,14 +21,14 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import java.util.List;
+import de.ozgcloud.user.settings.UserSettingsResource;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.ws.rs.core.Link;
-import de.itvsh.kop.user.settings.UserSettingsResource;
import io.quarkus.hal.HalCollectionWrapper;
import io.quarkus.hal.HalEntityWrapper;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserRepository.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
index 58fe0f1468bfc2edf7b0699c5f775595d50dc9fc..b13ef3cf5b5cfd05f4dc037e426abaa693d1f624 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserRepository.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
@@ -21,9 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
-import static de.itvsh.kop.user.User.*;
+import static de.ozgcloud.user.User.*;
import java.util.Optional;
import java.util.stream.Stream;
@@ -33,7 +33,7 @@ import jakarta.enterprise.context.ApplicationScoped;
import org.bson.types.ObjectId;
import de.itvsh.kop.common.logging.KopLogging;
-import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException;
+import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException;
import io.quarkus.mongodb.panache.PanacheMongoRepository;
import io.quarkus.panache.common.Parameters;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserResourceMapper.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserResourceMapper.java
similarity index 98%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserResourceMapper.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/UserResourceMapper.java
index d15c1c2d10717d9087f5c857481d9b4d2ffda2c0..52f53b25185c18d5c163bdb4ff695a0adc353266 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserResourceMapper.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserResourceMapper.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import java.util.Collections;
import java.util.Date;
@@ -44,7 +44,7 @@ import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy;
-import de.itvsh.kop.user.keycloak.KeycloakApiProperties;
+import de.ozgcloud.user.keycloak.KeycloakApiProperties;
@Mapper(unmappedTargetPolicy = ReportingPolicy.WARN)
public abstract class UserResourceMapper {
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserRole.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserRole.java
similarity index 98%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserRole.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/UserRole.java
index dc694061ae5053bc74b7546a4e4a7f777da815a0..4c8c9c5d0d6d0f09a6eb31b9c32a8257ffe980b5 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserRole.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserRole.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import java.util.Collection;
import java.util.Collections;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/UserService.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserService.java
similarity index 95%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/UserService.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/UserService.java
index 700348fb23f6f1999a920c21c98f47cef9776923..ee505dd992fbf2213a40b930c520b0c2183388c3 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/UserService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/UserService.java
@@ -21,20 +21,20 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+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.itvsh.kop.user.common.errorhandling.ResourceNotFoundException;
-import de.itvsh.kop.user.common.errorhandling.TechnicalException;
-import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService;
+import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException;
import io.smallrye.mutiny.Uni;
import io.smallrye.mutiny.infrastructure.Infrastructure;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/JwtUtil.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/JwtUtil.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/JwtUtil.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/JwtUtil.java
index 10b6fe56ec5019ab1ba88492dad6d988a3776139..70da14735f91f78c3931175c765bb14219e5572a 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/JwtUtil.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/JwtUtil.java
@@ -21,13 +21,14 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common;
+package de.ozgcloud.user.common;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import de.ozgcloud.user.keycloak.KeycloakApiProperties;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.json.JsonArray;
@@ -36,8 +37,6 @@ import jakarta.json.JsonString;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.microprofile.jwt.JsonWebToken;
-import de.itvsh.kop.user.keycloak.KeycloakApiProperties;
-
@ApplicationScoped
public class JwtUtil {
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/LivenessCheck.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/LivenessCheck.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/LivenessCheck.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/LivenessCheck.java
index fba90fa41fe3faa4e4747d4de498e3bbeecc6594..ff4757840bdec10fb6380189c11e7cb06a76f6e2 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/LivenessCheck.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/LivenessCheck.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common;
+package de.ozgcloud.user.common;
import org.eclipse.microprofile.health.HealthCheck;
import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/NativeConfig.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/NativeConfig.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/NativeConfig.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/NativeConfig.java
index 17a03635d1025ef7e7dc73571adb308d29f47af3..9e49c6cf372eff26be2beb1b6b237d6413886f15 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/NativeConfig.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/NativeConfig.java
@@ -21,8 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common;
+package de.ozgcloud.user.common;
+import de.ozgcloud.user.UserIdProjection;
import io.quarkus.runtime.annotations.RegisterForReflection;
@RegisterForReflection(targets = {
@@ -43,7 +44,7 @@ import io.quarkus.runtime.annotations.RegisterForReflection;
org.jboss.resteasy.plugins.providers.multipart.MimeMultipartProvider.class,
org.jboss.resteasy.plugins.providers.multipart.XopWithMultipartRelatedReader.class,
org.jboss.resteasy.plugins.providers.multipart.XopWithMultipartRelatedWriter.class,
- de.itvsh.kop.user.UserIdProjection.class
+ UserIdProjection.class
})
public class NativeConfig {
}
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/TargetTypeProvider.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/TargetTypeProvider.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/TargetTypeProvider.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/TargetTypeProvider.java
index bcdc58e497c2d71bc6ac0bec45f6443f3f9b7519..c48bd0e8b5bfea9227dcedcafbf301d40c9dc008 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/TargetTypeProvider.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/TargetTypeProvider.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common;
+package de.ozgcloud.user.common;
import java.lang.reflect.Type;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/CallContextUser.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/CallContextUser.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/CallContextUser.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/CallContextUser.java
index 633efe7bcc4c84dd54596af48dc4b752b8c558e2..9b352b7eb2252bd52e6040e591f27ea57f1cfbdf 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/CallContextUser.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/CallContextUser.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
import java.io.Serializable;
import java.security.Principal;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/CurrentCallContextUserService.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/CurrentCallContextUserService.java
similarity index 94%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/CurrentCallContextUserService.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/CurrentCallContextUserService.java
index 98b6984de20251ff5b1c83bfc27c843ed66fb4ac..8add5bb4d4ae903cc6f503a0fbc71e0d61e23fa3 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/CurrentCallContextUserService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/CurrentCallContextUserService.java
@@ -21,14 +21,13 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
import java.util.Optional;
+import de.ozgcloud.user.UserRole;
import jakarta.enterprise.context.RequestScoped;
-import de.itvsh.kop.user.UserRole;
-
@RequestScoped
public class CurrentCallContextUserService {
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/GrpcCallContextInterceptor.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/GrpcCallContextInterceptor.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/GrpcCallContextInterceptor.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/GrpcCallContextInterceptor.java
index 9717a5bdbd5aa4c70f97541bab47b131fbb370f9..00232b6bb1d855760ddce81ae732bfc13784e3d3 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/GrpcCallContextInterceptor.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/GrpcCallContextInterceptor.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
import java.util.Optional;
import java.util.UUID;
@@ -31,7 +31,7 @@ import jakarta.inject.Inject;
import org.apache.logging.log4j.CloseableThreadContext;
-import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException;
+import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException;
import io.grpc.ForwardingServerCallListener;
import io.grpc.Metadata;
import io.grpc.ServerCall;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/GrpcUtil.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/GrpcUtil.java
similarity index 95%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/GrpcUtil.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/GrpcUtil.java
index 07b3cfb40c353e8b94b6034103d22ad2f971a1ad..592cf317569db76caf8662a0a0b0c625b2bbf4e6 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/GrpcUtil.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/GrpcUtil.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/HttpRequestInterceptor.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptor.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/HttpRequestInterceptor.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptor.java
index 81e3f3f9c5134e0780fd953a4fff62b5541751b3..225abf0d55183c5512d88d12b92bd1f7ab28d0d5 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/HttpRequestInterceptor.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptor.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
import java.io.IOException;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/HttpSecurityFilter.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/HttpSecurityFilter.java
similarity index 95%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/HttpSecurityFilter.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/HttpSecurityFilter.java
index aabdd9cd38551ef45659c321bbc4870d8d9a868e..5afe4bb6af9bba8dcdf39cc154f5e5dcfee7232c 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/callcontext/HttpSecurityFilter.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/callcontext/HttpSecurityFilter.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
import java.io.IOException;
@@ -31,7 +31,7 @@ import jakarta.ws.rs.container.ContainerRequestFilter;
import jakarta.ws.rs.container.PreMatching;
import jakarta.ws.rs.ext.Provider;
-import de.itvsh.kop.user.common.JwtUtil;
+import de.ozgcloud.user.common.JwtUtil;
@Provider
@PreMatching
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/AccessForbiddenException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/AccessForbiddenException.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/AccessForbiddenException.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/AccessForbiddenException.java
index 31100db1c7bbb9bed171efa08a22517070ff3d5a..471b24a9d961702a0230f771822b8490c9483ea4 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/AccessForbiddenException.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/AccessForbiddenException.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.errorhandling;
+package de.ozgcloud.user.common.errorhandling;
import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ApiError.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiError.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ApiError.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiError.java
index ed83cb428be3525a4838c7b5176b0bdbe434880c..9e43a49a9cf40e206c7b1b2f33c8bd81efdde421 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ApiError.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiError.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.errorhandling;
+package de.ozgcloud.user.common.errorhandling;
import java.util.List;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ApiErrorUtil.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtil.java
similarity index 98%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ApiErrorUtil.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtil.java
index c11c6eb5a14f82bc27ae200fe0bc9756d2b7666c..ae340c425aa2406be44476251ea6bfbb32f9790f 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ApiErrorUtil.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtil.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.errorhandling;
+package de.ozgcloud.user.common.errorhandling;
import java.util.UUID;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ExceptionHandler.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ExceptionHandler.java
similarity index 98%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ExceptionHandler.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ExceptionHandler.java
index 9453922c7981a1ce2bf752eda49281172195b0c5..1392a36110cbe715a18ef60efb436343b954c03e 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ExceptionHandler.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ExceptionHandler.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.errorhandling;
+package de.ozgcloud.user.common.errorhandling;
import jakarta.inject.Inject;
import jakarta.ws.rs.NotFoundException;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/FunctionalException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/FunctionalException.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/FunctionalException.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/FunctionalException.java
index a304ccf2f92e71ad90e16fc6224bbb24efd16051..f6a5819ec2d399e911c7c29bd2b5682184154522 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/FunctionalException.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/FunctionalException.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.errorhandling;
+package de.ozgcloud.user.common.errorhandling;
import de.itvsh.kop.common.errorhandling.ExceptionUtil;
import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/Issue.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/Issue.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/Issue.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/Issue.java
index 7ef4deb71a0835790a4ad5c65c5d5a3274fffcf0..455386e2e02ad67aaeef25e703d8bfc2ad72077a 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/Issue.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/Issue.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.errorhandling;
+package de.ozgcloud.user.common.errorhandling;
import java.util.List;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/KeycloakUnavailableException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/KeycloakUnavailableException.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/KeycloakUnavailableException.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/KeycloakUnavailableException.java
index 5eadd9f3600e9760aa7fb92b60212a57502df865..1030fce63204cb7357aca58bbd8cc1bb60dad030 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/KeycloakUnavailableException.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/KeycloakUnavailableException.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.errorhandling;
+package de.ozgcloud.user.common.errorhandling;
public class KeycloakUnavailableException extends TechnicalException {
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/LockCreationException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/LockCreationException.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/LockCreationException.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/LockCreationException.java
index 926021272524586421d9ee79276ce8d2544969c6..48d6009e2f9055f0125b76b5b44b1b190726596d 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/LockCreationException.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/LockCreationException.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.errorhandling;
+package de.ozgcloud.user.common.errorhandling;
public class LockCreationException extends TechnicalException {
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ResourceNotFoundException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ResourceNotFoundException.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ResourceNotFoundException.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ResourceNotFoundException.java
index d6346d099bb28c53782988dc7a5ea82ba8d371ce..dda73e7fbbf3af9cedffd1126f05120f5730aded 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/ResourceNotFoundException.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/ResourceNotFoundException.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.errorhandling;
+package de.ozgcloud.user.common.errorhandling;
import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
import lombok.Getter;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/TechnicalException.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/TechnicalException.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/TechnicalException.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/TechnicalException.java
index 67dd8ec85f392e467096b79e93c2cbca19150f80..0f36a742cf508c60a92a7c999a12159161632053 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/errorhandling/TechnicalException.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/errorhandling/TechnicalException.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.errorhandling;
+package de.ozgcloud.user.common.errorhandling;
import java.util.UUID;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/Lock.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/Lock.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/Lock.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/lock/Lock.java
index f6399a5d0b43f634553256d6597bc9b5d6633367..27553ad3c0f52bc060f0931743b4497710a94f50 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/Lock.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/Lock.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.lock;
+package de.ozgcloud.user.common.lock;
import io.quarkus.mongodb.panache.PanacheMongoEntity;
import io.quarkus.mongodb.panache.common.MongoEntity;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/LockRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockRepository.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/LockRepository.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockRepository.java
index 6ca0b99f57523417607e0e7af5e7cbba385c9c92..bfc94d6c96053ce7bf2a217bc033003b34688934 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/LockRepository.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockRepository.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.lock;
+package de.ozgcloud.user.common.lock;
import java.time.Instant;
import java.util.Optional;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/LockService.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java
similarity index 95%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/LockService.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java
index 85de568651ff1ca2dfc3495f669473ac53acfa10..50c500471012f14332b7e521bb3ee10f2e83b48f 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/common/lock/LockService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/lock/LockService.java
@@ -21,16 +21,16 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.lock;
+package de.ozgcloud.user.common.lock;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
+import de.ozgcloud.user.common.errorhandling.LockCreationException;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import de.itvsh.kop.common.logging.KopLogging;
-import de.itvsh.kop.user.common.errorhandling.LockCreationException;
import lombok.extern.log4j.Log4j2;
@Log4j2
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiProperties.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiProperties.java
index 196b98fc31ce8cde4b0e18da7f1f4e1b3192a93c..cfc97551b07b69f9aafb2a2240dd1dabbf1da21a 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiProperties.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiProperties.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.keycloak;
+package de.ozgcloud.user.keycloak;
import jakarta.validation.constraints.NotBlank;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiService.java
similarity index 94%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiService.java
index 2c36eea90e954f364431b69be2f2761f0eb6e64d..3cc6c2de9a8230b52459a97d17e3810444bd5b2d 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakApiService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakApiService.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.keycloak;
+package de.ozgcloud.user.keycloak;
import java.util.Optional;
import java.util.Spliterators;
@@ -29,6 +29,7 @@ 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;
@@ -43,10 +44,9 @@ import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.representations.idm.UserRepresentation;
import de.itvsh.kop.common.logging.KopLogging;
-import de.itvsh.kop.user.RemoteUserIterator;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserResourceMapper;
-import de.itvsh.kop.user.common.errorhandling.KeycloakUnavailableException;
+import de.ozgcloud.user.RemoteUserIterator;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserResourceMapper;
import lombok.extern.log4j.Log4j2;
@ApplicationScoped
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakProvider.java
similarity index 98%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakProvider.java
index 5c59bbf5f78be244cfacd88165972025f7db614d..e7fba2dc87eb99e9cdd894e40b7fed1bdac55b2d 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakProvider.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakProvider.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.keycloak;
+package de.ozgcloud.user.keycloak;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteService.java b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteService.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteService.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteService.java
index b6c910d2ab167f8c5cfe35b76a9b692e2bf21147..bf0508c2904bac2a2f30e6b02b4b28a5aaa43e48 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteService.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.keycloak;
+package de.ozgcloud.user.keycloak;
import java.util.Optional;
import java.util.stream.Stream;
@@ -30,7 +30,7 @@ import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import de.itvsh.kop.common.logging.KopLogging;
-import de.itvsh.kop.user.User;
+import de.ozgcloud.user.User;
@ApplicationScoped
@KopLogging
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/OlderUserRepresentation.java b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/OlderUserRepresentation.java
similarity index 98%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/OlderUserRepresentation.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/keycloak/OlderUserRepresentation.java
index 493d84512de5fe974d366a535451079753808237..7ba8ca446052f28aa1724cdd2904bda4dddbe7dc 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/keycloak/OlderUserRepresentation.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/keycloak/OlderUserRepresentation.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user.keycloak;
+package de.ozgcloud.user.keycloak;
import org.keycloak.representations.idm.UserProfileMetadata;
import org.keycloak.representations.idm.UserRepresentation;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitGrpcService.java b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitGrpcService.java
similarity index 88%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitGrpcService.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitGrpcService.java
index 430440ae0e900cd07cc6e0761abdb117b6659715..b4dc3e8b67c150023f0a1a8c4bebe419b0be7003 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitGrpcService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitGrpcService.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.organisationseinheit;
+package de.ozgcloud.user.organisationseinheit;
import java.util.Collection;
@@ -29,8 +29,8 @@ import jakarta.inject.Inject;
import com.google.protobuf.Empty;
-import de.itvsh.kop.user.grpc.organisationseinheit.GrpcGetSupportedOrganisationsEinheitenResponse;
-import de.itvsh.kop.user.grpc.organisationseinheit.OrganisationsEinheitServiceGrpc.OrganisationsEinheitServiceImplBase;
+import de.ozgcloud.user.grpc.organisationseinheit.GrpcGetSupportedOrganisationsEinheitenResponse;
+import de.ozgcloud.user.grpc.organisationseinheit.OrganisationsEinheitServiceGrpc.OrganisationsEinheitServiceImplBase;
import io.grpc.stub.StreamObserver;
import io.quarkus.grpc.GrpcService;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepository.java
similarity index 93%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepository.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepository.java
index 5f22d5f5381bd6f62a664e43710069a6c355525b..896fc8eb6f9be516e457a33fc6dafa63021092b6 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepository.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepository.java
@@ -21,9 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.organisationseinheit;
+package de.ozgcloud.user.organisationseinheit;
-import static de.itvsh.kop.user.User.*;
+import static de.ozgcloud.user.User.*;
import static org.apache.commons.collections4.IterableUtils.*;
import java.util.Collection;
@@ -33,7 +33,7 @@ import jakarta.enterprise.context.ApplicationScoped;
import com.mongodb.client.model.Filters;
import de.itvsh.kop.common.logging.KopLogging;
-import de.itvsh.kop.user.User;
+import de.ozgcloud.user.User;
import io.quarkus.mongodb.panache.PanacheMongoRepository;
@ApplicationScoped
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitService.java b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitService.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitService.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitService.java
index f5f77cde964fe326e2e4bf43b2e8df12625b624f..bf096522d044ba6afd27d536e3d786e80a3039c4 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitService.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.organisationseinheit;
+package de.ozgcloud.user.organisationseinheit;
import java.util.Collection;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientGrpcService.java b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientGrpcService.java
similarity index 86%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientGrpcService.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientGrpcService.java
index 16e7f06ea4db5165b88295dc9acd16c45f880425..fa9dc41d0d2f2079ac017b8cfc7b3335e0ab105b 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientGrpcService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientGrpcService.java
@@ -21,16 +21,16 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.recipient;
+package de.ozgcloud.user.recipient;
import java.util.Collection;
import jakarta.inject.Inject;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientRequest;
-import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientResponse;
-import de.itvsh.kop.user.grpc.recipient.RecipientServiceGrpc.RecipientServiceImplBase;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.grpc.recipient.GrpcFindRecipientRequest;
+import de.ozgcloud.user.grpc.recipient.GrpcFindRecipientResponse;
+import de.ozgcloud.user.grpc.recipient.RecipientServiceGrpc.RecipientServiceImplBase;
import io.grpc.stub.StreamObserver;
import io.quarkus.grpc.GrpcService;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientMapper.java b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientMapper.java
similarity index 95%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientMapper.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientMapper.java
index 2274a16aa9373f133e14e65101e72dc9710da4da..bea3d98566fca973601f0139516bdcb3c0d5503c 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientMapper.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientMapper.java
@@ -21,14 +21,14 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.recipient;
+package de.ozgcloud.user.recipient;
import org.mapstruct.CollectionMappingStrategy;
import org.mapstruct.Mapper;
import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.ReportingPolicy;
-import de.itvsh.kop.user.User;
+import de.ozgcloud.user.User;
@Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, //
unmappedSourcePolicy = ReportingPolicy.WARN, //
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientRepository.java
similarity index 79%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientRepository.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientRepository.java
index 70ea06cea9f706ea7a3aa267c6164653fd9bbb9c..b64ac4c682be248505964150d4417d7cab5835b3 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientRepository.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientRepository.java
@@ -1,14 +1,14 @@
-package de.itvsh.kop.user.recipient;
+package de.ozgcloud.user.recipient;
-import static de.itvsh.kop.user.User.*;
+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.itvsh.kop.user.User;
-import de.itvsh.kop.user.settings.NotificationsSendFor;
+import de.ozgcloud.user.User;
import io.quarkus.mongodb.panache.PanacheMongoRepository;
@ApplicationScoped
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientService.java b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientService.java
similarity index 92%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientService.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientService.java
index 8958d2eed1775c19d58e901e5e217fb07cd1b24d..b383eceb28d300bae59c83f8c692d05d7cf1e776 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/recipient/RecipientService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/recipient/RecipientService.java
@@ -21,17 +21,17 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.recipient;
+package de.ozgcloud.user.recipient;
import java.util.List;
+import de.ozgcloud.user.common.errorhandling.FunctionalException;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import com.cronutils.utils.StringUtils;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.common.errorhandling.FunctionalException;
+import de.ozgcloud.user.User;
@ApplicationScoped
class RecipientService {
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/NotificationsSendFor.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/NotificationsSendFor.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/NotificationsSendFor.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/NotificationsSendFor.java
index 81d73b17215a01e2faaeb6a975b1c8cbbefbe0e8..8233b5e9a5715e447b784731bea38aae6c8b8b46 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/NotificationsSendFor.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/NotificationsSendFor.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
public enum NotificationsSendFor {
ALL, NONE;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/SendNewVorgangNotification.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/SendNewVorgangNotification.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/SendNewVorgangNotification.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/SendNewVorgangNotification.java
index 2f5d0b84aeb3c017956e4542fbd9200256d2ba5f..2cc61c6a41e50e5b5dc99d394539944470bdfd1a 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/SendNewVorgangNotification.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/SendNewVorgangNotification.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
public enum SendNewVorgangNotification {
NONE, ALL;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/Settings.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/Settings.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/Settings.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/Settings.java
index 2ae73eb2f89c44f2115c3ba0b9a460c2962ca154..a359065da1dca88ce4284c8459c2018b30b7350f 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/Settings.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/Settings.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettings.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettings.java
similarity index 97%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettings.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettings.java
index b9c12a6a7f043db47ab6305640c978fb75be3b4f..08fd9756f5144f793b456c047e14d988233518e0 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettings.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettings.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsRepository.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsRepository.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsRepository.java
index d3089627adf7bc02f1c91150502e63b4ff5a7221..b54e4c75fa6efa45c0c9b354e6d52a41751a4ce0 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsRepository.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsRepository.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
import java.util.Optional;
@@ -30,7 +30,7 @@ import jakarta.enterprise.context.ApplicationScoped;
import org.bson.types.ObjectId;
import de.itvsh.kop.common.logging.KopLogging;
-import de.itvsh.kop.user.User;
+import de.ozgcloud.user.User;
import io.quarkus.mongodb.panache.PanacheMongoRepository;
@ApplicationScoped
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResource.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsResource.java
similarity index 93%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResource.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsResource.java
index fef1c8c4463841035dc2f76f7fb5a0208b180394..de7b344a71ef2ea1874a55ef8f4bee02592f4e2a 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResource.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsResource.java
@@ -21,10 +21,12 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
import java.util.Objects;
+import de.ozgcloud.user.common.errorhandling.AccessForbiddenException;
+import de.ozgcloud.user.common.errorhandling.FunctionalException;
import jakarta.inject.Inject;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.PATCH;
@@ -39,10 +41,8 @@ import org.eclipse.microprofile.jwt.JsonWebToken;
import org.jboss.resteasy.reactive.ResponseStatus;
import org.jboss.resteasy.reactive.common.util.RestMediaType;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserService;
-import de.itvsh.kop.user.common.errorhandling.AccessForbiddenException;
-import de.itvsh.kop.user.common.errorhandling.FunctionalException;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserService;
import io.quarkus.hal.HalEntityWrapper;
@Path(UserSettingsResource.USER_PATH)
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResourceAssembler.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsResourceAssembler.java
similarity index 91%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResourceAssembler.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsResourceAssembler.java
index 3f3c65285fb7e17083959fe0eaea56c0d5863c88..92e356dfbd15ed1f46ec7386741b5e319a26e6ca 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsResourceAssembler.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsResourceAssembler.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
@@ -29,9 +29,9 @@ import jakarta.ws.rs.core.Link;
import org.apache.commons.lang3.StringUtils;
-import de.itvsh.kop.user.UserRole;
-import de.itvsh.kop.user.common.callcontext.CallContextUser;
-import de.itvsh.kop.user.common.callcontext.CurrentCallContextUserService;
+import de.ozgcloud.user.UserRole;
+import de.ozgcloud.user.common.callcontext.CallContextUser;
+import de.ozgcloud.user.common.callcontext.CurrentCallContextUserService;
import io.quarkus.hal.HalEntityWrapper;
@ApplicationScoped
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsService.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsService.java
similarity index 95%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsService.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsService.java
index d05de31f1bdb193692c89958173eeb4bb64579c7..11459e7a474a80d80823df6f7945661ddd3b0416 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/settings/UserSettingsService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsService.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
import java.util.Objects;
import java.util.Optional;
@@ -29,7 +29,7 @@ import java.util.Optional;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import de.itvsh.kop.user.UserService;
+import de.ozgcloud.user.UserService;
@ApplicationScoped
class UserSettingsService {
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java b/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncScheduler.java
similarity index 96%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncScheduler.java
index 86d8def9a360dfc89dda56b7b5f0b6f72c753223..0fe18bc239a37c83b2b93c4c9bfc44ee913a55fd 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncScheduler.java
@@ -21,14 +21,14 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.sync;
+package de.ozgcloud.user.sync;
import static io.quarkus.scheduler.Scheduled.ConcurrentExecution.*;
+import de.ozgcloud.user.common.lock.LockService;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import de.itvsh.kop.user.common.lock.LockService;
import io.quarkus.scheduler.Scheduled;
import lombok.extern.log4j.Log4j2;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/sync/SyncService.java b/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncService.java
similarity index 91%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/sync/SyncService.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncService.java
index baed27bbf16404ce167867ea910709527ac476eb..ad9ad6fa048f7e19cdcdf8fa0f6ba44c3744d4ad 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/sync/SyncService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncService.java
@@ -21,19 +21,19 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.sync;
+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.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserService;
-import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserService;
@ApplicationScoped
@KopLogging
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/userprofile/UserProfileGrpcService.java b/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileGrpcService.java
similarity index 93%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/userprofile/UserProfileGrpcService.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileGrpcService.java
index 81106fa820d7d233d79943a79491fdbfa6b19dcd..481f6c4a2863caf536ed7ba7f7ad6cebd16456f3 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/userprofile/UserProfileGrpcService.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileGrpcService.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.userprofile;
+package de.ozgcloud.user.userprofile;
import java.util.stream.Stream;
@@ -29,9 +29,9 @@ import jakarta.inject.Inject;
import com.google.protobuf.Empty;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserService;
-import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceImplBase;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserService;
+import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceImplBase;
import io.grpc.stub.StreamObserver;
import io.quarkus.grpc.GrpcService;
diff --git a/user-manager-server/src/main/java/de/itvsh/kop/user/userprofile/UserProfileMapper.java b/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java
similarity index 95%
rename from user-manager-server/src/main/java/de/itvsh/kop/user/userprofile/UserProfileMapper.java
rename to user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java
index bc17b7967d2c5e88cc61d7d0bbfb6f5cb60d2776..8f16ad1bf42f42a9cc40834612889d4c8eb9fc24 100644
--- a/user-manager-server/src/main/java/de/itvsh/kop/user/userprofile/UserProfileMapper.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java
@@ -21,14 +21,14 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.userprofile;
+package de.ozgcloud.user.userprofile;
import org.bson.types.ObjectId;
import org.mapstruct.Mapper;
import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.ReportingPolicy;
-import de.itvsh.kop.user.User;
+import de.ozgcloud.user.User;
@Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, //
unmappedSourcePolicy = ReportingPolicy.WARN, //
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/GroupRepresentationTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/GroupRepresentationTestFactory.java
similarity index 98%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/GroupRepresentationTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/GroupRepresentationTestFactory.java
index b6555495e52c1615c886ef7efc1b5297aea435c5..fcc0dd786ad938ab75905d6b23e6efbde16cb725 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/GroupRepresentationTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/GroupRepresentationTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import java.util.List;
import java.util.Map;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/RoleHierarchyTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/RoleHierarchyTest.java
similarity index 98%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/RoleHierarchyTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/RoleHierarchyTest.java
index 817276ee3679e4a0c72d29f9890e18ec5f9485a7..77e0a7a2514a770157d2d0b566dc589e50bef2cc 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/RoleHierarchyTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/RoleHierarchyTest.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/TestDatabaseUtils.java b/user-manager-server/src/test/java/de/ozgcloud/user/TestDatabaseUtils.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/TestDatabaseUtils.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/TestDatabaseUtils.java
index 81646a3905a273de123db7b37a647181c65d1c4a..f1916e8cb6b8de814945e93f7c3f58482070d1f8 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/TestDatabaseUtils.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/TestDatabaseUtils.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoDatabase;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceAssemblerTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceAssemblerTest.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceAssemblerTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceAssemblerTest.java
index 3ca7db44890e49d1d266d4aa950d5721f514bf9b..53bf19f480a1fe1ca195d76643ca58e37dcad593 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceAssemblerTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceAssemblerTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import static org.assertj.core.api.Assertions.*;
@@ -34,7 +34,7 @@ import org.mockito.Spy;
import com.thedeanda.lorem.LoremIpsum;
-import de.itvsh.kop.user.settings.UserSettingsResource;
+import de.ozgcloud.user.settings.UserSettingsResource;
class UserProfileResourceAssemblerTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceITCase.java
similarity index 96%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceITCase.java
index 449be2557563ea8477ecfd091dd3c0fc190f2a97..f61597e268d7f7953840c64e81a87f449afe470d 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceITCase.java
@@ -21,9 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
-import static de.itvsh.kop.user.UserTestFactory.*;
+import static de.ozgcloud.user.UserTestFactory.*;
import static io.restassured.RestAssured.*;
import static org.hamcrest.CoreMatchers.*;
import static org.mockito.ArgumentMatchers.any;
@@ -37,9 +37,9 @@ import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.user.common.errorhandling.ApiErrorUtil;
-import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException;
-import de.itvsh.kop.user.settings.UserSettingsResource;
+import de.ozgcloud.user.common.errorhandling.ApiErrorUtil;
+import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException;
+import de.ozgcloud.user.settings.UserSettingsResource;
import io.quarkus.test.InjectMock;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceTest.java
similarity index 99%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceTest.java
index 487b12e80cb3be8a94a2eeff5277aae3b5a98001..b642eff493e8ebca80499f6b524e985656b46471 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceTestProfile.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceTestProfile.java
similarity index 98%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceTestProfile.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceTestProfile.java
index 16cb762e60a35de89baf37c3450f8ee2c2b5249f..db61e3bb787d959d31f7121fc124f714bbb8a463 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserProfileResourceTestProfile.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserProfileResourceTestProfile.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import java.util.Map;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRepositoryITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryITCase.java
similarity index 98%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserRepositoryITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryITCase.java
index 35691484fbd43a53dbf049ed4c2b04e85dd14d73..e8cf01e27b347d8c4d93912f4fdcc6f27be59c30 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRepositoryITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryITCase.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import static java.util.function.Predicate.not;
import static org.assertj.core.api.Assertions.*;
@@ -42,9 +42,7 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-import com.thedeanda.lorem.LoremIpsum;
-
-import de.itvsh.kop.user.common.MongoDbTestProfile;
+import de.ozgcloud.user.common.MongoDbTestProfile;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
@@ -187,8 +185,7 @@ class UserRepositoryITCase {
@BeforeEach
void init() {
repository.deleteAll();
- repository.persist(UserTestFactory.createBuilder().id(new ObjectId()).email(LoremIpsum.getInstance().getEmail())
- .externalId("additional-id").build());
+ repository.persist(UserTestFactory.createBuilder().id(new ObjectId()).email("test@test.de").externalId("additional-id").build());
repository.persist(UserTestFactory.create());
}
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRepositoryTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryTest.java
similarity index 98%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserRepositoryTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryTest.java
index 409eb4b45dcdbd93f1ac2267463e5fd10b2cb180..98c81190f771301e7d9452acb42277da982c0cd8 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRepositoryTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -42,7 +42,7 @@ import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException;
+import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException;
import io.quarkus.mongodb.panache.PanacheQuery;
import io.quarkus.mongodb.panache.common.PanacheUpdate;
import io.quarkus.panache.common.Parameters;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRepresentationTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepresentationTestFactory.java
similarity index 98%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserRepresentationTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserRepresentationTestFactory.java
index 626b6953a31f761dc351fc817f617e176739fa71..5f1b3caf6813ae5e4cfb4d939d6503a3a0a57090 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRepresentationTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepresentationTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import java.time.Instant;
import java.util.List;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceMapperTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceMapperTest.java
similarity index 99%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceMapperTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserResourceMapperTest.java
index 4817dc2ee222969a4a11307118884f825f6eedcd..d50c9ee0fca676dfa08335cc4d7fc16ff3f8c519 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceMapperTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceMapperTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -45,7 +45,7 @@ import org.mapstruct.factory.Mappers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.kop.user.keycloak.KeycloakApiProperties;
+import de.ozgcloud.user.keycloak.KeycloakApiProperties;
class UserResourceMapperTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceStub.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceStub.java
similarity index 99%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceStub.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserResourceStub.java
index 723b607643a197e211eeba65f7223fa55fe08120..81959e3888847e1bc4d00d6998696494db40f1d7 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceStub.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceStub.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import java.util.List;
import java.util.Map;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceTestFactory.java
similarity index 98%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserResourceTestFactory.java
index f94763b5b95812eb6c74068c514877adaab022fb..8de656cf0a2c8641d95ee03c699effe298d21937 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserResourceTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserResourceTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import java.util.List;
import java.util.Map;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRoleTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserRoleTest.java
similarity index 96%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserRoleTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserRoleTest.java
index b38a8a5bdafeb3e276388dad606785edcf193891..125ab4f4cc738ee89d6e9b969bfe3415a340a188 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserRoleTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserRoleTest.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import static org.assertj.core.api.Assertions.*;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserServiceITCase.java
similarity index 91%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserServiceITCase.java
index 7375478b17e8921a6fbca7aae4a93e56f1c062ed..261684be78f62cf6e7845564c11e87108301d71e 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserServiceITCase.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import static org.assertj.core.api.Assertions.*;
@@ -32,9 +32,9 @@ import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.user.common.MongoDbTestProfile;
-import de.itvsh.kop.user.settings.NotificationsSendFor;
-import de.itvsh.kop.user.settings.UserSettingsTestFactory;
+import de.ozgcloud.user.common.MongoDbTestProfile;
+import de.ozgcloud.user.settings.NotificationsSendFor;
+import de.ozgcloud.user.settings.UserSettingsTestFactory;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserServiceTest.java
similarity index 96%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserServiceTest.java
index 32dfcee0b46522a83b01e8c493362a3774f021fa..a78a6738176d01b09e0d4af4b7a829e958c10afd 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserServiceTest.java
@@ -21,9 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
-import static de.itvsh.kop.user.UserTestFactory.*;
+import static de.ozgcloud.user.UserTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -42,9 +42,9 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException;
-import de.itvsh.kop.user.common.errorhandling.TechnicalException;
-import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService;
+import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException;
+import de.ozgcloud.user.common.errorhandling.TechnicalException;
+import de.ozgcloud.user.keycloak.KeycloakUserRemoteService;
class UserServiceTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/UserTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserTestFactory.java
similarity index 77%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/UserTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/UserTestFactory.java
index d48a9ceb324cb0ebc215b177e608a0d84d406061..fc8e1524b13bd267a2734f224601751bdd19aea9 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/UserTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserTestFactory.java
@@ -21,31 +21,28 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user;
+package de.ozgcloud.user;
import java.util.List;
-import java.util.UUID;
import org.bson.types.ObjectId;
-import com.thedeanda.lorem.LoremIpsum;
-
-import de.itvsh.kop.user.settings.UserSettingsTestFactory;
+import de.ozgcloud.user.settings.UserSettingsTestFactory;
public class UserTestFactory {
public static final ObjectId ID = new ObjectId();
- public static final String KEYCLOAK_USER_ID = UUID.randomUUID().toString();
+ public static final String KEYCLOAK_USER_ID = "aec115b5-67be-42c9-a693-36d4d711a87a";
public static final String ID_STR = ID.toHexString();
- public static final String FIRST_NAME = LoremIpsum.getInstance().getFirstName();
- public static final String LAST_NAME = LoremIpsum.getInstance().getLastName();
+ public static final String FIRST_NAME = "Sabine";
+ public static final String LAST_NAME = "Sach";
public static final String FULL_NAME = FIRST_NAME + " " + LAST_NAME;
public static final String FULL_NAME_REVERSED = LAST_NAME + " " + FIRST_NAME;
- public static final String USER_NAME = LoremIpsum.getInstance().getName();
+ public static final String USER_NAME = "sabine";
public static final long LAST_SYNC_TIMESTAMP = 1001L;
- public static final String EMAIL = LoremIpsum.getInstance().getEmail();
- public static final String EXTERNAL_ID = UUID.randomUUID().toString();
+ public static final String EMAIL = "sabine.sach@ozgcloud.de";
+ public static final String EXTERNAL_ID = "aec115b5-67be-42c9-a693-36d4d711a87a";
public static final String ORGANISTATIONSEINHEITEN_ID = "0815";
public static final List<String> ROLES = List.of("ROLE_1", "POSTSTELLE");
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/JwtUtilTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/JwtUtilTest.java
similarity index 95%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/JwtUtilTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/JwtUtilTest.java
index db2c00701d8915ab340e3d13871e20bf8055729d..bcb47047a73cefbf96d4ccf690d004dac1b8a973 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/JwtUtilTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/JwtUtilTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common;
+package de.ozgcloud.user.common;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.*;
import java.util.List;
import java.util.Map;
+import de.ozgcloud.user.common.callcontext.CallContextMetadataTestFactory;
import jakarta.json.Json;
import jakarta.json.JsonArray;
@@ -45,10 +46,9 @@ import org.mockito.Spy;
import com.cronutils.utils.StringUtils;
import com.thedeanda.lorem.LoremIpsum;
-import de.itvsh.kop.user.UserRole;
-import de.itvsh.kop.user.common.callcontext.CallContextMetadataTestFactory;
-import de.itvsh.kop.user.common.callcontext.CurrentCallContextUserService;
-import de.itvsh.kop.user.keycloak.KeycloakApiProperties;
+import de.ozgcloud.user.UserRole;
+import de.ozgcloud.user.common.callcontext.CurrentCallContextUserService;
+import de.ozgcloud.user.keycloak.KeycloakApiProperties;
class JwtUtilTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/MongoDbTestProfile.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/MongoDbTestProfile.java
similarity index 88%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/MongoDbTestProfile.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/MongoDbTestProfile.java
index 90522d045b5e3f6c48d34a1264935eee81689bdb..7a980b1826b2ab905e1537ea88a1816bbca0e546 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/MongoDbTestProfile.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/MongoDbTestProfile.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user.common;
+package de.ozgcloud.user.common;
import java.util.Map;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextInterceptorTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextInterceptorTestFactory.java
similarity index 98%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextInterceptorTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextInterceptorTestFactory.java
index 4fa2a92bc6a2455dc72f63f8aba7e12e5f0f8e3f..de12e290079cd32f3106765e198650e2cd530fec 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextInterceptorTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextInterceptorTestFactory.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
import io.grpc.CallOptions;
import io.grpc.Channel;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextMetadataTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextMetadataTestFactory.java
similarity index 98%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextMetadataTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextMetadataTestFactory.java
index 18ab208467173e49a47d2a9a52ed5e1a3a260796..c74e979aa8fb9dad0c1e4a1b9a8892f0b85303c5 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextMetadataTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextMetadataTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
import java.util.UUID;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextUserTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextUserTestFactory.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextUserTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextUserTestFactory.java
index 35314f684edff44f61630cc9943172f10f8a7acc..bbd5081474a2dcd36bc179c4e7d38027c4c804bf 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CallContextUserTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextUserTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
import java.util.Optional;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CurrentCallContextUserServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CurrentCallContextUserServiceTest.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CurrentCallContextUserServiceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CurrentCallContextUserServiceTest.java
index 2ac6b2bea3a300647af748462a1a3a382b89a8c6..30c545893602fb20443f32805e5cbb6431908eed 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/CurrentCallContextUserServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CurrentCallContextUserServiceTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.Spy;
-import de.itvsh.kop.user.UserRole;
+import de.ozgcloud.user.UserRole;
class CurrentCallContextUserServiceTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/GrpcCallContextInterceptorTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcCallContextInterceptorTest.java
similarity index 96%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/GrpcCallContextInterceptorTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcCallContextInterceptorTest.java
index 10c7379cc6d20f8133677cab57ecf7a81dec5c1f..54fc62f74b452c94f2f517f7e5b9854b1463a05b 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/GrpcCallContextInterceptorTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcCallContextInterceptorTest.java
@@ -21,9 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
-import static de.itvsh.kop.user.common.callcontext.GrpcCallContextInterceptor.*;
+import static de.ozgcloud.user.common.callcontext.GrpcCallContextInterceptor.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -36,10 +36,10 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.common.callcontext.GrpcCallContextInterceptor.*;
-import de.itvsh.kop.user.common.errorhandling.ResourceNotFoundException;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.common.callcontext.GrpcCallContextInterceptor.*;
+import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException;
import io.grpc.Metadata;
import io.grpc.ServerCall;
import io.grpc.Status;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/GrpcUtilTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcUtilTest.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/GrpcUtilTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcUtilTest.java
index 0a8f3621be19f1e87f1825700e02542d8dcb62e8..3f4ef79a46ed104608754f07d0fd0000e3bb22db 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/GrpcUtilTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcUtilTest.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
import static org.assertj.core.api.Assertions.*;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/HttpRequestInterceptorTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptorTest.java
similarity index 95%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/HttpRequestInterceptorTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptorTest.java
index c52e0e9039d7540e3cc3eb46dd0bff692fa0ad9d..c790742685004c950499e1313868554824d5cc90 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/HttpRequestInterceptorTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptorTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -38,7 +38,6 @@ import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.user.common.callcontext.HttpRequestInterceptor;
class HttpRequestInterceptorTest {
@Spy
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/HttpSecurityFilterTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpSecurityFilterTest.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/HttpSecurityFilterTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpSecurityFilterTest.java
index 3c6898e71c94d7db8b4e0915bbc6e96e595f5856..825d24bbe9a1924a9e3f013b35f217695093b205 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/callcontext/HttpSecurityFilterTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpSecurityFilterTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.callcontext;
+package de.ozgcloud.user.common.callcontext;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -39,7 +39,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.user.common.JwtUtil;
+import de.ozgcloud.user.common.JwtUtil;
class HttpSecurityFilterTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/errorhandling/ApiErrorUtilTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtilTest.java
similarity index 98%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/errorhandling/ApiErrorUtilTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtilTest.java
index 5d6ecf256749a33e64da5f993a3b3737190fc550..2fcf6e4c3bac3f8b9ced52bfa17d6318be7507bf 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/errorhandling/ApiErrorUtilTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtilTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.errorhandling;
+package de.ozgcloud.user.common.errorhandling;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -39,7 +39,7 @@ import org.mockito.Spy;
import com.cronutils.utils.StringUtils;
import com.thedeanda.lorem.LoremIpsum;
-import de.itvsh.kop.user.User;
+import de.ozgcloud.user.User;
class ApiErrorUtilTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/errorhandling/ExceptionHandlerTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ExceptionHandlerTest.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/errorhandling/ExceptionHandlerTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ExceptionHandlerTest.java
index 87f36bfb19d040df215d86d5ce1dea82367ff439..04335185ba93c501ec695e74f816c5b1a149c036 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/errorhandling/ExceptionHandlerTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ExceptionHandlerTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.errorhandling;
+package de.ozgcloud.user.common.errorhandling;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -40,8 +40,8 @@ import org.mockito.Mock;
import com.thedeanda.lorem.LoremIpsum;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserTestFactory;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserTestFactory;
class ExceptionHandlerTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockRepositoryITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockRepositoryITCase.java
similarity index 96%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockRepositoryITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockRepositoryITCase.java
index 37acb819bcfd930d301f49fe1e2a1527ac9e954c..4f9b32da84e8ea4cbf798db5a4bd7275c51ac4bc 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockRepositoryITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockRepositoryITCase.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.lock;
+package de.ozgcloud.user.common.lock;
import static org.assertj.core.api.Assertions.*;
@@ -33,7 +33,7 @@ import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.user.common.MongoDbTestProfile;
+import de.ozgcloud.user.common.MongoDbTestProfile;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockRepositoryTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockRepositoryTest.java
similarity index 98%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockRepositoryTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockRepositoryTest.java
index bd8e0f5c0da7034729eb80ec1e030c76766aff15..32ed63d549cbc95890b0b1018f70c29a36574c23 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockRepositoryTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockRepositoryTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.lock;
+package de.ozgcloud.user.common.lock;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockServiceTest.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockServiceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockServiceTest.java
index 544bfda09d49cafd5ebb4b9752789a49032d1d19..b5e957f6edb9bec4efa8e2370dba59000cfa993f 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockServiceTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.lock;
+package de.ozgcloud.user.common.lock;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.kop.user.common.errorhandling.LockCreationException;
+import de.ozgcloud.user.common.errorhandling.LockCreationException;
class LockServiceTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockTestFactory.java
similarity index 93%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockTestFactory.java
index 0d9ed3f70e877844a79be6f139686ef46ec2b72f..cc6c8acd688f7e9fc890735820c74d76398c77d4 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/common/lock/LockTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockTestFactory.java
@@ -21,12 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.common.lock;
+package de.ozgcloud.user.common.lock;
import java.time.Instant;
-import de.itvsh.kop.user.common.lock.Lock;
-
public class LockTestFactory {
private static final long TIMESTAMP = Instant.now().toEpochMilli();
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakApiServiceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakApiServiceITCase.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakApiServiceITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakApiServiceITCase.java
index 5514fea735b0e72673ad9f89c974903309fee5b5..d39d0e4befb6f2d828291b0e14432fa1af0b8146 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakApiServiceITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakApiServiceITCase.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.keycloak;
+package de.ozgcloud.user.keycloak;
import static org.assertj.core.api.Assertions.*;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakApiServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakApiServiceTest.java
similarity index 96%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakApiServiceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakApiServiceTest.java
index ffade1d3dfd22e111858ba54929a0e91b679526d..e74d6d994395f1d4a705e7aee75fb281abf88e24 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakApiServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakApiServiceTest.java
@@ -21,9 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.keycloak;
+package de.ozgcloud.user.keycloak;
-import static de.itvsh.kop.user.UserTestFactory.*;
+import static de.ozgcloud.user.UserTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -50,12 +50,12 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.user.RemoteUserIterator;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserRepresentationTestFactory;
-import de.itvsh.kop.user.UserResourceMapper;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.common.errorhandling.KeycloakUnavailableException;
+import de.ozgcloud.user.RemoteUserIterator;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserRepresentationTestFactory;
+import de.ozgcloud.user.UserResourceMapper;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.common.errorhandling.KeycloakUnavailableException;
class KeycloakApiServiceTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakProviderITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderITCase.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakProviderITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderITCase.java
index 02c286d771c81149cc20dfdb98488f3812b0e171..ffe409b4e83eee2f4b90fc1bc9efacfedcc75293 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakProviderITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderITCase.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.keycloak;
+package de.ozgcloud.user.keycloak;
import static org.assertj.core.api.Assertions.*;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakProviderTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderTest.java
similarity index 98%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakProviderTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderTest.java
index 38ccbb5913a656b23d9d48f57efb832670967818..ea8936b50337fd8b1e8e15fa52fd16dcf3114a7a 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakProviderTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.keycloak;
+package de.ozgcloud.user.keycloak;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakTestProfile.java
similarity index 98%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakTestProfile.java
index 7fa5e7a7d4b0dcd2495df841794ea7242bddcc03..847849343657d89b3841b4348be7173a2d6518ff 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakTestProfile.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakTestProfile.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.keycloak;
+package de.ozgcloud.user.keycloak;
import java.util.Map;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteServiceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceITCase.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteServiceITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceITCase.java
index e98d518f0045f95f1865975aa14b3d7ee445943d..75bd03fd37279a22afefab4779655924ae1c3833 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteServiceITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceITCase.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.keycloak;
+package de.ozgcloud.user.keycloak;
import static org.mockito.Mockito.*;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceTest.java
similarity index 93%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteServiceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceTest.java
index 853804b6abb8693bf73e9c8a2d162a4f7afb11d4..4604a2c45d6ddd056d7b29fbe1c9643d717590a6 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/keycloak/KeycloakUserRemoteServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceTest.java
@@ -21,21 +21,19 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.keycloak;
+package de.ozgcloud.user.keycloak;
-import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import java.util.Optional;
-import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.kop.user.UserTestFactory;
+import de.ozgcloud.user.UserTestFactory;
class KeycloakUserRemoteServiceTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepositoryITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryITCase.java
similarity index 88%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepositoryITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryITCase.java
index 1f1082a1749ce748a8787ad7406b30a6752c22fd..ce3e1ec54b40f4ff3e7fabd29c48fde7cef7069f 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepositoryITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryITCase.java
@@ -1,7 +1,8 @@
-package de.itvsh.kop.user.organisationseinheit;
+package de.ozgcloud.user.organisationseinheit;
import static org.assertj.core.api.Assertions.*;
+import de.ozgcloud.user.TestDatabaseUtils;
import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
@@ -11,9 +12,8 @@ import org.junit.jupiter.api.Test;
import com.mongodb.client.MongoClient;
-import de.itvsh.kop.user.TestDatabaseUtils;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.common.MongoDbTestProfile;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.common.MongoDbTestProfile;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java
similarity index 94%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java
index 2eee86f1e2ca3101b36438471284f35b91ae4935..9d6c2fe82e9dad5e1b5e041f7a4c0ad120bd5084 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user.organisationseinheit;
+package de.ozgcloud.user.organisationseinheit;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -15,7 +15,7 @@ import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoCursor;
import com.mongodb.client.model.Filters;
-import de.itvsh.kop.user.User;
+import de.ozgcloud.user.User;
class OrganisationsEinheitRepositoryTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitServiceTest.java
similarity index 93%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitServiceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitServiceTest.java
index 2726628161df8fa99cdcdc915049995c6886293b..65aa2d5a86897ba7ee41a5df41e2ff0803b99816 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationsEinheitServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitServiceTest.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user.organisationseinheit;
+package de.ozgcloud.user.organisationseinheit;
import static org.mockito.Mockito.*;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java
similarity index 86%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java
index 4a2fff863366db20867de2b2ebb9c504cf5e788e..eb8f64b977590d7aaaa700a60758f777344c834c 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user.organisationseinheit;
+package de.ozgcloud.user.organisationseinheit;
import static org.mockito.Mockito.*;
@@ -10,7 +10,7 @@ import org.mockito.Mock;
import com.google.protobuf.Empty;
-import de.itvsh.kop.user.grpc.organisationseinheit.GrpcGetSupportedOrganisationsEinheitenResponse;
+import de.ozgcloud.user.grpc.organisationseinheit.GrpcGetSupportedOrganisationsEinheitenResponse;
import io.grpc.stub.StreamObserver;
public class OrganisationseinheitGrpcServiceTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientGrpcServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientGrpcServiceTest.java
similarity index 93%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientGrpcServiceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientGrpcServiceTest.java
index ed3567f9d1be37e8d8990febdec4be4d0700acc9..28f13543f853a236efbfd959746fbe8803c8dc2f 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientGrpcServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientGrpcServiceTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.recipient;
+package de.ozgcloud.user.recipient;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -35,8 +35,8 @@ import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientResponse;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.grpc.recipient.GrpcFindRecipientResponse;
import io.grpc.stub.StreamObserver;
class RecipientGrpcServiceTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientMapperTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientMapperTest.java
similarity index 96%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientMapperTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientMapperTest.java
index c360d315f56294fe98d1b74da17d6a1ede222719..0241aa00e5dfb4a9714094a069d926edb55a733b 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientMapperTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientMapperTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.recipient;
+package de.ozgcloud.user.recipient;
import static org.assertj.core.api.Assertions.*;
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
-import de.itvsh.kop.user.UserTestFactory;
+import de.ozgcloud.user.UserTestFactory;
class RecipientMapperTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientRepositoryITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientRepositoryITCase.java
similarity index 89%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientRepositoryITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientRepositoryITCase.java
index 368f71a48ea68705ae361202e29325a21fe245b4..57448ee0d09db08e8ad51467f95f5cdab22dcccb 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientRepositoryITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientRepositoryITCase.java
@@ -1,8 +1,10 @@
-package de.itvsh.kop.user.recipient;
+package de.ozgcloud.user.recipient;
-import static de.itvsh.kop.user.settings.NotificationsSendFor.*;
+import static de.ozgcloud.user.settings.NotificationsSendFor.*;
import static org.assertj.core.api.Assertions.*;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.settings.UserSettingsTestFactory;
import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
@@ -13,11 +15,9 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import org.junit.jupiter.params.provider.EnumSource.Mode;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.common.MongoDbTestProfile;
-import de.itvsh.kop.user.settings.NotificationsSendFor;
-import de.itvsh.kop.user.settings.UserSettingsTestFactory;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.common.MongoDbTestProfile;
+import de.ozgcloud.user.settings.NotificationsSendFor;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientRepositoryTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientRepositoryTest.java
similarity index 90%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientRepositoryTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientRepositoryTest.java
index cbaa0e317db05fae25cf5adf319144cd8176d42d..addd8cf25b5a30a51bc2a54f58ce0228798e9c58 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientRepositoryTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientRepositoryTest.java
@@ -21,9 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.recipient;
+package de.ozgcloud.user.recipient;
-import static de.itvsh.kop.user.User.*;
+import static de.ozgcloud.user.User.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -35,9 +35,9 @@ import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.settings.NotificationsSendFor;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.settings.NotificationsSendFor;
import io.quarkus.mongodb.panache.PanacheQuery;
class RecipientRepositoryTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientServiceTest.java
similarity index 94%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientServiceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientServiceTest.java
index dc816a3b4eb510e57a12fbaa8447b13d580718a9..ce40a9747b45bef41bad1547d9f6e90ad2782b68 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientServiceTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.recipient;
+package de.ozgcloud.user.recipient;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -34,8 +34,8 @@ import org.mockito.Mock;
import com.cronutils.utils.StringUtils;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.common.errorhandling.FunctionalException;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.common.errorhandling.FunctionalException;
class RecipientServiceTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientTestFactory.java
similarity index 88%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientTestFactory.java
index f90a1b5ec07dc2327bd3c3d7e4a0902278fcc6fb..4e46e17cf764a3691a3ca8fd582408094485e7f5 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/recipient/RecipientTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/recipient/RecipientTestFactory.java
@@ -21,12 +21,12 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.recipient;
+package de.ozgcloud.user.recipient;
-import static de.itvsh.kop.user.UserTestFactory.*;
+import static de.ozgcloud.user.UserTestFactory.*;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientRequest;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.grpc.recipient.GrpcFindRecipientRequest;
public class RecipientTestFactory {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsRepositoryITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsRepositoryITCase.java
similarity index 93%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsRepositoryITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsRepositoryITCase.java
index 5b7e3a403d2ff4304926ab4089b0a47f4dc32458..d9b84e4df3d3c75e58f8a7c8f1c35e7c0f350c48 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsRepositoryITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsRepositoryITCase.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
import static org.assertj.core.api.Assertions.*;
@@ -9,8 +9,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.common.MongoDbTestProfile;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.common.MongoDbTestProfile;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceAssemblerTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceAssemblerTest.java
similarity index 95%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceAssemblerTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceAssemblerTest.java
index 3a20f53af8af9fd114f4006285ec345f1eea37fb..8bb2edbc11752d030bf01403b673b6e16c466f58 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceAssemblerTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceAssemblerTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -39,8 +39,8 @@ import org.mockito.Spy;
import com.thedeanda.lorem.LoremIpsum;
-import de.itvsh.kop.user.common.callcontext.CallContextUserTestFactory;
-import de.itvsh.kop.user.common.callcontext.CurrentCallContextUserService;
+import de.ozgcloud.user.common.callcontext.CallContextUserTestFactory;
+import de.ozgcloud.user.common.callcontext.CurrentCallContextUserService;
import io.quarkus.hal.HalEntityWrapper;
class UserSettingsResourceAssemblerTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceITCase.java
similarity index 91%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceITCase.java
index 43d947736894688be42a0b457b32ef92ea6fb3d2..42c89399c6284cf98844a5619ba558dba591616e 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceITCase.java
@@ -21,13 +21,14 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
-import static de.itvsh.kop.user.settings.UserSettings.*;
-import static de.itvsh.kop.user.settings.UserSettingsResource.*;
+import static de.ozgcloud.user.settings.UserSettings.*;
+import static de.ozgcloud.user.settings.UserSettingsResource.*;
import static io.restassured.RestAssured.*;
import static org.hamcrest.CoreMatchers.*;
+import de.ozgcloud.user.TestDatabaseUtils;
import jakarta.inject.Inject;
import jakarta.ws.rs.core.MediaType;
@@ -38,9 +39,8 @@ import org.junit.jupiter.api.Test;
import com.mongodb.client.MongoClient;
-import de.itvsh.kop.user.TestDatabaseUtils;
-import de.itvsh.kop.user.UserService;
-import de.itvsh.kop.user.UserTestFactory;
+import de.ozgcloud.user.UserService;
+import de.ozgcloud.user.UserTestFactory;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceTest.java
similarity index 96%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceTest.java
index 5b9c8c29d5d5e7fb59cbfeef93c0357956e6d636..df8ea4ff0e9ed34e051c28903e2ab78476f99f62 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -44,11 +44,11 @@ import org.mockito.Spy;
import com.thedeanda.lorem.LoremIpsum;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserService;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.common.errorhandling.AccessForbiddenException;
-import de.itvsh.kop.user.common.errorhandling.FunctionalException;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserService;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.common.errorhandling.AccessForbiddenException;
+import de.ozgcloud.user.common.errorhandling.FunctionalException;
import io.quarkus.hal.HalEntityWrapper;
class UserSettingsResourceTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceTestProfile.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceTestProfile.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceTestProfile.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceTestProfile.java
index 0245ce5d4a804215eeb5a3b9555b244ff91d717d..343447ad2348f9f7a19b992fc7c832138f7ef963 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsResourceTestProfile.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsResourceTestProfile.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
import java.util.Map;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsServiceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceITCase.java
similarity index 94%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsServiceITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceITCase.java
index 525c4af5b3259187eaf062a99c205062b0260a68..6f0d5f1d6744d4c813b16e7a4e0285577a34f112 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsServiceITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceITCase.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
import static org.assertj.core.api.Assertions.*;
@@ -32,8 +32,8 @@ import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.common.MongoDbTestProfile;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.common.MongoDbTestProfile;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceTest.java
similarity index 96%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsServiceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceTest.java
index 7c7e7c2b1dfdaee7997f9aaeec56fd2176900727..5eeac12fb8fda7f6ca0cdeceb3f74c6171acdace 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -36,8 +36,8 @@ import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.kop.user.UserService;
-import de.itvsh.kop.user.UserTestFactory;
+import de.ozgcloud.user.UserService;
+import de.ozgcloud.user.UserTestFactory;
class UserSettingsServiceTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java
index 50bb9d2763e70ccb1d999c31d52cac0d9c1a54a0..5e3c7ab6886cf791a36976a18e56776d0d4f56a9 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/settings/UserSettingsTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.settings;
+package de.ozgcloud.user.settings;
public class UserSettingsTestFactory {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncSchedulerITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerITCase.java
similarity index 89%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncSchedulerITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerITCase.java
index 969600a23fc6b42f6453402e710afbae26ff4948..c2a948e695cb3a71809a83d5503dbaab48509a8c 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncSchedulerITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerITCase.java
@@ -1,6 +1,6 @@
-package de.itvsh.kop.user.sync;
+package de.ozgcloud.user.sync;
-import static de.itvsh.kop.user.User.*;
+import static de.ozgcloud.user.User.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -10,6 +10,7 @@ import java.util.Arrays;
import java.util.Map;
import java.util.stream.Stream;
+import de.ozgcloud.user.TestDatabaseUtils;
import jakarta.inject.Inject;
import org.bson.Document;
@@ -21,13 +22,12 @@ import org.junit.jupiter.api.Test;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoDatabase;
-import de.itvsh.kop.user.TestDatabaseUtils;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserService;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.common.MongoDbTestProfile;
-import de.itvsh.kop.user.common.lock.Lock;
-import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserService;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.common.MongoDbTestProfile;
+import de.ozgcloud.user.common.lock.Lock;
+import de.ozgcloud.user.keycloak.KeycloakUserRemoteService;
import io.quarkus.test.InjectMock;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncSchedulerTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java
similarity index 95%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncSchedulerTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java
index 99927df2499ec16229ff1a5cca851182332b851b..9d20a7e2cfd3850669d10b185304cb7f2bb2f43c 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncSchedulerTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.sync;
+package de.ozgcloud.user.sync;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -36,8 +36,8 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.user.common.lock.Lock;
-import de.itvsh.kop.user.common.lock.LockService;
+import de.ozgcloud.user.common.lock.Lock;
+import de.ozgcloud.user.common.lock.LockService;
class SyncSchedulerTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncServiceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncServiceITCase.java
similarity index 90%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncServiceITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncServiceITCase.java
index e1685bd2497fa8b3dbad7890e8a2d0df15fbacee..b8f4b508195f389724843087ff90a1d074eb448d 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncServiceITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncServiceITCase.java
@@ -21,9 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.sync;
+package de.ozgcloud.user.sync;
-import static de.itvsh.kop.user.User.*;
+import static de.ozgcloud.user.User.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -32,6 +32,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.stream.Stream;
+import de.ozgcloud.user.TestDatabaseUtils;
import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
@@ -40,12 +41,11 @@ import org.junit.jupiter.api.Test;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoDatabase;
-import de.itvsh.kop.user.TestDatabaseUtils;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserService;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.common.MongoDbTestProfile;
-import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserService;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.common.MongoDbTestProfile;
+import de.ozgcloud.user.keycloak.KeycloakUserRemoteService;
import io.quarkus.test.InjectMock;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncServiceTest.java
similarity index 92%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncServiceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncServiceTest.java
index 9dd04c7e984a4b3fc43f57382a4ca2a54bc87b6e..8cd308cc99e188567f4bb66ef1fd7af13760020c 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncServiceTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.sync;
+package de.ozgcloud.user.sync;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -39,11 +39,11 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserService;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.common.lock.LockService;
-import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserService;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.common.lock.LockService;
+import de.ozgcloud.user.keycloak.KeycloakUserRemoteService;
class SyncServiceTest {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcDeleteInactiveUserRequestTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcDeleteInactiveUserRequestTestFactory.java
similarity index 81%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcDeleteInactiveUserRequestTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcDeleteInactiveUserRequestTestFactory.java
index d8a76fa479259d385f13c615dafe2dba5409dde1..e8f7b29fb508a735088820f09220dc6f4b043000 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcDeleteInactiveUserRequestTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcDeleteInactiveUserRequestTestFactory.java
@@ -1,6 +1,6 @@
-package de.itvsh.kop.user.userprofile;
+package de.ozgcloud.user.userprofile;
-import de.itvsh.kop.user.UserTestFactory;
+import de.ozgcloud.user.UserTestFactory;
public class GrpcDeleteInactiveUserRequestTestFactory {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcGetInactiveUserIdsResponseTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcGetInactiveUserIdsResponseTestFactory.java
similarity index 87%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcGetInactiveUserIdsResponseTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcGetInactiveUserIdsResponseTestFactory.java
index a02edd08186424de55a19f11d7de1769c7918c5d..478ce6a3dc716d3adfcfbc579ffd787a9a9c1a25 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcGetInactiveUserIdsResponseTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcGetInactiveUserIdsResponseTestFactory.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user.userprofile;
+package de.ozgcloud.user.userprofile;
class GrpcGetInactiveUserIdsResponseTestFactory {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcUserProfileIdTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcUserProfileIdTestFactory.java
similarity index 76%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcUserProfileIdTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcUserProfileIdTestFactory.java
index 5180348b34077ba5c25b6a60da456db90774e4f9..d23f70271301c0f078575c4495793b925df4c12b 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcUserProfileIdTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcUserProfileIdTestFactory.java
@@ -1,6 +1,6 @@
-package de.itvsh.kop.user.userprofile;
+package de.ozgcloud.user.userprofile;
-import de.itvsh.kop.user.UserTestFactory;
+import de.ozgcloud.user.UserTestFactory;
class GrpcUserProfileIdTestFactory {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcUserProfileTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcUserProfileTestFactory.java
similarity index 94%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcUserProfileTestFactory.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcUserProfileTestFactory.java
index 1ebb5779b5959aeb1efe4e37cab57b02009c1918..16fd8ad1742ccc8f91bfe9d037c9f481f9776126 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/GrpcUserProfileTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/GrpcUserProfileTestFactory.java
@@ -21,9 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.userprofile;
+package de.ozgcloud.user.userprofile;
-import de.itvsh.kop.user.UserTestFactory;
+import de.ozgcloud.user.UserTestFactory;
public class GrpcUserProfileTestFactory {
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileGrpcServiceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceITCase.java
similarity index 84%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileGrpcServiceITCase.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceITCase.java
index 972f94a7e80eb3dfa5d0de80ab148012a7cfc368..57da92d01036dd05241965f543807867db257675 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileGrpcServiceITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceITCase.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.user.userprofile;
+package de.ozgcloud.user.userprofile;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -10,10 +10,10 @@ import org.junit.jupiter.api.Test;
import com.google.rpc.Code;
-import de.itvsh.kop.user.UserService;
-import de.itvsh.kop.user.UserTestFactory;
-import de.itvsh.kop.user.common.callcontext.CallContextInterceptorTestFactory;
-import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
+import de.ozgcloud.user.UserService;
+import de.ozgcloud.user.UserTestFactory;
+import de.ozgcloud.user.common.callcontext.CallContextInterceptorTestFactory;
+import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
import io.grpc.StatusRuntimeException;
import io.quarkus.grpc.GrpcClient;
import io.quarkus.test.InjectMock;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileGrpcServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceTest.java
similarity index 97%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileGrpcServiceTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceTest.java
index 1f0c6c71f0c733f4ce93536daf071a31b8c8806f..157375cae3489fee6006f53d8e25be4c9fac73a3 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileGrpcServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.userprofile;
+package de.ozgcloud.user.userprofile;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -42,9 +42,9 @@ import org.mockito.Spy;
import com.google.protobuf.Empty;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserService;
-import de.itvsh.kop.user.UserTestFactory;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserService;
+import de.ozgcloud.user.UserTestFactory;
import io.grpc.stub.StreamObserver;
import lombok.SneakyThrows;
diff --git a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileMapperTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java
similarity index 94%
rename from user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileMapperTest.java
rename to user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java
index 9e79187d6e359fde9b51642bfa6219b10239ec8e..c9002fa39f17b01261095f2412dea607549b07e0 100644
--- a/user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileMapperTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.user.userprofile;
+package de.ozgcloud.user.userprofile;
import static org.assertj.core.api.Assertions.*;
@@ -31,8 +31,8 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
-import de.itvsh.kop.user.User;
-import de.itvsh.kop.user.UserTestFactory;
+import de.ozgcloud.user.User;
+import de.ozgcloud.user.UserTestFactory;
class UserProfileMapperTest {