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 2022/01/26 12:14:17 UTC
[hop] branch master updated: [HOP-3704] remove poi dependency from jsoninput
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 ae1c4c8 [HOP-3704] remove poi dependency from jsoninput
new 691b267 Merge pull request #1293 from pjfanning/HOP-3704-remove-poi-from-jsoninput
ae1c4c8 is described below
commit ae1c4c877b8b170638c931941add6e4773495fd1
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Wed Jan 26 11:39:43 2022 +0100
[HOP-3704] remove poi dependency from jsoninput
---
assemblies/plugins/transforms/json/pom.xml | 6 ------
assemblies/plugins/transforms/json/src/assembly/assembly.xml | 1 -
plugins/transforms/json/pom.xml | 7 -------
.../org/apache/hop/pipeline/transforms/jsoninput/JsonInput.java | 6 +++---
4 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/assemblies/plugins/transforms/json/pom.xml b/assemblies/plugins/transforms/json/pom.xml
index 4e98512..21e7f3b 100644
--- a/assemblies/plugins/transforms/json/pom.xml
+++ b/assemblies/plugins/transforms/json/pom.xml
@@ -42,7 +42,6 @@
<guava.version>31.0.1-jre</guava.version>
<javax.servlet-api.version>3.0.1</javax.servlet-api.version>
<mockito-all.version>1.9.5</mockito-all.version>
- <poi.version>5.2.0</poi.version>
<dependency.com.tinkerpop.blueprints.version>2.6.0</dependency.com.tinkerpop.blueprints.version>
<dependency.org.powermock.version>1.6.0</dependency.org.powermock.version>
<json-smart.version>2.2</json-smart.version>
@@ -75,11 +74,6 @@
<version>${jackson-core.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>${poi.version}</version>
- </dependency>
- <dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>${json-path.version}</version>
diff --git a/assemblies/plugins/transforms/json/src/assembly/assembly.xml b/assemblies/plugins/transforms/json/src/assembly/assembly.xml
index 68156d3..e2de15d 100644
--- a/assemblies/plugins/transforms/json/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/json/src/assembly/assembly.xml
@@ -50,7 +50,6 @@
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.apache.poi:poi:jar</include>
<include>com.jayway.jsonpath:json-path:jar</include>
<include>net.minidev:json-smart:jar</include>
</includes>
diff --git a/plugins/transforms/json/pom.xml b/plugins/transforms/json/pom.xml
index c91a37b..eef9e05 100644
--- a/plugins/transforms/json/pom.xml
+++ b/plugins/transforms/json/pom.xml
@@ -38,7 +38,6 @@
<guava.version>31.0.1-jre</guava.version>
<javax.servlet-api.version>3.0.1</javax.servlet-api.version>
<mockito-all.version>1.9.5</mockito-all.version>
- <poi.version>5.2.0</poi.version>
<dependency.com.tinkerpop.blueprints.version>2.6.0</dependency.com.tinkerpop.blueprints.version>
<dependency.org.powermock.version>1.6.0</dependency.org.powermock.version>
<json-smart.version>2.2</json-smart.version>
@@ -60,12 +59,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>${poi.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>${json-path.version}</version>
diff --git a/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInput.java b/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInput.java
index 2d46ee0..d4180d0 100644
--- a/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInput.java
+++ b/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInput.java
@@ -41,7 +41,6 @@ import org.apache.hop.pipeline.transforms.jsoninput.exception.JsonInputException
import org.apache.hop.pipeline.transforms.jsoninput.reader.FastJsonReader;
import org.apache.hop.pipeline.transforms.jsoninput.reader.InputsReader;
import org.apache.hop.pipeline.transforms.jsoninput.reader.RowOutputConverter;
-import org.apache.poi.util.IOUtils;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -260,13 +259,14 @@ public class JsonInput extends BaseFileInputTransform<JsonInputMeta, JsonInputDa
private void parseNextInputToRowSet(InputStream input) throws HopException {
try {
data.readerRowSet = data.reader.parse(input);
- input.close();
} catch (HopException ke) {
logInputError(ke);
throw new JsonInputException(ke);
} catch (Exception e) {
logInputError(e);
throw new JsonInputException(e);
+ } finally {
+ closeQuietly(input);
}
}
@@ -463,7 +463,7 @@ public class JsonInput extends BaseFileInputTransform<JsonInputMeta, JsonInputDa
@Override
public void dispose() {
if (data.file != null) {
- IOUtils.closeQuietly(data.file);
+ closeQuietly(data.file);
}
data.inputs = null;
data.reader = null;