From 15776fd4ba539a194b61f5e949cefc1562d47f8a Mon Sep 17 00:00:00 2001 From: "J. Koster" Date: Thu, 16 Nov 2023 13:38:04 +0100 Subject: [PATCH 1/2] Move core batch package to new Batch module (#5767) --- batch/.checkstyle | 10 +++++ batch/pom.xml | 37 +++++++++++++++++++ .../batch/AbstractRecordHandler.java | 0 .../batch/AbstractResultHandler.java | 0 .../batch/BatchFileTransformerPipe.java | 0 .../batch/DelphiStringRecordReader.java | 0 .../DelphiStringRecordReaderFactory.java | 0 .../FieldPositionRecordHandlerManager.java | 0 .../FixedPositionRecordHandlerManager.java | 0 .../batch/IReaderFactory.java | 0 .../batch/IRecordHandler.java | 0 .../batch/IRecordHandlerManager.java | 0 .../batch/IResultHandler.java | 0 .../batch/InputStreamReaderFactory.java | 0 .../batch/InputfieldsPart.java | 0 .../batch/OutputfieldsPart.java | 0 .../batch/RecordHandlerManager.java | 0 .../batch/RecordHandlingFlow.java | 0 .../batch/RecordTransformer.java | 0 .../batch/RecordXml2Sender.java | 0 .../batch/RecordXmlTransformer.java | 0 .../batch/Result2Filewriter.java | 0 .../batch/Result2StringWriter.java | 0 .../batch/ResultBlock2Sender.java | 0 .../adapterframework/batch/ResultWriter.java | 0 .../batch/StreamTransformerPipe.java | 0 .../jdbc/BatchBlobTransformerPipe.java | 0 .../jdbc/BatchClobTransformerPipe.java | 0 .../jdbc/BatchTransformerPipeBase.java | 0 .../jdbc/Result2BlobWriter.java | 2 +- .../jdbc/Result2ClobWriter.java | 0 .../jdbc/Result2LobWriterBase.java | 2 +- pom.xml | 1 + 33 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 batch/.checkstyle create mode 100644 batch/pom.xml rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/AbstractRecordHandler.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/AbstractResultHandler.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/BatchFileTransformerPipe.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/DelphiStringRecordReader.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/DelphiStringRecordReaderFactory.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/FieldPositionRecordHandlerManager.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/FixedPositionRecordHandlerManager.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/IReaderFactory.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/IRecordHandler.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/IRecordHandlerManager.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/IResultHandler.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/InputStreamReaderFactory.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/InputfieldsPart.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/OutputfieldsPart.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/RecordHandlerManager.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/RecordHandlingFlow.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/RecordTransformer.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/RecordXml2Sender.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/RecordXmlTransformer.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/Result2Filewriter.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/Result2StringWriter.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/ResultBlock2Sender.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/ResultWriter.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/batch/StreamTransformerPipe.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/jdbc/BatchBlobTransformerPipe.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/jdbc/BatchClobTransformerPipe.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/jdbc/BatchTransformerPipeBase.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/jdbc/Result2BlobWriter.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/jdbc/Result2ClobWriter.java (100%) rename {core => batch}/src/main/java/nl/nn/adapterframework/jdbc/Result2LobWriterBase.java (100%) diff --git a/batch/.checkstyle b/batch/.checkstyle new file mode 100644 index 00000000000..6d101973734 --- /dev/null +++ b/batch/.checkstyle @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/batch/pom.xml b/batch/pom.xml new file mode 100644 index 00000000000..2c8b18a3975 --- /dev/null +++ b/batch/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + + org.ibissource + ibis-adapterframework-parent + ${revision} + + + ibis-adapterframework-batch + Ibis AdapterFramework support for Batch processing + + + + org.ibissource + ibis-adapterframework-core + + + org.projectlombok + lombok + + + org.apache.commons + commons-lang3 + + + + org.junit.jupiter + junit-jupiter + test + + + + diff --git a/core/src/main/java/nl/nn/adapterframework/batch/AbstractRecordHandler.java b/batch/src/main/java/nl/nn/adapterframework/batch/AbstractRecordHandler.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/AbstractRecordHandler.java rename to batch/src/main/java/nl/nn/adapterframework/batch/AbstractRecordHandler.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/AbstractResultHandler.java b/batch/src/main/java/nl/nn/adapterframework/batch/AbstractResultHandler.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/AbstractResultHandler.java rename to batch/src/main/java/nl/nn/adapterframework/batch/AbstractResultHandler.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/BatchFileTransformerPipe.java b/batch/src/main/java/nl/nn/adapterframework/batch/BatchFileTransformerPipe.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/BatchFileTransformerPipe.java rename to batch/src/main/java/nl/nn/adapterframework/batch/BatchFileTransformerPipe.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/DelphiStringRecordReader.java b/batch/src/main/java/nl/nn/adapterframework/batch/DelphiStringRecordReader.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/DelphiStringRecordReader.java rename to batch/src/main/java/nl/nn/adapterframework/batch/DelphiStringRecordReader.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/DelphiStringRecordReaderFactory.java b/batch/src/main/java/nl/nn/adapterframework/batch/DelphiStringRecordReaderFactory.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/DelphiStringRecordReaderFactory.java rename to batch/src/main/java/nl/nn/adapterframework/batch/DelphiStringRecordReaderFactory.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/FieldPositionRecordHandlerManager.java b/batch/src/main/java/nl/nn/adapterframework/batch/FieldPositionRecordHandlerManager.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/FieldPositionRecordHandlerManager.java rename to batch/src/main/java/nl/nn/adapterframework/batch/FieldPositionRecordHandlerManager.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/FixedPositionRecordHandlerManager.java b/batch/src/main/java/nl/nn/adapterframework/batch/FixedPositionRecordHandlerManager.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/FixedPositionRecordHandlerManager.java rename to batch/src/main/java/nl/nn/adapterframework/batch/FixedPositionRecordHandlerManager.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/IReaderFactory.java b/batch/src/main/java/nl/nn/adapterframework/batch/IReaderFactory.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/IReaderFactory.java rename to batch/src/main/java/nl/nn/adapterframework/batch/IReaderFactory.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/IRecordHandler.java b/batch/src/main/java/nl/nn/adapterframework/batch/IRecordHandler.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/IRecordHandler.java rename to batch/src/main/java/nl/nn/adapterframework/batch/IRecordHandler.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/IRecordHandlerManager.java b/batch/src/main/java/nl/nn/adapterframework/batch/IRecordHandlerManager.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/IRecordHandlerManager.java rename to batch/src/main/java/nl/nn/adapterframework/batch/IRecordHandlerManager.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/IResultHandler.java b/batch/src/main/java/nl/nn/adapterframework/batch/IResultHandler.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/IResultHandler.java rename to batch/src/main/java/nl/nn/adapterframework/batch/IResultHandler.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/InputStreamReaderFactory.java b/batch/src/main/java/nl/nn/adapterframework/batch/InputStreamReaderFactory.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/InputStreamReaderFactory.java rename to batch/src/main/java/nl/nn/adapterframework/batch/InputStreamReaderFactory.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/InputfieldsPart.java b/batch/src/main/java/nl/nn/adapterframework/batch/InputfieldsPart.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/InputfieldsPart.java rename to batch/src/main/java/nl/nn/adapterframework/batch/InputfieldsPart.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/OutputfieldsPart.java b/batch/src/main/java/nl/nn/adapterframework/batch/OutputfieldsPart.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/OutputfieldsPart.java rename to batch/src/main/java/nl/nn/adapterframework/batch/OutputfieldsPart.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/RecordHandlerManager.java b/batch/src/main/java/nl/nn/adapterframework/batch/RecordHandlerManager.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/RecordHandlerManager.java rename to batch/src/main/java/nl/nn/adapterframework/batch/RecordHandlerManager.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/RecordHandlingFlow.java b/batch/src/main/java/nl/nn/adapterframework/batch/RecordHandlingFlow.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/RecordHandlingFlow.java rename to batch/src/main/java/nl/nn/adapterframework/batch/RecordHandlingFlow.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/RecordTransformer.java b/batch/src/main/java/nl/nn/adapterframework/batch/RecordTransformer.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/RecordTransformer.java rename to batch/src/main/java/nl/nn/adapterframework/batch/RecordTransformer.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/RecordXml2Sender.java b/batch/src/main/java/nl/nn/adapterframework/batch/RecordXml2Sender.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/RecordXml2Sender.java rename to batch/src/main/java/nl/nn/adapterframework/batch/RecordXml2Sender.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/RecordXmlTransformer.java b/batch/src/main/java/nl/nn/adapterframework/batch/RecordXmlTransformer.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/RecordXmlTransformer.java rename to batch/src/main/java/nl/nn/adapterframework/batch/RecordXmlTransformer.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/Result2Filewriter.java b/batch/src/main/java/nl/nn/adapterframework/batch/Result2Filewriter.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/Result2Filewriter.java rename to batch/src/main/java/nl/nn/adapterframework/batch/Result2Filewriter.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/Result2StringWriter.java b/batch/src/main/java/nl/nn/adapterframework/batch/Result2StringWriter.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/Result2StringWriter.java rename to batch/src/main/java/nl/nn/adapterframework/batch/Result2StringWriter.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/ResultBlock2Sender.java b/batch/src/main/java/nl/nn/adapterframework/batch/ResultBlock2Sender.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/ResultBlock2Sender.java rename to batch/src/main/java/nl/nn/adapterframework/batch/ResultBlock2Sender.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/ResultWriter.java b/batch/src/main/java/nl/nn/adapterframework/batch/ResultWriter.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/ResultWriter.java rename to batch/src/main/java/nl/nn/adapterframework/batch/ResultWriter.java diff --git a/core/src/main/java/nl/nn/adapterframework/batch/StreamTransformerPipe.java b/batch/src/main/java/nl/nn/adapterframework/batch/StreamTransformerPipe.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/batch/StreamTransformerPipe.java rename to batch/src/main/java/nl/nn/adapterframework/batch/StreamTransformerPipe.java diff --git a/core/src/main/java/nl/nn/adapterframework/jdbc/BatchBlobTransformerPipe.java b/batch/src/main/java/nl/nn/adapterframework/jdbc/BatchBlobTransformerPipe.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/jdbc/BatchBlobTransformerPipe.java rename to batch/src/main/java/nl/nn/adapterframework/jdbc/BatchBlobTransformerPipe.java diff --git a/core/src/main/java/nl/nn/adapterframework/jdbc/BatchClobTransformerPipe.java b/batch/src/main/java/nl/nn/adapterframework/jdbc/BatchClobTransformerPipe.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/jdbc/BatchClobTransformerPipe.java rename to batch/src/main/java/nl/nn/adapterframework/jdbc/BatchClobTransformerPipe.java diff --git a/core/src/main/java/nl/nn/adapterframework/jdbc/BatchTransformerPipeBase.java b/batch/src/main/java/nl/nn/adapterframework/jdbc/BatchTransformerPipeBase.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/jdbc/BatchTransformerPipeBase.java rename to batch/src/main/java/nl/nn/adapterframework/jdbc/BatchTransformerPipeBase.java diff --git a/core/src/main/java/nl/nn/adapterframework/jdbc/Result2BlobWriter.java b/batch/src/main/java/nl/nn/adapterframework/jdbc/Result2BlobWriter.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/jdbc/Result2BlobWriter.java rename to batch/src/main/java/nl/nn/adapterframework/jdbc/Result2BlobWriter.java index 3d57f21f5c0..7b392156299 100644 --- a/core/src/main/java/nl/nn/adapterframework/jdbc/Result2BlobWriter.java +++ b/batch/src/main/java/nl/nn/adapterframework/jdbc/Result2BlobWriter.java @@ -20,8 +20,8 @@ import nl.nn.adapterframework.batch.IResultHandler; import nl.nn.adapterframework.core.SenderException; -import nl.nn.adapterframework.doc.ReferTo; import nl.nn.adapterframework.dbms.IDbmsSupport; +import nl.nn.adapterframework.doc.ReferTo; import nl.nn.adapterframework.util.JdbcUtil; diff --git a/core/src/main/java/nl/nn/adapterframework/jdbc/Result2ClobWriter.java b/batch/src/main/java/nl/nn/adapterframework/jdbc/Result2ClobWriter.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/jdbc/Result2ClobWriter.java rename to batch/src/main/java/nl/nn/adapterframework/jdbc/Result2ClobWriter.java diff --git a/core/src/main/java/nl/nn/adapterframework/jdbc/Result2LobWriterBase.java b/batch/src/main/java/nl/nn/adapterframework/jdbc/Result2LobWriterBase.java similarity index 100% rename from core/src/main/java/nl/nn/adapterframework/jdbc/Result2LobWriterBase.java rename to batch/src/main/java/nl/nn/adapterframework/jdbc/Result2LobWriterBase.java index 21bbf2fc6f5..f91750ad8bf 100644 --- a/core/src/main/java/nl/nn/adapterframework/jdbc/Result2LobWriterBase.java +++ b/batch/src/main/java/nl/nn/adapterframework/jdbc/Result2LobWriterBase.java @@ -32,8 +32,8 @@ import nl.nn.adapterframework.configuration.ConfigurationException; import nl.nn.adapterframework.core.PipeLineSession; import nl.nn.adapterframework.core.SenderException; -import nl.nn.adapterframework.doc.ReferTo; import nl.nn.adapterframework.dbms.IDbmsSupport; +import nl.nn.adapterframework.doc.ReferTo; import nl.nn.adapterframework.stream.Message; import nl.nn.adapterframework.util.JdbcUtil; import nl.nn.adapterframework.util.SpringUtils; diff --git a/pom.xml b/pom.xml index 9f8ca9454a5..0a94050e054 100644 --- a/pom.xml +++ b/pom.xml @@ -1214,6 +1214,7 @@ akamai aws + batch cmis aspose nn-specials From a03f8a319f962007059aab964a077b8d23801396 Mon Sep 17 00:00:00 2001 From: "J. Koster" Date: Sat, 18 Nov 2023 13:58:52 +0100 Subject: [PATCH 2/2] Also add to bundle-full and in other places (#5767) --- bundle-full/pom.xml | 6 +++++- .../adapterframework/lifecycle/IbisApplicationContext.java | 1 + pom.xml | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/bundle-full/pom.xml b/bundle-full/pom.xml index 6b084f84ec5..de2e3b82f1e 100644 --- a/bundle-full/pom.xml +++ b/bundle-full/pom.xml @@ -35,6 +35,10 @@ org.ibissource nn-specials + + org.ibissource + ibis-adapterframework-batch + @@ -65,4 +69,4 @@ - \ No newline at end of file + diff --git a/core/src/main/java/nl/nn/adapterframework/lifecycle/IbisApplicationContext.java b/core/src/main/java/nl/nn/adapterframework/lifecycle/IbisApplicationContext.java index 519c68f8b73..84c94a47555 100644 --- a/core/src/main/java/nl/nn/adapterframework/lifecycle/IbisApplicationContext.java +++ b/core/src/main/java/nl/nn/adapterframework/lifecycle/IbisApplicationContext.java @@ -256,6 +256,7 @@ private void lookupApplicationModules() { modulesToScanFor.add("ibis-adapterframework-akamai"); modulesToScanFor.add("ibis-adapterframework-aspose"); modulesToScanFor.add("ibis-adapterframework-aws"); + modulesToScanFor.add("ibis-adapterframework-batch"); modulesToScanFor.add("ibis-adapterframework-cmis"); modulesToScanFor.add("ibis-adapterframework-commons"); modulesToScanFor.add("ibis-adapterframework-console-backend"); diff --git a/pom.xml b/pom.xml index 0a94050e054..440cd3a38be 100644 --- a/pom.xml +++ b/pom.xml @@ -273,6 +273,11 @@ nn-specials ${project.version} + + org.ibissource + ibis-adapterframework-batch + ${project.version} +