Skip to content

Commit 5c34a87

Browse files
committed
Implement MDS 2.1
1 parent 1268df4 commit 5c34a87

16 files changed

Lines changed: 806 additions & 176 deletions

File tree

bzst-dip-java-client/pom.xml

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>software.xdev</groupId>
@@ -579,5 +579,36 @@
579579
</plugins>
580580
</reporting>
581581
</profile>
582+
583+
<profile>
584+
<id>generate-records</id>
585+
<build>
586+
<plugins>
587+
<plugin>
588+
<groupId>org.codehaus.mojo</groupId>
589+
<artifactId>jaxb2-maven-plugin</artifactId>
590+
<version>3.3.0</version>
591+
<executions>
592+
<execution>
593+
<id>xjc</id>
594+
<goals>
595+
<goal>xjc</goal>
596+
</goals>
597+
</execution>
598+
</executions>
599+
<configuration>
600+
<sources>
601+
<source>${project.basedir}/src/main/resources/xsd/dip.xsd</source>
602+
<source>${project.basedir}/src/main/resources/xsd/dip-types.xsd</source>
603+
<source>${project.basedir}/src/main/resources/xsd/dipResponse.xsd</source>
604+
</sources>
605+
<outputDirectory>${project.basedir}/src/main/java</outputDirectory>
606+
<packageName>software.xdev.bzst.dip.client.generatedxmls</packageName>
607+
<clearOutputDir>false</clearOutputDir>
608+
</configuration>
609+
</plugin>
610+
</plugins>
611+
</build>
612+
</profile>
582613
</profiles>
583614
</project>

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/model/configuration/BzstDipConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ public enum SupportedApplicationCode
147147
* the portal via Elster) or the BZST number and the associated type (ELSTER or BZSTCERT) are used.
148148
* </p>
149149
* <p>
150-
* See <a href="https://www.bzst.de/SharedDocs/Downloads/DE/EOP_BOP/khb_dip
151-
* .pdf?__blob=publicationFile&v=9">Kommunikationshandbuch DIP-Standard 1.4</a> - Section 5.1.3:
150+
* See <a href="https://www.bzst.de/EN/Service/Portalinformation/Mass_data/DIP/mass_data_dip.html">Kommunikationshandbuch DIP-Standard 2.3</a> - Section 5.1.3:
152151
* </p>
153152
*/
154153
private final String taxNumber;

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/ConsignmentType.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@
3535
* &lt;complexContent&gt;
3636
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
3737
* &lt;sequence&gt;
38-
* &lt;element name="customerIdentifier" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}CustomerIdentifierType"/&gt;
38+
* &lt;element name="customerIdentifier" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}CustomerIdentifierType"/&gt;
3939
* &lt;element name="creationTime" type="{http://www.w3.org/2001/XMLSchema}dateTime"/&gt;
40-
* &lt;element name="transferticketId" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}customTicketIdNumberType"/&gt;
41-
* &lt;element name="referenceId" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}customTicketIdNumberType" minOccurs="0"/&gt;
40+
* &lt;element name="transferticketId" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}customTicketIdNumberType"/&gt;
41+
* &lt;element name="referenceId" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}customTicketIdNumberType" minOccurs="0"/&gt;
4242
* &lt;/sequence&gt;
4343
* &lt;/restriction&gt;
4444
* &lt;/complexContent&gt;
4545
* &lt;/complexType&gt;
4646
* </pre>
4747
*/
4848
@XmlAccessorType(XmlAccessType.FIELD)
49-
@XmlType(name = "ConsignmentType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", propOrder = {
49+
@XmlType(name = "ConsignmentType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", propOrder = {
5050
"customerIdentifier",
5151
"creationTime",
5252
"transferticketId",
@@ -55,14 +55,14 @@
5555
public class ConsignmentType
5656
{
5757

58-
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true)
58+
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true)
5959
protected CustomerIdentifierType customerIdentifier;
60-
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true)
60+
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true)
6161
@XmlSchemaType(name = "dateTime")
6262
protected XMLGregorianCalendar creationTime;
63-
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true)
63+
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true)
6464
protected String transferticketId;
65-
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/")
65+
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/")
6666
protected String referenceId;
6767

