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 2021/04/13 17:29:36 UTC
[incubator-hop] branch master updated: HOP-2781 : User Defined Java
Class: improve import (IT fix)
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 9a5558c HOP-2781 : User Defined Java Class: improve import (IT fix)
new f0fe44b Merge pull request #740 from mattcasters/master
9a5558c is described below
commit 9a5558c7e83b52fabfd1818063f9743b1063dd5c
Author: Matt Casters <ma...@gmail.com>
AuthorDate: Tue Apr 13 17:30:47 2021 +0200
HOP-2781 : User Defined Java Class: improve import (IT fix)
---
integration-tests/scripting/0003-udjc-simple.hpl | 28 +++++++++----------
.../0004-udjc-render-all-transforms-in-svg.hpl | 16 +++++------
.../0005-udjc-render-all-actions-in-svg.hpl | 16 +++++------
.../google/src/main/resources/googleanalytics.svg | 32 ++++++++++++----------
4 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/integration-tests/scripting/0003-udjc-simple.hpl b/integration-tests/scripting/0003-udjc-simple.hpl
index 24fd865..2d6b4f1 100644
--- a/integration-tests/scripting/0003-udjc-simple.hpl
+++ b/integration-tests/scripting/0003-udjc-simple.hpl
@@ -104,8 +104,8 @@
</partitioning>
<definitions>
<definition>
- <classType>TRANSFORM_CLASS</classType>
- <className>Processor</className>
+ <class_type>TRANSFORM_CLASS</class_type>
+ <class_name>Processor</class_name>
<class_source>
String firstnameField;
String lastnameField;
@@ -158,30 +158,30 @@ public boolean processRow() throws HopException
</definitions>
<fields>
<field>
- <fieldName>name</fieldName>
- <fieldType>String</fieldType>
- <fieldLength>-1</fieldLength>
- <fieldPrecision>-1</fieldPrecision>
+ <field_name>name</field_name>
+ <field_type>String</field_type>
+ <field_length>-1</field_length>
+ <field_precision>-1</field_precision>
</field>
</fields>
- <clearResultFields>N</clearResultFields>
- <infoTransforms/>
+ <clear_result_fields>N</clear_result_fields>
+ <info_transforms/>
<target_transforms/>
<usage_parameters>
<usage_parameter>
<parameter_tag>FIRSTNAME_FIELD</parameter_tag>
- <parameterValue>first</parameterValue>
- <parameterDescription>First name field</parameterDescription>
+ <parameter_value>first</parameter_value>
+ <parameter_description>First name field</parameter_description>
</usage_parameter>
<usage_parameter>
<parameter_tag>LASTNAME_FIELD</parameter_tag>
- <parameterValue>last</parameterValue>
- <parameterDescription>Last name field</parameterDescription>
+ <parameter_value>last</parameter_value>
+ <parameter_description>Last name field</parameter_description>
</usage_parameter>
<usage_parameter>
<parameter_tag>NAME_FIELD</parameter_tag>
- <parameterValue>name</parameterValue>
- <parameterDescription>The name field as output</parameterDescription>
+ <parameter_value>name</parameter_value>
+ <parameter_description>The name field as output</parameter_description>
</usage_parameter>
</usage_parameters>
<attributes/>
diff --git a/integration-tests/scripting/0004-udjc-render-all-transforms-in-svg.hpl b/integration-tests/scripting/0004-udjc-render-all-transforms-in-svg.hpl
index b53c53d..1f208a9 100644
--- a/integration-tests/scripting/0004-udjc-render-all-transforms-in-svg.hpl
+++ b/integration-tests/scripting/0004-udjc-render-all-transforms-in-svg.hpl
@@ -131,8 +131,8 @@
</partitioning>
<definitions>
<definition>
- <classType>TRANSFORM_CLASS</classType>
- <className>Processor</className>
+ <class_type>TRANSFORM_CLASS</class_type>
+ <class_name>Processor</class_name>
<class_source>import org.apache.hop.core.plugins.IPlugin;
import org.apache.hop.core.plugins.PluginRegistry;
import org.apache.hop.core.plugins.TransformPluginType;
@@ -191,14 +191,14 @@ public boolean processRow() throws HopException
</definitions>
<fields>
<field>
- <fieldName>svg</fieldName>
- <fieldType>String</fieldType>
- <fieldLength>-1</fieldLength>
- <fieldPrecision>-1</fieldPrecision>
+ <field_name>svg</field_name>
+ <field_type>String</field_type>
+ <field_length>-1</field_length>
+ <field_precision>-1</field_precision>
</field>
</fields>
- <clearResultFields>Y</clearResultFields>
- <infoTransforms/>
+ <clear_result_fields>Y</clear_result_fields>
+ <info_transforms/>
<target_transforms/>
<usage_parameters/>
<attributes/>
diff --git a/integration-tests/scripting/0005-udjc-render-all-actions-in-svg.hpl b/integration-tests/scripting/0005-udjc-render-all-actions-in-svg.hpl
index 86f31f9..2048e3d 100644
--- a/integration-tests/scripting/0005-udjc-render-all-actions-in-svg.hpl
+++ b/integration-tests/scripting/0005-udjc-render-all-actions-in-svg.hpl
@@ -131,8 +131,8 @@
</partitioning>
<definitions>
<definition>
- <classType>TRANSFORM_CLASS</classType>
- <className>WorkflowSvgGenerator</className>
+ <class_type>TRANSFORM_CLASS</class_type>
+ <class_name>WorkflowSvgGenerator</class_name>
<class_source>import org.apache.hop.core.plugins.IPlugin;
import org.apache.hop.core.plugins.PluginRegistry;
import org.apache.hop.core.plugins.ActionPluginType;
@@ -194,14 +194,14 @@ public boolean processRow() throws HopException
</definitions>
<fields>
<field>
- <fieldName>svg</fieldName>
- <fieldType>String</fieldType>
- <fieldLength>-1</fieldLength>
- <fieldPrecision>-1</fieldPrecision>
+ <field_name>svg</field_name>
+ <field_type>String</field_type>
+ <field_length>-1</field_length>
+ <field_precision>-1</field_precision>
</field>
</fields>
- <clearResultFields>Y</clearResultFields>
- <infoTransforms/>
+ <clear_result_fields>Y</clear_result_fields>
+ <info_transforms/>
<target_transforms/>
<usage_parameters/>
<attributes/>
diff --git a/plugins/tech/google/src/main/resources/googleanalytics.svg b/plugins/tech/google/src/main/resources/googleanalytics.svg
index 1116dde..5e493fc 100644
--- a/plugins/tech/google/src/main/resources/googleanalytics.svg
+++ b/plugins/tech/google/src/main/resources/googleanalytics.svg
@@ -1,25 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="-9 -9 42 42" enable-background="new -9 -9 42 42" xml:space="preserve">
-<g>
- <g>
- <path fill="#EFF9FE" d="M0.8,0.8v14.4c0,0,0.1,0,0.2,0c3.7,0,6.8,3,6.8,6.8c0,0.4,0,0.8-0.1,1.1h5.9l9.6-9.3v-13H0.8z"/>
- <path fill="#3D6380" d="M-0.9-0.9v16.4c-1,0.3-1.9,0.8-2.7,1.5l0,0l-0.3,0.3c-0.9,0.9-1.5,2.1-1.8,3.3c0,0,0,0,0,0.1
+<svg
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ x="0px" y="0px"
+ width="42"
+ height="42"
+ viewBox="-9 -9 42 42"
+ enable-background="new -9 -9 42 42"
+ xml:space="preserve"
+>
+ <path fill="#EFF9FE" d="M0.8,0.8v14.4c0,0,0.1,0,0.2,0c3.7,0,6.8,3,6.8,6.8c0,0.4,0,0.8-0.1,1.1h5.9l9.6-9.3v-13H0.8z"/>
+ <path fill="#3D6380" d="M-0.9-0.9v16.4c-1,0.3-1.9,0.8-2.7,1.5l0,0l-0.3,0.3c-0.9,0.9-1.5,2.1-1.8,3.3c0,0,0,0,0,0.1
c0,0.2-0.1,0.4-0.1,0.6c0,0,0,0.1,0,0.1c0,0.2,0,0.4,0,0.7v0.4h0c0.2,3.5,3.1,6.4,6.7,6.4c2.7,0,5-1.6,6.1-3.9h4.7l1.8-1.7h0H7.6
c0.1-0.4,0.1-0.8,0.1-1.1c0-3.7-3-6.8-6.8-6.8c0,0-0.1,0-0.2,0V0.8h22.3v13v0l1.7-1.7V-0.9H-0.9z M-3.5,18.1
c1.4,1.3,2.8,2.7,3.6,3.5H-5C-4.9,20.3-4.4,19.1-3.5,18.1z M0.6,27.9c-3-0.2-5.3-2.6-5.5-5.6h5.5V27.9z M1.4,27.9V22
c0,0,0-0.1,0-0.1c0-0.1-0.1-0.1-0.1-0.2c-0.3-0.4-1.2-1.3-4.2-4.2c1-0.9,2.4-1.5,3.9-1.5c3.3,0,6,2.7,6,6
C7,25.1,4.5,27.7,1.4,27.9z"/>
- <path fill="#FDE7EA" d="M1,16c-1.5,0-2.9,0.6-3.9,1.5c3,2.9,3.9,3.8,4.2,4.2c0,0,0.1,0.1,0.1,0.2c0,0.1,0,0.1,0,0.1v5.9
+ <path fill="#FDE7EA" d="M1,16c-1.5,0-2.9,0.6-3.9,1.5c3,2.9,3.9,3.8,4.2,4.2c0,0,0.1,0.1,0.1,0.2c0,0.1,0,0.1,0,0.1v5.9
C4.5,27.7,7,25.1,7,22C7,18.7,4.3,16,1,16z"/>
- <path fill="#DBF3DB" d="M0.6,27.9v-5.6H-5C-4.8,25.4-2.4,27.7,0.6,27.9z"/>
- <path fill="#FFECCE" d="M-3.5,18.1c-0.9,1-1.4,2.2-1.5,3.5h5.1C-0.7,20.8-2.1,19.4-3.5,18.1z"/>
- </g>
- <polygon fill="#3D6480" points="28.1,23.6 28.1,26.7 22.9,21.5 21.5,22.8 26.8,28.1 23.6,28.1 23.6,30 30,30 30,23.6 "/>
- <path fill="#3D6380" d="M12.5,11.7v1.1h1.7v2.6c-0.7,0.1-1.4,0.2-2,0.2c-1.8,0-2.2-0.6-2.2-2V9.1c0-1.4,0.5-2,2.3-2
+ <path fill="#DBF3DB" d="M0.6,27.9v-5.6H-5C-4.8,25.4-2.4,27.7,0.6,27.9z"/>
+ <path fill="#FFECCE" d="M-3.5,18.1c-0.9,1-1.4,2.2-1.5,3.5h5.1C-0.7,20.8-2.1,19.4-3.5,18.1z"/>
+ <polygon fill="#3D6480" points="28.1,23.6 28.1,26.7 22.9,21.5 21.5,22.8 26.8,28.1 23.6,28.1 23.6,30 30,30 30,23.6 "/>
+ <path fill="#3D6380" d="M12.5,11.7v1.1h1.7v2.6c-0.7,0.1-1.4,0.2-2,0.2c-1.8,0-2.2-0.6-2.2-2V9.1c0-1.4,0.5-2,2.3-2
c0.9,0,1.8,0.1,2.9,0.3l0.2-1.2c-1-0.2-2-0.3-3-0.3c-2.7,0-3.7,1-3.7,3.2v4.7c0,2,0.8,3.1,3.6,3.1c1.1,0,2.3-0.2,3.4-0.5v-3.6v-1
v-0.1H12.5z"/>
-</g>
</svg>