Skip to content
Snippets Groups Projects
Commit 39e221fe authored by Jan Zickermann's avatar Jan Zickermann
Browse files

KOP-2139 KOP-2461 Rename XtaMessageMetaDataAndHeader to XtaMessageMetaDataListing

parent f3774a48
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ import de.ozgcloud.xta.client.config.XtaClientConfig; ...@@ -6,7 +6,7 @@ import de.ozgcloud.xta.client.config.XtaClientConfig;
import de.ozgcloud.xta.client.core.WrappedXtaService; import de.ozgcloud.xta.client.core.WrappedXtaService;
import de.ozgcloud.xta.client.model.Identifier; import de.ozgcloud.xta.client.model.Identifier;
import de.ozgcloud.xta.client.model.XtaMessage; 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.PermissionDeniedException;
import genv3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException; import genv3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException;
import lombok.AccessLevel; import lombok.AccessLevel;
...@@ -22,19 +22,19 @@ public class XtaClient { ...@@ -22,19 +22,19 @@ public class XtaClient {
private final WrappedXtaService service; private final WrappedXtaService service;
private final XtaClientConfig config; private final XtaClientConfig config;
public XtaMessageMetaDataAndHeader getMessagesMetadata(String xtaIdentifier) public XtaMessageMetaDataListing getMessagesMetadata(String xtaIdentifier)
throws XTAWSTechnicalProblemException, PermissionDeniedException { throws XTAWSTechnicalProblemException, PermissionDeniedException {
var clientIdentifier = deriveIdentifier(xtaIdentifier); var clientIdentifier = deriveIdentifier(xtaIdentifier);
service.checkAccountActive(clientIdentifier); service.checkAccountActive(clientIdentifier);
return getStatusList(clientIdentifier); return getStatusList(clientIdentifier);
} }
public XtaMessageMetaDataAndHeader getNextMessagesMetadata(String xtaIdentifier) public XtaMessageMetaDataListing getNextMessagesMetadata(String xtaIdentifier)
throws XTAWSTechnicalProblemException, PermissionDeniedException { throws XTAWSTechnicalProblemException, PermissionDeniedException {
return getStatusList(deriveIdentifier(xtaIdentifier)); 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()); return service.getStatusList(clientIdentifier, config.getMaxListItems());
} }
......
...@@ -10,7 +10,7 @@ import org.mapstruct.ReportingPolicy; ...@@ -10,7 +10,7 @@ import org.mapstruct.ReportingPolicy;
import de.ozgcloud.xta.client.model.Identifier; import de.ozgcloud.xta.client.model.Identifier;
import de.ozgcloud.xta.client.model.XtaMessageMetaData; 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.MsgBoxResponseType;
import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxStatusListRequestType; import genv3.eu.osci.ws.x2008.x05.transport.MsgBoxStatusListRequestType;
import genv3.eu.osci.ws.x2008.x05.transport.MsgStatusListType; import genv3.eu.osci.ws.x2008.x05.transport.MsgStatusListType;
...@@ -44,7 +44,7 @@ public interface WebServiceTypeMapper { ...@@ -44,7 +44,7 @@ public interface WebServiceTypeMapper {
@Mapping(target = "moreMessagesAvailable", source = "response", qualifiedByName = "mapMoreMessagesAvailable") @Mapping(target = "moreMessagesAvailable", source = "response", qualifiedByName = "mapMoreMessagesAvailable")
@Mapping(target = "messages", source = "msgStatusListType.messageMetaData") @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 = "service", source = "qualifier.service")
@Mapping(target = "businessScenarioCode", source = "qualifier.businessScenario.defined.code") @Mapping(target = "businessScenarioCode", source = "qualifier.businessScenario.defined.code")
......
...@@ -4,7 +4,7 @@ import jakarta.xml.ws.Holder; ...@@ -4,7 +4,7 @@ import jakarta.xml.ws.Holder;
import de.ozgcloud.xta.client.model.Identifier; import de.ozgcloud.xta.client.model.Identifier;
import de.ozgcloud.xta.client.model.XtaMessage; 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.PermissionDeniedException;
import genv3.de.xoev.transport.xta.x211.XTAService; import genv3.de.xoev.transport.xta.x211.XTAService;
import genv3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException; import genv3.de.xoev.transport.xta.x211.XTAWSTechnicalProblemException;
...@@ -25,7 +25,7 @@ public class WrappedXtaService { ...@@ -25,7 +25,7 @@ public class WrappedXtaService {
service.getManagementPort().checkAccountActive(typeMapper.mapPartyTypeFromIdentifier(clientIdentifier)); service.getManagementPort().checkAccountActive(typeMapper.mapPartyTypeFromIdentifier(clientIdentifier));
} }
public XtaMessageMetaDataAndHeader getStatusList(Identifier clientIdentifier, int maxListItems) public XtaMessageMetaDataListing getStatusList(Identifier clientIdentifier, int maxListItems)
throws XTAWSTechnicalProblemException, PermissionDeniedException { throws XTAWSTechnicalProblemException, PermissionDeniedException {
final Holder<MsgBoxResponseType> fetchResponseHeader = new Holder<>(); final Holder<MsgBoxResponseType> fetchResponseHeader = new Holder<>();
var msgStatusListType = service.getMsgBoxPort().getStatusList( var msgStatusListType = service.getMsgBoxPort().getStatusList(
......
...@@ -5,8 +5,7 @@ import java.util.List; ...@@ -5,8 +5,7 @@ import java.util.List;
import lombok.Builder; import lombok.Builder;
@Builder @Builder
public record XtaMessageMetaDataAndHeader( public record XtaMessageMetaDataListing(
String msgBoxRequestID,
boolean moreMessagesAvailable, boolean moreMessagesAvailable,
List<XtaMessageMetaData> messages List<XtaMessageMetaData> messages
) { ) {
......
...@@ -16,7 +16,7 @@ import org.mockito.junit.jupiter.MockitoExtension; ...@@ -16,7 +16,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import de.ozgcloud.xta.client.config.XtaClientConfig; import de.ozgcloud.xta.client.config.XtaClientConfig;
import de.ozgcloud.xta.client.core.WrappedXtaService; import de.ozgcloud.xta.client.core.WrappedXtaService;
import de.ozgcloud.xta.client.model.XtaMessageMetaDataAndHeader; import de.ozgcloud.xta.client.model.XtaMessageMetaDataListing;
import lombok.SneakyThrows; import lombok.SneakyThrows;
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
...@@ -37,13 +37,13 @@ class XtaClientTest { ...@@ -37,13 +37,13 @@ class XtaClientTest {
class TestGetMessagesMetadata { class TestGetMessagesMetadata {
@Mock @Mock
XtaMessageMetaDataAndHeader xtaMessageMetaDataAndHeader; XtaMessageMetaDataListing xtaMessageMetaDataListing;
@BeforeEach @BeforeEach
@SneakyThrows @SneakyThrows
void mock() { void mock() {
doReturn(SELF_IDENTIFIER).when(client).deriveIdentifier(SELF_IDENTIFIER_VALUE); 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); when(config.getMaxListItems()).thenReturn(MAX_LIST_ITEMS);
} }
...@@ -62,7 +62,7 @@ class XtaClientTest { ...@@ -62,7 +62,7 @@ class XtaClientTest {
void shouldReturnGetStatusListResponse() { void shouldReturnGetStatusListResponse() {
var result = client.getMessagesMetadata(SELF_IDENTIFIER_VALUE); var result = client.getMessagesMetadata(SELF_IDENTIFIER_VALUE);
assertThat(result).isEqualTo(xtaMessageMetaDataAndHeader); assertThat(result).isEqualTo(xtaMessageMetaDataListing);
} }
} }
...@@ -72,13 +72,13 @@ class XtaClientTest { ...@@ -72,13 +72,13 @@ class XtaClientTest {
class TestGetNextMessagesMetaData { class TestGetNextMessagesMetaData {
@Mock @Mock
XtaMessageMetaDataAndHeader xtaMessageMetaDataAndHeader; XtaMessageMetaDataListing xtaMessageMetaDataListing;
@BeforeEach @BeforeEach
@SneakyThrows @SneakyThrows
void mock() { void mock() {
doReturn(SELF_IDENTIFIER).when(client).deriveIdentifier(SELF_IDENTIFIER_VALUE); 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); when(config.getMaxListItems()).thenReturn(MAX_LIST_ITEMS);
} }
...@@ -88,7 +88,7 @@ class XtaClientTest { ...@@ -88,7 +88,7 @@ class XtaClientTest {
void shouldReturnGetStatusListResponse() { void shouldReturnGetStatusListResponse() {
var result = client.getNextMessagesMetadata(SELF_IDENTIFIER_VALUE); var result = client.getNextMessagesMetadata(SELF_IDENTIFIER_VALUE);
assertThat(result).isEqualTo(xtaMessageMetaDataAndHeader); assertThat(result).isEqualTo(xtaMessageMetaDataListing);
} }
} }
......
...@@ -15,7 +15,7 @@ import org.mockito.InjectMocks; ...@@ -15,7 +15,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension; 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.ManagementPortType;
import genv3.de.xoev.transport.xta.x211.MsgBoxPortType; import genv3.de.xoev.transport.xta.x211.MsgBoxPortType;
import genv3.de.xoev.transport.xta.x211.XTAService; import genv3.de.xoev.transport.xta.x211.XTAService;
...@@ -82,7 +82,7 @@ class WrappedXtaServiceTest { ...@@ -82,7 +82,7 @@ class WrappedXtaServiceTest {
private MsgStatusListType msgStatusListType; private MsgStatusListType msgStatusListType;
@Mock @Mock
private XtaMessageMetaDataAndHeader xtaMessageMetaDataAndHeader; private XtaMessageMetaDataListing xtaMessageMetaDataListing;
@BeforeEach @BeforeEach
@SneakyThrows @SneakyThrows
...@@ -99,7 +99,7 @@ class WrappedXtaServiceTest { ...@@ -99,7 +99,7 @@ class WrappedXtaServiceTest {
return msgStatusListType; return msgStatusListType;
}); });
when(typeMapper.mapXtaMessageMetaDataAndHeader(msgStatusListType, msgBoxResponseType)) when(typeMapper.mapXtaMessageMetaDataAndHeader(msgStatusListType, msgBoxResponseType))
.thenReturn(xtaMessageMetaDataAndHeader); .thenReturn(xtaMessageMetaDataListing);
} }
@DisplayName("should map response") @DisplayName("should map response")
...@@ -108,7 +108,7 @@ class WrappedXtaServiceTest { ...@@ -108,7 +108,7 @@ class WrappedXtaServiceTest {
void shouldMapResponse() { void shouldMapResponse() {
var result = service.getStatusList(SELF_IDENTIFIER, MAX_LIST_ITEMS); var result = service.getStatusList(SELF_IDENTIFIER, MAX_LIST_ITEMS);
assertThat(result).isEqualTo(xtaMessageMetaDataAndHeader); assertThat(result).isEqualTo(xtaMessageMetaDataListing);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment