You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2020/12/17 11:19:56 UTC
[incubator-hop] branch master updated (2409e79 -> 3b6342e)
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git.
from 2409e79 Merge pull request #476 from hansva/master
new 3467458 HOP-2310 : Exasol dependency error
new c3e96cf HOP-2312 : Add Sequence delivers duplicate ids when running in copies
new a7ff973 HOP-1821 : Port user Defined Java Class transform
new 9264531 HOP-1821 : Port user Defined Java Class transform
new dcf6858 HOP-1821 : Port user Defined Java Class transform
new b5fcc2e HOP-1821 : Port user Defined Java Class transform
new 1c0b086 HOP-1821 : Port user Defined Java Class transform (merge fix)
new eef73eb HOP-1821 : Port user Defined Java Class transform (lighter test)
new cee27d4 HOP-2312 : Add Sequence delivers duplicate ids when running in copies (bug fix)
new b2e80b4 HOP-1821 : Port user Defined Java Class transform (headers)
new 7062e4d Exclude licenses/ folder for apache-rat check
new bcc9809 HOP-2312 : Running integration tests locally is dangerous
new 3b6342e Merge pull request #477 from mattcasters/master
The 1255 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../plugins/databases/exasol4-assemblies/pom.xml | 15 +-
assemblies/plugins/dist/pom.xml | 26 --
assemblies/plugins/transforms/janino/pom.xml | 10 +
.../transforms/janino/src/assembly/assembly.xml | 8 +
assemblies/plugins/transforms/javafilter/pom.xml | 28 ---
.../javafilter/src/assembly/assembly.xml | 32 ---
.../javafilter/src/main/resources/version.xml | 2 -
assemblies/plugins/transforms/pom.xml | 2 -
.../transforms/userdefinedjavaclass/pom.xml | 28 ---
.../userdefinedjavaclass/src/assembly/assembly.xml | 37 ---
.../src/main/resources/dependencies.xml | 3 -
.../src/main/resources/version.xml | 2 -
.../src/main/java/org/apache/hop/core/Counter.java | 94 +++----
.../main/java/org/apache/hop/core/Counters.java | 45 ++--
.../org/apache/hop/core/database/Database.java | 24 +-
.../hop/core/injection}/DataTypeConverter.java | 2 +-
.../test/java/org/apache/hop/core/CounterTest.java | 48 ++--
engine/pom.xml | 23 --
.../testcase.hpl | 103 --------
integration-tests/scripts/run-tests.sh | 125 +++++----
.../transforms/00100-add-sequence-copies.hpl | 225 +++++++++++++++++
.../transforms/00100-add-sequence-single.hpl | 223 +++++++++++++++++
integration-tests/transforms/00200-udjc-simple.hpl | 278 +++++++++++++++++++++
.../main-00100-add-sequence.hwf} | 80 +++---
.../main-00200-udjc-simple.hwf} | 69 +----
.../metadata/pipeline-run-configuration/local.json | 4 +-
.../metadata/workflow-run-configuration/local.json | 0
.../project-config.json | 0
.../transforms/addsequence/AddSequence.java | 235 +++++++++--------
.../transforms/addsequence/AddSequenceData.java | 23 +-
.../combinationlookup/CombinationLookup.java | 3 +-
.../dimensionlookup/DimensionLookup.java | 5 +-
.../fieldsplitter/FieldSplitterMeta.java | 1 +
plugins/transforms/janino/pom.xml | 69 ++++-
.../src/main/doc/javafilter.adoc | 0
.../src/main/doc/userdefinedjavaclass.adoc | 0
.../hop/pipeline/transforms/janino/JaninoData.java | 24 +-
.../hop/pipeline/transforms/janino/JaninoMeta.java | 25 +-
.../transforms/janino/JaninoMetaFunction.java | 25 +-
.../pipeline/transforms/javafilter/JavaFilter.java | 0
.../transforms/javafilter/JavaFilterData.java | 25 +-
.../transforms/javafilter/JavaFilterDialog.java | 0
.../transforms/javafilter/JavaFilterMeta.java | 25 +-
.../userdefinedjavaclass/FieldHelper.java | 25 +-
.../InfoTransformDefinition.java | 24 +-
.../TargetTransformDefinition.java | 24 +-
.../userdefinedjavaclass/TransformClassBase.java | 35 ++-
.../userdefinedjavaclass/TransformDefinition.java | 24 +-
.../userdefinedjavaclass/UsageParameter.java | 24 +-
.../userdefinedjavaclass/UserDefinedJavaClass.java | 25 +-
.../UserDefinedJavaClassCodeSnippits.java | 25 +-
.../UserDefinedJavaClassData.java | 24 +-
.../UserDefinedJavaClassDef.java | 24 +-
.../UserDefinedJavaClassDialog.java | 13 +-
.../UserDefinedJavaClassHighlight.java | 0
.../UserDefinedJavaClassMeta.java | 7 +-
.../src/main/resources/images/hop-input.svg | 34 +--
.../src/main/resources/images/hop-output.svg | 36 +--
.../src/main/resources/javafilter.svg | 56 ++---
.../javafilter/messages/messages_en_US.properties | 0
.../javafilter/messages/messages_es_AR.properties | 0
.../javafilter/messages/messages_fr_FR.properties | 0
.../javafilter/messages/messages_it_IT.properties | 0
.../javafilter/messages/messages_ja_JP.properties | 0
.../javafilter/messages/messages_ko_KR.properties | 0
.../javafilter/messages/messages_zh_CN.properties | 0
.../userdefinedjavaclass/codeSnippits.xml | 0
.../messages/messages_en_US.properties | 0
.../messages/messages_fr_FR.properties | 0
.../messages/messages_it_IT.properties | 0
.../messages/messages_ja_JP.properties | 0
.../messages/messages_ko_KR.properties | 0
.../messages/messages_zh_CN.properties | 0
.../src/main/resources/userdefinedjavaclass.svg | 42 ++--
.../transforms/javafilter/JavaFilterMetaTest.java | 0
.../userdefinedjavaclass/FieldHelperTest.java | 23 +-
.../TransformDefinitionTest.java | 23 +-
.../UserDefinedJavaClassMetaInjectionTest.java | 24 +-
.../UserDefinedJavaClassMetaTest.java | 23 +-
plugins/transforms/javafilter/pom.xml | 18 --
.../transforms/javascript/ScriptValuesMetaMod.java | 2 +-
plugins/transforms/pom.xml | 2 -
.../transforms/switchcase/SwitchCaseMeta.java | 3 +-
plugins/transforms/userdefinedjavaclass/pom.xml | 66 -----
pom.xml | 1 +
85 files changed, 1461 insertions(+), 1162 deletions(-)
delete mode 100644 assemblies/plugins/transforms/javafilter/pom.xml
delete mode 100644 assemblies/plugins/transforms/javafilter/src/assembly/assembly.xml
delete mode 100644 assemblies/plugins/transforms/javafilter/src/main/resources/version.xml
delete mode 100644 assemblies/plugins/transforms/userdefinedjavaclass/pom.xml
delete mode 100644 assemblies/plugins/transforms/userdefinedjavaclass/src/assembly/assembly.xml
delete mode 100644 assemblies/plugins/transforms/userdefinedjavaclass/src/main/resources/dependencies.xml
delete mode 100644 assemblies/plugins/transforms/userdefinedjavaclass/src/main/resources/version.xml
rename {plugins/transforms/fieldsplitter/src/main/java/org/apache/hop/pipeline/transforms/fieldsplitter => core/src/main/java/org/apache/hop/core/injection}/DataTypeConverter.java (95%)
delete mode 100644 integration-tests/HOP-2173_test_SingletonUtil_getValuesList/testcase.hpl
create mode 100644 integration-tests/transforms/00100-add-sequence-copies.hpl
create mode 100644 integration-tests/transforms/00100-add-sequence-single.hpl
create mode 100644 integration-tests/transforms/00200-udjc-simple.hpl
copy integration-tests/{HOP-2173_test_SingletonUtil_getValuesList/main_0001_test_valuelist.hwf => transforms/main-00100-add-sequence.hwf} (59%)
rename integration-tests/{HOP-2173_test_SingletonUtil_getValuesList/main_0001_test_valuelist.hwf => transforms/main-00200-udjc-simple.hwf} (56%)
rename integration-tests/{HOP-2173_test_SingletonUtil_getValuesList => transforms}/metadata/pipeline-run-configuration/local.json (91%)
rename integration-tests/{HOP-2173_test_SingletonUtil_getValuesList => transforms}/metadata/workflow-run-configuration/local.json (100%)
rename integration-tests/{HOP-2173_test_SingletonUtil_getValuesList => transforms}/project-config.json (100%)
rename plugins/transforms/{javafilter => janino}/src/main/doc/javafilter.adoc (100%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/doc/userdefinedjavaclass.adoc (100%)
rename plugins/transforms/{javafilter => janino}/src/main/java/org/apache/hop/pipeline/transforms/javafilter/JavaFilter.java (100%)
rename plugins/transforms/{javafilter => janino}/src/main/java/org/apache/hop/pipeline/transforms/javafilter/JavaFilterData.java (71%)
rename plugins/transforms/{javafilter => janino}/src/main/java/org/apache/hop/pipeline/transforms/javafilter/JavaFilterDialog.java (100%)
rename plugins/transforms/{javafilter => janino}/src/main/java/org/apache/hop/pipeline/transforms/javafilter/JavaFilterMeta.java (93%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/FieldHelper.java (90%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/InfoTransformDefinition.java (68%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/TargetTransformDefinition.java (68%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/TransformClassBase.java (95%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/TransformDefinition.java (68%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UsageParameter.java (57%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClass.java (98%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClassCodeSnippits.java (87%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClassData.java (60%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClassDef.java (83%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClassDialog.java (99%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClassHighlight.java (100%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClassMeta.java (98%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/resources/images/hop-input.svg (97%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/resources/images/hop-output.svg (97%)
rename plugins/transforms/{javafilter => janino}/src/main/resources/javafilter.svg (98%)
rename plugins/transforms/{javafilter => janino}/src/main/resources/org/apache/hop/pipeline/transforms/javafilter/messages/messages_en_US.properties (100%)
rename plugins/transforms/{javafilter => janino}/src/main/resources/org/apache/hop/pipeline/transforms/javafilter/messages/messages_es_AR.properties (100%)
rename plugins/transforms/{javafilter => janino}/src/main/resources/org/apache/hop/pipeline/transforms/javafilter/messages/messages_fr_FR.properties (100%)
rename plugins/transforms/{javafilter => janino}/src/main/resources/org/apache/hop/pipeline/transforms/javafilter/messages/messages_it_IT.properties (100%)
rename plugins/transforms/{javafilter => janino}/src/main/resources/org/apache/hop/pipeline/transforms/javafilter/messages/messages_ja_JP.properties (100%)
rename plugins/transforms/{javafilter => janino}/src/main/resources/org/apache/hop/pipeline/transforms/javafilter/messages/messages_ko_KR.properties (100%)
rename plugins/transforms/{javafilter => janino}/src/main/resources/org/apache/hop/pipeline/transforms/javafilter/messages/messages_zh_CN.properties (100%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/codeSnippits.xml (100%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/messages/messages_en_US.properties (100%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/messages/messages_fr_FR.properties (100%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/messages/messages_it_IT.properties (100%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/messages/messages_ja_JP.properties (100%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/messages/messages_ko_KR.properties (100%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/messages/messages_zh_CN.properties (100%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/main/resources/userdefinedjavaclass.svg (98%)
rename plugins/transforms/{javafilter => janino}/src/test/java/org/apache/hop/pipeline/transforms/javafilter/JavaFilterMetaTest.java (100%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/test/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/FieldHelperTest.java (94%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/test/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/TransformDefinitionTest.java (59%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/test/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClassMetaInjectionTest.java (88%)
rename plugins/transforms/{userdefinedjavaclass => janino}/src/test/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClassMetaTest.java (92%)
delete mode 100644 plugins/transforms/javafilter/pom.xml
delete mode 100644 plugins/transforms/userdefinedjavaclass/pom.xml