OZG-4094 Cleanup

pom.xml

@@ -74,14 +74,13 @@
 			<version>${testcontainers.version}</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.wiremock.integrations</groupId>
 			<artifactId>wiremock-spring-boot</artifactId>
 			<version>${wiremock-spring-boot.version}</version>
+			<scope>test</scope>
 		</dependency>
 
-
 		<!-- commons -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>

src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/OsiPostfachRemoteServiceITCase.java

@@ -5,7 +5,6 @@ import static de.ozgcloud.nachrichten.postfach.osiv2.factory.JwtFactory.*;
 import static org.assertj.core.api.Assertions.*;
 
 import java.time.OffsetDateTime;
-import java.util.Arrays;
 import java.util.UUID;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -26,7 +25,6 @@ import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
 import de.ozgcloud.nachrichten.postfach.osiv2.extension.Jwt;
 import de.ozgcloud.nachrichten.postfach.osiv2.extension.OsiMockServerExtension;
 import de.ozgcloud.nachrichten.postfach.osiv2.factory.JsonUtil;
-import de.ozgcloud.nachrichten.postfach.osiv2.factory.MessageExchangeReceiveMessageTestFactory;
 import de.ozgcloud.nachrichten.postfach.osiv2.factory.MessageExchangeReceiveMessagesResponseTestFactory;
 import de.ozgcloud.nachrichten.postfach.osiv2.factory.MessageExchangeSendMessageResponseTestFactory;
 import de.ozgcloud.nachrichten.postfach.osiv2.factory.PostfachNachrichtTestFactory;
@@ -116,27 +114,17 @@ class OsiPostfachRemoteServiceITCase {
 		postfachFacadeMockServer.stubFor(get(urlPathEqualTo("/MessageExchange/v1/Receive"))
 				.withQueryParam("take", equalTo("100"))
 				.withQueryParam("skip", equalTo("0"))
-				.willReturn(
-						okJsonObj(
-								MessageExchangeReceiveMessagesResponseTestFactory.create()
-										.messages(Arrays.stream(uuids)
-												.map(uuid -> MessageExchangeReceiveMessageTestFactory.create()
-														.guid(UUID.fromString(uuid)))
-												.toList())
-						)
-				)
+				.willReturn(okJsonObj(MessageExchangeReceiveMessagesResponseTestFactory.create(uuids)))
 		);
 		for (String uuid : uuids) {
 			// Stub individual response for message (MessageExchangeApi::getMessage)
 			postfachFacadeMockServer.stubFor(get(urlPathTemplate("/MessageExchange/v1/Receive/{messageId}"))
 					.withPathParam("messageId", equalTo(uuid))
-					.willReturn(
-							okJsonObj(
+					.willReturn(okJsonObj(
 							V1ReplyMessageTestFactory.create()
 									.messageBox(UUID.fromString(uuid))
 									.responseTime(OffsetDateTime.now())
-							)
-					)
+					))
 			);
 		}
 	}

src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/factory/MessageExchangeReceiveMessagesResponseTestFactory.java

 package de.ozgcloud.nachrichten.postfach.osiv2.factory;
 
-import java.util.List;
+import java.util.Arrays;
+import java.util.UUID;
 
 import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.MessageExchangeReceiveMessagesResponse;
 
 public class MessageExchangeReceiveMessagesResponseTestFactory {
 
-	public static MessageExchangeReceiveMessagesResponse create() {
+	public static MessageExchangeReceiveMessagesResponse create(String... uuids) {
 		return new MessageExchangeReceiveMessagesResponse()
-				.messages(List.of());
+				.messages(Arrays.stream(uuids)
+						.map(uuid -> MessageExchangeReceiveMessageTestFactory.create()
+								.guid(UUID.fromString(uuid)))
+						.toList());
 	}
+
 }