Fix pipeline with new schema configuration

Author: lars-xdev

bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/factory/SchemaFactoryExtension.java

@@ -40,7 +40,7 @@ public static SchemaFactory newInstance() throws SAXNotSupportedException, SAXNo
         schemaFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
         schemaFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
         schemaFactory.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
-        schemaFactory.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
+        schemaFactory.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "file");
 
         return schemaFactory;
     }

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

@@ -16,6 +16,7 @@
 package software.xdev.bzst.dip.client.xmldocument;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.GregorianCalendar;
@@ -92,18 +93,20 @@ private ConsignmentItemType createConsignmentItem(
 	) throws DatatypeConfigurationException
 	{
 		final ConsignmentItemType consignmentItem = new ConsignmentItemType();
+		consignmentItem.setConsignmentItemPosition(BigInteger.ZERO);
 		consignmentItem.setData(this.createData(correctableReportableSellerTypes, platformOperatorType));
-		
+
 		return consignmentItem;
 	}
-	
+
 	private ConsignmentItemType createConsignmentItem(
 		final PaymentDataBodyType paymentDataBodyType
 	) throws DatatypeConfigurationException
 	{
 		final ConsignmentItemType consignmentItem = new ConsignmentItemType();
+		consignmentItem.setConsignmentItemPosition(BigInteger.ZERO);
 		consignmentItem.setData(this.createData(paymentDataBodyType));
-		
+
 		return consignmentItem;
 	}
 

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

@@ -225,18 +225,10 @@ private void validateXMLDocument(final String xmlString)
 
 			final Schema schema = factory.newSchema(new Source[]
 				{
-					new StreamSource(this.getClass()
-						.getClassLoader()
-						.getResourceAsStream(XSD_SUBDIRECTORY + "/" + DIP_XSD)),
-					new StreamSource(this.getClass()
-						.getClassLoader()
-						.getResourceAsStream(XSD_SUBDIRECTORY + "/" + ISO_DPI_TYPES_XSD)),
-					new StreamSource(this.getClass()
-						.getClassLoader()
-						.getResourceAsStream(XSD_SUBDIRECTORY + "/" + OECD_DPI_TYPES_XSD)),
-					new StreamSource(this.getClass()
-						.getClassLoader()
-						.getResourceAsStream(XSD_SUBDIRECTORY + "/" + DPI_XML_XSD))
+					createStreamSource(DIP_XSD),
+					createStreamSource(ISO_DPI_TYPES_XSD),
+					createStreamSource(OECD_DPI_TYPES_XSD),
+					createStreamSource(DPI_XML_XSD)
 				});
 
 			final Validator validator = schema.newValidator();
@@ -251,6 +243,15 @@ private void validateXMLDocument(final String xmlString)
 		}
 	}
 
+	private StreamSource createStreamSource(final String xsdFileName)
+	{
+		final String resourcePath = XSD_SUBDIRECTORY + "/" + xsdFileName;
+		return new StreamSource(
+			this.getClass().getClassLoader().getResourceAsStream(resourcePath),
+			this.getClass().getClassLoader().getResource(resourcePath).toExternalForm()
+		);
+	}
+
 	public static XMLGregorianCalendar parseLocalDateToXMLGregorianCalendarDate(final LocalDate localDate)
 	{
 		try

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

@@ -38,7 +38,7 @@
  * </pre>
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ApplicationType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/")
+@XmlType(name = "ApplicationType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/")
 public class ApplicationType
 {
 

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

@@ -16,9 +16,12 @@
 
 package software.xdev.bzst.dip.client.xmldocument.model;
 
+import java.math.BigInteger;
+
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
 import jakarta.xml.bind.annotation.XmlElement;
 import jakarta.xml.bind.annotation.XmlSeeAlso;
 import jakarta.xml.bind.annotation.XmlType;
@@ -34,28 +37,32 @@
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="bopAccountId" type="{http://itzbund.de/ozg/bzst/post/dip/v1/}bopAccountIdType" minOccurs="0"/>
+ *         <element name="bopAccountId" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}bopAccountIdType" minOccurs="0"/>
  *         <element name="data" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
  *       </sequence>
+ *       <attribute name="consignmentItemPosition" type="{http://itzbund.de/ozg/bzst/post/dip/v2/}consignmentItemPositionType" use="required"/>
  *     </restriction>
  *   </complexContent>
  * </complexType>
  * </pre>
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ConsignmentItemType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/", propOrder = {
+@XmlType(name = "ConsignmentItemType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/", propOrder = {
 	"bopAccountId",
 	"data"
 })
 @XmlSeeAlso(DataType.class)
 public class ConsignmentItemType
 {
-	
-	@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/")
+
+	@XmlElement(namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/")
 	protected String bopAccountId;
-	
+
 	@XmlAnyElement(lax = true)
 	protected Object data;
+
+	@XmlAttribute(name = "consignmentItemPosition", required = true)
+	protected BigInteger consignmentItemPosition;
 
 	/**
 	 * Gets the value of the bopAccountId property.
@@ -96,4 +103,24 @@ public void setData(final Object value)
 	{
 		this.data = value;
 	}
+
+	/**
+	 * Gets the value of the consignmentItemPosition property.
+	 *
+	 * @return possible object is {@link BigInteger }
+	 */
+	public BigInteger getConsignmentItemPosition()
+	{
+		return this.consignmentItemPosition;
+	}
+
+	/**
+	 * Sets the value of the consignmentItemPosition property.
+	 *
+	 * @param value allowed object is {@link BigInteger }
+	 */
+	public void setConsignmentItemPosition(final BigInteger value)
+	{
+		this.consignmentItemPosition = value;
+	}
 }

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

@@ -33,7 +33,7 @@
  * </simpleType>
  * </pre>
  */
-@XmlType(name = "environmentType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/")
+@XmlType(name = "environmentType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/")
 @XmlEnum
 public enum EnvironmentType
 {

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

@@ -34,7 +34,7 @@
  * </simpleType>
  * </pre>
  */
-@XmlType(name = "identityProviderType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v1/")
+@XmlType(name = "identityProviderType", namespace = "http://itzbund.de/ozg/bzst/post/dip/v2/")
 @XmlEnum
 public enum IdentityProviderType
 {