Merge remote-tracking branch 'origin/master' into OZG-3532-package-namen

# Conflicts:
#	user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryITCase.java
#	user-manager-server/src/test/java/de/ozgcloud/user/UserTestFactory.java

user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryITCase.java

@@ -42,8 +42,6 @@ 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.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());
 		}
 

user-manager-server/src/test/java/de/ozgcloud/user/UserTestFactory.java

@@ -24,28 +24,25 @@
 package de.ozgcloud.user;
 
 import java.util.List;
-import java.util.UUID;
 
 import org.bson.types.ObjectId;
 
-import com.thedeanda.lorem.LoremIpsum;
-
 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");