diff --git a/Jenkinsfile b/Jenkinsfile
index 688a2c602c103244fb9715e0d6b41641a1971ca1..258cfa2497436f696c9e9e7216286f18ca3af206 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -277,7 +277,7 @@ Void sendFailureMessage() {
"formatted_body":"Eingang-Manager: Build Failed. Stage: ${FAILED_STAGE} Build-ID: <a href='${BLUE_OCEAN_URL}'>${env.BUILD_NUMBER}</a>"}"""
if (env.BRANCH_NAME == 'master') {
- room = "!iQPAvQIiRwRpNOszjw:matrix.ozg-sh.de"
+ room = "!GjqhmouBtnDbwUkAjx:matrix.ozg-sh.de"
}
else if (env.BRANCH_NAME == 'release') {
room = "!oWZpUGTFsxkJIYNfYg:matrix.ozg-sh.de"
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index 1abf7b15ee0077fc1c4811d6b323e709ad83e5a1..ab74074fa631daa7404959e1e05d9d4e7faed1b6 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -106,6 +106,21 @@ tests:
networkPolicy:
disabled: false
dnsServerNamespace: test-dns-namespace
+ asserts:
+ - hasDocuments:
+ count: 1
+ - it: test network policy dnsServerNamespace must be set message
+ set:
+ networkPolicy:
+ disabled: false
+ asserts:
+ - failedTemplate:
+ errorMessage: networkPolicy.dnsServerNamespace must be set
+
+ - it: test network policy should be enabled by default
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-dns-server-namespace
asserts:
- hasDocuments:
count: 1
\ No newline at end of file
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMetaDataMapper.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMetaDataMapper.java
index f81184fc20eb49e375f9d24dd9f5ce68021644c6..2cb772154e77246a41508a0116dd6db7f9cf9cae 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMetaDataMapper.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMetaDataMapper.java
@@ -1,14 +1,11 @@
package de.ozgcloud.eingang.xta;
-import java.math.BigInteger;
-import java.util.Optional;
import java.util.stream.Stream;
import jakarta.xml.bind.JAXBElement;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
-import org.mapstruct.Named;
import eu.osci.ws._2008._05.transport.MsgStatusListType;
import eu.osci.ws._2014._10.transport.MessageMetaData;
@@ -26,19 +23,9 @@ interface XtaMessageMetaDataMapper {
return XtaMessageId.from(id);
}
- @Mapping(target = "moreMessagesAvailable", source = ".", qualifiedByName = "moreMessagesAvailable")
+ @Mapping(target = "moreMessagesAvailable", constant = "false")
XtaMessageMetaDatasAndHeader msgStatusListFromSoap(MsgStatusListTypeAndHeaderResponse statusList);
- @Named("moreMessagesAvailable")
- default boolean moreMessagesAvailable(MsgStatusListTypeAndHeaderResponse statusList) {
- if (statusList.isNoMessageAvailable()) {
- return false;
- }
- return Optional.ofNullable(statusList.getMessageItemsPending())
- .filter(messagesPending -> !BigInteger.ZERO.equals(messagesPending))
- .isPresent();
- }
-
default Stream<XtaMessageMetaData> map(JAXBElement<MsgStatusListType> msgStatusListResponse) {
return msgStatusListResponse.getValue().getMessageMetaData().stream().map(this::fromSoap);
}
diff --git a/xta-adapter/src/main/resources/application.yml b/xta-adapter/src/main/resources/application.yml
index 5344c49bad39993d7f1d151330c73221fff28314..fd1f72982999b468311a1f7ec9faf5cec1b8a67d 100644
--- a/xta-adapter/src/main/resources/application.yml
+++ b/xta-adapter/src/main/resources/application.yml
@@ -6,7 +6,7 @@ logging:
ozgcloud:
xta:
- max-list-elements: 10
+ max-list-elements: 100
keystore:
type: PKCS12
actions:
diff --git a/xta-adapter/src/test/helm/network_policy_test.yaml b/xta-adapter/src/test/helm/network_policy_test.yaml
index 0c21953e21950822c2f58361fd9081a7f0405316..74ac285893aab5f14a2b7abe6e3d5c84fd55033d 100644
--- a/xta-adapter/src/test/helm/network_policy_test.yaml
+++ b/xta-adapter/src/test/helm/network_policy_test.yaml
@@ -27,19 +27,26 @@ release:
namespace: by-helm-test
templates:
- templates/network_policy.yaml
-set:
- networkPolicy:
- dnsServerNamespace: test-dns-namespace
+
tests:
- it: should match apiVersion
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-dns-namespace
asserts:
- isAPIVersion:
of: networking.k8s.io/v1
- it: should match kind
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-dns-namespace
asserts:
- isKind:
of: NetworkPolicy
- it: validate metadata
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-dns-namespace
asserts:
- equal:
path: metadata
@@ -47,6 +54,9 @@ tests:
name: network-policy-xta-adapter
namespace: by-helm-test
- it: validate spec
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-dns-namespace
asserts:
- equal:
path: spec
@@ -135,6 +145,21 @@ tests:
networkPolicy:
disabled: false
dnsServerNamespace: test-dns-namespace
+ asserts:
+ - hasDocuments:
+ count: 1
+ - it: test network policy dnsServerNamespace must be set message
+ set:
+ networkPolicy:
+ disabled: false
+ asserts:
+ - failedTemplate:
+ errorMessage: networkPolicy.dnsServerNamespace must be set
+
+ - it: test network policy should be enabled by default
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-dns-server-namespace
asserts:
- hasDocuments:
count: 1
\ No newline at end of file
diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMetaDataMapperTest.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMetaDataMapperTest.java
index 0b26412b73ffb000e3214c0e73fcddce166f6372..26f1ef8d1c76ea3a17eb9b6031c3df7d5d1e54d9 100644
--- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMetaDataMapperTest.java
+++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMetaDataMapperTest.java
@@ -4,6 +4,7 @@ import static org.assertj.core.api.Assertions.*;
import java.math.BigInteger;
+import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
@@ -14,55 +15,27 @@ class XtaMessageMetaDataMapperTest {
@Spy
private final XtaMessageMetaDataMapper mapper = Mappers.getMapper(XtaMessageMetaDataMapper.class);
+ @DisplayName("msg status list from soap")
@Nested
- class TestMoreMessagesAvailable {
+ class TestMsgStatusListFromSoap {
@Test
- void shouldReturnFalseOnNoMessagesAvailable() {
+ void shouldMap() {
+ var response = MsgStatusListTypeAndHeaderResponseTestFactory.createBuilder().build();
- var response = mapper.moreMessagesAvailable(buildWithNoMessageAvailable());
+ var result = mapper.msgStatusListFromSoap(response);
- assertThat(response).isFalse();
- }
-
- private MsgStatusListTypeAndHeaderResponse buildWithNoMessageAvailable() {
- return MsgStatusListTypeAndHeaderResponseTestFactory.createBuilder().noMessageAvailable(true).build();
- }
-
- @Test
- void shouldReturnFalseOnPendingMessagesNull() {
-
- var response = mapper.moreMessagesAvailable(buildPendingMessagesNull());
-
- assertThat(response).isFalse();
- }
-
- private MsgStatusListTypeAndHeaderResponse buildPendingMessagesNull() {
- return MsgStatusListTypeAndHeaderResponseTestFactory.createBuilder().messageItemsPending(null).build();
+ assertThat(result).isNotNull();
}
+ @DisplayName("should set moreMessagesAvailable to false")
@Test
- void shouldReturnFalseOnNoMessagesPending() {
+ void shouldSetMoreMessagesAvailableToFalse() {
+ var response = MsgStatusListTypeAndHeaderResponseTestFactory.createBuilder().build();
- var response = mapper.moreMessagesAvailable(buildWithoutPendingMessages());
-
- assertThat(response).isFalse();
- }
-
- private MsgStatusListTypeAndHeaderResponse buildWithoutPendingMessages() {
- return MsgStatusListTypeAndHeaderResponseTestFactory.createBuilder().messageItemsPending(null).build();
- }
-
- @Test
- void shouldReturnTrueOnMessagesPending() {
-
- var response = mapper.moreMessagesAvailable(buildWithPendingMessages());
-
- assertThat(response).isTrue();
- }
+ var result = mapper.msgStatusListFromSoap(response);
- private MsgStatusListTypeAndHeaderResponse buildWithPendingMessages() {
- return MsgStatusListTypeAndHeaderResponseTestFactory.createBuilder().messageItemsPending(BigInteger.ONE).build();
+ assertThat(result.isMoreMessagesAvailable()).isFalse();
}
}
}