From bba4da26bde32dcda335501b44b7e5889ba4fb51 Mon Sep 17 00:00:00 2001
From: Matt Casters <matt.casters@vdab.be>
Date: Wed, 18 Dec 2024 10:19:27 +0100
Subject: [PATCH 1/3] Fix of issue #4725

---
 .../org/apache/hop/parquet/transforms/input/ParquetInput.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tech/parquet/src/main/java/org/apache/hop/parquet/transforms/input/ParquetInput.java b/plugins/tech/parquet/src/main/java/org/apache/hop/parquet/transforms/input/ParquetInput.java
index 249e7e228ea..3629f8f7c92 100644
--- a/plugins/tech/parquet/src/main/java/org/apache/hop/parquet/transforms/input/ParquetInput.java
+++ b/plugins/tech/parquet/src/main/java/org/apache/hop/parquet/transforms/input/ParquetInput.java
@@ -102,7 +102,7 @@ public boolean processRow() throws HopException {
   }
 
   public void closeFile() {
-    if (!data.readerClosed) {
+    if (!data.readerClosed && data.reader != null && data.inputStream != null) {
       try {
         data.reader.close();
         data.inputStream.close();

From d57a03338a4e86e53e6bd0fb107a362f9824a5f2 Mon Sep 17 00:00:00 2001
From: Matt Casters <matt.casters@vdab.be>
Date: Wed, 18 Dec 2024 10:32:01 +0100
Subject: [PATCH 2/3] Fix of issue #4725 (added integration test)

---
 .../0029-parquet-input-no-files.hpl           | 232 ++++++++++++++++++
 .../golden-parquet-input-no-files.csv         |   2 +
 .../transforms/main-0029-parquet.hwf          |  57 +++--
 .../golden-parquet-input-no-files.json        | 104 ++++++++
 .../0029-parquet-input-no-files UNIT.json     |  83 +++++++
 5 files changed, 449 insertions(+), 29 deletions(-)
 create mode 100644 integration-tests/transforms/0029-parquet-input-no-files.hpl
 create mode 100644 integration-tests/transforms/datasets/golden-parquet-input-no-files.csv
 create mode 100644 integration-tests/transforms/metadata/dataset/golden-parquet-input-no-files.json
 create mode 100644 integration-tests/transforms/metadata/unit-test/0029-parquet-input-no-files UNIT.json

diff --git a/integration-tests/transforms/0029-parquet-input-no-files.hpl b/integration-tests/transforms/0029-parquet-input-no-files.hpl
new file mode 100644
index 00000000000..252f6660a8d
--- /dev/null
+++ b/integration-tests/transforms/0029-parquet-input-no-files.hpl
@@ -0,0 +1,232 @@
+<?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>0029-parquet-input-no-files</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>2024/12/18 10:21:38.301</created_date>
+    <modified_user>-</modified_user>
+    <modified_date>2024/12/18 10:21:38.301</modified_date>
+  </info>
+  <notepads>
+  </notepads>
+  <order>
+    <hop>
+      <from>No filenames</from>
+      <to>Parquet File Input</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Parquet File Input</from>
+      <to>Detect empty stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Detect empty stream</from>
+      <to>Count</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Count</from>
+      <to>Output</to>
+      <enabled>Y</enabled>
+    </hop>
+  </order>
+  <transform>
+    <name>Count</name>
+    <type>GroupBy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <add_linenr>N</add_linenr>
+    <all_rows>Y</all_rows>
+    <directory>${java.io.tmpdir}</directory>
+    <fields>
+      <field>
+        <aggregate>count</aggregate>
+        <subject>id</subject>
+        <type>COUNT_ALL</type>
+      </field>
+    </fields>
+    <give_back_row>N</give_back_row>
+    <group>
+</group>
+    <ignore_aggregate>N</ignore_aggregate>
+    <prefix>grp</prefix>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>80</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>416</xloc>
+      <yloc>80</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>No filenames</name>
+    <type>DataGrid</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <data>
+      <line>
+        <item/>
+      </line>
+    </data>
+    <fields>
+      <field>
+        <length>-1</length>
+        <precision>-1</precision>
+        <set_empty_string>N</set_empty_string>
+        <name>filename</name>
+        <type>String</type>
+      </field>
+    </fields>
+    <attributes/>
+    <GUI>
+      <xloc>112</xloc>
+      <yloc>80</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Parquet File Input</name>
+    <type>ParquetFileInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <fields>
+      <field>
+        <source_field>id</source_field>
+        <target_field>id</target_field>
+        <target_type>Integer</target_type>
+      </field>
+      <field>
+        <source_field>lastname</source_field>
+        <target_field>lastname</target_field>
+        <target_type>String</target_type>
+      </field>
+      <field>
+        <source_field>firstname</source_field>
+        <target_field>firstname</target_field>
+        <target_type>String</target_type>
+      </field>
+      <field>
+        <source_field>zip</source_field>
+        <target_field>zip</target_field>
+        <target_type>Integer</target_type>
+      </field>
+      <field>
+        <source_field>city</source_field>
+        <target_field>city</target_field>
+        <target_type>String</target_type>
+      </field>
+      <field>
+        <source_field>birthdate</source_field>
+        <target_field>birthdate</target_field>
+        <target_type>Integer</target_type>
+      </field>
+      <field>
+        <source_field>street</source_field>
+        <target_field>street</target_field>
+        <target_type>String</target_type>
+      </field>
+      <field>
+        <source_field>housenr</source_field>
+        <target_field>housenr</target_field>
+        <target_type>Integer</target_type>
+      </field>
+      <field>
+        <source_field>stateCode</source_field>
+        <target_field>stateCode</target_field>
+        <target_type>String</target_type>
+      </field>
+      <field>
+        <source_field>stateDesc</source_field>
+        <target_field>stateDesc</target_field>
+        <target_type>String</target_type>
+      </field>
+    </fields>
+    <filename_field>filename</filename_field>
+    <attributes/>
+    <GUI>
+      <xloc>272</xloc>
+      <yloc>80</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Output</name>
+    <type>Dummy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <attributes/>
+    <GUI>
+      <xloc>672</xloc>
+      <yloc>80</yloc>
+    </GUI>
+  </transform>
+  <transform_error_handling>
+  </transform_error_handling>
+  <attributes/>
+</pipeline>
diff --git a/integration-tests/transforms/datasets/golden-parquet-input-no-files.csv b/integration-tests/transforms/datasets/golden-parquet-input-no-files.csv
new file mode 100644
index 00000000000..1466dc703c4
--- /dev/null
+++ b/integration-tests/transforms/datasets/golden-parquet-input-no-files.csv
@@ -0,0 +1,2 @@
+filename,id,lastname,firstname,zip,city,birthdate,street,housenr,stateCode,stateDesc,count
+"",,,,,,,,,,," 0000000000"
diff --git a/integration-tests/transforms/main-0029-parquet.hwf b/integration-tests/transforms/main-0029-parquet.hwf
index f2aff8f5586..f6dcd9d6815 100644
--- a/integration-tests/transforms/main-0029-parquet.hwf
+++ b/integration-tests/transforms/main-0029-parquet.hwf
@@ -35,14 +35,14 @@ limitations under the License.
       <description/>
       <type>SPECIAL</type>
       <attributes/>
-      <repeat>N</repeat>
-      <schedulerType>0</schedulerType>
-      <intervalSeconds>0</intervalSeconds>
-      <intervalMinutes>60</intervalMinutes>
+      <DayOfMonth>1</DayOfMonth>
       <hour>12</hour>
+      <intervalMinutes>60</intervalMinutes>
+      <intervalSeconds>0</intervalSeconds>
       <minutes>0</minutes>
+      <repeat>N</repeat>
+      <schedulerType>0</schedulerType>
       <weekDay>1</weekDay>
-      <DayOfMonth>1</DayOfMonth>
       <parallel>N</parallel>
       <xloc>128</xloc>
       <yloc>80</yloc>
@@ -53,24 +53,22 @@ limitations under the License.
       <description/>
       <type>PIPELINE</type>
       <attributes/>
-      <filename>${PROJECT_HOME}/0029-parquet-output.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>
+      <clear_files>N</clear_files>
+      <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
-      <run_configuration>local</run_configuration>
+      <exec_per_row>N</exec_per_row>
+      <filename>${PROJECT_HOME}/0029-parquet-output.hpl</filename>
+      <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
       </parameters>
+      <params_from_previous>N</params_from_previous>
+      <run_configuration>local</run_configuration>
+      <set_append_logfile>N</set_append_logfile>
+      <set_logfile>N</set_logfile>
+      <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
       <xloc>272</xloc>
       <yloc>80</yloc>
@@ -88,6 +86,9 @@ limitations under the License.
         <test_name>
           <name>0029-parquet-input-nulls UNIT</name>
         </test_name>
+        <test_name>
+          <name>0029-parquet-input-no-files UNIT</name>
+        </test_name>
       </test_names>
       <parallel>N</parallel>
       <xloc>640</xloc>
@@ -99,24 +100,22 @@ limitations under the License.
       <description/>
       <type>PIPELINE</type>
       <attributes/>
-      <filename>${PROJECT_HOME}/0029-parquet-output-nulls.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>
+      <clear_files>N</clear_files>
+      <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
-      <run_configuration>local</run_configuration>
+      <exec_per_row>N</exec_per_row>
+      <filename>${PROJECT_HOME}/0029-parquet-output-nulls.hpl</filename>
+      <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
       </parameters>
+      <params_from_previous>N</params_from_previous>
+      <run_configuration>local</run_configuration>
+      <set_append_logfile>N</set_append_logfile>
+      <set_logfile>N</set_logfile>
+      <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
       <xloc>448</xloc>
       <yloc>80</yloc>
diff --git a/integration-tests/transforms/metadata/dataset/golden-parquet-input-no-files.json b/integration-tests/transforms/metadata/dataset/golden-parquet-input-no-files.json
new file mode 100644
index 00000000000..3c1f7f30f8c
--- /dev/null
+++ b/integration-tests/transforms/metadata/dataset/golden-parquet-input-no-files.json
@@ -0,0 +1,104 @@
+{
+  "base_filename": "golden-parquet-input-no-files.csv",
+  "name": "golden-parquet-input-no-files",
+  "description": "",
+  "dataset_fields": [
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 2,
+      "field_precision": -1,
+      "field_name": "filename",
+      "field_format": ""
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 5,
+      "field_precision": 0,
+      "field_name": "id",
+      "field_format": "####0;-####0"
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 2,
+      "field_precision": -1,
+      "field_name": "lastname",
+      "field_format": ""
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 2,
+      "field_precision": -1,
+      "field_name": "firstname",
+      "field_format": ""
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 5,
+      "field_precision": 0,
+      "field_name": "zip",
+      "field_format": "####0;-####0"
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 2,
+      "field_precision": -1,
+      "field_name": "city",
+      "field_format": ""
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 5,
+      "field_precision": 0,
+      "field_name": "birthdate",
+      "field_format": "####0;-####0"
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 2,
+      "field_precision": -1,
+      "field_name": "street",
+      "field_format": ""
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 5,
+      "field_precision": 0,
+      "field_name": "housenr",
+      "field_format": "####0;-####0"
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 2,
+      "field_precision": -1,
+      "field_name": "stateCode",
+      "field_format": ""
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 2,
+      "field_precision": -1,
+      "field_name": "stateDesc",
+      "field_format": ""
+    },
+    {
+      "field_comment": "",
+      "field_length": 10,
+      "field_type": 5,
+      "field_precision": 0,
+      "field_name": "count",
+      "field_format": " 0000000000;-0000000000"
+    }
+  ],
+  "folder_name": ""
+}
\ No newline at end of file
diff --git a/integration-tests/transforms/metadata/unit-test/0029-parquet-input-no-files UNIT.json b/integration-tests/transforms/metadata/unit-test/0029-parquet-input-no-files UNIT.json
new file mode 100644
index 00000000000..26192e82b48
--- /dev/null
+++ b/integration-tests/transforms/metadata/unit-test/0029-parquet-input-no-files UNIT.json	
@@ -0,0 +1,83 @@
+{
+  "database_replacements": [],
+  "autoOpening": true,
+  "description": "",
+  "persist_filename": "",
+  "test_type": "UNIT_TEST",
+  "variableValues": [],
+  "basePath": "",
+  "golden_data_sets": [
+    {
+      "field_mappings": [
+        {
+          "transform_field": "filename",
+          "data_set_field": "filename"
+        },
+        {
+          "transform_field": "id",
+          "data_set_field": "id"
+        },
+        {
+          "transform_field": "lastname",
+          "data_set_field": "lastname"
+        },
+        {
+          "transform_field": "firstname",
+          "data_set_field": "firstname"
+        },
+        {
+          "transform_field": "zip",
+          "data_set_field": "zip"
+        },
+        {
+          "transform_field": "city",
+          "data_set_field": "city"
+        },
+        {
+          "transform_field": "birthdate",
+          "data_set_field": "birthdate"
+        },
+        {
+          "transform_field": "street",
+          "data_set_field": "street"
+        },
+        {
+          "transform_field": "housenr",
+          "data_set_field": "housenr"
+        },
+        {
+          "transform_field": "stateCode",
+          "data_set_field": "stateCode"
+        },
+        {
+          "transform_field": "stateDesc",
+          "data_set_field": "stateDesc"
+        },
+        {
+          "transform_field": "count",
+          "data_set_field": "count"
+        }
+      ],
+      "field_order": [
+        "filename",
+        "id",
+        "lastname",
+        "firstname",
+        "zip",
+        "city",
+        "birthdate",
+        "street",
+        "housenr",
+        "stateCode",
+        "stateDesc",
+        "count"
+      ],
+      "data_set_name": "golden-parquet-input-no-files",
+      "transform_name": "Output"
+    }
+  ],
+  "input_data_sets": [],
+  "name": "0029-parquet-input-no-files UNIT",
+  "trans_test_tweaks": [],
+  "pipeline_filename": "./0029-parquet-input-no-files.hpl"
+}
\ No newline at end of file

From 537c2f5b62e0117351dd3e806f6cdcadd82b1f72 Mon Sep 17 00:00:00 2001
From: Matt Casters <matt.casters@vdab.be>
Date: Wed, 18 Dec 2024 10:39:18 +0100
Subject: [PATCH 3/3] Fix of issue #4726

---
 .../apache/hop/testing/actions/runtests/RunPipelineTests.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/misc/testing/src/main/java/org/apache/hop/testing/actions/runtests/RunPipelineTests.java b/plugins/misc/testing/src/main/java/org/apache/hop/testing/actions/runtests/RunPipelineTests.java
index fb46c051bc8..dadb9436f10 100644
--- a/plugins/misc/testing/src/main/java/org/apache/hop/testing/actions/runtests/RunPipelineTests.java
+++ b/plugins/misc/testing/src/main/java/org/apache/hop/testing/actions/runtests/RunPipelineTests.java
@@ -142,7 +142,7 @@ public Result execute(Result prevResult, int nr) throws HopException {
   public String[] getReferencedObjectDescriptions() {
     String[] descriptions = new String[testNames.size()];
     for (int i = 0; i < descriptions.length; i++) {
-      descriptions[i] = "Pipeline of unit test : " + testNames.get(i);
+      descriptions[i] = "Pipeline of unit test : " + testNames.get(i).getTestName();
     }
     return descriptions;
   }