Skip to content
Snippets Groups Projects
Commit e90912e1 authored by OZG-Cloud Team's avatar OZG-Cloud Team
Browse files

Merge remote-tracking branch 'refs/remotes/origin/master' into... 

Merge remote-tracking branch 'refs/remotes/origin/master' into OZG-6054-Umstellung-auf-Multiple-XTA-Identifier

# Conflicts:
#	xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
parents af0e7b36 303bc9b2
Branches develop
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 237 additions and 3 deletions
fim-adapter/src/test/java/de/ozgcloud/eingang/fim/FimTestConfig.java 0 → 100644
+ 11
− 0
View file @ e90912e1
package de.ozgcloud.eingang.fim;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@EnableAutoConfiguration
@ComponentScan("de.ozgcloud.eingang.fim")
public class FimTestConfig {
}
fim-adapter/src/test/java/de/ozgcloud/eingang/fim/TestNonStandardAdapter.java 0 → 100644
+ 23
− 0
View file @ e90912e1
package de.ozgcloud.eingang.fim;
import org.springframework.stereotype.Service;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import java.util.Optional;
@Service
public class TestNonStandardAdapter extends FimSchemeAdapter {
public FimSchemeIdentifier forIdentifier() {
return FimSchemeIdentifier.fromString("test2");
}
public Optional<String> getNameForElement(final Element element) {
final NodeList nameTags = element.getElementsByTagName("non-standard-name");
if (nameTags.getLength() != 1) {
return Optional.empty();
}
return Optional.ofNullable(nameTags.item(0).getTextContent());
}
}
fim-adapter/src/test/resources/S17000652V1.4_test01.xml 0 → 100644
+ 29
− 0
View file @ e90912e1
<?xml version="1.0" encoding="UTF-8"?>
<!--XML-Beispieldatei von XMLSpy generiert v2024 (x64) (http://www.altova.com)-->
<xfd:fim.S17000652.17000652001004 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xfd="urn:xoev-de:xfall:standard:fim-s17000652_1.4" xsi:schemaLocation="urn:xoev-de:xfall:standard:fim-s17000652_1.4 S17000652V1.4_xfall.xsd">
<xfd:G17003529>
<xfd:G05001479>
<xfd:G05001480>
<xfd:F05002750>d447e43a-5723-4821-a170-cb44d2dbf143</xfd:F05002750>
<xfd:F05002751>2022-08-15T09:30:47</xfd:F05002751>
<xfd:F05002752>fim.S17000652.17000652001004</xfd:F05002752>
<xfd:F05002753>urn:fim:Versammlungsanzeige:1.4</xfd:F05002753>
</xfd:G05001480>
<xfd:G05001481>
<xfd:F05002754>Celle</xfd:F05002754>
<xfd:F05002755>vbe:010550120100</xfd:F05002755>
<xfd:F05002756>Versammlungsbehörde</xfd:F05002756>
</xfd:G05001481>
<xfd:G05001482>
<xfd:F05002754>OSI-Onlinedienst Niedersachsen Versammlungsanzeige</xfd:F05002754>
<xfd:F05002755>vbe:010550120100</xfd:F05002755>
<xfd:F05002756>Engagement- und Hobbyportal</xfd:F05002756>
</xfd:G05001482>
</xfd:G05001479>
<xfd:F17005454>true</xfd:F17005454>
<xfd:F17005455>true</xfd:F17005455>
<xfd:F17005533>String</xfd:F17005533>
</xfd:G17003529>
<xfd:F17009191>true</xfd:F17009191>
<xfd:F17003371>String</xfd:F17003371>
</xfd:fim.S17000652.17000652001004>
fim-adapter/src/test/resources/application-test.yml 0 → 100644
+ 4
− 0
View file @ e90912e1
fim:
schemeLocations:
- src/main/resources/fim-s17000652_1.4/S17000652V1.4_xfall.xsd
- src/test/resources/test2/test2.xsd
\ No newline at end of file
fim-adapter/src/test/resources/test1.xml 0 → 100644
+ 3
− 0
View file @ e90912e1
<?xml version="1.0" encoding="UTF-8"?>
<xs:fim>
</xs:fim>
fim-adapter/src/test/resources/test2.xml 0 → 100644
+ 5
− 0
View file @ e90912e1
<?xml version="1.0" encoding="UTF-8"?>
<xs:fim.S1234 xmlns:xfd="test2" xsi:schemaLocation="test2">
<xs:fim.S1235>Testvalue</xs:fim.S1235>
<xs:fim.S1236>Testvalue 2</xs:fim.S1236>
</xs:fim.S1234>
fim-adapter/src/test/resources/test2/test2.xsd 0 → 100644
+ 9
− 0
View file @ e90912e1
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xfd="test2" xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="test2">
<xs:element name="fim.S1234">
<xs:annotation><xs:documentation><non-standard-name>Test-Fim-Data</non-standard-name></xs:documentation></xs:annotation>
</xs:element>
<xs:element name="fim.S1235">
<xs:annotation><xs:documentation><non-standard-name>Testkey</non-standard-name></xs:documentation></xs:annotation>
</xs:element>
</xs:schema>
\ No newline at end of file
fim-adapter/src/test/resources/test3/Antrag.xml 0 → 100644
+ 29
− 0
View file @ e90912e1
<?xml version="1.0" encoding="UTF-8"?>
<!--XML-Beispieldatei von XMLSpy generiert v2024 (x64) (http://www.altova.com)-->
<xfd:fim.S17000652.17000652001004 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xfd="empty" xsi:schemaLocation="empty">
<xfd:G17003529>
<xfd:G05001479>
<xfd:G05001480>
<xfd:F05002750>d447e43a-5723-4821-a170-cb44d2dbf143</xfd:F05002750>
<xfd:F05002751>2022-08-15T09:30:47</xfd:F05002751>
<xfd:F05002752>fim.S17000652.17000652001004</xfd:F05002752>
<xfd:F05002753>urn:fim:Versammlungsanzeige:1.4</xfd:F05002753>
</xfd:G05001480>
<xfd:G05001481>
<xfd:F05002754>Celle</xfd:F05002754>
<xfd:F05002755>vbe:010550120100</xfd:F05002755>
<xfd:F05002756>Versammlungsbehörde</xfd:F05002756>
</xfd:G05001481>
<xfd:G05001482>
<xfd:F05002754>OSI-Onlinedienst Niedersachsen Versammlungsanzeige</xfd:F05002754>
<xfd:F05002755>vbe:010550120100</xfd:F05002755>
<xfd:F05002756>Engagement- und Hobbyportal</xfd:F05002756>
</xfd:G05001482>
</xfd:G05001479>
<xfd:F17005454>true</xfd:F17005454>
<xfd:F17005455>true</xfd:F17005455>
<xfd:F17005533>String</xfd:F17005533>
</xfd:G17003529>
<xfd:F17009191>true</xfd:F17009191>
<xfd:F17003371>String</xfd:F17003371>
</xfd:fim.S17000652.17000652001004>
fim-adapter/src/test/resources/test3/fim_xtaMetadata.xml 0 → 100644
+ 49
− 0
View file @ e90912e1
a<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope" xmlns:a="http://www.w3.org/2005/08/addressing">
<s:Header>
<a:Action s:mustUnderstand="1">http://www.osci.eu/ws/2008/05/transport/urn/messageTypes/MsgBoxFetchRequest</a:Action>
<h:MsgBoxResponse MsgBoxRequestID="urn:de:xta:messageid:dataport_xta_210:3d280bfa-d790-4865-a6cf-f6656d7be13f" xmlns:h="http://www.osci.eu/ws/2008/05/transport" xmlns="http://www.osci.eu/ws/2008/05/transport" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ItemsPending>0</ItemsPending>
</h:MsgBoxResponse>
<h:MessageMetaData xmlns:h="http://www.osci.eu/ws/2014/10/transport" xmlns="http://www.osci.eu/ws/2014/10/transport">
<DeliveryAttributes>
<InitialSend>2024-03-21T08:56:35.214+01:00</InitialSend>
<Delivery>2024-03-21T08:56:38.417</Delivery>
</DeliveryAttributes>
<Originators>
<Author>
<Identifier type="xoev" name="Dataport" category="Engagement- und Hobbyportal">ehp:010100100000</Identifier>
</Author>
</Originators>
<Destinations>
<Reader>
<Identifier type="xoev" name="L100012.OE.279550874" category="Versammlungsbehörde">vbe:010550120100</Identifier>
</Reader>
</Destinations>
<MsgIdentification>
<MessageID xmlns="http://www.w3.org/2005/08/addressing">urn:de:xta:messageid:dataport_xta_210:3d280bfa-d790-4865-a6cf-f6656d7be13f</MessageID>
</MsgIdentification>
<Qualifier>
<Service>urn:fim:Versammlungsanzeige:1.4</Service>
<BusinessScenario>
<Defined listURI="urn:de:dataport:codeliste:business.scenario" listVersionID="1">
<code xmlns="">FIM_DATA</code>
</Defined>
</BusinessScenario>
<MessageType listURI="urn:de:payloadSchema:elementName" listVersionID="1.0" payloadSchema="urn:xoev-de:xfall:standard:fim-s17000652_1.4">
<code xmlns="">fim.S17000652.17000652001004</code>
<name xmlns="">fim.S17000652.17000652001004</name>
</MessageType>
</Qualifier>
<MsgSize>1738</MsgSize>
</h:MessageMetaData>
</s:Header>
<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<GenericContentContainer xmlns="http://xoev.de/transport/xta/211">
<ContentContainer>
<Message contentType="application/xml" filename="Antrag.xml" size="1738">
<xop:Include href="cid:http://tempuri.org/1/638485107771249372" xmlns:xop="http://www.w3.org/2004/08/xop/include"/>
</Message>
</ContentContainer>
</GenericContentContainer>
</s:Body>
</s:Envelope>
\ No newline at end of file
pom.xml
+ 8
− 2
View file @ e90912e1
......@@ -51,10 +51,11 @@
<module>formcycle-adapter</module>
<module>xta-adapter</module>
<module>enterprise-adapter</module>
<module>fim-adapter</module>
</modules>
<properties>
<vorgang-manager.version>2.7.0</vorgang-manager.version>
<vorgang-manager.version>2.10.0-SNAPSHOT</vorgang-manager.version>
<jsoup.version>1.14.3</jsoup.version>
<xmlschema.version>2.3.0</xmlschema.version>
......@@ -84,6 +85,11 @@
<artifactId>semantik-adapter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>fim-adapter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-interface</artifactId>
......
xta-adapter/pom.xml
+ 4
− 0
View file @ e90912e1
......@@ -42,6 +42,10 @@
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>semantik-adapter</artifactId>
</dependency>
<dependency>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>fim-adapter</artifactId>
</dependency>
<!--mapstruct-->
<dependency>
<groupId>org.mapstruct</groupId>
......
xta-adapter/src/main/helm/templates/_helpers.tpl
+ 18
− 0
View file @ e90912e1
......@@ -59,3 +59,21 @@ helm.sh/chart: {{ include "app.chart" . }}
{{- define "app.serviceAccountName" -}}
{{ printf "%s" ( (.Values.serviceAccount).name | default "xta-adapter-service-account" ) }}
{{- end -}}
{{- define "app.getCustomList" -}}
{{- with (.Values.env).customList -}}
{{- if kindIs "map" . -}}
{{ include "app.dictToList" . }}
{{- else if kindIs "slice" . -}}
{{ . | toYaml }}
{{- end -}}
{{- end -}}
{{- end -}}
{{- define "app.dictToList" -}}
{{- $customList := list -}}
{{- range $key, $value := . -}}
{{- $customList = append $customList (dict "name" $key "value" $value) }}
{{- end -}}
{{- $customList | toYaml -}}
{{- end -}}
\ No newline at end of file
xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml
+ 3
− 0
View file @ e90912e1
......@@ -85,6 +85,9 @@ spec:
- name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName }}_negotiationType
value: {{ (.Values.routing).negotiationType | default "PLAINTEXT" }}
{{- end }}
{{- with include "app.getCustomList" . }}
{{ . | indent 16 }}
{{- end }}
volumeMounts:
- name: bindings
mountPath: "/bindings/ca-certificates/type"
......
xta-adapter/src/test/helm/network_policy_test.yaml
+ 0
− 1
View file @ e90912e1
......@@ -122,7 +122,6 @@ tests:
- ipBlock:
cidr: 1.2.3.4/32
- it: test network policy disabled
set:
networkPolicy:
......
xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
+ 42
− 0
View file @ e90912e1
......@@ -157,3 +157,45 @@ tests:
content:
name: grpc_client_vorgang-manager-vorgang-manager_negotiationType
value: "TLS"
- it: check customList as list
set:
env.customList:
- name: my_test_environment_name
value: "A test value"
- name: test_environment
value: "B test value"
asserts:
- contains:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
name: my_test_environment_name
value: "A test value"
- contains:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
name: test_environment
value: "B test value"
- it: check customList as dict
set:
env.customList:
my_test_environment_name: "A test value"
test_environment: "B test value"
asserts:
- contains:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
name: my_test_environment_name
value: "A test value"
- contains:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
name: test_environment
value: "B test value"
- it: check customList test value is not set by default
asserts:
- notContains:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
name: my_test_environment_name
value: "A test value"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit