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/09/28 14:24:26 UTC

[incubator-hop] branch master updated: HOP-3307 - User Defined Java Class: init method is broken HOP-3311 - User Defined Java Class: dispose method is broken

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 761238e  HOP-3307 - User Defined Java Class: init method is broken HOP-3311 - User Defined Java Class: dispose method is broken
     new c4b73b5  Merge pull request #1085 from sramazzina/UDJC-SANDBOX
761238e is described below

commit 761238e1f089fac3f8379f46fd299567bdd84727
Author: sergio.ramazzina <se...@serasoft.it>
AuthorDate: Mon Sep 27 15:15:36 2021 +0200

    HOP-3307 - User Defined Java Class: init method is broken
    HOP-3311 - User Defined Java Class: dispose method is broken
---
 .../userdefinedjavaclass/UserDefinedJavaClass.java  |  2 +-
 .../userdefinedjavaclass/codeSnippits.xml           | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/plugins/transforms/janino/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClass.java b/plugins/transforms/janino/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClass.java
index 6671a83..5b17e05 100644
--- a/plugins/transforms/janino/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClass.java
+++ b/plugins/transforms/janino/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClass.java
@@ -152,7 +152,7 @@ public class UserDefinedJavaClass
     return super.decrementLinesWritten();
   }
 
-  public void disposeImpl(ITransform smi, ITransformData sdi) {
+  public void disposeImpl() {
     super.dispose();
   }
 
diff --git a/plugins/transforms/janino/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/codeSnippits.xml b/plugins/transforms/janino/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/codeSnippits.xml
index a8ffe02..898c682 100644
--- a/plugins/transforms/janino/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/codeSnippits.xml
+++ b/plugins/transforms/janino/src/main/resources/org/apache/hop/pipeline/transforms/userdefinedjavaclass/codeSnippits.xml
@@ -248,24 +248,26 @@ public boolean processRow() throws HopException {
     <codeSnippit>
         <name>Implement init</name>
         <category>COMMON</category>
-        <code><![CDATA[public boolean init(TransformMetaInterface transformMetaInterface, TransformDataInterface transformDataInterface) {
-  return parent.initImpl(transformMetaInterface, transformDataInterface);
+        <code><![CDATA[public boolean init() {
+  return parent.initImpl();
 }
 ]]></code>
-        <sample><![CDATA[public boolean init(TransformMetaInterface transformMetaInterface, TransformDataInterface transformDataInterface) {
-  return parent.initImpl(transformMetaInterface, transformDataInterface);
+        <sample><![CDATA[/** Initialize and do work where other transforms need to wait for... */
+public boolean init() {
+  return parent.initImpl();
 }
 ]]></sample>
     </codeSnippit>
     <codeSnippit>
         <name>Implement dispose</name>
         <category>COMMON</category>
-        <code><![CDATA[public void dispose(TransformMetaInterface smi, TransformDataInterface sdi) {
-  parent.disposeImpl(smi, sdi);
+        <code><![CDATA[public void dispose() {
+  parent.disposeImpl();
 }
 ]]></code>
-        <sample><![CDATA[public void dispose(TransformMetaInterface smi, TransformDataInterface sdi) {
-  parent.disposeImpl(smi, sdi);
+        <sample><![CDATA[/** Dispose of this transform: close files, empty logs, etc. */
+public void dispose() {
+  parent.disposeImpl();
 }
 ]]></sample>
     </codeSnippit>
@@ -285,8 +287,7 @@ public boolean processRow() throws HopException {
     return true;
 }
 ]]></code>
-        <sample><![CDATA[
-//
+        <sample><![CDATA[//
 // Perform the equivalent of processing one row. Typically this means reading a row from input
 // (getRow()) and passing a row to output (putRow)).
 //