diff --git a/src/main/java/de/ozgcloud/xta/client/XtaClient.java b/src/main/java/de/ozgcloud/xta/client/XtaClient.java
index 36075b3ae12624cc8a29c70c4c1a1ec7a0f4b44f..deb3050505bb39ad70d676571a3038df0261b95d 100644
--- a/src/main/java/de/ozgcloud/xta/client/XtaClient.java
+++ b/src/main/java/de/ozgcloud/xta/client/XtaClient.java
@@ -6,7 +6,7 @@ import de.ozgcloud.xta.client.config.XtaClientConfig;
import de.ozgcloud.xta.client.core.WrappedXtaService;
import de.ozgcloud.xta.client.model.Identifier;
import de.ozgcloud.xta.client.model.XtaMessage;
-import de.ozgcloud.xta.client.model.XtaMessageMetaDataAndHeader;
+import de.ozgcloud.xta.client.model.XtaMessageMetaDataListing;
import genv3.de.xoev.transport.xta.x211.PermissionDeniedException;
import genv3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException;
import lombok.AccessLevel;
@@ -22,19 +22,19 @@ public class XtaClient {
private final WrappedXtaService service;
private final XtaClientConfig config;
- public XtaMessageMetaDataAndHeader getMessagesMetadata(String xtaIdentifier)
+ public XtaMessageMetaDataListing getMessagesMetadata(String xtaIdentifier)
throws XTAWSTechnicalProblemException, PermissionDeniedException {
var clientIdentifier = deriveIdentifier(xtaIdentifier);
service.checkAccountActive(clientIdentifier);
return getStatusList(clientIdentifier);
}
- public XtaMessageMetaDataAndHeader getNextMessagesMetadata(String xtaIdentifier)
+ public XtaMessageMetaDataListing getNextMessagesMetadata(String xtaIdentifier)
throws XTAWSTechnicalProblemException, PermissionDeniedException {
return getStatusList(deriveIdentifier(xtaIdentifier));
}
- private XtaMessageMetaDataAndHeader getStatusList(Identifier clientIdentifier) throws XTAWSTechnicalProblemException, PermissionDeniedException {
+ private XtaMessageMetaDataListing getStatusList(Identifier clientIdentifier) throws XTAWSTechnicalProblemException, PermissionDeniedException {
return service.getStatusList(clientIdentifier, config.getMaxListItems());
}
diff --git a/src/main/java/de/ozgcloud/xta/client/core/WebServiceTypeMapper.java b/src/main/java/de/ozgcloud/xta/client/core/WebServiceTypeMapper.java
index 675da260a0c9001bc8818f2c02278776b1a6aa96..3bd8db056baec025368ef1a93369be4657e09f63 100644
--- a/src/main/java/de/ozgcloud/xta/client/core/WebServiceTypeMapper.java
+++ b/src/main/java/de/ozgcloud/xta/client/core/WebServiceTypeMapper.java
@@ -10,7 +10,7 @@ import org.mapstruct.ReportingPolicy;
import de.ozgcloud.xta.client.model.Identifier;
import de.ozgcloud.xta.client.model.XtaMessageMetaData;
-import de.ozgcloud.xta.client.model.XtaMessageMetaDataAndHeader;
+import de.ozgcloud.xta.client.model.XtaMessageMetaDataListing;
import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxResponseType;
import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxStatusListRequestType;
import genv3.eu.osci.ws.x2008.x05.transport.MsgStatusListType;
@@ -44,7 +44,7 @@ public interface WebServiceTypeMapper {
@Mapping(target = "moreMessagesAvailable", source = "response", qualifiedByName = "mapMoreMessagesAvailable")
@Mapping(target = "messages", source = "msgStatusListType.messageMetaData")
- XtaMessageMetaDataAndHeader mapXtaMessageMetaDataAndHeader(MsgStatusListType msgStatusListType, MsgBoxResponseType response);
+ XtaMessageMetaDataListing mapXtaMessageMetaDataAndHeader(MsgStatusListType msgStatusListType, MsgBoxResponseType response);
@Mapping(target = "service", source = "qualifier.service")
@Mapping(target = "businessScenarioCode", source = "qualifier.businessScenario.defined.code")
diff --git a/src/main/java/de/ozgcloud/xta/client/core/WrappedXtaService.java b/src/main/java/de/ozgcloud/xta/client/core/WrappedXtaService.java
index cc9338aef26273ed5b8a601a67fb1864daeaa1d7..46a87a056bd64988829874c360949d12a8350d12 100644
--- a/src/main/java/de/ozgcloud/xta/client/core/WrappedXtaService.java
+++ b/src/main/java/de/ozgcloud/xta/client/core/WrappedXtaService.java
@@ -4,7 +4,7 @@ import jakarta.xml.ws.Holder;
import de.ozgcloud.xta.client.model.Identifier;
import de.ozgcloud.xta.client.model.XtaMessage;
-import de.ozgcloud.xta.client.model.XtaMessageMetaDataAndHeader;
+import de.ozgcloud.xta.client.model.XtaMessageMetaDataListing;
import genv3.de.xoev.transport.xta.x211.PermissionDeniedException;
import genv3.de.xoev.transport.xta.x211.XTAService;
import genv3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException;
@@ -25,7 +25,7 @@ public class WrappedXtaService {
service.getManagementPort().checkAccountActive(typeMapper.mapPartyTypeFromIdentifier(clientIdentifier));
}
- public XtaMessageMetaDataAndHeader getStatusList(Identifier clientIdentifier, int maxListItems)
+ public XtaMessageMetaDataListing getStatusList(Identifier clientIdentifier, int maxListItems)
throws XTAWSTechnicalProblemException, PermissionDeniedException {
final Holder<MsgBoxResponseType> fetchResponseHeader = new Holder<>();
var msgStatusListType = service.getMsgBoxPort().getStatusList(
diff --git a/src/main/java/de/ozgcloud/xta/client/model/XtaMessageMetaDataAndHeader.java b/src/main/java/de/ozgcloud/xta/client/model/XtaMessageMetaDataListing.java
similarity index 71%
rename from src/main/java/de/ozgcloud/xta/client/model/XtaMessageMetaDataAndHeader.java
rename to src/main/java/de/ozgcloud/xta/client/model/XtaMessageMetaDataListing.java
index 86fcfa347815f1a42eb220f41172a9493aec07d9..58fe5d6e280505f08ad9d549ae947385b53383b2 100644
--- a/src/main/java/de/ozgcloud/xta/client/model/XtaMessageMetaDataAndHeader.java
+++ b/src/main/java/de/ozgcloud/xta/client/model/XtaMessageMetaDataListing.java
@@ -5,8 +5,7 @@ import java.util.List;
import lombok.Builder;
@Builder
-public record XtaMessageMetaDataAndHeader(
- String msgBoxRequestID,
+public record XtaMessageMetaDataListing(
boolean moreMessagesAvailable,
List<XtaMessageMetaData> messages
) {
diff --git a/src/test/java/de/ozgcloud/xta/client/XtaClientTest.java b/src/test/java/de/ozgcloud/xta/client/XtaClientTest.java
index 9c96be14adc05ab998b98dd7d86bd4364e1a026f..9ff22db19e463b2e91d2f20cb098bb41dff3a39a 100644
--- a/src/test/java/de/ozgcloud/xta/client/XtaClientTest.java
+++ b/src/test/java/de/ozgcloud/xta/client/XtaClientTest.java
@@ -16,7 +16,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import de.ozgcloud.xta.client.config.XtaClientConfig;
import de.ozgcloud.xta.client.core.WrappedXtaService;
-import de.ozgcloud.xta.client.model.XtaMessageMetaDataAndHeader;
+import de.ozgcloud.xta.client.model.XtaMessageMetaDataListing;
import lombok.SneakyThrows;
@ExtendWith(MockitoExtension.class)
@@ -37,13 +37,13 @@ class XtaClientTest {
class TestGetMessagesMetadata {
@Mock
- XtaMessageMetaDataAndHeader xtaMessageMetaDataAndHeader;
+ XtaMessageMetaDataListing xtaMessageMetaDataListing;
@BeforeEach
@SneakyThrows
void mock() {
doReturn(SELF_IDENTIFIER).when(client).deriveIdentifier(SELF_IDENTIFIER_VALUE);
- when(service.getStatusList(SELF_IDENTIFIER, MAX_LIST_ITEMS)).thenReturn(xtaMessageMetaDataAndHeader);
+ when(service.getStatusList(SELF_IDENTIFIER, MAX_LIST_ITEMS)).thenReturn(xtaMessageMetaDataListing);
when(config.getMaxListItems()).thenReturn(MAX_LIST_ITEMS);
}
@@ -62,7 +62,7 @@ class XtaClientTest {
void shouldReturnGetStatusListResponse() {
var result = client.getMessagesMetadata(SELF_IDENTIFIER_VALUE);
- assertThat(result).isEqualTo(xtaMessageMetaDataAndHeader);
+ assertThat(result).isEqualTo(xtaMessageMetaDataListing);
}
}
@@ -72,13 +72,13 @@ class XtaClientTest {
class TestGetNextMessagesMetaData {
@Mock
- XtaMessageMetaDataAndHeader xtaMessageMetaDataAndHeader;
+ XtaMessageMetaDataListing xtaMessageMetaDataListing;
@BeforeEach
@SneakyThrows
void mock() {
doReturn(SELF_IDENTIFIER).when(client).deriveIdentifier(SELF_IDENTIFIER_VALUE);
- when(service.getStatusList(SELF_IDENTIFIER, MAX_LIST_ITEMS)).thenReturn(xtaMessageMetaDataAndHeader);
+ when(service.getStatusList(SELF_IDENTIFIER, MAX_LIST_ITEMS)).thenReturn(xtaMessageMetaDataListing);
when(config.getMaxListItems()).thenReturn(MAX_LIST_ITEMS);
}
@@ -88,7 +88,7 @@ class XtaClientTest {
void shouldReturnGetStatusListResponse() {
var result = client.getNextMessagesMetadata(SELF_IDENTIFIER_VALUE);
- assertThat(result).isEqualTo(xtaMessageMetaDataAndHeader);
+ assertThat(result).isEqualTo(xtaMessageMetaDataListing);
}
}
diff --git a/src/test/java/de/ozgcloud/xta/client/core/WrappedXtaServiceTest.java b/src/test/java/de/ozgcloud/xta/client/core/WrappedXtaServiceTest.java
index 0d5e8bfce824be55ec6901f7e1140a9e3c74d328..8c01dcd8e04cd3321741beb844db43365149638b 100644
--- a/src/test/java/de/ozgcloud/xta/client/core/WrappedXtaServiceTest.java
+++ b/src/test/java/de/ozgcloud/xta/client/core/WrappedXtaServiceTest.java
@@ -15,7 +15,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import de.ozgcloud.xta.client.model.XtaMessageMetaDataAndHeader;
+import de.ozgcloud.xta.client.model.XtaMessageMetaDataListing;
import genv3.de.xoev.transport.xta.x211.ManagementPortType;
import genv3.de.xoev.transport.xta.x211.MsgBoxPortType;
import genv3.de.xoev.transport.xta.x211.XTAService;
@@ -82,7 +82,7 @@ class WrappedXtaServiceTest {
private MsgStatusListType msgStatusListType;
@Mock
- private XtaMessageMetaDataAndHeader xtaMessageMetaDataAndHeader;
+ private XtaMessageMetaDataListing xtaMessageMetaDataListing;
@BeforeEach
@SneakyThrows
@@ -99,7 +99,7 @@ class WrappedXtaServiceTest {
return msgStatusListType;
});
when(typeMapper.mapXtaMessageMetaDataAndHeader(msgStatusListType, msgBoxResponseType))
- .thenReturn(xtaMessageMetaDataAndHeader);
+ .thenReturn(xtaMessageMetaDataListing);
}
@DisplayName("should map response")
@@ -108,7 +108,7 @@ class WrappedXtaServiceTest {
void shouldMapResponse() {
var result = service.getStatusList(SELF_IDENTIFIER, MAX_LIST_ITEMS);
- assertThat(result).isEqualTo(xtaMessageMetaDataAndHeader);
+ assertThat(result).isEqualTo(xtaMessageMetaDataListing);
}
}