Merge pull request #4915 from hansva/main

fixes after XML cleanup

Author: hansva

plugins/transforms/joinrows/src/main/java/org/apache/hop/pipeline/transforms/joinrows/JoinRowsMeta.java

@@ -248,11 +248,11 @@ public boolean cleanAfterHopToRemove(TransformMeta fromTransform) {
   public static final class ConditionXmlConverter implements IStringObjectConverter {
     @Override
     public String getString(Object object) throws HopException {
-      if (!(object instanceof Condition)) {
+      if (!(object instanceof JRCompare)) {
         throw new HopException("We only support XML serialization of Condition objects here");
       }
       try {
-        return ((Condition) object).getXml();
+        return ((JRCompare) object).getCondition().getXml();
       } catch (Exception e) {
         throw new HopException("Error serializing Condition to XML", e);
       }
@@ -261,7 +261,7 @@ public String getString(Object object) throws HopException {
     @Override
     public Object getObject(String xml) throws HopException {
       try {
-        return new Condition(xml);
+        return new JRCompare(new Condition(xml));
       } catch (Exception e) {
         throw new HopException("Error serializing Condition from XML", e);
       }
@@ -277,6 +277,10 @@ public static final class JRCompare {
     public JRCompare() {
       condition = new Condition();
     }
+
+    public JRCompare(Condition condition) {
+      this.condition = condition;
+    }
   }
 
   /**

plugins/transforms/pipelineexecutor/src/main/java/org/apache/hop/pipeline/transforms/pipelineexecutor/PipelineExecutorMeta.java

@@ -39,6 +39,7 @@
 import org.apache.hop.core.xml.XmlHandler;
 import org.apache.hop.i18n.BaseMessages;
 import org.apache.hop.metadata.api.HopMetadataProperty;
+import org.apache.hop.metadata.api.HopMetadataPropertyType;
 import org.apache.hop.metadata.api.IHopMetadataProvider;
 import org.apache.hop.pipeline.ISubPipelineAwareMeta;
 import org.apache.hop.pipeline.PipelineMeta;
@@ -83,7 +84,9 @@ public class PipelineExecutorMeta
   private boolean filenameInField;
 
   /** Name of the field containing the pipeline file's name */
-  @HopMetadataProperty(key = "filenameField")
+  @HopMetadataProperty(
+      key = "filenameField",
+      hopMetadataPropertyType = HopMetadataPropertyType.PIPELINE_FILE)
   private String filenameField;
 
   /**
@@ -261,6 +264,7 @@ public void loadXml(Node transformNode, IHopMetadataProvider metadataProvider)
   @Override
   public void setDefault() {
     parameters = new ArrayList<>();
+    resultRows = new ArrayList<>();
     filenameInField = false;
 
     groupSize = "1";
@@ -281,7 +285,6 @@ public void setDefault() {
     executionExitStatusField = "ExecutionExitStatus";
     executionLogTextField = "ExecutionLogText";
     executionLogChannelIdField = "ExecutionLogChannelId";
-
     resultFilesFileNameField = "FileName";
   }
 

plugins/transforms/selectvalues/src/main/java/org/apache/hop/pipeline/transforms/selectvalues/SelectValues.java

@@ -17,6 +17,8 @@
 
 package org.apache.hop.pipeline.transforms.selectvalues;
 
+import static org.apache.hop.core.row.IValueMeta.storageTypeCodes;
+
 import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -356,8 +358,11 @@ synchronized Object[] metadataValues(IRowMeta rowMeta, Object[] rowData) throws
       //
       try {
         if (fromMeta.isStorageBinaryString()
-            && meta.getSelectOption().getMeta().get(i).getStorageType()
-                == ValueMetaFactory.getValueMetaName(IValueMeta.STORAGE_TYPE_NORMAL)) {
+            && meta.getSelectOption()
+                .getMeta()
+                .get(i)
+                .getStorageType()
+                .equals(storageTypeCodes[IValueMeta.STORAGE_TYPE_NORMAL])) {
           rowData[index] = fromMeta.convertBinaryStringToNativeType((byte[]) rowData[index]);
         }
         if (meta.getSelectOption().getMeta().get(i).getType()

plugins/transforms/selectvalues/src/main/java/org/apache/hop/pipeline/transforms/selectvalues/SelectValuesDialog.java

@@ -17,6 +17,8 @@
 
 package org.apache.hop.pipeline.transforms.selectvalues;
 
+import static org.apache.hop.core.row.IValueMeta.storageTypeCodes;
+
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -641,7 +643,11 @@ public void getData() {
         item.setText(index++, change.getType() != null ? change.getType() : "-");
         item.setText(index++, change.getLength() < 0 ? "" : "" + change.getLength());
         item.setText(index++, change.getPrecision() < 0 ? "" : "" + change.getPrecision());
-        item.setText(index++, change.getStorageType());
+        item.setText(
+            index++,
+            change.getStorageType().equals(storageTypeCodes[IValueMeta.STORAGE_TYPE_NORMAL])
+                ? BaseMessages.getString(PKG, CONST_SYSTEM_COMBO_YES)
+                : BaseMessages.getString(PKG, CONST_SYSTEM_COMBO_NO));
         item.setText(index++, Const.NVL(change.getConversionMask(), ""));
         item.setText(
             index++,
@@ -761,7 +767,7 @@ private void ok() {
       }
       if (BaseMessages.getString(PKG, CONST_SYSTEM_COMBO_YES)
           .equalsIgnoreCase(item.getText(index++))) {
-        change.setStorageType(ValueMetaFactory.getValueMetaName(IValueMeta.STORAGE_TYPE_NORMAL));
+        change.setStorageType(storageTypeCodes[IValueMeta.STORAGE_TYPE_NORMAL]);
       }
 
       change.setConversionMask(item.getText(index++));