From f7ccb859ce2b7e7a6e6e46b6df7d9b074909b3ca Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Thu, 30 Jan 2025 17:03:11 +0100
Subject: [PATCH] OZG-4094 Cleanup
---
pom.xml | 3 +--
.../osiv2/OsiPostfachRemoteServiceITCase.java | 24 +++++--------------
...ngeReceiveMessagesResponseTestFactory.java | 11 ++++++---
3 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0ad4730..6da03db 100644
--- a/pom.xml
+++ b/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>
diff --git a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/OsiPostfachRemoteServiceITCase.java b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/OsiPostfachRemoteServiceITCase.java
index 0acee01..c4f0c35 100644
--- a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/OsiPostfachRemoteServiceITCase.java
+++ b/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(
- V1ReplyMessageTestFactory.create()
- .messageBox(UUID.fromString(uuid))
- .responseTime(OffsetDateTime.now())
- )
- )
+ .willReturn(okJsonObj(
+ V1ReplyMessageTestFactory.create()
+ .messageBox(UUID.fromString(uuid))
+ .responseTime(OffsetDateTime.now())
+ ))
);
}
}
diff --git a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/factory/MessageExchangeReceiveMessagesResponseTestFactory.java b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/factory/MessageExchangeReceiveMessagesResponseTestFactory.java
index 8721bbb..7fa0ae8 100644
--- a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/factory/MessageExchangeReceiveMessagesResponseTestFactory.java
+++ b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/factory/MessageExchangeReceiveMessagesResponseTestFactory.java
@@ -1,13 +1,18 @@
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());
}
+
}
--
GitLab