6868
/**

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/CustomerIdentifierType.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,26 @@
3333
* &lt;complexContent&gt;
3434
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
3535
* &lt;sequence&gt;
36-
* &lt;element name="identityProvider" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}identityProviderType"/&gt;
37-
* &lt;element name="identifier" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}identifierType"/&gt;
36+
* &lt;element name="identityProvider" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}identityProviderType"/&gt;
37+
* &lt;element name="identifier" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}identifierType"/&gt;
3838
* &lt;/sequence&gt;
3939
* &lt;/restriction&gt;
4040
* &lt;/complexContent&gt;
4141
* &lt;/complexType&gt;
4242
* </pre>
4343
*/
4444
@XmlAccessorType(XmlAccessType.FIELD)
45-
@XmlType(name = "CustomerIdentifierType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", propOrder = {
45+
@XmlType(name = "CustomerIdentifierType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", propOrder = {
4646
"identityProvider",
4747
"identifier"
4848
})
4949
public class CustomerIdentifierType
5050
{
5151

52-
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true)
52+
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true)
5353
@XmlSchemaType(name = "string")
5454
protected IdentityProviderType identityProvider;
55-
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true)
55+
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true)
5656
protected String identifier;
5757

5858
/**

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipBodyType.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@
3535
* &lt;complexContent&gt;
3636
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
3737
* &lt;sequence&gt;
38-
* &lt;element name="consignmentItem" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}ConsignmentItemType" maxOccurs="unbounded"/&gt;
38+
* &lt;element name="consignmentItem" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}ConsignmentItemType" maxOccurs="unbounded"/&gt;
3939
* &lt;/sequence&gt;
4040
* &lt;/restriction&gt;
4141
* &lt;/complexContent&gt;
4242
* &lt;/complexType&gt;
4343
* </pre>
4444
*/
4545
@XmlAccessorType(XmlAccessType.FIELD)
46-
@XmlType(name = "DipBodyType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", propOrder = {
46+
@XmlType(name = "DipBodyType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", propOrder = {
4747
"consignmentItem"
4848
})
4949
public class DipBodyType
5050
{
5151

52-
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true)
52+
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true)
5353
protected List<ConsignmentItemType> consignmentItem;
5454

5555
/**

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/model/DipHeaderType.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,26 @@
3333
* &lt;complexContent&gt;
3434
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
3535
* &lt;sequence&gt;
36-
* &lt;element name="consignment" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}ConsignmentType"/&gt;
37-
* &lt;element name="application" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}ApplicationType"/&gt;
36+
* &lt;element name="consignment" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}ConsignmentType"/&gt;
37+
* &lt;element name="application" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}ApplicationType"/&gt;
3838
* &lt;/sequence&gt;
39-
* &lt;attribute name="environment" use="required" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}environmentType" /&gt;
39+
* &lt;attribute name="environment" use="required" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}environmentType" /&gt;
4040
* &lt;/restriction&gt;
4141
* &lt;/complexContent&gt;
4242
* &lt;/complexType&gt;
4343
* </pre>
4444
*/
4545
@XmlAccessorType(XmlAccessType.FIELD)
46-
@XmlType(name = "DipHeaderType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", propOrder = {
46+
@XmlType(name = "DipHeaderType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", propOrder = {
4747
"consignment",
4848
"application"
4949
})
5050
public class DipHeaderType
5151
{
5252

53-
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true)
53+
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true)
5454
protected ConsignmentType consignment;
55-
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", required = true)
55+
@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", required = true)
5656
protected ApplicationType application;
5757
@XmlAttribute(name = "environment", required = true)
5858
protected EnvironmentType environment;
Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
/*
2+
* Copyright © 2024 XDEV Software (https://xdev.software)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
//
17+
// Diese Datei wurde mit der Eclipse Implementation of JAXB, v3.0.2 generiert
18+
// Siehe https://eclipse-ee4j.github.io/jaxb-ri
19+
// Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren.
20+
// Generiert: 2025.10.29 um 12:56:51 PM CET
21+
//
22+
23+
package software.xdev.bzst.dip.client.xmldocument.model;
24+
25+
import java.util.ArrayList;
26+
import java.util.List;
27+
28+
import jakarta.xml.bind.annotation.XmlAccessType;
29+
import jakarta.xml.bind.annotation.XmlAccessorType;
30+
import jakarta.xml.bind.annotation.XmlElement;
31+
import jakarta.xml.bind.annotation.XmlSchemaType;
32+
import jakarta.xml.bind.annotation.XmlType;
33+
34+
35+
/**
36+
* <p>Java-Klasse für DipProtocolType complex type.
37+
*
38+
* <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
39+
*
40+
* <pre>
41+
* &lt;complexType name="DipProtocolType"&gt;
42+
* &lt;complexContent&gt;
43+
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
44+
* &lt;sequence&gt;
45+
* &lt;element name="consignment" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}ConsignmentType" minOccurs="0"/&gt;
46+
* &lt;element name="processStatus" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}processStatusType"/&gt;
47+
* &lt;element name="dipResult" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}DipResultType" maxOccurs="unbounded" minOccurs="0"/&gt;
48+
* &lt;element name="payloadResult" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}PayloadResultType" maxOccurs="unbounded" minOccurs="0"/&gt;
49+
* &lt;/sequence&gt;
50+
* &lt;/restriction&gt;
51+
* &lt;/complexContent&gt;
52+
* &lt;/complexType&gt;
53+
* </pre>
54+
*
55+
*
56+
*/
57+
@XmlAccessorType(XmlAccessType.FIELD)
58+
@XmlType(name = "DipProtocolType", propOrder = {
59+
"consignment",
60+
"processStatus",
61+
"dipResult",
62+
"payloadResult"
63+
})
64+
public class DipProtocolType
65+
{
66+
67+
protected ConsignmentType consignment;
68+
@XmlElement(required = true)
69+
@XmlSchemaType(name = "string")
70+
protected ProcessStatusType processStatus;
71+
protected List<DipResultType> dipResult;
72+
protected List<PayloadResultType> payloadResult;
73+
74+
/**
75+
* Ruft den Wert der consignment-Eigenschaft ab.
76+
*
77+
* @return possible object is {@link ConsignmentType }
78+
*
79+
*/
80+
public ConsignmentType getConsignment()
81+
{
82+
return this.consignment;
83+
}
84+
85+
/**
86+
* Legt den Wert der consignment-Eigenschaft fest.
87+
*
88+
* @param value allowed object is {@link ConsignmentType }
89+
*
90+
*/
91+
public void setConsignment(final ConsignmentType value)
92+
{
93+
this.consignment = value;
94+
}
95+
96+
/**
97+
* Ruft den Wert der processStatus-Eigenschaft ab.
98+
*
99+
* @return possible object is {@link ProcessStatusType }
100+
*
101+
*/
102+
public ProcessStatusType getProcessStatus()
103+
{
104+
return this.processStatus;
105+
}
106+
107+
/**
108+
* Legt den Wert der processStatus-Eigenschaft fest.
109+
*
110+
* @param value allowed object is {@link ProcessStatusType }
111+
*
112+
*/
113+
public void setProcessStatus(final ProcessStatusType value)
114+
{
115+
this.processStatus = value;
116+
}
117+
118+
/**
119+
* Gets the value of the dipResult property.
120+
*
121+
* <p>
122+
* This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you
123+
* make to
124+
* the returned list will be present inside the Jakarta XML Binding object. This is why there is not a
125+
* <CODE>set</CODE> method for the dipResult property.
126+
*
127+
* <p>
128+
* For example, to add a new item, do as follows:
129+
* <pre>
130+
* getDipResult().add(newItem);
131+
* </pre>
132+
*
133+
*
134+
* <p>
135+
* Objects of the following type(s) are allowed in the list {@link DipResultType }
136+
*
137+
*
138+
*/
139+
public List<DipResultType> getDipResult()
140+
{
141+
if(this.dipResult == null)
142+
{
143+
this.dipResult = new ArrayList<>();
144+
}
145+
return this.dipResult;
146+
}
147+
148+
/**
149+
* Gets the value of the payloadResult property.
150+
*
151+
* <p>
152+
* This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you
153+
* make to
154+
* the returned list will be present inside the Jakarta XML Binding object. This is why there is not a
155+
* <CODE>set</CODE> method for the payloadResult property.
156+
*
157+
* <p>
158+
* For example, to add a new item, do as follows:
159+
* <pre>
160+
* getPayloadResult().add(newItem);
161+
* </pre>
162+
*
163+
*
164+
* <p>
165+
* Objects of the following type(s) are allowed in the list {@link PayloadResultType }
166+
*
167+
*
168+
*/
169+
public List<PayloadResultType> getPayloadResult()
170+
{
171+
if(this.payloadResult == null)
172+
{
173+
this.payloadResult = new ArrayList<>();
174+
}
175+
return this.payloadResult;
176+
}
177+
}

0 commit comments

Comments
 (0)