Support cesop

.run/Run Demo.run.xml → .run/Run Demo CESOP.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Demo" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="software.xdev.Application" />
+  <configuration default="false" name="Run Demo CESOP" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="software.xdev.ApplicationWithCesop" />
     <module name="bzst-dip-java-client-demo" />
     <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
     <extension name="coverage">
@@ -9,11 +9,6 @@
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>
-    <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
-      <option name="credential" />
-      <option name="region" />
-      <option name="useCurrentConnection" value="false" />
-    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

.run/Run Demo DAC7.run.xml

@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run Demo DAC7" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="software.xdev.ApplicationWithDac7" />
+    <module name="bzst-dip-java-client-demo" />
+    <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="software.xdev.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.0
+
+* Now supports the CESOP-Format (and the DAC7-Format).
+
 # 1.0.3
 
 * ReportableSellerCreator can now create "Rechtsträger" like a company.

bzst-dip-java-client-demo/pom.xml

@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>bzst-dip-java-client-root</artifactId>
-		<version>1.0.4-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>bzst-dip-java-client-demo</artifactId>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>

bzst-dip-java-client-demo/src/main/java/software/xdev/ApplicationWithCesop.java

@@ -0,0 +1,140 @@
+package software.xdev;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.UUID;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import software.xdev.bzst.dip.client.BzstDipClient;
+import software.xdev.bzst.dip.client.exception.HttpStatusCodeNotExceptedException;
+import software.xdev.bzst.dip.client.model.configuration.BzstDipConfiguration;
+import software.xdev.bzst.dip.client.model.configuration.BzstDipConfigurationBuilder;
+import software.xdev.bzst.dip.client.model.configuration.BzstDipOecdDocType;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopAccountIdentifier;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopAccountIdentifierTypeEnum;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopAdress;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopAmount;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopDocSpec;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopDocTypeIndicEnum;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopLegalAdressTypeEnum;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopMSCountryCodeTypeEnum;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopMessageTypeEnum;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopMessageTypeIndicEnum;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopName;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopNameTypeEnum;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopPSPIdType;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopPSPIdTypeEnum;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopPSPRole;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopPSPRoleTypeEnum;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopPayerMS;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopPaymentDataBody;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopPaymentMethod;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopPaymentMethodEnum;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopReportedPayee;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopReportedTransaction;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopReportingPSP;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopTAXIdentification;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopTransactionDateType;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopTransactionDateTypeEnum;
+import software.xdev.bzst.dip.client.model.message.cesop.BzstCesopVatId;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipAddressFix;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCompleteResult;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCountryCode;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCurrency;
+
+
+@SuppressWarnings("checkstyle:MagicNumber")
+public final class ApplicationWithCesop
+{
+	private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationWithCesop.class);
+
+	public static void main(final String[] args)
+		throws InterruptedException, HttpStatusCodeNotExceptedException, IOException, DatatypeConfigurationException
+	{
+		final BzstDipConfiguration configuration = createConfiguration();
+		final BzstDipClient bzstDipClient = new BzstDipClient(configuration);
+		final BzstDipCompleteResult bzstDipCompleteResult = bzstDipClient.sendDipAndQueryResult(createMessage());
+		LOGGER.info(
+			"Sending dip message with transfer number {} {}",
+			bzstDipCompleteResult.dataTransferNumber(),
+			bzstDipCompleteResult.isSuccessful() ? "was successful." : "has failed!"
+		);
+	}
+
+	public static BzstDipConfiguration createConfiguration()
+	{
+		return new BzstDipConfigurationBuilder()
+			.setApplicationCode(BzstDipConfiguration.SupportedApplicationCode.CESOP)
+			.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
+			.setTaxID("86095742719")
+			.setTaxNumber("123")
+			.setCertificateKeystoreInputStream(() -> ClassLoader.getSystemClassLoader()
+				.getResourceAsStream("DemoKeystore.jks"))
+			.setCertificateKeystorePassword("test123")
+			.setRealmEnvironmentBaseUrl(BzstDipConfiguration.ENDPOINT_URL_TEST)
+			.setMessageTypeIndicCesop(BzstCesopMessageTypeIndicEnum.CESOP_101)
+			.setReportingPeriod(LocalDate.now())
+			.setDocTypeIndic(BzstDipOecdDocType.OECD_1)
+			.setPlatformOperatorOrganizationName("TestOrg")
+			.setPlatformOperatorPlatformName("TestApp")
+			.setPlatformOperatorAddress(new BzstDipAddressFix("TestCity"))
+			.setTransmittingCountry(BzstDipCountryCode.DE)
+			.setMessageType(BzstCesopMessageTypeEnum.PMT)
+			.setReportingPeriodCesopQuarter(2)
+			.setReportingPeriodCesopYear("2024")
+			.setMessageRefId(UUID.randomUUID().toString())
+			.setTimestamp(ZonedDateTime.parse("2024-05-08T14:02:53Z", DateTimeFormatter.ISO_ZONED_DATE_TIME))
+			.buildAndValidate();
+	}
+
+	public static BzstCesopPaymentDataBody createMessage()
+	{
+		return new BzstCesopPaymentDataBody(
+			new BzstCesopReportingPSP(
+				new BzstCesopPSPIdType(BzstCesopPSPIdTypeEnum.BIC, "TRSYDEFFXXX"),
+				new BzstCesopName(BzstCesopNameTypeEnum.LEGAL, "360 TREASURY SYSTEMS AG")
+			),
+			List.of(
+				new BzstCesopReportedPayee(
+					new BzstCesopName(BzstCesopNameTypeEnum.BUSINESS, "German Company AG"),
+					BzstDipCountryCode.DE,
+					new BzstCesopAdress(
+						BzstCesopLegalAdressTypeEnum.CESOP_303,
+						BzstDipCountryCode.DE,
+						"Beispielstraße 3, 11712 Berlin"),
+					new BzstCesopTAXIdentification(new BzstCesopVatId(
+						BzstCesopMSCountryCodeTypeEnum.DE,
+						"112233445")),
+					new BzstCesopAccountIdentifier(
+						BzstDipCountryCode.DE,
+						BzstCesopAccountIdentifierTypeEnum.IBAN,
+						"DE32503302010298200040"),
+					new BzstCesopReportedTransaction(false, "DE-01-0101",
+						new BzstCesopTransactionDateType(
+							BzstCesopTransactionDateTypeEnum.CESOP_701,
+							ZonedDateTime.parse("2024-03-03T11:53:25Z", DateTimeFormatter.ISO_ZONED_DATE_TIME)),
+						new BzstCesopAmount(BzstDipCurrency.EUR, new BigDecimal("100")),
+						new BzstCesopPaymentMethod(BzstCesopPaymentMethodEnum.BANK_TRANSFER),
+						false,
+						new BzstCesopPayerMS(
+							BzstCesopAccountIdentifierTypeEnum.IBAN,
+							BzstCesopMSCountryCodeTypeEnum.FR),
+						new BzstCesopPSPRole(BzstCesopPSPRoleTypeEnum.MONEY_TRANSFER_OPERATOR)),
+					new BzstCesopDocSpec(BzstCesopDocTypeIndicEnum.CESOP_1, UUID.randomUUID())
+				)
+			)
+		);
+	}
+
+	private ApplicationWithCesop()
+	{
+	}
+}

