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/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 1a7f5c1fbc fix #2142 : import pentaho ktr to apache hop
'TypeExitExcelWriterTransform' transform
new 79bd86e936 Merge pull request #2198 from sramazzina/2142.1
1a7f5c1fbc is described below
commit 1a7f5c1fbc441dfd28760bfd01d81633f97a751b
Author: sramazzina <[email protected]>
AuthorDate: Wed Jan 25 18:15:46 2023 +0100
fix #2142 : import pentaho ktr to apache hop 'TypeExitExcelWriterTransform'
transform
---
.../transforms/0065-check-excel-file-exists.hpl | 175 +++++++++++++++++++
.../transforms/0065-create-excel-file.hpl | 153 +++++++++++++++++
.../main-0065-excel-writer-output-basic.hwf | 187 +++++++++++++++++++++
.../org/apache/hop/imports/kettle/KettleConst.java | 10 +-
4 files changed, 519 insertions(+), 6 deletions(-)
diff --git a/integration-tests/transforms/0065-check-excel-file-exists.hpl
b/integration-tests/transforms/0065-check-excel-file-exists.hpl
new file mode 100644
index 0000000000..5b54be5913
--- /dev/null
+++ b/integration-tests/transforms/0065-check-excel-file-exists.hpl
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+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.
+
+-->
+<pipeline>
+ <info>
+ <name>0064-check-excel-file-exists.hpl</name>
+ <name_sync_with_filename>Y</name_sync_with_filename>
+ <description/>
+ <extended_description/>
+ <pipeline_version/>
+ <pipeline_type>Normal</pipeline_type>
+ <parameters>
+ </parameters>
+ <capture_transform_performance>N</capture_transform_performance>
+
<transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+
<transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+ <created_user>-</created_user>
+ <created_date>2023/01/12 09:32:57.327</created_date>
+ <modified_user>-</modified_user>
+ <modified_date>2023/01/12 09:32:57.327</modified_date>
+ </info>
+ <notepads>
+ </notepads>
+ <order>
+ <hop>
+ <from>File exists!</from>
+ <to>Cleanup temporary file</to>
+ <enabled>Y</enabled>
+ </hop>
+ <hop>
+ <from>Look for test file in target dir</from>
+ <to>Detect empty stream</to>
+ <enabled>Y</enabled>
+ </hop>
+ <hop>
+ <from>Detect empty stream</from>
+ <to>Abort because expected file not found!</to>
+ <enabled>Y</enabled>
+ </hop>
+ <hop>
+ <from>Look for test file in target dir</from>
+ <to>File exists!</to>
+ <enabled>Y</enabled>
+ </hop>
+ </order>
+ <transform>
+ <name>Abort because expected file not found!</name>
+ <type>Abort</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <abort_option>ABORT_WITH_ERROR</abort_option>
+ <always_log_rows>Y</always_log_rows>
+ <message>Expected file not found!</message>
+ <row_threshold>0</row_threshold>
+ <attributes/>
+ <GUI>
+ <xloc>336</xloc>
+ <yloc>368</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>Cleanup temporary file</name>
+ <type>ProcessFiles</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <addresultfilenames>N</addresultfilenames>
+ <createparentfolder>N</createparentfolder>
+ <operation_type>delete</operation_type>
+ <overwritetargetfile>N</overwritetargetfile>
+ <simulate>N</simulate>
+ <sourcefilenamefield>filename</sourcefilenamefield>
+ <attributes/>
+ <GUI>
+ <xloc>720</xloc>
+ <yloc>144</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>Detect empty stream</name>
+ <type>DetectEmptyStream</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <attributes/>
+ <GUI>
+ <xloc>336</xloc>
+ <yloc>256</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>File exists!</name>
+ <type>Dummy</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <attributes/>
+ <GUI>
+ <xloc>560</xloc>
+ <yloc>144</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>Look for test file in target dir</name>
+ <type>GetFileNames</type>
+ <description/>
+ <distribute>N</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <doNotFailIfNoFile>N</doNotFailIfNoFile>
+ <dynamic_include_subfolders>N</dynamic_include_subfolders>
+ <file>
+ <file_required>N</file_required>
+ <include_subfolders>N</include_subfolders>
+ <name>${PROJECT_HOME}/files/excel/temp-excel-output.xlsx</name>
+ </file>
+ <filefield>N</filefield>
+ <filter>
+ <filterfiletype>all_files</filterfiletype>
+ </filter>
+ <isaddresult>Y</isaddresult>
+ <limit>0</limit>
+ <raiseAnExceptionIfNoFile>N</raiseAnExceptionIfNoFile>
+ <rownum>N</rownum>
+ <attributes/>
+ <GUI>
+ <xloc>336</xloc>
+ <yloc>144</yloc>
+ </GUI>
+ </transform>
+ <transform_error_handling>
+ </transform_error_handling>
+ <attributes/>
+</pipeline>
diff --git a/integration-tests/transforms/0065-create-excel-file.hpl
b/integration-tests/transforms/0065-create-excel-file.hpl
new file mode 100644
index 0000000000..dda0d7c02e
--- /dev/null
+++ b/integration-tests/transforms/0065-create-excel-file.hpl
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+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.
+
+-->
+<pipeline>
+ <info>
+ <name>0064-create-excel-file.hpl</name>
+ <name_sync_with_filename>Y</name_sync_with_filename>
+ <description/>
+ <extended_description/>
+ <pipeline_version/>
+ <pipeline_type>Normal</pipeline_type>
+ <parameters>
+ </parameters>
+ <capture_transform_performance>N</capture_transform_performance>
+
<transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+
<transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+ <created_user>-</created_user>
+ <created_date>2023/01/12 09:30:06.480</created_date>
+ <modified_user>-</modified_user>
+ <modified_date>2023/01/12 09:30:06.480</modified_date>
+ </info>
+ <notepads>
+ </notepads>
+ <order>
+ <hop>
+ <from>Data grid</from>
+ <to>Write test excel file</to>
+ <enabled>Y</enabled>
+ </hop>
+ </order>
+ <transform>
+ <name>Data grid</name>
+ <type>DataGrid</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <data>
+ <line>
+ <item>A</item>
+ </line>
+ </data>
+ <fields>
+ <field>
+ <length>-1</length>
+ <precision>-1</precision>
+ <set_empty_string>N</set_empty_string>
+ <name>f1</name>
+ <type>String</type>
+ </field>
+ </fields>
+ <attributes/>
+ <GUI>
+ <xloc>256</xloc>
+ <yloc>192</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>Write test excel file</name>
+ <type>TypeExitExcelWriterTransform</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <add_to_result_filenames>Y</add_to_result_filenames>
+ <appendEmpty>0</appendEmpty>
+ <appendLines>N</appendLines>
+ <appendOffset>0</appendOffset>
+ <appendOmitHeader>N</appendOmitHeader>
+ <fields>
+ <field>
+ <commentAuthorField/>
+ <commentField/>
+ <format/>
+ <formula>N</formula>
+ <hyperlinkField/>
+ <name>f1</name>
+ <styleCell/>
+ <title>f1</title>
+ <titleStyleCell/>
+ <type>String</type>
+ </field>
+ </fields>
+ <file>
+ <SpecifyFormat>N</SpecifyFormat>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <autosizecolums>N</autosizecolums>
+ <createParentFolder>Y</createParentFolder>
+ <date_time_format/>
+ <do_not_open_newfile_init>Y</do_not_open_newfile_init>
+ <extension>xlsx</extension>
+ <filename_field/>
+ <filename_in_field>N</filename_in_field>
+ <if_file_exists>new</if_file_exists>
+ <if_sheet_exists>new</if_sheet_exists>
+ <name>${PROJECT_HOME}/files/excel/temp-excel-output</name>
+ <password/>
+ <protect_sheet>N</protect_sheet>
+ <protected_by/>
+ <sheetname>Sheet1</sheetname>
+ <split>N</split>
+ <splitevery>0</splitevery>
+ <stream_data>N</stream_data>
+ </file>
+ <footer>N</footer>
+ <forceFormulaRecalculation>N</forceFormulaRecalculation>
+ <header>Y</header>
+ <leaveExistingStylesUnchanged>N</leaveExistingStylesUnchanged>
+ <makeSheetActive>Y</makeSheetActive>
+ <rowWritingMethod>overwrite</rowWritingMethod>
+ <startingCell>A1</startingCell>
+ <template>
+ <enabled>N</enabled>
+ <filename>template.xls</filename>
+ <hidden>N</hidden>
+ <sheet_enabled>N</sheet_enabled>
+ <sheetname/>
+ </template>
+ <attributes/>
+ <GUI>
+ <xloc>448</xloc>
+ <yloc>192</yloc>
+ </GUI>
+ </transform>
+ <transform_error_handling>
+ </transform_error_handling>
+ <attributes/>
+</pipeline>
diff --git
a/integration-tests/transforms/main-0065-excel-writer-output-basic.hwf
b/integration-tests/transforms/main-0065-excel-writer-output-basic.hwf
new file mode 100644
index 0000000000..604b37be9c
--- /dev/null
+++ b/integration-tests/transforms/main-0065-excel-writer-output-basic.hwf
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+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.
+
+-->
+<workflow>
+ <name>main-0065-excel-writer-output-basic</name>
+ <name_sync_with_filename>Y</name_sync_with_filename>
+ <description/>
+ <extended_description/>
+ <workflow_version/>
+ <created_user>-</created_user>
+ <created_date>2023/01/12 09:24:03.397</created_date>
+ <modified_user>-</modified_user>
+ <modified_date>2023/01/12 09:24:03.397</modified_date>
+ <parameters>
+ </parameters>
+ <actions>
+ <action>
+ <name>Start</name>
+ <description/>
+ <type>SPECIAL</type>
+ <attributes/>
+ <DayOfMonth>1</DayOfMonth>
+ <hour>12</hour>
+ <intervalMinutes>60</intervalMinutes>
+ <intervalSeconds>0</intervalSeconds>
+ <minutes>0</minutes>
+ <repeat>N</repeat>
+ <schedulerType>0</schedulerType>
+ <weekDay>1</weekDay>
+ <parallel>N</parallel>
+ <xloc>208</xloc>
+ <yloc>96</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>0065-create-excel-file.hpl</name>
+ <description/>
+ <type>PIPELINE</type>
+ <attributes/>
+ <filename>${PROJECT_HOME}/0065-create-excel-file.hpl</filename>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <clear_rows>N</clear_rows>
+ <clear_files>N</clear_files>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Basic</loglevel>
+ <set_append_logfile>N</set_append_logfile>
+ <wait_until_finished>Y</wait_until_finished>
+ <create_parent_folder>N</create_parent_folder>
+ <run_configuration>local</run_configuration>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <parallel>N</parallel>
+ <xloc>368</xloc>
+ <yloc>96</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>0065-check-excel-file-exists.hpl</name>
+ <description/>
+ <type>PIPELINE</type>
+ <attributes/>
+ <filename>${PROJECT_HOME}/0065-check-excel-file-exists.hpl</filename>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <clear_rows>N</clear_rows>
+ <clear_files>N</clear_files>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Basic</loglevel>
+ <set_append_logfile>N</set_append_logfile>
+ <wait_until_finished>Y</wait_until_finished>
+ <create_parent_folder>N</create_parent_folder>
+ <run_configuration>local</run_configuration>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <parallel>N</parallel>
+ <xloc>592</xloc>
+ <yloc>96</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>Dummy</name>
+ <description/>
+ <type>DUMMY</type>
+ <attributes/>
+ <parallel>N</parallel>
+ <xloc>464</xloc>
+ <yloc>208</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>Success</name>
+ <description/>
+ <type>SUCCESS</type>
+ <attributes/>
+ <parallel>N</parallel>
+ <xloc>752</xloc>
+ <yloc>96</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>Error</name>
+ <description/>
+ <type>ABORT</type>
+ <attributes/>
+ <always_log_rows>N</always_log_rows>
+ <message>Something wrong happened!</message>
+ <parallel>N</parallel>
+ <xloc>464</xloc>
+ <yloc>320</yloc>
+ <attributes_hac/>
+ </action>
+ </actions>
+ <hops>
+ <hop>
+ <from>Start</from>
+ <to>0065-create-excel-file.hpl</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>Y</unconditional>
+ </hop>
+ <hop>
+ <from>0065-create-excel-file.hpl</from>
+ <to>0065-check-excel-file-exists.hpl</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>0065-create-excel-file.hpl</from>
+ <to>Dummy</to>
+ <enabled>Y</enabled>
+ <evaluation>N</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>0065-check-excel-file-exists.hpl</from>
+ <to>Dummy</to>
+ <enabled>Y</enabled>
+ <evaluation>N</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ <hop>
+ <from>Dummy</from>
+ <to>Error</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>Y</unconditional>
+ </hop>
+ <hop>
+ <from>0065-check-excel-file-exists.hpl</from>
+ <to>Success</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ </hops>
+ <notepads>
+ </notepads>
+ <attributes/>
+</workflow>
diff --git
a/plugins/misc/import/src/main/java/org/apache/hop/imports/kettle/KettleConst.java
b/plugins/misc/import/src/main/java/org/apache/hop/imports/kettle/KettleConst.java
index 2591eae639..b786883781 100644
---
a/plugins/misc/import/src/main/java/org/apache/hop/imports/kettle/KettleConst.java
+++
b/plugins/misc/import/src/main/java/org/apache/hop/imports/kettle/KettleConst.java
@@ -67,6 +67,8 @@ public class KettleConst {
{"step_tag", "transform_tag"},
{"step_name", "transform_name"},
{"step_description", "transform_description"},
+ // ExcelWriter
+ {"extention", "extension"}
})
.collect(Collectors.toMap(data -> (String) data[0], data -> (String)
data[1]));
@@ -181,16 +183,12 @@ public class KettleConst {
{"INC_STEPNR_IN_FILENAME", "INC_TRANSFORMNR_IN_FILENAME"}, //
jsonoutput & xmloutput
{"SOURCE_XML_STEP", "SOURCE_XML_TRANSFORM"}, // xmljoin
{"TARGET_XML_STEP", "TARGET_XML_TRANSFORM"}, // xmljoin
- {
- "OUTPUT_INCLUDE_STEPNR", "OUTPUT_INCLUDE_TRANSFORMNR"
- }, // webservice
+ {"OUTPUT_INCLUDE_STEPNR", "OUTPUT_INCLUDE_TRANSFORMNR"}, //
webservice
{
"SWITCH_CASE_TARGET.CASE_TARGET_STEP_NAME",
"SWITCH_CASE_TARGET.CASE_TARGET_TRANSFORM_NAME"
}, // switchcase
- {
- "DEFAULT_TARGET_STEP_NAME", "DEFAULT_TARGET_TRANSFORM_NAME"
- } // switchcase
+ {"DEFAULT_TARGET_STEP_NAME", "DEFAULT_TARGET_TRANSFORM_NAME"}
// switchcase
})
.collect(Collectors.toMap(data -> (String) data[0], data -> (String)
data[1]));
