Skip to content
Snippets Groups Projects
Commit 10e68fd8 authored by OZGCloud's avatar OZGCloud
Browse files

Merge remote-tracking branch 'origin/master' into OZG-5156-Xdomea-Abhaengigkeit-Ausbauen

# Conflicts:
#	xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaServiceTest.java
parents 331060d1 9290791f
No related branches found
No related tags found
No related merge requests found
...@@ -277,7 +277,7 @@ Void sendFailureMessage() { ...@@ -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>"}""" "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') { if (env.BRANCH_NAME == 'master') {
room = "!iQPAvQIiRwRpNOszjw:matrix.ozg-sh.de" room = "!GjqhmouBtnDbwUkAjx:matrix.ozg-sh.de"
} }
else if (env.BRANCH_NAME == 'release') { else if (env.BRANCH_NAME == 'release') {
room = "!oWZpUGTFsxkJIYNfYg:matrix.ozg-sh.de" room = "!oWZpUGTFsxkJIYNfYg:matrix.ozg-sh.de"
......
...@@ -109,3 +109,18 @@ tests: ...@@ -109,3 +109,18 @@ tests:
asserts: asserts:
- hasDocuments: - hasDocuments:
count: 1 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
package de.ozgcloud.eingang.xta; package de.ozgcloud.eingang.xta;
import java.math.BigInteger;
import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBElement;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mapping; import org.mapstruct.Mapping;
import org.mapstruct.Named;
import eu.osci.ws._2008._05.transport.MsgStatusListType; import eu.osci.ws._2008._05.transport.MsgStatusListType;
import eu.osci.ws._2014._10.transport.MessageMetaData; import eu.osci.ws._2014._10.transport.MessageMetaData;
...@@ -26,19 +23,9 @@ interface XtaMessageMetaDataMapper { ...@@ -26,19 +23,9 @@ interface XtaMessageMetaDataMapper {
return XtaMessageId.from(id); return XtaMessageId.from(id);
} }
@Mapping(target = "moreMessagesAvailable", source = ".", qualifiedByName = "moreMessagesAvailable") @Mapping(target = "moreMessagesAvailable", constant = "false")
XtaMessageMetaDatasAndHeader msgStatusListFromSoap(MsgStatusListTypeAndHeaderResponse statusList); 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) { default Stream<XtaMessageMetaData> map(JAXBElement<MsgStatusListType> msgStatusListResponse) {
return msgStatusListResponse.getValue().getMessageMetaData().stream().map(this::fromSoap); return msgStatusListResponse.getValue().getMessageMetaData().stream().map(this::fromSoap);
} }
......
...@@ -6,7 +6,7 @@ logging: ...@@ -6,7 +6,7 @@ logging:
ozgcloud: ozgcloud:
xta: xta:
max-list-elements: 10 max-list-elements: 100
keystore: keystore:
type: PKCS12 type: PKCS12
actions: actions:
......
...@@ -27,19 +27,26 @@ release: ...@@ -27,19 +27,26 @@ release:
namespace: by-helm-test namespace: by-helm-test
templates: templates:
- templates/network_policy.yaml - templates/network_policy.yaml
tests:
- it: should match apiVersion
set: set:
networkPolicy: networkPolicy:
dnsServerNamespace: test-dns-namespace dnsServerNamespace: test-dns-namespace
tests:
- it: should match apiVersion
asserts: asserts:
- isAPIVersion: - isAPIVersion:
of: networking.k8s.io/v1 of: networking.k8s.io/v1
- it: should match kind - it: should match kind
set:
networkPolicy:
dnsServerNamespace: test-dns-namespace
asserts: asserts:
- isKind: - isKind:
of: NetworkPolicy of: NetworkPolicy
- it: validate metadata - it: validate metadata
set:
networkPolicy:
dnsServerNamespace: test-dns-namespace
asserts: asserts:
- equal: - equal:
path: metadata path: metadata
...@@ -47,6 +54,9 @@ tests: ...@@ -47,6 +54,9 @@ tests:
name: network-policy-xta-adapter name: network-policy-xta-adapter
namespace: by-helm-test namespace: by-helm-test
- it: validate spec - it: validate spec
set:
networkPolicy:
dnsServerNamespace: test-dns-namespace
asserts: asserts:
- equal: - equal:
path: spec path: spec
...@@ -138,3 +148,18 @@ tests: ...@@ -138,3 +148,18 @@ tests:
asserts: asserts:
- hasDocuments: - hasDocuments:
count: 1 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
...@@ -4,6 +4,7 @@ import static org.assertj.core.api.Assertions.*; ...@@ -4,6 +4,7 @@ import static org.assertj.core.api.Assertions.*;
import java.math.BigInteger; import java.math.BigInteger;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
...@@ -14,55 +15,27 @@ class XtaMessageMetaDataMapperTest { ...@@ -14,55 +15,27 @@ class XtaMessageMetaDataMapperTest {
@Spy @Spy
private final XtaMessageMetaDataMapper mapper = Mappers.getMapper(XtaMessageMetaDataMapper.class); private final XtaMessageMetaDataMapper mapper = Mappers.getMapper(XtaMessageMetaDataMapper.class);
@DisplayName("msg status list from soap")
@Nested @Nested
class TestMoreMessagesAvailable { class TestMsgStatusListFromSoap {
@Test @Test
void shouldReturnFalseOnNoMessagesAvailable() { void shouldMap() {
var response = MsgStatusListTypeAndHeaderResponseTestFactory.createBuilder().build();
var response = mapper.moreMessagesAvailable(buildWithNoMessageAvailable()); var result = mapper.msgStatusListFromSoap(response);
assertThat(response).isFalse(); assertThat(result).isNotNull();
}
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();
} }
@DisplayName("should set moreMessagesAvailable to false")
@Test @Test
void shouldReturnFalseOnNoMessagesPending() { void shouldSetMoreMessagesAvailableToFalse() {
var response = MsgStatusListTypeAndHeaderResponseTestFactory.createBuilder().build();
var response = mapper.moreMessagesAvailable(buildWithoutPendingMessages()); var result = mapper.msgStatusListFromSoap(response);
assertThat(response).isFalse();
}
private MsgStatusListTypeAndHeaderResponse buildWithoutPendingMessages() {
return MsgStatusListTypeAndHeaderResponseTestFactory.createBuilder().messageItemsPending(null).build();
}
@Test
void shouldReturnTrueOnMessagesPending() {
var response = mapper.moreMessagesAvailable(buildWithPendingMessages());
assertThat(response).isTrue();
}
private MsgStatusListTypeAndHeaderResponse buildWithPendingMessages() { assertThat(result.isMoreMessagesAvailable()).isFalse();
return MsgStatusListTypeAndHeaderResponseTestFactory.createBuilder().messageItemsPending(BigInteger.ONE).build();
} }
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment