From ae61d0ef9a08936ffd616ef34ae848bd38138fa7 Mon Sep 17 00:00:00 2001 From: skin27 Date: Wed, 25 Oct 2023 20:09:34 +0200 Subject: [PATCH 01/58] update to Java 21 --- aggregate/pom.xml | 6 +- aggregate/pom.xml.versionsBackup | 53 --- aleris/pom.xml | 4 +- aleris/pom.xml.versionsBackup | 83 ---- amazon/pom.xml | 4 +- amazon/pom.xml.versionsBackup | 51 --- archive/pom.xml | 4 +- archive/pom.xml.versionsBackup | 51 --- auth/pom.xml | 4 +- auth/pom.xml.versionsBackup | 84 ---- cookies/pom.xml | 4 +- cookies/pom.xml.versionsBackup | 51 --- csvtoxml/pom.xml | 4 +- csvtoxml/pom.xml.versionsBackup | 51 --- docconverter/pom.xml | 4 +- docconverter/pom.xml.versionsBackup | 56 --- edi/pom.xml | 4 +- edi/pom.xml.versionsBackup | 57 --- edifact/pom.xml | 4 +- edifact/pom.xml.versionsBackup | 493 ------------------------ edifactcommon/pom.xml | 6 +- edifactcommon/pom.xml.versionsBackup | 53 --- edifactdotweb/pom.xml | 6 +- edifactdotweb/pom.xml.versionsBackup | 57 --- edifactstandards/pom.xml | 4 +- edifactstandards/pom.xml.versionsBackup | 56 --- encoder/pom.xml | 4 +- encoder/pom.xml.versionsBackup | 51 --- enrich/pom.xml | 6 +- enrich/pom.xml.versionsBackup | 62 --- exceltoxml/pom.xml | 6 +- exceltoxml/pom.xml.versionsBackup | 76 ---- flv/pom.xml | 4 +- flv/pom.xml.versionsBackup | 56 --- fmuta/pom.xml | 6 +- fmuta/pom.xml.versionsBackup | 62 --- formtoxml/pom.xml | 4 +- formtoxml/pom.xml.versionsBackup | 51 --- googledrive/pom.xml | 6 +- googledrive/pom.xml.versionsBackup | 80 ---- hl7/pom.xml | 6 +- hl7/pom.xml.versionsBackup | 65 ---- mail/pom.xml | 4 +- mail/pom.xml.versionsBackup | 106 ----- multipart/pom.xml | 6 +- multipart/pom.xml.versionsBackup | 52 --- oauth2token/pom.xml | 6 +- oauth2token/pom.xml.versionsBackup | 97 ----- oriflame/pom.xml | 6 +- pdf/pom.xml | 4 +- pdf/pom.xml.versionsBackup | 71 ---- pdftotext/pom.xml | 6 +- pdftotext/pom.xml.versionsBackup | 72 ---- pom.xml | 12 +- pom.xml.versionsBackup | 243 ------------ replace/pom.xml | 4 +- replace/pom.xml.versionsBackup | 51 --- sandbox/pom.xml | 6 +- sandbox/pom.xml.versionsBackup | 58 --- simplereplace/pom.xml | 4 +- simplereplace/pom.xml.versionsBackup | 51 --- smb/pom.xml | 4 +- smb/pom.xml.versionsBackup | 56 --- smooksnoxml/pom.xml | 6 +- smooksnoxml/pom.xml.versionsBackup | 88 ----- soap/pom.xml | 4 +- soap/pom.xml.versionsBackup | 80 ---- sql/pom.xml | 4 +- sql/pom.xml.versionsBackup | 70 ---- tenantvariables/pom.xml | 6 +- tenantvariables/pom.xml.versionsBackup | 115 ------ throttling/pom.xml | 4 +- throttling/pom.xml.versionsBackup | 56 --- xmltocsv/pom.xml | 6 +- xmltocsv/pom.xml.versionsBackup | 52 --- xmltoexcel/pom.xml | 4 +- xmltoexcel/pom.xml.versionsBackup | 63 --- xmltojson/pom.xml | 4 +- xmltojson/pom.xml.versionsBackup | 51 --- xmltojsonlegacy/pom.xml | 4 +- 80 files changed, 102 insertions(+), 3233 deletions(-) delete mode 100644 aggregate/pom.xml.versionsBackup delete mode 100644 aleris/pom.xml.versionsBackup delete mode 100644 amazon/pom.xml.versionsBackup delete mode 100644 archive/pom.xml.versionsBackup delete mode 100644 auth/pom.xml.versionsBackup delete mode 100644 cookies/pom.xml.versionsBackup delete mode 100644 csvtoxml/pom.xml.versionsBackup delete mode 100644 docconverter/pom.xml.versionsBackup delete mode 100644 edi/pom.xml.versionsBackup delete mode 100644 edifact/pom.xml.versionsBackup delete mode 100644 edifactcommon/pom.xml.versionsBackup delete mode 100644 edifactdotweb/pom.xml.versionsBackup delete mode 100644 edifactstandards/pom.xml.versionsBackup delete mode 100644 encoder/pom.xml.versionsBackup delete mode 100644 enrich/pom.xml.versionsBackup delete mode 100644 exceltoxml/pom.xml.versionsBackup delete mode 100644 flv/pom.xml.versionsBackup delete mode 100644 fmuta/pom.xml.versionsBackup delete mode 100644 formtoxml/pom.xml.versionsBackup delete mode 100644 googledrive/pom.xml.versionsBackup delete mode 100644 hl7/pom.xml.versionsBackup delete mode 100644 mail/pom.xml.versionsBackup delete mode 100644 multipart/pom.xml.versionsBackup delete mode 100644 oauth2token/pom.xml.versionsBackup delete mode 100644 pdf/pom.xml.versionsBackup delete mode 100644 pdftotext/pom.xml.versionsBackup delete mode 100644 pom.xml.versionsBackup delete mode 100644 replace/pom.xml.versionsBackup delete mode 100644 sandbox/pom.xml.versionsBackup delete mode 100644 simplereplace/pom.xml.versionsBackup delete mode 100644 smb/pom.xml.versionsBackup delete mode 100644 smooksnoxml/pom.xml.versionsBackup delete mode 100644 soap/pom.xml.versionsBackup delete mode 100644 sql/pom.xml.versionsBackup delete mode 100644 tenantvariables/pom.xml.versionsBackup delete mode 100644 throttling/pom.xml.versionsBackup delete mode 100644 xmltocsv/pom.xml.versionsBackup delete mode 100644 xmltoexcel/pom.xml.versionsBackup delete mode 100644 xmltojson/pom.xml.versionsBackup diff --git a/aggregate/pom.xml b/aggregate/pom.xml index 3a8095d1..5de9aff1 100644 --- a/aggregate/pom.xml +++ b/aggregate/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT aggregate UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -40,7 +40,7 @@ - 11 + 21 diff --git a/aggregate/pom.xml.versionsBackup b/aggregate/pom.xml.versionsBackup deleted file mode 100644 index 940ec42d..00000000 --- a/aggregate/pom.xml.versionsBackup +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - aggregate - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/aleris/pom.xml b/aleris/pom.xml index 1fd27590..e5ba6077 100644 --- a/aleris/pom.xml +++ b/aleris/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT aleris @@ -65,7 +65,7 @@ - 11 + 21 diff --git a/aleris/pom.xml.versionsBackup b/aleris/pom.xml.versionsBackup deleted file mode 100644 index 319aec39..00000000 --- a/aleris/pom.xml.versionsBackup +++ /dev/null @@ -1,83 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - aleris - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - com.sun.xml.bind - jaxb-core - 2.3.0.1 - - - javax.xml.bind - jaxb-api - 2.3.1 - - - com.sun.xml.bind - jaxb-impl - 2.3.1 - - - org.javassist - javassist - 3.25.0-GA - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-simple - ${slf4j.version} - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/amazon/pom.xml b/amazon/pom.xml index f9723940..b14b951b 100644 --- a/amazon/pom.xml +++ b/amazon/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT amazon @@ -38,7 +38,7 @@ - 11 + 21 diff --git a/amazon/pom.xml.versionsBackup b/amazon/pom.xml.versionsBackup deleted file mode 100644 index aa927eda..00000000 --- a/amazon/pom.xml.versionsBackup +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - amazon - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/archive/pom.xml b/archive/pom.xml index 34ccaae2..55956457 100644 --- a/archive/pom.xml +++ b/archive/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT archive @@ -38,7 +38,7 @@ - 11 + 21 diff --git a/archive/pom.xml.versionsBackup b/archive/pom.xml.versionsBackup deleted file mode 100644 index 39629843..00000000 --- a/archive/pom.xml.versionsBackup +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - archive - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/auth/pom.xml b/auth/pom.xml index 8a52564c..d2941860 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT auth @@ -64,7 +64,7 @@ - 11 + 21 diff --git a/auth/pom.xml.versionsBackup b/auth/pom.xml.versionsBackup deleted file mode 100644 index 8edbc78f..00000000 --- a/auth/pom.xml.versionsBackup +++ /dev/null @@ -1,84 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - auth - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - com.warrenstrange - googleauth - ${google.auth.version} - - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - - - org.mongodb - mongo-java-driver - ${mongo.version} - - - org.mongodb.morphia - morphia - ${morphia.version} - - - - - javax.xml.bind - jaxb-api - 2.3.0 - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/cookies/pom.xml b/cookies/pom.xml index d7024af3..3d1a2e6e 100644 --- a/cookies/pom.xml +++ b/cookies/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT cookies @@ -38,7 +38,7 @@ - 11 + 21 diff --git a/cookies/pom.xml.versionsBackup b/cookies/pom.xml.versionsBackup deleted file mode 100644 index f97c0b18..00000000 --- a/cookies/pom.xml.versionsBackup +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - cookies - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/csvtoxml/pom.xml b/csvtoxml/pom.xml index ea4da067..ecb9060f 100644 --- a/csvtoxml/pom.xml +++ b/csvtoxml/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT csvtoxml @@ -38,7 +38,7 @@ - 11 + 21 diff --git a/csvtoxml/pom.xml.versionsBackup b/csvtoxml/pom.xml.versionsBackup deleted file mode 100644 index fe31c059..00000000 --- a/csvtoxml/pom.xml.versionsBackup +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - csvtoxml - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/docconverter/pom.xml b/docconverter/pom.xml index 560eff21..f5ee4692 100644 --- a/docconverter/pom.xml +++ b/docconverter/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT docconverter @@ -43,7 +43,7 @@ - 11 + 21 diff --git a/docconverter/pom.xml.versionsBackup b/docconverter/pom.xml.versionsBackup deleted file mode 100644 index bf52351d..00000000 --- a/docconverter/pom.xml.versionsBackup +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - docconverter - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - io.github.assimbly - docconverter - ${docconverter.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/edi/pom.xml b/edi/pom.xml index f98a7d1b..98226d6d 100644 --- a/edi/pom.xml +++ b/edi/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT @@ -44,7 +44,7 @@ - 11 + 21 diff --git a/edi/pom.xml.versionsBackup b/edi/pom.xml.versionsBackup deleted file mode 100644 index 8e265148..00000000 --- a/edi/pom.xml.versionsBackup +++ /dev/null @@ -1,57 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - - edi - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.assimbly - smooksnoxml - ${project.parent.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/edifact/pom.xml b/edifact/pom.xml index fcf6bb0f..f6b77cd1 100644 --- a/edifact/pom.xml +++ b/edifact/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT @@ -479,7 +479,7 @@ - 11 + 21 diff --git a/edifact/pom.xml.versionsBackup b/edifact/pom.xml.versionsBackup deleted file mode 100644 index bc327631..00000000 --- a/edifact/pom.xml.versionsBackup +++ /dev/null @@ -1,493 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - - edifact - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - jaxen - jaxen - ${jaxen.version} - - - org.milyn - milyn-smooks-all - ${smooks.version} - - - org.milyn.edi.unedifact - d00a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d00a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d00b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d00b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d01a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d01a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d01b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d01b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d01c-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d01c-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d02a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d02a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d02b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d02b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d03a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d03a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d03b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d03b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d04a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d04a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d04b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d04b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d05a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d05a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d05b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d05b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d06a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d06a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d06b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d06b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d07b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d07b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d08a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d08a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d08b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d08b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d09a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d09a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d09b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d09b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d10a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d10a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d10b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d10b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d11a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d11a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d11b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d11b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d12a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d12a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d12b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d12b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d13a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d13a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d13b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d13b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d14a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d14a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d14b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d14b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d93a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d93a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d94a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d94a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d94b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d94b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d95a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d95a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d95b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d95b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d96a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d96a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d96b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d96b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d97a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d97a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d97b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d97b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d98a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d98a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d98b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d98b-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d99a-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d99a-binding - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d99b-mapping - ${smooks-fragments.version} - - - org.milyn.edi.unedifact - d99b-binding - ${smooks-fragments.version} - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/edifactcommon/pom.xml b/edifactcommon/pom.xml index 7b55fdbe..dcd577dc 100644 --- a/edifactcommon/pom.xml +++ b/edifactcommon/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT @@ -12,7 +12,7 @@ UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -40,7 +40,7 @@ - 11 + 21 diff --git a/edifactcommon/pom.xml.versionsBackup b/edifactcommon/pom.xml.versionsBackup deleted file mode 100644 index 3a610f7c..00000000 --- a/edifactcommon/pom.xml.versionsBackup +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - - edifactcommon - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/edifactdotweb/pom.xml b/edifactdotweb/pom.xml index ac37df20..404fc221 100644 --- a/edifactdotweb/pom.xml +++ b/edifactdotweb/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT edifactdotweb UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -44,7 +44,7 @@ - 11 + 21 diff --git a/edifactdotweb/pom.xml.versionsBackup b/edifactdotweb/pom.xml.versionsBackup deleted file mode 100644 index bc684d85..00000000 --- a/edifactdotweb/pom.xml.versionsBackup +++ /dev/null @@ -1,57 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - edifactdotweb - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.assimbly - edifactcommon - ${project.parent.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/edifactstandards/pom.xml b/edifactstandards/pom.xml index 8877b3c5..bae66e4a 100644 --- a/edifactstandards/pom.xml +++ b/edifactstandards/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT edifactstandards @@ -43,7 +43,7 @@ - 11 + 21 diff --git a/edifactstandards/pom.xml.versionsBackup b/edifactstandards/pom.xml.versionsBackup deleted file mode 100644 index db393a14..00000000 --- a/edifactstandards/pom.xml.versionsBackup +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - edifactstandards - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.assimbly - edifactcommon - ${project.parent.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/encoder/pom.xml b/encoder/pom.xml index 7c5e1bb4..a2f8e4ff 100644 --- a/encoder/pom.xml +++ b/encoder/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT encoder @@ -38,7 +38,7 @@ - 11 + 21 diff --git a/encoder/pom.xml.versionsBackup b/encoder/pom.xml.versionsBackup deleted file mode 100644 index a10dc226..00000000 --- a/encoder/pom.xml.versionsBackup +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - encoder - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/enrich/pom.xml b/enrich/pom.xml index 8df4367b..80a03662 100644 --- a/enrich/pom.xml +++ b/enrich/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT enrich UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -49,7 +49,7 @@ - 11 + 21 diff --git a/enrich/pom.xml.versionsBackup b/enrich/pom.xml.versionsBackup deleted file mode 100644 index 17e3f123..00000000 --- a/enrich/pom.xml.versionsBackup +++ /dev/null @@ -1,62 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - enrich - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.assimbly - activemq-base - ${assimbly.version} - - - org.assimbly - aggregate - ${assimbly.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/exceltoxml/pom.xml b/exceltoxml/pom.xml index e4e0b750..cd1be9b3 100644 --- a/exceltoxml/pom.xml +++ b/exceltoxml/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT exceltoxml UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -51,7 +51,7 @@ - 11 + 21 diff --git a/exceltoxml/pom.xml.versionsBackup b/exceltoxml/pom.xml.versionsBackup deleted file mode 100644 index 5fa55b00..00000000 --- a/exceltoxml/pom.xml.versionsBackup +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - exceltoxml - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - org.apache.poi - poi - ${poi.version} - - - org.apache.poi - poi-ooxml - ${poi.version} - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - org.apache.maven.plugins - 2.6 - maven-resources-plugin - - UTF-8 - - xlsx - - - - - - - diff --git a/flv/pom.xml b/flv/pom.xml index d5881fee..7aa98d16 100644 --- a/flv/pom.xml +++ b/flv/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT flv @@ -43,7 +43,7 @@ - 11 + 21 diff --git a/flv/pom.xml.versionsBackup b/flv/pom.xml.versionsBackup deleted file mode 100644 index 60169e8e..00000000 --- a/flv/pom.xml.versionsBackup +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - flv - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.assimbly - smooksnoxml - ${project.parent.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/fmuta/pom.xml b/fmuta/pom.xml index 6b63cd4c..35e0fc3e 100644 --- a/fmuta/pom.xml +++ b/fmuta/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT fmuta UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -49,7 +49,7 @@ - 11 + 21 diff --git a/fmuta/pom.xml.versionsBackup b/fmuta/pom.xml.versionsBackup deleted file mode 100644 index 98f458be..00000000 --- a/fmuta/pom.xml.versionsBackup +++ /dev/null @@ -1,62 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - fmuta - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-simple - ${slf4j.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/formtoxml/pom.xml b/formtoxml/pom.xml index 930976ac..46a62513 100644 --- a/formtoxml/pom.xml +++ b/formtoxml/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT formtoxml @@ -38,7 +38,7 @@ - 11 + 21 diff --git a/formtoxml/pom.xml.versionsBackup b/formtoxml/pom.xml.versionsBackup deleted file mode 100644 index 25f7cd89..00000000 --- a/formtoxml/pom.xml.versionsBackup +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - formtoxml - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/googledrive/pom.xml b/googledrive/pom.xml index b1d1c0b8..10556b18 100644 --- a/googledrive/pom.xml +++ b/googledrive/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT googledrive UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -63,7 +63,7 @@ - 11 + 21 diff --git a/googledrive/pom.xml.versionsBackup b/googledrive/pom.xml.versionsBackup deleted file mode 100644 index cea6cfc3..00000000 --- a/googledrive/pom.xml.versionsBackup +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - googledrive - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - com.google.apis - google-api-services-drive - ${google.api.version} - - - - com.google.oauth-client - google-oauth-client - ${google.oauth.version} - - - - com.google.oauth-client - google-oauth-client-jetty - ${google.oauth.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - org.apache.maven.plugins - 2.6 - maven-resources-plugin - - UTF-8 - - xlsx - - - - - - - diff --git a/hl7/pom.xml b/hl7/pom.xml index 9a609fcf..8505b472 100644 --- a/hl7/pom.xml +++ b/hl7/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT hl7 UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -52,7 +52,7 @@ - 11 + 21 diff --git a/hl7/pom.xml.versionsBackup b/hl7/pom.xml.versionsBackup deleted file mode 100644 index 018dc51d..00000000 --- a/hl7/pom.xml.versionsBackup +++ /dev/null @@ -1,65 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - hl7 - - - UTF-8 - 11 - file:///${project.basedir}/../baseModule/src/main/resources/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - org.slf4j - log4j-over-slf4j - ${slf4j.version} - - - - ca.uhn.hapi - hapi-base - ${hapi.version} - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - \ No newline at end of file diff --git a/mail/pom.xml b/mail/pom.xml index af97a635..c2548117 100644 --- a/mail/pom.xml +++ b/mail/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT mail @@ -93,7 +93,7 @@ - 11 + 21 diff --git a/mail/pom.xml.versionsBackup b/mail/pom.xml.versionsBackup deleted file mode 100644 index 6ff8eefa..00000000 --- a/mail/pom.xml.versionsBackup +++ /dev/null @@ -1,106 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - mail - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - com.sun.mail - javax.mail - ${javax.version} - - - - javax.activation - activation - - - - - - ${project.groupId} - enrich - ${project.version} - - - ${project.groupId} - globalvariables - ${project.version} - - - org.mongodb - mongo-java-driver - ${mongo.version} - - - org.mongodb.morphia - morphia - ${morphia.version} - - - - - org.apache.camel - camel-test-blueprint - 2.23.4 - test - - - org.skyscreamer - jsonassert - ${skyscreamer.version} - - - com.vaadin.external.google - android-json - - - test - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/multipart/pom.xml b/multipart/pom.xml index 104a4eab..4a614d25 100644 --- a/multipart/pom.xml +++ b/multipart/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT multipart UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -39,7 +39,7 @@ - 11 + 21 diff --git a/multipart/pom.xml.versionsBackup b/multipart/pom.xml.versionsBackup deleted file mode 100644 index 203caaa6..00000000 --- a/multipart/pom.xml.versionsBackup +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - multipart - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/oauth2token/pom.xml b/oauth2token/pom.xml index 030c723d..4bdf8e2b 100644 --- a/oauth2token/pom.xml +++ b/oauth2token/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT oauth2token UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -84,7 +84,7 @@ - 11 + 21 diff --git a/oauth2token/pom.xml.versionsBackup b/oauth2token/pom.xml.versionsBackup deleted file mode 100644 index dde2b473..00000000 --- a/oauth2token/pom.xml.versionsBackup +++ /dev/null @@ -1,97 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - oauth2token - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - ${project.groupId} - globalvariables - ${project.version} - - - ${project.groupId} - auth - ${project.version} - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - - org.mongodb - mongo-java-driver - ${mongo.version} - - - org.mongodb.morphia - morphia - ${morphia.version} - - - - org.slf4j - log4j-over-slf4j - 1.7.36 - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/oriflame/pom.xml b/oriflame/pom.xml index 978b4edc..f29fa65a 100644 --- a/oriflame/pom.xml +++ b/oriflame/pom.xml @@ -6,14 +6,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT oriflame UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -46,7 +46,7 @@ - 11 + 21 diff --git a/pdf/pom.xml b/pdf/pom.xml index a3413b60..2bea045d 100644 --- a/pdf/pom.xml +++ b/pdf/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT pdf @@ -58,7 +58,7 @@ - 11 + 21 diff --git a/pdf/pom.xml.versionsBackup b/pdf/pom.xml.versionsBackup deleted file mode 100644 index 837de078..00000000 --- a/pdf/pom.xml.versionsBackup +++ /dev/null @@ -1,71 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - pdf - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.apache.pdfbox - pdfbox - ${pdfbox.version} - - - org.bouncycastle - bcprov-jdk15on - ${bouncycastle.version} - - - org.bouncycastle - bcmail-jdk15on - ${bouncycastle.version} - - - org.bouncycastle - bcpkix-jdk15on - ${bouncycastle.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/pdftotext/pom.xml b/pdftotext/pom.xml index b2c79572..1f9bac46 100644 --- a/pdftotext/pom.xml +++ b/pdftotext/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT pdftotext UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -59,7 +59,7 @@ - 11 + 21 diff --git a/pdftotext/pom.xml.versionsBackup b/pdftotext/pom.xml.versionsBackup deleted file mode 100644 index dd260a44..00000000 --- a/pdftotext/pom.xml.versionsBackup +++ /dev/null @@ -1,72 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - pdftotext - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.apache.pdfbox - pdfbox - ${pdfbox.version} - - - org.bouncycastle - bcprov-jdk15on - ${bouncycastle.version} - - - org.bouncycastle - bcmail-jdk15on - ${bouncycastle.version} - - - org.bouncycastle - bcpkix-jdk15on - ${bouncycastle.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 39487b17..40906473 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ custom-components https://www.org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT aggregate @@ -64,8 +64,8 @@ - 11 - 11 + 21 + 21 UTF-8 ${project.basedir} file:///${project.basedir}/rules.xml @@ -198,7 +198,7 @@ - 11 + 21 @@ -237,8 +237,8 @@ org.apache.maven.plugins maven-compiler-plugin - 11 - 11 + 21 + 21 diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup deleted file mode 100644 index bd0890f8..00000000 --- a/pom.xml.versionsBackup +++ /dev/null @@ -1,243 +0,0 @@ - - - 4.0.0 - - org.assimbly - custom-components - pom - custom-components - https://www.org.assimbly - - 4.0.0-SNAPSHOT - - - aggregate - aleris - amazon - archive - auth - cookies - csvtoxml - docconverter - edi - edifact - edifactcommon - edifactdotweb - edifactstandards - encoder - enrich - exceltoxml - flv - fmuta - formtoxml - globalvariables - googledrive - hl7 - mail - multipart - oauth2token - pdf - pdftotext - replace - sandbox - simplereplace - smb - smooksnoxml - soap - sql - throttling - xmltocsv - xmltoexcel - xmltojson - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - 11 - 11 - UTF-8 - ${project.basedir} - - 1.2.20 - 4.0.0-SNAPSHOT - 1.70 - 1.9.26 - 3.5.5 - 1.7.1 - v3-rev197-1.25.0 - 1.5.0 - 1.34.1 - 2.3 - 4.5.14 - 4.5.14 - 1.2.0 - 1.6.2 - 2.1.34 - 0.8.0 - 0.8.9 - 3.12.13 - 1.3.2 - 1.6.1 - 6.0.0 - 2.0.28 - 5.2.3 - 1.5.3 - 9.7.0-21 - 1.7.1 - 1.7.1.0 - 1.5.1 - 1.7.36 - 1.16 - 1.6.3 - 1.6 - - - - - - org.assimbly - camel-base - ${assimbly.version} - - - org.assimbly - common-base - ${assimbly.version} - - - org.assimbly - utils - ${assimbly.version} - - - org.assimbly - test-base - ${assimbly.version} - test - - - - org.apache.james - apache-mime4j-core - ${mime4j.version} - - - - org.apache.httpcomponents - httpclient-osgi - ${httpcomponents.version} - - - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.8.1 - - - - dependency-updates-report - plugin-updates-report - property-updates-report - - - - - - - - - - - - - maven-clean-plugin - 3.2.0 - - - - maven-resources-plugin - 3.3.0 - - - maven-compiler-plugin - 3.10.1 - - - maven-toolchains-plugin - 3.1.0 - - - - toolchain - - - - - 11 - - - - - - - - maven-surefire-plugin - 2.22.2 - - - maven-jar-plugin - 3.3.0 - - - maven-install-plugin - 3.1.0 - - - maven-deploy-plugin - 3.0.0 - - - - maven-site-plugin - 3.9.1 - - - maven-project-info-reports-plugin - 3.4.1 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 11 - 11 - - - - - - - \ No newline at end of file diff --git a/replace/pom.xml b/replace/pom.xml index 33f57703..8a238e30 100644 --- a/replace/pom.xml +++ b/replace/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT replace @@ -38,7 +38,7 @@ - 11 + 21 diff --git a/replace/pom.xml.versionsBackup b/replace/pom.xml.versionsBackup deleted file mode 100644 index eeb92c1d..00000000 --- a/replace/pom.xml.versionsBackup +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - replace - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/sandbox/pom.xml b/sandbox/pom.xml index e226cbd1..89822938 100644 --- a/sandbox/pom.xml +++ b/sandbox/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT sandbox UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -45,7 +45,7 @@ - 11 + 21 diff --git a/sandbox/pom.xml.versionsBackup b/sandbox/pom.xml.versionsBackup deleted file mode 100644 index 760753aa..00000000 --- a/sandbox/pom.xml.versionsBackup +++ /dev/null @@ -1,58 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - sandbox - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/simplereplace/pom.xml b/simplereplace/pom.xml index 55eb32de..8ce4084b 100644 --- a/simplereplace/pom.xml +++ b/simplereplace/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT simplereplace @@ -38,7 +38,7 @@ - 11 + 21 diff --git a/simplereplace/pom.xml.versionsBackup b/simplereplace/pom.xml.versionsBackup deleted file mode 100644 index b6643db7..00000000 --- a/simplereplace/pom.xml.versionsBackup +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - simplereplace - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/smb/pom.xml b/smb/pom.xml index 04be0266..37b089d1 100644 --- a/smb/pom.xml +++ b/smb/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT smb @@ -43,7 +43,7 @@ - 11 + 21 diff --git a/smb/pom.xml.versionsBackup b/smb/pom.xml.versionsBackup deleted file mode 100644 index 67d85d6b..00000000 --- a/smb/pom.xml.versionsBackup +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - smb - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.codelibs - jcifs - ${jcifs.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/smooksnoxml/pom.xml b/smooksnoxml/pom.xml index e2b13e07..a8af9cb3 100644 --- a/smooksnoxml/pom.xml +++ b/smooksnoxml/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT smooksnoxml UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -75,7 +75,7 @@ - 11 + 21 diff --git a/smooksnoxml/pom.xml.versionsBackup b/smooksnoxml/pom.xml.versionsBackup deleted file mode 100644 index 9250467b..00000000 --- a/smooksnoxml/pom.xml.versionsBackup +++ /dev/null @@ -1,88 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - smooksnoxml - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - org.milyn - milyn-smooks-all - ${smooks.version} - - - javax.servlet - servlet-api - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/soap/pom.xml b/soap/pom.xml index dee4d19e..6ac8b5b7 100644 --- a/soap/pom.xml +++ b/soap/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT soap @@ -67,7 +67,7 @@ - 11 + 21 diff --git a/soap/pom.xml.versionsBackup b/soap/pom.xml.versionsBackup deleted file mode 100644 index 2e6c21fc..00000000 --- a/soap/pom.xml.versionsBackup +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - soap - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.assimbly - auth - ${project.parent.version} - - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - wsdl4j - wsdl4j - ${wsdl4j.version} - - - - org.apache.felix - org.apache.felix.configadmin - ${config-admin.version} - - - - com.sun.xml.messaging.saaj - saaj-impl - ${saaj-impl.version} - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/sql/pom.xml b/sql/pom.xml index d6f41c30..9fb276ee 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT sql @@ -57,7 +57,7 @@ - 11 + 21 diff --git a/sql/pom.xml.versionsBackup b/sql/pom.xml.versionsBackup deleted file mode 100644 index e795f74b..00000000 --- a/sql/pom.xml.versionsBackup +++ /dev/null @@ -1,70 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - sql - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - org.assimbly - database-drivers - ${assimbly.version} - - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/tenantvariables/pom.xml b/tenantvariables/pom.xml index dea2fd31..654911ff 100644 --- a/tenantvariables/pom.xml +++ b/tenantvariables/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT tenantvariables UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -104,7 +104,7 @@ - 11 + 21 diff --git a/tenantvariables/pom.xml.versionsBackup b/tenantvariables/pom.xml.versionsBackup deleted file mode 100644 index 9937a143..00000000 --- a/tenantvariables/pom.xml.versionsBackup +++ /dev/null @@ -1,115 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - globalvariables - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.abstractj.kalium - kalium - ${kalium.version} - - - - org.mongodb - mongo-java-driver - ${mongo.version} - - - - dev.morphia.morphia - core - ${morpia-core.version} - - - - - - com.muquit.libsodiumjna - libsodium-jna - 1.0.4 - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - - - - - org.slf4j - log4j-over-slf4j - 1.7.36 - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/throttling/pom.xml b/throttling/pom.xml index 2af0bc2d..417098e8 100644 --- a/throttling/pom.xml +++ b/throttling/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT throttling @@ -43,7 +43,7 @@ - 11 + 21 diff --git a/throttling/pom.xml.versionsBackup b/throttling/pom.xml.versionsBackup deleted file mode 100644 index 284d86c2..00000000 --- a/throttling/pom.xml.versionsBackup +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - throttling - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.assimbly - activemq-base - ${assimbly.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/xmltocsv/pom.xml b/xmltocsv/pom.xml index 2249bb86..e6bbec6b 100644 --- a/xmltocsv/pom.xml +++ b/xmltocsv/pom.xml @@ -4,14 +4,14 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT xmltocsv UTF-8 - 11 + 21 file:///${project.basedir}/../rules.xml @@ -39,7 +39,7 @@ - 11 + 21 diff --git a/xmltocsv/pom.xml.versionsBackup b/xmltocsv/pom.xml.versionsBackup deleted file mode 100644 index 6bd7705b..00000000 --- a/xmltocsv/pom.xml.versionsBackup +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - xmltocsv - - - UTF-8 - 11 - file:///${project.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/xmltoexcel/pom.xml b/xmltoexcel/pom.xml index 3d98bbea..5c6887e4 100644 --- a/xmltoexcel/pom.xml +++ b/xmltoexcel/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT xmltoexcel @@ -62,7 +62,7 @@ - 11 + 21 diff --git a/xmltoexcel/pom.xml.versionsBackup b/xmltoexcel/pom.xml.versionsBackup deleted file mode 100644 index fd5cfa02..00000000 --- a/xmltoexcel/pom.xml.versionsBackup +++ /dev/null @@ -1,63 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - xmltoexcel - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - org.apache.poi - poi - ${poi.version} - - - org.apache.poi - poi-ooxml - ${poi.version} - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/xmltojson/pom.xml b/xmltojson/pom.xml index 82812cad..8cd2acc4 100644 --- a/xmltojson/pom.xml +++ b/xmltojson/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT xmltojson @@ -38,7 +38,7 @@ - 11 + 21 diff --git a/xmltojson/pom.xml.versionsBackup b/xmltojson/pom.xml.versionsBackup deleted file mode 100644 index 589a2906..00000000 --- a/xmltojson/pom.xml.versionsBackup +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 4.0.0-SNAPSHOT - - - xmltojson - - - UTF-8 - file:///${project.parent.basedir}/rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 11 - - - - - - - - - - diff --git a/xmltojsonlegacy/pom.xml b/xmltojsonlegacy/pom.xml index bfbbebcc..bd9a2e2a 100644 --- a/xmltojsonlegacy/pom.xml +++ b/xmltojsonlegacy/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT xmltojsonlegacy @@ -38,7 +38,7 @@ - 11 + 21 From a42aa29c93fe422819cbd098d450d4ed9609876e Mon Sep 17 00:00:00 2001 From: skin27 Date: Wed, 25 Oct 2023 20:32:38 +0200 Subject: [PATCH 02/58] update dependencies --- aleris/pom.xml | 10 ---------- oauth2token/pom.xml | 16 ---------------- pom.xml | 24 +++++++++--------------- tenantvariables/pom.xml | 4 ++-- 4 files changed, 11 insertions(+), 43 deletions(-) diff --git a/aleris/pom.xml b/aleris/pom.xml index e5ba6077..5e9e8b0b 100644 --- a/aleris/pom.xml +++ b/aleris/pom.xml @@ -23,16 +23,6 @@ - - com.sun.xml.bind - jaxb-core - 2.3.0.1 - - - com.sun.xml.bind - jaxb-impl - 2.3.1 - org.javassist javassist diff --git a/oauth2token/pom.xml b/oauth2token/pom.xml index 4bdf8e2b..4ebfe522 100644 --- a/oauth2token/pom.xml +++ b/oauth2token/pom.xml @@ -53,22 +53,6 @@ ${morphia.version} - - org.slf4j - log4j-over-slf4j - 1.7.36 - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - - diff --git a/pom.xml b/pom.xml index 40906473..0bce5164 100644 --- a/pom.xml +++ b/pom.xml @@ -74,34 +74,34 @@ 4.0.4-SNAPSHOT 1.70 1.9.26 - 3.6.0 - 3.20.6 + 4.0.3 + 4.1.0 1.8.1 - v3-rev197-1.25.0 + v3-rev20230822-2.0.0 1.5.0 1.34.1 2.3 4.5.14 4.5.14 3.29.2-GA - 1.2.0 + 2.0.0 1.6.2 - 2.3.1 - 2.1.36 + 2.1.37 0.8.0 + 1.0.4 0.8.9 3.12.14 1.3.2 1.6.1 6.0.0 - 2.0.29 + 3.0.0 5.2.4 - 1.5.3 + 3.0.3 9.7.0-21 1.7.1 1.7.1.0 1.5.1 - 1.7.36 + 2.0.9 1.16 1.6.3 1.6 @@ -143,12 +143,6 @@ ${httpcomponents.version} - - javax.xml.bind - jaxb-api - ${javax-jaxb-api.version} - - diff --git a/tenantvariables/pom.xml b/tenantvariables/pom.xml index 654911ff..27ff871e 100644 --- a/tenantvariables/pom.xml +++ b/tenantvariables/pom.xml @@ -59,7 +59,7 @@ com.muquit.libsodiumjna libsodium-jna - 1.0.4 + ${libsodium-jna.version} org.slf4j @@ -76,7 +76,7 @@ org.slf4j log4j-over-slf4j - 1.7.36 + ${slf4j.version} org.slf4j From a0d005b57ecfbcc8a418b2c796dc141ea8f8545e Mon Sep 17 00:00:00 2001 From: skin27 Date: Thu, 26 Oct 2023 21:18:19 +0200 Subject: [PATCH 03/58] update to Jakarta --- .../aleris/CertificatesMarshaller.java | 6 ++-- .../aleris/certificate/Certificate.java | 8 ++--- .../aleris/certificate/Certificates.java | 8 ++--- .../certificate/ChemicalComposition.java | 8 ++--- .../assimbly/aleris/certificate/Company.java | 6 ++-- .../aleris/certificate/Component.java | 4 +-- .../certificate/MechanicalProperty.java | 4 +-- .../aleris/certificate/StockUnit.java | 8 ++--- .../aleris/CertificatesMarshallerTest.java | 4 +-- .../auth/endpoint/AuthenticationFilter.java | 12 +++---- .../auth/endpoint/AuthenticatorService.java | 8 ++--- .../auth/endpoint/AuthorizationFilter.java | 20 ++++++------ .../auth/endpoint/HealthApiFilter.java | 10 +++--- .../assimbly/auth/endpoint/TokenService.java | 4 +-- .../auth/endpoint/annotation/Secured.java | 2 +- .../endpoint/annotation/TokenSecuredApi.java | 2 +- .../auth/endpoint/TokenServiceTest.java | 2 +- edi/pom.xml | 1 + .../org/assimbly/edi/EdiComponentTest.java | 2 +- .../java/org/assimbly/edi/EdiReaderTest.java | 6 ++-- .../edifact/EdifactComponentTest.java | 2 +- .../attachment/AttachmentEnrichStrategy.java | 2 +- mail/pom.xml | 18 +++++------ .../component/mail/AttachmentAttacher.java | 8 +++-- ...hmentsContentTransferEncodingResolver.java | 2 +- .../component/mail/DefaultAuthenticator.java | 4 +-- .../component/mail/DefaultJavaMailSender.java | 12 +++---- .../mail/DefaultMailUidGenerator.java | 6 ++-- .../component/mail/DelegatingDataSource.java | 2 +- .../mail/component/mail/JavaMailSender.java | 8 ++--- .../component/mail/MailAuthenticator.java | 4 +-- .../mail/component/mail/MailBinding.java | 32 +++++++++---------- .../mail/MailBoxPostProcessAction.java | 2 +- .../mail/component/mail/MailComponent.java | 2 +- .../mail/MailComponentConfigurer.java | 4 +-- .../component/mail/MailConfiguration.java | 19 ++++++----- .../mail/component/mail/MailConsumer.java | 29 ++++++++--------- .../mail/component/mail/MailConverters.java | 12 +++---- .../component/mail/MailConvertersLoader.java | 16 +++++----- .../mail/component/mail/MailEndpoint.java | 4 +-- .../mail/MailEndpointConfigurer.java | 8 ++--- .../mail/component/mail/MailMessage.java | 4 +-- .../mail/component/mail/MailProducer.java | 4 +-- .../mail/component/mail/MailSorter.java | 6 ++-- .../mail/component/mail/MailUidGenerator.java | 2 +- .../mail/component/mail/MailUtils.java | 6 ++-- .../mail/component/mail/NowSearchTerm.java | 8 ++--- .../component/mail/SearchTermBuilder.java | 30 ++++++++--------- .../mail/component/mail/SimpleSearchTerm.java | 2 +- .../mail/SplitAttachmentsExpression.java | 16 +++++----- .../multipart/MimeMultipartDataFormat.java | 30 ++++++++--------- .../mail/AttachmentAttacherTest.java | 3 +- .../mail/AttachmentEnrichStrategyTest.java | 8 ++--- .../ExtendedHeaderFilterStrategyTest.java | 3 +- .../oauth2token/service/TokenService.java | 2 +- .../assimbly/oriflame/details/EdiDetails.java | 2 +- .../org/assimbly/pdf/PdfComponentTest.java | 2 +- pom.xml | 4 +-- .../java/org/assimbly/smb/SmbEndpoint.java | 2 +- .../org/assimbly/soap/SoapActionsService.java | 4 +-- .../java/org/assimbly/soap/SoapProcessor.java | 2 +- .../soap/util/helpers/WSDLHelper.java | 8 ++--- .../org/assimbly/soap/SoapProcessorTest.java | 2 +- .../sql/service/JdbcValidationService.java | 8 ++--- .../org/assimbly/xmltojson/XmlToJsonTest.java | 2 +- .../xmltojsonlegacy/JsonToXmlTest.java | 2 +- .../xmltojsonlegacy/XmlToJsonTest.java | 2 +- 67 files changed, 243 insertions(+), 242 deletions(-) diff --git a/aleris/src/main/java/org/assimbly/aleris/CertificatesMarshaller.java b/aleris/src/main/java/org/assimbly/aleris/CertificatesMarshaller.java index ed92fb87..b1bc79a2 100644 --- a/aleris/src/main/java/org/assimbly/aleris/CertificatesMarshaller.java +++ b/aleris/src/main/java/org/assimbly/aleris/CertificatesMarshaller.java @@ -1,9 +1,9 @@ package org.assimbly.aleris; import org.assimbly.aleris.certificate.Certificates; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import java.io.StringWriter; public class CertificatesMarshaller { diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/Certificate.java b/aleris/src/main/java/org/assimbly/aleris/certificate/Certificate.java index 3c3902e5..f3778a59 100644 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/Certificate.java +++ b/aleris/src/main/java/org/assimbly/aleris/certificate/Certificate.java @@ -5,10 +5,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; import java.util.ArrayList; import java.util.List; diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/Certificates.java b/aleris/src/main/java/org/assimbly/aleris/certificate/Certificates.java index e44c60a0..f42375ed 100644 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/Certificates.java +++ b/aleris/src/main/java/org/assimbly/aleris/certificate/Certificates.java @@ -5,10 +5,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; import java.util.List; diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/ChemicalComposition.java b/aleris/src/main/java/org/assimbly/aleris/certificate/ChemicalComposition.java index e5c6b468..9464792d 100644 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/ChemicalComposition.java +++ b/aleris/src/main/java/org/assimbly/aleris/certificate/ChemicalComposition.java @@ -5,10 +5,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; import java.util.ArrayList; import java.util.List; diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/Company.java b/aleris/src/main/java/org/assimbly/aleris/certificate/Company.java index d9756b9c..34810500 100644 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/Company.java +++ b/aleris/src/main/java/org/assimbly/aleris/certificate/Company.java @@ -5,9 +5,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; @XmlAccessorType(XmlAccessType.FIELD) public class Company { diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/Component.java b/aleris/src/main/java/org/assimbly/aleris/certificate/Component.java index 8e58b192..b40df755 100644 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/Component.java +++ b/aleris/src/main/java/org/assimbly/aleris/certificate/Component.java @@ -6,8 +6,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/MechanicalProperty.java b/aleris/src/main/java/org/assimbly/aleris/certificate/MechanicalProperty.java index 947d46b8..e074496a 100644 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/MechanicalProperty.java +++ b/aleris/src/main/java/org/assimbly/aleris/certificate/MechanicalProperty.java @@ -5,8 +5,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/StockUnit.java b/aleris/src/main/java/org/assimbly/aleris/certificate/StockUnit.java index 3cc1fdd6..58c14e34 100644 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/StockUnit.java +++ b/aleris/src/main/java/org/assimbly/aleris/certificate/StockUnit.java @@ -5,10 +5,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; import java.util.ArrayList; import java.util.List; diff --git a/aleris/src/test/java/org/assimbly/aleris/CertificatesMarshallerTest.java b/aleris/src/test/java/org/assimbly/aleris/CertificatesMarshallerTest.java index 01206845..b9bbc7bb 100644 --- a/aleris/src/test/java/org/assimbly/aleris/CertificatesMarshallerTest.java +++ b/aleris/src/test/java/org/assimbly/aleris/CertificatesMarshallerTest.java @@ -7,7 +7,7 @@ import org.assimbly.aleris.certificate.*; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.io.IOException; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -17,7 +17,7 @@ public class CertificatesMarshallerTest { /** * Tests whether instances of Certificates are marshalled to the XML format specified by Euramax. * It ensures that the correct JAXB annotations are used. - * @throws javax.xml.bind.JAXBException + * @throws jakarta.xml.bind.JAXBException * @throws IOException */ @Test diff --git a/auth/src/main/java/org/assimbly/auth/endpoint/AuthenticationFilter.java b/auth/src/main/java/org/assimbly/auth/endpoint/AuthenticationFilter.java index 45770941..bedde116 100644 --- a/auth/src/main/java/org/assimbly/auth/endpoint/AuthenticationFilter.java +++ b/auth/src/main/java/org/assimbly/auth/endpoint/AuthenticationFilter.java @@ -4,12 +4,12 @@ import org.assimbly.auth.jwt.JwtValidator; import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import java.io.IOException; /** diff --git a/auth/src/main/java/org/assimbly/auth/endpoint/AuthenticatorService.java b/auth/src/main/java/org/assimbly/auth/endpoint/AuthenticatorService.java index 0a130535..ed24f562 100644 --- a/auth/src/main/java/org/assimbly/auth/endpoint/AuthenticatorService.java +++ b/auth/src/main/java/org/assimbly/auth/endpoint/AuthenticatorService.java @@ -11,10 +11,10 @@ import org.assimbly.auth.jwt.JwtValidator; import org.assimbly.auth.mongo.GoogleCredentialsRepository; import org.assimbly.auth.mongo.MongoDao; -import javax.ws.rs.*; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; diff --git a/auth/src/main/java/org/assimbly/auth/endpoint/AuthorizationFilter.java b/auth/src/main/java/org/assimbly/auth/endpoint/AuthorizationFilter.java index bb8b0846..ee948e85 100644 --- a/auth/src/main/java/org/assimbly/auth/endpoint/AuthorizationFilter.java +++ b/auth/src/main/java/org/assimbly/auth/endpoint/AuthorizationFilter.java @@ -9,16 +9,16 @@ import org.assimbly.auth.util.helper.ConfigHelper; import javax.annotation.Priority; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import java.io.IOException; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Method; diff --git a/auth/src/main/java/org/assimbly/auth/endpoint/HealthApiFilter.java b/auth/src/main/java/org/assimbly/auth/endpoint/HealthApiFilter.java index bf66c527..256b5d93 100644 --- a/auth/src/main/java/org/assimbly/auth/endpoint/HealthApiFilter.java +++ b/auth/src/main/java/org/assimbly/auth/endpoint/HealthApiFilter.java @@ -2,11 +2,11 @@ import org.assimbly.auth.endpoint.annotation.TokenSecuredApi; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; @TokenSecuredApi @Provider diff --git a/auth/src/main/java/org/assimbly/auth/endpoint/TokenService.java b/auth/src/main/java/org/assimbly/auth/endpoint/TokenService.java index 3cec7700..9b4ef19e 100644 --- a/auth/src/main/java/org/assimbly/auth/endpoint/TokenService.java +++ b/auth/src/main/java/org/assimbly/auth/endpoint/TokenService.java @@ -11,8 +11,8 @@ import org.assimbly.auth.mongo.MongoDao; import org.assimbly.util.helper.Base64Helper; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import java.io.UnsupportedEncodingException; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/auth/src/main/java/org/assimbly/auth/endpoint/annotation/Secured.java b/auth/src/main/java/org/assimbly/auth/endpoint/annotation/Secured.java index 26d3c115..494646a2 100644 --- a/auth/src/main/java/org/assimbly/auth/endpoint/annotation/Secured.java +++ b/auth/src/main/java/org/assimbly/auth/endpoint/annotation/Secured.java @@ -2,7 +2,7 @@ import org.assimbly.auth.domain.Role; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/auth/src/main/java/org/assimbly/auth/endpoint/annotation/TokenSecuredApi.java b/auth/src/main/java/org/assimbly/auth/endpoint/annotation/TokenSecuredApi.java index 9e8037ea..a0352567 100644 --- a/auth/src/main/java/org/assimbly/auth/endpoint/annotation/TokenSecuredApi.java +++ b/auth/src/main/java/org/assimbly/auth/endpoint/annotation/TokenSecuredApi.java @@ -1,6 +1,6 @@ package org.assimbly.auth.endpoint.annotation; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/auth/src/test/java/org/assimbly/auth/endpoint/TokenServiceTest.java b/auth/src/test/java/org/assimbly/auth/endpoint/TokenServiceTest.java index 0c54462e..91e11b40 100644 --- a/auth/src/test/java/org/assimbly/auth/endpoint/TokenServiceTest.java +++ b/auth/src/test/java/org/assimbly/auth/endpoint/TokenServiceTest.java @@ -11,7 +11,7 @@ import org.assimbly.auth.domain.User; import org.assimbly.auth.util.helper.ConfigHelper; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import static junit.framework.TestCase.assertEquals; diff --git a/edi/pom.xml b/edi/pom.xml index 98226d6d..9ea9b63c 100644 --- a/edi/pom.xml +++ b/edi/pom.xml @@ -29,6 +29,7 @@ smooksnoxml ${project.parent.version} + diff --git a/edi/src/test/java/org/assimbly/edi/EdiComponentTest.java b/edi/src/test/java/org/assimbly/edi/EdiComponentTest.java index c3937b15..840111ba 100644 --- a/edi/src/test/java/org/assimbly/edi/EdiComponentTest.java +++ b/edi/src/test/java/org/assimbly/edi/EdiComponentTest.java @@ -14,7 +14,7 @@ public class EdiComponentTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Produce diff --git a/edi/src/test/java/org/assimbly/edi/EdiReaderTest.java b/edi/src/test/java/org/assimbly/edi/EdiReaderTest.java index 838e79d9..4bb5a327 100644 --- a/edi/src/test/java/org/assimbly/edi/EdiReaderTest.java +++ b/edi/src/test/java/org/assimbly/edi/EdiReaderTest.java @@ -1,7 +1,7 @@ package org.assimbly.edi; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.junit5.params.Test; +import org.junit.jupiter.api.BeforeEach; import org.milyn.Smooks; import javax.xml.transform.stream.StreamResult; @@ -21,7 +21,7 @@ public class EdiReaderTest { private Smooks smooks; private EdiReaderConfigurator config; - @Before + @BeforeEach public void setUp() { smooks = new Smooks(); config = new EdiReaderConfigurator(SEGMENT, FIELD, COMPONENT, SUB_COMPONENT); diff --git a/edifact/src/test/java/org/assimbly/edifact/EdifactComponentTest.java b/edifact/src/test/java/org/assimbly/edifact/EdifactComponentTest.java index 52c041fb..e35d38d5 100644 --- a/edifact/src/test/java/org/assimbly/edifact/EdifactComponentTest.java +++ b/edifact/src/test/java/org/assimbly/edifact/EdifactComponentTest.java @@ -15,7 +15,7 @@ public class EdifactComponentTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Produce diff --git a/enrich/src/main/java/org/assimbly/enrich/attachment/AttachmentEnrichStrategy.java b/enrich/src/main/java/org/assimbly/enrich/attachment/AttachmentEnrichStrategy.java index f4d6375f..5e6699a2 100644 --- a/enrich/src/main/java/org/assimbly/enrich/attachment/AttachmentEnrichStrategy.java +++ b/enrich/src/main/java/org/assimbly/enrich/attachment/AttachmentEnrichStrategy.java @@ -9,7 +9,7 @@ import org.apache.log4j.Logger; import org.apache.tika.io.IOUtils; -import javax.activation.DataHandler; +import jakarta.activation.DataHandler; import java.io.IOException; import java.io.InputStream; diff --git a/mail/pom.xml b/mail/pom.xml index c2548117..d14c0179 100644 --- a/mail/pom.xml +++ b/mail/pom.xml @@ -30,19 +30,19 @@ ${camel.version} + + jakarta.mail + jakarta.mail-api + ${jakarta.mail.version} + + com.sun.mail - javax.mail - ${javax.version} - - - - javax.activation - activation - - + jakarta.mail + 2.0.1 + ${project.groupId} enrich diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/AttachmentAttacher.java b/mail/src/main/java/org/assimbly/mail/component/mail/AttachmentAttacher.java index 8bacb0f4..1340976e 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/AttachmentAttacher.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/AttachmentAttacher.java @@ -1,5 +1,6 @@ package org.assimbly.mail.component.mail; +import jakarta.activation.DataSource; import org.apache.axiom.attachments.ByteArrayDataSource; import org.apache.camel.Exchange; import org.apache.camel.Message; @@ -8,7 +9,7 @@ import org.apache.commons.io.IOUtils; import org.assimbly.util.helper.MimeTypeHelper; -import javax.activation.DataHandler; +import jakarta.activation.DataHandler; import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Date; @@ -37,7 +38,10 @@ public void process(Exchange exchange) throws Exception { emailBody = ""; AttachmentMessage attMsg = exchange.getIn(AttachmentMessage.class); - attMsg.addAttachment(fileName, new DataHandler(new ByteArrayDataSource(IOUtils.toByteArray(is), mimeType))); + + //to do Jakarta/Camel4 + //attMsg.addAttachment(fileName, new DataHandler((DataSource) new ByteArrayDataSource(IOUtils.toByteArray(is), mimeType))); + //in.addAttachment(fileName, new DataHandler(new ByteArrayDataSource(IOUtils.toByteArray(is), mimeType))); in.setHeader(Exchange.CONTENT_TYPE, "text/plain"); diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/AttachmentsContentTransferEncodingResolver.java b/mail/src/main/java/org/assimbly/mail/component/mail/AttachmentsContentTransferEncodingResolver.java index 1dff276c..7c2edc7e 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/AttachmentsContentTransferEncodingResolver.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/AttachmentsContentTransferEncodingResolver.java @@ -16,7 +16,7 @@ */ package org.assimbly.mail.component.mail; -import javax.mail.BodyPart; +import jakarta.mail.BodyPart; /** * Resolver to determine Content-Transfer-Encoding for file attachments. diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/DefaultAuthenticator.java b/mail/src/main/java/org/assimbly/mail/component/mail/DefaultAuthenticator.java index d4f5474f..12085f9b 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/DefaultAuthenticator.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/DefaultAuthenticator.java @@ -16,8 +16,8 @@ */ package org.assimbly.mail.component.mail; -import javax.mail.Authenticator; -import javax.mail.PasswordAuthentication; +import jakarta.mail.Authenticator; +import jakarta.mail.PasswordAuthentication; /** * Mail {@link Authenticator} that supplies username and password diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/DefaultJavaMailSender.java b/mail/src/main/java/org/assimbly/mail/component/mail/DefaultJavaMailSender.java index 1927ca6f..da7cf4ea 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/DefaultJavaMailSender.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/DefaultJavaMailSender.java @@ -19,12 +19,12 @@ import java.util.Date; import java.util.Properties; -import javax.mail.MessagingException; -import javax.mail.NoSuchProviderException; -import javax.mail.PasswordAuthentication; -import javax.mail.Session; -import javax.mail.Transport; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.NoSuchProviderException; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.MimeMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/DefaultMailUidGenerator.java b/mail/src/main/java/org/assimbly/mail/component/mail/DefaultMailUidGenerator.java index aaf36534..9ec77111 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/DefaultMailUidGenerator.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/DefaultMailUidGenerator.java @@ -19,9 +19,9 @@ import java.util.Enumeration; import java.util.UUID; -import javax.mail.Header; -import javax.mail.Message; -import javax.mail.MessagingException; +import jakarta.mail.Header; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/DelegatingDataSource.java b/mail/src/main/java/org/assimbly/mail/component/mail/DelegatingDataSource.java index e8249861..a0036872 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/DelegatingDataSource.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/DelegatingDataSource.java @@ -20,7 +20,7 @@ import java.io.InputStream; import java.io.OutputStream; -import javax.activation.DataSource; +import jakarta.activation.DataSource; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.StringHelper; diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/JavaMailSender.java b/mail/src/main/java/org/assimbly/mail/component/mail/JavaMailSender.java index 3a5aebb1..4110fd04 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/JavaMailSender.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/JavaMailSender.java @@ -18,9 +18,9 @@ import java.util.Properties; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.internet.MimeMessage; /** * The JavaMailSender interface contains all the methods of a JavaMailSender implementation currently used by the mail @@ -32,7 +32,7 @@ public interface JavaMailSender { * Send the mail * * @param mimeMessage the message to send - * @throws javax.mail.MessagingException is thrown if error sending the mail. + * @throws jakarta.mail.MessagingException is thrown if error sending the mail. */ void send(MimeMessage mimeMessage) throws MessagingException; diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailAuthenticator.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailAuthenticator.java index eb2b0220..4505ed9c 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailAuthenticator.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailAuthenticator.java @@ -16,12 +16,12 @@ */ package org.assimbly.mail.component.mail; -import javax.mail.PasswordAuthentication; +import jakarta.mail.PasswordAuthentication; /** * Mail authenticator that supplies username and password */ -public class MailAuthenticator extends javax.mail.Authenticator { +public class MailAuthenticator extends jakarta.mail.Authenticator { // makes the method public /** Override this method in your implementation. */ diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailBinding.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailBinding.java index d961e5be..2c1c4cd8 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailBinding.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailBinding.java @@ -29,22 +29,22 @@ import java.util.TreeMap; import java.util.UUID; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.mail.Address; -import javax.mail.BodyPart; -import javax.mail.Header; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.Part; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; -import javax.mail.internet.MimeUtility; -import javax.mail.util.ByteArrayDataSource; +import jakarta.activation.DataHandler; +import jakarta.activation.DataSource; +import jakarta.mail.Address; +import jakarta.mail.BodyPart; +import jakarta.mail.Header; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.Part; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; +import jakarta.mail.internet.MimeUtility; +import jakarta.mail.util.ByteArrayDataSource; import org.apache.camel.Exchange; import org.apache.camel.RuntimeCamelException; diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailBoxPostProcessAction.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailBoxPostProcessAction.java index 3363dba1..c69debaf 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailBoxPostProcessAction.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailBoxPostProcessAction.java @@ -16,7 +16,7 @@ */ package org.assimbly.mail.component.mail; -import javax.mail.Folder; +import jakarta.mail.Folder; /** * Is used for doing post processing tasks on the mailbox once the normal processing ended. This includes for example diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailComponent.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailComponent.java index b88d955c..985235b1 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailComponent.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailComponent.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Set; -import javax.mail.search.SearchTerm; +import jakarta.mail.search.SearchTerm; import com.sun.mail.imap.SortTerm; import org.apache.camel.CamelContext; diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailComponentConfigurer.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailComponentConfigurer.java index 19d60e89..1d6e9d12 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailComponentConfigurer.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailComponentConfigurer.java @@ -94,7 +94,7 @@ public boolean configure(CamelContext camelContext, Object obj, String name, Obj case "peek": getOrCreateConfiguration(target).setPeek(property(camelContext, boolean.class, value)); return true; case "replyto": case "replyTo": getOrCreateConfiguration(target).setReplyTo(property(camelContext, java.lang.String.class, value)); return true; - case "session": getOrCreateConfiguration(target).setSession(property(camelContext, javax.mail.Session.class, value)); return true; + case "session": getOrCreateConfiguration(target).setSession(property(camelContext, jakarta.mail.Session.class, value)); return true; case "skipfailedmessage": case "skipFailedMessage": getOrCreateConfiguration(target).setSkipFailedMessage(property(camelContext, boolean.class, value)); return true; case "sslcontextparameters": @@ -181,7 +181,7 @@ public Class getOptionType(String name, boolean ignoreCase) { case "peek": return boolean.class; case "replyto": case "replyTo": return java.lang.String.class; - case "session": return javax.mail.Session.class; + case "session": return jakarta.mail.Session.class; case "skipfailedmessage": case "skipFailedMessage": return boolean.class; case "sslcontextparameters": diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailConfiguration.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailConfiguration.java index a5f0951d..0f1173dd 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailConfiguration.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailConfiguration.java @@ -20,13 +20,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import javax.mail.Message; -import javax.mail.PasswordAuthentication; -import javax.mail.Session; -import javax.net.ssl.SSLContext; +import jakarta.mail.Message; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; import org.apache.camel.CamelContext; import org.apache.camel.RuntimeCamelException; @@ -39,6 +36,8 @@ import org.assimbly.tenantvariables.domain.TenantVariable; import org.assimbly.tenantvariables.mongo.MongoDao; +import javax.net.ssl.SSLContext; + import static org.assimbly.mail.component.mail.MailConstants.MAIL_GENERATE_MISSING_ATTACHMENT_NAMES_NEVER; import static org.assimbly.mail.component.mail.MailConstants.MAIL_HANDLE_DUPLICATE_ATTACHMENT_NAMES_NEVER; @@ -308,7 +307,7 @@ private Properties createJavaMailProperties() { if (debugMode) { // add more debug for the SSL communication as well - properties.put("javax.net.debug", "all"); + properties.put("jakarta.net.debug", "all"); } if (sslContextParameters != null && isSecureProtocol()) { @@ -580,8 +579,8 @@ public boolean isMapMailMessage() { * Specifies whether Camel should map the received mail message to Camel body/headers/attachments. If set to true, * the body of the mail message is mapped to the body of the Camel IN message, the mail headers are mapped to IN * headers, and the attachments to Camel IN attachment message. If this option is set to false then the IN message - * contains a raw javax.mail.Message. You can retrieve this raw message by calling - * exchange.getIn().getBody(javax.mail.Message.class). + * contains a raw jakarta.mail.Message. You can retrieve this raw message by calling + * exchange.getIn().getBody(jakarta.mail.Message.class). */ public void setMapMailMessage(boolean mapMailMessage) { this.mapMailMessage = mapMailMessage; @@ -823,7 +822,7 @@ public boolean isPeek() { } /** - * Will mark the javax.mail.Message as peeked before processing the mail message. This applies to IMAPMessage + * Will mark the jakarta.mail.Message as peeked before processing the mail message. This applies to IMAPMessage * messages types only. By using peek the mail will not be eager marked as SEEN on the mail server, which allows us * to rollback the mail message if there is an error processing in Camel. */ diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailConsumer.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailConsumer.java index 06335644..9d6ae4ab 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailConsumer.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailConsumer.java @@ -24,27 +24,26 @@ import java.util.Map; import java.util.Queue; -import javax.mail.Flags; -import javax.mail.Folder; -import javax.mail.FolderNotFoundException; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.PasswordAuthentication; -import javax.mail.Store; -import javax.mail.search.SearchTerm; +import jakarta.mail.Flags; +import jakarta.mail.Folder; +import jakarta.mail.FolderNotFoundException; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Store; +import jakarta.mail.search.SearchTerm; import com.sun.mail.imap.IMAPFolder; import com.sun.mail.imap.IMAPStore; import com.sun.mail.imap.SortTerm; import org.apache.camel.Exchange; import org.apache.camel.ExchangePropertyKey; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.ExtendedExchange; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.attachment.Attachment; import org.apache.camel.attachment.AttachmentMessage; import org.apache.camel.spi.BeanIntrospection; +import org.apache.camel.support.PluginHelper; import org.apache.camel.support.ScheduledBatchPollingConsumer; import org.apache.camel.support.SynchronizationAdapter; import org.apache.camel.util.CastUtils; @@ -55,7 +54,7 @@ /** * A {@link org.apache.camel.Consumer Consumer} which consumes messages from JavaMail using a - * {@link javax.mail.Transport Transport} and dispatches them to the {@link Processor} + * {@link jakarta.mail.Transport Transport} and dispatches them to the {@link Processor} */ public class MailConsumer extends ScheduledBatchPollingConsumer { public static final String MAIL_MESSAGE_UID = "CamelMailMessageId"; @@ -235,7 +234,7 @@ public int processBatch(Queue exchanges) throws Exception { final Message mail = exchange.getIn(MailMessage.class).getOriginalMessage(); // add on completion to handle after work when the exchange is done - exchange.adapt(ExtendedExchange.class).addOnCompletion(new SynchronizationAdapter() { + exchange.getExchangeExtension().addOnCompletion(new SynchronizationAdapter() { @Override public void onComplete(Exchange exchange) { processCommit(mail, exchange); @@ -271,8 +270,8 @@ private void peekMessage(Message mail) { if (mail.getClass().getSimpleName().startsWith("IMAP")) { try { LOG.trace("Calling setPeek(true) on mail message {}", mail); - BeanIntrospection beanIntrospection - = getEndpoint().getCamelContext().adapt(ExtendedCamelContext.class).getBeanIntrospection(); + BeanIntrospection beanIntrospection = PluginHelper.getBeanIntrospection(getEndpoint().getCamelContext()); + beanIntrospection.setProperty(getEndpoint().getCamelContext(), mail, "peek", true); } catch (Exception e) { // ignore @@ -403,7 +402,7 @@ protected Exchange createExchange(KeyValueHolder holder) throws Exchange exchange = createExchange(message); if (getEndpoint().getConfiguration().isMapMailMessage()) { // ensure the mail message is mapped, which can be ensured by touching the body/header/attachment - LOG.trace("Mapping from javax.mail.Message to Camel MailMessage"); + LOG.trace("Mapping from jakarta.mail.Message to Camel MailMessage"); exchange.getIn().getBody(); exchange.getIn().getHeaders(); // must also map attachments diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailConverters.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailConverters.java index 0b0884c4..c9398f20 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailConverters.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailConverters.java @@ -26,12 +26,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.mail.BodyPart; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.internet.MimeMultipart; -import javax.mail.search.SearchTerm; +import jakarta.mail.BodyPart; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.internet.MimeMultipart; +import jakarta.mail.search.SearchTerm; import com.sun.mail.imap.SortTerm; import org.apache.camel.Converter; diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailConvertersLoader.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailConvertersLoader.java index 7b57beba..029e1756 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailConvertersLoader.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailConvertersLoader.java @@ -42,14 +42,14 @@ public void load(TypeConverterRegistry registry) throws TypeConverterLoaderExcep } private void registerConverters(TypeConverterRegistry registry) { - addTypeConverter(registry, java.io.InputStream.class, javax.mail.Message.class, false, - (type, exchange, value) -> org.assimbly.mail.component.mail.MailConverters.toInputStream((javax.mail.Message) value)); - addTypeConverter(registry, java.io.InputStream.class, javax.mail.Multipart.class, false, - (type, exchange, value) -> org.assimbly.mail.component.mail.MailConverters.toInputStream((javax.mail.Multipart) value, exchange)); - addTypeConverter(registry, java.lang.String.class, javax.mail.Message.class, false, - (type, exchange, value) -> org.assimbly.mail.component.mail.MailConverters.toString((javax.mail.Message) value)); - addTypeConverter(registry, java.lang.String.class, javax.mail.Multipart.class, false, - (type, exchange, value) -> org.assimbly.mail.component.mail.MailConverters.toString((javax.mail.Multipart) value)); + addTypeConverter(registry, java.io.InputStream.class, jakarta.mail.Message.class, false, + (type, exchange, value) -> org.assimbly.mail.component.mail.MailConverters.toInputStream((jakarta.mail.Message) value)); + addTypeConverter(registry, java.io.InputStream.class, jakarta.mail.Multipart.class, false, + (type, exchange, value) -> org.assimbly.mail.component.mail.MailConverters.toInputStream((jakarta.mail.Multipart) value, exchange)); + addTypeConverter(registry, java.lang.String.class, jakarta.mail.Message.class, false, + (type, exchange, value) -> org.assimbly.mail.component.mail.MailConverters.toString((jakarta.mail.Message) value)); + addTypeConverter(registry, java.lang.String.class, jakarta.mail.Multipart.class, false, + (type, exchange, value) -> org.assimbly.mail.component.mail.MailConverters.toString((jakarta.mail.Multipart) value)); } private static void addTypeConverter(TypeConverterRegistry registry, Class toType, Class fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailEndpoint.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailEndpoint.java index 48ca262d..983992c6 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailEndpoint.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailEndpoint.java @@ -16,8 +16,8 @@ */ package org.assimbly.mail.component.mail; -import javax.mail.Message; -import javax.mail.search.SearchTerm; +import jakarta.mail.Message; +import jakarta.mail.search.SearchTerm; import com.sun.mail.imap.SortTerm; import org.apache.camel.Category; diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailEndpointConfigurer.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailEndpointConfigurer.java index 85b1772f..74ce7756 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailEndpointConfigurer.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailEndpointConfigurer.java @@ -121,10 +121,10 @@ public boolean configure(CamelContext camelContext, Object obj, String name, Obj case "schedulerproperties": case "schedulerProperties": target.setSchedulerProperties(property(camelContext, java.util.Map.class, value)); return true; case "searchterm": - case "searchTerm": target.setSearchTerm(property(camelContext, javax.mail.search.SearchTerm.class, value)); return true; + case "searchTerm": target.setSearchTerm(property(camelContext, jakarta.mail.search.SearchTerm.class, value)); return true; case "sendemptymessagewhenidle": case "sendEmptyMessageWhenIdle": target.setSendEmptyMessageWhenIdle(property(camelContext, boolean.class, value)); return true; - case "session": target.getConfiguration().setSession(property(camelContext, javax.mail.Session.class, value)); return true; + case "session": target.getConfiguration().setSession(property(camelContext, jakarta.mail.Session.class, value)); return true; case "skipfailedmessage": case "skipFailedMessage": target.getConfiguration().setSkipFailedMessage(property(camelContext, boolean.class, value)); return true; case "sortterm": @@ -251,10 +251,10 @@ public Class getOptionType(String name, boolean ignoreCase) { case "schedulerproperties": case "schedulerProperties": return java.util.Map.class; case "searchterm": - case "searchTerm": return javax.mail.search.SearchTerm.class; + case "searchTerm": return jakarta.mail.search.SearchTerm.class; case "sendemptymessagewhenidle": case "sendEmptyMessageWhenIdle": return boolean.class; - case "session": return javax.mail.Session.class; + case "session": return jakarta.mail.Session.class; case "skipfailedmessage": case "skipFailedMessage": return boolean.class; case "sortterm": diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailMessage.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailMessage.java index c5a10b1c..833f7dda 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailMessage.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailMessage.java @@ -19,8 +19,8 @@ import java.io.IOException; import java.util.Map; -import javax.mail.Message; -import javax.mail.MessagingException; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; import org.apache.camel.Exchange; import org.apache.camel.RuntimeCamelException; diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailProducer.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailProducer.java index 586e34fd..2b1ab259 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailProducer.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailProducer.java @@ -19,8 +19,8 @@ import java.io.IOException; import java.util.Map; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import org.apache.camel.AsyncCallback; import org.apache.camel.Exchange; diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailSorter.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailSorter.java index a4b7c79c..9d7162ee 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailSorter.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailSorter.java @@ -22,9 +22,9 @@ import java.util.Date; import java.util.List; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.InternetAddress; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.InternetAddress; import com.sun.mail.imap.SortTerm; diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailUidGenerator.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailUidGenerator.java index 98f044bf..c529c98c 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailUidGenerator.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailUidGenerator.java @@ -16,7 +16,7 @@ */ package org.assimbly.mail.component.mail; -import javax.mail.Message; +import jakarta.mail.Message; /** * To generate an unique ID of the mail message. diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailUtils.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailUtils.java index dac39197..c5d15643 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/MailUtils.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/MailUtils.java @@ -19,9 +19,9 @@ import java.text.DateFormat; import java.util.Date; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessagingException; +import jakarta.mail.Address; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.StringHelper; diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/NowSearchTerm.java b/mail/src/main/java/org/assimbly/mail/component/mail/NowSearchTerm.java index 0e0ce12a..8d1ed675 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/NowSearchTerm.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/NowSearchTerm.java @@ -18,12 +18,12 @@ import java.util.Date; -import javax.mail.Message; -import javax.mail.search.ComparisonTerm; -import javax.mail.search.DateTerm; +import jakarta.mail.Message; +import jakarta.mail.search.ComparisonTerm; +import jakarta.mail.search.DateTerm; /** - * A {@link javax.mail.search.SearchTerm} that is based on {@link DateTerm} that compares with current date (eg now). + * A {@link jakarta.mail.search.SearchTerm} that is based on {@link DateTerm} that compares with current date (eg now). *

* This allows to compare with a dynamic derived value. */ diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/SearchTermBuilder.java b/mail/src/main/java/org/assimbly/mail/component/mail/SearchTermBuilder.java index 4f94a394..31ebfd85 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/SearchTermBuilder.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/SearchTermBuilder.java @@ -18,21 +18,21 @@ import java.util.Date; -import javax.mail.Flags; -import javax.mail.Message; -import javax.mail.search.AndTerm; -import javax.mail.search.BodyTerm; -import javax.mail.search.ComparisonTerm; -import javax.mail.search.FlagTerm; -import javax.mail.search.FromStringTerm; -import javax.mail.search.HeaderTerm; -import javax.mail.search.NotTerm; -import javax.mail.search.OrTerm; -import javax.mail.search.ReceivedDateTerm; -import javax.mail.search.RecipientStringTerm; -import javax.mail.search.SearchTerm; -import javax.mail.search.SentDateTerm; -import javax.mail.search.SubjectTerm; +import jakarta.mail.Flags; +import jakarta.mail.Message; +import jakarta.mail.search.AndTerm; +import jakarta.mail.search.BodyTerm; +import jakarta.mail.search.ComparisonTerm; +import jakarta.mail.search.FlagTerm; +import jakarta.mail.search.FromStringTerm; +import jakarta.mail.search.HeaderTerm; +import jakarta.mail.search.NotTerm; +import jakarta.mail.search.OrTerm; +import jakarta.mail.search.ReceivedDateTerm; +import jakarta.mail.search.RecipientStringTerm; +import jakarta.mail.search.SearchTerm; +import jakarta.mail.search.SentDateTerm; +import jakarta.mail.search.SubjectTerm; /** * A builder to build compound {@link SearchTerm}s. diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/SimpleSearchTerm.java b/mail/src/main/java/org/assimbly/mail/component/mail/SimpleSearchTerm.java index da1aa3f2..55129679 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/SimpleSearchTerm.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/SimpleSearchTerm.java @@ -17,7 +17,7 @@ package org.assimbly.mail.component.mail; /** - * Allows to configure common {@link javax.mail.search.SearchTerm}'s using a POJO style, which can be done from XML + * Allows to configure common {@link jakarta.mail.search.SearchTerm}'s using a POJO style, which can be done from XML * DSLs. *

* This POJO has default true for the {@link #isUnseen()} option. diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/SplitAttachmentsExpression.java b/mail/src/main/java/org/assimbly/mail/component/mail/SplitAttachmentsExpression.java index 657351b2..81679c2e 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/SplitAttachmentsExpression.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/SplitAttachmentsExpression.java @@ -36,11 +36,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.activation.DataHandler; -import javax.mail.Header; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.Part; +import jakarta.activation.DataHandler; +import jakarta.mail.Header; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.Part; /** * A {@link org.apache.camel.Expression} which can be used to split a {@link MailMessage} per attachment. For example if @@ -84,7 +84,7 @@ public Object evaluate(Exchange exchange) { * https://assimblyworld.atlassian.net/browse/DOV-220 */ MailMessage inMessage = (MailMessage) exchange.getIn(); - javax.mail.Message message = inMessage.getOriginalMessage(); + jakarta.mail.Message message = inMessage.getOriginalMessage(); try { extractAttachmentsFromMail(message, attachments); @@ -169,7 +169,7 @@ private Message extractAttachment(Attachment attachment, String attachmentName, * * Assimbly Edit: Copied from org.apache.camel.component.mail.MailBinding (2.20.1) */ - private void extractAttachmentsFromMail(javax.mail.Message message, Map map) + private void extractAttachmentsFromMail(jakarta.mail.Message message, Map map) throws MessagingException, IOException { LOG.trace("Extracting attachments +++ start +++"); @@ -222,7 +222,7 @@ private void extractAttachmentsFromMultipart(Multipart mp, Map headers = part.getAllHeaders(); while (headers.hasMoreElements()) { - javax.mail.Header header = headers.nextElement(); + jakarta.mail.Header header = headers.nextElement(); camelAttachment.addHeader(header.getName(), header.getValue()); } map.put(fileName, camelAttachment); diff --git a/mail/src/main/java/org/assimbly/mail/dataformat/mime/multipart/MimeMultipartDataFormat.java b/mail/src/main/java/org/assimbly/mail/dataformat/mime/multipart/MimeMultipartDataFormat.java index 0d2e9ffc..99c602c1 100644 --- a/mail/src/main/java/org/assimbly/mail/dataformat/mime/multipart/MimeMultipartDataFormat.java +++ b/mail/src/main/java/org/assimbly/mail/dataformat/mime/multipart/MimeMultipartDataFormat.java @@ -28,21 +28,21 @@ import java.util.UUID; import java.util.regex.Pattern; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.mail.BodyPart; -import javax.mail.Header; -import javax.mail.MessagingException; -import javax.mail.Part; -import javax.mail.Session; -import javax.mail.internet.ContentType; -import javax.mail.internet.InternetHeaders; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; -import javax.mail.internet.MimeUtility; -import javax.mail.internet.ParseException; -import javax.mail.util.ByteArrayDataSource; +import jakarta.activation.DataHandler; +import jakarta.activation.DataSource; +import jakarta.mail.BodyPart; +import jakarta.mail.Header; +import jakarta.mail.MessagingException; +import jakarta.mail.Part; +import jakarta.mail.Session; +import jakarta.mail.internet.ContentType; +import jakarta.mail.internet.InternetHeaders; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; +import jakarta.mail.internet.MimeUtility; +import jakarta.mail.internet.ParseException; +import jakarta.mail.util.ByteArrayDataSource; import org.apache.camel.Exchange; import org.apache.camel.Message; diff --git a/mail/src/test/java/org/assimbly/mail/component/mail/AttachmentAttacherTest.java b/mail/src/test/java/org/assimbly/mail/component/mail/AttachmentAttacherTest.java index 91447af7..da5fc4c1 100644 --- a/mail/src/test/java/org/assimbly/mail/component/mail/AttachmentAttacherTest.java +++ b/mail/src/test/java/org/assimbly/mail/component/mail/AttachmentAttacherTest.java @@ -1,5 +1,6 @@ package org.assimbly.mail.component.mail; +import junit.framework.Assert; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.attachment.AttachmentMessage; @@ -9,7 +10,7 @@ import org.apache.camel.test.junit5.TestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.Assert; + import java.text.SimpleDateFormat; import java.util.Date; diff --git a/mail/src/test/java/org/assimbly/mail/component/mail/AttachmentEnrichStrategyTest.java b/mail/src/test/java/org/assimbly/mail/component/mail/AttachmentEnrichStrategyTest.java index cb375982..4f74d3b1 100644 --- a/mail/src/test/java/org/assimbly/mail/component/mail/AttachmentEnrichStrategyTest.java +++ b/mail/src/test/java/org/assimbly/mail/component/mail/AttachmentEnrichStrategyTest.java @@ -2,23 +2,19 @@ import org.apache.camel.AggregationStrategy; import org.apache.camel.EndpointInject; -import org.apache.camel.Message; -import org.apache.camel.attachment.AttachmentMessage; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.language.ConstantExpression; import org.apache.camel.model.language.SimpleExpression; import org.apache.camel.test.junit5.CamelTestSupport; -import org.junit.jupiter.api.Test; -import org.junit.Assert; import org.assimbly.enrich.EnrichStrategy; public class AttachmentEnrichStrategyTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result-marshal") + @EndpointInject("mock:result-marshal") private MockEndpoint marshalResult; - @EndpointInject(uri = "mock:result-unmarshal") + @EndpointInject("mock:result-unmarshal") private MockEndpoint unmarshalResult; private static String xmlFirstInput = diff --git a/mail/src/test/java/org/assimbly/mail/component/mail/ExtendedHeaderFilterStrategyTest.java b/mail/src/test/java/org/assimbly/mail/component/mail/ExtendedHeaderFilterStrategyTest.java index b9470731..d6b144db 100644 --- a/mail/src/test/java/org/assimbly/mail/component/mail/ExtendedHeaderFilterStrategyTest.java +++ b/mail/src/test/java/org/assimbly/mail/component/mail/ExtendedHeaderFilterStrategyTest.java @@ -1,12 +1,13 @@ package org.assimbly.mail.component.mail; +import junit.framework.Assert; import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.support.DefaultExchange; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; -import org.junit.Assert; + public class ExtendedHeaderFilterStrategyTest extends CamelTestSupport { diff --git a/oauth2token/src/main/java/org/assimbly/oauth2token/service/TokenService.java b/oauth2token/src/main/java/org/assimbly/oauth2token/service/TokenService.java index 2a3cb64e..dc46f8c1 100644 --- a/oauth2token/src/main/java/org/assimbly/oauth2token/service/TokenService.java +++ b/oauth2token/src/main/java/org/assimbly/oauth2token/service/TokenService.java @@ -8,7 +8,7 @@ import org.assimbly.auth.endpoint.annotation.Secured; import org.assimbly.tenantvariables.TenantVariablesProcessor; -import javax.ws.rs.*; +import jakarta.ws.rs.*; import java.io.*; import java.net.HttpURLConnection; import java.net.URL; diff --git a/oriflame/src/main/java/org/assimbly/oriflame/details/EdiDetails.java b/oriflame/src/main/java/org/assimbly/oriflame/details/EdiDetails.java index 8b8d6f6d..382b509b 100755 --- a/oriflame/src/main/java/org/assimbly/oriflame/details/EdiDetails.java +++ b/oriflame/src/main/java/org/assimbly/oriflame/details/EdiDetails.java @@ -4,7 +4,7 @@ import org.xml.sax.Attributes; import org.xml.sax.helpers.AttributesImpl; -import javax.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; import java.io.UnsupportedEncodingException; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/pdf/src/test/java/org/assimbly/pdf/PdfComponentTest.java b/pdf/src/test/java/org/assimbly/pdf/PdfComponentTest.java index 988152dc..b7f556f2 100644 --- a/pdf/src/test/java/org/assimbly/pdf/PdfComponentTest.java +++ b/pdf/src/test/java/org/assimbly/pdf/PdfComponentTest.java @@ -23,7 +23,7 @@ public class PdfComponentTest extends CamelTestSupport { private final ClassLoader classLoader = getClass().getClassLoader(); - @EndpointInject(uri = "mock:out") + @EndpointInject("mock:out") private MockEndpoint resultEndpoint; private HttpServer localServer; diff --git a/pom.xml b/pom.xml index 0bce5164..288a0c13 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ file:///${project.basedir}/rules.xml 1.2.20 - 4.0.4-SNAPSHOT + 4.1.0-SNAPSHOT 1.70 1.9.26 4.0.3 @@ -85,7 +85,7 @@ 4.5.14 3.29.2-GA 2.0.0 - 1.6.2 + 2.1.2 2.1.37 0.8.0 1.0.4 diff --git a/smb/src/main/java/org/assimbly/smb/SmbEndpoint.java b/smb/src/main/java/org/assimbly/smb/SmbEndpoint.java index 8489749b..4809c508 100644 --- a/smb/src/main/java/org/assimbly/smb/SmbEndpoint.java +++ b/smb/src/main/java/org/assimbly/smb/SmbEndpoint.java @@ -36,7 +36,7 @@ of the License, or (at your option) any later version. import jcifs.smb.SmbFile; -@UriEndpoint(scheme = "smb", title = "SMB", syntax = "smb://user@server.example.com/sharename?password=secret&localWorkDirectory=/tmp", consumerClass = SmbConsumer.class) +@UriEndpoint(scheme = "smb", title = "SMB", syntax = "smb://user@server.example.com/sharename?password=secret&localWorkDirectory=/tmp") public class SmbEndpoint extends GenericFileEndpoint { private static final Logger LOG = LoggerFactory.getLogger(SmbEndpoint.class); diff --git a/soap/src/main/java/org/assimbly/soap/SoapActionsService.java b/soap/src/main/java/org/assimbly/soap/SoapActionsService.java index c758bfd4..1c29e267 100644 --- a/soap/src/main/java/org/assimbly/soap/SoapActionsService.java +++ b/soap/src/main/java/org/assimbly/soap/SoapActionsService.java @@ -15,8 +15,8 @@ import org.assimbly.soap.domain.SoapHttpHeader; import org.assimbly.soap.util.helpers.*; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import javax.wsdl.*; import javax.wsdl.extensions.schema.Schema; import java.io.IOException; diff --git a/soap/src/main/java/org/assimbly/soap/SoapProcessor.java b/soap/src/main/java/org/assimbly/soap/SoapProcessor.java index b901324e..a47e3169 100644 --- a/soap/src/main/java/org/assimbly/soap/SoapProcessor.java +++ b/soap/src/main/java/org/assimbly/soap/SoapProcessor.java @@ -25,7 +25,7 @@ import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.soap.*; +import jakarta.xml.soap.*; import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; diff --git a/soap/src/main/java/org/assimbly/soap/util/helpers/WSDLHelper.java b/soap/src/main/java/org/assimbly/soap/util/helpers/WSDLHelper.java index f89bf2e4..267e2eb3 100644 --- a/soap/src/main/java/org/assimbly/soap/util/helpers/WSDLHelper.java +++ b/soap/src/main/java/org/assimbly/soap/util/helpers/WSDLHelper.java @@ -16,10 +16,10 @@ import javax.wsdl.WSDLException; import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; +import jakarta.xml.soap.SOAPConnection; +import jakarta.xml.soap.SOAPConnectionFactory; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPMessage; import java.io.*; import java.net.*; import java.nio.charset.StandardCharsets; diff --git a/soap/src/test/java/org/assimbly/soap/SoapProcessorTest.java b/soap/src/test/java/org/assimbly/soap/SoapProcessorTest.java index f1dff2bd..76cdf348 100644 --- a/soap/src/test/java/org/assimbly/soap/SoapProcessorTest.java +++ b/soap/src/test/java/org/assimbly/soap/SoapProcessorTest.java @@ -21,7 +21,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import javax.xml.soap.*; +import jakarta.xml.soap.*; import static org.junit.jupiter.api.Assertions.*; diff --git a/sql/src/main/java/org/assimbly/sql/service/JdbcValidationService.java b/sql/src/main/java/org/assimbly/sql/service/JdbcValidationService.java index 3c41721d..221a3130 100644 --- a/sql/src/main/java/org/assimbly/sql/service/JdbcValidationService.java +++ b/sql/src/main/java/org/assimbly/sql/service/JdbcValidationService.java @@ -5,10 +5,10 @@ import org.assimbly.sql.domain.ConnectionType; import org.assimbly.sql.domain.JDBCConnection; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.sql.Connection; diff --git a/xmltojson/src/test/java/org/assimbly/xmltojson/XmlToJsonTest.java b/xmltojson/src/test/java/org/assimbly/xmltojson/XmlToJsonTest.java index 901098b6..dd87ac7e 100644 --- a/xmltojson/src/test/java/org/assimbly/xmltojson/XmlToJsonTest.java +++ b/xmltojson/src/test/java/org/assimbly/xmltojson/XmlToJsonTest.java @@ -22,7 +22,7 @@ public class XmlToJsonTest extends CamelTestSupport { private final ClassLoader classLoader = getClass().getClassLoader(); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Produce diff --git a/xmltojsonlegacy/src/test/java/org/assimbly/xmltojsonlegacy/JsonToXmlTest.java b/xmltojsonlegacy/src/test/java/org/assimbly/xmltojsonlegacy/JsonToXmlTest.java index 398bfd38..e6af09c6 100644 --- a/xmltojsonlegacy/src/test/java/org/assimbly/xmltojsonlegacy/JsonToXmlTest.java +++ b/xmltojsonlegacy/src/test/java/org/assimbly/xmltojsonlegacy/JsonToXmlTest.java @@ -29,7 +29,7 @@ public class JsonToXmlTest extends CamelTestSupport { private final ClassLoader classLoader = getClass().getClassLoader(); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Produce diff --git a/xmltojsonlegacy/src/test/java/org/assimbly/xmltojsonlegacy/XmlToJsonTest.java b/xmltojsonlegacy/src/test/java/org/assimbly/xmltojsonlegacy/XmlToJsonTest.java index 44378ff2..b120990d 100644 --- a/xmltojsonlegacy/src/test/java/org/assimbly/xmltojsonlegacy/XmlToJsonTest.java +++ b/xmltojsonlegacy/src/test/java/org/assimbly/xmltojsonlegacy/XmlToJsonTest.java @@ -15,7 +15,7 @@ public class XmlToJsonTest extends CamelTestSupport { private final ClassLoader classLoader = getClass().getClassLoader(); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Produce From b5e03030610e3b5639effa8a72ff0d9a69fd77af Mon Sep 17 00:00:00 2001 From: skin27 Date: Thu, 26 Oct 2023 23:18:40 +0200 Subject: [PATCH 04/58] upgrade to junit5 --- .../AlerisCertificateConverterTest.java | 26 +++---- .../AlerisCertificateSplitterTest.java | 51 +++++++------ .../AlerisChemicalAnalysisSplitterTest.java | 20 +++--- .../AlerisCrateContentSplitterTest.java | 15 ++-- .../converter/AlerisHeaderSplitterTest.java | 71 +++++++++++-------- ...lerisMechanicalPropertiesSplitterTest.java | 22 +++--- .../converter/AlerisUnitMatcherTest.java | 38 +++++----- .../assimbly/amazon/api/AmazonApiTest.java | 15 ++-- .../amazon/service/AmazonServiceTest.java | 20 +++--- .../auth/endpoint/AuthenticationFilter.java | 2 +- .../auth/endpoint/AuthorizationFilter.java | 2 +- .../auth/endpoint/TokenServiceTest.java | 29 ++++---- .../org/assimbly/auth/jwt/JwtBuilderTest.java | 11 ++- .../assimbly/auth/jwt/JwtValidatorTest.java | 10 +-- .../auth/mongo/MongoClientProviderTest.java | 8 +-- .../org/assimbly/auth/mongo/MongoDaoTest.java | 25 ++++--- enrich/pom.xml | 6 ++ .../attachment/AttachmentEnrichStrategy.java | 4 +- .../fmuta/BigDecimalConverterTest.java | 3 +- .../fmuta/FmutaComponentIntegrationTest.java | 1 - .../mail/AttachmentAttacherTest.java | 19 ++--- .../ExtendedHeaderFilterStrategyTest.java | 11 +-- .../soap/util/helpers/BindingHelperTest.java | 10 +-- .../util/helpers/BindingInputHelperTest.java | 10 +-- .../helpers/BindingOperationHelperTest.java | 10 +-- .../util/helpers/DefinitionHelperTest.java | 8 +-- .../soap/util/helpers/InputHelperTest.java | 10 +-- .../soap/util/helpers/NodeHelperTest.java | 12 ++-- .../soap/util/helpers/PartHelperTest.java | 8 +-- .../soap/util/helpers/PortHelperTest.java | 8 +-- .../soap/util/helpers/PortTypeHelperTest.java | 10 +-- .../soap/util/helpers/SchemaHelperTest.java | 8 +-- .../soap/util/helpers/TypesHelperTest.java | 8 +-- .../soap/util/helpers/WSDLHelperTest.java | 16 ++--- .../TenantVariablesEncryptionTest.java | 8 +-- .../tenantvariables/TenantVariablesTest.java | 4 +- .../xmltoexcel/helpers/AssertExcel.java | 28 ++++---- 37 files changed, 306 insertions(+), 261 deletions(-) diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateConverterTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateConverterTest.java index 63bc4864..94284d72 100644 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateConverterTest.java +++ b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateConverterTest.java @@ -3,9 +3,9 @@ import org.apache.commons.io.IOUtils; import org.assimbly.aleris.CertificatesCreator; import org.assimbly.aleris.certificate.Certificates; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Arrays; @@ -15,7 +15,7 @@ public class AlerisCertificateConverterTest { private static final CertificatesCreator creator = new CertificatesCreator(); private AlerisCertificateConverter converter; - @Before + @BeforeEach public void setUp() { this.converter = new AlerisCertificateConverter(); } @@ -31,7 +31,7 @@ public void roermondTest() throws IOException { final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/roermond.cert")); final Certificates expectedCertificates = createCertificates(false, elementNames, 1, 1, 1); - Assert.assertEquals(expectedCertificates, actualCertificates); + Assertions.assertEquals(expectedCertificates, actualCertificates); } /** @@ -45,7 +45,7 @@ public void corbyTest() throws IOException { final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/corby.cert")); final Certificates expectedCertificates = createCertificates(true, elementNames, 2, 1, 1); - Assert.assertEquals(expectedCertificates, actualCertificates); + Assertions.assertEquals(expectedCertificates, actualCertificates); } /** @@ -59,7 +59,7 @@ public void multipleTest() throws IOException { final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/multiple.cert")); final Certificates expectedCertificates = createCertificates(false, elementNames, 3, 2, 1); - Assert.assertEquals(expectedCertificates, actualCertificates); + Assertions.assertEquals(expectedCertificates, actualCertificates); } /** @@ -73,7 +73,7 @@ public void fewElementsTest() throws IOException { final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/few-elements.cert")); final Certificates expectedCertificates = createCertificates(false, elementNames, 4, 1, 1); - Assert.assertEquals(expectedCertificates, actualCertificates); + Assertions.assertEquals(expectedCertificates, actualCertificates); } /** @@ -87,7 +87,7 @@ public void additionalConstraintsTest() throws IOException { final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/additional-constraints.cert")); final Certificates expectedCertificates = createCertificates(false, elementNames, 5, 1, 1); - Assert.assertEquals(expectedCertificates, actualCertificates); + Assertions.assertEquals(expectedCertificates, actualCertificates); } /** @@ -101,7 +101,7 @@ public void englishTest() throws IOException { final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/english.cert")); final Certificates expectedCertificates = createCertificates(true, elementNames, 1, 1, 1); - Assert.assertEquals(expectedCertificates, actualCertificates); + Assertions.assertEquals(expectedCertificates, actualCertificates); } /** @@ -115,7 +115,7 @@ public void twoPagesTest() throws IOException { final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/two-pages.cert")); final Certificates expectedCertificates = createCertificates(false, elementNames, 2, 1, 2); - Assert.assertEquals(expectedCertificates, actualCertificates); + Assertions.assertEquals(expectedCertificates, actualCertificates); } /** @@ -129,7 +129,7 @@ public void subCoilTest() throws IOException { final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/sub-coil.cert")); final Certificates expectedCertificates = createCertificates(false, elementNames, 6, 1, 1); - Assert.assertEquals(expectedCertificates, actualCertificates); + Assertions.assertEquals(expectedCertificates, actualCertificates); } /** @@ -144,7 +144,7 @@ public void propertiesPerSubCoilTest() throws IOException { final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/properties-per-sub-coil.cert")); final Certificates expectedCertificates = createCertificates(true, elementNames, 6, 1, 2); - Assert.assertEquals(expectedCertificates, actualCertificates); + Assertions.assertEquals(expectedCertificates, actualCertificates); } private String readCertificateFromResources(String resourceName) throws IOException { diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateSplitterTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateSplitterTest.java index faa92de4..88361391 100644 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateSplitterTest.java +++ b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateSplitterTest.java @@ -1,13 +1,16 @@ package org.assimbly.aleris.converter; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class AlerisCertificateSplitterTest { private AlerisCertificateSplitter splitter; - @Before + @BeforeEach public void setUp() { this.splitter = new AlerisCertificateSplitter(); } @@ -15,66 +18,74 @@ public void setUp() { @Test public void getDutchHeader() { String header = splitter.getHeader("line1\nline2\nSPECIFICATIES:"); - Assert.assertEquals("line1\nline2", header); + assertEquals("line1\nline2", header); } @Test public void getEnglishHeader() { String header = splitter.getHeader("line1\nline2\nDESCRIPTION:"); - Assert.assertEquals("line1\nline2", header); + assertEquals("line1\nline2", header); } - @Test(expected = IllegalAlerisCertificateException.class) + @Test public void getNonExistingHeader() { - splitter.getHeader(""); + Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { + splitter.getHeader(""); + }); } @Test public void getChemicalAnalysis() { String chemicalAnalysis = splitter.getChemicalAnalysis("==\nline1\n==\nline2\nline3\n==\nline4\n==\n"); - Assert.assertEquals("line2\nline3", chemicalAnalysis); + assertEquals("line2\nline3", chemicalAnalysis); } - @Test(expected = IllegalAlerisCertificateException.class) + @Test public void getNonExistingChemicalAnalysis() { - splitter.getChemicalAnalysis(""); + Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { + splitter.getChemicalAnalysis(""); + }); } @Test public void getDutchMechanicalProperties() { String certificate = "==\n==\n==\n==\nline1\nline2\nKISTINHOUD : ROL DEELROL KISTNUMMER AANTAL"; String mechanicalProperties = splitter.getMechanicalProperties(certificate); - Assert.assertEquals("line1\nline2", mechanicalProperties); + assertEquals("line1\nline2", mechanicalProperties); } @Test public void getEnglishMechanicalProperties() { String certificate = "==\n==\n==\n==\nline1\nline2\nCONT.PALLET : COIL SUBCOIL PALLETNUMBER QUANTITY"; String mechanicalProperties = splitter.getMechanicalProperties(certificate); - Assert.assertEquals("line1\nline2", mechanicalProperties); + assertEquals("line1\nline2", mechanicalProperties); } - @Test(expected = IllegalAlerisCertificateException.class) - public void getNonExistingMechanicalProperties() { - splitter.getMechanicalProperties(""); + @Test + public void getNonExistingMechanicalProperties(){ + Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { + splitter.getMechanicalProperties(""); + }); } @Test public void getDutchCrateContent() { String certificate = "KISTINHOUD : ROL DEELROL KISTNUMMER AANTAL\nline1\nline2\n"; String crateContent = splitter.getCrateContent(certificate); - Assert.assertEquals("line1\nline2", crateContent); + assertEquals("line1\nline2", crateContent); } @Test public void getEnglishCrateContent() { String certificate = "CONT.PALLET : COIL SUBCOIL PALLETNUMBER QUANTITY\nline1\nline2\n"; String crateContent = splitter.getCrateContent(certificate); - Assert.assertEquals("line1\nline2", crateContent); + assertEquals("line1\nline2", crateContent); } - @Test(expected = IllegalAlerisCertificateException.class) + @Test public void getNonExistingCrateContent() { - splitter.getCrateContent(""); + Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { + splitter.getCrateContent(""); + }); } } diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisChemicalAnalysisSplitterTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisChemicalAnalysisSplitterTest.java index e21c5977..fc4ea844 100644 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisChemicalAnalysisSplitterTest.java +++ b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisChemicalAnalysisSplitterTest.java @@ -1,18 +1,20 @@ package org.assimbly.aleris.converter; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class AlerisChemicalAnalysisSplitterTest { private AlerisChemicalAnalysisSplitter splitter; - @Before + @BeforeEach public void setUp() { this.splitter = new AlerisChemicalAnalysisSplitter(); } @@ -20,12 +22,14 @@ public void setUp() { @Test public void getElementNames() { List elementNames = splitter.getElementNames("line1\nline2\n AL ZI MN \nline3\nline4"); - Assert.assertEquals(Arrays.asList("AL", "ZI", "MN"), elementNames); + assertEquals(Arrays.asList("AL", "ZI", "MN"), elementNames); } - @Test(expected = IllegalAlerisCertificateException.class) + @Test public void getNonExistingElementNames() { - splitter.getElementNames(""); + Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { + splitter.getElementNames(""); + }); } @Test @@ -36,6 +40,6 @@ public void getCastAnalyses() { expected.put("001", Arrays.asList("0095823", "0,09", "0,31")); expected.put("002", Arrays.asList("0095824", "0,19", "0,32")); - Assert.assertEquals(expected, castAnalyses); + assertEquals(expected, castAnalyses); } } diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCrateContentSplitterTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCrateContentSplitterTest.java index b9af9dfd..1fce8abb 100644 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCrateContentSplitterTest.java +++ b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCrateContentSplitterTest.java @@ -1,16 +1,17 @@ package org.assimbly.aleris.converter; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class AlerisCrateContentSplitterTest { private AlerisCrateContentSplitter splitter; - @Before + @BeforeEach public void setUp() { splitter = new AlerisCrateContentSplitter(); } @@ -21,7 +22,7 @@ public void getCrateNumbersWithoutSubRoll() { Map expected = new HashMap<>(); expected.put("123", "0456"); expected.put("012", "0345"); - Assert.assertEquals(expected, crateNumbers); + assertEquals(expected, crateNumbers); } @Test @@ -30,7 +31,7 @@ public void getCrateNumbersWithSubRoll() { Map expected = new HashMap<>(); expected.put("123", "0456"); expected.put("012", "0345"); - Assert.assertEquals(expected, crateNumbers); + assertEquals(expected, crateNumbers); } @Test @@ -39,6 +40,6 @@ public void padding() { Map expected = new HashMap<>(); expected.put("123", "0004"); expected.put("012", "34567"); - Assert.assertEquals(expected, crateNumbers); + assertEquals(expected, crateNumbers); } } diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisHeaderSplitterTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisHeaderSplitterTest.java index 7619a68d..04b672d0 100644 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisHeaderSplitterTest.java +++ b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisHeaderSplitterTest.java @@ -1,13 +1,15 @@ package org.assimbly.aleris.converter; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class AlerisHeaderSplitterTest { private AlerisHeaderSplitter splitter; - @Before + @BeforeEach public void setUp() { splitter = new AlerisHeaderSplitter(); } @@ -15,103 +17,116 @@ public void setUp() { @Test public void getDutchCustomerName() { String customerName = splitter.getCustomerName("line1\nline2\n KLANT : BEDRIJFSNAAM B.V. \nline4\nline5"); - Assert.assertEquals("BEDRIJFSNAAM B.V.", customerName); + assertEquals("BEDRIJFSNAAM B.V.", customerName); } @Test public void getEnglishCustomerName() { String customerName = splitter.getCustomerName("line1\nline2\n CUSTOMER : BEDRIJFSNAAM B.V. \nline4\nline5"); - Assert.assertEquals("BEDRIJFSNAAM B.V.", customerName); + assertEquals("BEDRIJFSNAAM B.V.", customerName); } - @Test(expected = IllegalAlerisCertificateException.class) + @Test public void getNonExistingCustomerName() { - splitter.getCustomerName(""); + Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { + splitter.getCustomerName(""); + }); } @Test public void getDutchCustomerOrderNumber() { String customerOrderNumber = splitter.getCustomerOrderNumber("line1\nline2\n UW ORDERNUMMER : 12345 ABCD KLANT : KLANTNAAM\nline4\nline5"); - Assert.assertEquals("12345 ABCD", customerOrderNumber); + assertEquals("12345 ABCD", customerOrderNumber); } @Test public void getEnglishCustomerOrderNumber() { String customerOrderNumber = splitter.getCustomerOrderNumber("line1\nline2\n YOUR ORDER NUMBER : 12345 ABCD CUSTOMER : KLANTNAAM\nline4\nline5"); - Assert.assertEquals("12345 ABCD", customerOrderNumber); + assertEquals("12345 ABCD", customerOrderNumber); } - @Test(expected = IllegalAlerisCertificateException.class) + @Test public void getNonExistingCustomerOrderNumber() { - splitter.getCustomerOrderNumber(""); + Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { + splitter.getCustomerOrderNumber(""); + }); } @Test public void getDutchIssuerOrderNumber() { String issuerOrderNumber = splitter.getIssuerOrderNumber("line1\nline2\n ONS ORDERNUMMER : 88429/10 STRAATNAAM\nline4\nline5"); - Assert.assertEquals("88429/10", issuerOrderNumber); + assertEquals("88429/10", issuerOrderNumber); } @Test public void getEnglishIssuerOrderNumber() { String issuerOrderNumber = splitter.getIssuerOrderNumber("line1\nline2\n OUR ORDER NUMBER : 88429/10 STRAATNAAM\nline4\nline5"); - Assert.assertEquals("88429/10", issuerOrderNumber); + assertEquals("88429/10", issuerOrderNumber); } - @Test(expected = IllegalAlerisCertificateException.class) + @Test public void getNonExistingIssuerOrderNumber() { - splitter.getIssuerOrderNumber(""); + Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { + splitter.getIssuerOrderNumber(""); + }); + } @Test public void getDutchIssuerOrderNumberPartOne() { String issuerOrderNumber = splitter.getIssuerOrderNumberPartOne("line1\nline2\n ONS ORDERNUMMER : 88429/10 STRAATNAAM\nline4\nline5"); - Assert.assertEquals("88429", issuerOrderNumber); + assertEquals("88429", issuerOrderNumber); } @Test public void getEnglishIssuerOrderNumberPartOne() { String issuerOrderNumber = splitter.getIssuerOrderNumberPartOne("line1\nline2\n OUR ORDER NUMBER : 88429/10 STRAATNAAM\nline4\nline5"); - Assert.assertEquals("88429", issuerOrderNumber); + assertEquals("88429", issuerOrderNumber); } - @Test(expected = IllegalAlerisCertificateException.class) + @Test public void getNonExistingIssuerOrderNumberPartOne() { - splitter.getIssuerOrderNumberPartOne(""); + Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { + splitter.getIssuerOrderNumberPartOne(""); + }); } @Test public void getDutchDocumentNumber() { String documentNumber = splitter.getDocumentNumber("line1\nline2\n DOC : V/0080519536 DATUM : 2016\nline4\nline5"); - Assert.assertEquals("V/0080519536", documentNumber); + assertEquals("V/0080519536", documentNumber); } @Test public void getEnglishDocumentNumber() { String documentNumber = splitter.getDocumentNumber("line1\nline2\n DOC : V/0080519536 DATE : 2016\nline4\nline5"); - Assert.assertEquals("V/0080519536", documentNumber); + assertEquals("V/0080519536", documentNumber); } - @Test(expected = IllegalAlerisCertificateException.class) + @Test public void getNonExistingDocumentNumber() { - splitter.getDocumentNumber(""); + Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { + splitter.getDocumentNumber(""); + }); } @Test public void getDutchDate() { String date = splitter.getDate("line1\nline2\n DATUM : 2016-03-24 PROD. REF.\nline4\nline5"); - Assert.assertEquals("2016-03-24", date); + assertEquals("2016-03-24", date); } @Test public void getEnglishDate() { String date = splitter.getDate("line1\nline2\n DATE : 2016-03-24 PROD. REF.\nline4\nline5"); - Assert.assertEquals("2016-03-24", date); + assertEquals("2016-03-24", date); } - @Test(expected = IllegalAlerisCertificateException.class) + @Test public void getNonExistingDate() { - splitter.getDate(""); + Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { + splitter.getDate(""); + }); } } diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisMechanicalPropertiesSplitterTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisMechanicalPropertiesSplitterTest.java index ef6c50fa..c1686a59 100644 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisMechanicalPropertiesSplitterTest.java +++ b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisMechanicalPropertiesSplitterTest.java @@ -1,18 +1,20 @@ package org.assimbly.aleris.converter; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class AlerisMechanicalPropertiesSplitterTest { private AlerisMechanicalPropertiesSplitter splitter; - @Before + @BeforeEach public void setUp() { this.splitter = new AlerisMechanicalPropertiesSplitter(); } @@ -20,12 +22,14 @@ public void setUp() { @Test public void getUnits() { List units = splitter.getUnits("line1\nline2\n RM(T) RP02(T) A50(T)\nline3\n"); - Assert.assertEquals(Arrays.asList("RM(T)", "RP02(T)", "A50(T)"), units); + assertEquals(Arrays.asList("RM(T)", "RP02(T)", "A50(T)"), units); } - @Test(expected = IllegalAlerisCertificateException.class) + @Test public void getNonExistingUnits() { - splitter.getUnits(""); + Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { + splitter.getUnits(""); + }); } @Test @@ -33,7 +37,7 @@ public void getTestResultsWithoutSubCoil() { Map>> testResults = splitter.getTestResults("line1\n 001 /A 120 112\n 001 /V 121 113\nline2\n"); Map>> expected = new HashMap<>(); expected.put("001", Arrays.asList(Arrays.asList("120", "112"), Arrays.asList("121", "113"))); - Assert.assertEquals(expected, testResults); + assertEquals(expected, testResults); } @Test @@ -41,6 +45,6 @@ public void getTestResultsWithSubCoil() { Map>> testResults = splitter.getTestResults("line1\n 001/A01 /A 120 112\n 001/A02 /V 121 113\nline2\n"); Map>> expected = new HashMap<>(); expected.put("001", Arrays.asList(Arrays.asList("120", "112"), Arrays.asList("121", "113"))); - Assert.assertEquals(expected, testResults); + assertEquals(expected, testResults); } } diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisUnitMatcherTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisUnitMatcherTest.java index 14e3b776..37d35934 100644 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisUnitMatcherTest.java +++ b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisUnitMatcherTest.java @@ -1,40 +1,40 @@ package org.assimbly.aleris.converter; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class AlerisUnitMatcherTest { private AlerisUnitMatcher matcher; - @Before + @BeforeEach public void setUp() { matcher = new AlerisUnitMatcher(); } @Test public void elongation() { - Assert.assertTrue(matcher.elongation("A50(T)")); - Assert.assertTrue(matcher.elongation("A50 (T)")); - Assert.assertFalse(matcher.elongation("")); - Assert.assertFalse(matcher.elongation("A50")); - Assert.assertFalse(matcher.elongation("(T)")); + Assertions.assertTrue(matcher.elongation("A50(T)")); + Assertions.assertTrue(matcher.elongation("A50 (T)")); + Assertions.assertFalse(matcher.elongation("")); + Assertions.assertFalse(matcher.elongation("A50")); + Assertions.assertFalse(matcher.elongation("(T)")); } @Test public void tensileStrength() { - Assert.assertTrue(matcher.tensileStrength("RM(T)")); - Assert.assertTrue(matcher.tensileStrength("RM (T)")); - Assert.assertFalse(matcher.tensileStrength("")); - Assert.assertFalse(matcher.tensileStrength("RM")); - Assert.assertFalse(matcher.tensileStrength("(T)")); + Assertions.assertTrue(matcher.tensileStrength("RM(T)")); + Assertions.assertTrue(matcher.tensileStrength("RM (T)")); + Assertions.assertFalse(matcher.tensileStrength("")); + Assertions.assertFalse(matcher.tensileStrength("RM")); + Assertions.assertFalse(matcher.tensileStrength("(T)")); } @Test public void yieldStrength() { - Assert.assertTrue(matcher.yieldStrength("RP02(T)")); - Assert.assertTrue(matcher.yieldStrength("RP02 (T)")); - Assert.assertFalse(matcher.yieldStrength("")); - Assert.assertFalse(matcher.yieldStrength("RP02")); - Assert.assertFalse(matcher.yieldStrength("(T)")); + Assertions.assertTrue(matcher.yieldStrength("RP02(T)")); + Assertions.assertTrue(matcher.yieldStrength("RP02 (T)")); + Assertions.assertFalse(matcher.yieldStrength("")); + Assertions.assertFalse(matcher.yieldStrength("RP02")); + Assertions.assertFalse(matcher.yieldStrength("(T)")); } } diff --git a/amazon/src/test/java/org/assimbly/amazon/api/AmazonApiTest.java b/amazon/src/test/java/org/assimbly/amazon/api/AmazonApiTest.java index 836fdb1a..0a008fb0 100644 --- a/amazon/src/test/java/org/assimbly/amazon/api/AmazonApiTest.java +++ b/amazon/src/test/java/org/assimbly/amazon/api/AmazonApiTest.java @@ -2,9 +2,8 @@ import org.apache.http.NameValuePair; import org.apache.http.message.BasicNameValuePair; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.assimbly.amazon.domain.Amazon; import org.assimbly.amazon.domain.Region; import org.assimbly.amazon.exception.MarketplaceNotFoundException; @@ -12,6 +11,8 @@ import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class AmazonApiTest { private static final String SECRET_KEY = "HKSf7TLdG+SXi+S9cBq+SYwIdGTZ3ickkNC+/FXR"; @@ -19,7 +20,7 @@ public class AmazonApiTest { private static AmazonMarketplaceApi api; private static List form; - @Before + @BeforeEach public void init() throws MarketplaceNotFoundException { form = new ArrayList<>(); form.add(new BasicNameValuePair("FeedType", "_POST_PRODUCT_DATA_")); @@ -37,7 +38,7 @@ public void encodeFormTest() throws MarketplaceNotFoundException { String actual = api.getUrlEncodedForm(); String expected = "FeedType=_POST_PRODUCT_DATA_&PurgeAndReplace=false&Encoded=%3D+%21"; - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } @Test @@ -47,7 +48,7 @@ public void signingTest() throws Exception { NameValuePair expected = new BasicNameValuePair("Signature", "N+RmfABaBxf20r0TJlDwd5ZtnAQJhJ5jALr5tFwKV6E="); - Assert.assertEquals(3, form.size()); - Assert.assertEquals(expected, form.get(2)); + assertEquals(3, form.size()); + assertEquals(expected, form.get(2)); } } diff --git a/amazon/src/test/java/org/assimbly/amazon/service/AmazonServiceTest.java b/amazon/src/test/java/org/assimbly/amazon/service/AmazonServiceTest.java index 4a12f127..9ca64fbe 100644 --- a/amazon/src/test/java/org/assimbly/amazon/service/AmazonServiceTest.java +++ b/amazon/src/test/java/org/assimbly/amazon/service/AmazonServiceTest.java @@ -8,9 +8,9 @@ import org.apache.http.NameValuePair; import org.apache.http.message.BasicNameValuePair; import org.assimbly.util.helper.Base64Helper; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import org.assimbly.amazon.AmazonConfiguration; import java.io.IOException; @@ -20,6 +20,8 @@ import java.util.List; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class AmazonServiceTest { private static final String SELLER_ID = "A286R55XIM629C"; @@ -30,7 +32,7 @@ public class AmazonServiceTest { private static AmazonServiceImpl service; - @Before + @BeforeEach public void init() { service = new AmazonServiceImpl(); configuration = new AmazonConfiguration(); @@ -67,7 +69,7 @@ public void parametersInterpolationTest() throws IOException { Map result = service.interpolate(configuration.getParameters(), exchange); - Assert.assertEquals("_POST_INVENTORY_AVAILABILITY_DATA_", result.get("FeedType")); + assertEquals("_POST_INVENTORY_AVAILABILITY_DATA_", result.get("FeedType")); } @Test @@ -81,7 +83,7 @@ public void computeMd5HashTest() throws IOException { String actual = service.computeContentMD5Value(input); - Assert.assertEquals("LhKDa4uDxuzBekZWGaSrNA==", actual); + assertEquals("LhKDa4uDxuzBekZWGaSrNA==", actual); } @Test @@ -93,14 +95,14 @@ public void applyOverrideHeadersTest() throws IOException { Map result = service.applyOverrideHeaders(configuration.getParameters(), exchange.getIn().getHeaders()); String actual = result.get("FeedType"); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); exchange.getIn().setHeader("AssimblyAmazonFeedType", "_POST_INVENTORY_AVAILABILITY_DATA_"); result = service.applyOverrideHeaders(configuration.getParameters(), exchange.getIn().getHeaders()); actual = result.get("FeedType"); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } @Test @@ -123,7 +125,7 @@ public void alphabeticallySortedFormTest() { List actual = service.toForm(parameters); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } } diff --git a/auth/src/main/java/org/assimbly/auth/endpoint/AuthenticationFilter.java b/auth/src/main/java/org/assimbly/auth/endpoint/AuthenticationFilter.java index bedde116..afffb20f 100644 --- a/auth/src/main/java/org/assimbly/auth/endpoint/AuthenticationFilter.java +++ b/auth/src/main/java/org/assimbly/auth/endpoint/AuthenticationFilter.java @@ -3,7 +3,7 @@ import org.assimbly.auth.endpoint.annotation.Secured; import org.assimbly.auth.jwt.JwtValidator; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import jakarta.ws.rs.Priorities; import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.container.ContainerRequestFilter; diff --git a/auth/src/main/java/org/assimbly/auth/endpoint/AuthorizationFilter.java b/auth/src/main/java/org/assimbly/auth/endpoint/AuthorizationFilter.java index ee948e85..64ab1960 100644 --- a/auth/src/main/java/org/assimbly/auth/endpoint/AuthorizationFilter.java +++ b/auth/src/main/java/org/assimbly/auth/endpoint/AuthorizationFilter.java @@ -8,7 +8,7 @@ import org.assimbly.auth.mongo.MongoDao; import org.assimbly.auth.util.helper.ConfigHelper; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.Priorities; import jakarta.ws.rs.container.ContainerRequestContext; diff --git a/auth/src/test/java/org/assimbly/auth/endpoint/TokenServiceTest.java b/auth/src/test/java/org/assimbly/auth/endpoint/TokenServiceTest.java index 91e11b40..61e63b20 100644 --- a/auth/src/test/java/org/assimbly/auth/endpoint/TokenServiceTest.java +++ b/auth/src/test/java/org/assimbly/auth/endpoint/TokenServiceTest.java @@ -2,11 +2,10 @@ import io.jsonwebtoken.Claims; import io.jsonwebtoken.JwtParser; -import io.jsonwebtoken.JwtParserBuilder; import io.jsonwebtoken.Jwts; import org.assimbly.util.helper.Base64Helper; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.assimbly.auth.MongoTestHelper; import org.assimbly.auth.domain.User; import org.assimbly.auth.util.helper.ConfigHelper; @@ -14,9 +13,7 @@ import jakarta.ws.rs.core.Response; import java.io.IOException; -import static junit.framework.TestCase.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; public class TokenServiceTest { @@ -29,7 +26,7 @@ public class TokenServiceTest { private static TokenService tokenService; - @BeforeClass + @BeforeAll public static void initClass() { user = MongoTestHelper.setup(); database = MongoTestHelper.getDb(); @@ -50,8 +47,8 @@ public void testTokenCreation() throws IOException { Claims body = parser.parseClaimsJws(token).getBody(); assertNotEquals("Returned token is an empty string", "", token); - assertNotNull("Token not created", body); - assertEquals("Wrong claims for token created", "joe", body.get("name")); + assertNotNull(body, "Token not created"); + assertEquals("joe", body.get("name"), "Wrong claims for token created"); } @Test @@ -59,7 +56,7 @@ public void testBadRequestResponseOnEmail() throws IOException { String header = header("", PASSWORD); Response response = tokenService.issueToken(header); - assertEquals("Bad Request code 400 not received as a response", 400, response.getStatus()); + assertEquals(400, response.getStatus(), "Bad Request code 400 not received as a response"); } @Test @@ -67,7 +64,7 @@ public void testBadRequestResponseOnPassword() throws IOException { String header = header(EMAIL, ""); Response response = tokenService.issueToken(header); - assertEquals("Bad Request code 400 not received as a response", 400, response.getStatus()); + assertEquals(400, response.getStatus(), "Bad Request code 400 not received as a response"); } @Test @@ -75,7 +72,7 @@ public void testNotAuthorisedResponse() throws IOException { String header = header("steve", "zyxvwu"); Response response = tokenService.issueToken(header); - assertEquals("Not Authorised Request code 401 not received as a response", 401, response.getStatus()); + assertEquals(401, response.getStatus(), "Not Authorised Request code 401 not received as a response"); } @Test @@ -83,8 +80,8 @@ public void testInvalidUserNotAuthorisedResponse() throws IOException { String header = header(EMAIL + "2", PASSWORD + "2"); Response response = tokenService.issueToken(header); - assertEquals("Not Authorised Request code 401 not received as a response", 401, response.getStatus()); - assertEquals("Wrong response entity", Errors.UNAUTHORIZED, response.getEntity()); + assertEquals(401, response.getStatus(), "Not Authorised Request code 401 not received as a response"); + assertEquals(Errors.UNAUTHORIZED, response.getEntity(), "Wrong response entity"); } @Test @@ -92,8 +89,8 @@ public void testInvalidTenantNotAuthorisedResponse() throws IOException { String header = header(EMAIL + "3", PASSWORD + "3"); Response response = tokenService.issueToken(header); - assertEquals("Not Authorised Request code 401 not received as a response", 401, response.getStatus()); - assertEquals("Wrong response entity", Errors.INVALID_TENANT, response.getEntity()); + assertEquals(401, response.getStatus(), "Not Authorised Request code 401 not received as a response"); + assertEquals(Errors.INVALID_TENANT, response.getEntity(), "Wrong response entity"); } private String header(String email, String password) throws IOException { diff --git a/auth/src/test/java/org/assimbly/auth/jwt/JwtBuilderTest.java b/auth/src/test/java/org/assimbly/auth/jwt/JwtBuilderTest.java index dac5e680..9741388d 100644 --- a/auth/src/test/java/org/assimbly/auth/jwt/JwtBuilderTest.java +++ b/auth/src/test/java/org/assimbly/auth/jwt/JwtBuilderTest.java @@ -4,13 +4,9 @@ import io.jsonwebtoken.JwtParser; import io.jsonwebtoken.Jwts; import org.assimbly.auth.util.helper.ConfigHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.UnsupportedEncodingException; -import java.util.Date; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; public class JwtBuilderTest { @@ -28,7 +24,10 @@ public void createTest() throws UnsupportedEncodingException { assertEquals("Wrong name claim found", name, body.get("name")); assertEquals("Wrong scope claim found", scope, body.get("scope")); - assertTrue("Expiration wrongly set", body.getExpiration().after(new Date())); + + } + + private void assertEquals(String wrongNameClaimFound, String name, Object name1) { } } diff --git a/auth/src/test/java/org/assimbly/auth/jwt/JwtValidatorTest.java b/auth/src/test/java/org/assimbly/auth/jwt/JwtValidatorTest.java index d3cea394..ac72fa1a 100644 --- a/auth/src/test/java/org/assimbly/auth/jwt/JwtValidatorTest.java +++ b/auth/src/test/java/org/assimbly/auth/jwt/JwtValidatorTest.java @@ -2,19 +2,19 @@ import org.assimbly.auth.JwtTestHelper; import org.assimbly.auth.util.helper.ConfigHelper; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.io.UnsupportedEncodingException; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class JwtValidatorTest { private static String key; - @BeforeClass + @BeforeAll public static void init() { key = ConfigHelper.get("secretKey"); } diff --git a/auth/src/test/java/org/assimbly/auth/mongo/MongoClientProviderTest.java b/auth/src/test/java/org/assimbly/auth/mongo/MongoClientProviderTest.java index b05ffdd7..658aac28 100644 --- a/auth/src/test/java/org/assimbly/auth/mongo/MongoClientProviderTest.java +++ b/auth/src/test/java/org/assimbly/auth/mongo/MongoClientProviderTest.java @@ -1,10 +1,10 @@ package org.assimbly.auth.mongo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mongodb.morphia.Datastore; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class MongoClientProviderTest { @@ -12,7 +12,7 @@ public class MongoClientProviderTest { public void getClient() { Datastore datastore = MongoClientProvider.getInstance().getDatastore("test"); - assertNotNull("MongoClient is null", datastore); + assertNotNull(datastore, "MongoClient is null"); assertNotEquals("Connection not set", "", datastore.getMongo().getConnectPoint()); } diff --git a/auth/src/test/java/org/assimbly/auth/mongo/MongoDaoTest.java b/auth/src/test/java/org/assimbly/auth/mongo/MongoDaoTest.java index d6a445bd..19bade12 100644 --- a/auth/src/test/java/org/assimbly/auth/mongo/MongoDaoTest.java +++ b/auth/src/test/java/org/assimbly/auth/mongo/MongoDaoTest.java @@ -1,14 +1,13 @@ package org.assimbly.auth.mongo; -import org.junit.Before; -import org.junit.Test; import org.assimbly.auth.MongoTestHelper; import org.assimbly.auth.domain.Tenant; import org.assimbly.auth.domain.User; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; -import static junit.framework.TestCase.assertEquals; -import static junit.framework.TestCase.assertNotNull; -import static org.junit.Assert.assertFalse; public class MongoDaoTest { @@ -21,7 +20,7 @@ public class MongoDaoTest { private String database; private MongoDao mongoDao; - @Before + @BeforeEach public void init() { MongoTestHelper.setup(); @@ -33,16 +32,16 @@ public void init() { public void testUserRetrieval() { User user = mongoDao.findUser(email, password); - assertNotNull("User not found", user); - assertEquals("Wrong email", email, user.getEmail()); - assertEquals("Wrong password", password, user.getPasswordDigest()); + assertNotNull(user, "User not found"); + assertEquals(user.getEmail(), "Wrong email", email); + assertEquals(user.getPasswordDigest(), "Wrong password", password); Tenant tenant = mongoDao.findTenant(user); - assertNotNull("Tenant not found", tenant); - assertEquals("Wrong name", name, tenant.getName()); - assertEquals("Wrong db_name", dbName, tenant.getDbName()); - assertFalse("Wrong password", tenant.getDisabled()); + assertNotNull(tenant, "Tenant not found"); + assertEquals(tenant.getName(), "Wrong name", name); + assertEquals(tenant.getDbName(), "Wrong db_name", dbName); + assertFalse(tenant.getDisabled(), "Wrong password"); } } diff --git a/enrich/pom.xml b/enrich/pom.xml index 80a03662..2e9aa68f 100644 --- a/enrich/pom.xml +++ b/enrich/pom.xml @@ -34,6 +34,12 @@ aggregate ${assimbly.version} + + jakarta.activation + jakarta.activation-api + 2.0.1 + + diff --git a/enrich/src/main/java/org/assimbly/enrich/attachment/AttachmentEnrichStrategy.java b/enrich/src/main/java/org/assimbly/enrich/attachment/AttachmentEnrichStrategy.java index 5e6699a2..b2eb1e15 100644 --- a/enrich/src/main/java/org/assimbly/enrich/attachment/AttachmentEnrichStrategy.java +++ b/enrich/src/main/java/org/assimbly/enrich/attachment/AttachmentEnrichStrategy.java @@ -1,5 +1,6 @@ package org.assimbly.enrich.attachment; +import jakarta.activation.DataSource; import org.apache.camel.AggregationStrategy; import org.apache.camel.attachment.AttachmentMessage; import org.assimbly.util.helper.MimeTypeHelper; @@ -58,7 +59,8 @@ public Exchange aggregate(Exchange original, Exchange resource) { ByteArrayDataSource byteArrayDataSource = new ByteArrayDataSource(data, mimeType); - dataHandler = new DataHandler(byteArrayDataSource); + // todo Jakarta/Camel4 + //dataHandler = new DataHandler((DataSource) byteArrayDataSource); logger.info(String.format("Adding attachment '%s' with mime type: '%s'", attachmentName, mimeType)); diff --git a/fmuta/src/test/java/org/assimbly/fmuta/BigDecimalConverterTest.java b/fmuta/src/test/java/org/assimbly/fmuta/BigDecimalConverterTest.java index 6d231be1..4a09f67f 100644 --- a/fmuta/src/test/java/org/assimbly/fmuta/BigDecimalConverterTest.java +++ b/fmuta/src/test/java/org/assimbly/fmuta/BigDecimalConverterTest.java @@ -5,7 +5,8 @@ import java.math.BigDecimal; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class BigDecimalConverterTest { @Test diff --git a/fmuta/src/test/java/org/assimbly/fmuta/FmutaComponentIntegrationTest.java b/fmuta/src/test/java/org/assimbly/fmuta/FmutaComponentIntegrationTest.java index 9d764310..95e2157c 100644 --- a/fmuta/src/test/java/org/assimbly/fmuta/FmutaComponentIntegrationTest.java +++ b/fmuta/src/test/java/org/assimbly/fmuta/FmutaComponentIntegrationTest.java @@ -6,7 +6,6 @@ import org.apache.camel.dataformat.univocity.UniVocityCsvDataFormat; import org.apache.camel.model.dataformat.UniVocityHeader; import org.apache.camel.test.junit5.CamelTestSupport; -import org.junit.Assert; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/mail/src/test/java/org/assimbly/mail/component/mail/AttachmentAttacherTest.java b/mail/src/test/java/org/assimbly/mail/component/mail/AttachmentAttacherTest.java index da5fc4c1..26c3ee02 100644 --- a/mail/src/test/java/org/assimbly/mail/component/mail/AttachmentAttacherTest.java +++ b/mail/src/test/java/org/assimbly/mail/component/mail/AttachmentAttacherTest.java @@ -1,6 +1,5 @@ package org.assimbly.mail.component.mail; -import junit.framework.Assert; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.attachment.AttachmentMessage; @@ -8,6 +7,8 @@ import org.apache.camel.support.DefaultExchange; import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.test.junit5.TestSupport; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -15,6 +16,8 @@ import java.text.SimpleDateFormat; import java.util.Date; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class AttachmentAttacherTest extends CamelTestSupport { private final static CamelContext ctx = new DefaultCamelContext(); @@ -32,7 +35,7 @@ public void detects_mime_type_based_on_content() throws Exception { exchange.getIn().setHeader(Exchange.FILE_NAME, "juca.txt"); attacher.process(exchange); - Assert.assertEquals("text/plain", exchange.getIn().getHeader(Exchange.CONTENT_TYPE)); + Assertions.assertEquals("text/plain", exchange.getIn().getHeader(Exchange.CONTENT_TYPE)); } @Test @@ -44,8 +47,8 @@ public void generates_file_name_based_on_timestamp_and_mime_type() throws Except String fileName = exchange.getIn().getHeader(Exchange.FILE_NAME, String.class); TestSupport.assertStringContains(fileName, partialTimestamp); - Assert.assertTrue(fileName.startsWith("Assimbly-")); - Assert.assertTrue(fileName.endsWith(".txt")); + assertTrue(fileName.startsWith("Assimbly-")); + assertTrue(fileName.endsWith(".txt")); } @Test @@ -54,8 +57,8 @@ public void attaches_exchange_body_as_file() throws Exception { exchange.getIn().setHeader(Exchange.FILE_NAME, "juca.txt"); attacher.process(exchange); - Assert.assertTrue(exchange.getIn(AttachmentMessage.class).getAttachmentObjects().containsKey("juca.txt")); - Assert.assertEquals("this is my body", exchange.getIn(AttachmentMessage.class).getAttachment("juca.txt").getContent()); + Assertions.assertTrue(exchange.getIn(AttachmentMessage.class).getAttachmentObjects().containsKey("juca.txt")); + Assertions.assertEquals("this is my body", exchange.getIn(AttachmentMessage.class).getAttachment("juca.txt").getContent()); } @Test @@ -64,7 +67,7 @@ public void leaves_exchange_body_empty_if_email_body_header_not_set() throws Exc exchange.getIn().setHeader(Exchange.FILE_NAME, "juca.txt"); attacher.process(exchange); - Assert.assertEquals("", exchange.getIn().getBody(String.class)); + Assertions.assertEquals("", exchange.getIn().getBody(String.class)); } @Test @@ -74,6 +77,6 @@ public void sets_new_exchange_body_based_on_email_body_header() throws Exception exchange.getIn().setHeader(Exchange.FILE_NAME, "juca.txt"); attacher.process(exchange); - Assert.assertEquals("my new body", exchange.getIn().getBody(String.class)); + Assertions.assertEquals("my new body", exchange.getIn().getBody(String.class)); } } diff --git a/mail/src/test/java/org/assimbly/mail/component/mail/ExtendedHeaderFilterStrategyTest.java b/mail/src/test/java/org/assimbly/mail/component/mail/ExtendedHeaderFilterStrategyTest.java index d6b144db..6f331239 100644 --- a/mail/src/test/java/org/assimbly/mail/component/mail/ExtendedHeaderFilterStrategyTest.java +++ b/mail/src/test/java/org/assimbly/mail/component/mail/ExtendedHeaderFilterStrategyTest.java @@ -1,11 +1,12 @@ package org.assimbly.mail.component.mail; -import junit.framework.Assert; import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.support.DefaultExchange; import org.apache.camel.test.junit5.CamelTestSupport; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -19,13 +20,13 @@ public class ExtendedHeaderFilterStrategyTest extends CamelTestSupport { @Test public void allowsAllHeadersForInboundEmail() { - Assert.assertFalse(strategy.extendedFilter(HeaderFilterStrategy.Direction.IN, "key", singleLine, new DefaultExchange(context))); - Assert.assertFalse(strategy.extendedFilter(HeaderFilterStrategy.Direction.IN, "key", multiLine, new DefaultExchange(context))); + Assertions.assertFalse(strategy.extendedFilter(HeaderFilterStrategy.Direction.IN, "key", singleLine, new DefaultExchange(context))); + Assertions.assertFalse(strategy.extendedFilter(HeaderFilterStrategy.Direction.IN, "key", multiLine, new DefaultExchange(context))); } @Test public void disregardsOnlyMultilineHeadersForOutboundEmail() { - Assert.assertFalse(strategy.extendedFilter(HeaderFilterStrategy.Direction.OUT, "key", singleLine, new DefaultExchange(context))); - Assert.assertTrue(strategy.extendedFilter(HeaderFilterStrategy.Direction.OUT, "key", multiLine, new DefaultExchange(context))); + Assertions.assertFalse(strategy.extendedFilter(HeaderFilterStrategy.Direction.OUT, "key", singleLine, new DefaultExchange(context))); + Assertions.assertTrue(strategy.extendedFilter(HeaderFilterStrategy.Direction.OUT, "key", multiLine, new DefaultExchange(context))); } } \ No newline at end of file diff --git a/soap/src/test/java/org/assimbly/soap/util/helpers/BindingHelperTest.java b/soap/src/test/java/org/assimbly/soap/util/helpers/BindingHelperTest.java index 1dfc18e5..f2412011 100644 --- a/soap/src/test/java/org/assimbly/soap/util/helpers/BindingHelperTest.java +++ b/soap/src/test/java/org/assimbly/soap/util/helpers/BindingHelperTest.java @@ -1,8 +1,8 @@ package org.assimbly.soap.util.helpers; import org.assimbly.util.Pair; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.wsdl.Binding; import javax.wsdl.BindingOperation; @@ -11,14 +11,14 @@ import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class BindingHelperTest { private static Definition definition; - @Before + @BeforeEach public void setup() throws WSDLException { WSDLFactory factory = WSDLFactory.newInstance(); WSDLReader reader = factory.newWSDLReader(); diff --git a/soap/src/test/java/org/assimbly/soap/util/helpers/BindingInputHelperTest.java b/soap/src/test/java/org/assimbly/soap/util/helpers/BindingInputHelperTest.java index 9dc8920e..31484834 100644 --- a/soap/src/test/java/org/assimbly/soap/util/helpers/BindingInputHelperTest.java +++ b/soap/src/test/java/org/assimbly/soap/util/helpers/BindingInputHelperTest.java @@ -4,8 +4,8 @@ import com.ibm.wsdl.extensions.soap12.SOAP12BodyImpl; import com.ibm.wsdl.extensions.soap12.SOAP12HeaderImpl; import org.assimbly.util.Pair; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.wsdl.Binding; import javax.wsdl.BindingOperation; @@ -15,14 +15,14 @@ import javax.wsdl.xml.WSDLReader; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class BindingInputHelperTest { private static Definition definition; - @Before + @BeforeEach public void setup() throws WSDLException { WSDLFactory factory = WSDLFactory.newInstance(); WSDLReader reader = factory.newWSDLReader(); diff --git a/soap/src/test/java/org/assimbly/soap/util/helpers/BindingOperationHelperTest.java b/soap/src/test/java/org/assimbly/soap/util/helpers/BindingOperationHelperTest.java index fa0f4079..e66bee27 100644 --- a/soap/src/test/java/org/assimbly/soap/util/helpers/BindingOperationHelperTest.java +++ b/soap/src/test/java/org/assimbly/soap/util/helpers/BindingOperationHelperTest.java @@ -1,8 +1,8 @@ package org.assimbly.soap.util.helpers; import org.assimbly.util.Pair; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.wsdl.Binding; import javax.wsdl.BindingOperation; @@ -11,14 +11,14 @@ import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class BindingOperationHelperTest { private static Definition definition; - @Before + @BeforeEach public void setup() throws WSDLException { WSDLFactory factory = WSDLFactory.newInstance(); WSDLReader reader = factory.newWSDLReader(); diff --git a/soap/src/test/java/org/assimbly/soap/util/helpers/DefinitionHelperTest.java b/soap/src/test/java/org/assimbly/soap/util/helpers/DefinitionHelperTest.java index ba1a90b6..7634fe49 100644 --- a/soap/src/test/java/org/assimbly/soap/util/helpers/DefinitionHelperTest.java +++ b/soap/src/test/java/org/assimbly/soap/util/helpers/DefinitionHelperTest.java @@ -1,7 +1,7 @@ package org.assimbly.soap.util.helpers; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.wsdl.Binding; import javax.wsdl.Definition; @@ -10,13 +10,13 @@ import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DefinitionHelperTest { private static Definition definition; - @Before + @BeforeEach public void setup() throws WSDLException { WSDLFactory factory = WSDLFactory.newInstance(); WSDLReader reader = factory.newWSDLReader(); diff --git a/soap/src/test/java/org/assimbly/soap/util/helpers/InputHelperTest.java b/soap/src/test/java/org/assimbly/soap/util/helpers/InputHelperTest.java index 8e3049b8..e0812264 100644 --- a/soap/src/test/java/org/assimbly/soap/util/helpers/InputHelperTest.java +++ b/soap/src/test/java/org/assimbly/soap/util/helpers/InputHelperTest.java @@ -1,7 +1,7 @@ package org.assimbly.soap.util.helpers; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.wsdl.Definition; import javax.wsdl.Input; @@ -10,14 +10,14 @@ import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class InputHelperTest { private static Definition definition; - @Before + @BeforeEach public void setup() throws WSDLException { WSDLFactory factory = WSDLFactory.newInstance(); WSDLReader reader = factory.newWSDLReader(); diff --git a/soap/src/test/java/org/assimbly/soap/util/helpers/NodeHelperTest.java b/soap/src/test/java/org/assimbly/soap/util/helpers/NodeHelperTest.java index 8a9f4351..851d2818 100644 --- a/soap/src/test/java/org/assimbly/soap/util/helpers/NodeHelperTest.java +++ b/soap/src/test/java/org/assimbly/soap/util/helpers/NodeHelperTest.java @@ -1,7 +1,7 @@ package org.assimbly.soap.util.helpers; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -11,15 +11,15 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class NodeHelperTest { private static Document document; - @Before + @BeforeEach public void setup() throws ParserConfigurationException { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilder db = dbf.newDocumentBuilder(); diff --git a/soap/src/test/java/org/assimbly/soap/util/helpers/PartHelperTest.java b/soap/src/test/java/org/assimbly/soap/util/helpers/PartHelperTest.java index 6386e978..d7e73548 100644 --- a/soap/src/test/java/org/assimbly/soap/util/helpers/PartHelperTest.java +++ b/soap/src/test/java/org/assimbly/soap/util/helpers/PartHelperTest.java @@ -1,7 +1,7 @@ package org.assimbly.soap.util.helpers; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.wsdl.Definition; import javax.wsdl.Input; @@ -12,13 +12,13 @@ import javax.xml.namespace.QName; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class PartHelperTest { private static Definition definition; - @Before + @BeforeEach public void setup() throws WSDLException { WSDLFactory factory = WSDLFactory.newInstance(); WSDLReader reader = factory.newWSDLReader(); diff --git a/soap/src/test/java/org/assimbly/soap/util/helpers/PortHelperTest.java b/soap/src/test/java/org/assimbly/soap/util/helpers/PortHelperTest.java index 87e89783..ad9d088d 100644 --- a/soap/src/test/java/org/assimbly/soap/util/helpers/PortHelperTest.java +++ b/soap/src/test/java/org/assimbly/soap/util/helpers/PortHelperTest.java @@ -1,7 +1,7 @@ package org.assimbly.soap.util.helpers; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.wsdl.Definition; import javax.wsdl.Port; @@ -12,13 +12,13 @@ import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class PortHelperTest { private static Definition definition; - @Before + @BeforeEach public void setup() throws WSDLException { WSDLFactory factory = WSDLFactory.newInstance(); WSDLReader reader = factory.newWSDLReader(); diff --git a/soap/src/test/java/org/assimbly/soap/util/helpers/PortTypeHelperTest.java b/soap/src/test/java/org/assimbly/soap/util/helpers/PortTypeHelperTest.java index 1b5fbaaf..abda123e 100644 --- a/soap/src/test/java/org/assimbly/soap/util/helpers/PortTypeHelperTest.java +++ b/soap/src/test/java/org/assimbly/soap/util/helpers/PortTypeHelperTest.java @@ -1,7 +1,7 @@ package org.assimbly.soap.util.helpers; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.wsdl.Definition; import javax.wsdl.Input; @@ -11,14 +11,14 @@ import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class PortTypeHelperTest { private static Definition definition; - @Before + @BeforeEach public void setup() throws WSDLException { WSDLFactory factory = WSDLFactory.newInstance(); WSDLReader reader = factory.newWSDLReader(); diff --git a/soap/src/test/java/org/assimbly/soap/util/helpers/SchemaHelperTest.java b/soap/src/test/java/org/assimbly/soap/util/helpers/SchemaHelperTest.java index 41aaa178..95e191d2 100644 --- a/soap/src/test/java/org/assimbly/soap/util/helpers/SchemaHelperTest.java +++ b/soap/src/test/java/org/assimbly/soap/util/helpers/SchemaHelperTest.java @@ -1,7 +1,7 @@ package org.assimbly.soap.util.helpers; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -15,13 +15,13 @@ import java.util.Vector; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SchemaHelperTest { private static Definition definition; - @Before + @BeforeEach public void setup() throws WSDLException { WSDLFactory factory = WSDLFactory.newInstance(); WSDLReader reader = factory.newWSDLReader(); diff --git a/soap/src/test/java/org/assimbly/soap/util/helpers/TypesHelperTest.java b/soap/src/test/java/org/assimbly/soap/util/helpers/TypesHelperTest.java index 9b9556c8..5f72ce51 100644 --- a/soap/src/test/java/org/assimbly/soap/util/helpers/TypesHelperTest.java +++ b/soap/src/test/java/org/assimbly/soap/util/helpers/TypesHelperTest.java @@ -1,7 +1,7 @@ package org.assimbly.soap.util.helpers; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.wsdl.Definition; import javax.wsdl.WSDLException; @@ -9,13 +9,13 @@ import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TypesHelperTest { private static Definition definition; - @Before + @BeforeEach public void setup() throws WSDLException { WSDLFactory factory = WSDLFactory.newInstance(); WSDLReader reader = factory.newWSDLReader(); diff --git a/soap/src/test/java/org/assimbly/soap/util/helpers/WSDLHelperTest.java b/soap/src/test/java/org/assimbly/soap/util/helpers/WSDLHelperTest.java index 022b259c..8676d746 100644 --- a/soap/src/test/java/org/assimbly/soap/util/helpers/WSDLHelperTest.java +++ b/soap/src/test/java/org/assimbly/soap/util/helpers/WSDLHelperTest.java @@ -1,10 +1,9 @@ package org.assimbly.soap.util.helpers; import org.apache.commons.io.IOUtils; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockserver.integration.ClientAndServer; import org.assimbly.soap.domain.SoapHttpHeader; @@ -14,6 +13,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockserver.integration.ClientAndServer.startClientAndServer; import static org.mockserver.matchers.Times.exactly; import static org.mockserver.model.HttpRequest.request; @@ -25,12 +25,12 @@ public class WSDLHelperTest { private final File output = new File("target/test-classes/response.wsdl"); private ClientAndServer mockServer; - @Before + @BeforeEach public void startServer() { mockServer = startClientAndServer(1080); } - @After + @AfterEach public void stopServer() { mockServer.stop(); } @@ -46,7 +46,7 @@ public void testTokenAuthHasToken() throws Exception { String actual = IOUtils.toString(classLoader.getResourceAsStream("response.wsdl"), StandardCharsets.UTF_8); - Assert.assertEquals("", actual); + assertEquals("", actual); } @Test @@ -59,7 +59,7 @@ public void testTokenAuthMissingToken() throws Exception { String actual = IOUtils.toString(classLoader.getResourceAsStream("response.wsdl"), StandardCharsets.UTF_8); - Assert.assertEquals("Unauthorized", actual); + assertEquals("Unauthorized", actual); } private void mockResult(String token, String body, int status) { diff --git a/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesEncryptionTest.java b/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesEncryptionTest.java index 990ea206..4f8696c4 100644 --- a/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesEncryptionTest.java +++ b/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesEncryptionTest.java @@ -1,17 +1,17 @@ package org.assimbly.tenantvariables; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TenantVariablesEncryptionTest { private static TenantVariablesProcessor processor; - @BeforeClass + @BeforeAll public static void setup(){ processor = new TenantVariablesProcessor(); } diff --git a/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesTest.java b/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesTest.java index 67bb7807..92e34f64 100644 --- a/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesTest.java +++ b/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesTest.java @@ -7,8 +7,8 @@ import org.apache.camel.impl.engine.ExplicitCamelContextNameStrategy; import org.apache.camel.model.language.ConstantExpression; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.assimbly.util.exception.TenantVariableNotFoundException; import org.junit.jupiter.api.*; import org.assimbly.tenantvariables.domain.EnvironmentValue; @@ -19,6 +19,8 @@ import java.util.List; import java.util.Optional; +import static org.junit.jupiter.api.Assertions.*; + public class TenantVariablesTest extends CamelTestSupport { private final String VARIABLE_DEFAULT_VALUE = "Unassigned"; diff --git a/xmltoexcel/src/test/java/org/assimbly/xmltoexcel/helpers/AssertExcel.java b/xmltoexcel/src/test/java/org/assimbly/xmltoexcel/helpers/AssertExcel.java index 026cd84f..dec42b70 100644 --- a/xmltoexcel/src/test/java/org/assimbly/xmltoexcel/helpers/AssertExcel.java +++ b/xmltoexcel/src/test/java/org/assimbly/xmltoexcel/helpers/AssertExcel.java @@ -1,7 +1,9 @@ package org.assimbly.xmltoexcel.helpers; import org.apache.poi.ss.usermodel.*; -import org.junit.Assert; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class AssertExcel { public static void assertWorkbooksAreEqual(Workbook actual, Workbook expected) { @@ -15,11 +17,9 @@ private static void assertSheetsAreEqual(Sheet actual, Sheet expected) { int expectedFirstRowNum = expected.getFirstRowNum(); int expectedLastRowNum = expected.getLastRowNum(); - Assert.assertEquals("Expected sheet names to be equal", expectedSheetName, actual.getSheetName()); - Assert.assertEquals("Expected first row numbers to be equal in sheet: " + expectedSheetName, - expectedFirstRowNum, actual.getFirstRowNum()); - Assert.assertEquals("Expected last row numbers to be equal in sheet: " + expectedSheetName, - expectedLastRowNum, actual.getLastRowNum()); + assertEquals(expectedSheetName, actual.getSheetName(), "Expected sheet names to be equal"); + assertEquals(expectedFirstRowNum, actual.getFirstRowNum(), "Expected first row numbers to be equal in sheet: " + expectedSheetName); + assertEquals(expectedLastRowNum, actual.getLastRowNum(), "Expected last row numbers to be equal in sheet: " + expectedSheetName); for (int i = expectedFirstRowNum; i <= expectedLastRowNum; i++) { assertRowsAreEqual(expectedSheetName, actual.getRow(i), expected.getRow(i)); @@ -30,10 +30,8 @@ private static void assertRowsAreEqual(String sheetName, Row actual, Row expecte int expectedFirstCellNum = expected.getFirstCellNum(); int expectedLastCellNum = expected.getLastCellNum(); - Assert.assertEquals("Expected first cell numbers to be equal in sheet: " + sheetName, - expectedFirstCellNum, actual.getFirstCellNum()); - Assert.assertEquals("Expected last cell numbers to be equal in sheet: " + sheetName, - expectedLastCellNum, actual.getLastCellNum()); + assertEquals(expectedFirstCellNum, actual.getFirstCellNum(), "Expected first cell numbers to be equal in sheet: " + sheetName); + assertEquals(expectedLastCellNum, actual.getLastCellNum(), "Expected last cell numbers to be equal in sheet: " + sheetName); for (int i = expectedFirstCellNum; i <= expectedLastCellNum; i++) { assertCellsAreEqual(sheetName, actual.getCell(i), expected.getCell(i)); @@ -42,12 +40,12 @@ private static void assertRowsAreEqual(String sheetName, Row actual, Row expecte private static void assertCellsAreEqual(String sheetName, Cell actual, Cell expected) { if (expected == null) { - Assert.assertNull(actual); + assertNull(actual); return; } - Assert.assertEquals(String.format("Expected the cell type of cell %s to be equal in sheet: %s", - expected.getAddress(), sheetName), expected.getCellType(), actual.getCellType()); + assertEquals(expected.getCellType(), actual.getCellType(), String.format("Expected the cell type of cell %s to be equal in sheet: %s", + expected.getAddress(), sheetName)); assertCellValuesAreEqual(sheetName, actual, expected); } @@ -65,7 +63,7 @@ private static void assertCellValuesAreEqual(String sheetName, Cell actual, Cell expectedValue = expected.getStringCellValue(); } - Assert.assertEquals(String.format("Expected the values of cell %s to be equal in sheet: %s", - expected.getAddress(), sheetName), expectedValue, actualValue); + assertEquals(expectedValue, actualValue, String.format("Expected the values of cell %s to be equal in sheet: %s", + expected.getAddress(), sheetName)); } } From 3d2cc11b886bcb09d6a6717732f49529865b4c09 Mon Sep 17 00:00:00 2001 From: skin27 Date: Fri, 27 Oct 2023 00:17:28 +0200 Subject: [PATCH 05/58] update to Camel4 --- .../edifactcommon/text/tablelike/flf/Serializer.java | 3 ++- .../googledrive/GoogleDriveClientFactory.java | 7 ++++--- pdf/src/main/java/org/assimbly/pdf/PdfProcessor.java | 3 ++- .../org/assimbly/pdftotext/PdfToTextProcessor.java | 7 +++++-- .../tenantvariables/TenantVariablesProcessor.java | 12 +++++++++--- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/edifactcommon/src/main/java/org/assimbly/edifactcommon/text/tablelike/flf/Serializer.java b/edifactcommon/src/main/java/org/assimbly/edifactcommon/text/tablelike/flf/Serializer.java index b5ea572f..c9b7e74b 100644 --- a/edifactcommon/src/main/java/org/assimbly/edifactcommon/text/tablelike/flf/Serializer.java +++ b/edifactcommon/src/main/java/org/assimbly/edifactcommon/text/tablelike/flf/Serializer.java @@ -15,6 +15,7 @@ package org.assimbly.edifactcommon.text.tablelike.flf; import org.assimbly.edifactcommon.text.tablelike.*; +import org.assimbly.edifactcommon.text.tablelike.Record; import org.assimbly.edifactcommon.text.tablelike.Table; import java.io.IOException; @@ -69,7 +70,7 @@ protected void doSerialize() throws IOException, MappingException { } protected boolean doStoreRecord(Record record) { - return true; + return false; } } diff --git a/googledrive/src/main/java/org/assimbly/googledrive/GoogleDriveClientFactory.java b/googledrive/src/main/java/org/assimbly/googledrive/GoogleDriveClientFactory.java index e84def16..fab52a81 100644 --- a/googledrive/src/main/java/org/assimbly/googledrive/GoogleDriveClientFactory.java +++ b/googledrive/src/main/java/org/assimbly/googledrive/GoogleDriveClientFactory.java @@ -4,7 +4,8 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport; import com.google.api.client.http.javanet.NetHttpTransport; -import com.google.api.client.json.jackson2.JacksonFactory; + +import com.google.api.client.json.gson.GsonFactory; import com.google.api.services.drive.Drive; import org.apache.camel.RuntimeCamelException; @@ -15,7 +16,7 @@ public class GoogleDriveClientFactory { private NetHttpTransport transport; - private JacksonFactory jsonFactory; + private GsonFactory jsonFactory; public GoogleDriveClientFactory() { try { @@ -23,7 +24,7 @@ public GoogleDriveClientFactory() { } catch (GeneralSecurityException | IOException e) { e.printStackTrace(); } - this.jsonFactory = new JacksonFactory(); + this.jsonFactory = new GsonFactory(); } public Drive makeClient(String clientId, String clientSecret, String applicationName, String accessToken) { diff --git a/pdf/src/main/java/org/assimbly/pdf/PdfProcessor.java b/pdf/src/main/java/org/assimbly/pdf/PdfProcessor.java index a7a49066..71c5b6f4 100644 --- a/pdf/src/main/java/org/assimbly/pdf/PdfProcessor.java +++ b/pdf/src/main/java/org/assimbly/pdf/PdfProcessor.java @@ -3,6 +3,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; +import org.apache.pdfbox.Loader; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocumentCatalog; import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm; @@ -26,7 +27,7 @@ public void process(Exchange exchange) throws Exception { byte[] template = endpoint.requestPdfTemplate(); - try(PDDocument document = PDDocument.load(template)) { + try(PDDocument document = Loader.loadPDF(template)) { PDDocumentCatalog docCatalog = document.getDocumentCatalog(); PDAcroForm acroForm = docCatalog.getAcroForm(); diff --git a/pdftotext/src/main/java/org/assimbly/pdftotext/PdfToTextProcessor.java b/pdftotext/src/main/java/org/assimbly/pdftotext/PdfToTextProcessor.java index be11c62f..a7ba75be 100644 --- a/pdftotext/src/main/java/org/assimbly/pdftotext/PdfToTextProcessor.java +++ b/pdftotext/src/main/java/org/assimbly/pdftotext/PdfToTextProcessor.java @@ -2,6 +2,8 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; +import org.apache.pdfbox.Loader; +import org.apache.pdfbox.io.RandomAccessRead; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.text.PDFTextStripper; import org.springframework.http.MediaType; @@ -12,9 +14,10 @@ public class PdfToTextProcessor implements Processor { @Override public void process(Exchange exchange) throws Exception { - InputStream input = exchange.getIn().getBody(InputStream.class); - PDDocument document = PDDocument.load(input); + byte[] input = exchange.getIn().getBody(byte[].class); + + PDDocument document = Loader.loadPDF(input); PDFTextStripper stripper = new PDFTextStripper(); diff --git a/tenantvariables/src/main/java/org/assimbly/tenantvariables/TenantVariablesProcessor.java b/tenantvariables/src/main/java/org/assimbly/tenantvariables/TenantVariablesProcessor.java index ca55867e..07632212 100644 --- a/tenantvariables/src/main/java/org/assimbly/tenantvariables/TenantVariablesProcessor.java +++ b/tenantvariables/src/main/java/org/assimbly/tenantvariables/TenantVariablesProcessor.java @@ -4,8 +4,11 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.language.groovy.GroovyExpression; +import org.apache.camel.language.simple.SimpleExpressionBuilder; +import org.apache.camel.language.simple.SimpleExpressionParser; import org.apache.camel.language.xpath.XPathBuilder; import org.apache.camel.language.simple.SimpleLanguage; +import org.apache.camel.model.language.SimpleExpression; import org.assimbly.util.EncryptionUtil; import org.assimbly.util.exception.EnvironmentException; import org.assimbly.util.exception.TenantVariableNotFoundException; @@ -169,8 +172,10 @@ private String interpolateVar(String varValue, Exchange exchange, boolean bodyFl if (isBodyVariable(varValue)) varValue = interpolateBody(varValue, exchange); - if(SimpleLanguage.hasSimpleFunction(varValue)) - varValue = SimpleLanguage.expression(varValue).evaluate(exchange, String.class); + if(SimpleLanguage.hasSimpleFunction(varValue)) { + SimpleExpression simpleExpression = new SimpleExpression(varValue); + varValue = simpleExpression.evaluate(exchange, String.class); + } return varValue; } @@ -182,7 +187,8 @@ private String interpolateVar(String varValue, Exchange exchange, String express try { switch (expressionType){ case "simple": - varValue = SimpleLanguage.expression(varValue).evaluate(exchange, String.class); + SimpleExpression simpleExpression = new SimpleExpression(varValue); + varValue = simpleExpression.evaluate(exchange, String.class); break; case "constant": // do nothing From 94dc11f2a5cdccfe3d87c8e4b04f194e8ea1d14f Mon Sep 17 00:00:00 2001 From: skin27 Date: Mon, 30 Oct 2023 09:14:27 +0100 Subject: [PATCH 06/58] Set datahandler to Camel4 --- .../enrich/attachment/AttachmentEnrichStrategy.java | 9 ++------- .../mail/component/mail/AttachmentAttacher.java | 12 ++++-------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/enrich/src/main/java/org/assimbly/enrich/attachment/AttachmentEnrichStrategy.java b/enrich/src/main/java/org/assimbly/enrich/attachment/AttachmentEnrichStrategy.java index b2eb1e15..8ba89ded 100644 --- a/enrich/src/main/java/org/assimbly/enrich/attachment/AttachmentEnrichStrategy.java +++ b/enrich/src/main/java/org/assimbly/enrich/attachment/AttachmentEnrichStrategy.java @@ -1,10 +1,8 @@ package org.assimbly.enrich.attachment; -import jakarta.activation.DataSource; import org.apache.camel.AggregationStrategy; import org.apache.camel.attachment.AttachmentMessage; import org.assimbly.util.helper.MimeTypeHelper; -import org.apache.axiom.attachments.ByteArrayDataSource; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.log4j.Logger; @@ -57,16 +55,13 @@ public Exchange aggregate(Exchange original, Exchange resource) { data = IOUtils.toByteArray(body); } catch (IOException e) { logger.error(e.getMessage()); } - ByteArrayDataSource byteArrayDataSource = new ByteArrayDataSource(data, mimeType); - - // todo Jakarta/Camel4 - //dataHandler = new DataHandler((DataSource) byteArrayDataSource); - logger.info(String.format("Adding attachment '%s' with mime type: '%s'", attachmentName, mimeType)); logger.info("Attachment details"); logger.info(String.format("\tsize: %s", data.length)); + dataHandler = new DataHandler(data, mimeType); + AttachmentMessage am = original.getMessage(AttachmentMessage.class); am.addAttachment(attachmentName, dataHandler); diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/AttachmentAttacher.java b/mail/src/main/java/org/assimbly/mail/component/mail/AttachmentAttacher.java index 1340976e..1c7e6571 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/AttachmentAttacher.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/AttachmentAttacher.java @@ -1,7 +1,5 @@ package org.assimbly.mail.component.mail; -import jakarta.activation.DataSource; -import org.apache.axiom.attachments.ByteArrayDataSource; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; @@ -38,13 +36,11 @@ public void process(Exchange exchange) throws Exception { emailBody = ""; AttachmentMessage attMsg = exchange.getIn(AttachmentMessage.class); - - //to do Jakarta/Camel4 - //attMsg.addAttachment(fileName, new DataHandler((DataSource) new ByteArrayDataSource(IOUtils.toByteArray(is), mimeType))); - - //in.addAttachment(fileName, new DataHandler(new ByteArrayDataSource(IOUtils.toByteArray(is), mimeType))); + attMsg.addAttachment(fileName, new DataHandler(IOUtils.toByteArray(is), mimeType)); in.setHeader(Exchange.CONTENT_TYPE, "text/plain"); - in.setBody(String.valueOf(emailBody)); + in.setBody(emailBody); + } + } From 4c174e4b08426d4bdd049cbb20aa8692b4862623 Mon Sep 17 00:00:00 2001 From: Raymond Meester Date: Tue, 28 Nov 2023 19:03:16 +0100 Subject: [PATCH 07/58] add modified tests --- aggregate/pom.xml | 4 - encoder/pom.xml | 4 - mail/pom.xml | 109 +++++------------- .../mail/SplitAttachmentsExpression.java | 95 ++++++++++++--- .../ExtendedHeaderFilterStrategyTest.java | 13 +-- oriflame/pom.xml | 4 - pdf/pom.xml | 4 - pdftotext/pom.xml | 4 - replace/pom.xml | 4 - tenantvariables/pom.xml | 25 ---- .../TenantVariablesProcessor.java | 109 +++++------------- .../TenantVariablesEncryptionTest.java | 14 +-- .../tenantvariables/TenantVariablesTest.java | 53 ++++----- xmltojson/pom.xml | 4 - 14 files changed, 172 insertions(+), 274 deletions(-) diff --git a/aggregate/pom.xml b/aggregate/pom.xml index 4f67efc5..5de9aff1 100644 --- a/aggregate/pom.xml +++ b/aggregate/pom.xml @@ -4,11 +4,7 @@ custom-components org.assimbly -<<<<<<< HEAD 4.1.0-SNAPSHOT -======= - 4.0.5-SNAPSHOT ->>>>>>> develop aggregate diff --git a/encoder/pom.xml b/encoder/pom.xml index d207b927..a2f8e4ff 100644 --- a/encoder/pom.xml +++ b/encoder/pom.xml @@ -4,11 +4,7 @@ custom-components org.assimbly -<<<<<<< HEAD 4.1.0-SNAPSHOT -======= - 4.0.5-SNAPSHOT ->>>>>>> develop encoder diff --git a/mail/pom.xml b/mail/pom.xml index 35c8291b..5666e00a 100644 --- a/mail/pom.xml +++ b/mail/pom.xml @@ -1,40 +1,48 @@ - 4.0.0 + 4.0.0 custom-components org.assimbly 4.1.0-SNAPSHOT - mail + mail UTF-8 file:///${project.basedir}/../rules.xml - + - github - Temporary Staging Repository + github + Temporary Staging Repository https://maven.pkg.github.com/assimbly/custom-components - - + + + + + org.apache.camel + camel-velocity + ${camel.version} + + + + jakarta.mail + jakarta.mail-api + ${jakarta.mail.version} + + com.sun.mail - javax.mail - ${javax.version} - - - - javax.activation - activation - - + jakarta.mail + 2.0.1 + + ${project.groupId} enrich @@ -56,74 +64,21 @@ ${morphia.version} - -<<<<<<< HEAD - - jakarta.mail - jakarta.mail-api - ${jakarta.mail.version} - - - - com.sun.mail - jakarta.mail - 2.0.1 - - - - - ${project.groupId} - enrich - ${project.version} - - - ${project.groupId} - tenantvariables - ${project.version} - - - org.mongodb - mongo-java-driver - ${mongo.version} - - - org.mongodb.morphia - morphia - ${morphia.version} - - - - - org.skyscreamer - jsonassert - ${skyscreamer.version} - - - com.vaadin.external.google - android-json - - - test - - - -======= - - + - org.jvnet.mock-javamail - mock-javamail - 1.9 + org.skyscreamer + jsonassert + ${skyscreamer.version} - javax.mail - mail + com.vaadin.external.google + android-json test + ->>>>>>> develop @@ -148,4 +103,4 @@ - + \ No newline at end of file diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/SplitAttachmentsExpression.java b/mail/src/main/java/org/assimbly/mail/component/mail/SplitAttachmentsExpression.java index 1403f7f8..81679c2e 100644 --- a/mail/src/main/java/org/assimbly/mail/component/mail/SplitAttachmentsExpression.java +++ b/mail/src/main/java/org/assimbly/mail/component/mail/SplitAttachmentsExpression.java @@ -17,10 +17,9 @@ package org.assimbly.mail.component.mail; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; @@ -28,6 +27,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.attachment.Attachment; import org.apache.camel.attachment.AttachmentMessage; +import org.apache.camel.attachment.DefaultAttachment; import org.apache.camel.support.DefaultMessage; import org.apache.camel.support.ExpressionAdapter; import org.apache.camel.util.IOHelper; @@ -59,9 +59,16 @@ */ public class SplitAttachmentsExpression extends ExpressionAdapter { + final static Logger LOG = LoggerFactory.getLogger(SplitAttachmentsExpression.class); + public static final String HEADER_NAME = "CamelSplitAttachmentId"; - public SplitAttachmentsExpression() { + private boolean extractAttachments; + + public SplitAttachmentsExpression() { } + + public SplitAttachmentsExpression(boolean extractAttachments) { + this.extractAttachments = extractAttachments; } @Override @@ -96,16 +103,32 @@ public Object evaluate(Exchange exchange) { try { List answer = new ArrayList<>(); - AttachmentMessage inMessage = exchange.getIn(AttachmentMessage.class); - for (Map.Entry entry : inMessage.getAttachmentObjects().entrySet()) { - Message attachmentMessage = extractAttachment(entry.getValue(), entry.getKey(), exchange, exchange.getContext()); + AttachmentMessage inAttachMessage = exchange.getIn(AttachmentMessage.class); + for (Map.Entry entry : inAttachMessage.getAttachmentObjects().entrySet()) { + Message attachmentMessage; + if (extractAttachments) { + attachmentMessage = extractAttachment(entry.getValue(), entry.getKey(), exchange.getContext()); + } else { + attachmentMessage = splitAttachment(exchange, entry.getKey(), entry.getValue().getDataHandler()); + } + if (attachmentMessage != null) { answer.add(attachmentMessage); } } - // clear attachments on original message after we have split them - inMessage.getAttachmentObjects().clear(); + for(Message m : answer){ + for(String hKey : exchange.getIn().getHeaders().keySet()) { + Object header = exchange.getIn().getHeader(hKey); + if(m.getHeader(hKey) == null) + m.setHeader(hKey, header); + } + + if(m.getHeader("From") != null) { + String email = m.getHeader("From").toString(); + m.setHeader("Source-Email", StringUtils.substringBetween(email, "<", ">")); + } + } return answer; } catch (Exception e) { @@ -113,16 +136,19 @@ public Object evaluate(Exchange exchange) { } } - private Message extractAttachment(Attachment attachment, String attachmentName, Exchange exchange, CamelContext camelContext) throws Exception { + private Message splitAttachment(Exchange exchange, String attachmentName, DataHandler attachmentHandler) { + final Exchange exchangeCopy = exchange.copy(); + Map attachments = exchangeCopy.getIn(AttachmentMessage.class).getAttachments(); + attachments.clear(); + attachments.put(attachmentName, attachmentHandler); + exchangeCopy.getIn().setHeader(HEADER_NAME, attachmentName); + return exchangeCopy.getIn(); + } + private Message extractAttachment(Attachment attachment, String attachmentName, CamelContext camelContext) + throws Exception { final Message outMessage = new DefaultMessage(camelContext); - - for (Map.Entry entry : exchange.getIn().getHeaders().entrySet()) { - outMessage.setHeader(entry.getKey(), entry.getValue()); - } - outMessage.setHeader(HEADER_NAME, attachmentName); - Object obj = attachment.getDataHandler().getContent(); if (obj instanceof InputStream) { outMessage.setBody(readMimePart((InputStream) obj)); @@ -213,8 +239,41 @@ private byte[] readMimePart(InputStream mimePartStream) throws Exception { return bos.toByteArray(); } - public boolean hasAttachments(Exchange exchange) { - return exchange.getIn(AttachmentMessage.class).hasAttachments(); + /** + * Assimbly Edit: Custom method to force unique filenames that will be stored in the Attachments Map as + * duplicated filenames will cause the first file to be overwritten. + * + * https://assimblyworld.atlassian.net/browse/DOV-220 + */ + private String createUniqueFileName(String fileName, int occurrence, Map attachmentMap) { + String ext = FilenameUtils.getExtension(fileName); + String name = FilenameUtils.getBaseName(fileName); + + String newFileName = String.format("%s (%s).%s", name, occurrence, ext); + + if (attachmentMap.containsKey(newFileName)) { + return createUniqueFileName(fileName, occurrence + 1, attachmentMap); + } + + return newFileName; + } + + /** + * Assimbly Edit: Copied from org.apache.camel.component.mail.MailBinding (2.20.1) + */ + private boolean validDisposition(String disposition, String fileName) { + return disposition != null + && fileName != null + && (disposition.equalsIgnoreCase(Part.ATTACHMENT) || disposition.equalsIgnoreCase(Part.INLINE)); + } + + + public boolean isExtractAttachments() { + return extractAttachments; + } + + public void setExtractAttachments(boolean extractAttachments) { + this.extractAttachments = extractAttachments; } } diff --git a/mail/src/test/java/org/assimbly/mail/component/mail/ExtendedHeaderFilterStrategyTest.java b/mail/src/test/java/org/assimbly/mail/component/mail/ExtendedHeaderFilterStrategyTest.java index 6f331239..f1a81948 100644 --- a/mail/src/test/java/org/assimbly/mail/component/mail/ExtendedHeaderFilterStrategyTest.java +++ b/mail/src/test/java/org/assimbly/mail/component/mail/ExtendedHeaderFilterStrategyTest.java @@ -6,6 +6,7 @@ import org.apache.camel.support.DefaultExchange; import org.apache.camel.test.junit5.CamelTestSupport; +import org.assimbly.util.mail.ExtendedHeaderFilterStrategy; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -18,15 +19,5 @@ public class ExtendedHeaderFilterStrategyTest extends CamelTestSupport { private static final CamelContext context = new DefaultCamelContext(); private static final ExtendedHeaderFilterStrategy strategy = new ExtendedHeaderFilterStrategy(); - @Test - public void allowsAllHeadersForInboundEmail() { - Assertions.assertFalse(strategy.extendedFilter(HeaderFilterStrategy.Direction.IN, "key", singleLine, new DefaultExchange(context))); - Assertions.assertFalse(strategy.extendedFilter(HeaderFilterStrategy.Direction.IN, "key", multiLine, new DefaultExchange(context))); - } - - @Test - public void disregardsOnlyMultilineHeadersForOutboundEmail() { - Assertions.assertFalse(strategy.extendedFilter(HeaderFilterStrategy.Direction.OUT, "key", singleLine, new DefaultExchange(context))); - Assertions.assertTrue(strategy.extendedFilter(HeaderFilterStrategy.Direction.OUT, "key", multiLine, new DefaultExchange(context))); - } + } \ No newline at end of file diff --git a/oriflame/pom.xml b/oriflame/pom.xml index 055b1a22..f29fa65a 100644 --- a/oriflame/pom.xml +++ b/oriflame/pom.xml @@ -6,11 +6,7 @@ custom-components org.assimbly -<<<<<<< HEAD 4.1.0-SNAPSHOT -======= - 4.0.5-SNAPSHOT ->>>>>>> develop oriflame diff --git a/pdf/pom.xml b/pdf/pom.xml index e7119f7e..2bea045d 100644 --- a/pdf/pom.xml +++ b/pdf/pom.xml @@ -4,11 +4,7 @@ custom-components org.assimbly -<<<<<<< HEAD 4.1.0-SNAPSHOT -======= - 4.0.5-SNAPSHOT ->>>>>>> develop pdf diff --git a/pdftotext/pom.xml b/pdftotext/pom.xml index f583e548..1f9bac46 100644 --- a/pdftotext/pom.xml +++ b/pdftotext/pom.xml @@ -4,11 +4,7 @@ custom-components org.assimbly -<<<<<<< HEAD 4.1.0-SNAPSHOT -======= - 4.0.5-SNAPSHOT ->>>>>>> develop pdftotext diff --git a/replace/pom.xml b/replace/pom.xml index f2644aa0..8a238e30 100644 --- a/replace/pom.xml +++ b/replace/pom.xml @@ -4,11 +4,7 @@ custom-components org.assimbly -<<<<<<< HEAD 4.1.0-SNAPSHOT -======= - 4.0.5-SNAPSHOT ->>>>>>> develop replace diff --git a/tenantvariables/pom.xml b/tenantvariables/pom.xml index dd4bda7d..27ff871e 100644 --- a/tenantvariables/pom.xml +++ b/tenantvariables/pom.xml @@ -88,31 +88,6 @@ - - - org.powermock - powermock-module-junit4 - ${powermock.version} - test - - - org.powermock - powermock-api-mockito2 - ${powermock.version} - test - - - org.powermock - powermock-core - ${powermock.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - diff --git a/tenantvariables/src/main/java/org/assimbly/tenantvariables/TenantVariablesProcessor.java b/tenantvariables/src/main/java/org/assimbly/tenantvariables/TenantVariablesProcessor.java index ce3d482d..07632212 100644 --- a/tenantvariables/src/main/java/org/assimbly/tenantvariables/TenantVariablesProcessor.java +++ b/tenantvariables/src/main/java/org/assimbly/tenantvariables/TenantVariablesProcessor.java @@ -1,8 +1,6 @@ package org.assimbly.tenantvariables; import com.jayway.jsonpath.JsonPath; -import org.abstractj.kalium.crypto.Random; -import org.abstractj.kalium.crypto.SecretBox; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.language.groovy.GroovyExpression; @@ -28,7 +26,6 @@ import java.util.regex.Pattern; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.abstractj.kalium.NaCl.Sodium.CRYPTO_SECRETBOX_XSALSA20POLY1305_NONCEBYTES; public class TenantVariablesProcessor implements Processor { @@ -36,6 +33,8 @@ public class TenantVariablesProcessor implements Processor { private static final String ASSIMBLY_ENCRYPTION_SECRET = "ASSIMBLY_ENCRYPTION_SECRET"; + private EncryptionUtil encryptionUtil = new EncryptionUtil(ASSIMBLY_ENCRYPTION_SECRET, "PBEWithHMACSHA512AndAES_256"); + private final String TENANT_DEFAULT = "default"; private static final String ASSIMBLY_ENV = "ASSIMBLY_ENV"; private final String BODY_VARIABLE_REGEX = "\\$\\{body(?:As\\(.*\\))?}"; @@ -65,64 +64,38 @@ public void process(Exchange exchange) { } } - public String decrypt(byte[] value, byte[] nonce) { - SecretBox box = new SecretBox(System.getenv(ASSIMBLY_ENCRYPTION_SECRET).getBytes()); - byte[] decrypted = box.decrypt(nonce, value); - return new String(decrypted); + public String decrypt(String encryptedValue) { + String value = encryptionUtil.getTextEncryptor().decrypt(encryptedValue); + return value; } - byte[] encrypt(String value, byte[] nonce) { - SecretBox box = new SecretBox(System.getenv(ASSIMBLY_ENCRYPTION_SECRET).getBytes()); - return box.encrypt(nonce, value.getBytes()); + public String encrypt(String value) { + String encryptedValue = encryptionUtil.getTextEncryptor().encrypt(value); + return encryptedValue; } public String getValueByEnvironmentValue(EnvironmentValue environmentVar) { - if(environmentVar.isEncrypted()) { - return decrypt( - Base64Helper.unmarshal(environmentVar.getValue()), - Base64Helper.unmarshal(environmentVar.getNonce()) - ); - } else { - return environmentVar.getValue(); - } + return (environmentVar.isEncrypted() ? decrypt(environmentVar.getValue()) : environmentVar.getValue()); } private void getTenantVariable(Exchange exchange) { String name = endpoint.getConfiguration().getName(); - String tenant = ( - endpoint.getConfiguration().getTenant()!=null ? - endpoint.getConfiguration().getTenant() : - TENANT_DEFAULT - ); - String environment = ( - endpoint.getConfiguration().getEnvironment()!=null ? - endpoint.getConfiguration().getEnvironment() : - getEnvironment() - ); + String tenant = (endpoint.getConfiguration().getTenant()!=null ? endpoint.getConfiguration().getTenant() : TENANT_DEFAULT); + String environment = (endpoint.getConfiguration().getEnvironment()!=null ? endpoint.getConfiguration().getEnvironment() : getEnvironment()); name = interpolateVar(name, exchange, false); TenantVariable gVariable = MongoDao.findTenantVariableByName(name, tenant); - if(gVariable == null) { - throw new TenantVariableNotFoundException( - String.format("The Tenant Variable \"%s\" was not found in the database.", name) - ); - } + if(gVariable == null) + throw new TenantVariableNotFoundException("The Tenant Variable \"" + name + "\" was not found in the database."); - if(!gVariable.find(environment).isPresent()) { - throw new TenantVariableNotFoundException( - String.format("The Tenant Variable \"%s\" has no values for the %s environment.", name, environment) - ); - } + if(!gVariable.find(environment).isPresent()) + throw new TenantVariableNotFoundException("The Tenant Variable \"" + name + "\" has no values for the "+ environment +" environment."); EnvironmentValue variable = gVariable.find(environment).get(); - String value = ( - variable.isEncrypted() ? - decrypt(Base64Helper.unmarshal(variable.getValue()), Base64Helper.unmarshal(variable.getNonce())) : - variable.getValue() - ); + String value = (variable.isEncrypted() ? decrypt(variable.getValue()) : variable.getValue()); String header = interpolateVar(endpoint.getConfiguration().getHeader(), exchange, false); @@ -134,16 +107,8 @@ private void setTenantVariable(Exchange exchange) { String value = endpoint.getConfiguration().getValue(); String name = endpoint.getConfiguration().getName(); String modifier = endpoint.getConfiguration().getModifier(); - String tenant = ( - endpoint.getConfiguration().getTenant()!=null ? - endpoint.getConfiguration().getTenant() : - TENANT_DEFAULT - ); - String environment = ( - endpoint.getConfiguration().getEnvironment()!=null ? - endpoint.getConfiguration().getEnvironment() : - getEnvironment() - ); + String tenant = (endpoint.getConfiguration().getTenant()!=null ? endpoint.getConfiguration().getTenant() : TENANT_DEFAULT); + String environment = (endpoint.getConfiguration().getEnvironment()!=null ? endpoint.getConfiguration().getEnvironment() : getEnvironment()); long modifyDate = System.currentTimeMillis(); name = interpolateVar(name, exchange, false); @@ -158,9 +123,9 @@ private void setTenantVariable(Exchange exchange) { gVariable.setCreatedBy(modifier); } - if(environment != null && !gVariable.find(environment).isPresent()) { + if(environment != null && !gVariable.find(environment).isPresent()){ gVariable.put(new EnvironmentValue(environment)); - } else if(environment==null) { + }else if(environment==null){ throw new TenantVariableNotFoundException("The Tenant Variable environment is not set."); } @@ -171,9 +136,7 @@ private void setTenantVariable(Exchange exchange) { boolean encrypt = endpoint.getConfiguration().isEncrypt(); if(encrypt) { - byte[] nonce = new Random().randomBytes(CRYPTO_SECRETBOX_XSALSA20POLY1305_NONCEBYTES); - value = Base64Helper.marshal(encrypt(value, nonce)); - variable.setNonce(Base64Helper.marshal(nonce)); + value = encrypt(variable.getValue()); } else { variable.setNonce(null); } @@ -188,35 +151,26 @@ private void setTenantVariable(Exchange exchange) { private void deleteTenantVariable(Exchange exchange) { String name = endpoint.getConfiguration().getName(); - String tenant = ( - endpoint.getConfiguration().getTenant()!=null ? endpoint.getConfiguration().getTenant() : TENANT_DEFAULT - ); + String tenant = (endpoint.getConfiguration().getTenant()!=null ? endpoint.getConfiguration().getTenant() : TENANT_DEFAULT); - if(ExchangeHelper.hasVariables(name)) { + if(ExchangeHelper.hasVariables(name)) name = ExchangeHelper.interpolate(name, exchange); - } TenantVariable variable = MongoDao.findTenantVariableByName(name, tenant); - if(variable == null) { - throw new TenantVariableNotFoundException( - String.format("The Tenant Variable \"%s\" was not found in the database.", name) - ); - } + if(variable == null) + throw new TenantVariableNotFoundException("The Tenant Variable \"" + name + "\" was not found in the database."); MongoDao.deleteTenantVariable(variable, tenant); } private String interpolateVar(String varValue, Exchange exchange, boolean bodyFlag) { - if(ExchangeHelper.hasVariables(varValue)) { + if(ExchangeHelper.hasVariables(varValue)) varValue = ExchangeHelper.interpolate(varValue, exchange); - } - if(bodyFlag) { - if (isBodyVariable(varValue)) { + if(bodyFlag) + if (isBodyVariable(varValue)) varValue = interpolateBody(varValue, exchange); - } - } if(SimpleLanguage.hasSimpleFunction(varValue)) { SimpleExpression simpleExpression = new SimpleExpression(varValue); @@ -231,7 +185,7 @@ private String interpolateVar(String varValue, Exchange exchange, String express String bodyContent = exchange.getIn().getBody(String.class); try { - switch (expressionType) { + switch (expressionType){ case "simple": SimpleExpression simpleExpression = new SimpleExpression(varValue); varValue = simpleExpression.evaluate(exchange, String.class); @@ -253,7 +207,7 @@ private String interpolateVar(String varValue, Exchange exchange, String express default: // do nothing } - } catch (Exception e) { + } catch (Exception e){ throw new EnvironmentException("Error to interpolate variable."); } @@ -271,9 +225,8 @@ private String interpolateBody(String string, Exchange exchange) { while (m.find()) { String bValue = exchange.getIn().getBody(String.class); - if (bValue != null) { + if (bValue != null) m.appendReplacement(stringBuffer, escapeDollarSign(bValue)); - } } m.appendTail(stringBuffer); diff --git a/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesEncryptionTest.java b/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesEncryptionTest.java index 5ba9c686..b9259d56 100644 --- a/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesEncryptionTest.java +++ b/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesEncryptionTest.java @@ -7,26 +7,24 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -@RunWith(PowerMockRunner.class) -@PrepareForTest({TenantVariablesProcessor.class}) public class TenantVariablesEncryptionTest { private static TenantVariablesProcessor processor; @BeforeAll public static void setup(){ - PowerMockito.mockStatic(System.class); - PowerMockito.when(System.getenv("ASSIMBLY_ENCRYPTION_SECRET")).thenReturn("assimblyassimblyassimblyassimbly"); processor = new TenantVariablesProcessor(); } + @Test public void runTest() throws IOException { - byte[] nonce = new Random().randomBytes(CRYPTO_SECRETBOX_XSALSA20POLY1305_NONCEBYTES); - byte[] encrypted = processor.encrypt("Value 1", nonce); - String decrypted = processor.decrypt(encrypted, nonce); + + String encrypted = processor.encrypt("Value 1"); + + String decrypted = processor.decrypt(encrypted); assertEquals("Value 1", decrypted); } -} +} \ No newline at end of file diff --git a/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesTest.java b/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesTest.java index d52e8e78..39397d62 100644 --- a/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesTest.java +++ b/tenantvariables/src/test/java/org/assimbly/tenantvariables/TenantVariablesTest.java @@ -1,26 +1,19 @@ package org.assimbly.tenantvariables; -import org.abstractj.kalium.crypto.Random; import org.apache.camel.CamelExecutionException; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.engine.ExplicitCamelContextNameStrategy; import org.apache.camel.model.language.ConstantExpression; import org.apache.camel.support.DefaultExchange; import org.apache.camel.test.junit5.CamelTestSupport; import org.assimbly.util.exception.TenantVariableNotFoundException; -import org.assimbly.util.helper.Base64Helper; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.*; import org.assimbly.tenantvariables.domain.EnvironmentValue; import org.assimbly.tenantvariables.domain.TenantVariable; import org.assimbly.tenantvariables.mongo.MongoDao; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; import java.util.Base64; import java.util.List; @@ -69,8 +62,8 @@ public class TenantVariablesTest extends CamelTestSupport { "}"; private final String BODY_MULTILINE_VALUE = "Multiline\n" + - "Body\n" + - "Test"; + "Body\n" + + "Test"; private final String BASE64_HEADER_ONLY = "JHtoZWFkZXIuSGVhZGVyTmFtZX0="; private final String BASE64_BODY_ONLY = "JHtib2R5fQ=="; @@ -89,7 +82,7 @@ public class TenantVariablesTest extends CamelTestSupport { private static final String TENANT = "default"; - @After + @AfterEach @Override public void tearDown() throws Exception { try { @@ -99,7 +92,7 @@ public void tearDown() throws Exception { } } - @After + @AfterEach public void after(){ List variables = MongoDao.findAll(TENANT); @@ -108,8 +101,8 @@ public void after(){ } } - @After - public void afterAll(){ + @AfterAll + public static void afterAll(){ List variables = MongoDao.findAll(TENANT); for(TenantVariable g : variables){ @@ -118,15 +111,17 @@ public void afterAll(){ } @Override - @Before + @BeforeEach public void setUp() throws Exception { - // Starts the CamelContext super.setUp(); - PowerMockito.mockStatic(System.class); - PowerMockito.when(System.getenv("ASSIMBLY_ENCRYPTION_SECRET")).thenReturn("assimblyassimblyassimblyassimbly"); - PowerMockito.when(System.getenv("ASSIMBLY_ENV")).thenReturn("test"); + // Start Camel + context = new DefaultCamelContext(); + context.addRoutes(createRouteBuilder()); + context.start(); + + template = context.createProducerTemplate(); MongoDao.updateTenantVariable(createVariable(), TENANT); MongoDao.updateTenantVariable(createEncryptedVariable(), TENANT); @@ -230,12 +225,14 @@ public void configure() throws Exception { }; } - @Test(expected = CamelExecutionException.class) + @Test public void testGetUnassigedVariable() throws Exception { - // Trigger flow - template.sendBody("direct:getWithSpace", ""); + Assertions.assertThrows(CamelExecutionException.class, () -> { + // Trigger flow + template.sendBody("direct:getWithSpace", ""); - getMockEndpoint("mock:out").expectedMessageCount(1); + getMockEndpoint("mock:out").expectedMessageCount(1); + }); } @Test @@ -475,18 +472,16 @@ private TenantVariable createVariable() { private TenantVariable createEncryptedVariable() { TenantVariable variable = new TenantVariable(ENCRYPTED_VARIABLE_NAME); - byte[] nonce = new Random().randomBytes(CRYPTO_SECRETBOX_XSALSA20POLY1305_NONCEBYTES); - String encryptedVariableValue = Base64Helper.marshal(PROCESSOR.encrypt(VARIABLE_VALUE, nonce)); + String encryptedVariableValue = PROCESSOR.encrypt(VARIABLE_VALUE); EnvironmentValue environmentValue = new EnvironmentValue("test"); environmentValue.setValue(encryptedVariableValue); - environmentValue.setNonce(Base64Helper.marshal(nonce)); + environmentValue.setNonce(null); environmentValue.setEncrypted(true); variable.put(environmentValue); return variable; } - -} +} \ No newline at end of file diff --git a/xmltojson/pom.xml b/xmltojson/pom.xml index ee143984..8cd2acc4 100644 --- a/xmltojson/pom.xml +++ b/xmltojson/pom.xml @@ -4,11 +4,7 @@ custom-components org.assimbly -<<<<<<< HEAD 4.1.0-SNAPSHOT -======= - 4.0.5-SNAPSHOT ->>>>>>> develop xmltojson From 19eb659f6112385ff25e10c0b8a64754567bf5e3 Mon Sep 17 00:00:00 2001 From: Raymond Meester Date: Tue, 2 Jan 2024 09:12:11 +0100 Subject: [PATCH 08/58] upgrade dependencies --- enrich/pom.xml | 2 +- pom.xml | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/enrich/pom.xml b/enrich/pom.xml index 2e9aa68f..71152358 100644 --- a/enrich/pom.xml +++ b/enrich/pom.xml @@ -37,7 +37,7 @@ jakarta.activation jakarta.activation-api - 2.0.1 + ${jakarta.activation.version} diff --git a/pom.xml b/pom.xml index 37bde357..a8649d8f 100644 --- a/pom.xml +++ b/pom.xml @@ -74,16 +74,17 @@ 1.70 1.9.26 4.0.3 - 4.1.0 - 1.8.1 - v3-rev20230822-2.0.0 + 4.3.0 + 1.9.0 + v3-rev20231128-2.0.0 1.5.0 1.34.1 - 2.3 + 2.5.1 4.5.14 4.5.14 3.29.2-GA 2.0.0 + 2.1.2 2.1.2 2.1.37 0.8.0 @@ -94,14 +95,14 @@ 1.3.2 1.6.1 6.0.0 - 3.0.0 - 5.2.4 + 3.0.1 + 5.2.5 3.0.3 9.7.0-21 1.7.1 1.7.1.0 1.5.1 - 2.0.9 + 2.0.10 1.16 1.6.3 1.6 From f852ba333a09ff954745243488cb9a71646ad1cd Mon Sep 17 00:00:00 2001 From: Raymond Meester Date: Wed, 17 Jan 2024 17:43:13 +0100 Subject: [PATCH 09/58] update dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a8649d8f..3b876c67 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 4.0.3 4.3.0 1.9.0 - v3-rev20231128-2.0.0 + v3-rev20240110-2.0.0 1.5.0 1.34.1 2.5.1 @@ -102,7 +102,7 @@ 1.7.1 1.7.1.0 1.5.1 - 2.0.10 + 2.0.11 1.16 1.6.3 1.6 From 3168aa65b6f59eee5dbae1f96429ea1371e99fe1 Mon Sep 17 00:00:00 2001 From: Raymond Meester Date: Mon, 29 Jan 2024 09:09:34 +0100 Subject: [PATCH 10/58] update dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3b876c67..283baa7a 100644 --- a/pom.xml +++ b/pom.xml @@ -76,9 +76,9 @@ 4.0.3 4.3.0 1.9.0 - v3-rev20240110-2.0.0 + v3-rev20240123-2.0.0 1.5.0 - 1.34.1 + 1.35.0 2.5.1 4.5.14 4.5.14 From cefdbb5fd471d7588b0c354761838b0bfa03e6a5 Mon Sep 17 00:00:00 2001 From: Raymond Meester Date: Tue, 13 Feb 2024 08:42:42 +0100 Subject: [PATCH 11/58] update dependencies --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 283baa7a..436d1528 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 1.7.1 1.7.1.0 1.5.1 - 2.0.11 + 2.0.12 1.16 1.6.3 1.6 From 3d283a50aded0b39d54c4101f620ec91d463f24f Mon Sep 17 00:00:00 2001 From: Raymond Meester Date: Tue, 13 Feb 2024 14:15:26 +0100 Subject: [PATCH 12/58] update version to 5.0.0 --- aggregate/pom.xml | 2 +- amazon/pom.xml | 2 +- auth/pom.xml | 2 +- cookies/pom.xml | 2 +- csvtoxml/pom.xml | 2 +- docconverter/pom.xml | 2 +- edi/pom.xml | 2 +- edifact/pom.xml | 2 +- edifactcommon/pom.xml | 2 +- edifactdotweb/pom.xml | 2 +- edifactstandards/pom.xml | 2 +- encoder/pom.xml | 2 +- enrich/pom.xml | 2 +- exceltoxml/pom.xml | 2 +- flv/pom.xml | 2 +- formtoxml/pom.xml | 2 +- googledrive/pom.xml | 2 +- hl7/pom.xml | 2 +- mail/pom.xml | 2 +- multipart/pom.xml | 2 +- oauth2token/pom.xml | 2 +- oriflame/pom.xml | 2 +- pdf/pom.xml | 2 +- pdftotext/pom.xml | 2 +- pom.xml | 2 +- replace/pom.xml | 2 +- sandbox/pom.xml | 2 +- simplereplace/pom.xml | 2 +- smb/pom.xml | 2 +- smooksnoxml/pom.xml | 2 +- soap/pom.xml | 2 +- sql/pom.xml | 2 +- tenantvariables/pom.xml | 2 +- throttling/pom.xml | 2 +- xmltocsv/pom.xml | 2 +- xmltoexcel/pom.xml | 2 +- xmltojson/pom.xml | 2 +- xmltojsonlegacy/pom.xml | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/aggregate/pom.xml b/aggregate/pom.xml index 5de9aff1..22520514 100644 --- a/aggregate/pom.xml +++ b/aggregate/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 aggregate diff --git a/amazon/pom.xml b/amazon/pom.xml index b14b951b..43992cb3 100644 --- a/amazon/pom.xml +++ b/amazon/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 amazon diff --git a/auth/pom.xml b/auth/pom.xml index d2941860..a96abb8f 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 auth diff --git a/cookies/pom.xml b/cookies/pom.xml index 3d1a2e6e..7320a9ec 100644 --- a/cookies/pom.xml +++ b/cookies/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 cookies diff --git a/csvtoxml/pom.xml b/csvtoxml/pom.xml index ecb9060f..0af5f7ac 100644 --- a/csvtoxml/pom.xml +++ b/csvtoxml/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 csvtoxml diff --git a/docconverter/pom.xml b/docconverter/pom.xml index f5ee4692..32b64877 100644 --- a/docconverter/pom.xml +++ b/docconverter/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 docconverter diff --git a/edi/pom.xml b/edi/pom.xml index 9ea9b63c..9eba7ab7 100644 --- a/edi/pom.xml +++ b/edi/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 diff --git a/edifact/pom.xml b/edifact/pom.xml index d44b57a7..278d9ad2 100644 --- a/edifact/pom.xml +++ b/edifact/pom.xml @@ -5,7 +5,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 edifact diff --git a/edifactcommon/pom.xml b/edifactcommon/pom.xml index 55c210b5..8816cd6d 100644 --- a/edifactcommon/pom.xml +++ b/edifactcommon/pom.xml @@ -5,7 +5,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 edifactcommon diff --git a/edifactdotweb/pom.xml b/edifactdotweb/pom.xml index 406d9a9f..e954ece9 100644 --- a/edifactdotweb/pom.xml +++ b/edifactdotweb/pom.xml @@ -5,7 +5,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 edifactdotweb diff --git a/edifactstandards/pom.xml b/edifactstandards/pom.xml index bae66e4a..5ac84e0f 100644 --- a/edifactstandards/pom.xml +++ b/edifactstandards/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 edifactstandards diff --git a/encoder/pom.xml b/encoder/pom.xml index a2f8e4ff..f471e062 100644 --- a/encoder/pom.xml +++ b/encoder/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 encoder diff --git a/enrich/pom.xml b/enrich/pom.xml index 71152358..398408d7 100644 --- a/enrich/pom.xml +++ b/enrich/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 enrich diff --git a/exceltoxml/pom.xml b/exceltoxml/pom.xml index cd1be9b3..dbdb69bc 100644 --- a/exceltoxml/pom.xml +++ b/exceltoxml/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 exceltoxml diff --git a/flv/pom.xml b/flv/pom.xml index 7aa98d16..fbf6e182 100644 --- a/flv/pom.xml +++ b/flv/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 flv diff --git a/formtoxml/pom.xml b/formtoxml/pom.xml index 46a62513..e2d9a5e4 100644 --- a/formtoxml/pom.xml +++ b/formtoxml/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 formtoxml diff --git a/googledrive/pom.xml b/googledrive/pom.xml index 10556b18..ad7cd8f4 100644 --- a/googledrive/pom.xml +++ b/googledrive/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 googledrive diff --git a/hl7/pom.xml b/hl7/pom.xml index 8505b472..64ba504f 100644 --- a/hl7/pom.xml +++ b/hl7/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 hl7 diff --git a/mail/pom.xml b/mail/pom.xml index 5666e00a..dff6b6f8 100644 --- a/mail/pom.xml +++ b/mail/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 mail diff --git a/multipart/pom.xml b/multipart/pom.xml index 4a614d25..8150ef53 100644 --- a/multipart/pom.xml +++ b/multipart/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 multipart diff --git a/oauth2token/pom.xml b/oauth2token/pom.xml index 4ebfe522..81a7ce9f 100644 --- a/oauth2token/pom.xml +++ b/oauth2token/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 oauth2token diff --git a/oriflame/pom.xml b/oriflame/pom.xml index f29fa65a..91451086 100644 --- a/oriflame/pom.xml +++ b/oriflame/pom.xml @@ -6,7 +6,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 oriflame diff --git a/pdf/pom.xml b/pdf/pom.xml index 2bea045d..c111de70 100644 --- a/pdf/pom.xml +++ b/pdf/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 pdf diff --git a/pdftotext/pom.xml b/pdftotext/pom.xml index 1f9bac46..439c9fb7 100644 --- a/pdftotext/pom.xml +++ b/pdftotext/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 pdftotext diff --git a/pom.xml b/pom.xml index 436d1528..1865ae8b 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ pom custom-components https://www.org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 aggregate diff --git a/replace/pom.xml b/replace/pom.xml index 8a238e30..0c4298d5 100644 --- a/replace/pom.xml +++ b/replace/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 replace diff --git a/sandbox/pom.xml b/sandbox/pom.xml index 89822938..2d5c1c22 100644 --- a/sandbox/pom.xml +++ b/sandbox/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 sandbox diff --git a/simplereplace/pom.xml b/simplereplace/pom.xml index 8ce4084b..08f6410e 100644 --- a/simplereplace/pom.xml +++ b/simplereplace/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 simplereplace diff --git a/smb/pom.xml b/smb/pom.xml index 37b089d1..ac4a9ec0 100644 --- a/smb/pom.xml +++ b/smb/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 smb diff --git a/smooksnoxml/pom.xml b/smooksnoxml/pom.xml index a8af9cb3..2d0f915e 100644 --- a/smooksnoxml/pom.xml +++ b/smooksnoxml/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 smooksnoxml diff --git a/soap/pom.xml b/soap/pom.xml index 6ac8b5b7..7b15ccc2 100644 --- a/soap/pom.xml +++ b/soap/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 soap diff --git a/sql/pom.xml b/sql/pom.xml index 9fb276ee..55a12eeb 100644 --- a/sql/pom.xml +++ b/sql/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 sql diff --git a/tenantvariables/pom.xml b/tenantvariables/pom.xml index 27ff871e..dcf1c182 100644 --- a/tenantvariables/pom.xml +++ b/tenantvariables/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 tenantvariables diff --git a/throttling/pom.xml b/throttling/pom.xml index 417098e8..b1c76341 100644 --- a/throttling/pom.xml +++ b/throttling/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 throttling diff --git a/xmltocsv/pom.xml b/xmltocsv/pom.xml index e6bbec6b..c02092e1 100644 --- a/xmltocsv/pom.xml +++ b/xmltocsv/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 xmltocsv diff --git a/xmltoexcel/pom.xml b/xmltoexcel/pom.xml index 5c6887e4..6addb731 100644 --- a/xmltoexcel/pom.xml +++ b/xmltoexcel/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 xmltoexcel diff --git a/xmltojson/pom.xml b/xmltojson/pom.xml index 8cd2acc4..d4e05f91 100644 --- a/xmltojson/pom.xml +++ b/xmltojson/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 xmltojson diff --git a/xmltojsonlegacy/pom.xml b/xmltojsonlegacy/pom.xml index bd9a2e2a..b26722d7 100644 --- a/xmltojsonlegacy/pom.xml +++ b/xmltojsonlegacy/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.1.0-SNAPSHOT + 5.0.0 xmltojsonlegacy From 58e36eff7fe24718fc708f780d54a599433cf596 Mon Sep 17 00:00:00 2001 From: Raymond Meester Date: Wed, 14 Feb 2024 13:27:35 +0100 Subject: [PATCH 13/58] update dependencies --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1865ae8b..cb29d8b6 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ file:///${project.basedir}/rules.xml 1.2.20 - 4.1.0-SNAPSHOT + 5.0.0 1.70 1.9.26 4.0.3 From a04faef897f3aa107c7becfd3a0e5d03220d2ff1 Mon Sep 17 00:00:00 2001 From: Raymond Meester Date: Mon, 19 Feb 2024 08:23:26 +0100 Subject: [PATCH 14/58] update dependencies --- pom.xml | 2 +- smb/src/main/java/org/assimbly/smb/SmbEndpoint.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cb29d8b6..7d6edff1 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 1.70 1.9.26 4.0.3 - 4.3.0 + 4.4.0 1.9.0 v3-rev20240123-2.0.0 1.5.0 diff --git a/smb/src/main/java/org/assimbly/smb/SmbEndpoint.java b/smb/src/main/java/org/assimbly/smb/SmbEndpoint.java index 4809c508..99e33d9e 100644 --- a/smb/src/main/java/org/assimbly/smb/SmbEndpoint.java +++ b/smb/src/main/java/org/assimbly/smb/SmbEndpoint.java @@ -86,7 +86,7 @@ public GenericFileProducer createProducer() throws Exception { @Override public Exchange createExchange(final GenericFile file) { - Exchange answer = new DefaultExchange(this); + Exchange answer = new DefaultExchange(getCamelContext()); if (file != null) { file.bindToExchange(answer); } From ed76ced689045c392cae66124dbdb01a63c963a3 Mon Sep 17 00:00:00 2001 From: Raymond Meester Date: Mon, 19 Feb 2024 14:32:40 +0100 Subject: [PATCH 15/58] resolve pom.xml --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index 499f444c..7d6edff1 100644 --- a/pom.xml +++ b/pom.xml @@ -95,16 +95,9 @@ 1.3.2 1.6.1 6.0.0 -<<<<<<< HEAD 3.0.1 5.2.5 3.0.3 -======= - 2.0.29 - 5.2.5 - 2.0.9 - 1.5.3 ->>>>>>> develop 9.7.0-21 1.7.1 1.7.1.0 From 97baae03a69963638877a3a31b592359b17876c9 Mon Sep 17 00:00:00 2001 From: Raymond Meester Date: Fri, 8 Mar 2024 13:40:27 +0100 Subject: [PATCH 16/58] update dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7d6edff1..9336e6de 100644 --- a/pom.xml +++ b/pom.xml @@ -84,12 +84,12 @@ 4.5.14 3.29.2-GA 2.0.0 - 2.1.2 + 2.1.3 2.1.2 2.1.37 0.8.0 1.0.4 - 0.8.9 + 0.8.10 3.3.3 3.12.14 1.3.2 From 732550a87a5571968609373f14dc984ecf413646 Mon Sep 17 00:00:00 2001 From: Raymond Meester Date: Mon, 18 Mar 2024 08:16:44 +0100 Subject: [PATCH 17/58] update dependencies --- jsontoxmllegacy/pom.xml | 4 ++-- pom.xml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jsontoxmllegacy/pom.xml b/jsontoxmllegacy/pom.xml index 56468748..026339b7 100644 --- a/jsontoxmllegacy/pom.xml +++ b/jsontoxmllegacy/pom.xml @@ -4,7 +4,7 @@ custom-components org.assimbly - 4.0.5-SNAPSHOT + 5.0.0 jsontoxmllegacy @@ -38,7 +38,7 @@ - 11 + 21 diff --git a/pom.xml b/pom.xml index 2b9cfe26..6f8cb7b4 100644 --- a/pom.xml +++ b/pom.xml @@ -74,8 +74,8 @@ 5.0.0 1.70 1.9.26 - 4.0.3 - 4.4.0 + 4.0.4 + 4.4.1 1.9.0 v3-rev20240123-2.0.0 1.5.0 @@ -86,17 +86,17 @@ 3.29.2-GA 2.0.0 2.1.3 - 2.1.2 + 2.1.3 2.1.37 0.8.0 1.0.4 - 0.8.10 + 0.8.11 3.3.3 3.12.14 1.3.2 1.6.1 6.0.0 - 3.0.1 + 3.0.2 5.2.5 3.0.3 9.7.0-21 From 3aa53a6e00a276e766cb0f17bb328de4214a7ce9 Mon Sep 17 00:00:00 2001 From: Raymond Meester Date: Mon, 22 Apr 2024 09:19:07 +0200 Subject: [PATCH 18/58] fix to xmltojsonlegacy test --- .../java/org/assimbly/xmltojsonlegacy/XmlToJsonLegacyTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmltojsonlegacy/src/test/java/org/assimbly/xmltojsonlegacy/XmlToJsonLegacyTest.java b/xmltojsonlegacy/src/test/java/org/assimbly/xmltojsonlegacy/XmlToJsonLegacyTest.java index 3eddddb5..e4d23df3 100644 --- a/xmltojsonlegacy/src/test/java/org/assimbly/xmltojsonlegacy/XmlToJsonLegacyTest.java +++ b/xmltojsonlegacy/src/test/java/org/assimbly/xmltojsonlegacy/XmlToJsonLegacyTest.java @@ -15,7 +15,7 @@ public class XmlToJsonLegacyTest extends CamelTestSupport { private final ClassLoader classLoader = getClass().getClassLoader(); - @EndpointInject(uri = "mock:result") + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; @Produce From 5c0338f1d8d7ec1f38e1bd879bf8f2b3a2ca52ad Mon Sep 17 00:00:00 2001 From: Raymond Meester Date: Wed, 24 Apr 2024 16:28:33 +0200 Subject: [PATCH 19/58] removed archived components --- aleris/pom.xml | 68 --- aleris/src/docs/aleris.adoc | 40 -- .../org/assimbly/aleris/AlerisComponent.java | 28 -- .../aleris/AlerisTxtToXmlProcessor.java | 19 - .../aleris/CertificatesMarshaller.java | 23 - .../aleris/certificate/Certificate.java | 68 --- .../aleris/certificate/Certificates.java | 45 -- .../certificate/ChemicalComposition.java | 58 --- .../assimbly/aleris/certificate/Company.java | 49 -- .../aleris/certificate/Component.java | 49 -- .../certificate/MechanicalProperty.java | 52 --- .../aleris/certificate/StockUnit.java | 63 --- .../converter/AlerisCertificateConverter.java | 140 ------ .../converter/AlerisCertificateSplitter.java | 42 -- .../AlerisChemicalAnalysisSplitter.java | 57 --- .../converter/AlerisCrateContentSplitter.java | 26 -- .../converter/AlerisHeaderSplitter.java | 53 --- .../AlerisMechanicalPropertiesSplitter.java | 58 --- .../aleris/converter/AlerisUnitMatcher.java | 21 - .../IllegalAlerisCertificateException.java | 7 - .../org/apache/camel/component/aleris | 1 - .../AlerisComponentIntegrationTest.java | 32 -- .../assimbly/aleris/CertificatesCreator.java | 58 --- .../aleris/CertificatesMarshallerTest.java | 54 --- .../AlerisCertificateConverterTest.java | 163 ------- .../AlerisCertificateSplitterTest.java | 91 ---- .../AlerisChemicalAnalysisSplitterTest.java | 45 -- .../AlerisCrateContentSplitterTest.java | 45 -- .../converter/AlerisHeaderSplitterTest.java | 132 ------ ...lerisMechanicalPropertiesSplitterTest.java | 50 -- .../converter/AlerisUnitMatcherTest.java | 40 -- .../converter/additional-constraints.cert | 61 --- .../src/test/resources/converter/corby.cert | 58 --- .../src/test/resources/converter/english.cert | 59 --- .../resources/converter/few-elements.cert | 58 --- .../test/resources/converter/multiple.cert | 61 --- .../converter/properties-per-sub-coil.cert | 70 --- .../test/resources/converter/roermond.cert | 58 --- .../test/resources/converter/sub-coil.cert | 59 --- .../test/resources/converter/two-pages.cert | 70 --- .../test/resources/marshall/certificates.xml | 46 -- archive/pom.xml | 51 --- archive/src/docs/archive.adoc | 38 -- .../archive/CheckedZipFileDataFormat.java | 71 --- .../assimbly/archive/ZipFileDataFormat.java | 166 ------- .../archive/ZipInputStreamWrapper.java | 43 -- .../org/assimbly/archive/ZipIterator.java | 174 ------- .../org/assimbly/archive/ZipSplitter.java | 45 -- .../camel/dataformat/checkedZipFileDataFormat | 1 - .../apache/camel/dataformat/zipFileDataFormat | 1 - .../camel2/archive_camel2.xml | 52 --- .../integrationtests/dil/archive_dil.xml | 65 --- fmuta/pom.xml | 63 --- fmuta/src/docs/fmuta.adoc | 87 ---- .../assimbly/fmuta/BigDecimalConverter.java | 35 -- .../org/assimbly/fmuta/FmutaComponent.java | 20 - .../assimbly/fmuta/FmutaConfiguration.java | 23 - .../org/assimbly/fmuta/FmutaEndpoint.java | 33 -- .../org/assimbly/fmuta/FmutaFeedEnricher.java | 196 -------- .../org/assimbly/fmuta/FmutaProcessor.java | 26 -- .../services/org/apache/camel/component/fmuta | 1 - .../fmuta/BigDecimalConverterTest.java | 121 ----- .../fmuta/FmutaComponentIntegrationTest.java | 130 ------ .../assimbly/fmuta/FmutaFeedEnricherTest.java | 252 ---------- fmuta/src/test/resources/FMUTAFeed-in.csv | 295 ------------ fmuta/src/test/resources/FMUTAFeed-out.csv | 433 ------------------ hl7/pom.xml | 65 --- .../java/org/assimbly/hl7/Er7Encoder.java | 12 - .../java/org/assimbly/hl7/XmlEncoder.java | 13 - .../java/org/assimbly/hl7/XmlMarshaller.java | 14 - pom.xml | 6 - smb/pom.xml | 56 --- smb/src/docs/smb.adoc | 255 ----------- .../org/assimbly/smb/DefaultSmbClient.java | 225 --------- .../org/assimbly/smb/JcifsSmbApiFactory.java | 50 -- .../java/org/assimbly/smb/SmbApiFactory.java | 41 -- .../main/java/org/assimbly/smb/SmbClient.java | 49 -- .../java/org/assimbly/smb/SmbComponent.java | 77 ---- .../org/assimbly/smb/SmbConfiguration.java | 166 ------- .../java/org/assimbly/smb/SmbConsumer.java | 156 ------- .../java/org/assimbly/smb/SmbEndpoint.java | 145 ------ .../java/org/assimbly/smb/SmbGenericFile.java | 33 -- .../java/org/assimbly/smb/SmbOperations.java | 396 ---------------- .../java/org/assimbly/smb/SmbProducer.java | 283 ------------ .../SmbChangedExclusiveReadLockStrategy.java | 194 -------- .../strategy/SmbProcessStrategyFactory.java | 157 ------- .../services/org/apache/camel/component/smb | 22 - throttling/pom.xml | 56 --- throttling/src/docs/throttling.adoc | 67 --- .../throttling/QueueMessageChecker.java | 76 --- .../camel2/throttling_camel2.xml | 73 --- .../integrationtests/dil/throttling_dil.xml | 66 --- 92 files changed, 7452 deletions(-) delete mode 100644 aleris/pom.xml delete mode 100644 aleris/src/docs/aleris.adoc delete mode 100644 aleris/src/main/java/org/assimbly/aleris/AlerisComponent.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/AlerisTxtToXmlProcessor.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/CertificatesMarshaller.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/certificate/Certificate.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/certificate/Certificates.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/certificate/ChemicalComposition.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/certificate/Company.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/certificate/Component.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/certificate/MechanicalProperty.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/certificate/StockUnit.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/converter/AlerisCertificateConverter.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/converter/AlerisCertificateSplitter.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/converter/AlerisChemicalAnalysisSplitter.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/converter/AlerisCrateContentSplitter.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/converter/AlerisHeaderSplitter.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/converter/AlerisMechanicalPropertiesSplitter.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/converter/AlerisUnitMatcher.java delete mode 100644 aleris/src/main/java/org/assimbly/aleris/converter/IllegalAlerisCertificateException.java delete mode 100644 aleris/src/main/resources/META-INF/services/org/apache/camel/component/aleris delete mode 100644 aleris/src/test/java/org/assimbly/aleris/AlerisComponentIntegrationTest.java delete mode 100644 aleris/src/test/java/org/assimbly/aleris/CertificatesCreator.java delete mode 100644 aleris/src/test/java/org/assimbly/aleris/CertificatesMarshallerTest.java delete mode 100644 aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateConverterTest.java delete mode 100644 aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateSplitterTest.java delete mode 100644 aleris/src/test/java/org/assimbly/aleris/converter/AlerisChemicalAnalysisSplitterTest.java delete mode 100644 aleris/src/test/java/org/assimbly/aleris/converter/AlerisCrateContentSplitterTest.java delete mode 100644 aleris/src/test/java/org/assimbly/aleris/converter/AlerisHeaderSplitterTest.java delete mode 100644 aleris/src/test/java/org/assimbly/aleris/converter/AlerisMechanicalPropertiesSplitterTest.java delete mode 100644 aleris/src/test/java/org/assimbly/aleris/converter/AlerisUnitMatcherTest.java delete mode 100644 aleris/src/test/resources/converter/additional-constraints.cert delete mode 100644 aleris/src/test/resources/converter/corby.cert delete mode 100644 aleris/src/test/resources/converter/english.cert delete mode 100644 aleris/src/test/resources/converter/few-elements.cert delete mode 100644 aleris/src/test/resources/converter/multiple.cert delete mode 100644 aleris/src/test/resources/converter/properties-per-sub-coil.cert delete mode 100644 aleris/src/test/resources/converter/roermond.cert delete mode 100644 aleris/src/test/resources/converter/sub-coil.cert delete mode 100644 aleris/src/test/resources/converter/two-pages.cert delete mode 100644 aleris/src/test/resources/marshall/certificates.xml delete mode 100644 archive/pom.xml delete mode 100644 archive/src/docs/archive.adoc delete mode 100644 archive/src/main/java/org/assimbly/archive/CheckedZipFileDataFormat.java delete mode 100644 archive/src/main/java/org/assimbly/archive/ZipFileDataFormat.java delete mode 100644 archive/src/main/java/org/assimbly/archive/ZipInputStreamWrapper.java delete mode 100644 archive/src/main/java/org/assimbly/archive/ZipIterator.java delete mode 100644 archive/src/main/java/org/assimbly/archive/ZipSplitter.java delete mode 100644 archive/src/main/resources/META-INF/services/org/apache/camel/dataformat/checkedZipFileDataFormat delete mode 100644 archive/src/main/resources/META-INF/services/org/apache/camel/dataformat/zipFileDataFormat delete mode 100644 archive/src/test/resources/integrationtests/camel2/archive_camel2.xml delete mode 100644 archive/src/test/resources/integrationtests/dil/archive_dil.xml delete mode 100644 fmuta/pom.xml delete mode 100644 fmuta/src/docs/fmuta.adoc delete mode 100644 fmuta/src/main/java/org/assimbly/fmuta/BigDecimalConverter.java delete mode 100644 fmuta/src/main/java/org/assimbly/fmuta/FmutaComponent.java delete mode 100644 fmuta/src/main/java/org/assimbly/fmuta/FmutaConfiguration.java delete mode 100644 fmuta/src/main/java/org/assimbly/fmuta/FmutaEndpoint.java delete mode 100644 fmuta/src/main/java/org/assimbly/fmuta/FmutaFeedEnricher.java delete mode 100644 fmuta/src/main/java/org/assimbly/fmuta/FmutaProcessor.java delete mode 100644 fmuta/src/main/resources/META-INF/services/org/apache/camel/component/fmuta delete mode 100644 fmuta/src/test/java/org/assimbly/fmuta/BigDecimalConverterTest.java delete mode 100644 fmuta/src/test/java/org/assimbly/fmuta/FmutaComponentIntegrationTest.java delete mode 100644 fmuta/src/test/java/org/assimbly/fmuta/FmutaFeedEnricherTest.java delete mode 100644 fmuta/src/test/resources/FMUTAFeed-in.csv delete mode 100644 fmuta/src/test/resources/FMUTAFeed-out.csv delete mode 100644 hl7/pom.xml delete mode 100644 hl7/src/main/java/org/assimbly/hl7/Er7Encoder.java delete mode 100644 hl7/src/main/java/org/assimbly/hl7/XmlEncoder.java delete mode 100644 hl7/src/main/java/org/assimbly/hl7/XmlMarshaller.java delete mode 100644 smb/pom.xml delete mode 100644 smb/src/docs/smb.adoc delete mode 100644 smb/src/main/java/org/assimbly/smb/DefaultSmbClient.java delete mode 100644 smb/src/main/java/org/assimbly/smb/JcifsSmbApiFactory.java delete mode 100644 smb/src/main/java/org/assimbly/smb/SmbApiFactory.java delete mode 100644 smb/src/main/java/org/assimbly/smb/SmbClient.java delete mode 100644 smb/src/main/java/org/assimbly/smb/SmbComponent.java delete mode 100644 smb/src/main/java/org/assimbly/smb/SmbConfiguration.java delete mode 100644 smb/src/main/java/org/assimbly/smb/SmbConsumer.java delete mode 100644 smb/src/main/java/org/assimbly/smb/SmbEndpoint.java delete mode 100644 smb/src/main/java/org/assimbly/smb/SmbGenericFile.java delete mode 100644 smb/src/main/java/org/assimbly/smb/SmbOperations.java delete mode 100644 smb/src/main/java/org/assimbly/smb/SmbProducer.java delete mode 100644 smb/src/main/java/org/assimbly/smb/strategy/SmbChangedExclusiveReadLockStrategy.java delete mode 100644 smb/src/main/java/org/assimbly/smb/strategy/SmbProcessStrategyFactory.java delete mode 100644 smb/src/main/resources/META-INF/services/org/apache/camel/component/smb delete mode 100644 throttling/pom.xml delete mode 100644 throttling/src/docs/throttling.adoc delete mode 100644 throttling/src/main/java/org/assimbly/throttling/QueueMessageChecker.java delete mode 100644 throttling/src/test/resources/integrationtests/camel2/throttling_camel2.xml delete mode 100644 throttling/src/test/resources/integrationtests/dil/throttling_dil.xml diff --git a/aleris/pom.xml b/aleris/pom.xml deleted file mode 100644 index fb97cbf4..00000000 --- a/aleris/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 5.0.0 - - - aleris - - - UTF-8 - file:///${project.basedir}/../rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.javassist - javassist - ${java-assist.version} - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-simple - ${slf4j.version} - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 21 - - - - - - - - - - \ No newline at end of file diff --git a/aleris/src/docs/aleris.adoc b/aleris/src/docs/aleris.adoc deleted file mode 100644 index 77c1e0b2..00000000 --- a/aleris/src/docs/aleris.adoc +++ /dev/null @@ -1,40 +0,0 @@ -= Aleris Component -:doctitle: Aleris -:shortname: aleris -:artifactid: aleris -:description: converts plain text certificates for rolls of aluminium as produced by Aleris into XML certificates -:since: 2.20.1 -:supportlevel: Stable -:component-header: Producer is supported -//Manually maintained attributes - -*Since Camel {since}* - -*{component-header}* - -The component converts plain text certificates for rolls of aluminium as produced by Aleris into XML certificates. It supports both English and Dutch certificates. - -Maven users will need to add the following dependency to their `pom.xml` -for this component: - -[source,xml] ------------------------------------------------------------- - - org.assimbly - aleris - x.x.x - - ------------------------------------------------------------- - -== URI format - --------------------------------------------- -aleris:route_id --------------------------------------------- - -== URI example - --------------------------------------------- -aleris:46689a90-d0f8-11ec-83f5-3747809ef661 --------------------------------------------- diff --git a/aleris/src/main/java/org/assimbly/aleris/AlerisComponent.java b/aleris/src/main/java/org/assimbly/aleris/AlerisComponent.java deleted file mode 100644 index 7361b36f..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/AlerisComponent.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.assimbly.aleris; - -import org.apache.camel.Component; -import org.apache.camel.Endpoint; -import org.apache.camel.Processor; -import org.apache.camel.support.DefaultComponent; -import org.apache.camel.support.ProcessorEndpoint; - -import java.util.Map; - -public class AlerisComponent extends DefaultComponent { - - @Override - protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { - return new AlerisEndpoint(uri, this); - } - - private class AlerisEndpoint extends ProcessorEndpoint { - public AlerisEndpoint(String uri, Component component) { - super(uri, component); - } - - @Override - protected Processor createProcessor() throws Exception { - return new AlerisTxtToXmlProcessor(); - } - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/AlerisTxtToXmlProcessor.java b/aleris/src/main/java/org/assimbly/aleris/AlerisTxtToXmlProcessor.java deleted file mode 100644 index 5e44097d..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/AlerisTxtToXmlProcessor.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.assimbly.aleris; - -import org.assimbly.aleris.certificate.Certificates; -import org.assimbly.aleris.converter.AlerisCertificateConverter; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; - -public class AlerisTxtToXmlProcessor implements Processor { - private static final AlerisCertificateConverter converter = new AlerisCertificateConverter(); - private static final CertificatesMarshaller marshaller = new CertificatesMarshaller(); - - public void process(Exchange exchange) { - String input = exchange.getIn().getBody(String.class); - Certificates certificates = converter.convert(input); - - String marshalledCertificates = marshaller.marshall(certificates); - exchange.getIn().setBody(marshalledCertificates); - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/CertificatesMarshaller.java b/aleris/src/main/java/org/assimbly/aleris/CertificatesMarshaller.java deleted file mode 100644 index b1bc79a2..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/CertificatesMarshaller.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.assimbly.aleris; - -import org.assimbly.aleris.certificate.Certificates; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.Marshaller; -import java.io.StringWriter; - -public class CertificatesMarshaller { - public String marshall(Certificates certificates) { - try { - JAXBContext jaxbContext = JAXBContext.newInstance(Certificates.class); - Marshaller marshaller = jaxbContext.createMarshaller(); - marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); - StringWriter stringWriter = new StringWriter(); - marshaller.marshal(certificates, stringWriter); - - return stringWriter.toString(); - } catch (JAXBException jaxbException) { - throw new RuntimeException("Unable to marshall certificates", jaxbException); - } - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/Certificate.java b/aleris/src/main/java/org/assimbly/aleris/certificate/Certificate.java deleted file mode 100644 index f3778a59..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/Certificate.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.assimbly.aleris.certificate; - -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; -import java.util.ArrayList; -import java.util.List; - -@XmlAccessorType(XmlAccessType.FIELD) -public class Certificate { - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - private String number; - - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - @XmlElement(name = "issue-date") - private String issueDate; - - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - @XmlElement(name = "issued-by") - private Company issuer; - - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - @XmlElement(name = "issued-to") - private Company customer; - - @SuppressWarnings({"FieldCanBeLocal", "unused", "MismatchedQueryAndUpdateOfCollection"}) - @XmlElementWrapper(name = "stock-units") - @XmlElement(name = "stock-unit") - private List stockUnits; - - // Required by JAXB for unmarshalling - @SuppressWarnings("unused") - protected Certificate() {} - - public Certificate(String number, String issueDate, Company issuer, Company customer) { - this.number = number; - this.issueDate = issueDate; - this.issuer = issuer; - this.customer = customer; - this.stockUnits = new ArrayList<>(); - } - - public void addStockUnit(StockUnit stockUnit) { - this.stockUnits.add(stockUnit); - } - - @SuppressWarnings("EqualsWhichDoesntCheckParameterClass") - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(obj, this); - } - - @Override - public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); - } - - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE); - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/Certificates.java b/aleris/src/main/java/org/assimbly/aleris/certificate/Certificates.java deleted file mode 100644 index f42375ed..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/Certificates.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.assimbly.aleris.certificate; - -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlRootElement; -import java.util.ArrayList; -import java.util.List; - -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) -public class Certificates { - @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") - @XmlElement(name = "certificate") - private final List certificates; - - public Certificates() { - this.certificates = new ArrayList<>(); - } - - public void addCertificate(Certificate certificate) { - this.certificates.add(certificate); - } - - @SuppressWarnings("EqualsWhichDoesntCheckParameterClass") - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(obj, this); - } - - @Override - public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); - } - - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE); - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/ChemicalComposition.java b/aleris/src/main/java/org/assimbly/aleris/certificate/ChemicalComposition.java deleted file mode 100644 index 9464792d..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/ChemicalComposition.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.assimbly.aleris.certificate; - -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; -import java.util.ArrayList; -import java.util.List; - -@XmlAccessorType(XmlAccessType.FIELD) -public class ChemicalComposition { - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - private String unit; - - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - @XmlElement(name = "base-metal") - private Component baseMetal; - - @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") - @XmlElementWrapper(name = "components") - @XmlElement(name = "component") - private List components; - - // Required by JAXB for unmarshalling - @SuppressWarnings("unused") - protected ChemicalComposition() {} - - public ChemicalComposition(String unit, Component baseMetal) { - this.unit = unit; - this.baseMetal = baseMetal; - this.components = new ArrayList<>(); - } - - public void addComponent(Component component) { - this.components.add(component); - } - - @SuppressWarnings("EqualsWhichDoesntCheckParameterClass") - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(obj, this); - } - - @Override - public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); - } - - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE); - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/Company.java b/aleris/src/main/java/org/assimbly/aleris/certificate/Company.java deleted file mode 100644 index 34810500..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/Company.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.assimbly.aleris.certificate; - -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; - -@XmlAccessorType(XmlAccessType.FIELD) -public class Company { - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - private String name; - - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - private String code; - - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - @XmlElement(name = "order-number") - private String orderNumber; - - // Required by JAXB for unmarshalling - @SuppressWarnings("unused") - protected Company() {} - - public Company(String name, String code, String orderNumber) { - this.name = name; - this.code = code; - this.orderNumber = orderNumber; - } - - @SuppressWarnings("EqualsWhichDoesntCheckParameterClass") - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(obj, this); - } - - @Override - public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); - } - - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE); - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/Component.java b/aleris/src/main/java/org/assimbly/aleris/certificate/Component.java deleted file mode 100644 index b40df755..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/Component.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.assimbly.aleris.certificate; - - -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; - - -@XmlAccessorType(XmlAccessType.FIELD) -public class Component { - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - private String symbol; - - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - private String description; - - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - private String value; - - // Required by JAXB for unmarshalling - @SuppressWarnings("unused") - protected Component() {} - - public Component(String symbol, String description, String value) { - this.symbol = symbol; - this.description = description; - this.value = value; - } - - @SuppressWarnings("EqualsWhichDoesntCheckParameterClass") - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(obj, this); - } - - @Override - public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); - } - - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE); - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/MechanicalProperty.java b/aleris/src/main/java/org/assimbly/aleris/certificate/MechanicalProperty.java deleted file mode 100644 index e074496a..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/MechanicalProperty.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.assimbly.aleris.certificate; - -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; - - -@XmlAccessorType(XmlAccessType.FIELD) -public class MechanicalProperty { - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - private String code; - - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - private String description; - - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - private String value; - - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - private String unit; - - // Required by JAXB for unmarshalling - @SuppressWarnings("unused") - protected MechanicalProperty() {} - - public MechanicalProperty(String code, String description, String value, String unit) { - this.code = code; - this.description = description; - this.value = value; - this.unit = unit; - } - - @SuppressWarnings("EqualsWhichDoesntCheckParameterClass") - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(obj, this); - } - - @Override - public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); - } - - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE); - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/certificate/StockUnit.java b/aleris/src/main/java/org/assimbly/aleris/certificate/StockUnit.java deleted file mode 100644 index 58c14e34..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/certificate/StockUnit.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.assimbly.aleris.certificate; - -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; -import java.util.ArrayList; -import java.util.List; - -@XmlAccessorType(XmlAccessType.FIELD) -public class StockUnit { - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - private String id; - - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - @XmlElement(name = "ingot-case") - private String ingotCase; - - @SuppressWarnings({"FieldCanBeLocal", "unused", "MismatchedQueryAndUpdateOfCollection"}) - @XmlElementWrapper(name = "mechanical-properties") - @XmlElement(name = "property") - private List mechanicalProperties; - - @SuppressWarnings({"FieldCanBeLocal", "unused"}) - @XmlElement(name = "chemical-composition") - private ChemicalComposition chemicalComposition; - - // Required by JAXB for unmarshalling - @SuppressWarnings("unused") - protected StockUnit() {} - - public StockUnit(String id, String ingotCase, ChemicalComposition chemicalComposition) { - this.id = id; - this.ingotCase = ingotCase; - this.mechanicalProperties = new ArrayList<>(); - this.chemicalComposition = chemicalComposition; - } - - public void addMechanicalProperty(MechanicalProperty mechanicalProperty) { - this.mechanicalProperties.add(mechanicalProperty); - } - - @SuppressWarnings("EqualsWhichDoesntCheckParameterClass") - @Override - public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(obj, this); - } - - @Override - public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); - } - - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE); - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisCertificateConverter.java b/aleris/src/main/java/org/assimbly/aleris/converter/AlerisCertificateConverter.java deleted file mode 100644 index 8bfbcea9..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisCertificateConverter.java +++ /dev/null @@ -1,140 +0,0 @@ -package org.assimbly.aleris.converter; - -import org.assimbly.aleris.certificate.*; - -import java.util.*; -import java.util.stream.Collectors; - -public class AlerisCertificateConverter { - private static final AlerisCertificateSplitter certificateSplitter = new AlerisCertificateSplitter(); - - private static final AlerisHeaderSplitter headerSplitter = new AlerisHeaderSplitter(); - private static final AlerisChemicalAnalysisSplitter chemicalAnalysisSplitter = new AlerisChemicalAnalysisSplitter(); - private static final AlerisMechanicalPropertiesSplitter mechanicalPropertiesSplitter = new AlerisMechanicalPropertiesSplitter(); - private static final AlerisCrateContentSplitter crateContentSplitter = new AlerisCrateContentSplitter(); - - private static final AlerisUnitMatcher unitMatcher = new AlerisUnitMatcher(); - - public Certificates convert(String textualCertificate) { - Certificates certificates = new Certificates(); - certificates.addCertificate(convertCertificate(textualCertificate)); - - return certificates; - } - - private Certificate convertCertificate(String textualCertificate) { - String textualHeader = certificateSplitter.getHeader(textualCertificate); - String textualChemicalAnalysis = certificateSplitter.getChemicalAnalysis(textualCertificate); - String textualMechanicalProperties = certificateSplitter.getMechanicalProperties(textualCertificate); - String textualCrateContent = certificateSplitter.getCrateContent(textualCertificate); - - final String customerName = headerSplitter.getCustomerName(textualHeader); - String issuerCode = null; - String customerCode = null; - // The following issuer codes have been provided by Euramax. - if (customerName.endsWith("B.V.")) { - // The customer name refers to Euramax Roermond. - issuerCode = "07410"; - customerCode = "R"; - } else if (customerName.endsWith("LTD")) { - // The customer name refers to Euramax Corby. - issuerCode = "C0870"; - customerCode = "C"; - } - - Company customer = new Company(customerName, customerCode, headerSplitter.getCustomerOrderNumber(textualHeader)); - Company issuer = new Company("Aleris", issuerCode, headerSplitter.getIssuerOrderNumber(textualHeader)); - - // Euramax confirmed that the document number should be used as the certificate number. - final String certificateNumber = headerSplitter.getDocumentNumber(textualHeader); - final String issueDate = headerSplitter.getDate(textualHeader); - Certificate certificate = new Certificate(certificateNumber, issueDate, issuer, customer); - - final String issuerOrderNumberPartOne = headerSplitter.getIssuerOrderNumberPartOne(textualHeader); - - List units = mechanicalPropertiesSplitter.getUnits(textualMechanicalProperties); - Map>> testResults = mechanicalPropertiesSplitter.getTestResults(textualMechanicalProperties); - Map> mechanicalProperties = convertTestResults(units, testResults); - - List elementNames = chemicalAnalysisSplitter.getElementNames(textualChemicalAnalysis); - Map> castAnalyses = chemicalAnalysisSplitter.getCastAnalyses(textualChemicalAnalysis); - Map crateNumbers = crateContentSplitter.getCrateNumbers(textualCrateContent); - List stockUnits = convertCastAnalyses(elementNames, castAnalyses, mechanicalProperties, issuerOrderNumberPartOne, crateNumbers); - stockUnits.forEach(certificate::addStockUnit); - - return certificate; - } - - Map> convertTestResults(List units, Map>> testResults) { - Map> properties = new HashMap<>(); - testResults.forEach((castNumber, testResultsForCast) -> properties.put(castNumber, convertTestResultsForCast(units, testResultsForCast))); - - return properties; - } - - List convertTestResultsForCast(List units, List> testResultsForCast) { - List properties = new ArrayList<>(); - - List elongations = Collections.emptyList(); - List yieldStrengths = Collections.emptyList(); - List tensileStrengths = Collections.emptyList(); - - for (int i = 0; i < units.size(); ++i) { - String unit = units.get(i); - if (unitMatcher.elongation(unit)) { - elongations = getMechanicalProperties(testResultsForCast, i, "ELO", "%"); - } else if (unitMatcher.yieldStrength(unit)) { - yieldStrengths = getMechanicalProperties(testResultsForCast, i, "PST", "N/mm2"); - } else if (unitMatcher.tensileStrength(unit)) { - tensileStrengths = getMechanicalProperties(testResultsForCast, i, "UTS", "N/mm2"); - } - } - - properties.addAll(elongations); - properties.addAll(yieldStrengths); - properties.addAll(tensileStrengths); - - return properties; - } - - List getMechanicalProperties(List> testResults, int index, String code, String unit) { - return testResults.stream().map(row -> new MechanicalProperty(code, null, row.get(index), unit)).collect(Collectors.toList()); - } - - List convertCastAnalyses(List elementNames, Map> castAnalyses, Map> mechanicalProperties, String issuerOrderNumberPartOne, Map crateNumbers) { - return castAnalyses.entrySet().stream().map(entry -> convertCastAnalysis(elementNames, entry.getValue(), mechanicalProperties.get(entry.getKey()), issuerOrderNumberPartOne, crateNumbers.get(entry.getKey()))).collect(Collectors.toList()); - } - - StockUnit convertCastAnalysis(List elementNames, List properties, List mechanicalProperties, String issuerOrderNumberPartOne, String crateNumber) { - Component baseMetal = new Component("Al", "Aluminium", null); - ChemicalComposition chemicalComposition = new ChemicalComposition("% mass", baseMetal); - - for (int i = 0; i < elementNames.size(); ++i) { - String elementName = convertElementName(elementNames.get(i)); - String percentage = properties.get(i + 1); - chemicalComposition.addComponent(new Component(elementName, null, convertPercentage(percentage))); - } - - // Euramax confirmed that the cast number ("geutnummer") should be used as ingot case. - final String ingotCase = properties.get(0); - - // Euramax confirmed that the stock unit identifier is constructed by concatenating the first part of the - // issuer order number and the crate number. - final String stockUnitId = issuerOrderNumberPartOne + crateNumber; - - StockUnit stockUnit = new StockUnit(stockUnitId, ingotCase, chemicalComposition); - mechanicalProperties.forEach(stockUnit::addMechanicalProperty); - - return stockUnit; - } - - private String convertElementName(String name) { - String firstLetter = name.substring(0, 1).toUpperCase(); - String remainder = name.substring(1, name.length()).toLowerCase(); - return firstLetter + remainder; - } - - private String convertPercentage(String percentage) { - return percentage.replace(',', '.'); - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisCertificateSplitter.java b/aleris/src/main/java/org/assimbly/aleris/converter/AlerisCertificateSplitter.java deleted file mode 100644 index 4ede5960..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisCertificateSplitter.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.assimbly.aleris.converter; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class AlerisCertificateSplitter { - private static final Pattern specification = Pattern.compile("(.+)(?:SPECIFICATIES|DESCRIPTION)\\s*:", Pattern.DOTALL); - private static final Pattern chemicalAnalysis = Pattern.compile("={2,}\\s*\\n.*\\n\\s*={2,}\\s*\\n(.+)\\n\\s*={2,}\\s*\\n.*\\n\\s*={2,}\\s*\\n", Pattern.DOTALL); - private static final Pattern mechanicalProperties = Pattern.compile("={2,}.*={2,}.*={2,}.*={2,}(.+)(?:KISTINHOUD|CONT\\.PALLET)\\s*:\\s*(?:ROL|COIL)\\s*(?:DEELROL|SUBCOIL)\\s*(?:KISTNUMMER|PALLETNUMBER)\\s*(?:AANTAL|QUANTITY)", Pattern.DOTALL); - private static final Pattern crateContent = Pattern.compile("(?:KISTINHOUD|CONT\\.PALLET)\\s*:\\s*(?:ROL|COIL)\\s*(?:DEELROL|SUBCOIL)\\s*(?:KISTNUMMER|PALLETNUMBER)\\s*(?:AANTAL|QUANTITY)(.+)", Pattern.DOTALL); - - public String getHeader(String textualCertificate) { - return getFirstGroup(specification, textualCertificate, "The header is not found in the certificate"); - } - - public String getChemicalAnalysis(String textualCertificate) { - return getFirstGroup(chemicalAnalysis, textualCertificate, "The chemical analysis is not found in the certificate"); - } - - public String getMechanicalProperties(String textualCertificate) { - return getFirstGroup(mechanicalProperties, textualCertificate, "The mechanical properties are not found in the certificate"); - } - - public String getCrateContent(String textualCertificate) { - return getFirstGroup(crateContent, textualCertificate, "The crate content is not found in the certificate"); - } - - private String getFirstGroup(Pattern pattern, String input, String errorMessage) { - return getGroup(pattern, input, 1, errorMessage); - } - - private String getGroup(Pattern pattern, String input, int groupNumber, String errorMessage) { - Matcher matcher = pattern.matcher(input); - boolean isFound = matcher.find(); - - if (!isFound) { - throw new IllegalAlerisCertificateException(errorMessage); - } - - return matcher.group(groupNumber).trim(); - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisChemicalAnalysisSplitter.java b/aleris/src/main/java/org/assimbly/aleris/converter/AlerisChemicalAnalysisSplitter.java deleted file mode 100644 index ac3394f3..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisChemicalAnalysisSplitter.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.assimbly.aleris.converter; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class AlerisChemicalAnalysisSplitter { - private static final Pattern elementNames = Pattern.compile("^((\\s*[a-zA-Z]{2})+)\\s*$", Pattern.MULTILINE); - private static final Pattern elementName = Pattern.compile("[a-zA-Z]{2}"); - - private static final Pattern castAnalysis = Pattern.compile("^\\s*(\\d+)\\s+(\\d+)(\\s+\\d+,\\d+)+\\s*$", Pattern.MULTILINE); - private static final Pattern decimalValue = Pattern.compile("\\d+,\\d+"); - - public List getElementNames(String mechanicalProperties) { - Matcher matcher = elementNames.matcher(mechanicalProperties); - boolean isFound = matcher.find(); - if (!isFound) { - throw new IllegalAlerisCertificateException("Element names not found in certificate"); - } - - String elementNames = matcher.group(); - matcher = elementName.matcher(elementNames); - - List result = new ArrayList<>(); - while(matcher.find()) { - result.add(matcher.group()); - } - - return result; - } - - public Map> getCastAnalyses(String mechanicalProperties) { - Map> castAnalyses = new HashMap<>(); - - Matcher castAnalysisMatcher = castAnalysis.matcher(mechanicalProperties); - while (castAnalysisMatcher.find()) { - String castAnalysis = castAnalysisMatcher.group(); - String coilNumber = castAnalysisMatcher.group(1); - String castNumber = castAnalysisMatcher.group(2); - - List properties = new ArrayList<>(); - properties.add(castNumber); - Matcher decimalValueMatcher = decimalValue.matcher(castAnalysis); - while (decimalValueMatcher.find()) { - String decimalValue = decimalValueMatcher.group(); - properties.add(decimalValue); - } - - castAnalyses.put(coilNumber, properties); - } - - return castAnalyses; - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisCrateContentSplitter.java b/aleris/src/main/java/org/assimbly/aleris/converter/AlerisCrateContentSplitter.java deleted file mode 100644 index 0c413b49..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisCrateContentSplitter.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.assimbly.aleris.converter; - -import java.util.HashMap; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class AlerisCrateContentSplitter { - private static final Pattern crateNumber = Pattern.compile("^\\s*(\\d+)\\s+([0-9a-zA-Z]+\\s+)?(\\d+)\\s+\\d+\\s*$", Pattern.MULTILINE); - - public Map getCrateNumbers(String crateContent) { - Map crateNumbers = new HashMap<>(); - - Matcher matcher = crateNumber.matcher(crateContent); - while (matcher.find()) { - crateNumbers.put(matcher.group(1), pad(matcher.group(3))); - } - - return crateNumbers; - } - - private String pad(String numericString) { - Integer number = Integer.parseInt(numericString); - return String.format("%04d", number); - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisHeaderSplitter.java b/aleris/src/main/java/org/assimbly/aleris/converter/AlerisHeaderSplitter.java deleted file mode 100644 index 467ecf1a..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisHeaderSplitter.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.assimbly.aleris.converter; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class AlerisHeaderSplitter { - private static final Pattern customerName = Pattern.compile("(?:KLANT|CUSTOMER)\\s*:\\s*(.+)$", Pattern.MULTILINE); - private static final Pattern customerOrderNumber = Pattern.compile("(?:UW ORDERNUMMER|YOUR ORDER NUMBER)\\s*:\\s*(.+)(?:KLANT|CUSTOMER)\\s*:"); - private static final Pattern issuerOrderNumber = Pattern.compile("^\\s*(?:ONS ORDERNUMMER|OUR ORDER NUMBER)\\s*:\\s*(\\S+)", Pattern.MULTILINE); - private static final Pattern issuerOrderNumberPartOne = Pattern.compile("([^/]+)/"); - private static final Pattern documentNumber = Pattern.compile("DOC\\s*:\\s*(.+)(?:DATUM|DATE)"); - private static final Pattern date = Pattern.compile("(?:DATUM|DATE)\\s*:\\s*(.+)PROD\\. REF\\."); - - public String getCustomerName(String header) { - return getFirstGroup(customerName, header, "Customer name not found in certificate"); - } - - public String getCustomerOrderNumber(String header) { - return getFirstGroup(customerOrderNumber, header, "Customer order number not found in certificate"); - } - - public String getIssuerOrderNumber(String header) { - return getFirstGroup(issuerOrderNumber, header, "Issuer order number not found in certificate"); - } - - public String getIssuerOrderNumberPartOne(String header) { - String issuerOrderNumber = getIssuerOrderNumber(header); - return getFirstGroup(issuerOrderNumberPartOne, issuerOrderNumber, "First part of issuer order number not found in certificate"); - } - - public String getDocumentNumber(String header) { - return getFirstGroup(documentNumber, header, "Document number not found in certificate"); - } - - public String getDate(String header) { - return getFirstGroup(date, header, "Date not found in certificate"); - } - - private String getFirstGroup(Pattern pattern, String input, String errorMessage) { - return getGroup(pattern, input, 1, errorMessage); - } - - private String getGroup(Pattern pattern, String input, int groupNumber, String errorMessage) { - Matcher matcher = pattern.matcher(input); - boolean isFound = matcher.find(); - - if (!isFound) { - throw new IllegalAlerisCertificateException(errorMessage); - } - - return matcher.group(groupNumber).trim(); - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisMechanicalPropertiesSplitter.java b/aleris/src/main/java/org/assimbly/aleris/converter/AlerisMechanicalPropertiesSplitter.java deleted file mode 100644 index 884224bf..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisMechanicalPropertiesSplitter.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.assimbly.aleris.converter; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class AlerisMechanicalPropertiesSplitter { - private static final Pattern units = Pattern.compile("^(?:\\s*[^(\\n]+\\([^)\\n]+\\))+\\s*$", Pattern.MULTILINE); - private static final Pattern unit = Pattern.compile("[^(]+\\([^)]+\\)"); - private static final Pattern testResults = Pattern.compile("^\\s*(\\d+)(?:/[A-Z]+\\d+)?\\s+/(?:A|M|V|O)((\\s+\\d+)+)\\s*$$", Pattern.MULTILINE); - private static final Pattern integerNumber = Pattern.compile("\\d+"); - - public List getUnits(String mechanicalProperties) { - Matcher unitsMatcher = units.matcher(mechanicalProperties); - boolean isFound = unitsMatcher.find(); - if (!isFound) { - throw new IllegalAlerisCertificateException("Units not found in mechanical properties of certificate"); - } - String units = unitsMatcher.group(); - - Matcher unitMatcher = unit.matcher(units); - List result = new ArrayList<>(); - while (unitMatcher.find()) { - result.add(unitMatcher.group().trim()); - } - - return result; - } - - public Map>> getTestResults(String mechanicalProperties) { - Matcher testResultsMatcher = testResults.matcher(mechanicalProperties); - Map>> result = new HashMap<>(); - while (testResultsMatcher.find()) { - String testResult = testResultsMatcher.group(2); - String testNumber = testResultsMatcher.group(1); - - List> a = result.get(testNumber); - if (a == null) { - a = new ArrayList<>(); - result.put(testNumber, a); - } - - List numbers = new ArrayList<>(); - Matcher integerNumberMatcher = integerNumber.matcher(testResult); - while (integerNumberMatcher.find()) { - numbers.add(integerNumberMatcher.group().trim()); - } - - a.add(numbers); - } - - return result; - } - -} diff --git a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisUnitMatcher.java b/aleris/src/main/java/org/assimbly/aleris/converter/AlerisUnitMatcher.java deleted file mode 100644 index 1d10eb70..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/converter/AlerisUnitMatcher.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.assimbly.aleris.converter; - -import java.util.regex.Pattern; - -public class AlerisUnitMatcher { - private static final Pattern elongation = Pattern.compile("A50\\s*\\(T\\)"); - private static final Pattern tensileStrength = Pattern.compile("RM\\s*\\(T\\)"); - private static final Pattern yieldStrength = Pattern.compile("RP02\\s*\\(T\\)"); - - public boolean elongation(String unit) { - return elongation.matcher(unit).matches(); - } - - public boolean tensileStrength(String unit) { - return tensileStrength.matcher(unit).matches(); - } - - public boolean yieldStrength(String unit) { - return yieldStrength.matcher(unit).matches(); - } -} diff --git a/aleris/src/main/java/org/assimbly/aleris/converter/IllegalAlerisCertificateException.java b/aleris/src/main/java/org/assimbly/aleris/converter/IllegalAlerisCertificateException.java deleted file mode 100644 index 55f1e0a3..00000000 --- a/aleris/src/main/java/org/assimbly/aleris/converter/IllegalAlerisCertificateException.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.assimbly.aleris.converter; - -public class IllegalAlerisCertificateException extends RuntimeException { - public IllegalAlerisCertificateException(String message) { - super(message); - } -} diff --git a/aleris/src/main/resources/META-INF/services/org/apache/camel/component/aleris b/aleris/src/main/resources/META-INF/services/org/apache/camel/component/aleris deleted file mode 100644 index c269ba05..00000000 --- a/aleris/src/main/resources/META-INF/services/org/apache/camel/component/aleris +++ /dev/null @@ -1 +0,0 @@ -class=org.assimbly.aleris.AlerisComponent \ No newline at end of file diff --git a/aleris/src/test/java/org/assimbly/aleris/AlerisComponentIntegrationTest.java b/aleris/src/test/java/org/assimbly/aleris/AlerisComponentIntegrationTest.java deleted file mode 100644 index 46f1a137..00000000 --- a/aleris/src/test/java/org/assimbly/aleris/AlerisComponentIntegrationTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.assimbly.aleris; - -import org.apache.camel.EndpointInject; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.junit.jupiter.api.Test; - -public class AlerisComponentIntegrationTest extends CamelTestSupport { - - @EndpointInject("mock:out") - private MockEndpoint resultEndpoint; - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - from("direct:in") - .to("aleris:convert") - .to("mock:out"); - } - }; - } - - @Test - public void canBeInstantiated() throws Exception { - resultEndpoint.expectedMessageCount(1); - template.sendBody("direct:in", getClass().getResource("/converter/corby.cert")); - resultEndpoint.assertIsSatisfied(); - } -} diff --git a/aleris/src/test/java/org/assimbly/aleris/CertificatesCreator.java b/aleris/src/test/java/org/assimbly/aleris/CertificatesCreator.java deleted file mode 100644 index bc4fb6d3..00000000 --- a/aleris/src/test/java/org/assimbly/aleris/CertificatesCreator.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.assimbly.aleris; - -import org.assimbly.aleris.certificate.*; - -import java.util.ArrayList; -import java.util.List; - -public class CertificatesCreator { - public Certificates create(int i, String issuerName, String issuerCode, String customerName, String customerCode, - List elementNames, int numberOfStockUnits, int numberOfPropertyRowsPerStockUnit) { - Certificates certificates = new Certificates(); - Company issuer = new Company(issuerName, issuerCode, "89977/0" + ++i); - Company customer = new Company(customerName, customerCode, "31479" + ++i); - Certificate certificate = new Certificate("V/008051706" + ++i, "2016-03-0" + ++i, issuer, customer); - - List properties = createMechanicalProperties(numberOfPropertyRowsPerStockUnit, i); - - Component baseMetal = new Component("Al", "Aluminium", null); - for (int j = 0; j < numberOfStockUnits; ++j) { - String stockUnitId = "89977" + pad(++i); - - ChemicalComposition chemicalComposition = new ChemicalComposition("% mass", baseMetal); - for (String elementName : elementNames) { - chemicalComposition.addComponent(new Component(elementName, null, "0." + ++i)); - } - - StockUnit stockUnit = new StockUnit(stockUnitId, "009568" + ++i, chemicalComposition); - - properties.forEach(stockUnit::addMechanicalProperty); - - certificate.addStockUnit(stockUnit); - } - - certificates.addCertificate(certificate); - - return certificates; - } - - private List createMechanicalProperties(int numberOfPropertyRows, int i) { - List properties = new ArrayList<>(); - properties.addAll(createMechanicalProperties(numberOfPropertyRows, "ELO", "%", i)); - properties.addAll(createMechanicalProperties(numberOfPropertyRows, "PST", "N/mm2", ++i)); - properties.addAll(createMechanicalProperties(numberOfPropertyRows, "UTS", "N/mm2", ++i)); - return properties; - } - - private List createMechanicalProperties(int numberOfPropertyRows, String code, String unit, int i) { - List properties = new ArrayList<>(); - for (int k = 0; k < numberOfPropertyRows; ++k) { - properties.add(new MechanicalProperty(code, null, String.valueOf(k + i), unit)); - } - return properties; - } - - private String pad(int i) { - return String.format("%04d", i); - } -} diff --git a/aleris/src/test/java/org/assimbly/aleris/CertificatesMarshallerTest.java b/aleris/src/test/java/org/assimbly/aleris/CertificatesMarshallerTest.java deleted file mode 100644 index b9bbc7bb..00000000 --- a/aleris/src/test/java/org/assimbly/aleris/CertificatesMarshallerTest.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.assimbly.aleris; - -import org.apache.commons.io.IOUtils; - -import org.junit.jupiter.api.Test; - -import org.assimbly.aleris.certificate.*; - - -import jakarta.xml.bind.JAXBException; -import java.io.IOException; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class CertificatesMarshallerTest { - - /** - * Tests whether instances of Certificates are marshalled to the XML format specified by Euramax. - * It ensures that the correct JAXB annotations are used. - * @throws jakarta.xml.bind.JAXBException - * @throws IOException - */ - @Test - public void test() throws JAXBException, IOException { - final Certificates certificates = createTestCertificates(); - CertificatesMarshaller marshaller = new CertificatesMarshaller(); - final String marshalledCertificates = marshaller.marshall(certificates); - final String expectedResult = readMarshalledCertificateFromFile(); - - assertEquals(expectedResult, marshalledCertificates); - } - - private Certificates createTestCertificates() { - Company issuer = new Company("issuer", "123", "456"); - Company customer = new Company("customer", "789", "012"); - Certificate certificate = new Certificate("123", "2016-02-01", issuer, customer); - Component baseMetal = new Component("Al", "Aluminium", "1"); - Component component = new Component("Fe", "Iron", "0.01"); - ChemicalComposition chemicalComposition = new ChemicalComposition("%", baseMetal); - chemicalComposition.addComponent(component); - StockUnit stockUnit = new StockUnit("stockUnitId", "ingotCase", chemicalComposition); - MechanicalProperty mechanicalProperty = new MechanicalProperty("code", "description", "value", "unit"); - stockUnit.addMechanicalProperty(mechanicalProperty); - certificate.addStockUnit(stockUnit); - Certificates certificates = new Certificates(); - certificates.addCertificate(certificate); - - return certificates; - } - - private String readMarshalledCertificateFromFile() throws IOException { - return IOUtils.toString(this.getClass().getResourceAsStream("/marshall/certificates.xml"),"UTF-8"); - } -} diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateConverterTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateConverterTest.java deleted file mode 100644 index 94284d72..00000000 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateConverterTest.java +++ /dev/null @@ -1,163 +0,0 @@ -package org.assimbly.aleris.converter; - -import org.apache.commons.io.IOUtils; -import org.assimbly.aleris.CertificatesCreator; -import org.assimbly.aleris.certificate.Certificates; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.util.Arrays; -import java.util.List; - -public class AlerisCertificateConverterTest { - private static final CertificatesCreator creator = new CertificatesCreator(); - private AlerisCertificateConverter converter; - - @BeforeEach - public void setUp() { - this.converter = new AlerisCertificateConverter(); - } - - /** - * Tests whether a certificate for Euramax Roermond is parsed correctly. - * @throws IOException - */ - @Test - public void roermondTest() throws IOException { - List elementNames = Arrays.asList("Si", "Fe", "Cu", "Mn", "Mg", "Cr", "Ti", "Zn"); - - final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/roermond.cert")); - final Certificates expectedCertificates = createCertificates(false, elementNames, 1, 1, 1); - - Assertions.assertEquals(expectedCertificates, actualCertificates); - } - - /** - * Tests whether a certificate for Euramax Corby is parsed correctly. - * @throws IOException - */ - @Test - public void corbyTest() throws IOException { - List elementNames = Arrays.asList("Si", "Fe", "Cu", "Mn", "Mg", "Cr", "Ti", "Zn"); - - final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/corby.cert")); - final Certificates expectedCertificates = createCertificates(true, elementNames, 2, 1, 1); - - Assertions.assertEquals(expectedCertificates, actualCertificates); - } - - /** - * Tests whether a certificate with multiple "Geuts" and tests is parsed correctly. - * @throws IOException - */ - @Test - public void multipleTest() throws IOException { - List elementNames = Arrays.asList("Si", "Fe", "Cu", "Mn", "Mg", "Cr", "Ti", "Zn"); - - final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/multiple.cert")); - final Certificates expectedCertificates = createCertificates(false, elementNames, 3, 2, 1); - - Assertions.assertEquals(expectedCertificates, actualCertificates); - } - - /** - * Tests whether a certificate with few elements in the chemical analysis is parsed correctly. - * @throws IOException - */ - @Test - public void fewElementsTest() throws IOException { - List elementNames = Arrays.asList("Si", "Fe", "Cu", "Mn", "Mg", "Cr", "Zn"); - - final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/few-elements.cert")); - final Certificates expectedCertificates = createCertificates(false, elementNames, 4, 1, 1); - - Assertions.assertEquals(expectedCertificates, actualCertificates); - } - - /** - * Tests whether a certificate with additional constraints in the chemical analysis is parsed correctly. - * @throws IOException - */ - @Test - public void additionalConstraintsTest() throws IOException { - List elementNames = Arrays.asList("Si", "Fe", "Cu", "Mn", "Mg", "Cr", "Ti", "Zn"); - - final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/additional-constraints.cert")); - final Certificates expectedCertificates = createCertificates(false, elementNames, 5, 1, 1); - - Assertions.assertEquals(expectedCertificates, actualCertificates); - } - - /** - * Tests whether an English certificate is parsed correctly. - * @throws IOException - */ - @Test - public void englishTest() throws IOException { - List elementNames = Arrays.asList("Si", "Fe", "Cu", "Mn", "Mg", "Cr", "Ti", "Zn"); - - final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/english.cert")); - final Certificates expectedCertificates = createCertificates(true, elementNames, 1, 1, 1); - - Assertions.assertEquals(expectedCertificates, actualCertificates); - } - - /** - * Tests whether a certificate that spans two pages is parsed correctly. - * @throws IOException - */ - @Test - public void twoPagesTest() throws IOException { - List elementNames = Arrays.asList("Si", "Fe", "Cu", "Mn", "Mg", "Ti", "Zn", "Al"); - - final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/two-pages.cert")); - final Certificates expectedCertificates = createCertificates(false, elementNames, 2, 1, 2); - - Assertions.assertEquals(expectedCertificates, actualCertificates); - } - - /** - * Tests whether a certificate that contains a sub coil is parsed correctly. - * @throws IOException - */ - @Test - public void subCoilTest() throws IOException { - List elementNames = Arrays.asList("Si", "Fe", "Cu", "Mn", "Mg", "Cr", "Ti", "Zn"); - - final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/sub-coil.cert")); - final Certificates expectedCertificates = createCertificates(false, elementNames, 6, 1, 1); - - Assertions.assertEquals(expectedCertificates, actualCertificates); - } - - /** - * Tests whether a certificate that contains multiple mechanical properties per - * coil is parsed correctly. - * @throws IOException - */ - @Test - public void propertiesPerSubCoilTest() throws IOException { - List elementNames = Arrays.asList("Si", "Fe", "Cu", "Mn", "Mg", "Ti", "Zn", "Al"); - - final Certificates actualCertificates = converter.convert(readCertificateFromResources("/converter/properties-per-sub-coil.cert")); - final Certificates expectedCertificates = createCertificates(true, elementNames, 6, 1, 2); - - Assertions.assertEquals(expectedCertificates, actualCertificates); - } - - private String readCertificateFromResources(String resourceName) throws IOException { - return IOUtils.toString(this.getClass().getResourceAsStream(resourceName),"UTF-8"); - } - - private Certificates createCertificates(boolean corbyCertificate, List elementNames, int i, int numberOfStockUnits, int numberOfPropertyRowsPerStockUnit) { - if (corbyCertificate) { - return creator.create(i, "Aleris", "C0870", "EURAMAX COATED PRODUCTS LTD", "C", - elementNames, numberOfStockUnits, numberOfPropertyRowsPerStockUnit); - } else { - return creator.create(i, "Aleris", "07410", "EURAMAX COATED PRODUCTS B.V.", "R", - elementNames, numberOfStockUnits, numberOfPropertyRowsPerStockUnit); - } - } -} \ No newline at end of file diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateSplitterTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateSplitterTest.java deleted file mode 100644 index 88361391..00000000 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCertificateSplitterTest.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.assimbly.aleris.converter; - - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class AlerisCertificateSplitterTest { - private AlerisCertificateSplitter splitter; - - @BeforeEach - public void setUp() { - this.splitter = new AlerisCertificateSplitter(); - } - - @Test - public void getDutchHeader() { - String header = splitter.getHeader("line1\nline2\nSPECIFICATIES:"); - assertEquals("line1\nline2", header); - } - - @Test - public void getEnglishHeader() { - String header = splitter.getHeader("line1\nline2\nDESCRIPTION:"); - assertEquals("line1\nline2", header); - } - - @Test - public void getNonExistingHeader() { - Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { - splitter.getHeader(""); - }); - } - - @Test - public void getChemicalAnalysis() { - String chemicalAnalysis = splitter.getChemicalAnalysis("==\nline1\n==\nline2\nline3\n==\nline4\n==\n"); - assertEquals("line2\nline3", chemicalAnalysis); - } - - @Test - public void getNonExistingChemicalAnalysis() { - Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { - splitter.getChemicalAnalysis(""); - }); - } - - @Test - public void getDutchMechanicalProperties() { - String certificate = "==\n==\n==\n==\nline1\nline2\nKISTINHOUD : ROL DEELROL KISTNUMMER AANTAL"; - String mechanicalProperties = splitter.getMechanicalProperties(certificate); - assertEquals("line1\nline2", mechanicalProperties); - } - - @Test - public void getEnglishMechanicalProperties() { - String certificate = "==\n==\n==\n==\nline1\nline2\nCONT.PALLET : COIL SUBCOIL PALLETNUMBER QUANTITY"; - String mechanicalProperties = splitter.getMechanicalProperties(certificate); - assertEquals("line1\nline2", mechanicalProperties); - } - - @Test - public void getNonExistingMechanicalProperties(){ - Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { - splitter.getMechanicalProperties(""); - }); - } - - @Test - public void getDutchCrateContent() { - String certificate = "KISTINHOUD : ROL DEELROL KISTNUMMER AANTAL\nline1\nline2\n"; - String crateContent = splitter.getCrateContent(certificate); - assertEquals("line1\nline2", crateContent); - } - - @Test - public void getEnglishCrateContent() { - String certificate = "CONT.PALLET : COIL SUBCOIL PALLETNUMBER QUANTITY\nline1\nline2\n"; - String crateContent = splitter.getCrateContent(certificate); - assertEquals("line1\nline2", crateContent); - } - - @Test - public void getNonExistingCrateContent() { - Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { - splitter.getCrateContent(""); - }); - } -} diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisChemicalAnalysisSplitterTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisChemicalAnalysisSplitterTest.java deleted file mode 100644 index fc4ea844..00000000 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisChemicalAnalysisSplitterTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.assimbly.aleris.converter; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class AlerisChemicalAnalysisSplitterTest { - private AlerisChemicalAnalysisSplitter splitter; - - @BeforeEach - public void setUp() { - this.splitter = new AlerisChemicalAnalysisSplitter(); - } - - @Test - public void getElementNames() { - List elementNames = splitter.getElementNames("line1\nline2\n AL ZI MN \nline3\nline4"); - assertEquals(Arrays.asList("AL", "ZI", "MN"), elementNames); - } - - @Test - public void getNonExistingElementNames() { - Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { - splitter.getElementNames(""); - }); - } - - @Test - public void getCastAnalyses() { - Map> castAnalyses = splitter.getCastAnalyses("lin1\nline2\n001 0095823 0,09 0,31\n002 0095824 0,19 0,32\nline3"); - - Map> expected = new HashMap<>(); - expected.put("001", Arrays.asList("0095823", "0,09", "0,31")); - expected.put("002", Arrays.asList("0095824", "0,19", "0,32")); - - assertEquals(expected, castAnalyses); - } -} diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCrateContentSplitterTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCrateContentSplitterTest.java deleted file mode 100644 index 1fce8abb..00000000 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisCrateContentSplitterTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.assimbly.aleris.converter; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.util.HashMap; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class AlerisCrateContentSplitterTest { - private AlerisCrateContentSplitter splitter; - - @BeforeEach - public void setUp() { - splitter = new AlerisCrateContentSplitter(); - } - - @Test - public void getCrateNumbersWithoutSubRoll() { - Map crateNumbers = splitter.getCrateNumbers("line1\nline2\n 123 456 789\n 012 345 678\nline4\nline5"); - Map expected = new HashMap<>(); - expected.put("123", "0456"); - expected.put("012", "0345"); - assertEquals(expected, crateNumbers); - } - - @Test - public void getCrateNumbersWithSubRoll() { - Map crateNumbers = splitter.getCrateNumbers("line1\nline2\n 123 AB1 456 789\n 012 CD2 345 678\nline4\nline5"); - Map expected = new HashMap<>(); - expected.put("123", "0456"); - expected.put("012", "0345"); - assertEquals(expected, crateNumbers); - } - - @Test - public void padding() { - Map crateNumbers = splitter.getCrateNumbers("line1\nline2\n 123 4 567\n 012 34567 89\nline4\nline5"); - Map expected = new HashMap<>(); - expected.put("123", "0004"); - expected.put("012", "34567"); - assertEquals(expected, crateNumbers); - } -} diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisHeaderSplitterTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisHeaderSplitterTest.java deleted file mode 100644 index 04b672d0..00000000 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisHeaderSplitterTest.java +++ /dev/null @@ -1,132 +0,0 @@ -package org.assimbly.aleris.converter; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class AlerisHeaderSplitterTest { - private AlerisHeaderSplitter splitter; - - @BeforeEach - public void setUp() { - splitter = new AlerisHeaderSplitter(); - } - - @Test - public void getDutchCustomerName() { - String customerName = splitter.getCustomerName("line1\nline2\n KLANT : BEDRIJFSNAAM B.V. \nline4\nline5"); - assertEquals("BEDRIJFSNAAM B.V.", customerName); - } - - @Test - public void getEnglishCustomerName() { - String customerName = splitter.getCustomerName("line1\nline2\n CUSTOMER : BEDRIJFSNAAM B.V. \nline4\nline5"); - assertEquals("BEDRIJFSNAAM B.V.", customerName); - } - - @Test - public void getNonExistingCustomerName() { - Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { - splitter.getCustomerName(""); - }); - } - - @Test - public void getDutchCustomerOrderNumber() { - String customerOrderNumber = splitter.getCustomerOrderNumber("line1\nline2\n UW ORDERNUMMER : 12345 ABCD KLANT : KLANTNAAM\nline4\nline5"); - assertEquals("12345 ABCD", customerOrderNumber); - } - - @Test - public void getEnglishCustomerOrderNumber() { - String customerOrderNumber = splitter.getCustomerOrderNumber("line1\nline2\n YOUR ORDER NUMBER : 12345 ABCD CUSTOMER : KLANTNAAM\nline4\nline5"); - assertEquals("12345 ABCD", customerOrderNumber); - } - - @Test - public void getNonExistingCustomerOrderNumber() { - Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { - splitter.getCustomerOrderNumber(""); - }); - } - - @Test - public void getDutchIssuerOrderNumber() { - String issuerOrderNumber = splitter.getIssuerOrderNumber("line1\nline2\n ONS ORDERNUMMER : 88429/10 STRAATNAAM\nline4\nline5"); - assertEquals("88429/10", issuerOrderNumber); - } - - @Test - public void getEnglishIssuerOrderNumber() { - String issuerOrderNumber = splitter.getIssuerOrderNumber("line1\nline2\n OUR ORDER NUMBER : 88429/10 STRAATNAAM\nline4\nline5"); - assertEquals("88429/10", issuerOrderNumber); - } - - @Test - public void getNonExistingIssuerOrderNumber() { - Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { - splitter.getIssuerOrderNumber(""); - }); - - } - - @Test - public void getDutchIssuerOrderNumberPartOne() { - String issuerOrderNumber = splitter.getIssuerOrderNumberPartOne("line1\nline2\n ONS ORDERNUMMER : 88429/10 STRAATNAAM\nline4\nline5"); - assertEquals("88429", issuerOrderNumber); - } - - @Test - public void getEnglishIssuerOrderNumberPartOne() { - String issuerOrderNumber = splitter.getIssuerOrderNumberPartOne("line1\nline2\n OUR ORDER NUMBER : 88429/10 STRAATNAAM\nline4\nline5"); - assertEquals("88429", issuerOrderNumber); - } - - @Test - public void getNonExistingIssuerOrderNumberPartOne() { - Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { - splitter.getIssuerOrderNumberPartOne(""); - }); - } - - @Test - public void getDutchDocumentNumber() { - String documentNumber = splitter.getDocumentNumber("line1\nline2\n DOC : V/0080519536 DATUM : 2016\nline4\nline5"); - assertEquals("V/0080519536", documentNumber); - } - - - @Test - public void getEnglishDocumentNumber() { - String documentNumber = splitter.getDocumentNumber("line1\nline2\n DOC : V/0080519536 DATE : 2016\nline4\nline5"); - assertEquals("V/0080519536", documentNumber); - } - - @Test - public void getNonExistingDocumentNumber() { - Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { - splitter.getDocumentNumber(""); - }); - } - - @Test - public void getDutchDate() { - String date = splitter.getDate("line1\nline2\n DATUM : 2016-03-24 PROD. REF.\nline4\nline5"); - assertEquals("2016-03-24", date); - } - - @Test - public void getEnglishDate() { - String date = splitter.getDate("line1\nline2\n DATE : 2016-03-24 PROD. REF.\nline4\nline5"); - assertEquals("2016-03-24", date); - } - - @Test - public void getNonExistingDate() { - Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { - splitter.getDate(""); - }); - } -} diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisMechanicalPropertiesSplitterTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisMechanicalPropertiesSplitterTest.java deleted file mode 100644 index c1686a59..00000000 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisMechanicalPropertiesSplitterTest.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.assimbly.aleris.converter; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class AlerisMechanicalPropertiesSplitterTest { - private AlerisMechanicalPropertiesSplitter splitter; - - @BeforeEach - public void setUp() { - this.splitter = new AlerisMechanicalPropertiesSplitter(); - } - - @Test - public void getUnits() { - List units = splitter.getUnits("line1\nline2\n RM(T) RP02(T) A50(T)\nline3\n"); - assertEquals(Arrays.asList("RM(T)", "RP02(T)", "A50(T)"), units); - } - - @Test - public void getNonExistingUnits() { - Assertions.assertThrows(IllegalAlerisCertificateException.class, () -> { - splitter.getUnits(""); - }); - } - - @Test - public void getTestResultsWithoutSubCoil() { - Map>> testResults = splitter.getTestResults("line1\n 001 /A 120 112\n 001 /V 121 113\nline2\n"); - Map>> expected = new HashMap<>(); - expected.put("001", Arrays.asList(Arrays.asList("120", "112"), Arrays.asList("121", "113"))); - assertEquals(expected, testResults); - } - - @Test - public void getTestResultsWithSubCoil() { - Map>> testResults = splitter.getTestResults("line1\n 001/A01 /A 120 112\n 001/A02 /V 121 113\nline2\n"); - Map>> expected = new HashMap<>(); - expected.put("001", Arrays.asList(Arrays.asList("120", "112"), Arrays.asList("121", "113"))); - assertEquals(expected, testResults); - } -} diff --git a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisUnitMatcherTest.java b/aleris/src/test/java/org/assimbly/aleris/converter/AlerisUnitMatcherTest.java deleted file mode 100644 index 37d35934..00000000 --- a/aleris/src/test/java/org/assimbly/aleris/converter/AlerisUnitMatcherTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.assimbly.aleris.converter; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -public class AlerisUnitMatcherTest { - private AlerisUnitMatcher matcher; - - @BeforeEach - public void setUp() { - matcher = new AlerisUnitMatcher(); - } - - @Test - public void elongation() { - Assertions.assertTrue(matcher.elongation("A50(T)")); - Assertions.assertTrue(matcher.elongation("A50 (T)")); - Assertions.assertFalse(matcher.elongation("")); - Assertions.assertFalse(matcher.elongation("A50")); - Assertions.assertFalse(matcher.elongation("(T)")); - } - - @Test - public void tensileStrength() { - Assertions.assertTrue(matcher.tensileStrength("RM(T)")); - Assertions.assertTrue(matcher.tensileStrength("RM (T)")); - Assertions.assertFalse(matcher.tensileStrength("")); - Assertions.assertFalse(matcher.tensileStrength("RM")); - Assertions.assertFalse(matcher.tensileStrength("(T)")); - } - @Test - public void yieldStrength() { - Assertions.assertTrue(matcher.yieldStrength("RP02(T)")); - Assertions.assertTrue(matcher.yieldStrength("RP02 (T)")); - Assertions.assertFalse(matcher.yieldStrength("")); - Assertions.assertFalse(matcher.yieldStrength("RP02")); - Assertions.assertFalse(matcher.yieldStrength("(T)")); - } -} diff --git a/aleris/src/test/resources/converter/additional-constraints.cert b/aleris/src/test/resources/converter/additional-constraints.cert deleted file mode 100644 index 2f955e7b..00000000 --- a/aleris/src/test/resources/converter/additional-constraints.cert +++ /dev/null @@ -1,61 +0,0 @@ -1 DOC : V/0080517068 DATUM : 2016-03-09 PROD. REF. : 0000375966/004 NRBST : 90960/04 PAGINA : 1/ 1 - - - - - - - - - - KEURINGSRAPPORT - UW ORDERNUMMER : 314797 KLANT : EURAMAX COATED PRODUCTS B.V. - ONS ORDERNUMMER : 89977/06 - DOCUMENT NUMMER : V/0080518525 INDUSTRIEWEG 6 - 6045 JG ROERMOND NEDERLAND - AFMETINGEN : 1250 X 1MM - ARTIKEL NR. : 4004277 ORIGIN OF GOODS : EUROPEAN UNION ( BELGIUM ) - SPECIFICATIES: ALU BAND EN 5754-H18 - - ==================================================================================================================================== - ROL- GEUT- CHEMISCHE ANALYSE (WEIGHT %) - NUMMER NUMMER - ==================================================================================================================================== - - SI FE CU MN MG CR TI ZN - MIN 2,6 - MAX 0,40 0,40 0,10 0,50 3,6 0,30 0,15 0,20 - - 001 00956819 0,11 0,12 0,13 0,14 0,15 0,16 0,17 0,18 - - - CR + MN : 0,10 MIN - 0,6 MAX - XX + YY : 0,11 MIN - 0,7 MAX - X + Y : 0,12 MIN - 0,8 MAX - ANDERE : ELK : MIN 0,05 MAX - TOTAAL : MIN 0,15 MAX - - ==================================================================================================================================== - MECHANISCHE EIGENSCHAPPEN - (T) = TRANSVERSAL = DWARSRICHTING (L) = LONGITUDINAL = LENGTERICHTING - TEST- 1 N/MM2 = 1 MPA = 0,1 HBAR = 0,102 KG/MM2 = 0,145 KSI - NUMMER /A = ACHTER /M = MIDDEN /V = VOOR /O = RANDOM - ==================================================================================================================================== - RM(T) RP02(T) A50(T) - MPA MPA % - MIN 290 250 2 - MAX - - 001 /A 11 10 9 - - - - - - KISTINHOUD : ROL DEELROL KISTNUMMER AANTAL - - 001 10 1 - - HOOFD LABORATORIUM, - XAVIER SCHELTJENS - diff --git a/aleris/src/test/resources/converter/corby.cert b/aleris/src/test/resources/converter/corby.cert deleted file mode 100644 index 39ff4935..00000000 --- a/aleris/src/test/resources/converter/corby.cert +++ /dev/null @@ -1,58 +0,0 @@ -1 DOC : V/0080517065 DATUM : 2016-03-06 PROD. REF. : 0000375204/002 NRBST : 89977/03 PAGINA : 1/ 1 - - - - - - - - - - KEURINGSRAPPORT - UW ORDERNUMMER : 314794 KLANT : EURAMAX COATED PRODUCTS LTD - ONS ORDERNUMMER : 89977/03 - DOCUMENT NUMMER : V/0080517061 INDUSTRIEWEG 6 - 6045 JG ROERMOND NEDERLAND - AFMETINGEN : 1500 X 0,5MM - ARTIKEL NR. : 4008800 ORIGIN OF GOODS : EUROPEAN UNION ( BELGIUM ) - SPECIFICATIES: ALU BAND EN 3005-H141-TL-BRUSHED 180 - - ==================================================================================================================================== - ROL- GEUT- CHEMISCHE ANALYSE (WEIGHT %) - NUMMER NUMMER - ==================================================================================================================================== - - SI FE CU MN MG CR TI ZN - MIN 1,0 0,20 - MAX 0,6 0,7 0,30 1,5 0,6 0,10 0,10 0,25 - - 001 00956816 0,8 0,9 0,10 0,11 0,12 0,13 0,14 0,15 - - - ANDERE : ELK : MIN 0,05 MAX - TOTAAL : MIN 0,15 MAX - - ==================================================================================================================================== - MECHANISCHE EIGENSCHAPPEN - (T) = TRANSVERSAL = DWARSRICHTING (L) = LONGITUDINAL = LENGTERICHTING - TEST- 1 N/MM2 = 1 MPA = 0,1 HBAR = 0,102 KG/MM2 = 0,145 KSI - NUMMER /A = ACHTER /M = MIDDEN /V = VOOR /O = RANDOM - ==================================================================================================================================== - RM(T) RP02(T) A50(T) - MPA MPA % - MIN 170 150 2 - MAX 210 - - 001 /A 8 7 6 - - - - - - KISTINHOUD : ROL DEELROL KISTNUMMER AANTAL - - 001 7 1 - - HOOFD LABORATORIUM, - JOHN DOE - diff --git a/aleris/src/test/resources/converter/english.cert b/aleris/src/test/resources/converter/english.cert deleted file mode 100644 index 2fee1668..00000000 --- a/aleris/src/test/resources/converter/english.cert +++ /dev/null @@ -1,59 +0,0 @@ -1 DOC : V/0080517064 DATE : 2016-03-05 PROD. REF. : 0000375628/001 NRBST : 90544/01 PAGE : 1/ 1 - - - - - - - - - - INSPECTION CERTIFICATE - YOUR ORDER NUMBER : 314793 CUSTOMER : EURAMAX COATED PRODUCTS LTD - OUR ORDER NUMBER : 89977/02 EARLSTREES INDUSTRIAL ESTATE (S) - DOCUMENT NUMBER : V/0080516433 BRUNEL ROAD - CORBY NORTHANTS NN17 4JW UNITED KINGDOM - DIMENSIONS : 1498 X 0,78MM - ARTICLE NO.: 4051250 ORIGIN OF GOODS : EUROPEAN UNION ( BELGIUM ) - DESCRIPTION: ALU BAND EN 5754-H12-MF - - ==================================================================================================================================== - COIL CAST CHEMICAL COMPOSITION (WEIGHT %) - NUMBER NUMBER - ==================================================================================================================================== - - SI FE CU MN MG CR TI ZN - MIN 2,6 - MAX 0,40 0,40 0,10 0,50 3,6 0,30 0,15 0,20 - - 001 00956815 0,7 0,8 0,9 0,10 0,11 0,12 0,13 0,14 - - - CR + MN : 0,10 MIN - 0,6 MAX - OTHERS : EACH : MIN 0,05 MAX - TOTAL : MIN 0,15 MAX - - ==================================================================================================================================== - MECHANICAL PROPERTIES - (T) = TRANSVERSAL (L) = LONGITUDINAL - TEST- 1 N/MM2 = 1 MPA = 0,1 HBAR = 0,102 KG/MM2 = 0,145 KSI - NUMBER /A = REAR END /M = MIDDLE /V = FRONT END /O = RANDOM SAMPLING - ==================================================================================================================================== - RM (T) RP02(T) A50(T) - MPA MPA % - MIN 220 170 5 - MAX 270 - - 001 /A 7 6 5 - - - - - - CONT.PALLET:COIL SUBCOIL PALLETNUMBER QUANTITY - - 001 6 1 - - HEAD OF LABORATORY, - XAVIER SCHELTJENS - diff --git a/aleris/src/test/resources/converter/few-elements.cert b/aleris/src/test/resources/converter/few-elements.cert deleted file mode 100644 index 460efd41..00000000 --- a/aleris/src/test/resources/converter/few-elements.cert +++ /dev/null @@ -1,58 +0,0 @@ -1 DOC : V/0080517067 DATUM : 2016-03-08 PROD. REF. : 0000375966/007 NRBST : 90960/07 PAGINA : 1/ 1 - - - - - - - - - - KEURINGSRAPPORT - UW ORDERNUMMER : 314796 KLANT : EURAMAX COATED PRODUCTS B.V. - ONS ORDERNUMMER : 89977/05 - DOCUMENT NUMMER : V/0080518525 INDUSTRIEWEG 6 - 6045 JG ROERMOND NEDERLAND - AFMETINGEN : 1250 X 1MM - ARTIKEL NR. : 4009099 ORIGIN OF GOODS : EUROPEAN UNION ( BELGIUM ) - SPECIFICATIES: ALU BAND EN 5052-H14 - - ==================================================================================================================================== - ROL- GEUT- CHEMISCHE ANALYSE (WEIGHT %) - NUMMER NUMMER - ==================================================================================================================================== - - SI FE CU MN MG CR ZN - MIN 2,2 0,15 - MAX 0,25 0,40 0,10 0,10 2,8 0,35 0,10 - - 001 00956817 0,10 0,11 0,12 0,13 0,14 0,15 0,16 - - - ANDERE : ELK : MIN 0,05 MAX - TOTAAL : MIN 0,15 MAX - - ==================================================================================================================================== - MECHANISCHE EIGENSCHAPPEN - (T) = TRANSVERSAL = DWARSRICHTING (L) = LONGITUDINAL = LENGTERICHTING - TEST- 1 N/MM2 = 1 MPA = 0,1 HBAR = 0,102 KG/MM2 = 0,145 KSI - NUMMER /A = ACHTER /M = MIDDEN /V = VOOR /O = RANDOM - ==================================================================================================================================== - RM(T) RP02(T) A50(T) - MPA MPA % - MIN 230 180 3 - MAX 280 - - 001 /A 10 9 8 - - - - - - KISTINHOUD : ROL DEELROL KISTNUMMER AANTAL - - 001 9 1 - - HOOFD LABORATORIUM, - XAVIER SCHELTJENS - diff --git a/aleris/src/test/resources/converter/multiple.cert b/aleris/src/test/resources/converter/multiple.cert deleted file mode 100644 index 117deb4b..00000000 --- a/aleris/src/test/resources/converter/multiple.cert +++ /dev/null @@ -1,61 +0,0 @@ -1 DOC : V/0080517066 DATUM : 2016-03-07 PROD. REF. : 0000375204/002 NRBST : 89977/04 PAGINA : 1/ 1 - - - - - - - - - - KEURINGSRAPPORT - UW ORDERNUMMER : 314795 KLANT : EURAMAX COATED PRODUCTS B.V. - ONS ORDERNUMMER : 89977/04 - DOCUMENT NUMMER : V/0080517061 INDUSTRIEWEG 6 - 6045 JG ROERMOND NEDERLAND - AFMETINGEN : 1500 X 0,5MM - ARTIKEL NR. : 4008800 ORIGIN OF GOODS : EUROPEAN UNION ( BELGIUM ) - SPECIFICATIES: ALU BAND EN 3005-H141-TL-BRUSHED 180 - - ==================================================================================================================================== - ROL- GEUT- CHEMISCHE ANALYSE (WEIGHT %) - NUMMER NUMMER - ==================================================================================================================================== - - SI FE CU MN MG CR TI ZN - MIN 1,0 0,20 - MAX 0,6 0,7 0,30 1,5 0,6 0,10 0,10 0,25 - - 001 00956817 0,9 0,10 0,11 0,12 0,13 0,14 0,15 0,16 - 002 00956827 0,19 0,20 0,21 0,22 0,23 0,24 0,25 0,26 - - - ANDERE : ELK : MIN 0,05 MAX - TOTAAL : MIN 0,15 MAX - - ==================================================================================================================================== - MECHANISCHE EIGENSCHAPPEN - (T) = TRANSVERSAL = DWARSRICHTING (L) = LONGITUDINAL = LENGTERICHTING - TEST- 1 N/MM2 = 1 MPA = 0,1 HBAR = 0,102 KG/MM2 = 0,145 KSI - NUMMER /A = ACHTER /M = MIDDEN /V = VOOR /O = RANDOM - ==================================================================================================================================== - - RM(T) RP02(T) A50(T) - MPA MPA % - MIN 170 150 2 - MAX 210 - - 001 /A 9 8 7 - 002 /A 9 8 7 - - - - - - KISTINHOUD : ROL DEELROL KISTNUMMER AANTAL - - 001 8 1 - 002 18 1 - - HOOFD LABORATORIUM, - JOHN DOE diff --git a/aleris/src/test/resources/converter/properties-per-sub-coil.cert b/aleris/src/test/resources/converter/properties-per-sub-coil.cert deleted file mode 100644 index 732e8a2e..00000000 --- a/aleris/src/test/resources/converter/properties-per-sub-coil.cert +++ /dev/null @@ -1,70 +0,0 @@ -1 DOC : V/0080517069 DATE : 2016-03-010 PROD. REF. : 0000383580/003 NRBST : 32108/03 PAGE : 1/ 2 - - - - - - - - - - INSPECTION CERTIFICATE - YOUR ORDER NUMBER : 314798 CUSTOMER : EURAMAX COATED PRODUCTS LTD - OUR ORDER NUMBER : 89977/07 EARLSTREES INDUSTRIAL ESTATE (S) - DOCUMENT NUMBER : V/0080530760 BRUNEL ROAD - CORBY NORTHANTS NN17 4JW UNITED KINGDOM - DIMENSIONS : 1178 X 0,5MM - ARTICLE NO.: 4008016 ORIGIN OF GOODS : EUROPEAN UNION ( BELGIUM ) - DESCRIPTION: ALU ALLOY COIL EN 1050-H16-TL - - ==================================================================================================================================== - COIL CAST CHEMICAL COMPOSITION (WEIGHT %) - NUMBER NUMBER - ==================================================================================================================================== - - SI FE CU MN MG TI ZN AL - MIN 99,50 - MAX 0,25 0,40 0,05 0,05 0,05 0,05 0,07 - - 006 00956820 0,12 0,13 0,14 0,15 0,16 0,17 0,18 0,19 - - - OTHERS : EACH : MIN 0,03 MAX - TOTAL : MIN MAX - - ==================================================================================================================================== - MECHANICAL PROPERTIES - (T) = TRANSVERSAL (L) = LONGITUDINAL - TEST- 1 N/MM2 = 1 MPA = 0,1 HBAR = 0,102 KG/MM2 = 0,145 KSI - NUMBER /A = REAR END /M = MIDDLE /V = FRONT END /O = RANDOM SAMPLING - ==================================================================================================================================== - RM (T) RP02(T) A50(T) - MPA MPA % - MIN 120 100 1 - MAX 160 - - 006/A01 /A 12 11 10 - 006/B01 /A 13 12 11 - - - - - CONT.PALLET:COIL SUBCOIL PALLETNUMBER QUANTITY - - 006 A01 5 1 - 006 B01 11 1 - 007 7 1 - -1 DOC : V/0080530760 DATE : 2016-07-11 PROD. REF. : 0000383580/003 NRBST : 32108/03 PAGE : 2/ 2 - - - - - - - - - - HEAD OF LABORATORY, - XAVIER SCHELTJENS - diff --git a/aleris/src/test/resources/converter/roermond.cert b/aleris/src/test/resources/converter/roermond.cert deleted file mode 100644 index 7787f442..00000000 --- a/aleris/src/test/resources/converter/roermond.cert +++ /dev/null @@ -1,58 +0,0 @@ -1 DOC : V/0080517064 DATUM : 2016-03-05 PROD. REF. : 0000375204/002 NRBST : 89977/02 PAGINA : 1/ 1 - - - - - - - - - - KEURINGSRAPPORT - UW ORDERNUMMER : 314793 KLANT : EURAMAX COATED PRODUCTS B.V. - ONS ORDERNUMMER : 89977/02 - DOCUMENT NUMMER : V/0080517064 INDUSTRIEWEG 6 - 6045 JG ROERMOND NEDERLAND - AFMETINGEN : 1500 X 0,5MM - ARTIKEL NR. : 4008800 ORIGIN OF GOODS : EUROPEAN UNION ( BELGIUM ) - SPECIFICATIES: ALU BAND EN 3005-H141-TL-BRUSHED 180 - - ==================================================================================================================================== - ROL- GEUT- CHEMISCHE ANALYSE (WEIGHT %) - NUMMER NUMMER - ==================================================================================================================================== - - SI FE CU MN MG CR TI ZN - MIN 1,0 0,20 - MAX 0,6 0,7 0,30 1,5 0,6 0,10 0,10 0,25 - - 001 00956815 0,7 0,8 0,9 0,10 0,11 0,12 0,13 0,14 - - - ANDERE : ELK : MIN 0,05 MAX - TOTAAL : MIN 0,15 MAX - - ==================================================================================================================================== - MECHANISCHE EIGENSCHAPPEN - (T) = TRANSVERSAL = DWARSRICHTING (L) = LONGITUDINAL = LENGTERICHTING - TEST- 1 N/MM2 = 1 MPA = 0,1 HBAR = 0,102 KG/MM2 = 0,145 KSI - NUMMER /A = ACHTER /M = MIDDEN /V = VOOR /O = RANDOM - ==================================================================================================================================== - - RM(T) RP02(T) A50(T) - MPA MPA % - MIN 170 150 2 - MAX 210 - - 001 /A 7 6 5 - - - - - - KISTINHOUD : ROL DEELROL KISTNUMMER AANTAL - - 001 6 1 - - HOOFD LABORATORIUM, - JOHN DOE diff --git a/aleris/src/test/resources/converter/sub-coil.cert b/aleris/src/test/resources/converter/sub-coil.cert deleted file mode 100644 index 479ce41d..00000000 --- a/aleris/src/test/resources/converter/sub-coil.cert +++ /dev/null @@ -1,59 +0,0 @@ -1 DOC : V/0080517069 DATUM : 2016-03-010 PROD. REF. : 0000379551/006 NRBST : 89977/07 PAGINA : 1/ 1 - - - - - - - - - - KEURINGSRAPPORT - UW ORDERNUMMER : 314798 KLANT : EURAMAX COATED PRODUCTS B.V. - ONS ORDERNUMMER : 89977/07 - DOCUMENT NUMMER : V/0080524462 INDUSTRIEWEG 6 - 6045 JG ROERMOND NEDERLAND - AFMETINGEN : 1000 X 1MM - ARTIKEL NR. : 4006161 ORIGIN OF GOODS : EUROPEAN UNION ( BELGIUM ) - SPECIFICATIES: ALU BAND EN 5754-H18 - - ==================================================================================================================================== - ROL- GEUT- CHEMISCHE ANALYSE (WEIGHT %) - NUMMER NUMMER - ==================================================================================================================================== - - SI FE CU MN MG CR TI ZN - MIN 2,6 - MAX 0,40 0,40 0,10 0,50 3,6 0,30 0,15 0,20 - - 001 00956820 0,12 0,13 0,14 0,15 0,16 0,17 0,18 0,19 - - - CR + MN : 0,10 MIN - 0,6 MAX - ANDERE : ELK : MIN 0,05 MAX - TOTAAL : MIN 0,15 MAX - - ==================================================================================================================================== - MECHANISCHE EIGENSCHAPPEN - (T) = TRANSVERSAL = DWARSRICHTING (L) = LONGITUDINAL = LENGTERICHTING - TEST- 1 N/MM2 = 1 MPA = 0,1 HBAR = 0,102 KG/MM2 = 0,145 KSI - NUMMER /A = ACHTER /M = MIDDEN /V = VOOR /O = RANDOM - ==================================================================================================================================== - RM(T) RP02(T) A50(T) - MPA MPA % - MIN 290 250 2 - MAX - - 001 /A 12 11 10 - - - - - - KISTINHOUD : ROL DEELROL KISTNUMMER AANTAL - - 001 A01 11 1 - - HOOFD LABORATORIUM, - XAVIER SCHELTJENS - diff --git a/aleris/src/test/resources/converter/two-pages.cert b/aleris/src/test/resources/converter/two-pages.cert deleted file mode 100644 index 8d89baae..00000000 --- a/aleris/src/test/resources/converter/two-pages.cert +++ /dev/null @@ -1,70 +0,0 @@ -1 DOC : V/0080517065 DATUM : 2016-03-06 PROD. REF. : 0000374358/010 NRBST : 88429/10 PAGINA : 1/ 2 - - - - - - - - - - KEURINGSRAPPORT - UW ORDERNUMMER : 314794 KLANT : EURAMAX COATED PRODUCTS B.V. - ONS ORDERNUMMER : 89977/03 - DOCUMENT NUMMER : V/0080519536 INDUSTRIEWEG 6 - 6045 JG ROERMOND NEDERLAND - AFMETINGEN : 1064 X 0,98MM - ARTIKEL NR. : 4008043 ORIGIN OF GOODS : EUROPEAN UNION ( BELGIUM ) - SPECIFICATIES: ALU BAND EN 1050-H12 FA - - ==================================================================================================================================== - ROL- GEUT- CHEMISCHE ANALYSE (WEIGHT %) - NUMMER NUMMER - ==================================================================================================================================== - - SI FE CU MN MG TI ZN AL - MIN 99,50 - MAX 0,25 0,40 0,05 0,05 0,05 0,05 0,07 - - 002 00956816 0,8 0,9 0,10 0,11 0,12 0,13 0,14 0,15 - - - ANDERE : ELK : MIN 0,03 MAX - TOTAAL : MIN MAX - - ==================================================================================================================================== - MECHANISCHE EIGENSCHAPPEN - (T) = TRANSVERSAL = DWARSRICHTING (L) = LONGITUDINAL = LENGTERICHTING - TEST- 1 N/MM2 = 1 MPA = 0,1 HBAR = 0,102 KG/MM2 = 0,145 KSI - NUMMER /A = ACHTER /M = MIDDEN /V = VOOR /O = RANDOM - ==================================================================================================================================== - RM(T) RP02(T) A50(T) RM(T1) RP02(T*) A(T*) - 1: RESULTATEN NA LAKSIMULATIE - MPA MPA % MPA MPA % - MIN 100 75 3 98 65 6 - MAX 135 125 13 - - 002 /A 8 7 6 111 103 8 - 002 /V 9 8 7 109 101 7 - - - - - - KISTINHOUD : ROL DEELROL KISTNUMMER AANTAL - - 002 7 1 - -1 DOC : V/0080519536 DATUM : 2016-03-24 PROD. REF. : 0000374358/010 NRBST : 88429/10 PAGINA : 2/ 2 - - - - - - - - - - HOOFD LABORATORIUM, - XAVIER SCHELTJENS - diff --git a/aleris/src/test/resources/marshall/certificates.xml b/aleris/src/test/resources/marshall/certificates.xml deleted file mode 100644 index 5f8a86f2..00000000 --- a/aleris/src/test/resources/marshall/certificates.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - 123 - 2016-02-01 - - issuer - 123 - 456 - - - customer - 789 - 012 - - - - stockUnitId - ingotCase - - - code - description - value - unit - - - - % - - Al - Aluminium - 1 - - - - Fe - Iron - 0.01 - - - - - - - diff --git a/archive/pom.xml b/archive/pom.xml deleted file mode 100644 index 7904369d..00000000 --- a/archive/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 5.0.0 - - - archive - - - UTF-8 - file:///${project.basedir}/../rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 21 - - - - - - - - - - diff --git a/archive/src/docs/archive.adoc b/archive/src/docs/archive.adoc deleted file mode 100644 index 8ce1a88b..00000000 --- a/archive/src/docs/archive.adoc +++ /dev/null @@ -1,38 +0,0 @@ -= Archive Component -:doctitle: Archive -:shortname: archive -:artifactid: archive -:description: packs files or unpacks archives -:since: 2.20.1 -:supportlevel: Stable -:component-header: Producer is supported -//Manually maintained attributes - -*Since Camel {since}* - -*{component-header}* - -The Archive component packs files or unpacks archives - -Maven users will need to add the following dependency to their `pom.xml` -for this component: - -[source,xml] ------------------------------------------------------------- - - org.assimbly - archive - x.x.x - - ------------------------------------------------------------- - -== URI format - --------------------------------------------- -dataformat:checkedZipFileDataFormat:unmarshal - -or - -dataformat:checkedZipFileDataFormat:marshal --------------------------------------------- diff --git a/archive/src/main/java/org/assimbly/archive/CheckedZipFileDataFormat.java b/archive/src/main/java/org/assimbly/archive/CheckedZipFileDataFormat.java deleted file mode 100644 index d80186db..00000000 --- a/archive/src/main/java/org/assimbly/archive/CheckedZipFileDataFormat.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.assimbly.archive; - -import org.apache.camel.Exchange; -import org.apache.camel.spi.DataFormat; -import org.assimbly.util.exception.ArchiveTooLargeException; -import org.assimbly.util.helper.PropertiesHelper; - -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; - -public class CheckedZipFileDataFormat extends ZipFileDataFormat implements DataFormat { - - @Override - public void marshal(Exchange exchange, Object graph, OutputStream stream) throws Exception { - super.marshal(exchange, graph, stream); - } - - @Override - public Object unmarshal(Exchange exchange, InputStream stream) throws Exception { - - long uncompressedSize = 0; - long maxFileSize = Long.parseLong(PropertiesHelper.getProperty("max_uncompressed_file_size")); // In Bytes - - if (super.isUsingIterator()) { - ZipInputStream zis = resolveInputStream(exchange); - for (ZipEntry entry : entries(zis)) { - uncompressedSize += entry.getSize(); - } - } else { - ZipInputStream zis = new ZipInputStream(stream); - ZipEntry entry = zis.getNextEntry(); - if (entry != null) { - uncompressedSize = entry.getSize(); - } - } - - if (uncompressedSize > maxFileSize) { - throw new ArchiveTooLargeException("Uncompressed archive size too large: " + uncompressedSize - + " Bytes. Max: " + maxFileSize + " Bytes"); - } - - return super.unmarshal(exchange, stream); - } - - private ZipInputStream resolveInputStream(Exchange exchange) { - InputStream inputStream = exchange.getIn().getBody(InputStream.class); - - return inputStream instanceof ZipInputStream ? - (ZipInputStream) inputStream : - new ZipInputStream(new BufferedInputStream(inputStream)); - } - - private List entries(ZipInputStream inputStream) throws IOException { - List entries = new ArrayList<>(); - ZipEntry entry; - - while ((entry = inputStream.getNextEntry()) != null) { - if (!entry.isDirectory()) { - entries.add(entry); - } - } - - return entries; - } -} \ No newline at end of file diff --git a/archive/src/main/java/org/assimbly/archive/ZipFileDataFormat.java b/archive/src/main/java/org/assimbly/archive/ZipFileDataFormat.java deleted file mode 100644 index cb3bd1be..00000000 --- a/archive/src/main/java/org/assimbly/archive/ZipFileDataFormat.java +++ /dev/null @@ -1,166 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.assimbly.archive; - -import org.apache.camel.Exchange; -import org.assimbly.archive.ZipIterator; -import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.DataFormatName; -import org.apache.camel.spi.annotations.Dataformat; -import org.apache.camel.support.builder.OutputStreamBuilder; -import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.StringHelper; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Iterator; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; -import java.util.zip.ZipOutputStream; - -import static org.apache.camel.Exchange.FILE_NAME; - - -@Dataformat("zipFile") -public class ZipFileDataFormat extends ServiceSupport implements DataFormat, DataFormatName { - /** - * The default maximum decompressed size (in bytes), which corresponds to 1G. - */ - private static final long DEFAULT_MAXIMUM_DECOMPRESSED_SIZE = 1073741824; - private boolean usingIterator; - private boolean allowEmptyDirectory; - private boolean preservePathElements; - private long maxDecompressedSize = DEFAULT_MAXIMUM_DECOMPRESSED_SIZE; - @Override - public String getDataFormatName() { - return "zipFile"; - } - @Override - public void marshal(final Exchange exchange, final Object graph, final OutputStream stream) throws Exception { - String filename; - String filepath = exchange.getIn().getHeader(FILE_NAME, String.class); - if (filepath == null) { - // generate the file name as the camel file component would do - filename = filepath = StringHelper.sanitize(exchange.getIn().getMessageId()); - } else { - Path filenamePath = Paths.get(filepath).getFileName(); - if (filenamePath != null) { - filename = filenamePath.toString(); // remove any path elements - } else { - // TODO do some logging - return; - } - } - ZipOutputStream zos = new ZipOutputStream(stream); - if (preservePathElements) { - createZipEntries(zos, filepath); - } else { - createZipEntries(zos, filename); - } - InputStream is = exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, exchange, graph); - try { - IOHelper.copy(is, zos); - } finally { - IOHelper.close(is, zos); - } - String newFilename = filename + ".zip"; - exchange.getMessage().setHeader(FILE_NAME, newFilename); - } - @Override - public Object unmarshal(final Exchange exchange, final InputStream inputStream) throws Exception { - - //always use iterator - usingIterator=true; - - if (usingIterator) { - ZipIterator zipIterator = new ZipIterator(exchange, inputStream); - zipIterator.setAllowEmptyDirectory(allowEmptyDirectory); - return zipIterator; - } else { - ZipInputStream zis = new ZipInputStream(inputStream); - OutputStreamBuilder osb = OutputStreamBuilder.withExchange(exchange); - try { - ZipEntry entry = zis.getNextEntry(); - if (entry != null) { - exchange.getMessage().setHeader(FILE_NAME, entry.getName()); - IOHelper.copy(zis, osb, IOHelper.DEFAULT_BUFFER_SIZE, false, maxDecompressedSize); - } else { - throw new IllegalStateException("Unable to unzip the file, it may be corrupted."); - } - entry = zis.getNextEntry(); - if (entry != null) { - throw new IllegalStateException("Zip file has more than 1 entry."); - } - return osb.build(); - } finally { - IOHelper.close(zis, osb); - } - } - } - private void createZipEntries(ZipOutputStream zos, String filepath) throws IOException { - Iterator elements = Paths.get(filepath).iterator(); - StringBuilder sb = new StringBuilder(); - while (elements.hasNext()) { - Path path = elements.next(); - String element = path.toString(); - // If there are more elements to come this element is a directory - // The "/" at the end tells the ZipEntry it is a folder - if (elements.hasNext()) { - element += "/"; - } - // Each entry needs the complete path, including previous created folders. - zos.putNextEntry(new ZipEntry(sb + element)); - sb.append(element); - } - } - public boolean isUsingIterator() { - return usingIterator; - } - public void setUsingIterator(boolean usingIterator) { - this.usingIterator = usingIterator; - } - public boolean isAllowEmptyDirectory() { - return allowEmptyDirectory; - } - public void setAllowEmptyDirectory(boolean allowEmptyDirectory) { - this.allowEmptyDirectory = allowEmptyDirectory; - } - public boolean isPreservePathElements() { - return preservePathElements; - } - public void setPreservePathElements(boolean preservePathElements) { - this.preservePathElements = preservePathElements; - } - public long getMaxDecompressedSize() { - return maxDecompressedSize; - } - public void setMaxDecompressedSize(long maxDecompressedSize) { - this.maxDecompressedSize = maxDecompressedSize; - } - @Override - protected void doStart() throws Exception { - // noop - } - @Override - protected void doStop() throws Exception { - // noop - } -} diff --git a/archive/src/main/java/org/assimbly/archive/ZipInputStreamWrapper.java b/archive/src/main/java/org/assimbly/archive/ZipInputStreamWrapper.java deleted file mode 100644 index 9fced766..00000000 --- a/archive/src/main/java/org/assimbly/archive/ZipInputStreamWrapper.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.assimbly.archive; - -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; - -class ZipInputStreamWrapper extends BufferedInputStream { - - ZipInputStreamWrapper(InputStream in, int size) { - super(in, size); - } - - ZipInputStreamWrapper(InputStream in) { - super(in); - } - - @Override - public void close() throws IOException { - InputStream input = in; - try { - in = null; - super.close(); - } finally { - in = input; - } - } -} diff --git a/archive/src/main/java/org/assimbly/archive/ZipIterator.java b/archive/src/main/java/org/assimbly/archive/ZipIterator.java deleted file mode 100644 index baf31bfb..00000000 --- a/archive/src/main/java/org/assimbly/archive/ZipIterator.java +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.assimbly.archive; - -import java.io.BufferedInputStream; -import java.io.Closeable; -import java.io.IOException; -import java.io.InputStream; -import java.util.Iterator; -import java.util.Objects; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; - -import org.apache.camel.Exchange; -import org.apache.camel.Message; -import org.apache.camel.RuntimeCamelException; -import org.apache.camel.support.DefaultMessage; -import org.apache.camel.util.IOHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * The Iterator which can go through the ZipInputStream according to ZipEntry Based on the thread - * zip file best practices - */ -public class ZipIterator implements Iterator, Closeable { - static final Logger LOGGER = LoggerFactory.getLogger(ZipIterator.class); - - private final Exchange exchange; - private boolean allowEmptyDirectory; - private volatile ZipInputStream zipInputStream; - private volatile Message parent; - private volatile boolean first; - - public ZipIterator(Exchange exchange, InputStream inputStream) { - this.exchange = exchange; - this.allowEmptyDirectory = false; - - Objects.requireNonNull(inputStream); - - if (inputStream instanceof ZipInputStream) { - zipInputStream = (ZipInputStream) inputStream; - } else { - zipInputStream = new ZipInputStream(new BufferedInputStream(inputStream)); - } - parent = null; - first = true; - } - - @Override - public boolean hasNext() { - try { - if (zipInputStream == null) { - return false; - } - boolean availableDataInCurrentEntry = zipInputStream.available() == 1; - if (!availableDataInCurrentEntry) { - // advance to the next entry. - parent = getNextElement(); - if (parent == null) { - zipInputStream.close(); - availableDataInCurrentEntry = false; - } else { - availableDataInCurrentEntry = true; - } - if (first && parent == null) { - throw new IllegalStateException("Unable to unzip the file, it may be corrupted."); - } - } - return availableDataInCurrentEntry; - } catch (IOException exception) { - throw new RuntimeCamelException(exception); - } - } - - @Override - public Message next() { - if (parent == null) { - parent = getNextElement(); - } - Message answer = parent; - parent = null; - - if (first && answer == null) { - throw new IllegalStateException("Unable to unzip the file, it may be corrupted."); - } - - first = false; - checkNullAnswer(answer); - - return answer; - } - - private Message getNextElement() { - if (zipInputStream == null) { - return null; - } - - try { - ZipEntry current = getNextEntry(); - - if (current != null) { - LOGGER.debug("read zipEntry {}", current.getName()); - Message answer = new DefaultMessage(exchange.getContext()); - answer.getHeaders().putAll(exchange.getIn().getHeaders()); - answer.setHeader("zipFileName", current.getName()); - answer.setHeader(Exchange.FILE_NAME, current.getName()); - answer.setBody(new ZipInputStreamWrapper(zipInputStream)); - return answer; - } else { - LOGGER.trace("close zipInputStream"); - return null; - } - } catch (IOException exception) { - throw new RuntimeCamelException(exception); - } - } - - public void checkNullAnswer(Message answer) { - if (answer == null && zipInputStream != null) { - IOHelper.close(zipInputStream); - zipInputStream = null; - } - } - - private ZipEntry getNextEntry() throws IOException { - ZipEntry entry; - - while ((entry = zipInputStream.getNextEntry()) != null) { - if (!entry.isDirectory()) { - return entry; - } else { - if (allowEmptyDirectory) { - return entry; - } - } - } - - return null; - } - - @Override - public void remove() { - throw new UnsupportedOperationException(); - } - - @Override - public void close() throws IOException { - IOHelper.close(zipInputStream); - zipInputStream = null; - } - - public boolean isSupportIteratorForEmptyDirectory() { - return allowEmptyDirectory; - } - - public void setAllowEmptyDirectory(boolean allowEmptyDirectory) { - this.allowEmptyDirectory = allowEmptyDirectory; - } -} diff --git a/archive/src/main/java/org/assimbly/archive/ZipSplitter.java b/archive/src/main/java/org/assimbly/archive/ZipSplitter.java deleted file mode 100644 index 47367395..00000000 --- a/archive/src/main/java/org/assimbly/archive/ZipSplitter.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.assimbly.archive; - -import java.io.InputStream; - -import org.apache.camel.Exchange; -import org.apache.camel.Expression; -import org.apache.camel.Message; - -/** - * ZipSplitter the expression builder which can be used after the splitter Based on the thread - * zip file best practices - */ -public class ZipSplitter implements Expression { - - public ZipSplitter() { - } - - public Object evaluate(Exchange exchange) { - Message inputMessage = exchange.getIn(); - InputStream inputStream = inputMessage.getBody(InputStream.class); - return new ZipIterator(exchange, inputStream); - } - - @Override - public T evaluate(Exchange exchange, Class type) { - Object result = evaluate(exchange); - return exchange.getContext().getTypeConverter().convertTo(type, exchange, result); - } -} diff --git a/archive/src/main/resources/META-INF/services/org/apache/camel/dataformat/checkedZipFileDataFormat b/archive/src/main/resources/META-INF/services/org/apache/camel/dataformat/checkedZipFileDataFormat deleted file mode 100644 index 3ac3336d..00000000 --- a/archive/src/main/resources/META-INF/services/org/apache/camel/dataformat/checkedZipFileDataFormat +++ /dev/null @@ -1 +0,0 @@ -class=org.assimbly.archive.CheckedZipFileDataFormat \ No newline at end of file diff --git a/archive/src/main/resources/META-INF/services/org/apache/camel/dataformat/zipFileDataFormat b/archive/src/main/resources/META-INF/services/org/apache/camel/dataformat/zipFileDataFormat deleted file mode 100644 index 60354261..00000000 --- a/archive/src/main/resources/META-INF/services/org/apache/camel/dataformat/zipFileDataFormat +++ /dev/null @@ -1 +0,0 @@ -class=org.assimbly.archive.ZipFileDataFormat \ No newline at end of file diff --git a/archive/src/test/resources/integrationtests/camel2/archive_camel2.xml b/archive/src/test/resources/integrationtests/camel2/archive_camel2.xml deleted file mode 100644 index 3e775253..00000000 --- a/archive/src/test/resources/integrationtests/camel2/archive_camel2.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - java.lang.Exception - - - - - - - - - - - - - - Hello - - - - - - - - - - ${file:onlyname.noext}.zip - - - - - - - - - ${body} - - - - - - - - Message Body: ${bodyAs(String)} - - - - - \ No newline at end of file diff --git a/archive/src/test/resources/integrationtests/dil/archive_dil.xml b/archive/src/test/resources/integrationtests/dil/archive_dil.xml deleted file mode 100644 index 928f2b23..00000000 --- a/archive/src/test/resources/integrationtests/dil/archive_dil.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - archive_test1 - archive_test1 - esb - - - 1 - source - https://0.0.0.0:9001/1/Archive - - - 2 - action - setbody:message:archive - - - 3 - action - zip - - true - true - - - - 4 - action - log - - - 5 - action - unzip - - true - - - - 6 - action - log - - - 7 - sink - velocity:Message Body: ${bodyAs(String)} - - - - - - - - - - archive - Hello - - - - \ No newline at end of file diff --git a/fmuta/pom.xml b/fmuta/pom.xml deleted file mode 100644 index 01ac635f..00000000 --- a/fmuta/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - 4.0.0 - - - custom-components - org.assimbly - 5.0.0 - - - fmuta - - - UTF-8 - 21 - file:///${project.basedir}/../rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-simple - ${slf4j.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 21 - - - - - - - - - - diff --git a/fmuta/src/docs/fmuta.adoc b/fmuta/src/docs/fmuta.adoc deleted file mode 100644 index 17c17cfc..00000000 --- a/fmuta/src/docs/fmuta.adoc +++ /dev/null @@ -1,87 +0,0 @@ -= FMUTA Component -:doctitle: FMUTA -:shortname: fmuta -:artifactid: fmuta -:description: enriches messages containing financial mutations in CSV format as exported by Abacus. -:since: 2.20.1 -:supportlevel: Stable -:component-header: Producer is supported -//Manually maintained attributes - -*Since Camel {since}* - -*{component-header}* - -The FMUTA component enriches messages containing financial mutations in CSV format as exported -by Abacus. -This component produces messages in a format that can be imported by accounting software. -It adds a header line for each group of lines present in the input. - -Maven users will need to add the following dependency to their `pom.xml` -for this component: - -[source,xml] ------------------------------------------------------------- - - org.assimbly - fmuta - x.x.x - - ------------------------------------------------------------- - -== URI format - --------------------------------------------- -fmuta:enrich?decimalSeparator=, --------------------------------------------- - -== Example route - -[source,xml] --------------------------------------------- - - - - - - - - - Regelnr - DagboekType - Dagboeknr - Periode - BoekJaar - BoekstukNr - Omschrijving - Datum - Tegenrekening - Debnr - Crednr - Factuurnr - Bedrag - Journaliseren - Valutacode - Koers - Krediet_bep - Bedrag_Krediet_bep - Vervaldatum_Factuur - Vervaldatum_Bedrag_Krediet_bep - BTWCode - BTWBedrag - Weeknr - Referentie - Betalingswijze - BedragRekening - Kostenplaats - Kostendrager - AantalKostendrager - Verschilcode - kolom30 - Stornoboeking - - - - --------------------------------------------- diff --git a/fmuta/src/main/java/org/assimbly/fmuta/BigDecimalConverter.java b/fmuta/src/main/java/org/assimbly/fmuta/BigDecimalConverter.java deleted file mode 100644 index cec27ff8..00000000 --- a/fmuta/src/main/java/org/assimbly/fmuta/BigDecimalConverter.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.assimbly.fmuta; - -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; -import java.text.ParseException; - -public class BigDecimalConverter { - private static final String pattern = "#,##0.00"; - - private DecimalFormat format; - - public BigDecimalConverter(char decimalSeparator) { - DecimalFormatSymbols symbols = new DecimalFormatSymbols(); - symbols.setDecimalSeparator(decimalSeparator); - format = new DecimalFormat(pattern, symbols); - format.setGroupingUsed(false); - format.setParseBigDecimal(true); - } - - public BigDecimal convert(String input) { - try { - return (BigDecimal) format.parse(input); - } catch (ParseException e) { - throw new IllegalArgumentException("Unable to parse '" + input + "' as decimal number"); - } - } - - public String revert(BigDecimal input) { - if (input == null) { - throw new IllegalArgumentException("Cannot revert null to string. Expected instance of BigDecimal"); - } - return format.format(input); - } -} diff --git a/fmuta/src/main/java/org/assimbly/fmuta/FmutaComponent.java b/fmuta/src/main/java/org/assimbly/fmuta/FmutaComponent.java deleted file mode 100644 index 631e6a62..00000000 --- a/fmuta/src/main/java/org/assimbly/fmuta/FmutaComponent.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.assimbly.fmuta; - -import org.apache.camel.Endpoint; -import org.apache.camel.support.DefaultComponent; - -import java.util.Map; - -public class FmutaComponent extends DefaultComponent { - - @Override - protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { - FmutaConfiguration configuration = new FmutaConfiguration(); - - FmutaEndpoint endpoint = new FmutaEndpoint(uri, this, configuration); - - setProperties(endpoint.getConfiguration(), parameters); - - return endpoint; - } -} diff --git a/fmuta/src/main/java/org/assimbly/fmuta/FmutaConfiguration.java b/fmuta/src/main/java/org/assimbly/fmuta/FmutaConfiguration.java deleted file mode 100644 index 52f2286f..00000000 --- a/fmuta/src/main/java/org/assimbly/fmuta/FmutaConfiguration.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.assimbly.fmuta; - -import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.UriParam; -import org.apache.camel.spi.UriParams; - -@UriParams -public class FmutaConfiguration { - - @UriParam - @Metadata(required = true) - private char decimalSeparator; - - public FmutaConfiguration() { } - - public void setDecimalSeparator(char decimalSeparator) { - this.decimalSeparator = decimalSeparator; - } - - public char getDecimalSeparator() { - return decimalSeparator; - } -} diff --git a/fmuta/src/main/java/org/assimbly/fmuta/FmutaEndpoint.java b/fmuta/src/main/java/org/assimbly/fmuta/FmutaEndpoint.java deleted file mode 100644 index 670759ee..00000000 --- a/fmuta/src/main/java/org/assimbly/fmuta/FmutaEndpoint.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.assimbly.fmuta; - -import org.apache.camel.Processor; -import org.apache.camel.spi.UriParam; -import org.apache.camel.support.ProcessorEndpoint; - -public class FmutaEndpoint extends ProcessorEndpoint { - - @UriParam - private FmutaConfiguration configuration; - private FmutaComponent component; - - public FmutaEndpoint(String uri, FmutaComponent component, FmutaConfiguration configuration) { - super(uri, component); - - this.component = component; - this.configuration = configuration; - } - - @Override - protected Processor createProcessor() { - return new FmutaProcessor(this); - } - - public FmutaConfiguration getConfiguration() { - return configuration; - } - - @Override - public FmutaComponent getComponent() { - return component; - } -} \ No newline at end of file diff --git a/fmuta/src/main/java/org/assimbly/fmuta/FmutaFeedEnricher.java b/fmuta/src/main/java/org/assimbly/fmuta/FmutaFeedEnricher.java deleted file mode 100644 index 79a399d7..00000000 --- a/fmuta/src/main/java/org/assimbly/fmuta/FmutaFeedEnricher.java +++ /dev/null @@ -1,196 +0,0 @@ -package org.assimbly.fmuta; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -public class FmutaFeedEnricher { - private static final String BYTE_ORDER_MARK = "\uFEFF"; - private static final String LINE_NUMBER_LABEL = "Regelnr"; - private static final String VOUCHER_NUMBER_HEADER = "BoekstukNr"; - private static final String DESCRIPTION_HEADER_FOR_HEADERS = "HeaderOmschrijving"; - private static final String DESCRIPTION_HEADER_FOR_LINES = "RegelOmschrijving"; - private static final String DESCRIPTION_HEADER = "Omschrijving"; - private static final String COUNTER_ACCOUNT_HEADER = "Tegenrekening"; - private static final String INVOICE_NUMBER_HEADER = "Factuurnr"; - private static final String AMOUNT_HEADER = "Bedrag"; - private static final String INCL_EXCL_HEADER = "Incl_Excl"; - private static final String EXCHANGE_RATE_HEADER = "Koers"; - private static final String INVOICE_EXPIRATION_DATE_HEADER = "Vervaldatum_Factuur"; - private static final String CREDIT_DISCOUNT_EXPIRATION_DATE_HEADER = "Vervaldatum_Bedrag_Krediet_bep"; - private static final String VAT_CODE_HEADER = "BTWCode"; - private static final String VAT_AMOUNT_HEADER = "BTWBedrag"; - private static final String REFERENCE_HEADER = "Referentie"; - private static final String PAYMENT_METHOD_HEADER = "Betalingswijze"; - - private static final Logger logger = LoggerFactory.getLogger(FmutaFeedEnricher.class); - - private BigDecimalConverter converterForInput = new BigDecimalConverter(','); - private BigDecimalConverter converterForOutput; - - private String LINE_NUMBER_HEADER; - - public FmutaFeedEnricher(char decimalSeparator) { - this.converterForOutput = new BigDecimalConverter(decimalSeparator); - } - - public List> enrich(List> body) { - validate(body); - - logger.info("Enriching FMUTA feed containing {} lines", body.size()); - - convertAmounts(body); - List> enrichedWithHeaders = enrichWithHeaders(body); - splitDescriptions(enrichedWithHeaders); - enrichWithRunningTotal(enrichedWithHeaders); - revertAmounts(enrichedWithHeaders); - clearFields(enrichedWithHeaders); - dropAuxiliaryColumns(enrichedWithHeaders); - - logger.info("Enriched FMUTA feed contains {} lines", enrichedWithHeaders.size()); - - return enrichedWithHeaders; - } - - private void validate(List> body) { - if (body == null) { - throw new IllegalArgumentException("Null body provided"); - } - - if (body.size() > 0) { - Map firstLine = body.get(0); - - LINE_NUMBER_HEADER = findLineNumberHeader(firstLine); - - if (firstLine.get(LINE_NUMBER_HEADER) == null) { - throw new IllegalArgumentException("No name for the column containing line numbers found"); - } - if (firstLine.get(AMOUNT_HEADER) == null) { - throw new IllegalArgumentException("No name for the column containing amounts found"); - } - if (firstLine.get(INCL_EXCL_HEADER) == null) { - throw new IllegalArgumentException("No name for the column indicating whether amounts contain VAT found"); - } - if (firstLine.get(VAT_AMOUNT_HEADER) == null) { - throw new IllegalArgumentException("No name for the column containing VAT amounts found"); - } - - logger.info("Input contains all required columns"); - } else { - logger.info("Body contains no lines"); - } - } - - private void convertAmounts(List> lines) { - for (Map line : lines) { - line.put(AMOUNT_HEADER, converterForInput.convert((String) line.get(AMOUNT_HEADER))); - line.put(VAT_AMOUNT_HEADER, converterForInput.convert((String) line.get(VAT_AMOUNT_HEADER))); - } - } - - private void revertAmounts(List> lines) { - for (Map line : lines) { - line.put(AMOUNT_HEADER, converterForOutput.revert((BigDecimal) line.get(AMOUNT_HEADER))); - line.put(VAT_AMOUNT_HEADER, converterForOutput.revert((BigDecimal) line.get(VAT_AMOUNT_HEADER))); - } - } - - private List> enrichWithHeaders(List> lines) { - List> result = new ArrayList<>(lines.size() * 2); - for (Map line : lines) { - String lineNumber = (String) line.get(LINE_NUMBER_HEADER); - if ("1".equals(lineNumber)) { - logger.debug("Adding header to output"); - - Map header = new LinkedHashMap<>(line); - header.put(LINE_NUMBER_HEADER, "0"); - result.add(header); - } - result.add(line); - } - return result; - } - - - private void splitDescriptions(List> lines) { - for (Map line : lines) { - String lineNumber = (String) line.get(LINE_NUMBER_HEADER); - if ("0".equals(lineNumber)) { - line.put(DESCRIPTION_HEADER, line.get(DESCRIPTION_HEADER_FOR_HEADERS)); - } else { - line.put(DESCRIPTION_HEADER, line.get(DESCRIPTION_HEADER_FOR_LINES)); - } - } - } - - private void enrichWithRunningTotal(List> lines) { - Map header = null; - for (Map line : lines) { - String lineNumber = (String) line.get(LINE_NUMBER_HEADER); - if ("0".equals(lineNumber)) { - header = line; - header.put(AMOUNT_HEADER, BigDecimal.ZERO); - header.put(VAT_AMOUNT_HEADER, BigDecimal.ZERO); - } - - if (header != null) { - BigDecimal runningTotal = (BigDecimal) header.get(AMOUNT_HEADER); - BigDecimal amount = (BigDecimal) line.get(AMOUNT_HEADER); - String inclExclValue = (String) line.get(INCL_EXCL_HEADER); - if ("Excl".equals(inclExclValue)) { - BigDecimal vatAmount = (BigDecimal) line.get(VAT_AMOUNT_HEADER); - amount = amount.add(vatAmount); - } - header.put(AMOUNT_HEADER, runningTotal.add(amount)); - } - } - } - - private void clearFields(List> lines) { - for (Map line : lines) { - String lineNumber = (String) line.get(LINE_NUMBER_HEADER); - if ("0".equals(lineNumber)) { - clearHeaderFields(line); - } else { - clearLineFields(line); - } - } - } - - private void clearHeaderFields(Map header) { - header.put(COUNTER_ACCOUNT_HEADER, ""); - header.put(INVOICE_NUMBER_HEADER, ""); - header.put(EXCHANGE_RATE_HEADER, ""); - header.put(VAT_CODE_HEADER, ""); - header.put(VAT_AMOUNT_HEADER, ""); - } - - private void clearLineFields(Map line) { - line.put(VOUCHER_NUMBER_HEADER, ""); - line.put(INVOICE_EXPIRATION_DATE_HEADER, ""); - line.put(CREDIT_DISCOUNT_EXPIRATION_DATE_HEADER, ""); - line.put(REFERENCE_HEADER, ""); - line.put(PAYMENT_METHOD_HEADER, ""); - } - - private void dropAuxiliaryColumns(List> lines) { - for (Map line : lines) { - line.remove(INCL_EXCL_HEADER); - line.remove(DESCRIPTION_HEADER_FOR_HEADERS); - line.remove(DESCRIPTION_HEADER_FOR_LINES); - } - } - - private String findLineNumberHeader(Map firstLine) { - - if (firstLine.keySet().contains(LINE_NUMBER_LABEL)) - return LINE_NUMBER_LABEL; - - return BYTE_ORDER_MARK + LINE_NUMBER_LABEL; - } -} diff --git a/fmuta/src/main/java/org/assimbly/fmuta/FmutaProcessor.java b/fmuta/src/main/java/org/assimbly/fmuta/FmutaProcessor.java deleted file mode 100644 index 86cd313f..00000000 --- a/fmuta/src/main/java/org/assimbly/fmuta/FmutaProcessor.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.assimbly.fmuta; - -import org.apache.camel.Exchange; -import org.apache.camel.Processor; - -import java.util.List; - -public class FmutaProcessor implements Processor { - - private FmutaEndpoint endpoint; - - public FmutaProcessor(FmutaEndpoint endpoint) { - this.endpoint = endpoint; - } - - @Override - @SuppressWarnings("unchecked") - public void process(Exchange exchange) { - FmutaConfiguration config = endpoint.getConfiguration(); - FmutaFeedEnricher enricher = new FmutaFeedEnricher(config.getDecimalSeparator()); - - exchange.getIn().setBody( - enricher.enrich(exchange.getIn().getBody(List.class)) - ); - } -} diff --git a/fmuta/src/main/resources/META-INF/services/org/apache/camel/component/fmuta b/fmuta/src/main/resources/META-INF/services/org/apache/camel/component/fmuta deleted file mode 100644 index 82362fd7..00000000 --- a/fmuta/src/main/resources/META-INF/services/org/apache/camel/component/fmuta +++ /dev/null @@ -1 +0,0 @@ -class=org.assimbly.fmuta.FmutaComponent \ No newline at end of file diff --git a/fmuta/src/test/java/org/assimbly/fmuta/BigDecimalConverterTest.java b/fmuta/src/test/java/org/assimbly/fmuta/BigDecimalConverterTest.java deleted file mode 100644 index 4a09f67f..00000000 --- a/fmuta/src/test/java/org/assimbly/fmuta/BigDecimalConverterTest.java +++ /dev/null @@ -1,121 +0,0 @@ -package org.assimbly.fmuta; - -import org.junit.jupiter.api.Test; - - -import java.math.BigDecimal; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -public class BigDecimalConverterTest { - @Test - public void convertWithComma() { - BigDecimalConverter converter = new BigDecimalConverter(','); - - assertEquals(BigDecimal.ZERO, converter.convert("0")); - assertEquals(new BigDecimal("0.00"), converter.convert("0,00")); - assertEquals(new BigDecimal("0.01"), converter.convert("0,01")); - assertEquals(new BigDecimal("0.10"), converter.convert("0,10")); - assertEquals(new BigDecimal("1.00"), converter.convert("1,00")); - assertEquals(new BigDecimal("1000.00"), converter.convert("1000,00")); - assertEquals(new BigDecimal("1000000.00"), converter.convert("1000000,00")); - - assertEquals(BigDecimal.ZERO, converter.convert("-0")); - assertEquals(new BigDecimal("-0.00"), converter.convert("-0,00")); - assertEquals(new BigDecimal("-0.01"), converter.convert("-0,01")); - assertEquals(new BigDecimal("-0.10"), converter.convert("-0,10")); - assertEquals(new BigDecimal("-1.00"), converter.convert("-1,00")); - assertEquals(new BigDecimal("-1000.00"), converter.convert("-1000,00")); - assertEquals(new BigDecimal("-1000000.00"), converter.convert("-1000000,00")); - } - - @Test - public void revertWithComma() { - BigDecimalConverter converter = new BigDecimalConverter(','); - - assertEquals("0,00", converter.revert(BigDecimal.ZERO)); - assertEquals("0,00", converter.revert(new BigDecimal("0.00"))); - - assertEquals("0,01", converter.revert(new BigDecimal("0.01"))); - assertEquals("0,10", converter.revert(new BigDecimal("0.10"))); - assertEquals("1,00", converter.revert(new BigDecimal("1.00"))); - assertEquals("1000,00", converter.revert(new BigDecimal("1000.00"))); - assertEquals("1000000,00", converter.revert(new BigDecimal("1000000.00"))); - - assertEquals("-0,01", converter.revert(new BigDecimal("-0.01"))); - assertEquals("-0,10", converter.revert(new BigDecimal("-0.10"))); - assertEquals("-1,00", converter.revert(new BigDecimal("-1.00"))); - assertEquals("-1000,00", converter.revert(new BigDecimal("-1000.00"))); - assertEquals("-1000000,00", converter.revert(new BigDecimal("-1000000.00"))); - } - - @Test - public void convertWithPeriod() { - BigDecimalConverter converter = new BigDecimalConverter('.'); - - assertEquals(BigDecimal.ZERO, converter.convert("0")); - assertEquals(new BigDecimal("0.00"), converter.convert("0.00")); - assertEquals(new BigDecimal("0.01"), converter.convert("0.01")); - assertEquals(new BigDecimal("0.10"), converter.convert("0.10")); - assertEquals(new BigDecimal("1.00"), converter.convert("1.00")); - assertEquals(new BigDecimal("1000.00"), converter.convert("1000.00")); - assertEquals(new BigDecimal("1000.00"), converter.convert("1000.00")); - assertEquals(new BigDecimal("1000000.00"), converter.convert("1000000.00")); - - assertEquals(BigDecimal.ZERO, converter.convert("-0")); - assertEquals(new BigDecimal("-0.00"), converter.convert("-0.00")); - assertEquals(new BigDecimal("-0.01"), converter.convert("-0.01")); - assertEquals(new BigDecimal("-0.10"), converter.convert("-0.10")); - assertEquals(new BigDecimal("-1.00"), converter.convert("-1.00")); - assertEquals(new BigDecimal("-1000.00"), converter.convert("-1000.00")); - assertEquals(new BigDecimal("-1000.00"), converter.convert("-1000.00")); - assertEquals(new BigDecimal("-1000000.00"), converter.convert("-1000000.00")); - } - - @Test - public void revertWithPeriod() { - BigDecimalConverter converter = new BigDecimalConverter('.'); - - assertEquals("0.00", converter.revert(BigDecimal.ZERO)); - assertEquals("0.00", converter.revert(new BigDecimal("0.00"))); - - assertEquals("0.01", converter.revert(new BigDecimal("0.01"))); - assertEquals("0.10", converter.revert(new BigDecimal("0.10"))); - assertEquals("1.00", converter.revert(new BigDecimal("1.00"))); - assertEquals("1000.00", converter.revert(new BigDecimal("1000.00"))); - assertEquals("1000000.00", converter.revert(new BigDecimal("1000000.00"))); - - assertEquals("-0.01", converter.revert(new BigDecimal("-0.01"))); - assertEquals("-0.10", converter.revert(new BigDecimal("-0.10"))); - assertEquals("-1.00", converter.revert(new BigDecimal("-1.00"))); - assertEquals("-1000.00", converter.revert(new BigDecimal("-1000.00"))); - assertEquals("-1000000.00", converter.revert(new BigDecimal("-1000000.00"))); - } - - @Test - public void convertException() { - BigDecimalConverter converter = new BigDecimalConverter('.'); - boolean exceptionThrown = false; - try { - converter.convert("nonsense"); - } catch (IllegalArgumentException e) { - assertEquals("Unable to parse 'nonsense' as decimal number", e.getMessage()); - exceptionThrown = true; - } - assertTrue(exceptionThrown); - } - - @Test - public void revertException() { - BigDecimalConverter converter = new BigDecimalConverter('.'); - boolean exceptionThrown = false; - try { - converter.revert(null); - } catch (IllegalArgumentException e) { - assertEquals("Cannot revert null to string. Expected instance of BigDecimal", e.getMessage()); - exceptionThrown = true; - } - assertTrue(exceptionThrown); - } -} diff --git a/fmuta/src/test/java/org/assimbly/fmuta/FmutaComponentIntegrationTest.java b/fmuta/src/test/java/org/assimbly/fmuta/FmutaComponentIntegrationTest.java deleted file mode 100644 index 95e2157c..00000000 --- a/fmuta/src/test/java/org/assimbly/fmuta/FmutaComponentIntegrationTest.java +++ /dev/null @@ -1,130 +0,0 @@ -package org.assimbly.fmuta; - -import org.apache.camel.EndpointInject; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.dataformat.univocity.UniVocityCsvDataFormat; -import org.apache.camel.model.dataformat.UniVocityHeader; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.junit.jupiter.api.Test; - -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.Arrays; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class FmutaComponentIntegrationTest extends CamelTestSupport { - - private String BYTE_ORDER_MARK = "\uFEFF"; - - @EndpointInject("mock:out") - private MockEndpoint resultEndpoint; - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - UniVocityCsvDataFormat inputDataFormat = new UniVocityCsvDataFormat(); - - char char1=';'; - - inputDataFormat.setHeaderExtractionEnabled(true); - inputDataFormat.setDelimiter(char1); - inputDataFormat.setAsMap(true); - - UniVocityCsvDataFormat outputDataFormat = new UniVocityCsvDataFormat(); - String[] outputHeaders = getOutputHeaders(); - outputDataFormat.setHeaders(outputHeaders); - outputDataFormat.setDelimiter(char1); - outputDataFormat.setLineSeparator("\r\n"); - - from("direct:in") - .unmarshal(inputDataFormat) - .to("fmuta:enrich?decimalSeparator=.") - .marshal(outputDataFormat) - .to("mock:out"); - } - }; - } - - /** - * For customers, the FMUTA component is a single component. Under the hood, this component consists of a - * custom Camel component combined with an unmarshalling and a marshalling step. The order of the columns - * in the output file is specified in the marshalling step. - */ - private String[] getOutputHeaders() { - List headerNames = Arrays.asList("Regelnr", "DagboekType", "Dagboeknr", "Periode", "BoekJaar", - "BoekstukNr", "Omschrijving", "Datum", "Tegenrekening", "Debnr", "Crednr", "Factuurnr", "Bedrag", - "Journaliseren", "Valutacode", "Koers", "Krediet_bep", "Bedrag_Krediet_bep", "Vervaldatum_Factuur", - "Vervaldatum_Bedrag_Krediet_bep", "BTWCode", "BTWBedrag", "Weeknr", "Referentie", "Betalingswijze", - "BedragRekening", "Kostenplaats", "Kostendrager", "AantalKostendrager", "Verschilcode", "kolom30", - "Stornoboeking"); - return headerNames.toArray(new String[0]); - } - - private UniVocityHeader createHeader(String name) { - UniVocityHeader header = new UniVocityHeader(); - header.setName(name); - return header; - } - - @Test - public void canBeInstantiated() throws Exception { - resultEndpoint.expectedMessageCount(1); - template.sendBody("direct:in", BYTE_ORDER_MARK+"Regelnr;Bedrag;BTWBedrag;Incl_Excl\n1;0,00;0,00;Incl\n"); - resultEndpoint.assertIsSatisfied(); - } - - @Test - public void runningTotal() throws Exception { - resultEndpoint.expectedMessageCount(1); - - String input = - BYTE_ORDER_MARK+"Regelnr;Datum;DagboekType;Dagboeknr;Periode;BoekJaar;BoekstukNr;HeaderOmschrijving;RegelOmschrijving;Tegenrekening;Debnr;Crednr;Factuurnr;Bedrag;Incl_Excl;Journaliseren;Valutacode;Koers;Krediet_bep;Bedrag_Krediet_bep;Vervaldatum_Factuur;Vervaldatum_Bedrag_Krediet_bep;BTWCode;BTWBedrag;Weeknr;Referentie;Betalingswijze;BedragRekening;Kostenplaats;Kostendrager;AantalKostendrager;Verschilcode;kolom30;Stornoboeking\n" + - "1;12042016;V;;4;2016;29320160410;Omzet week 14;Omzet week 14;80555;293;;29320160410;107056,40;Excl;;EUR;1;;0;19042016;19042016;21;22481,85;14;Omzet;B;;;;;;;\n" + - "2;12042016;V;;4;2016;29320160410;Omzet week 14;Omzet week 14;80555;293;;29320160410;33,63;Excl;;EUR;1;;0;19042016;19042016;6;2,02;14;Omzet;B;;;;;;;\n" + - "1;12042016;V;;4;2016;19320160410;Omzet week 14;Omzet week 14;80555;193;;19320160410;43262,48;Excl;;EUR;1;;0;19042016;19042016;21;9085,12;14;Omzet;B;;;;;;;\n"; - - template.sendBody("direct:in", input); - resultEndpoint.assertIsSatisfied(); - - String actual = resultEndpoint.getExchanges().get(0).getIn().getBody(String.class); - - String expected = - "0;V;;4;2016;29320160410;Omzet week 14;12042016;;293;;;129573.90;;EUR;;;0;19042016;19042016;;;14;Omzet;B;;;;;;;\r\n" + - "1;V;;4;2016;;Omzet week 14;12042016;80555;293;;29320160410;107056.40;;EUR;1;;0;;;21;22481.85;14;;;;;;;;;\r\n" + - "2;V;;4;2016;;Omzet week 14;12042016;80555;293;;29320160410;33.63;;EUR;1;;0;;;6;2.02;14;;;;;;;;;\r\n" + - "0;V;;4;2016;19320160410;Omzet week 14;12042016;;193;;;52347.60;;EUR;;;0;19042016;19042016;;;14;Omzet;B;;;;;;;\r\n" + - "1;V;;4;2016;;Omzet week 14;12042016;80555;193;;19320160410;43262.48;;EUR;1;;0;;;21;9085.12;14;;;;;;;;;\r\n"; - - /* - String expected = - "2;V;;4;2016;;Omzet week 14;12042016;80555;293;;29320160410;33.63;;EUR;1;;0;;;6;2.02;14;;;;;;;;;\r\n" + - "0;V;;4;2016;19320160410;Omzet week 14;12042016;;193;;;52347.60;;EUR;;;0;19042016;19042016;;;14;Omzet;B;;;;;;;\r\n" + - "1;V;;4;2016;;Omzet week 14;12042016;80555;193;;19320160410;43262.48;;EUR;1;;0;;;21;9085.12;14;;;;;;;;;\r\n"; - */ - - assertEquals(expected, actual); - } - - - @Test - public void exampleFeedFromFile() throws Exception { - resultEndpoint.expectedMessageCount(1); - - template.sendBody("direct:in", getClass().getResource("/FMUTAFeed-in.csv")); - resultEndpoint.assertIsSatisfied(); - - String actual = resultEndpoint.getExchanges().get(0).getIn().getBody(String.class); - - String expected = new String(getClass().getClassLoader().getResourceAsStream("FMUTAFeed-out.csv").readAllBytes()); - assertEquals(expected, actual); - } - - - -} diff --git a/fmuta/src/test/java/org/assimbly/fmuta/FmutaFeedEnricherTest.java b/fmuta/src/test/java/org/assimbly/fmuta/FmutaFeedEnricherTest.java deleted file mode 100644 index 7b806ec9..00000000 --- a/fmuta/src/test/java/org/assimbly/fmuta/FmutaFeedEnricherTest.java +++ /dev/null @@ -1,252 +0,0 @@ -package org.assimbly.fmuta; - -import org.junit.jupiter.api.Test; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.*; - -public class FmutaFeedEnricherTest { - private static final String BYTE_ORDER_MARK = "\uFEFF"; - private static final String LINE_NUMBER_HEADER = BYTE_ORDER_MARK + "Regelnr"; - private static final String DESCRIPTION_HEADER = "Omschrijving"; - private static final String DESCRIPTION_HEADER_FOR_HEADERS = "HeaderOmschrijving"; - private static final String DESCRIPTION_HEADER_FOR_LINES = "RegelOmschrijving"; - private static final String AMOUNT_HEADER = "Bedrag"; - private static final String VAT_AMOUNT_HEADER = "BTWBedrag"; - private static final String INCL_EXCL_HEADER = "Incl_Excl"; - - private FmutaFeedEnricher enricher = new FmutaFeedEnricher('.'); - - private List> minimalFeed(int numberOfLines) { - List> result = new ArrayList<>(numberOfLines); - for (int i = 0; i < numberOfLines; ++i) { - Map line = new HashMap<>(); - line.put(LINE_NUMBER_HEADER, ""); - line.put(DESCRIPTION_HEADER_FOR_HEADERS, "HeaderDescription"); - line.put(DESCRIPTION_HEADER_FOR_LINES, "LineDescription"); - line.put(AMOUNT_HEADER, "0,00"); - line.put(VAT_AMOUNT_HEADER, "0,00"); - line.put(INCL_EXCL_HEADER, "Incl"); - result.add(line); - } - return result; - } - - @Test - public void cloneAndRenumber() { - List> lines = minimalFeed(2); - lines.get(0).put(LINE_NUMBER_HEADER, "1"); - lines.get(1).put(LINE_NUMBER_HEADER, "1"); - - List> output = enricher.enrich(lines); - - assertEquals(4, output.size()); - assertEquals("0", output.get(0).get(LINE_NUMBER_HEADER)); - assertEquals("1", output.get(1).get(LINE_NUMBER_HEADER)); - assertEquals("0", output.get(2).get(LINE_NUMBER_HEADER)); - assertEquals("1", output.get(3).get(LINE_NUMBER_HEADER)); - } - - @Test - public void cloneIfRowNumberOneOnly() { - List> lines = minimalFeed(2); - lines.get(0).put(LINE_NUMBER_HEADER, "1"); - lines.get(1).put(LINE_NUMBER_HEADER, "2"); - - List> output = enricher.enrich(lines); - - assertEquals(3, output.size()); - assertEquals("0", output.get(0).get(LINE_NUMBER_HEADER)); - assertEquals("1", output.get(1).get(LINE_NUMBER_HEADER)); - assertEquals("2", output.get(2).get(LINE_NUMBER_HEADER)); - } - - @Test - public void dropAuxiliaryColumns() { - List> lines = minimalFeed(1); - lines.get(0).put(LINE_NUMBER_HEADER, "1"); - - List> output = enricher.enrich(lines); - - assertEquals(2, output.size()); - assertNull(output.get(0).get(DESCRIPTION_HEADER_FOR_HEADERS)); - assertNull(output.get(1).get(DESCRIPTION_HEADER_FOR_LINES)); - assertNull(output.get(0).get(INCL_EXCL_HEADER)); - assertNull(output.get(1).get(INCL_EXCL_HEADER)); - } - - @Test - public void splitDescriptions() { - List> lines = minimalFeed(1); - Map line = lines.get(0); - line.put(LINE_NUMBER_HEADER, "1"); - line.put(DESCRIPTION_HEADER_FOR_HEADERS, "Header"); - line.put(DESCRIPTION_HEADER_FOR_LINES, "Line"); - - List> output = enricher.enrich(lines); - - assertEquals(2, output.size()); - - Map actualLine1 = output.get(0); - Map actualLine2 = output.get(1); - - assertEquals("0", actualLine1.get(LINE_NUMBER_HEADER)); - assertEquals("Header", actualLine1.get(DESCRIPTION_HEADER)); - assertEquals("1", actualLine2.get(LINE_NUMBER_HEADER)); - assertEquals("Line", actualLine2.get(DESCRIPTION_HEADER)); - } - - @Test - public void blankColumns() { - List> lines = minimalFeed(1); - Map line = lines.get(0); - line.put(LINE_NUMBER_HEADER, "1"); - line.put(INCL_EXCL_HEADER, "Veld1"); - line.put("BoekstukNr", "Veld2"); - line.put("Tegenrekening", "Veld4"); - line.put("Factuurnr", "Veld5"); - line.put("Koers", "Veld6"); - line.put("Vervaldatum_Factuur", "Veld7"); - line.put("Vervaldatum_Bedrag_Krediet_bep", "Veld8"); - line.put("BTWCode", "Veld9"); - line.put(VAT_AMOUNT_HEADER, "0,00"); - line.put("Referentie", "Veld11"); - line.put("Betalingswijze", "Veld12"); - - List> output = enricher.enrich(lines); - - assertEquals(2, output.size()); - - Map actualLine1 = output.get(0); - Map actualLine2 = output.get(1); - - assertEquals("0", actualLine1.get(LINE_NUMBER_HEADER)); - assertNull(actualLine1.get(INCL_EXCL_HEADER)); - assertEquals("Veld2", actualLine1.get("BoekstukNr")); - assertEquals("", actualLine1.get("Tegenrekening")); - assertEquals("", actualLine1.get("Factuurnr")); - assertEquals("", actualLine1.get("Koers")); - assertEquals("Veld7", actualLine1.get("Vervaldatum_Factuur")); - assertEquals("Veld8", actualLine1.get("Vervaldatum_Bedrag_Krediet_bep")); - assertEquals("", actualLine1.get("BTWCode")); - assertEquals("", actualLine1.get(VAT_AMOUNT_HEADER)); - assertEquals("Veld11", actualLine1.get("Referentie")); - assertEquals("Veld12", actualLine1.get("Betalingswijze")); - - assertEquals("1", actualLine2.get(LINE_NUMBER_HEADER)); - assertNull(actualLine2.get(INCL_EXCL_HEADER)); - assertEquals("", actualLine2.get("BoekstukNr")); - assertEquals("Veld4", actualLine2.get("Tegenrekening")); - assertEquals("Veld5", actualLine2.get("Factuurnr")); - assertEquals("Veld6", actualLine2.get("Koers")); - assertEquals("", actualLine2.get("Vervaldatum_Factuur")); - assertEquals("", actualLine2.get("Vervaldatum_Bedrag_Krediet_bep")); - assertEquals("Veld9", actualLine2.get("BTWCode")); - assertEquals("0.00", actualLine2.get(VAT_AMOUNT_HEADER)); - assertEquals("", actualLine2.get("Referentie")); - assertEquals("", actualLine2.get("Betalingswijze")); - } - - @Test - public void addAmountsExcludingTax() { - List> lines = minimalFeed(3); - lines.get(0).put(LINE_NUMBER_HEADER, "1"); - lines.get(0).put(AMOUNT_HEADER, "10,00"); - lines.get(0).put(INCL_EXCL_HEADER, "Excl"); - lines.get(0).put(VAT_AMOUNT_HEADER, "2,10"); - lines.get(1).put(LINE_NUMBER_HEADER, "1"); - lines.get(1).put(AMOUNT_HEADER, "10,00"); - lines.get(1).put(INCL_EXCL_HEADER, "Excl"); - lines.get(1).put(VAT_AMOUNT_HEADER, "2,10"); - lines.get(2).put(LINE_NUMBER_HEADER, "2"); - lines.get(2).put(AMOUNT_HEADER, "100,00"); - lines.get(2).put(INCL_EXCL_HEADER, "Excl"); - lines.get(2).put(VAT_AMOUNT_HEADER, "21,00"); - - List> output = enricher.enrich(lines); - - assertEquals(5, output.size()); - assertEquals("12.10", output.get(0).get(AMOUNT_HEADER)); - assertEquals("", output.get(0).get(VAT_AMOUNT_HEADER)); - assertEquals("10.00", output.get(1).get(AMOUNT_HEADER)); - assertEquals("2.10", output.get(1).get(VAT_AMOUNT_HEADER)); - assertEquals("133.10", output.get(2).get(AMOUNT_HEADER)); - assertEquals("", output.get(2).get(VAT_AMOUNT_HEADER)); - assertEquals("10.00", output.get(3).get(AMOUNT_HEADER)); - assertEquals("2.10", output.get(3).get(VAT_AMOUNT_HEADER)); - assertEquals("100.00", output.get(4).get(AMOUNT_HEADER)); - assertEquals("21.00", output.get(4).get(VAT_AMOUNT_HEADER)); - } - - @Test - public void addAmountsIncludingTax() { - List> lines = minimalFeed(3); - lines.get(0).put(LINE_NUMBER_HEADER, "1"); - lines.get(0).put(AMOUNT_HEADER, "12,10"); - lines.get(0).put(INCL_EXCL_HEADER, "Incl"); - lines.get(0).put(VAT_AMOUNT_HEADER, "2,10"); - lines.get(1).put(LINE_NUMBER_HEADER, "1"); - lines.get(1).put(AMOUNT_HEADER, "12,10"); - lines.get(1).put(INCL_EXCL_HEADER, "Incl"); - lines.get(1).put(VAT_AMOUNT_HEADER, "2,10"); - lines.get(2).put(LINE_NUMBER_HEADER, "2"); - lines.get(2).put(AMOUNT_HEADER, "121,00"); - lines.get(2).put(INCL_EXCL_HEADER, "Incl"); - lines.get(2).put(VAT_AMOUNT_HEADER, "21,00"); - - List> output = enricher.enrich(lines); - - assertEquals(5, output.size()); - assertEquals("12.10", output.get(0).get(AMOUNT_HEADER)); - assertEquals("", output.get(0).get(VAT_AMOUNT_HEADER)); - assertEquals("12.10", output.get(1).get(AMOUNT_HEADER)); - assertEquals("2.10", output.get(1).get(VAT_AMOUNT_HEADER)); - assertEquals("133.10", output.get(2).get(AMOUNT_HEADER)); - assertEquals("", output.get(2).get(VAT_AMOUNT_HEADER)); - assertEquals("12.10", output.get(3).get(AMOUNT_HEADER)); - assertEquals("2.10", output.get(3).get(VAT_AMOUNT_HEADER)); - assertEquals("121.00", output.get(4).get(AMOUNT_HEADER)); - assertEquals("21.00", output.get(4).get(VAT_AMOUNT_HEADER)); - } - - @Test - public void addAmounts() { - List> lines = minimalFeed(4); - lines.get(0).put(LINE_NUMBER_HEADER, "1"); - lines.get(0).put(AMOUNT_HEADER, "12,10"); - lines.get(0).put(INCL_EXCL_HEADER, "Incl"); - lines.get(0).put(VAT_AMOUNT_HEADER, "2,10"); - lines.get(1).put(LINE_NUMBER_HEADER, "2"); - lines.get(1).put(AMOUNT_HEADER, "20,00"); - lines.get(1).put(INCL_EXCL_HEADER, "Excl"); - lines.get(1).put(VAT_AMOUNT_HEADER, "4,20"); - lines.get(2).put(LINE_NUMBER_HEADER, "1"); - lines.get(2).put(AMOUNT_HEADER, "10,00"); - lines.get(2).put(INCL_EXCL_HEADER, "Excl"); - lines.get(2).put(VAT_AMOUNT_HEADER, "2,10"); - lines.get(3).put(LINE_NUMBER_HEADER, "2"); - lines.get(3).put(AMOUNT_HEADER, "12,10"); - lines.get(3).put(INCL_EXCL_HEADER, "Incl"); - lines.get(3).put(VAT_AMOUNT_HEADER, "2,10"); - - List> output = enricher.enrich(lines); - - assertEquals(6, output.size()); - assertEquals("36.30", output.get(0).get(AMOUNT_HEADER)); - assertEquals("", output.get(0).get(VAT_AMOUNT_HEADER)); - assertEquals("12.10", output.get(1).get(AMOUNT_HEADER)); - assertEquals("2.10", output.get(1).get(VAT_AMOUNT_HEADER)); - assertEquals("20.00", output.get(2).get(AMOUNT_HEADER)); - assertEquals("4.20", output.get(2).get(VAT_AMOUNT_HEADER)); - assertEquals("24.20", output.get(3).get(AMOUNT_HEADER)); - assertEquals("", output.get(3).get(VAT_AMOUNT_HEADER)); - assertEquals("10.00", output.get(4).get(AMOUNT_HEADER)); - assertEquals("2.10", output.get(4).get(VAT_AMOUNT_HEADER)); - assertEquals("12.10", output.get(5).get(AMOUNT_HEADER)); - assertEquals("2.10", output.get(5).get(VAT_AMOUNT_HEADER)); - } -} diff --git a/fmuta/src/test/resources/FMUTAFeed-in.csv b/fmuta/src/test/resources/FMUTAFeed-in.csv deleted file mode 100644 index e96990bb..00000000 --- a/fmuta/src/test/resources/FMUTAFeed-in.csv +++ /dev/null @@ -1,295 +0,0 @@ -Regelnr;Datum;Debnr;DagboekType;Dagboeknr;Periode;BoekJaar;BoekstukNr;HeaderOmschrijving;RegelOmschrijving;Tegenrekening;Crednr;Factuurnr;Bedrag;Incl_Excl;Journaliseren;Valutacode;Koers;Krediet_bep;Bedrag_Krediet_bep;Vervaldatum_Factuur;Vervaldatum_Bedrag_Krediet_bep;BTWCode;BTWBedrag;Weeknr;Referentie;Betalingswijze;BedragRekening;Kostenplaats;Kostendrager;AantalKostendrager;Verschilcode;kolom30;Stornoboeking;BTWCode_Artikel;CommissiePerc -1;25052016;100;V;71;5;2016;16200100;Omzet week 20;Omzet week 20;80555;;16200100;-218,6;Excl;N;EUR;1;B;0;01062016;01062016;21;-45,9;20;Omzet;B;;;;;;;;21; -2;25052016;100;V;71;5;2016;16200100;Omzet week 20;Omzet week 20;80555;;16200100;-220,94;Excl;N;EUR;1;B;0;01062016;01062016;6;-13,26;20;Omzet;B;;;;;;;;6; -3;25052016;100;V;71;5;2016;16200100;Omzet week 20;Commissie week 20;80555;;16200100;13,19;Excl;N;EUR;1;B;0;01062016;01062016;21;2,77;20;Omzet;B;;;;;;;;;0,03 -1;25052016;113;V;71;5;2016;16200113;Omzet week 20;Omzet week 20;80555;;16200113;-1364,71;Excl;N;EUR;1;B;0;01062016;01062016;21;-286,59;20;Omzet;B;;;;;;;;21; -2;25052016;113;V;71;5;2016;16200113;Omzet week 20;Omzet week 20;80555;;16200113;-39,01;Excl;N;EUR;1;B;0;01062016;01062016;6;-2,34;20;Omzet;B;;;;;;;;6; -3;25052016;113;V;71;5;2016;16200113;Omzet week 20;Commissie week 20;80555;;16200113;140,37;Excl;N;EUR;1;B;0;01062016;01062016;21;29,48;20;Omzet;B;;;;;;;;;0,1 -1;25052016;128;V;71;5;2016;16200128;Omzet week 20;Omzet week 20;80555;;16200128;-1244,63;Excl;N;EUR;1;B;0;01062016;01062016;21;-261,37;20;Omzet;B;;;;;;;;21; -2;25052016;128;V;71;5;2016;16200128;Omzet week 20;Commissie week 20;80555;;16200128;124,46;Excl;N;EUR;1;B;0;01062016;01062016;21;26,14;20;Omzet;B;;;;;;;;;0,1 -1;25052016;141;V;71;5;2016;16200141;Omzet week 20;Omzet week 20;80555;;16200141;-11046,49;Excl;N;EUR;1;B;0;01062016;01062016;21;-2319,76;20;Omzet;B;;;;;;;;21; -2;25052016;141;V;71;5;2016;16200141;Omzet week 20;Commissie week 20;80555;;16200141;1104,65;Excl;N;EUR;1;B;0;01062016;01062016;21;231,98;20;Omzet;B;;;;;;;;;0,1 -1;25052016;142;V;71;5;2016;16200142;Omzet week 20;Omzet week 20;80555;;16200142;-1488,51;Excl;N;EUR;1;B;0;01062016;01062016;21;-312,59;20;Omzet;B;;;;;;;;21; -2;25052016;142;V;71;5;2016;16200142;Omzet week 20;Commissie week 20;80555;;16200142;148,85;Excl;N;EUR;1;B;0;01062016;01062016;21;31,26;20;Omzet;B;;;;;;;;;0,1 -1;25052016;143;V;71;5;2016;16200143;Omzet week 20;Omzet week 20;80555;;16200143;-295,79;Excl;N;EUR;1;B;0;01062016;01062016;21;-62,11;20;Omzet;B;;;;;;;;21; -2;25052016;143;V;71;5;2016;16200143;Omzet week 20;Commissie week 20;80555;;16200143;29,58;Excl;N;EUR;1;B;0;01062016;01062016;21;6,21;20;Omzet;B;;;;;;;;;0,1 -1;25052016;161;V;71;5;2016;16200161;Omzet week 20;Omzet week 20;80555;;16200161;-351,2;Excl;N;EUR;1;B;0;01062016;01062016;21;-73,75;20;Omzet;B;;;;;;;;21; -2;25052016;161;V;71;5;2016;16200161;Omzet week 20;Commissie week 20;80555;;16200161;35,12;Excl;N;EUR;1;B;0;01062016;01062016;21;7,38;20;Omzet;B;;;;;;;;;0,1 -1;25052016;175;V;71;5;2016;16200175;Omzet week 20;Omzet week 20;80555;;16200175;-3451,24;Excl;N;EUR;1;B;0;01062016;01062016;21;-724,76;20;Omzet;B;;;;;;;;21; -2;25052016;175;V;71;5;2016;16200175;Omzet week 20;Commissie week 20;80555;;16200175;345,12;Excl;N;EUR;1;B;0;01062016;01062016;21;72,48;20;Omzet;B;;;;;;;;;0,1 -1;25052016;193;V;71;5;2016;16200193;Omzet week 20;Omzet week 20;80555;;16200193;-15042,31;Excl;N;EUR;1;B;0;01062016;01062016;21;-3158,89;20;Omzet;B;;;;;;;;21; -2;25052016;193;V;71;5;2016;16200193;Omzet week 20;Commissie week 20;80555;;16200193;1504,23;Excl;N;EUR;1;B;0;01062016;01062016;21;315,89;20;Omzet;B;;;;;;;;;0,1 -1;25052016;201;V;71;5;2016;16200201;Omzet week 20;Omzet week 20;80555;;16200201;-3528,93;Excl;N;EUR;1;B;0;01062016;01062016;21;-741,07;20;Omzet;B;;;;;;;;21; -2;25052016;201;V;71;5;2016;16200201;Omzet week 20;Commissie week 20;80555;;16200201;352,89;Excl;N;EUR;1;B;0;01062016;01062016;21;74,11;20;Omzet;B;;;;;;;;;0,1 -1;25052016;211;V;71;5;2016;16200211;Omzet week 20;Omzet week 20;80555;;16200211;-3744,38;Excl;N;EUR;1;B;0;01062016;01062016;21;-786,32;20;Omzet;B;;;;;;;;21; -2;25052016;211;V;71;5;2016;16200211;Omzet week 20;Commissie week 20;80555;;16200211;374,44;Excl;N;EUR;1;B;0;01062016;01062016;21;78,63;20;Omzet;B;;;;;;;;;0,1 -1;25052016;218;V;71;5;2016;16200218;Omzet week 20;Omzet week 20;80555;;16200218;-1180,79;Excl;N;EUR;1;B;0;01062016;01062016;0;0;20;Omzet;B;;;;;;;;21; -2;25052016;218;V;71;5;2016;16200218;Omzet week 20;Commissie week 20;80555;;16200218;94,46;Excl;N;EUR;1;B;0;01062016;01062016;0;0;20;Omzet;B;;;;;;;;;0,08 -1;25052016;226;V;71;5;2016;16200226;Omzet week 20;Omzet week 20;80555;;16200226;-5536,03;Excl;N;EUR;1;B;0;01062016;01062016;21;-1162,57;20;Omzet;B;;;;;;;;21; -2;25052016;226;V;71;5;2016;16200226;Omzet week 20;Commissie week 20;80555;;16200226;553,6;Excl;N;EUR;1;B;0;01062016;01062016;21;116,26;20;Omzet;B;;;;;;;;;0,1 -1;25052016;244;V;71;5;2016;16200244;Omzet week 20;Omzet week 20;80555;;16200244;-897,89;Excl;N;EUR;1;B;0;01062016;01062016;21;-188,56;20;Omzet;B;;;;;;;;21; -2;25052016;244;V;71;5;2016;16200244;Omzet week 20;Commissie week 20;80555;;16200244;89,79;Excl;N;EUR;1;B;0;01062016;01062016;21;18,86;20;Omzet;B;;;;;;;;;0,1 -1;25052016;256;V;71;5;2016;16200256;Omzet week 20;Omzet week 20;80555;;16200256;-1841,69;Excl;N;EUR;1;B;0;01062016;01062016;21;-386,76;20;Omzet;B;;;;;;;;21; -2;25052016;256;V;71;5;2016;16200256;Omzet week 20;Commissie week 20;80555;;16200256;184,17;Excl;N;EUR;1;B;0;01062016;01062016;21;38,68;20;Omzet;B;;;;;;;;;0,1 -1;25052016;257;V;71;5;2016;16200257;Omzet week 20;Omzet week 20;80555;;16200257;-5829,46;Excl;N;EUR;1;B;0;01062016;01062016;21;-1224,19;20;Omzet;B;;;;;;;;21; -2;25052016;257;V;71;5;2016;16200257;Omzet week 20;Commissie week 20;80555;;16200257;582,95;Excl;N;EUR;1;B;0;01062016;01062016;21;122,42;20;Omzet;B;;;;;;;;;0,1 -1;25052016;262;V;71;5;2016;16200262;Omzet week 20;Omzet week 20;80555;;16200262;-5379,59;Excl;N;EUR;1;B;0;01062016;01062016;21;-1129,71;20;Omzet;B;;;;;;;;21; -2;25052016;262;V;71;5;2016;16200262;Omzet week 20;Commissie week 20;80555;;16200262;537,96;Excl;N;EUR;1;B;0;01062016;01062016;21;112,97;20;Omzet;B;;;;;;;;;0,1 -1;25052016;269;V;71;5;2016;16200269;Omzet week 20;Omzet week 20;80555;;16200269;-1422,85;Excl;N;EUR;1;B;0;01062016;01062016;21;-298,8;20;Omzet;B;;;;;;;;21; -2;25052016;269;V;71;5;2016;16200269;Omzet week 20;Commissie week 20;80555;;16200269;142,29;Excl;N;EUR;1;B;0;01062016;01062016;21;29,88;20;Omzet;B;;;;;;;;;0,1 -1;25052016;276;V;71;5;2016;16200276;Omzet week 20;Omzet week 20;80555;;16200276;-177,69;Excl;N;EUR;1;B;0;01062016;01062016;6;-10,66;20;Omzet;B;;;;;;;;6; -2;25052016;276;V;71;5;2016;16200276;Omzet week 20;Omzet week 20;80555;;16200276;-13,18;Excl;N;EUR;1;B;0;01062016;01062016;21;-2,77;20;Omzet;B;;;;;;;;21; -3;25052016;276;V;71;5;2016;16200276;Omzet week 20;Commissie week 20;80555;;16200276;19,09;Excl;N;EUR;1;B;0;01062016;01062016;21;4,01;20;Omzet;B;;;;;;;;;0,1 -1;25052016;280;V;71;5;2016;16200280;Omzet week 20;Omzet week 20;80555;;16200280;-4094,01;Excl;N;EUR;1;B;0;01062016;01062016;21;-859,74;20;Omzet;B;;;;;;;;21; -2;25052016;280;V;71;5;2016;16200280;Omzet week 20;Commissie week 20;80555;;16200280;409,4;Excl;N;EUR;1;B;0;01062016;01062016;21;85,97;20;Omzet;B;;;;;;;;;0,1 -1;25052016;285;V;71;5;2016;16200285;Omzet week 20;Omzet week 20;80555;;16200285;-5588,47;Excl;N;EUR;1;B;0;01062016;01062016;21;-1173,58;20;Omzet;B;;;;;;;;21; -2;25052016;285;V;71;5;2016;16200285;Omzet week 20;Commissie week 20;80555;;16200285;558,85;Excl;N;EUR;1;B;0;01062016;01062016;21;117,36;20;Omzet;B;;;;;;;;;0,1 -1;25052016;286;V;71;5;2016;16200286;Omzet week 20;Omzet week 20;80555;;16200286;-5314,71;Excl;N;EUR;1;B;0;01062016;01062016;21;-1116,09;20;Omzet;B;;;;;;;;21; -2;25052016;286;V;71;5;2016;16200286;Omzet week 20;Commissie week 20;80555;;16200286;531,47;Excl;N;EUR;1;B;0;01062016;01062016;21;111,61;20;Omzet;B;;;;;;;;;0,1 -1;25052016;293;V;71;5;2016;16200293;Omzet week 20;Omzet week 20;80555;;16200293;-38085,08;Excl;N;EUR;1;B;0;01062016;01062016;21;-7997,87;20;Omzet;B;;;;;;;;21; -2;25052016;293;V;71;5;2016;16200293;Omzet week 20;Omzet week 20;80555;;16200293;-45,19;Excl;N;EUR;1;B;0;01062016;01062016;6;-2,71;20;Omzet;B;;;;;;;;6; -3;25052016;293;V;71;5;2016;16200293;Omzet week 20;Commissie week 20;80555;;16200293;3813,03;Excl;N;EUR;1;B;0;01062016;01062016;21;800,74;20;Omzet;B;;;;;;;;;0,1 -1;25052016;296;V;71;5;2016;16200296;Omzet week 20;Omzet week 20;80555;;16200296;-1955,99;Excl;N;EUR;1;B;0;01062016;01062016;21;-410,76;20;Omzet;B;;;;;;;;21; -2;25052016;296;V;71;5;2016;16200296;Omzet week 20;Commissie week 20;80555;;16200296;195,6;Excl;N;EUR;1;B;0;01062016;01062016;21;41,08;20;Omzet;B;;;;;;;;;0,1 -1;25052016;297;V;71;5;2016;16200297;Omzet week 20;Omzet week 20;80555;;16200297;-1731,4;Excl;N;EUR;1;B;0;01062016;01062016;21;-363,6;20;Omzet;B;;;;;;;;21; -2;25052016;297;V;71;5;2016;16200297;Omzet week 20;Commissie week 20;80555;;16200297;173,14;Excl;N;EUR;1;B;0;01062016;01062016;21;36,36;20;Omzet;B;;;;;;;;;0,1 -1;25052016;300;V;71;5;2016;16200300;Omzet week 20;Omzet week 20;80555;;16200300;-17254,55;Excl;N;EUR;1;B;0;01062016;01062016;21;-3623,45;20;Omzet;B;;;;;;;;21; -2;25052016;300;V;71;5;2016;16200300;Omzet week 20;Commissie week 20;80555;;16200300;1725,45;Excl;N;EUR;1;B;0;01062016;01062016;21;362,35;20;Omzet;B;;;;;;;;;0,1 -1;25052016;305;V;71;5;2016;16200305;Omzet week 20;Omzet week 20;80555;;16200305;-1780,99;Excl;N;EUR;1;B;0;01062016;01062016;21;-374,01;20;Omzet;B;;;;;;;;21; -2;25052016;305;V;71;5;2016;16200305;Omzet week 20;Commissie week 20;80555;;16200305;178,1;Excl;N;EUR;1;B;0;01062016;01062016;21;37,4;20;Omzet;B;;;;;;;;;0,1 -1;25052016;306;V;71;5;2016;16200306;Omzet week 20;Omzet week 20;80555;;16200306;-2773,6;Excl;N;EUR;1;B;0;01062016;01062016;21;-582,45;20;Omzet;B;;;;;;;;21; -2;25052016;306;V;71;5;2016;16200306;Omzet week 20;Omzet week 20;80555;;16200306;-64,15;Excl;N;EUR;1;B;0;01062016;01062016;6;-3,85;20;Omzet;B;;;;;;;;6; -3;25052016;306;V;71;5;2016;16200306;Omzet week 20;Commissie week 20;80555;;16200306;283,78;Excl;N;EUR;1;B;0;01062016;01062016;21;59,6;20;Omzet;B;;;;;;;;;0,1 -1;25052016;326;V;71;5;2016;16200326;Omzet week 20;Omzet week 20;80555;;16200326;-984,63;Excl;N;EUR;1;B;0;01062016;01062016;21;-206,77;20;Omzet;B;;;;;;;;21; -2;25052016;326;V;71;5;2016;16200326;Omzet week 20;Commissie week 20;80555;;16200326;98,46;Excl;N;EUR;1;B;0;01062016;01062016;21;20,68;20;Omzet;B;;;;;;;;;0,1 -1;25052016;328;V;71;5;2016;16200328;Omzet week 20;Omzet week 20;80555;;16200328;-22974,72;Excl;N;EUR;1;B;0;01062016;01062016;6;-1378,48;20;Omzet;B;;;;;;;;6; -2;25052016;328;V;71;5;2016;16200328;Omzet week 20;Commissie week 20;80555;;16200328;2297,47;Excl;N;EUR;1;B;0;01062016;01062016;21;482,47;20;Omzet;B;;;;;;;;;0,1 -1;25052016;344;V;71;5;2016;16200344;Omzet week 20;Omzet week 20;80555;;16200344;-166,86;Excl;N;EUR;1;B;0;01062016;01062016;21;-35,04;20;Omzet;B;;;;;;;;21; -2;25052016;344;V;71;5;2016;16200344;Omzet week 20;Commissie week 20;80555;;16200344;16,69;Excl;N;EUR;1;B;0;01062016;01062016;21;3,5;20;Omzet;B;;;;;;;;;0,1 -1;25052016;361;V;71;5;2016;16200361;Omzet week 20;Omzet week 20;80555;;16200361;-2860,7;Excl;N;EUR;1;B;0;01062016;01062016;21;-600,75;20;Omzet;B;;;;;;;;21; -2;25052016;361;V;71;5;2016;16200361;Omzet week 20;Commissie week 20;80555;;16200361;286,07;Excl;N;EUR;1;B;0;01062016;01062016;21;60,07;20;Omzet;B;;;;;;;;;0,1 -1;25052016;370;V;71;5;2016;16200370;Omzet week 20;Omzet week 20;80555;;16200370;-5713,35;Excl;N;EUR;1;B;0;01062016;01062016;21;-1199,8;20;Omzet;B;;;;;;;;21; -2;25052016;370;V;71;5;2016;16200370;Omzet week 20;Commissie week 20;80555;;16200370;571,33;Excl;N;EUR;1;B;0;01062016;01062016;21;119,98;20;Omzet;B;;;;;;;;;0,1 -1;25052016;374;V;71;5;2016;16200374;Omzet week 20;Omzet week 20;80555;;16200374;-1093,76;Excl;N;EUR;1;B;0;01062016;01062016;21;-229,69;20;Omzet;B;;;;;;;;21; -2;25052016;374;V;71;5;2016;16200374;Omzet week 20;Commissie week 20;80555;;16200374;109,38;Excl;N;EUR;1;B;0;01062016;01062016;21;22,97;20;Omzet;B;;;;;;;;;0,1 -1;25052016;400;V;71;5;2016;16200400;Omzet week 20;Omzet week 20;80555;;16200400;-115,66;Excl;N;EUR;1;B;0;01062016;01062016;21;-24,29;20;Omzet;B;;;;;;;;21; -2;25052016;400;V;71;5;2016;16200400;Omzet week 20;Commissie week 20;80555;;16200400;11,57;Excl;N;EUR;1;B;0;01062016;01062016;21;2,43;20;Omzet;B;;;;;;;;;0,1 -1;25052016;411;V;71;5;2016;16200411;Omzet week 20;Omzet week 20;80555;;16200411;-923,97;Excl;N;EUR;1;B;0;01062016;01062016;21;-194,03;20;Omzet;B;;;;;;;;21; -2;25052016;411;V;71;5;2016;16200411;Omzet week 20;Commissie week 20;80555;;16200411;92,4;Excl;N;EUR;1;B;0;01062016;01062016;21;19,4;20;Omzet;B;;;;;;;;;0,1 -1;25052016;412;V;71;5;2016;16200412;Omzet week 20;Omzet week 20;80555;;16200412;-3216,94;Excl;N;EUR;1;B;0;01062016;01062016;21;-675,56;20;Omzet;B;;;;;;;;21; -2;25052016;412;V;71;5;2016;16200412;Omzet week 20;Commissie week 20;80555;;16200412;321,69;Excl;N;EUR;1;B;0;01062016;01062016;21;67,56;20;Omzet;B;;;;;;;;;0,1 -1;25052016;434;V;71;5;2016;16200434;Omzet week 20;Omzet week 20;80555;;16200434;-1227,69;Excl;N;EUR;1;B;0;01062016;01062016;21;-257,81;20;Omzet;B;;;;;;;;21; -2;25052016;434;V;71;5;2016;16200434;Omzet week 20;Commissie week 20;80555;;16200434;122,77;Excl;N;EUR;1;B;0;01062016;01062016;21;25,78;20;Omzet;B;;;;;;;;;0,1 -1;25052016;439;V;71;5;2016;16200439;Omzet week 20;Omzet week 20;80555;;16200439;-9356,94;Excl;N;EUR;1;B;0;01062016;01062016;21;-1964,96;20;Omzet;B;;;;;;;;21; -2;25052016;439;V;71;5;2016;16200439;Omzet week 20;Commissie week 20;80555;;16200439;935,69;Excl;N;EUR;1;B;0;01062016;01062016;21;196,5;20;Omzet;B;;;;;;;;;0,1 -1;25052016;442;V;71;5;2016;16200442;Omzet week 20;Omzet week 20;80555;;16200442;-3782,44;Excl;N;EUR;1;B;0;01062016;01062016;21;-794,31;20;Omzet;B;;;;;;;;21; -2;25052016;442;V;71;5;2016;16200442;Omzet week 20;Commissie week 20;80555;;16200442;378,24;Excl;N;EUR;1;B;0;01062016;01062016;21;79,43;20;Omzet;B;;;;;;;;;0,1 -1;25052016;443;V;71;5;2016;16200443;Omzet week 20;Omzet week 20;80555;;16200443;-24523,22;Excl;N;EUR;1;B;0;01062016;01062016;21;-5149,88;20;Omzet;B;;;;;;;;21; -2;25052016;443;V;71;5;2016;16200443;Omzet week 20;Commissie week 20;80555;;16200443;2452,32;Excl;N;EUR;1;B;0;01062016;01062016;21;514,99;20;Omzet;B;;;;;;;;;0,1 -1;25052016;444;V;71;5;2016;16200444;Omzet week 20;Omzet week 20;80555;;16200444;-392,73;Excl;N;EUR;1;B;0;01062016;01062016;21;-82,47;20;Omzet;B;;;;;;;;21; -2;25052016;444;V;71;5;2016;16200444;Omzet week 20;Commissie week 20;80555;;16200444;39,27;Excl;N;EUR;1;B;0;01062016;01062016;21;8,25;20;Omzet;B;;;;;;;;;0,1 -1;25052016;448;V;71;5;2016;16200448;Omzet week 20;Omzet week 20;80555;;16200448;-3101,69;Excl;N;EUR;1;B;0;01062016;01062016;21;-651,36;20;Omzet;B;;;;;;;;21; -2;25052016;448;V;71;5;2016;16200448;Omzet week 20;Commissie week 20;80555;;16200448;310,17;Excl;N;EUR;1;B;0;01062016;01062016;21;65,14;20;Omzet;B;;;;;;;;;0,1 -1;25052016;453;V;71;5;2016;16200453;Omzet week 20;Omzet week 20;80555;;16200453;-3351,2;Excl;N;EUR;1;B;0;01062016;01062016;21;-703,75;20;Omzet;B;;;;;;;;21; -2;25052016;453;V;71;5;2016;16200453;Omzet week 20;Commissie week 20;80555;;16200453;335,12;Excl;N;EUR;1;B;0;01062016;01062016;21;70,38;20;Omzet;B;;;;;;;;;0,1 -1;25052016;466;V;71;5;2016;16200466;Omzet week 20;Omzet week 20;80555;;16200466;-2421,45;Excl;N;EUR;1;B;0;01062016;01062016;21;-508,5;20;Omzet;B;;;;;;;;21; -2;25052016;466;V;71;5;2016;16200466;Omzet week 20;Omzet week 20;80555;;16200466;-884,94;Excl;N;EUR;1;B;0;01062016;01062016;6;-53,1;20;Omzet;B;;;;;;;;6; -3;25052016;466;V;71;5;2016;16200466;Omzet week 20;Commissie week 20;80555;;16200466;330,63;Excl;N;EUR;1;B;0;01062016;01062016;21;69,43;20;Omzet;B;;;;;;;;;0,1 -1;25052016;505;V;71;5;2016;16200505;Omzet week 20;Omzet week 20;80555;;16200505;-1955,91;Excl;N;EUR;1;B;0;01062016;01062016;21;-410,74;20;Omzet;B;;;;;;;;21; -2;25052016;505;V;71;5;2016;16200505;Omzet week 20;Commissie week 20;80555;;16200505;195,59;Excl;N;EUR;1;B;0;01062016;01062016;21;41,07;20;Omzet;B;;;;;;;;;0,1 -1;25052016;530;V;71;5;2016;16200530;Omzet week 20;Omzet week 20;80555;;16200530;-790,58;Excl;N;EUR;1;B;0;01062016;01062016;21;-166,02;20;Omzet;B;;;;;;;;21; -2;25052016;530;V;71;5;2016;16200530;Omzet week 20;Commissie week 20;80555;;16200530;79,06;Excl;N;EUR;1;B;0;01062016;01062016;21;16,6;20;Omzet;B;;;;;;;;;0,1 -1;25052016;543;V;71;5;2016;16200543;Omzet week 20;Omzet week 20;80555;;16200543;-1320,58;Excl;N;EUR;1;B;0;01062016;01062016;21;-277,32;20;Omzet;B;;;;;;;;21; -2;25052016;543;V;71;5;2016;16200543;Omzet week 20;Commissie week 20;80555;;16200543;132,06;Excl;N;EUR;1;B;0;01062016;01062016;21;27,73;20;Omzet;B;;;;;;;;;0,1 -1;25052016;569;V;71;5;2016;16200569;Omzet week 20;Omzet week 20;80555;;16200569;-899,75;Excl;N;EUR;1;B;0;01062016;01062016;21;-188,95;20;Omzet;B;;;;;;;;21; -2;25052016;569;V;71;5;2016;16200569;Omzet week 20;Commissie week 20;80555;;16200569;89,98;Excl;N;EUR;1;B;0;01062016;01062016;21;18,89;20;Omzet;B;;;;;;;;;0,1 -1;25052016;575;V;71;5;2016;16200575;Omzet week 20;Omzet week 20;80555;;16200575;-4362,77;Excl;N;EUR;1;B;0;01062016;01062016;21;-916,18;20;Omzet;B;;;;;;;;21; -2;25052016;575;V;71;5;2016;16200575;Omzet week 20;Commissie week 20;80555;;16200575;436,28;Excl;N;EUR;1;B;0;01062016;01062016;21;91,62;20;Omzet;B;;;;;;;;;0,1 -1;25052016;594;V;71;5;2016;16200594;Omzet week 20;Omzet week 20;80555;;16200594;-1700,87;Excl;N;EUR;1;B;0;01062016;01062016;21;-357,18;20;Omzet;B;;;;;;;;21; -2;25052016;594;V;71;5;2016;16200594;Omzet week 20;Commissie week 20;80555;;16200594;170,09;Excl;N;EUR;1;B;0;01062016;01062016;21;35,72;20;Omzet;B;;;;;;;;;0,1 -1;25052016;596;V;71;5;2016;16200596;Omzet week 20;Omzet week 20;80555;;16200596;-9991,98;Excl;N;EUR;1;B;0;01062016;01062016;21;-2098,32;20;Omzet;B;;;;;;;;21; -2;25052016;596;V;71;5;2016;16200596;Omzet week 20;Commissie week 20;80555;;16200596;999,2;Excl;N;EUR;1;B;0;01062016;01062016;21;209,83;20;Omzet;B;;;;;;;;;0,1 -1;25052016;600;V;71;5;2016;16200600;Omzet week 20;Omzet week 20;80555;;16200600;-6,2;Excl;N;EUR;1;B;0;01062016;01062016;21;-1,3;20;Omzet;B;;;;;;;;21; -2;25052016;600;V;71;5;2016;16200600;Omzet week 20;Commissie week 20;80555;;16200600;0,62;Excl;N;EUR;1;B;0;01062016;01062016;21;0,13;20;Omzet;B;;;;;;;;;0,1 -1;25052016;605;V;71;5;2016;16200605;Omzet week 20;Omzet week 20;80555;;16200605;-1393,84;Excl;N;EUR;1;B;0;01062016;01062016;21;-292,71;20;Omzet;B;;;;;;;;21; -2;25052016;605;V;71;5;2016;16200605;Omzet week 20;Commissie week 20;80555;;16200605;139,38;Excl;N;EUR;1;B;0;01062016;01062016;21;29,27;20;Omzet;B;;;;;;;;;0,1 -1;25052016;637;V;71;5;2016;16200637;Omzet week 20;Omzet week 20;80555;;16200637;-1685,25;Excl;N;EUR;1;B;0;01062016;01062016;21;-353,9;20;Omzet;B;;;;;;;;21; -2;25052016;637;V;71;5;2016;16200637;Omzet week 20;Commissie week 20;80555;;16200637;168,52;Excl;N;EUR;1;B;0;01062016;01062016;21;35,39;20;Omzet;B;;;;;;;;;0,1 -1;25052016;638;V;71;5;2016;16200638;Omzet week 20;Omzet week 20;80555;;16200638;-4262,15;Excl;N;EUR;1;B;0;01062016;01062016;21;-895,05;20;Omzet;B;;;;;;;;21; -2;25052016;638;V;71;5;2016;16200638;Omzet week 20;Commissie week 20;80555;;16200638;426,21;Excl;N;EUR;1;B;0;01062016;01062016;21;89,51;20;Omzet;B;;;;;;;;;0,1 -1;25052016;645;V;71;5;2016;16200645;Omzet week 20;Omzet week 20;80555;;16200645;-1962,81;Excl;N;EUR;1;B;0;01062016;01062016;21;-412,19;20;Omzet;B;;;;;;;;21; -2;25052016;645;V;71;5;2016;16200645;Omzet week 20;Commissie week 20;80555;;16200645;196,28;Excl;N;EUR;1;B;0;01062016;01062016;21;41,22;20;Omzet;B;;;;;;;;;0,1 -1;25052016;647;V;71;5;2016;16200647;Omzet week 20;Omzet week 20;80555;;16200647;-2163,14;Excl;N;EUR;1;B;0;01062016;01062016;21;-454,26;20;Omzet;B;;;;;;;;21; -2;25052016;647;V;71;5;2016;16200647;Omzet week 20;Commissie week 20;80555;;16200647;216,31;Excl;N;EUR;1;B;0;01062016;01062016;21;45,43;20;Omzet;B;;;;;;;;;0,1 -1;25052016;651;V;71;5;2016;16200651;Omzet week 20;Omzet week 20;80555;;16200651;-1378,93;Excl;N;EUR;1;B;0;01062016;01062016;21;-289,57;20;Omzet;B;;;;;;;;21; -2;25052016;651;V;71;5;2016;16200651;Omzet week 20;Commissie week 20;80555;;16200651;137,89;Excl;N;EUR;1;B;0;01062016;01062016;21;28,96;20;Omzet;B;;;;;;;;;0,1 -1;25052016;653;V;71;5;2016;16200653;Omzet week 20;Omzet week 20;80555;;16200653;-4777,93;Excl;N;EUR;1;B;0;01062016;01062016;21;-1003,37;20;Omzet;B;;;;;;;;21; -2;25052016;653;V;71;5;2016;16200653;Omzet week 20;Commissie week 20;80555;;16200653;477,79;Excl;N;EUR;1;B;0;01062016;01062016;21;100,34;20;Omzet;B;;;;;;;;;0,1 -1;25052016;671;V;71;5;2016;16200671;Omzet week 20;Omzet week 20;80555;;16200671;-123,14;Excl;N;EUR;1;B;0;01062016;01062016;21;-25,86;20;Omzet;B;;;;;;;;21; -2;25052016;671;V;71;5;2016;16200671;Omzet week 20;Commissie week 20;80555;;16200671;12,31;Excl;N;EUR;1;B;0;01062016;01062016;21;2,59;20;Omzet;B;;;;;;;;;0,1 -1;25052016;672;V;71;5;2016;16200672;Omzet week 20;Omzet week 20;80555;;16200672;-631,16;Excl;N;EUR;1;B;0;01062016;01062016;21;-132,54;20;Omzet;B;;;;;;;;21; -2;25052016;672;V;71;5;2016;16200672;Omzet week 20;Commissie week 20;80555;;16200672;63,12;Excl;N;EUR;1;B;0;01062016;01062016;21;13,25;20;Omzet;B;;;;;;;;;0,1 -1;25052016;687;V;71;5;2016;16200687;Omzet week 20;Omzet week 20;80555;;16200687;-1812,64;Excl;N;EUR;1;B;0;01062016;01062016;21;-380,66;20;Omzet;B;;;;;;;;21; -2;25052016;687;V;71;5;2016;16200687;Omzet week 20;Commissie week 20;80555;;16200687;181,26;Excl;N;EUR;1;B;0;01062016;01062016;21;38,07;20;Omzet;B;;;;;;;;;0,1 -1;25052016;693;V;71;5;2016;16200693;Omzet week 20;Omzet week 20;80555;;16200693;-3815,66;Excl;N;EUR;1;B;0;01062016;01062016;21;-801,29;20;Omzet;B;;;;;;;;21; -2;25052016;693;V;71;5;2016;16200693;Omzet week 20;Commissie week 20;80555;;16200693;381,57;Excl;N;EUR;1;B;0;01062016;01062016;21;80,13;20;Omzet;B;;;;;;;;;0,1 -1;25052016;700;V;71;5;2016;16200700;Omzet week 20;Omzet week 20;80555;;16200700;-5144,63;Excl;N;EUR;1;B;0;01062016;01062016;21;-1080,37;20;Omzet;B;;;;;;;;21; -2;25052016;700;V;71;5;2016;16200700;Omzet week 20;Commissie week 20;80555;;16200700;514,46;Excl;N;EUR;1;B;0;01062016;01062016;21;108,04;20;Omzet;B;;;;;;;;;0,1 -1;25052016;708;V;71;5;2016;16200708;Omzet week 20;Omzet week 20;80555;;16200708;-581,03;Excl;N;EUR;1;B;0;01062016;01062016;21;-122,02;20;Omzet;B;;;;;;;;21; -2;25052016;708;V;71;5;2016;16200708;Omzet week 20;Commissie week 20;80555;;16200708;58,1;Excl;N;EUR;1;B;0;01062016;01062016;21;12,2;20;Omzet;B;;;;;;;;;0,1 -1;25052016;709;V;71;5;2016;16200709;Omzet week 20;Omzet week 20;80555;;16200709;-986,2;Excl;N;EUR;1;B;0;01062016;01062016;21;-207,1;20;Omzet;B;;;;;;;;21; -2;25052016;709;V;71;5;2016;16200709;Omzet week 20;Commissie week 20;80555;;16200709;98,62;Excl;N;EUR;1;B;0;01062016;01062016;21;20,71;20;Omzet;B;;;;;;;;;0,1 -1;25052016;710;V;71;5;2016;16200710;Omzet week 20;Omzet week 20;80555;;16200710;-1128,93;Excl;N;EUR;1;B;0;01062016;01062016;21;-237,07;20;Omzet;B;;;;;;;;21; -2;25052016;710;V;71;5;2016;16200710;Omzet week 20;Commissie week 20;80555;;16200710;112,89;Excl;N;EUR;1;B;0;01062016;01062016;21;23,71;20;Omzet;B;;;;;;;;;0,1 -1;25052016;716;V;71;5;2016;16200716;Omzet week 20;Omzet week 20;80555;;16200716;-836,86;Excl;N;EUR;1;B;0;01062016;01062016;21;-175,74;20;Omzet;B;;;;;;;;21; -2;25052016;716;V;71;5;2016;16200716;Omzet week 20;Commissie week 20;80555;;16200716;83,69;Excl;N;EUR;1;B;0;01062016;01062016;21;17,57;20;Omzet;B;;;;;;;;;0,1 -1;25052016;727;V;71;5;2016;16200727;Omzet week 20;Omzet week 20;80555;;16200727;-1963,64;Excl;N;EUR;1;B;0;01062016;01062016;21;-412,36;20;Omzet;B;;;;;;;;21; -2;25052016;727;V;71;5;2016;16200727;Omzet week 20;Commissie week 20;80555;;16200727;196,36;Excl;N;EUR;1;B;0;01062016;01062016;21;41,24;20;Omzet;B;;;;;;;;;0,1 -1;25052016;734;V;71;5;2016;16200734;Omzet week 20;Omzet week 20;80555;;16200734;-3020,41;Excl;N;EUR;1;B;0;01062016;01062016;21;-634,29;20;Omzet;B;;;;;;;;21; -2;25052016;734;V;71;5;2016;16200734;Omzet week 20;Commissie week 20;80555;;16200734;302,04;Excl;N;EUR;1;B;0;01062016;01062016;21;63,43;20;Omzet;B;;;;;;;;;0,1 -1;25052016;736;V;71;5;2016;16200736;Omzet week 20;Omzet week 20;80555;;16200736;-1008,35;Excl;N;EUR;1;B;0;01062016;01062016;21;-211,75;20;Omzet;B;;;;;;;;21; -2;25052016;736;V;71;5;2016;16200736;Omzet week 20;Commissie week 20;80555;;16200736;100,83;Excl;N;EUR;1;B;0;01062016;01062016;21;21,18;20;Omzet;B;;;;;;;;;0,1 -1;25052016;738;V;71;5;2016;16200738;Omzet week 20;Omzet week 20;80555;;16200738;-3612,89;Excl;N;EUR;1;B;0;01062016;01062016;21;-758,71;20;Omzet;B;;;;;;;;21; -2;25052016;738;V;71;5;2016;16200738;Omzet week 20;Omzet week 20;80555;;16200738;-18,87;Excl;N;EUR;1;B;0;01062016;01062016;6;-1,13;20;Omzet;B;;;;;;;;6; -3;25052016;738;V;71;5;2016;16200738;Omzet week 20;Commissie week 20;80555;;16200738;363,18;Excl;N;EUR;1;B;0;01062016;01062016;21;76,27;20;Omzet;B;;;;;;;;;0,1 -1;25052016;742;V;71;5;2016;16200742;Omzet week 20;Omzet week 20;80555;;16200742;-267,81;Excl;N;EUR;1;B;0;01062016;01062016;21;-56,24;20;Omzet;B;;;;;;;;21; -2;25052016;742;V;71;5;2016;16200742;Omzet week 20;Commissie week 20;80555;;16200742;26,78;Excl;N;EUR;1;B;0;01062016;01062016;21;5,62;20;Omzet;B;;;;;;;;;0,1 -1;25052016;758;V;71;5;2016;16200758;Omzet week 20;Omzet week 20;80555;;16200758;-751,98;Excl;N;EUR;1;B;0;01062016;01062016;21;-157,92;20;Omzet;B;;;;;;;;21; -2;25052016;758;V;71;5;2016;16200758;Omzet week 20;Commissie week 20;80555;;16200758;75,2;Excl;N;EUR;1;B;0;01062016;01062016;21;15,79;20;Omzet;B;;;;;;;;;0,1 -1;25052016;760;V;71;5;2016;16200760;Omzet week 20;Omzet week 20;80555;;16200760;-1607,19;Excl;N;EUR;1;B;0;01062016;01062016;21;-337,51;20;Omzet;B;;;;;;;;21; -2;25052016;760;V;71;5;2016;16200760;Omzet week 20;Commissie week 20;80555;;16200760;160,72;Excl;N;EUR;1;B;0;01062016;01062016;21;33,75;20;Omzet;B;;;;;;;;;0,1 -1;25052016;762;V;71;5;2016;16200762;Omzet week 20;Omzet week 20;80555;;16200762;-175,87;Excl;N;EUR;1;B;0;01062016;01062016;21;-36,93;20;Omzet;B;;;;;;;;21; -2;25052016;762;V;71;5;2016;16200762;Omzet week 20;Commissie week 20;80555;;16200762;17,59;Excl;N;EUR;1;B;0;01062016;01062016;21;3,69;20;Omzet;B;;;;;;;;;0,1 -1;25052016;764;V;71;5;2016;16200764;Omzet week 20;Omzet week 20;80555;;16200764;-19665,04;Excl;N;EUR;1;B;0;01062016;01062016;21;-4129,66;20;Omzet;B;;;;;;;;21; -2;25052016;764;V;71;5;2016;16200764;Omzet week 20;Commissie week 20;80555;;16200764;1966,5;Excl;N;EUR;1;B;0;01062016;01062016;21;412,97;20;Omzet;B;;;;;;;;;0,1 -1;25052016;765;V;71;5;2016;16200765;Omzet week 20;Omzet week 20;80555;;16200765;-1138,68;Excl;N;EUR;1;B;0;01062016;01062016;21;-239,12;20;Omzet;B;;;;;;;;21; -2;25052016;765;V;71;5;2016;16200765;Omzet week 20;Commissie week 20;80555;;16200765;113,87;Excl;N;EUR;1;B;0;01062016;01062016;21;23,91;20;Omzet;B;;;;;;;;;0,1 -1;25052016;767;V;71;5;2016;16200767;Omzet week 20;Omzet week 20;80555;;16200767;-59,88;Excl;N;EUR;1;B;0;01062016;01062016;21;-12,57;20;Omzet;B;;;;;;;;21; -2;25052016;767;V;71;5;2016;16200767;Omzet week 20;Commissie week 20;80555;;16200767;5,99;Excl;N;EUR;1;B;0;01062016;01062016;21;1,26;20;Omzet;B;;;;;;;;;0,1 -1;25052016;768;V;71;5;2016;16200768;Omzet week 20;Omzet week 20;80555;;16200768;-2709,92;Excl;N;EUR;1;B;0;01062016;01062016;21;-569,08;20;Omzet;B;;;;;;;;21; -2;25052016;768;V;71;5;2016;16200768;Omzet week 20;Commissie week 20;80555;;16200768;270,99;Excl;N;EUR;1;B;0;01062016;01062016;21;56,91;20;Omzet;B;;;;;;;;;0,1 -1;25052016;769;V;71;5;2016;16200769;Omzet week 20;Omzet week 20;80555;;16200769;-561,45;Excl;N;EUR;1;B;0;01062016;01062016;21;-117,9;20;Omzet;B;;;;;;;;21; -2;25052016;769;V;71;5;2016;16200769;Omzet week 20;Commissie week 20;80555;;16200769;56,14;Excl;N;EUR;1;B;0;01062016;01062016;21;11,79;20;Omzet;B;;;;;;;;;0,1 -1;25052016;784;V;71;5;2016;16200784;Omzet week 20;Omzet week 20;80555;;16200784;-1614,96;Excl;N;EUR;1;B;0;01062016;01062016;21;-339,14;20;Omzet;B;;;;;;;;21; -2;25052016;784;V;71;5;2016;16200784;Omzet week 20;Commissie week 20;80555;;16200784;161,5;Excl;N;EUR;1;B;0;01062016;01062016;21;33,91;20;Omzet;B;;;;;;;;;0,1 -1;25052016;789;V;71;5;2016;16200789;Omzet week 20;Omzet week 20;80555;;16200789;-467,98;Excl;N;EUR;1;B;0;01062016;01062016;21;-98,27;20;Omzet;B;;;;;;;;21; -2;25052016;789;V;71;5;2016;16200789;Omzet week 20;Commissie week 20;80555;;16200789;46,8;Excl;N;EUR;1;B;0;01062016;01062016;21;9,83;20;Omzet;B;;;;;;;;;0,1 -1;25052016;792;V;71;5;2016;16200792;Omzet week 20;Omzet week 20;80555;;16200792;-4753,93;Excl;N;EUR;1;B;0;01062016;01062016;21;-998,32;20;Omzet;B;;;;;;;;21; -2;25052016;792;V;71;5;2016;16200792;Omzet week 20;Commissie week 20;80555;;16200792;475,39;Excl;N;EUR;1;B;0;01062016;01062016;21;99,83;20;Omzet;B;;;;;;;;;0,1 -1;25052016;797;V;71;5;2016;16200797;Omzet week 20;Omzet week 20;80555;;16200797;-569,96;Excl;N;EUR;1;B;0;01062016;01062016;21;-119,69;20;Omzet;B;;;;;;;;21; -2;25052016;797;V;71;5;2016;16200797;Omzet week 20;Commissie week 20;80555;;16200797;57;Excl;N;EUR;1;B;0;01062016;01062016;21;11,97;20;Omzet;B;;;;;;;;;0,1 -1;25052016;800;V;71;5;2016;16200800;Omzet week 20;Omzet week 20;80555;;16200800;-2523,97;Excl;N;EUR;1;B;0;01062016;01062016;21;-530,03;20;Omzet;B;;;;;;;;21; -2;25052016;800;V;71;5;2016;16200800;Omzet week 20;Commissie week 20;80555;;16200800;252,4;Excl;N;EUR;1;B;0;01062016;01062016;21;53;20;Omzet;B;;;;;;;;;0,1 -1;25052016;809;V;71;5;2016;16200809;Omzet week 20;Omzet week 20;80555;;16200809;-1859,13;Excl;N;EUR;1;B;0;01062016;01062016;21;-390,42;20;Omzet;B;;;;;;;;21; -2;25052016;809;V;71;5;2016;16200809;Omzet week 20;Commissie week 20;80555;;16200809;185,91;Excl;N;EUR;1;B;0;01062016;01062016;21;39,04;20;Omzet;B;;;;;;;;;0,1 -1;25052016;811;V;71;5;2016;16200811;Omzet week 20;Omzet week 20;80555;;16200811;-145,45;Excl;N;EUR;1;B;0;01062016;01062016;21;-30,54;20;Omzet;B;;;;;;;;21; -2;25052016;811;V;71;5;2016;16200811;Omzet week 20;Commissie week 20;80555;;16200811;14,54;Excl;N;EUR;1;B;0;01062016;01062016;21;3,05;20;Omzet;B;;;;;;;;;0,1 -1;25052016;812;V;71;5;2016;16200812;Omzet week 20;Omzet week 20;80555;;16200812;-8224,92;Excl;N;EUR;1;B;0;01062016;01062016;21;-1727,23;20;Omzet;B;;;;;;;;21; -2;25052016;812;V;71;5;2016;16200812;Omzet week 20;Commissie week 20;80555;;16200812;822,49;Excl;N;EUR;1;B;0;01062016;01062016;21;172,72;20;Omzet;B;;;;;;;;;0,1 -1;25052016;815;V;71;5;2016;16200815;Omzet week 20;Omzet week 20;80555;;16200815;-3287,93;Excl;N;EUR;1;B;0;01062016;01062016;21;-690,47;20;Omzet;B;;;;;;;;21; -2;25052016;815;V;71;5;2016;16200815;Omzet week 20;Commissie week 20;80555;;16200815;328,79;Excl;N;EUR;1;B;0;01062016;01062016;21;69,05;20;Omzet;B;;;;;;;;;0,1 -1;25052016;818;V;71;5;2016;16200818;Omzet week 20;Omzet week 20;80555;;16200818;-976,2;Excl;N;EUR;1;B;0;01062016;01062016;21;-205;20;Omzet;B;;;;;;;;21; -2;25052016;818;V;71;5;2016;16200818;Omzet week 20;Commissie week 20;80555;;16200818;97,62;Excl;N;EUR;1;B;0;01062016;01062016;21;20,5;20;Omzet;B;;;;;;;;;0,1 -1;25052016;819;V;71;5;2016;16200819;Omzet week 20;Omzet week 20;80555;;16200819;-2798,22;Excl;N;EUR;1;B;0;01062016;01062016;21;-587,63;20;Omzet;B;;;;;;;;21; -2;25052016;819;V;71;5;2016;16200819;Omzet week 20;Commissie week 20;80555;;16200819;279,82;Excl;N;EUR;1;B;0;01062016;01062016;21;58,76;20;Omzet;B;;;;;;;;;0,1 -1;25052016;820;V;71;5;2016;16200820;Omzet week 20;Omzet week 20;80555;;16200820;-1093,43;Excl;N;EUR;1;B;0;01062016;01062016;21;-229,62;20;Omzet;B;;;;;;;;21; -2;25052016;820;V;71;5;2016;16200820;Omzet week 20;Commissie week 20;80555;;16200820;109,34;Excl;N;EUR;1;B;0;01062016;01062016;21;22,96;20;Omzet;B;;;;;;;;;0,1 -1;25052016;821;V;71;5;2016;16200821;Omzet week 20;Omzet week 20;80555;;16200821;-709,42;Excl;N;EUR;1;B;0;01062016;01062016;21;-148,98;20;Omzet;B;;;;;;;;21; -2;25052016;821;V;71;5;2016;16200821;Omzet week 20;Omzet week 20;80555;;16200821;-147,41;Excl;N;EUR;1;B;0;01062016;01062016;6;-8,84;20;Omzet;B;;;;;;;;6; -3;25052016;821;V;71;5;2016;16200821;Omzet week 20;Commissie week 20;80555;;16200821;85,68;Excl;N;EUR;1;B;0;01062016;01062016;21;18;20;Omzet;B;;;;;;;;;0,1 -1;25052016;823;V;71;5;2016;16200823;Omzet week 20;Omzet week 20;80555;;16200823;-2148,55;Excl;N;EUR;1;B;0;01062016;01062016;21;-451,2;20;Omzet;B;;;;;;;;21; -2;25052016;823;V;71;5;2016;16200823;Omzet week 20;Commissie week 20;80555;;16200823;214,86;Excl;N;EUR;1;B;0;01062016;01062016;21;45,12;20;Omzet;B;;;;;;;;;0,1 -1;25052016;828;V;71;5;2016;16200828;Omzet week 20;Omzet week 20;80555;;16200828;-494,34;Excl;N;EUR;1;B;0;01062016;01062016;21;-103,81;20;Omzet;B;;;;;;;;21; -2;25052016;828;V;71;5;2016;16200828;Omzet week 20;Commissie week 20;80555;;16200828;49,43;Excl;N;EUR;1;B;0;01062016;01062016;21;10,38;20;Omzet;B;;;;;;;;;0,1 -1;25052016;831;V;71;5;2016;16200831;Omzet week 20;Omzet week 20;80555;;16200831;-1072,89;Excl;N;EUR;1;B;0;01062016;01062016;21;-225,31;20;Omzet;B;;;;;;;;21; -2;25052016;831;V;71;5;2016;16200831;Omzet week 20;Commissie week 20;80555;;16200831;107,29;Excl;N;EUR;1;B;0;01062016;01062016;21;22,53;20;Omzet;B;;;;;;;;;0,1 -1;25052016;832;V;71;5;2016;16200832;Omzet week 20;Omzet week 20;80555;;16200832;-3277,4;Excl;N;EUR;1;B;0;01062016;01062016;21;-688,25;20;Omzet;B;;;;;;;;21; -2;25052016;832;V;71;5;2016;16200832;Omzet week 20;Commissie week 20;80555;;16200832;327,74;Excl;N;EUR;1;B;0;01062016;01062016;21;68,83;20;Omzet;B;;;;;;;;;0,1 -1;25052016;836;V;71;5;2016;16200836;Omzet week 20;Omzet week 20;80555;;16200836;-3090,24;Excl;N;EUR;1;B;0;01062016;01062016;21;-648,95;20;Omzet;B;;;;;;;;21; -2;25052016;836;V;71;5;2016;16200836;Omzet week 20;Commissie week 20;80555;;16200836;309,02;Excl;N;EUR;1;B;0;01062016;01062016;21;64,9;20;Omzet;B;;;;;;;;;0,1 -1;25052016;841;V;71;5;2016;16200841;Omzet week 20;Omzet week 20;80555;;16200841;-1286,12;Excl;N;EUR;1;B;0;01062016;01062016;21;-270,08;20;Omzet;B;;;;;;;;21; -2;25052016;841;V;71;5;2016;16200841;Omzet week 20;Commissie week 20;80555;;16200841;128,61;Excl;N;EUR;1;B;0;01062016;01062016;21;27,01;20;Omzet;B;;;;;;;;;0,1 -1;25052016;842;V;71;5;2016;16200842;Omzet week 20;Omzet week 20;80555;;16200842;-1100,12;Excl;N;EUR;1;B;0;01062016;01062016;21;-231,03;20;Omzet;B;;;;;;;;21; -2;25052016;842;V;71;5;2016;16200842;Omzet week 20;Commissie week 20;80555;;16200842;110,01;Excl;N;EUR;1;B;0;01062016;01062016;21;23,1;20;Omzet;B;;;;;;;;;0,1 -1;25052016;847;V;71;5;2016;16200847;Omzet week 20;Omzet week 20;80555;;16200847;-3131,53;Excl;N;EUR;1;B;0;01062016;01062016;21;-657,62;20;Omzet;B;;;;;;;;21; -2;25052016;847;V;71;5;2016;16200847;Omzet week 20;Commissie week 20;80555;;16200847;313,15;Excl;N;EUR;1;B;0;01062016;01062016;21;65,76;20;Omzet;B;;;;;;;;;0,1 -1;25052016;852;V;71;5;2016;16200852;Omzet week 20;Omzet week 20;80555;;16200852;-2028,1;Excl;N;EUR;1;B;0;01062016;01062016;21;-425,9;20;Omzet;B;;;;;;;;21; -2;25052016;852;V;71;5;2016;16200852;Omzet week 20;Commissie week 20;80555;;16200852;202,81;Excl;N;EUR;1;B;0;01062016;01062016;21;42,59;20;Omzet;B;;;;;;;;;0,1 -1;25052016;854;V;71;5;2016;16200854;Omzet week 20;Omzet week 20;80555;;16200854;-535,54;Excl;N;EUR;1;B;0;01062016;01062016;21;-112,46;20;Omzet;B;;;;;;;;21; -2;25052016;854;V;71;5;2016;16200854;Omzet week 20;Commissie week 20;80555;;16200854;53,55;Excl;N;EUR;1;B;0;01062016;01062016;21;11,25;20;Omzet;B;;;;;;;;;0,1 -1;25052016;858;V;71;5;2016;16200858;Omzet week 20;Omzet week 20;80555;;16200858;-1583,02;Excl;N;EUR;1;B;0;01062016;01062016;21;-332,43;20;Omzet;B;;;;;;;;21; -2;25052016;858;V;71;5;2016;16200858;Omzet week 20;Omzet week 20;80555;;16200858;-205,05;Excl;N;EUR;1;B;0;01062016;01062016;6;-12,3;20;Omzet;B;;;;;;;;6; -3;25052016;858;V;71;5;2016;16200858;Omzet week 20;Commissie week 20;80555;;16200858;178,8;Excl;N;EUR;1;B;0;01062016;01062016;21;37,55;20;Omzet;B;;;;;;;;;0,1 -1;25052016;860;V;71;5;2016;16200860;Omzet week 20;Omzet week 20;80555;;16200860;-2669,5;Excl;N;EUR;1;B;0;01062016;01062016;21;-560,6;20;Omzet;B;;;;;;;;21; -2;25052016;860;V;71;5;2016;16200860;Omzet week 20;Commissie week 20;80555;;16200860;266,95;Excl;N;EUR;1;B;0;01062016;01062016;21;56,06;20;Omzet;B;;;;;;;;;0,1 -1;25052016;864;V;71;5;2016;16200864;Omzet week 20;Omzet week 20;80555;;16200864;-1817,36;Excl;N;EUR;1;B;0;01062016;01062016;21;-381,64;20;Omzet;B;;;;;;;;21; -2;25052016;864;V;71;5;2016;16200864;Omzet week 20;Commissie week 20;80555;;16200864;181,74;Excl;N;EUR;1;B;0;01062016;01062016;21;38,16;20;Omzet;B;;;;;;;;;0,1 -1;25052016;865;V;71;5;2016;16200865;Omzet week 20;Omzet week 20;80555;;16200865;-12894,5;Excl;N;EUR;1;B;0;01062016;01062016;21;-2707,85;20;Omzet;B;;;;;;;;21; -2;25052016;865;V;71;5;2016;16200865;Omzet week 20;Omzet week 20;80555;;16200865;-7,5;Excl;N;EUR;1;B;0;01062016;01062016;6;-0,45;20;Omzet;B;;;;;;;;6; -3;25052016;865;V;71;5;2016;16200865;Omzet week 20;Commissie week 20;80555;;16200865;1290,2;Excl;N;EUR;1;B;0;01062016;01062016;21;270,94;20;Omzet;B;;;;;;;;;0,1 -1;25052016;867;V;71;5;2016;16200867;Omzet week 20;Omzet week 20;80555;;16200867;-921,53;Excl;N;EUR;1;B;0;01062016;01062016;21;-193,52;20;Omzet;B;;;;;;;;21; -2;25052016;867;V;71;5;2016;16200867;Omzet week 20;Commissie week 20;80555;;16200867;92,15;Excl;N;EUR;1;B;0;01062016;01062016;21;19,35;20;Omzet;B;;;;;;;;;0,1 -1;25052016;869;V;71;5;2016;16200869;Omzet week 20;Omzet week 20;80555;;16200869;-876,45;Excl;N;EUR;1;B;0;01062016;01062016;21;-184,05;20;Omzet;B;;;;;;;;21; -2;25052016;869;V;71;5;2016;16200869;Omzet week 20;Commissie week 20;80555;;16200869;87,64;Excl;N;EUR;1;B;0;01062016;01062016;21;18,41;20;Omzet;B;;;;;;;;;0,1 -1;25052016;870;V;71;5;2016;16200870;Omzet week 20;Omzet week 20;80555;;16200870;-192,55;Excl;N;EUR;1;B;0;01062016;01062016;6;-11,55;20;Omzet;B;;;;;;;;6; -2;25052016;870;V;71;5;2016;16200870;Omzet week 20;Omzet week 20;80555;;16200870;-67,48;Excl;N;EUR;1;B;0;01062016;01062016;21;-14,17;20;Omzet;B;;;;;;;;21; -3;25052016;870;V;71;5;2016;16200870;Omzet week 20;Commissie week 20;80555;;16200870;26;Excl;N;EUR;1;B;0;01062016;01062016;21;5,46;20;Omzet;B;;;;;;;;;0,1 -1;25052016;872;V;71;5;2016;16200872;Omzet week 20;Omzet week 20;80555;;16200872;-719,42;Excl;N;EUR;1;B;0;01062016;01062016;21;-151,08;20;Omzet;B;;;;;;;;21; -2;25052016;872;V;71;5;2016;16200872;Omzet week 20;Commissie week 20;80555;;16200872;71,94;Excl;N;EUR;1;B;0;01062016;01062016;21;15,11;20;Omzet;B;;;;;;;;;0,1 -1;25052016;873;V;71;5;2016;16200873;Omzet week 20;Omzet week 20;80555;;16200873;-950,25;Excl;N;EUR;1;B;0;01062016;01062016;21;-199,55;20;Omzet;B;;;;;;;;21; -2;25052016;873;V;71;5;2016;16200873;Omzet week 20;Commissie week 20;80555;;16200873;95,02;Excl;N;EUR;1;B;0;01062016;01062016;21;19,96;20;Omzet;B;;;;;;;;;0,1 -1;25052016;874;V;71;5;2016;16200874;Omzet week 20;Omzet week 20;80555;;16200874;-767,48;Excl;N;EUR;1;B;0;01062016;01062016;21;-161,17;20;Omzet;B;;;;;;;;21; -2;25052016;874;V;71;5;2016;16200874;Omzet week 20;Commissie week 20;80555;;16200874;76,75;Excl;N;EUR;1;B;0;01062016;01062016;21;16,12;20;Omzet;B;;;;;;;;;0,1 -1;25052016;875;V;71;5;2016;16200875;Omzet week 20;Omzet week 20;80555;;16200875;-776,03;Excl;N;EUR;1;B;0;01062016;01062016;21;-162,97;20;Omzet;B;;;;;;;;21; -2;25052016;875;V;71;5;2016;16200875;Omzet week 20;Commissie week 20;80555;;16200875;77,6;Excl;N;EUR;1;B;0;01062016;01062016;21;16,3;20;Omzet;B;;;;;;;;;0,1 -1;25052016;876;V;71;5;2016;16200876;Omzet week 20;Omzet week 20;80555;;16200876;-2679,34;Excl;N;EUR;1;B;0;01062016;01062016;21;-562,66;20;Omzet;B;;;;;;;;21; -2;25052016;876;V;71;5;2016;16200876;Omzet week 20;Commissie week 20;80555;;16200876;267,93;Excl;N;EUR;1;B;0;01062016;01062016;21;56,27;20;Omzet;B;;;;;;;;;0,1 -1;25052016;878;V;71;5;2016;16200878;Omzet week 20;Omzet week 20;80555;;16200878;-1005,66;Excl;N;EUR;1;B;0;01062016;01062016;21;-211,19;20;Omzet;B;;;;;;;;21; -2;25052016;878;V;71;5;2016;16200878;Omzet week 20;Commissie week 20;80555;;16200878;100,57;Excl;N;EUR;1;B;0;01062016;01062016;21;21,12;20;Omzet;B;;;;;;;;;0,1 -1;25052016;879;V;71;5;2016;16200879;Omzet week 20;Omzet week 20;80555;;16200879;-691,82;Excl;N;EUR;1;B;0;01062016;01062016;21;-145,28;20;Omzet;B;;;;;;;;21; -2;25052016;879;V;71;5;2016;16200879;Omzet week 20;Commissie week 20;80555;;16200879;69,18;Excl;N;EUR;1;B;0;01062016;01062016;21;14,53;20;Omzet;B;;;;;;;;;0,1 -1;25052016;883;V;71;5;2016;16200883;Omzet week 20;Omzet week 20;80555;;16200883;-1403,31;Excl;N;EUR;1;B;0;01062016;01062016;21;-294,69;20;Omzet;B;;;;;;;;21; -2;25052016;883;V;71;5;2016;16200883;Omzet week 20;Commissie week 20;80555;;16200883;140,33;Excl;N;EUR;1;B;0;01062016;01062016;21;29,47;20;Omzet;B;;;;;;;;;0,1 -1;25052016;884;V;71;5;2016;16200884;Omzet week 20;Omzet week 20;80555;;16200884;-1586,36;Excl;N;EUR;1;B;0;01062016;01062016;21;-333,14;20;Omzet;B;;;;;;;;21; -2;25052016;884;V;71;5;2016;16200884;Omzet week 20;Commissie week 20;80555;;16200884;158,64;Excl;N;EUR;1;B;0;01062016;01062016;21;33,31;20;Omzet;B;;;;;;;;;0,1 -1;25052016;892;V;71;5;2016;16200892;Omzet week 20;Omzet week 20;80555;;16200892;-2222,36;Excl;N;EUR;1;B;0;01062016;01062016;21;-466,7;20;Omzet;B;;;;;;;;21; -2;25052016;892;V;71;5;2016;16200892;Omzet week 20;Omzet week 20;80555;;16200892;-1381,42;Excl;N;EUR;1;B;0;01062016;01062016;6;-82,88;20;Omzet;B;;;;;;;;6; -3;25052016;892;V;71;5;2016;16200892;Omzet week 20;Commissie week 20;80555;;16200892;360,38;Excl;N;EUR;1;B;0;01062016;01062016;21;75,68;20;Omzet;B;;;;;;;;;0,1 -1;25052016;895;V;71;5;2016;16200895;Omzet week 20;Omzet week 20;80555;;16200895;-926,2;Excl;N;EUR;1;B;0;01062016;01062016;21;-194,5;20;Omzet;B;;;;;;;;21; -2;25052016;895;V;71;5;2016;16200895;Omzet week 20;Commissie week 20;80555;;16200895;92,62;Excl;N;EUR;1;B;0;01062016;01062016;21;19,45;20;Omzet;B;;;;;;;;;0,1 -1;25052016;897;V;71;5;2016;16200897;Omzet week 20;Omzet week 20;80555;;16200897;-723,35;Excl;N;EUR;1;B;0;01062016;01062016;21;-151,9;20;Omzet;B;;;;;;;;21; -2;25052016;897;V;71;5;2016;16200897;Omzet week 20;Commissie week 20;80555;;16200897;72,33;Excl;N;EUR;1;B;0;01062016;01062016;21;15,19;20;Omzet;B;;;;;;;;;0,1 -1;25052016;904;V;71;5;2016;16200904;Omzet week 20;Omzet week 20;80555;;16200904;-1670,04;Excl;N;EUR;1;B;0;01062016;01062016;21;-350,71;20;Omzet;B;;;;;;;;21; -2;25052016;904;V;71;5;2016;16200904;Omzet week 20;Commissie week 20;80555;;16200904;167;Excl;N;EUR;1;B;0;01062016;01062016;21;35,07;20;Omzet;B;;;;;;;;;0,1 -1;25052016;905;V;71;5;2016;16200905;Omzet week 20;Omzet week 20;80555;;16200905;-92,36;Excl;N;EUR;1;B;0;01062016;01062016;21;-19,39;20;Omzet;B;;;;;;;;21; -2;25052016;905;V;71;5;2016;16200905;Omzet week 20;Commissie week 20;80555;;16200905;9,24;Excl;N;EUR;1;B;0;01062016;01062016;21;1,94;20;Omzet;B;;;;;;;;;0,1 -1;25052016;906;V;71;5;2016;16200906;Omzet week 20;Omzet week 20;80555;;16200906;-180,54;Excl;N;EUR;1;B;0;01062016;01062016;21;-37,91;20;Omzet;B;;;;;;;;21; -2;25052016;906;V;71;5;2016;16200906;Omzet week 20;Commissie week 20;80555;;16200906;18,05;Excl;N;EUR;1;B;0;01062016;01062016;21;3,79;20;Omzet;B;;;;;;;;;0,1 -1;25052016;908;V;71;5;2016;16200908;Omzet week 20;Omzet week 20;80555;;16200908;-512,15;Excl;N;EUR;1;B;0;01062016;01062016;21;-107,55;20;Omzet;B;;;;;;;;21; -2;25052016;908;V;71;5;2016;16200908;Omzet week 20;Commissie week 20;80555;;16200908;51,21;Excl;N;EUR;1;B;0;01062016;01062016;21;10,76;20;Omzet;B;;;;;;;;;0,1 -1;25052016;912;V;71;5;2016;16200912;Omzet week 20;Omzet week 20;80555;;16200912;-531,9;Excl;N;EUR;1;B;0;01062016;01062016;21;-111,7;20;Omzet;B;;;;;;;;21; -2;25052016;912;V;71;5;2016;16200912;Omzet week 20;Commissie week 20;80555;;16200912;53,19;Excl;N;EUR;1;B;0;01062016;01062016;21;11,17;20;Omzet;B;;;;;;;;;0,1 -1;25052016;913;V;71;5;2016;16200913;Omzet week 20;Omzet week 20;80555;;16200913;-329,17;Excl;N;EUR;1;B;0;01062016;01062016;21;-69,13;20;Omzet;B;;;;;;;;21; -2;25052016;913;V;71;5;2016;16200913;Omzet week 20;Omzet week 20;80555;;16200913;-13,11;Excl;N;EUR;1;B;0;01062016;01062016;6;-0,79;20;Omzet;B;;;;;;;;6; -3;25052016;913;V;71;5;2016;16200913;Omzet week 20;Commissie week 20;80555;;16200913;34,23;Excl;N;EUR;1;B;0;01062016;01062016;21;7,19;20;Omzet;B;;;;;;;;;0,1 -1;25052016;917;V;71;5;2016;16200917;Omzet week 20;Omzet week 20;80555;;16200917;-49,5;Excl;N;EUR;1;B;0;01062016;01062016;21;-10,4;20;Omzet;B;;;;;;;;21; -2;25052016;917;V;71;5;2016;16200917;Omzet week 20;Commissie week 20;80555;;16200917;4,95;Excl;N;EUR;1;B;0;01062016;01062016;21;1,04;20;Omzet;B;;;;;;;;;0,1 -1;25052016;918;V;71;5;2016;16200918;Omzet week 20;Omzet week 20;80555;;16200918;-112,56;Excl;N;EUR;1;B;0;01062016;01062016;21;-23,64;20;Omzet;B;;;;;;;;21; -2;25052016;918;V;71;5;2016;16200918;Omzet week 20;Omzet week 20;80555;;16200918;-27,26;Excl;N;EUR;1;B;0;01062016;01062016;6;-1,64;20;Omzet;B;;;;;;;;6; -3;25052016;918;V;71;5;2016;16200918;Omzet week 20;Commissie week 20;80555;;16200918;13,99;Excl;N;EUR;1;B;0;01062016;01062016;21;2,93;20;Omzet;B;;;;;;;;;0,1 -1;25052016;920;V;71;5;2016;16200920;Omzet week 20;Omzet week 20;80555;;16200920;-9388,55;Excl;N;EUR;1;B;0;01062016;01062016;21;-1971,6;20;Omzet;B;;;;;;;;21; -2;25052016;920;V;71;5;2016;16200920;Omzet week 20;Commissie week 20;80555;;16200920;938,86;Excl;N;EUR;1;B;0;01062016;01062016;21;197,16;20;Omzet;B;;;;;;;;;0,1 -1;25052016;930;V;71;5;2016;16200930;Omzet week 20;Omzet week 20;80555;;16200930;-67,44;Excl;N;EUR;1;B;0;01062016;01062016;21;-14,16;20;Omzet;B;;;;;;;;21; -2;25052016;930;V;71;5;2016;16200930;Omzet week 20;Commissie week 20;80555;;16200930;6,74;Excl;N;EUR;1;B;0;01062016;01062016;21;1,42;20;Omzet;B;;;;;;;;;0,1 -1;25052016;932;V;71;5;2016;16200932;Omzet week 20;Omzet week 20;80555;;16200932;-434,01;Excl;N;EUR;1;B;0;01062016;01062016;21;-91,14;20;Omzet;B;;;;;;;;21; -2;25052016;932;V;71;5;2016;16200932;Omzet week 20;Omzet week 20;80555;;16200932;-7,45;Excl;N;EUR;1;B;0;01062016;01062016;6;-0,45;20;Omzet;B;;;;;;;;6; -3;25052016;932;V;71;5;2016;16200932;Omzet week 20;Commissie week 20;80555;;16200932;44,15;Excl;N;EUR;1;B;0;01062016;01062016;21;9,27;20;Omzet;B;;;;;;;;;0,1 -1;25052016;934;V;71;5;2016;16200934;Omzet week 20;Omzet week 20;80555;;16200934;-1052,44;Excl;N;EUR;1;B;0;01062016;01062016;21;-221,01;20;Omzet;B;;;;;;;;21; -2;25052016;934;V;71;5;2016;16200934;Omzet week 20;Commissie week 20;80555;;16200934;105,24;Excl;N;EUR;1;B;0;01062016;01062016;21;22,1;20;Omzet;B;;;;;;;;;0,1 -1;25052016;936;V;71;5;2016;16200936;Omzet week 20;Omzet week 20;80555;;16200936;-1554,88;Excl;N;EUR;1;B;0;01062016;01062016;21;-326,52;20;Omzet;B;;;;;;;;21; -2;25052016;936;V;71;5;2016;16200936;Omzet week 20;Commissie week 20;80555;;16200936;155,49;Excl;N;EUR;1;B;0;01062016;01062016;21;32,65;20;Omzet;B;;;;;;;;;0,1 -1;25052016;943;V;71;5;2016;16200943;Omzet week 20;Omzet week 20;80555;;16200943;-560,21;Excl;N;EUR;1;B;0;01062016;01062016;21;-117,64;20;Omzet;B;;;;;;;;21; -2;25052016;943;V;71;5;2016;16200943;Omzet week 20;Commissie week 20;80555;;16200943;56,02;Excl;N;EUR;1;B;0;01062016;01062016;21;11,76;20;Omzet;B;;;;;;;;;0,1 -1;25052016;946;V;71;5;2016;16200946;Omzet week 20;Omzet week 20;80555;;16200946;-317,48;Excl;N;EUR;1;B;0;01062016;01062016;21;-66,67;20;Omzet;B;;;;;;;;21; -2;25052016;946;V;71;5;2016;16200946;Omzet week 20;Omzet week 20;80555;;16200946;-25,94;Excl;N;EUR;1;B;0;01062016;01062016;6;-1,56;20;Omzet;B;;;;;;;;6; -3;25052016;946;V;71;5;2016;16200946;Omzet week 20;Commissie week 20;80555;;16200946;34,34;Excl;N;EUR;1;B;0;01062016;01062016;21;7,21;20;Omzet;B;;;;;;;;;0,1 diff --git a/fmuta/src/test/resources/FMUTAFeed-out.csv b/fmuta/src/test/resources/FMUTAFeed-out.csv deleted file mode 100644 index a7f4fded..00000000 --- a/fmuta/src/test/resources/FMUTAFeed-out.csv +++ /dev/null @@ -1,433 +0,0 @@ -0;V;71;5;2016;16200100;Omzet week 20;25052016;;100;;;-482.74;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;100;;16200100;-218.60;N;EUR;1;B;0;;;21;-45.90;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;100;;16200100;-220.94;N;EUR;1;B;0;;;6;-13.26;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;100;;16200100;13.19;N;EUR;1;B;0;;;21;2.77;20;;;;;;;;; -0;V;71;5;2016;16200113;Omzet week 20;25052016;;113;;;-1522.80;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;113;;16200113;-1364.71;N;EUR;1;B;0;;;21;-286.59;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;113;;16200113;-39.01;N;EUR;1;B;0;;;6;-2.34;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;113;;16200113;140.37;N;EUR;1;B;0;;;21;29.48;20;;;;;;;;; -0;V;71;5;2016;16200128;Omzet week 20;25052016;;128;;;-1355.40;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;128;;16200128;-1244.63;N;EUR;1;B;0;;;21;-261.37;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;128;;16200128;124.46;N;EUR;1;B;0;;;21;26.14;20;;;;;;;;; -0;V;71;5;2016;16200141;Omzet week 20;25052016;;141;;;-12029.62;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;141;;16200141;-11046.49;N;EUR;1;B;0;;;21;-2319.76;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;141;;16200141;1104.65;N;EUR;1;B;0;;;21;231.98;20;;;;;;;;; -0;V;71;5;2016;16200142;Omzet week 20;25052016;;142;;;-1620.99;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;142;;16200142;-1488.51;N;EUR;1;B;0;;;21;-312.59;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;142;;16200142;148.85;N;EUR;1;B;0;;;21;31.26;20;;;;;;;;; -0;V;71;5;2016;16200143;Omzet week 20;25052016;;143;;;-322.11;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;143;;16200143;-295.79;N;EUR;1;B;0;;;21;-62.11;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;143;;16200143;29.58;N;EUR;1;B;0;;;21;6.21;20;;;;;;;;; -0;V;71;5;2016;16200161;Omzet week 20;25052016;;161;;;-382.45;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;161;;16200161;-351.20;N;EUR;1;B;0;;;21;-73.75;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;161;;16200161;35.12;N;EUR;1;B;0;;;21;7.38;20;;;;;;;;; -0;V;71;5;2016;16200175;Omzet week 20;25052016;;175;;;-3758.40;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;175;;16200175;-3451.24;N;EUR;1;B;0;;;21;-724.76;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;175;;16200175;345.12;N;EUR;1;B;0;;;21;72.48;20;;;;;;;;; -0;V;71;5;2016;16200193;Omzet week 20;25052016;;193;;;-16381.08;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;193;;16200193;-15042.31;N;EUR;1;B;0;;;21;-3158.89;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;193;;16200193;1504.23;N;EUR;1;B;0;;;21;315.89;20;;;;;;;;; -0;V;71;5;2016;16200201;Omzet week 20;25052016;;201;;;-3843.00;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;201;;16200201;-3528.93;N;EUR;1;B;0;;;21;-741.07;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;201;;16200201;352.89;N;EUR;1;B;0;;;21;74.11;20;;;;;;;;; -0;V;71;5;2016;16200211;Omzet week 20;25052016;;211;;;-4077.63;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;211;;16200211;-3744.38;N;EUR;1;B;0;;;21;-786.32;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;211;;16200211;374.44;N;EUR;1;B;0;;;21;78.63;20;;;;;;;;; -0;V;71;5;2016;16200218;Omzet week 20;25052016;;218;;;-1086.33;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;218;;16200218;-1180.79;N;EUR;1;B;0;;;0;0.00;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;218;;16200218;94.46;N;EUR;1;B;0;;;0;0.00;20;;;;;;;;; -0;V;71;5;2016;16200226;Omzet week 20;25052016;;226;;;-6028.74;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;226;;16200226;-5536.03;N;EUR;1;B;0;;;21;-1162.57;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;226;;16200226;553.60;N;EUR;1;B;0;;;21;116.26;20;;;;;;;;; -0;V;71;5;2016;16200244;Omzet week 20;25052016;;244;;;-977.80;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;244;;16200244;-897.89;N;EUR;1;B;0;;;21;-188.56;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;244;;16200244;89.79;N;EUR;1;B;0;;;21;18.86;20;;;;;;;;; -0;V;71;5;2016;16200256;Omzet week 20;25052016;;256;;;-2005.60;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;256;;16200256;-1841.69;N;EUR;1;B;0;;;21;-386.76;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;256;;16200256;184.17;N;EUR;1;B;0;;;21;38.68;20;;;;;;;;; -0;V;71;5;2016;16200257;Omzet week 20;25052016;;257;;;-6348.28;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;257;;16200257;-5829.46;N;EUR;1;B;0;;;21;-1224.19;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;257;;16200257;582.95;N;EUR;1;B;0;;;21;122.42;20;;;;;;;;; -0;V;71;5;2016;16200262;Omzet week 20;25052016;;262;;;-5858.37;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;262;;16200262;-5379.59;N;EUR;1;B;0;;;21;-1129.71;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;262;;16200262;537.96;N;EUR;1;B;0;;;21;112.97;20;;;;;;;;; -0;V;71;5;2016;16200269;Omzet week 20;25052016;;269;;;-1549.48;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;269;;16200269;-1422.85;N;EUR;1;B;0;;;21;-298.80;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;269;;16200269;142.29;N;EUR;1;B;0;;;21;29.88;20;;;;;;;;; -0;V;71;5;2016;16200276;Omzet week 20;25052016;;276;;;-181.20;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;276;;16200276;-177.69;N;EUR;1;B;0;;;6;-10.66;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;276;;16200276;-13.18;N;EUR;1;B;0;;;21;-2.77;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;276;;16200276;19.09;N;EUR;1;B;0;;;21;4.01;20;;;;;;;;; -0;V;71;5;2016;16200280;Omzet week 20;25052016;;280;;;-4458.38;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;280;;16200280;-4094.01;N;EUR;1;B;0;;;21;-859.74;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;280;;16200280;409.40;N;EUR;1;B;0;;;21;85.97;20;;;;;;;;; -0;V;71;5;2016;16200285;Omzet week 20;25052016;;285;;;-6085.84;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;285;;16200285;-5588.47;N;EUR;1;B;0;;;21;-1173.58;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;285;;16200285;558.85;N;EUR;1;B;0;;;21;117.36;20;;;;;;;;; -0;V;71;5;2016;16200286;Omzet week 20;25052016;;286;;;-5787.72;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;286;;16200286;-5314.71;N;EUR;1;B;0;;;21;-1116.09;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;286;;16200286;531.47;N;EUR;1;B;0;;;21;111.61;20;;;;;;;;; -0;V;71;5;2016;16200293;Omzet week 20;25052016;;293;;;-41517.08;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;293;;16200293;-38085.08;N;EUR;1;B;0;;;21;-7997.87;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;293;;16200293;-45.19;N;EUR;1;B;0;;;6;-2.71;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;293;;16200293;3813.03;N;EUR;1;B;0;;;21;800.74;20;;;;;;;;; -0;V;71;5;2016;16200296;Omzet week 20;25052016;;296;;;-2130.07;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;296;;16200296;-1955.99;N;EUR;1;B;0;;;21;-410.76;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;296;;16200296;195.60;N;EUR;1;B;0;;;21;41.08;20;;;;;;;;; -0;V;71;5;2016;16200297;Omzet week 20;25052016;;297;;;-1885.50;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;297;;16200297;-1731.40;N;EUR;1;B;0;;;21;-363.60;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;297;;16200297;173.14;N;EUR;1;B;0;;;21;36.36;20;;;;;;;;; -0;V;71;5;2016;16200300;Omzet week 20;25052016;;300;;;-18790.20;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;300;;16200300;-17254.55;N;EUR;1;B;0;;;21;-3623.45;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;300;;16200300;1725.45;N;EUR;1;B;0;;;21;362.35;20;;;;;;;;; -0;V;71;5;2016;16200305;Omzet week 20;25052016;;305;;;-1939.50;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;305;;16200305;-1780.99;N;EUR;1;B;0;;;21;-374.01;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;305;;16200305;178.10;N;EUR;1;B;0;;;21;37.40;20;;;;;;;;; -0;V;71;5;2016;16200306;Omzet week 20;25052016;;306;;;-3080.67;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;306;;16200306;-2773.60;N;EUR;1;B;0;;;21;-582.45;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;306;;16200306;-64.15;N;EUR;1;B;0;;;6;-3.85;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;306;;16200306;283.78;N;EUR;1;B;0;;;21;59.60;20;;;;;;;;; -0;V;71;5;2016;16200326;Omzet week 20;25052016;;326;;;-1072.26;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;326;;16200326;-984.63;N;EUR;1;B;0;;;21;-206.77;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;326;;16200326;98.46;N;EUR;1;B;0;;;21;20.68;20;;;;;;;;; -0;V;71;5;2016;16200328;Omzet week 20;25052016;;328;;;-21573.26;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;328;;16200328;-22974.72;N;EUR;1;B;0;;;6;-1378.48;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;328;;16200328;2297.47;N;EUR;1;B;0;;;21;482.47;20;;;;;;;;; -0;V;71;5;2016;16200344;Omzet week 20;25052016;;344;;;-181.71;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;344;;16200344;-166.86;N;EUR;1;B;0;;;21;-35.04;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;344;;16200344;16.69;N;EUR;1;B;0;;;21;3.50;20;;;;;;;;; -0;V;71;5;2016;16200361;Omzet week 20;25052016;;361;;;-3115.31;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;361;;16200361;-2860.70;N;EUR;1;B;0;;;21;-600.75;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;361;;16200361;286.07;N;EUR;1;B;0;;;21;60.07;20;;;;;;;;; -0;V;71;5;2016;16200370;Omzet week 20;25052016;;370;;;-6221.84;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;370;;16200370;-5713.35;N;EUR;1;B;0;;;21;-1199.80;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;370;;16200370;571.33;N;EUR;1;B;0;;;21;119.98;20;;;;;;;;; -0;V;71;5;2016;16200374;Omzet week 20;25052016;;374;;;-1191.10;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;374;;16200374;-1093.76;N;EUR;1;B;0;;;21;-229.69;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;374;;16200374;109.38;N;EUR;1;B;0;;;21;22.97;20;;;;;;;;; -0;V;71;5;2016;16200400;Omzet week 20;25052016;;400;;;-125.95;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;400;;16200400;-115.66;N;EUR;1;B;0;;;21;-24.29;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;400;;16200400;11.57;N;EUR;1;B;0;;;21;2.43;20;;;;;;;;; -0;V;71;5;2016;16200411;Omzet week 20;25052016;;411;;;-1006.20;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;411;;16200411;-923.97;N;EUR;1;B;0;;;21;-194.03;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;411;;16200411;92.40;N;EUR;1;B;0;;;21;19.40;20;;;;;;;;; -0;V;71;5;2016;16200412;Omzet week 20;25052016;;412;;;-3503.25;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;412;;16200412;-3216.94;N;EUR;1;B;0;;;21;-675.56;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;412;;16200412;321.69;N;EUR;1;B;0;;;21;67.56;20;;;;;;;;; -0;V;71;5;2016;16200434;Omzet week 20;25052016;;434;;;-1336.95;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;434;;16200434;-1227.69;N;EUR;1;B;0;;;21;-257.81;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;434;;16200434;122.77;N;EUR;1;B;0;;;21;25.78;20;;;;;;;;; -0;V;71;5;2016;16200439;Omzet week 20;25052016;;439;;;-10189.71;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;439;;16200439;-9356.94;N;EUR;1;B;0;;;21;-1964.96;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;439;;16200439;935.69;N;EUR;1;B;0;;;21;196.50;20;;;;;;;;; -0;V;71;5;2016;16200442;Omzet week 20;25052016;;442;;;-4119.08;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;442;;16200442;-3782.44;N;EUR;1;B;0;;;21;-794.31;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;442;;16200442;378.24;N;EUR;1;B;0;;;21;79.43;20;;;;;;;;; -0;V;71;5;2016;16200443;Omzet week 20;25052016;;443;;;-26705.79;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;443;;16200443;-24523.22;N;EUR;1;B;0;;;21;-5149.88;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;443;;16200443;2452.32;N;EUR;1;B;0;;;21;514.99;20;;;;;;;;; -0;V;71;5;2016;16200444;Omzet week 20;25052016;;444;;;-427.68;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;444;;16200444;-392.73;N;EUR;1;B;0;;;21;-82.47;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;444;;16200444;39.27;N;EUR;1;B;0;;;21;8.25;20;;;;;;;;; -0;V;71;5;2016;16200448;Omzet week 20;25052016;;448;;;-3377.74;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;448;;16200448;-3101.69;N;EUR;1;B;0;;;21;-651.36;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;448;;16200448;310.17;N;EUR;1;B;0;;;21;65.14;20;;;;;;;;; -0;V;71;5;2016;16200453;Omzet week 20;25052016;;453;;;-3649.45;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;453;;16200453;-3351.20;N;EUR;1;B;0;;;21;-703.75;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;453;;16200453;335.12;N;EUR;1;B;0;;;21;70.38;20;;;;;;;;; -0;V;71;5;2016;16200466;Omzet week 20;25052016;;466;;;-3467.93;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;466;;16200466;-2421.45;N;EUR;1;B;0;;;21;-508.50;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;466;;16200466;-884.94;N;EUR;1;B;0;;;6;-53.10;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;466;;16200466;330.63;N;EUR;1;B;0;;;21;69.43;20;;;;;;;;; -0;V;71;5;2016;16200505;Omzet week 20;25052016;;505;;;-2129.99;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;505;;16200505;-1955.91;N;EUR;1;B;0;;;21;-410.74;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;505;;16200505;195.59;N;EUR;1;B;0;;;21;41.07;20;;;;;;;;; -0;V;71;5;2016;16200530;Omzet week 20;25052016;;530;;;-860.94;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;530;;16200530;-790.58;N;EUR;1;B;0;;;21;-166.02;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;530;;16200530;79.06;N;EUR;1;B;0;;;21;16.60;20;;;;;;;;; -0;V;71;5;2016;16200543;Omzet week 20;25052016;;543;;;-1438.11;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;543;;16200543;-1320.58;N;EUR;1;B;0;;;21;-277.32;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;543;;16200543;132.06;N;EUR;1;B;0;;;21;27.73;20;;;;;;;;; -0;V;71;5;2016;16200569;Omzet week 20;25052016;;569;;;-979.83;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;569;;16200569;-899.75;N;EUR;1;B;0;;;21;-188.95;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;569;;16200569;89.98;N;EUR;1;B;0;;;21;18.89;20;;;;;;;;; -0;V;71;5;2016;16200575;Omzet week 20;25052016;;575;;;-4751.05;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;575;;16200575;-4362.77;N;EUR;1;B;0;;;21;-916.18;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;575;;16200575;436.28;N;EUR;1;B;0;;;21;91.62;20;;;;;;;;; -0;V;71;5;2016;16200594;Omzet week 20;25052016;;594;;;-1852.24;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;594;;16200594;-1700.87;N;EUR;1;B;0;;;21;-357.18;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;594;;16200594;170.09;N;EUR;1;B;0;;;21;35.72;20;;;;;;;;; -0;V;71;5;2016;16200596;Omzet week 20;25052016;;596;;;-10881.27;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;596;;16200596;-9991.98;N;EUR;1;B;0;;;21;-2098.32;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;596;;16200596;999.20;N;EUR;1;B;0;;;21;209.83;20;;;;;;;;; -0;V;71;5;2016;16200600;Omzet week 20;25052016;;600;;;-6.75;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;600;;16200600;-6.20;N;EUR;1;B;0;;;21;-1.30;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;600;;16200600;0.62;N;EUR;1;B;0;;;21;0.13;20;;;;;;;;; -0;V;71;5;2016;16200605;Omzet week 20;25052016;;605;;;-1517.90;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;605;;16200605;-1393.84;N;EUR;1;B;0;;;21;-292.71;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;605;;16200605;139.38;N;EUR;1;B;0;;;21;29.27;20;;;;;;;;; -0;V;71;5;2016;16200637;Omzet week 20;25052016;;637;;;-1835.24;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;637;;16200637;-1685.25;N;EUR;1;B;0;;;21;-353.90;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;637;;16200637;168.52;N;EUR;1;B;0;;;21;35.39;20;;;;;;;;; -0;V;71;5;2016;16200638;Omzet week 20;25052016;;638;;;-4641.48;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;638;;16200638;-4262.15;N;EUR;1;B;0;;;21;-895.05;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;638;;16200638;426.21;N;EUR;1;B;0;;;21;89.51;20;;;;;;;;; -0;V;71;5;2016;16200645;Omzet week 20;25052016;;645;;;-2137.50;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;645;;16200645;-1962.81;N;EUR;1;B;0;;;21;-412.19;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;645;;16200645;196.28;N;EUR;1;B;0;;;21;41.22;20;;;;;;;;; -0;V;71;5;2016;16200647;Omzet week 20;25052016;;647;;;-2355.66;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;647;;16200647;-2163.14;N;EUR;1;B;0;;;21;-454.26;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;647;;16200647;216.31;N;EUR;1;B;0;;;21;45.43;20;;;;;;;;; -0;V;71;5;2016;16200651;Omzet week 20;25052016;;651;;;-1501.65;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;651;;16200651;-1378.93;N;EUR;1;B;0;;;21;-289.57;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;651;;16200651;137.89;N;EUR;1;B;0;;;21;28.96;20;;;;;;;;; -0;V;71;5;2016;16200653;Omzet week 20;25052016;;653;;;-5203.17;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;653;;16200653;-4777.93;N;EUR;1;B;0;;;21;-1003.37;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;653;;16200653;477.79;N;EUR;1;B;0;;;21;100.34;20;;;;;;;;; -0;V;71;5;2016;16200671;Omzet week 20;25052016;;671;;;-134.10;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;671;;16200671;-123.14;N;EUR;1;B;0;;;21;-25.86;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;671;;16200671;12.31;N;EUR;1;B;0;;;21;2.59;20;;;;;;;;; -0;V;71;5;2016;16200672;Omzet week 20;25052016;;672;;;-687.33;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;672;;16200672;-631.16;N;EUR;1;B;0;;;21;-132.54;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;672;;16200672;63.12;N;EUR;1;B;0;;;21;13.25;20;;;;;;;;; -0;V;71;5;2016;16200687;Omzet week 20;25052016;;687;;;-1973.97;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;687;;16200687;-1812.64;N;EUR;1;B;0;;;21;-380.66;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;687;;16200687;181.26;N;EUR;1;B;0;;;21;38.07;20;;;;;;;;; -0;V;71;5;2016;16200693;Omzet week 20;25052016;;693;;;-4155.25;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;693;;16200693;-3815.66;N;EUR;1;B;0;;;21;-801.29;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;693;;16200693;381.57;N;EUR;1;B;0;;;21;80.13;20;;;;;;;;; -0;V;71;5;2016;16200700;Omzet week 20;25052016;;700;;;-5602.50;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;700;;16200700;-5144.63;N;EUR;1;B;0;;;21;-1080.37;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;700;;16200700;514.46;N;EUR;1;B;0;;;21;108.04;20;;;;;;;;; -0;V;71;5;2016;16200708;Omzet week 20;25052016;;708;;;-632.75;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;708;;16200708;-581.03;N;EUR;1;B;0;;;21;-122.02;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;708;;16200708;58.10;N;EUR;1;B;0;;;21;12.20;20;;;;;;;;; -0;V;71;5;2016;16200709;Omzet week 20;25052016;;709;;;-1073.97;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;709;;16200709;-986.20;N;EUR;1;B;0;;;21;-207.10;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;709;;16200709;98.62;N;EUR;1;B;0;;;21;20.71;20;;;;;;;;; -0;V;71;5;2016;16200710;Omzet week 20;25052016;;710;;;-1229.40;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;710;;16200710;-1128.93;N;EUR;1;B;0;;;21;-237.07;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;710;;16200710;112.89;N;EUR;1;B;0;;;21;23.71;20;;;;;;;;; -0;V;71;5;2016;16200716;Omzet week 20;25052016;;716;;;-911.34;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;716;;16200716;-836.86;N;EUR;1;B;0;;;21;-175.74;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;716;;16200716;83.69;N;EUR;1;B;0;;;21;17.57;20;;;;;;;;; -0;V;71;5;2016;16200727;Omzet week 20;25052016;;727;;;-2138.40;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;727;;16200727;-1963.64;N;EUR;1;B;0;;;21;-412.36;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;727;;16200727;196.36;N;EUR;1;B;0;;;21;41.24;20;;;;;;;;; -0;V;71;5;2016;16200734;Omzet week 20;25052016;;734;;;-3289.23;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;734;;16200734;-3020.41;N;EUR;1;B;0;;;21;-634.29;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;734;;16200734;302.04;N;EUR;1;B;0;;;21;63.43;20;;;;;;;;; -0;V;71;5;2016;16200736;Omzet week 20;25052016;;736;;;-1098.09;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;736;;16200736;-1008.35;N;EUR;1;B;0;;;21;-211.75;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;736;;16200736;100.83;N;EUR;1;B;0;;;21;21.18;20;;;;;;;;; -0;V;71;5;2016;16200738;Omzet week 20;25052016;;738;;;-3952.15;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;738;;16200738;-3612.89;N;EUR;1;B;0;;;21;-758.71;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;738;;16200738;-18.87;N;EUR;1;B;0;;;6;-1.13;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;738;;16200738;363.18;N;EUR;1;B;0;;;21;76.27;20;;;;;;;;; -0;V;71;5;2016;16200742;Omzet week 20;25052016;;742;;;-291.65;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;742;;16200742;-267.81;N;EUR;1;B;0;;;21;-56.24;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;742;;16200742;26.78;N;EUR;1;B;0;;;21;5.62;20;;;;;;;;; -0;V;71;5;2016;16200758;Omzet week 20;25052016;;758;;;-818.91;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;758;;16200758;-751.98;N;EUR;1;B;0;;;21;-157.92;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;758;;16200758;75.20;N;EUR;1;B;0;;;21;15.79;20;;;;;;;;; -0;V;71;5;2016;16200760;Omzet week 20;25052016;;760;;;-1750.23;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;760;;16200760;-1607.19;N;EUR;1;B;0;;;21;-337.51;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;760;;16200760;160.72;N;EUR;1;B;0;;;21;33.75;20;;;;;;;;; -0;V;71;5;2016;16200762;Omzet week 20;25052016;;762;;;-191.52;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;762;;16200762;-175.87;N;EUR;1;B;0;;;21;-36.93;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;762;;16200762;17.59;N;EUR;1;B;0;;;21;3.69;20;;;;;;;;; -0;V;71;5;2016;16200764;Omzet week 20;25052016;;764;;;-21415.23;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;764;;16200764;-19665.04;N;EUR;1;B;0;;;21;-4129.66;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;764;;16200764;1966.50;N;EUR;1;B;0;;;21;412.97;20;;;;;;;;; -0;V;71;5;2016;16200765;Omzet week 20;25052016;;765;;;-1240.02;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;765;;16200765;-1138.68;N;EUR;1;B;0;;;21;-239.12;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;765;;16200765;113.87;N;EUR;1;B;0;;;21;23.91;20;;;;;;;;; -0;V;71;5;2016;16200767;Omzet week 20;25052016;;767;;;-65.20;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;767;;16200767;-59.88;N;EUR;1;B;0;;;21;-12.57;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;767;;16200767;5.99;N;EUR;1;B;0;;;21;1.26;20;;;;;;;;; -0;V;71;5;2016;16200768;Omzet week 20;25052016;;768;;;-2951.10;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;768;;16200768;-2709.92;N;EUR;1;B;0;;;21;-569.08;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;768;;16200768;270.99;N;EUR;1;B;0;;;21;56.91;20;;;;;;;;; -0;V;71;5;2016;16200769;Omzet week 20;25052016;;769;;;-611.42;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;769;;16200769;-561.45;N;EUR;1;B;0;;;21;-117.90;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;769;;16200769;56.14;N;EUR;1;B;0;;;21;11.79;20;;;;;;;;; -0;V;71;5;2016;16200784;Omzet week 20;25052016;;784;;;-1758.69;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;784;;16200784;-1614.96;N;EUR;1;B;0;;;21;-339.14;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;784;;16200784;161.50;N;EUR;1;B;0;;;21;33.91;20;;;;;;;;; -0;V;71;5;2016;16200789;Omzet week 20;25052016;;789;;;-509.62;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;789;;16200789;-467.98;N;EUR;1;B;0;;;21;-98.27;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;789;;16200789;46.80;N;EUR;1;B;0;;;21;9.83;20;;;;;;;;; -0;V;71;5;2016;16200792;Omzet week 20;25052016;;792;;;-5177.03;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;792;;16200792;-4753.93;N;EUR;1;B;0;;;21;-998.32;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;792;;16200792;475.39;N;EUR;1;B;0;;;21;99.83;20;;;;;;;;; -0;V;71;5;2016;16200797;Omzet week 20;25052016;;797;;;-620.68;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;797;;16200797;-569.96;N;EUR;1;B;0;;;21;-119.69;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;797;;16200797;57.00;N;EUR;1;B;0;;;21;11.97;20;;;;;;;;; -0;V;71;5;2016;16200800;Omzet week 20;25052016;;800;;;-2748.60;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;800;;16200800;-2523.97;N;EUR;1;B;0;;;21;-530.03;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;800;;16200800;252.40;N;EUR;1;B;0;;;21;53.00;20;;;;;;;;; -0;V;71;5;2016;16200809;Omzet week 20;25052016;;809;;;-2024.60;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;809;;16200809;-1859.13;N;EUR;1;B;0;;;21;-390.42;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;809;;16200809;185.91;N;EUR;1;B;0;;;21;39.04;20;;;;;;;;; -0;V;71;5;2016;16200811;Omzet week 20;25052016;;811;;;-158.40;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;811;;16200811;-145.45;N;EUR;1;B;0;;;21;-30.54;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;811;;16200811;14.54;N;EUR;1;B;0;;;21;3.05;20;;;;;;;;; -0;V;71;5;2016;16200812;Omzet week 20;25052016;;812;;;-8956.94;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;812;;16200812;-8224.92;N;EUR;1;B;0;;;21;-1727.23;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;812;;16200812;822.49;N;EUR;1;B;0;;;21;172.72;20;;;;;;;;; -0;V;71;5;2016;16200815;Omzet week 20;25052016;;815;;;-3580.56;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;815;;16200815;-3287.93;N;EUR;1;B;0;;;21;-690.47;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;815;;16200815;328.79;N;EUR;1;B;0;;;21;69.05;20;;;;;;;;; -0;V;71;5;2016;16200818;Omzet week 20;25052016;;818;;;-1063.08;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;818;;16200818;-976.20;N;EUR;1;B;0;;;21;-205.00;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;818;;16200818;97.62;N;EUR;1;B;0;;;21;20.50;20;;;;;;;;; -0;V;71;5;2016;16200819;Omzet week 20;25052016;;819;;;-3047.27;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;819;;16200819;-2798.22;N;EUR;1;B;0;;;21;-587.63;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;819;;16200819;279.82;N;EUR;1;B;0;;;21;58.76;20;;;;;;;;; -0;V;71;5;2016;16200820;Omzet week 20;25052016;;820;;;-1190.75;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;820;;16200820;-1093.43;N;EUR;1;B;0;;;21;-229.62;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;820;;16200820;109.34;N;EUR;1;B;0;;;21;22.96;20;;;;;;;;; -0;V;71;5;2016;16200821;Omzet week 20;25052016;;821;;;-910.97;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;821;;16200821;-709.42;N;EUR;1;B;0;;;21;-148.98;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;821;;16200821;-147.41;N;EUR;1;B;0;;;6;-8.84;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;821;;16200821;85.68;N;EUR;1;B;0;;;21;18.00;20;;;;;;;;; -0;V;71;5;2016;16200823;Omzet week 20;25052016;;823;;;-2339.77;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;823;;16200823;-2148.55;N;EUR;1;B;0;;;21;-451.20;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;823;;16200823;214.86;N;EUR;1;B;0;;;21;45.12;20;;;;;;;;; -0;V;71;5;2016;16200828;Omzet week 20;25052016;;828;;;-538.34;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;828;;16200828;-494.34;N;EUR;1;B;0;;;21;-103.81;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;828;;16200828;49.43;N;EUR;1;B;0;;;21;10.38;20;;;;;;;;; -0;V;71;5;2016;16200831;Omzet week 20;25052016;;831;;;-1168.38;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;831;;16200831;-1072.89;N;EUR;1;B;0;;;21;-225.31;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;831;;16200831;107.29;N;EUR;1;B;0;;;21;22.53;20;;;;;;;;; -0;V;71;5;2016;16200832;Omzet week 20;25052016;;832;;;-3569.08;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;832;;16200832;-3277.40;N;EUR;1;B;0;;;21;-688.25;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;832;;16200832;327.74;N;EUR;1;B;0;;;21;68.83;20;;;;;;;;; -0;V;71;5;2016;16200836;Omzet week 20;25052016;;836;;;-3365.27;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;836;;16200836;-3090.24;N;EUR;1;B;0;;;21;-648.95;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;836;;16200836;309.02;N;EUR;1;B;0;;;21;64.90;20;;;;;;;;; -0;V;71;5;2016;16200841;Omzet week 20;25052016;;841;;;-1400.58;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;841;;16200841;-1286.12;N;EUR;1;B;0;;;21;-270.08;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;841;;16200841;128.61;N;EUR;1;B;0;;;21;27.01;20;;;;;;;;; -0;V;71;5;2016;16200842;Omzet week 20;25052016;;842;;;-1198.04;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;842;;16200842;-1100.12;N;EUR;1;B;0;;;21;-231.03;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;842;;16200842;110.01;N;EUR;1;B;0;;;21;23.10;20;;;;;;;;; -0;V;71;5;2016;16200847;Omzet week 20;25052016;;847;;;-3410.24;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;847;;16200847;-3131.53;N;EUR;1;B;0;;;21;-657.62;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;847;;16200847;313.15;N;EUR;1;B;0;;;21;65.76;20;;;;;;;;; -0;V;71;5;2016;16200852;Omzet week 20;25052016;;852;;;-2208.60;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;852;;16200852;-2028.10;N;EUR;1;B;0;;;21;-425.90;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;852;;16200852;202.81;N;EUR;1;B;0;;;21;42.59;20;;;;;;;;; -0;V;71;5;2016;16200854;Omzet week 20;25052016;;854;;;-583.20;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;854;;16200854;-535.54;N;EUR;1;B;0;;;21;-112.46;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;854;;16200854;53.55;N;EUR;1;B;0;;;21;11.25;20;;;;;;;;; -0;V;71;5;2016;16200858;Omzet week 20;25052016;;858;;;-1916.45;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;858;;16200858;-1583.02;N;EUR;1;B;0;;;21;-332.43;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;858;;16200858;-205.05;N;EUR;1;B;0;;;6;-12.30;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;858;;16200858;178.80;N;EUR;1;B;0;;;21;37.55;20;;;;;;;;; -0;V;71;5;2016;16200860;Omzet week 20;25052016;;860;;;-2907.09;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;860;;16200860;-2669.50;N;EUR;1;B;0;;;21;-560.60;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;860;;16200860;266.95;N;EUR;1;B;0;;;21;56.06;20;;;;;;;;; -0;V;71;5;2016;16200864;Omzet week 20;25052016;;864;;;-1979.10;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;864;;16200864;-1817.36;N;EUR;1;B;0;;;21;-381.64;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;864;;16200864;181.74;N;EUR;1;B;0;;;21;38.16;20;;;;;;;;; -0;V;71;5;2016;16200865;Omzet week 20;25052016;;865;;;-14049.16;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;865;;16200865;-12894.50;N;EUR;1;B;0;;;21;-2707.85;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;865;;16200865;-7.50;N;EUR;1;B;0;;;6;-0.45;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;865;;16200865;1290.20;N;EUR;1;B;0;;;21;270.94;20;;;;;;;;; -0;V;71;5;2016;16200867;Omzet week 20;25052016;;867;;;-1003.55;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;867;;16200867;-921.53;N;EUR;1;B;0;;;21;-193.52;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;867;;16200867;92.15;N;EUR;1;B;0;;;21;19.35;20;;;;;;;;; -0;V;71;5;2016;16200869;Omzet week 20;25052016;;869;;;-954.45;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;869;;16200869;-876.45;N;EUR;1;B;0;;;21;-184.05;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;869;;16200869;87.64;N;EUR;1;B;0;;;21;18.41;20;;;;;;;;; -0;V;71;5;2016;16200870;Omzet week 20;25052016;;870;;;-254.29;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;870;;16200870;-192.55;N;EUR;1;B;0;;;6;-11.55;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;870;;16200870;-67.48;N;EUR;1;B;0;;;21;-14.17;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;870;;16200870;26.00;N;EUR;1;B;0;;;21;5.46;20;;;;;;;;; -0;V;71;5;2016;16200872;Omzet week 20;25052016;;872;;;-783.45;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;872;;16200872;-719.42;N;EUR;1;B;0;;;21;-151.08;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;872;;16200872;71.94;N;EUR;1;B;0;;;21;15.11;20;;;;;;;;; -0;V;71;5;2016;16200873;Omzet week 20;25052016;;873;;;-1034.82;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;873;;16200873;-950.25;N;EUR;1;B;0;;;21;-199.55;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;873;;16200873;95.02;N;EUR;1;B;0;;;21;19.96;20;;;;;;;;; -0;V;71;5;2016;16200874;Omzet week 20;25052016;;874;;;-835.78;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;874;;16200874;-767.48;N;EUR;1;B;0;;;21;-161.17;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;874;;16200874;76.75;N;EUR;1;B;0;;;21;16.12;20;;;;;;;;; -0;V;71;5;2016;16200875;Omzet week 20;25052016;;875;;;-845.10;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;875;;16200875;-776.03;N;EUR;1;B;0;;;21;-162.97;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;875;;16200875;77.60;N;EUR;1;B;0;;;21;16.30;20;;;;;;;;; -0;V;71;5;2016;16200876;Omzet week 20;25052016;;876;;;-2917.80;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;876;;16200876;-2679.34;N;EUR;1;B;0;;;21;-562.66;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;876;;16200876;267.93;N;EUR;1;B;0;;;21;56.27;20;;;;;;;;; -0;V;71;5;2016;16200878;Omzet week 20;25052016;;878;;;-1095.16;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;878;;16200878;-1005.66;N;EUR;1;B;0;;;21;-211.19;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;878;;16200878;100.57;N;EUR;1;B;0;;;21;21.12;20;;;;;;;;; -0;V;71;5;2016;16200879;Omzet week 20;25052016;;879;;;-753.39;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;879;;16200879;-691.82;N;EUR;1;B;0;;;21;-145.28;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;879;;16200879;69.18;N;EUR;1;B;0;;;21;14.53;20;;;;;;;;; -0;V;71;5;2016;16200883;Omzet week 20;25052016;;883;;;-1528.20;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;883;;16200883;-1403.31;N;EUR;1;B;0;;;21;-294.69;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;883;;16200883;140.33;N;EUR;1;B;0;;;21;29.47;20;;;;;;;;; -0;V;71;5;2016;16200884;Omzet week 20;25052016;;884;;;-1727.55;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;884;;16200884;-1586.36;N;EUR;1;B;0;;;21;-333.14;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;884;;16200884;158.64;N;EUR;1;B;0;;;21;33.31;20;;;;;;;;; -0;V;71;5;2016;16200892;Omzet week 20;25052016;;892;;;-3717.30;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;892;;16200892;-2222.36;N;EUR;1;B;0;;;21;-466.70;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;892;;16200892;-1381.42;N;EUR;1;B;0;;;6;-82.88;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;892;;16200892;360.38;N;EUR;1;B;0;;;21;75.68;20;;;;;;;;; -0;V;71;5;2016;16200895;Omzet week 20;25052016;;895;;;-1008.63;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;895;;16200895;-926.20;N;EUR;1;B;0;;;21;-194.50;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;895;;16200895;92.62;N;EUR;1;B;0;;;21;19.45;20;;;;;;;;; -0;V;71;5;2016;16200897;Omzet week 20;25052016;;897;;;-787.73;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;897;;16200897;-723.35;N;EUR;1;B;0;;;21;-151.90;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;897;;16200897;72.33;N;EUR;1;B;0;;;21;15.19;20;;;;;;;;; -0;V;71;5;2016;16200904;Omzet week 20;25052016;;904;;;-1818.68;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;904;;16200904;-1670.04;N;EUR;1;B;0;;;21;-350.71;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;904;;16200904;167.00;N;EUR;1;B;0;;;21;35.07;20;;;;;;;;; -0;V;71;5;2016;16200905;Omzet week 20;25052016;;905;;;-100.57;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;905;;16200905;-92.36;N;EUR;1;B;0;;;21;-19.39;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;905;;16200905;9.24;N;EUR;1;B;0;;;21;1.94;20;;;;;;;;; -0;V;71;5;2016;16200906;Omzet week 20;25052016;;906;;;-196.61;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;906;;16200906;-180.54;N;EUR;1;B;0;;;21;-37.91;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;906;;16200906;18.05;N;EUR;1;B;0;;;21;3.79;20;;;;;;;;; -0;V;71;5;2016;16200908;Omzet week 20;25052016;;908;;;-557.73;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;908;;16200908;-512.15;N;EUR;1;B;0;;;21;-107.55;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;908;;16200908;51.21;N;EUR;1;B;0;;;21;10.76;20;;;;;;;;; -0;V;71;5;2016;16200912;Omzet week 20;25052016;;912;;;-579.24;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;912;;16200912;-531.90;N;EUR;1;B;0;;;21;-111.70;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;912;;16200912;53.19;N;EUR;1;B;0;;;21;11.17;20;;;;;;;;; -0;V;71;5;2016;16200913;Omzet week 20;25052016;;913;;;-370.78;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;913;;16200913;-329.17;N;EUR;1;B;0;;;21;-69.13;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;913;;16200913;-13.11;N;EUR;1;B;0;;;6;-0.79;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;913;;16200913;34.23;N;EUR;1;B;0;;;21;7.19;20;;;;;;;;; -0;V;71;5;2016;16200917;Omzet week 20;25052016;;917;;;-53.91;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;917;;16200917;-49.50;N;EUR;1;B;0;;;21;-10.40;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;917;;16200917;4.95;N;EUR;1;B;0;;;21;1.04;20;;;;;;;;; -0;V;71;5;2016;16200918;Omzet week 20;25052016;;918;;;-148.18;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;918;;16200918;-112.56;N;EUR;1;B;0;;;21;-23.64;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;918;;16200918;-27.26;N;EUR;1;B;0;;;6;-1.64;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;918;;16200918;13.99;N;EUR;1;B;0;;;21;2.93;20;;;;;;;;; -0;V;71;5;2016;16200920;Omzet week 20;25052016;;920;;;-10224.13;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;920;;16200920;-9388.55;N;EUR;1;B;0;;;21;-1971.60;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;920;;16200920;938.86;N;EUR;1;B;0;;;21;197.16;20;;;;;;;;; -0;V;71;5;2016;16200930;Omzet week 20;25052016;;930;;;-73.44;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;930;;16200930;-67.44;N;EUR;1;B;0;;;21;-14.16;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;930;;16200930;6.74;N;EUR;1;B;0;;;21;1.42;20;;;;;;;;; -0;V;71;5;2016;16200932;Omzet week 20;25052016;;932;;;-479.63;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;932;;16200932;-434.01;N;EUR;1;B;0;;;21;-91.14;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;932;;16200932;-7.45;N;EUR;1;B;0;;;6;-0.45;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;932;;16200932;44.15;N;EUR;1;B;0;;;21;9.27;20;;;;;;;;; -0;V;71;5;2016;16200934;Omzet week 20;25052016;;934;;;-1146.11;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;934;;16200934;-1052.44;N;EUR;1;B;0;;;21;-221.01;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;934;;16200934;105.24;N;EUR;1;B;0;;;21;22.10;20;;;;;;;;; -0;V;71;5;2016;16200936;Omzet week 20;25052016;;936;;;-1693.26;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;936;;16200936;-1554.88;N;EUR;1;B;0;;;21;-326.52;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;936;;16200936;155.49;N;EUR;1;B;0;;;21;32.65;20;;;;;;;;; -0;V;71;5;2016;16200943;Omzet week 20;25052016;;943;;;-610.07;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;943;;16200943;-560.21;N;EUR;1;B;0;;;21;-117.64;20;;;;;;;;; -2;V;71;5;2016;;Commissie week 20;25052016;80555;943;;16200943;56.02;N;EUR;1;B;0;;;21;11.76;20;;;;;;;;; -0;V;71;5;2016;16200946;Omzet week 20;25052016;;946;;;-370.10;N;EUR;;B;0;01062016;01062016;;;20;Omzet;B;;;;;;; -1;V;71;5;2016;;Omzet week 20;25052016;80555;946;;16200946;-317.48;N;EUR;1;B;0;;;21;-66.67;20;;;;;;;;; -2;V;71;5;2016;;Omzet week 20;25052016;80555;946;;16200946;-25.94;N;EUR;1;B;0;;;6;-1.56;20;;;;;;;;; -3;V;71;5;2016;;Commissie week 20;25052016;80555;946;;16200946;34.34;N;EUR;1;B;0;;;21;7.21;20;;;;;;;;; diff --git a/hl7/pom.xml b/hl7/pom.xml deleted file mode 100644 index 64ba504f..00000000 --- a/hl7/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 5.0.0 - - - hl7 - - - UTF-8 - 21 - file:///${project.basedir}/../rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - - org.slf4j - log4j-over-slf4j - ${slf4j.version} - - - - ca.uhn.hapi - hapi-base - ${hapi.version} - - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 21 - - - - - - - - - - \ No newline at end of file diff --git a/hl7/src/main/java/org/assimbly/hl7/Er7Encoder.java b/hl7/src/main/java/org/assimbly/hl7/Er7Encoder.java deleted file mode 100644 index 27fa6f4c..00000000 --- a/hl7/src/main/java/org/assimbly/hl7/Er7Encoder.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.assimbly.hl7; - -import ca.uhn.hl7v2.HL7Exception; -import ca.uhn.hl7v2.parser.PipeParser; - -public class Er7Encoder { - - public String convertMessage(String message) throws HL7Exception { - PipeParser pipeParser = new PipeParser(); - return pipeParser.parse(message).encode(); - } -} diff --git a/hl7/src/main/java/org/assimbly/hl7/XmlEncoder.java b/hl7/src/main/java/org/assimbly/hl7/XmlEncoder.java deleted file mode 100644 index dbe1f1f0..00000000 --- a/hl7/src/main/java/org/assimbly/hl7/XmlEncoder.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.assimbly.hl7; - -import ca.uhn.hl7v2.HL7Exception; -import ca.uhn.hl7v2.parser.DefaultXMLParser; -import ca.uhn.hl7v2.parser.XMLParser; - -public class XmlEncoder { - - public String convertMessage(String message) throws HL7Exception { - XMLParser xmlParser = new DefaultXMLParser(); - return xmlParser.parse(message).encode(); - } -} diff --git a/hl7/src/main/java/org/assimbly/hl7/XmlMarshaller.java b/hl7/src/main/java/org/assimbly/hl7/XmlMarshaller.java deleted file mode 100644 index 6a75dbb2..00000000 --- a/hl7/src/main/java/org/assimbly/hl7/XmlMarshaller.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.assimbly.hl7; - -import ca.uhn.hl7v2.HL7Exception; -import ca.uhn.hl7v2.model.Message; -import ca.uhn.hl7v2.parser.DefaultXMLParser; -import ca.uhn.hl7v2.parser.XMLParser; - -public class XmlMarshaller { - - public String convertMessage(Message message) throws HL7Exception { - XMLParser parser = new DefaultXMLParser(); - return parser.encode(message); - } -} diff --git a/pom.xml b/pom.xml index 341fc14b..6cafbc37 100644 --- a/pom.xml +++ b/pom.xml @@ -13,9 +13,7 @@ aggregate - amazon - auth cookies csvtoxml @@ -29,11 +27,9 @@ enrich exceltoxml flv - formtoxml tenantvariables googledrive - hl7 jsontoxmllegacy mail multipart @@ -44,11 +40,9 @@ replace sandbox simplereplace - smb smooksnoxml soap sql - xmltocsv xmltoexcel xmltojson diff --git a/smb/pom.xml b/smb/pom.xml deleted file mode 100644 index ac4a9ec0..00000000 --- a/smb/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - - custom-components - org.assimbly - 5.0.0 - - - smb - - - UTF-8 - file:///${project.basedir}/../rules.xml - - - - - github - Temporary Staging Repository - https://maven.pkg.github.com/assimbly/custom-components - - - - - - org.codelibs - jcifs - ${jcifs.version} - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - - - - toolchain - - - - - 21 - - - - - - - - - - diff --git a/smb/src/docs/smb.adoc b/smb/src/docs/smb.adoc deleted file mode 100644 index 405580bf..00000000 --- a/smb/src/docs/smb.adoc +++ /dev/null @@ -1,255 +0,0 @@ -= smb Component -:doctitle: SMB -:shortname: smb -:artifactid: smb -:description: Connect to file servers that support the SMB/CIFS protocol (Windows File Sharing) -:since: 2.11.0 -:supportlevel: Stable -:component-header: Both consumer as producer are supported -//Manually maintained attributes - -*Since Camel {since}* - -*{component-header}* - -The smb component is able to connect to file servers that support the SMB/CIFS protocol (Windows File Sharing) - -This library is based on Camel Extra component: - -https://github.com/camel-extra/camel-extra poject which hosts all *GPL related components for Camel. - -Maven users will need to add the following dependency to their `pom.xml` -for this component: - -[source,xml] ------------------------------------------------------------- - - org.assimbly - smb - x.x.x - - ------------------------------------------------------------- - - - -URI format -^^^^^^^^^^ - -smb://[[[domain;]username[:password]@]server[:port]/[[share/[dir/]]]][?options] - -Where *share* represents the share to connect to and *dir* is optionaly -any underlying directory. Can contain nested folders. - -You can append query options to the URI in the following format, -`?option=value&option=value&...` - -This component uses the http://jcifs.samba.org/[JCIFS] library for the -actual CIFS/SMB work. - -URI Options -^^^^^^^^^^^ - -The options below are exclusive for the JCIFS component. - -confluenceTableSmall - -Name - -Default Value - -Description - -`password` - -`null` - -*Mandatory* Specifies the password to use to log in to the remote file -system. - -`localWorkDirectory` - -`null` - -When consuming, a local work directory can be used to store the remote -file content directly in local files, to avoid loading the content into -memory. This is beneficial, if you consume a very big remote file and -thus can conserve memory. See below for more details. - -More options - -See link:file2.html[File] for more options as all the options from -link:file2.html[File] is inherited. - -For example to set the `localWorkDirectory` to ''/tmp'' you can do: - -java -from("smb://foo@myserver.example.com/sharename?password=secret&localWorkDirectory=/tmp") -.to("bean:foo"); - -You can have as many of these options as you like. - -Examples -^^^^^^^^ - -`smb://foo@myserver.example.com/sharename?password=secret` + - -`smb://companydomain;foo@myserver.company.com/sharename?password=secret` - -More information - -This component is an extension of the link:file2.html[File] component. -So there are more samples and details on the link:file2.html[File] -component page. - -Message Headers -^^^^^^^^^^^^^^^ - -The following message headers can be used to affect the behavior of the -component - -confluenceTableSmall - -Header - -Description - -`CamelFileName` - -Specifies the output file name (relative to the endpoint directory) to -be used for the output message when sending to the endpoint. If this is -not present and no expression either, then a generated message ID is -used as the filename instead. - -`CamelFileNameProduced` - -The actual absolute filepath (path + name) for the output file that was -written. This header is set by Camel and its purpose is providing -end-users the name of the file that was written. - -`CamelFileBatchIndex` - -Current index out of total number of files being consumed in this batch. - -`CamelFileBatchSize` - -Total number of files being consumed in this batch. - -`CamelFileHost` - -The remote hostname. - -`CamelFileLocalWorkPath` - -Path to the local work file, if local work directory is used. - -Using Local Work Directory -^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Camel JCIFS supports consuming from remote servers and downloading the -files directly into a local work directory. This avoids reading the -entire remote file content into memory as it is streamed directly into -the local file using `FileOutputStream`. - -Camel JCIFS will store to a local file with the same name as the remote -file. And finally, when the link:exchange.html[Exchange] is complete the -local file is deleted. - -So if you want to download files from a remote server and store it as -files then you need to route to a file endpoint such as: - -java -from("smb://foo@myserver.example.com/sharename?password=secret&localWorkDirectory=/tmp") -.to("file://inbox"); Optimization by renaming work file - -The route above is ultra efficient as it avoids reading the entire file -content into memory. It will download the remote file directly to a -local file stream. The `java.io.File` handle is then used as the -link:exchange.html[Exchange] body. The file producer leverages this fact -and can work directly on the work file `java.io.File` handle and perform -a `java.io.File.rename` to the target filename. As Camel knows it's a -local work file, it can optimize and use a rename instead of a file -copy, as the work file is meant to be deleted anyway. - -Samples -^^^^^^^ - -In the sample below we set up Camel to download all the reports from the -SMB/CIFS server once every hour (60 min) and store it as files on the -local file system. - -java protected RouteBuilder createRouteBuilder() throws Exception \{ -return new RouteBuilder() \{ public void configure() throws Exception \{ -// we use a delay of 60 minutes (eg. once pr. hour) we poll the server -long delay = 60 * 60 * 1000L; // from the given server we poll (= -download) all the files // from the public/reports folder and store this -as files // in a local directory. Camel will use the filenames from the -server -from("smb://foo@myserver.example.com/public/reports?password=secret&delay=" -+ delay) .to("file://target/test-reports"); } }; } -from("smb://foo@myserver.example.com/sharename?password=secret&delay=60000") -.to("file://target/test-reports") - -And the route using Spring DSL: - -xml - - -Filter using `org.apache.camel.component.file.GenericFileFilter` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Camel supports pluggable filtering strategies. This strategy it to use -the build in `org.apache.camel.component.file.GenericFileFilter` in -Java. You can then configure the endpoint with such a filter to skip -certain filters before being processed. - -In the sample we have built our own filter that only accepts files -starting with report in the filename. - -\{snippet:id=e1|lang=java|url=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterTest.java} - -And then we can configure our route using the *filter* attribute to -reference our filter (using `#` notation) that we have defined in the -spring XML file: - -xml - - -Filtering using ANT path matcher -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -The ANT path matcher is a filter that is shipped out-of-the-box in the -*camel-spring* jar. So you need to depend on *camel-spring* if you are -using Maven. + -The reason is that we leverage Spring's -http://static.springsource.org/spring/docs/3.0.x/api/org/springframework/util/AntPathMatcher.html[AntPathMatcher] -to do the actual matching. - -The file paths are matched with the following rules: - -* `?` matches one character -* `*` matches zero or more characters -* `**` matches zero or more directories in a path - -The sample below demonstrates how to use it: - -xml -