diff --git a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/RequestMapper.java b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2RequestMapper.java
similarity index 98%
rename from src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/RequestMapper.java
rename to src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2RequestMapper.java
index c9a42ae3fa9756dfe2ac34d20bfd73405f85a5fe..4b1482c4efeb283320bd9abace07dc89da77f52f 100644
--- a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/RequestMapper.java
+++ b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2RequestMapper.java
@@ -17,7 +17,7 @@ import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.V1References;
import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.V1ReplyBehavior;
@Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR)
-public interface RequestMapper {
+public interface Osi2RequestMapper {
@Mapping(target = "sequencenumber", source = "vorgangId")
@Mapping(target = "body", source = "mailBody")
diff --git a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/ResponseMapper.java b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2ResponseMapper.java
similarity index 97%
rename from src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/ResponseMapper.java
rename to src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2ResponseMapper.java
index 84a1b80ce2f3ac508b39ce35bd9c52edc6f5ce4b..f5acb80a874aed8cf323aca797cbc5488f7846f5 100644
--- a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/ResponseMapper.java
+++ b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2ResponseMapper.java
@@ -1,7 +1,6 @@
package de.ozgcloud.nachrichten.postfach.osiv2.transfer;
import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@@ -17,7 +16,7 @@ import lombok.Builder;
import lombok.Getter;
@Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR, imports = ZoneOffset.class)
-public interface ResponseMapper {
+public interface Osi2ResponseMapper {
String POSTFACH_ADDRESS_VERSION = "2.0";
int POSTFACH_ADDRESS_TYPE = 2;
diff --git a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/PostfachApiFacadeService.java b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/PostfachApiFacadeService.java
index 7f62892e8b031e4ce89a716db9c1d2a6952497c1..7d3651aa1d42782ea1feaf76cbfdff25d09ff3dd 100644
--- a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/PostfachApiFacadeService.java
+++ b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/PostfachApiFacadeService.java
@@ -20,15 +20,15 @@ import lombok.extern.log4j.Log4j2;
public class PostfachApiFacadeService {
private final MessageExchangeApi messageExchangeApi;
- private final RequestMapper requestMapper;
- private final ResponseMapper responseMapper;
+ private final Osi2RequestMapper osi2RequestMapper;
+ private final Osi2ResponseMapper osi2ResponseMapper;
private static int MAX_NUMBER_RECEIVED_MESSAGES = 100;
public void sendMessage(PostfachNachricht nachricht) {
messageExchangeApi.sendMessage(
- requestMapper.mapMailboxId(nachricht),
- requestMapper.mapOutSendMessageRequestV2(nachricht)
+ osi2RequestMapper.mapMailboxId(nachricht),
+ osi2RequestMapper.mapOutSendMessageRequestV2(nachricht)
);
}
@@ -39,7 +39,7 @@ public class PostfachApiFacadeService {
PostfachNachricht fetchMessageByGuid(final MessageExchangeReceiveMessage message) {
var messageReply = messageExchangeApi.getMessage(message.getGuid());
- return responseMapper.toPostfachNachricht(messageReply);
+ return osi2ResponseMapper.toPostfachNachricht(messageReply);
}
public void deleteMessage(final String messageId) {
diff --git a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/RequestMapperTest.java b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2RequestMapperTest.java
similarity index 97%
rename from src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/RequestMapperTest.java
rename to src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2RequestMapperTest.java
index 0e67c3c307449847d9e9e89e936f6812938ae98a..3abec1a5f53dd2c897230896e38a443eebd4ce4d 100644
--- a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/RequestMapperTest.java
+++ b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2RequestMapperTest.java
@@ -23,9 +23,9 @@ import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.OutSendMessageRequestV2;
import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.V1EidasLevel;
import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.V1ReplyBehavior;
-class RequestMapperTest {
+class Osi2RequestMapperTest {
- private final RequestMapper mapper = Mappers.getMapper(RequestMapper.class);
+ private final Osi2RequestMapper mapper = Mappers.getMapper(Osi2RequestMapper.class);
@DisplayName("map mailbox id")
@Nested
diff --git a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/ResponseMapperTest.java b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2ResponseMapperTest.java
similarity index 96%
rename from src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/ResponseMapperTest.java
rename to src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2ResponseMapperTest.java
index d4c8706356d03230611e185f639484e124b2601d..3ec9b5009bb41bc5339e27fb3ab99d6f63517368 100644
--- a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/ResponseMapperTest.java
+++ b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2ResponseMapperTest.java
@@ -16,10 +16,10 @@ import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
import de.ozgcloud.nachrichten.postfach.osiv2.factory.V1ReplyMessageFactory;
import de.ozgcloud.nachrichten.postfach.osiv2.gen.model.V1ReplyMessage;
-class ResponseMapperTest {
+class Osi2ResponseMapperTest {
@InjectMocks
- private ResponseMapper mapper = Mappers.getMapper(ResponseMapper.class);
+ private Osi2ResponseMapper mapper = Mappers.getMapper(Osi2ResponseMapper.class);
private V1ReplyMessage message = V1ReplyMessageFactory.create();
@DisplayName("map V1ReplyMessage to PostfachNachricht")
diff --git a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/PostfachApiFacadeServiceTest.java b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/PostfachApiFacadeServiceTest.java
index 139ba192c9394ddb55d2657e094a2d9d15765866..c1abebba22f3e88935c0465e0bba99d6840a07e5 100644
--- a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/PostfachApiFacadeServiceTest.java
+++ b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/PostfachApiFacadeServiceTest.java
@@ -32,10 +32,10 @@ class PostfachApiFacadeServiceTest {
MessageExchangeApi messageExchangeApi;
@Mock
- RequestMapper requestMapper;
+ Osi2RequestMapper osi2RequestMapper;
@Mock
- ResponseMapper responseMapper;
+ Osi2ResponseMapper osi2ResponseMapper;
@DisplayName("send message")
@Nested
@@ -51,8 +51,8 @@ class PostfachApiFacadeServiceTest {
@BeforeEach
void mock() {
- when(requestMapper.mapMailboxId(nachricht)).thenReturn(MAILBOX_ID);
- when(requestMapper.mapOutSendMessageRequestV2(nachricht)).thenReturn(outSendMessageRequestV2);
+ when(osi2RequestMapper.mapMailboxId(nachricht)).thenReturn(MAILBOX_ID);
+ when(osi2RequestMapper.mapOutSendMessageRequestV2(nachricht)).thenReturn(outSendMessageRequestV2);
when(messageExchangeApi.sendMessage(any(), any())).thenReturn(messageExchangeSendMessageResponse);
}
@@ -107,17 +107,17 @@ class PostfachApiFacadeServiceTest {
@Test
void shouldCallResponseMapper(){
when(messageExchangeApi.getMessage(any())).thenReturn(replyMessage);
- when(responseMapper.toPostfachNachricht(any())).thenReturn(PostfachNachrichtTestFactory.create());
+ when(osi2ResponseMapper.toPostfachNachricht(any())).thenReturn(PostfachNachrichtTestFactory.create());
postfachApiFacadeService.fetchMessageByGuid(receiveMessage);
- verify(responseMapper).toPostfachNachricht(any());
+ verify(osi2ResponseMapper).toPostfachNachricht(any());
}
@Test
void shouldReturnPostfachNachricht(){
when(messageExchangeApi.getMessage(any())).thenReturn(replyMessage);
- when(responseMapper.toPostfachNachricht(any())).thenReturn(PostfachNachrichtTestFactory.create());
+ when(osi2ResponseMapper.toPostfachNachricht(any())).thenReturn(PostfachNachrichtTestFactory.create());
var postfachNachricht = postfachApiFacadeService.fetchMessageByGuid(receiveMessage);