Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move core batch package to new Batch module (#5767) #5783

Merged
merged 3 commits into from
Nov 20, 2023
Merged

Move core batch package to new Batch module (#5767) #5783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15776fd
Move core batch package to new Batch module (#5767)
jkosternl Nov 16, 2023
a03f8a3
Also add to bundle-full and in other places (#5767)
jkosternl Nov 18, 2023
14ced4a
Merge branch 'master' into feature/5767_move-batch-to-module
jkosternl Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions batch/.checkstyle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>

<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
<local-check-config name="Frank!Framework" location="/iaf/checkstyle.xml" type="project" description="">
<additional-data name="protect-config-file" value="false"/>
</local-check-config>
<fileset name="all" enabled="true" check-config-name="Frank!Framework" local="true">
<file-match-pattern match-pattern="." include-pattern="true"/>
</fileset>
</fileset-config>
37 changes: 37 additions & 0 deletions batch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-parent</artifactId>
<version>${revision}</version>
</parent>

<artifactId>ibis-adapterframework-batch</artifactId>
<name>Ibis AdapterFramework support for Batch processing</name>

<dependencies>
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-core</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
0 ...ramework/batch/AbstractRecordHandler.java → ...ramework/batch/AbstractRecordHandler.java
View file
Open in desktop
File renamed without changes.
0 ...ramework/batch/AbstractResultHandler.java → ...ramework/batch/AbstractResultHandler.java
View file
Open in desktop
File renamed without changes.
0 ...ework/batch/BatchFileTransformerPipe.java → ...ework/batch/BatchFileTransformerPipe.java
View file
Open in desktop
File renamed without changes.
0 ...ework/batch/DelphiStringRecordReader.java → ...ework/batch/DelphiStringRecordReader.java
View file
Open in desktop
File renamed without changes.
0 ...atch/DelphiStringRecordReaderFactory.java → ...atch/DelphiStringRecordReaderFactory.java
View file
Open in desktop
File renamed without changes.
0 ...ch/FieldPositionRecordHandlerManager.java → ...ch/FieldPositionRecordHandlerManager.java
View file
Open in desktop
File renamed without changes.
0 ...ch/FixedPositionRecordHandlerManager.java → ...ch/FixedPositionRecordHandlerManager.java
View file
Open in desktop
File renamed without changes.
0 ...dapterframework/batch/IReaderFactory.java → ...dapterframework/batch/IReaderFactory.java
View file
Open in desktop
File renamed without changes.
0 ...dapterframework/batch/IRecordHandler.java → ...dapterframework/batch/IRecordHandler.java
View file
Open in desktop
File renamed without changes.
0 ...ramework/batch/IRecordHandlerManager.java → ...ramework/batch/IRecordHandlerManager.java
View file
Open in desktop
File renamed without changes.
0 ...dapterframework/batch/IResultHandler.java → ...dapterframework/batch/IResultHandler.java
View file
Open in desktop
File renamed without changes.
0 ...ework/batch/InputStreamReaderFactory.java → ...ework/batch/InputStreamReaderFactory.java
View file
Open in desktop
File renamed without changes.
0 ...apterframework/batch/InputfieldsPart.java → ...apterframework/batch/InputfieldsPart.java
View file
Open in desktop
File renamed without changes.
0 ...pterframework/batch/OutputfieldsPart.java → ...pterframework/batch/OutputfieldsPart.java
View file
Open in desktop
File renamed without changes.
0 ...framework/batch/RecordHandlerManager.java → ...framework/batch/RecordHandlerManager.java
View file
Open in desktop
File renamed without changes.
0 ...erframework/batch/RecordHandlingFlow.java → ...erframework/batch/RecordHandlingFlow.java
View file
Open in desktop
File renamed without changes.
0 ...terframework/batch/RecordTransformer.java → ...terframework/batch/RecordTransformer.java
View file
Open in desktop
File renamed without changes.
0 ...pterframework/batch/RecordXml2Sender.java → ...pterframework/batch/RecordXml2Sender.java
View file
Open in desktop
File renamed without changes.
0 ...framework/batch/RecordXmlTransformer.java → ...framework/batch/RecordXmlTransformer.java
View file
Open in desktop
File renamed without changes.
0 ...terframework/batch/Result2Filewriter.java → ...terframework/batch/Result2Filewriter.java
View file
Open in desktop
File renamed without changes.
0 ...rframework/batch/Result2StringWriter.java → ...rframework/batch/Result2StringWriter.java
View file
Open in desktop
File renamed without changes.
0 ...erframework/batch/ResultBlock2Sender.java → ...erframework/batch/ResultBlock2Sender.java
View file
Open in desktop
File renamed without changes.
0 .../adapterframework/batch/ResultWriter.java → .../adapterframework/batch/ResultWriter.java
View file
Open in desktop
File renamed without changes.
0 ...ramework/batch/StreamTransformerPipe.java → ...ramework/batch/StreamTransformerPipe.java
View file
Open in desktop
File renamed without changes.
0 ...mework/jdbc/BatchBlobTransformerPipe.java → ...mework/jdbc/BatchBlobTransformerPipe.java
View file
Open in desktop
File renamed without changes.
0 ...mework/jdbc/BatchClobTransformerPipe.java → ...mework/jdbc/BatchClobTransformerPipe.java
View file
Open in desktop
File renamed without changes.
0 ...mework/jdbc/BatchTransformerPipeBase.java → ...mework/jdbc/BatchTransformerPipeBase.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...pterframework/jdbc/Result2BlobWriter.java → ...pterframework/jdbc/Result2BlobWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
0 ...pterframework/jdbc/Result2ClobWriter.java → ...pterframework/jdbc/Result2ClobWriter.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rframework/jdbc/Result2LobWriterBase.java → ...rframework/jdbc/Result2LobWriterBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 5 additions & 1 deletion bundle-full/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
<groupId>org.ibissource</groupId>
<artifactId>nn-specials</artifactId>
</dependency>
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-batch</artifactId>
</dependency>
</dependencies>

<profiles>
Expand Down Expand Up @@ -65,4 +69,4 @@
</dependencies>
</profile>
</profiles>
</project>
</project>
1 change: 1 addition & 0 deletions core/src/main/java/nl/nn/adapterframework/lifecycle/IbisApplicationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,11 @@
<artifactId>nn-specials</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ibissource</groupId>
<artifactId>ibis-adapterframework-batch</artifactId>
<version>${project.version}</version>
</dependency>


<dependency>
Expand Down Expand Up @@ -1214,6 +1219,7 @@

<module>akamai</module>
<module>aws</module>
<module>batch</module>
jkosternl marked this conversation as resolved.
Show resolved Hide resolved
<module>cmis</module>
<module>aspose</module>
<module>nn-specials</module>
Expand Down
Loading