bzst-dip-java-client-demo/src/main/java/software/xdev/ApplicationWithConfigurationFromProperties.java

@@ -10,7 +10,7 @@
 import software.xdev.bzst.dip.client.model.configuration.BzstDipConfiguration;
 import software.xdev.bzst.dip.client.model.configuration.BzstDipConfigurationBuilder;
 import software.xdev.bzst.dip.client.model.configuration.PropertiesSupplier;
-import software.xdev.bzst.dip.client.model.message.BzstDipCompleteResult;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCompleteResult;
 
 
 @SuppressWarnings("checkstyle:MagicNumber")
@@ -24,7 +24,7 @@ public static void main(final String[] args)
 		final BzstDipConfiguration configuration = createConfigurationFromProperties();
 		final BzstDipClient bzstDipClient = new BzstDipClient(configuration);
 		final BzstDipCompleteResult bzstDipCompleteResult =
-			bzstDipClient.sendDipAndQueryResult(Application.createMessage());
+			bzstDipClient.sendDipAndQueryResult(ApplicationWithDac7.createMessage());
 		LOGGER.info(
 			"Sending dip message with transfer number {} {}",
 			bzstDipCompleteResult.dataTransferNumber(),

bzst-dip-java-client-demo/src/main/java/software/xdev/ApplicationWithCsvInput.java

@@ -14,7 +14,7 @@
 import software.xdev.bzst.dip.client.BzstDipClient;
 import software.xdev.bzst.dip.client.exception.HttpStatusCodeNotExceptedException;
 import software.xdev.bzst.dip.client.model.configuration.BzstDipConfiguration;
-import software.xdev.bzst.dip.client.model.message.BzstDipCompleteResult;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCompleteResult;
 
 
 @SuppressWarnings("checkstyle:MagicNumber")
@@ -25,7 +25,7 @@ public final class ApplicationWithCsvInput
 	public static void main(final String[] args)
 		throws InterruptedException, HttpStatusCodeNotExceptedException, IOException, CsvValidationException
 	{
-		final BzstDipConfiguration configuration = Application.createConfiguration();
+		final BzstDipConfiguration configuration = ApplicationWithDac7.createConfiguration();
 
 		final String csvData = getResourceFileAsString("DemoCsvData.csv");
 

bzst-dip-java-client-demo/src/main/java/software/xdev/Application.java → bzst-dip-java-client-demo/src/main/java/software/xdev/ApplicationWithDac7.java

@@ -14,25 +14,25 @@
 import software.xdev.bzst.dip.client.model.configuration.BzstDipConfigurationBuilder;
 import software.xdev.bzst.dip.client.model.configuration.BzstDipDpiMessageType;
 import software.xdev.bzst.dip.client.model.configuration.BzstDipOecdDocType;
-import software.xdev.bzst.dip.client.model.message.BzstDipAddressFix;
-import software.xdev.bzst.dip.client.model.message.BzstDipCompleteResult;
-import software.xdev.bzst.dip.client.model.message.BzstDipConsiderations;
-import software.xdev.bzst.dip.client.model.message.BzstDipCorrectableReportableSellerType;
-import software.xdev.bzst.dip.client.model.message.BzstDipCountryCode;
-import software.xdev.bzst.dip.client.model.message.BzstDipCurrency;
-import software.xdev.bzst.dip.client.model.message.BzstDipFees;
-import software.xdev.bzst.dip.client.model.message.BzstDipMessage;
-import software.xdev.bzst.dip.client.model.message.BzstDipMonetaryAmount;
-import software.xdev.bzst.dip.client.model.message.BzstDipNumberOfActivities;
-import software.xdev.bzst.dip.client.model.message.BzstDipOecdLegalAddressType;
-import software.xdev.bzst.dip.client.model.message.BzstDipTaxes;
-import software.xdev.bzst.dip.client.model.message.BzstDipTin;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipAddressFix;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCompleteResult;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipConsiderations;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCorrectableReportableSellerType;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCountryCode;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipCurrency;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipFees;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipMessage;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipMonetaryAmount;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipNumberOfActivities;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipOecdLegalAddressType;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipTaxes;
+import software.xdev.bzst.dip.client.model.message.dac7.BzstDipTin;
 
 
 @SuppressWarnings("checkstyle:MagicNumber")
-public final class Application
+public final class ApplicationWithDac7
 {
-	private static final Logger LOGGER = LoggerFactory.getLogger(Application.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationWithDac7.class);
 
 	public static void main(final String[] args)
 		throws InterruptedException, HttpStatusCodeNotExceptedException, IOException
@@ -50,6 +50,7 @@ public static void main(final String[] args)
 	public static BzstDipConfiguration createConfiguration()
 	{
 		return new BzstDipConfigurationBuilder()
+			.setApplicationCode(BzstDipConfiguration.SupportedApplicationCode.DAC7)
 			.setClientId("abcd1234-ab12-ab12-ab12-abcdef123456")
 			.setTaxID("86095742719")
 			.setTaxNumber("123")
@@ -112,7 +113,7 @@ public static BzstDipMessage createMessage()
 		);
 	}
 
-	private Application()
+	private ApplicationWithDac7()
 	{
 	}
 }

bzst-dip-java-client-demo/src/main/resources/app.properties

@@ -4,6 +4,7 @@ environment=TEST
 
 tax.id=123456781011
 tax.number=123456781011
+application.code=
 
 message.type=DPI402
 reporting.period=2023-12-31
@@ -26,3 +27,9 @@ platform.operator.address.street=
 platform.operator.address.building=
 platform.operator.address.suite=
 platform.operator.address.floor=
+transmitting.country=
+message.ref.id=
+reporting.period.cesop.quarter=
+reporting.period.cesop.year=
+timestamp=
+message.type.indic=

bzst-dip-java-client/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>bzst-dip-java-client</artifactId>
-	<version>1.0.4-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>bzst-dip-java-client</name>