[incubator-hop] branch master updated: HOP-3530 fixed sourceXmlTransform and targetXmlTransform references (#1214)

[hansva]

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 165c5c1  HOP-3530 fixed sourceXmlTransform and targetXmlTransform 
references (#1214)
165c5c1 is described below

commit 165c5c119321da185934312938b152d05bec8c47
Author: Bart Maertens <bart.maert...@know.bi>
AuthorDate: Sun Dec 12 11:56:53 2021 +0100

    HOP-3530 fixed sourceXmlTransform and targetXmlTransform references (#1214)
    
    * HOP-3530 fixed sourceXmlTransform and targetXmlTransform references
    
    * HOP-3530 get source and target transform names from meta
---
 .../apache/hop/pipeline/transforms/xml/xmljoin/XmlJoin.java  |  5 ++---
 .../hop/pipeline/transforms/xml/xmljoin/XmlJoinMeta.java     | 12 ++++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git 
a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmljoin/XmlJoin.java
 
b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmljoin/XmlJoin.java
index 99d137f..cb04083 100644
--- 
a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmljoin/XmlJoin.java
+++ 
b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmljoin/XmlJoin.java
@@ -82,13 +82,12 @@ public class XmlJoin extends BaseTransform<XmlJoinMeta, 
XmlJoinData>
 
       // Find the row sets to read from
       //
-      List<IStream> infoStreams = meta.getTransformIOMeta().getInfoStreams();
-      String targetStreamTransformName = infoStreams.get(0).getTransformName();
+      String targetStreamTransformName = meta.getTargetXmlTransform();
       if (StringUtils.isEmpty(targetStreamTransformName)) {
         throw new HopException(
             "Please specify which transform to read the XML target stream rows 
from");
       }
-      String sourceStreamTransformName = infoStreams.get(1).getTransformName();
+      String sourceStreamTransformName = meta.getSourceXmlTransform();
       if (StringUtils.isEmpty(sourceStreamTransformName)) {
         throw new HopException(
             "Please specify which transform to read the XML source stream rows 
from");
diff --git 
a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmljoin/XmlJoinMeta.java
 
b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmljoin/XmlJoinMeta.java
index 8e5b584..e7e98b4 100644
--- 
a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmljoin/XmlJoinMeta.java
+++ 
b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmljoin/XmlJoinMeta.java
@@ -118,10 +118,8 @@ public class XmlJoinMeta extends BaseTransformMeta 
implements ITransformMeta<Xml
       throws HopXmlException {
     try {
 
-      List<IStream> infoStreams = getTransformIOMeta().getInfoStreams();
-      infoStreams.get(0).setSubject(XmlHandler.getTagValue(transformNode, 
"targetXmlTransform"));
-      infoStreams.get(1).setSubject(XmlHandler.getTagValue(transformNode, 
"sourceXmlTransform"));
-
+      sourceXmlTransform = XmlHandler.getTagValue(transformNode, 
"sourceXmlTransform");
+      targetXmlTransform = XmlHandler.getTagValue(transformNode, 
"targetXmlTransform");
       valueXmlField = XmlHandler.getTagValue(transformNode, "valueXmlField");
       targetXmlField = XmlHandler.getTagValue(transformNode, "targetXmlField");
       sourceXmlField = XmlHandler.getTagValue(transformNode, "sourceXmlField");
@@ -187,10 +185,8 @@ public class XmlJoinMeta extends BaseTransformMeta 
implements ITransformMeta<Xml
   public String getXml() {
     StringBuffer xml = new StringBuffer(500);
 
-    List<IStream> infoStreams = getTransformIOMeta().getInfoStreams();
-    xml.append(XmlHandler.addTagValue("targetXmlTransform", 
infoStreams.get(0).getTransformName()));
-    xml.append(XmlHandler.addTagValue("sourceXmlTransform", 
infoStreams.get(1).getTransformName()));
-
+    xml.append("    ").append(XmlHandler.addTagValue("targetXmlTransform", 
targetXmlTransform));
+    xml.append("    ").append(XmlHandler.addTagValue("sourceXmlTransform", 
sourceXmlTransform));
     xml.append("    ").append(XmlHandler.addTagValue("valueXmlField", 
valueXmlField));
     xml.append("    ").append(XmlHandler.addTagValue("targetXmlField", 
targetXmlField));
     xml.append("    ").append(XmlHandler.addTagValue("sourceXmlField", 
sourceXmlField));