Merge pull request #4491 from hansva/1987

Cleanup XML of action Repeat/End Repeat, fixes #1987
apache · Oct 28, 2024 · c77da04 · c77da04
2 parents 3d64ec7 + 6a615b9
commit c77da04
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 372 deletions.
diff --git a/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeat.java b/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeat.java
@@ -20,12 +20,8 @@
 import org.apache.hop.core.Result;
 import org.apache.hop.core.annotations.Action;
 import org.apache.hop.core.exception.HopException;
-import org.apache.hop.core.exception.HopXmlException;
-import org.apache.hop.core.variables.IVariables;
-import org.apache.hop.metadata.api.IHopMetadataProvider;
 import org.apache.hop.workflow.action.ActionBase;
 import org.apache.hop.workflow.action.IAction;
-import org.w3c.dom.Node;
 
 @Action(
     id = "EndRepeat",
@@ -80,21 +76,4 @@ public boolean isEvaluation() {
   public boolean isUnconditional() {
     return false;
   }
-
-  @Override
-  public String getXml() {
-    StringBuilder xml = new StringBuilder();
-    xml.append(super.getXml());
-    return xml.toString();
-  }
-
-  @Override
-  public void loadXml(Node actionNode, IHopMetadataProvider metadataProvider, IVariables variables)
-      throws HopXmlException {
-    try {
-      super.loadXml(actionNode);
-    } catch (Exception e) {
-      throw new HopXmlException("Unable to load End Repeat workflow entry metadata from XML", e);
-    }
-  }
 }
diff --git a/...actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/ParameterDetails.java b/...actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/ParameterDetails.java
@@ -17,8 +17,18 @@
 
 package org.apache.hop.workflow.actions.repeat;
 
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.hop.metadata.api.HopMetadataProperty;
+
+@Getter
+@Setter
 public class ParameterDetails {
+
+  @HopMetadataProperty(key = "name")
   private String name;
+
+  @HopMetadataProperty(key = "value")
   private String field;
 
   public ParameterDetails() {}
@@ -27,36 +37,4 @@ public ParameterDetails(String name, String field) {
     this.name = name;
     this.field = field;
   }
-
-  /**
-   * Gets name
-   *
-   * @return value of name
-   */
-  public String getName() {
-    return name;
-  }
-
-  /**
-   * @param name The name to set
-   */
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  /**
-   * Gets field
-   *
-   * @return value of field
-   */
-  public String getField() {
-    return field;
-  }
-
-  /**
-   * @param field The field to set
-   */
-  public void setField(String field) {
-    this.field = field;
-  }
 }