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/22 22:25:58 UTC
[incubator-hop] branch master updated (5a8172e -> cde9470)
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 5a8172e Merge pull request #483 from nadment/HOP-2281
new e9eaa2f HOP-2298 : Converted Token Replacement plugin from Chris Deptula
new 4c9f552 HOP-2298 : Applied changes identified after PR review.
new 784a478 HOP-2330 : Resolved Merge Conflicts
new 7f01cf2 HOP-2333 : Fixed issue on environment variables management and added simple integration test to verify functionality
new a2cddf3 HOP-2330 : Fixed wrong release number
new 2ee7305 HOP-2298 : Fixed header in messages' resource file
new 41063de HOP-2298 : Code cleanup
new cde9470 Merge pull request #481 from sramazzina/master
The 1290 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:
archive-pipeline-transforms/pom.xml | 2 +-
.../addsequence/messages/messages_it_IT.properties | 4 +-
.../cubeoutput/messages/messages_it_IT.properties | 2 +-
.../messages/messages_it_IT.properties | 2 +-
.../exceloutput/messages/messages_it_IT.properties | 2 +-
.../excelwriter/messages/messages_it_IT.properties | 2 +-
.../script/messages/messages_it_IT.properties | 11 +-
.../messages/messages_it_IT.properties | 8 +-
.../setvariable/messages/messages_it_IT.properties | 4 +-
.../sftpput/messages/messages_it_IT.properties | 2 +-
.../systemdata/messages/messages_it_IT.properties | 10 +-
.../messages/messages_it_IT.properties | 2 +-
assemblies/plugins/actions/ftp/pom.xml | 4 +-
assemblies/plugins/dist/pom.xml | 13 +
assemblies/plugins/transforms/pom.xml | 1 +
.../plugins/transforms/tokenreplacement/pom.xml | 28 +
.../tokenreplacement/src/assembly/assembly.xml | 32 +
.../src/main/resources/version.xml | 2 +
.../apache/hop/core/config/plugin/ConfigFile.java | 7 +
.../logging/messages/messages_it_IT.properties | 50 +-
.../hop/core/messages/messages_it_IT.properties | 6 +-
.../pipeline/messages/messages_it_IT.properties | 94 +-
.../transform/messages/messages_it_IT.properties | 6 +-
.../messages/messages_it_IT.properties | 37 +-
.../messages/messages_it_IT.properties | 38 +-
.../messages/messages_it_IT.properties | 2 +-
.../pipeline/messages/messages_it_IT.properties | 46 +-
.../workflow/messages/messages_it_IT.properties | 2 +-
.../workflow/messages/messages_it_IT.properties | 6 +-
.../hop/www/messages/messages_it_IT.properties | 84 +-
.../conf/dev-env-config.json | 8 +-
.../conf}/project-config.json | 1 +
.../main-HOP-2333_test_environment_variables.hwf} | 16 +-
.../metadata/pipeline-run-configuration/local.json | 0
.../metadata/workflow-run-configuration/local.json | 0
.../run-env-check-test.hpl} | 115 +-
plugins/actions/ftp/pom.xml | 2 +-
.../sftpput/messages/messages_it_IT.properties | 4 +-
.../shell/messages/messages_it_IT.properties | 2 +-
.../abort/messages/messages_it_IT.properties | 2 +-
.../addsequence/messages/messages_it_IT.properties | 4 +-
.../cubeoutput/messages/messages_it_IT.properties | 2 +-
.../messages/messages_it_IT.properties | 2 +-
.../exceloutput/messages/messages_it_IT.properties | 2 +-
.../excelwriter/messages/messages_it_IT.properties | 2 +-
.../messages/messages_it_IT.properties | 8 +-
.../javascript/messages/messages_it_IT.properties | 8 +-
.../input/messages/messages_it_IT.properties | 4 +-
.../mapping/messages/messages_it_IT.properties | 56 +-
.../output/messages/messages_it_IT.properties | 2 +-
plugins/transforms/pom.xml | 1 +
plugins/transforms/recordsfromstream/pom.xml | 2 +-
.../setvariable/messages/messages_it_IT.properties | 4 +-
.../systemdata/messages/messages_it_IT.properties | 10 +-
.../messages/messages_it_IT.properties | 2 +-
plugins/transforms/tokenreplacement/pom.xml | 18 +
.../src/main/doc/tokenreplacement.adoc | 8 +
.../tokenreplacement/TokenReplacement.java | 430 +++++
.../tokenreplacement/TokenReplacementData.java} | 65 +-
.../tokenreplacement/TokenReplacementDialog.java | 1693 ++++++++++++++++++++
.../tokenreplacement/TokenReplacementField.java | 98 ++
.../tokenreplacement/TokenReplacementMeta.java | 712 ++++++++
.../tokenreplacement/TokenReplacingReader.java | 216 +++
.../tokenreplacement/TokenResolver.java} | 27 +-
.../messages/messages_en_US.properties | 122 ++
.../tokenreplacement/src/main/resources/token.svg | 6 +
.../core/dialog/messages/messages_it_IT.properties | 12 +-
.../dialog/messages/messages_it_IT.properties | 14 +-
.../file.trans.messages/messages_it_IT.properties | 142 +-
.../workflow/messages/messages_it_IT.properties | 18 +-
.../ui/hopgui/messages/messages_it_IT.properties | 142 +-
.../wizards/messages/messages_it_IT.properties | 6 +-
.../partition/messages/messages_it_IT.properties | 4 +-
.../debug/messages/messages_it_IT.properties | 12 +-
.../dialog/messages/messages_it_IT.properties | 74 +-
.../pipeline/messages/messages_it_IT.properties | 46 +-
.../dialog/messages/messages_it_IT.properties | 16 +-
77 files changed, 4044 insertions(+), 605 deletions(-)
create mode 100644 assemblies/plugins/transforms/tokenreplacement/pom.xml
create mode 100644 assemblies/plugins/transforms/tokenreplacement/src/assembly/assembly.xml
create mode 100644 assemblies/plugins/transforms/tokenreplacement/src/main/resources/version.xml
copy plugins/engines/beam/src/main/resources/demo/project-config.json => integration-tests/HOP-2333_test_environment_variables/conf/dev-env-config.json (55%)
copy integration-tests/{HOP-2214_test_empty_variables => HOP-2333_test_environment_variables/conf}/project-config.json (79%)
copy integration-tests/{transforms/main-00400-udjc-render-all-actions-in-svg.hwf => HOP-2333_test_environment_variables/main-HOP-2333_test_environment_variables.hwf} (82%)
copy integration-tests/{xml => HOP-2333_test_environment_variables}/metadata/pipeline-run-configuration/local.json (100%)
copy {plugins/transforms/mapping/src/main/resources/it => integration-tests/HOP-2333_test_environment_variables}/metadata/workflow-run-configuration/local.json (100%)
copy integration-tests/{parameters_and_variables/0001-get-variable.hpl => HOP-2333_test_environment_variables/run-env-check-test.hpl} (59%)
create mode 100644 plugins/transforms/tokenreplacement/pom.xml
create mode 100644 plugins/transforms/tokenreplacement/src/main/doc/tokenreplacement.adoc
create mode 100644 plugins/transforms/tokenreplacement/src/main/java/org/apache/hop/pipeline/transforms/tokenreplacement/TokenReplacement.java
copy plugins/transforms/{propertyoutput/src/main/java/org/apache/hop/pipeline/transforms/propertyoutput/PropertyOutputData.java => tokenreplacement/src/main/java/org/apache/hop/pipeline/transforms/tokenreplacement/TokenReplacementData.java} (51%)
create mode 100644 plugins/transforms/tokenreplacement/src/main/java/org/apache/hop/pipeline/transforms/tokenreplacement/TokenReplacementDialog.java
create mode 100644 plugins/transforms/tokenreplacement/src/main/java/org/apache/hop/pipeline/transforms/tokenreplacement/TokenReplacementField.java
create mode 100644 plugins/transforms/tokenreplacement/src/main/java/org/apache/hop/pipeline/transforms/tokenreplacement/TokenReplacementMeta.java
create mode 100644 plugins/transforms/tokenreplacement/src/main/java/org/apache/hop/pipeline/transforms/tokenreplacement/TokenReplacingReader.java
copy plugins/transforms/{mongodb/src/main/java/org/apache/hop/mongo/MongoDbException.java => tokenreplacement/src/main/java/org/apache/hop/pipeline/transforms/tokenreplacement/TokenResolver.java} (64%)
create mode 100644 plugins/transforms/tokenreplacement/src/main/resources/org/apache/hop/pipeline/transforms/tokenreplacement/messages/messages_en_US.properties
create mode 100644 plugins/transforms/tokenreplacement/src/main/resources/token.svg