CB-5400: Restructured batch custom type example; removed deprecated method calls.

Author: polarfish

dbs/payments/payments-add-custom-batch-type/lorem-ipsum-batch-type-service-extension/README.md renamed to dbs/batches/batches-add-custom-batch-upload-type/README.md

@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.backbase.buildingblocks</groupId>
+        <artifactId>backbase-service-extension-starter-parent</artifactId>
+        <version>12.1.0</version>
+    </parent>
+
+    <groupId>com.backbase.dbs.paymentorder</groupId>
+    <artifactId>lorem-ipsum-batch-upload-type-service-extension</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <properties>
+
+        <!-- docker configuration -->
+        <docker.image.name>harbor.backbase.eu/experimental/${project.artifactId}</docker.image.name>
+        <docker.image.tag>${project.version}</docker.image.tag>
+
+        <!-- base image -->
+        <docker.base.tag>DBS-2.20.1</docker.base.tag>
+        <docker.base.name>repo.backbase.com/backbase-docker-releases/payment-order-service</docker.base.name>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.backbase.dbs</groupId>
+                <artifactId>banking-services-bom</artifactId>
+                <version>2.20.1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.backbase.dbs.paymentorder</groupId>
+            <artifactId>payment-order-service</artifactId>
+            <classifier>classes</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

dbs/payments/payments-add-custom-batch-type/batch-type-lorem-ipsum-example.json renamed to dbs/batches/batches-add-custom-batch-upload-type/batch-upload-type-lorem-ipsum-example.json

@@ -3,9 +3,7 @@
 import com.backbase.buildingblocks.presentation.errors.BadRequestException;
 import com.backbase.dbs.payment.batch.config.BatchConfiguration;
 import com.backbase.dbs.payment.batch.model.BatchHeader;
-import com.backbase.dbs.payment.batch.model.BatchHeader.BatchHeaderBuilder;
 import com.backbase.dbs.payment.batch.model.BatchPayment;
-import com.backbase.dbs.payment.batch.model.BatchPayment.BatchPaymentBuilder;
 import com.backbase.dbs.payment.batch.model.BatchUploadHeader;
 import com.backbase.dbs.payment.batch.parser.BatchParseCallback;
 import com.backbase.dbs.payment.batch.parser.DigestBatchParser;
@@ -38,53 +36,53 @@ public String getBatchUploadType() {
     public void parseBatches(InputStream inputStream, BatchParseCallback callback) {
 
         try (JsonParser parser = new JsonFactory().createParser(inputStream)) {
-            callback.onBatchUpload(BatchUploadHeader.builder().batchFileType(LOREM_IPSUM_TYPE).build());
-            BatchHeaderBuilder batchHeaderBuilder = BatchHeader.builder().currency("EUR").batchType("SEPACT");
+            callback.onBatchUpload(new BatchUploadHeader().batchFileType(LOREM_IPSUM_TYPE));
+            BatchHeader batchHeader = new BatchHeader().currency("EUR").batchType("SEPACT");
             parser.nextToken();
             while (parser.nextToken() != JsonToken.END_OBJECT) {
                 switch (parser.getCurrentName()) {
                     case "label":
-                        batchHeaderBuilder.batchName(parser.nextTextValue());
+                        batchHeader.batchName(parser.nextTextValue());
                         break;
                     case "priority":
                         // priority is non-standard field and will be stored in the additions map
-                        batchHeaderBuilder.additions(Collections.singletonMap("priority", parser.nextTextValue()));
+                        batchHeader.additions(Collections.singletonMap("priority", parser.nextTextValue()));
                         break;
                     case "own-account":
-                        batchHeaderBuilder.originatorAccount(parser.nextTextValue());
+                        batchHeader.originatorAccount(parser.nextTextValue());
                         break;
                     case "requested-execution-date":
-                        batchHeaderBuilder.requestedExecutionDate(
+                        batchHeader.requestedExecutionDate(
                             LocalDate.parse(parser.nextTextValue(), DateTimeFormatter.ofPattern("dd/MM/yyyy")));
                         break;
                     case "batch-total-amount":
-                        batchHeaderBuilder.batchTotalAmount(new BigDecimal(parser.nextTextValue()));
+                        batchHeader.batchTotalCreditAmount(new BigDecimal(parser.nextTextValue()));
                         break;
                     case "batch-payments-count":
-                        batchHeaderBuilder.batchPaymentsCount(Integer.valueOf(parser.nextTextValue()));
+                        batchHeader.batchPaymentsCount(Integer.valueOf(parser.nextTextValue()));
                         break;
                     case "payments":
-                        callback.onBatch(batchHeaderBuilder.build());
+                        callback.onBatch(batchHeader);
                         parser.nextToken();
                         while (parser.nextToken() != JsonToken.END_ARRAY) {
-                            BatchPaymentBuilder batchPaymentBuilder = BatchPayment.builder().currency("EUR")
+                            BatchPayment batchPayment = new BatchPayment().currency("EUR")
                                 .location(formatJsonLocation(parser.getCurrentLocation()));
                             while (parser.nextToken() != JsonToken.END_OBJECT) {
                                 switch (parser.getCurrentName()) {
                                     case "counterparty-name":
-                                        batchPaymentBuilder.counterpartyName(parser.nextTextValue());
+                                        batchPayment.counterpartyName(parser.nextTextValue());
                                         break;
                                     case "counterparty-account":
-                                        batchPaymentBuilder.counterpartyAccount(parser.nextTextValue());
+                                        batchPayment.counterpartyAccount(parser.nextTextValue());
                                         break;
                                     case "amount":
-                                        batchPaymentBuilder.amount(new BigDecimal(parser.nextTextValue()));
+                                        batchPayment.amount(new BigDecimal(parser.nextTextValue()));
                                         break;
                                     default:
                                         throw new BadRequestException("Batch is not valid");
                                 }
                             }
-                            callback.onPaymentRecord(batchPaymentBuilder.build());
+                            callback.onPaymentRecord(batchPayment);
                         }
                         callback.onBatchEnd();
                         break;

dbs/payments/payments-add-custom-batch-type/lorem-ipsum-batch-type-service-extension/.gitignore renamed to dbs/batches/batches-add-custom-batch-upload-type/lorem-ipsum-batch-upload-type-service-extension/.gitignore

@@ -50,10 +50,11 @@ public void validate(BatchUploadHeader batchUploadHeader, BatchUploadReport batc
     public void validate(BatchHeader batchHeader, BatchUploadReport batchUploadReport) {
         // add batch order pre-validation logic here
 
-        if (batchHeader.getBatchTotalAmount().compareTo(BigDecimal.ZERO) <= 0) {
+        if (batchHeader.getBatchTotalCreditAmount().compareTo(BigDecimal.ZERO) <= 0) {
             // We do not propagate batch order location because the upload always has one batch order
             batchUploadReport.addError(
-                ErrorFactory.createAmountIsNotPositiveError("batch-total-amount", batchHeader.getBatchTotalAmount()));
+                ErrorFactory.createAmountIsNotPositiveError("batch-total-amount",
+                    batchHeader.getBatchTotalCreditAmount()));
         }
     }