Merge pull request apache#5209 from hansva/main

cleanup and metadata item fixes, apache#4969

Author: hansva

plugins/actions/abort/src/test/java/org/apache/hop/workflow/actions/abort/ActionAbortTest.java

@@ -17,16 +17,17 @@
 
 package org.apache.hop.workflow.actions.abort;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.apache.hop.core.variables.Variables;
 import org.apache.hop.core.xml.XmlHandler;
 import org.apache.hop.workflow.action.ActionMeta;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ActionAbortTest {
+class ActionAbortTest {
 
   @Test
-  public void testXmlRoundTrip() throws Exception {
+  void testXmlRoundTrip() throws Exception {
     final String message = "This is a test message";
     ActionAbort action = new ActionAbort();
     action.setMessageAbort(message);
@@ -37,6 +38,6 @@ public void testXmlRoundTrip() throws Exception {
     ActionAbort action2 = new ActionAbort();
     action2.loadXml(XmlHandler.loadXmlString(actionXml, ActionMeta.XML_TAG), null, new Variables());
 
-    Assert.assertEquals(action.getMessageAbort(), action2.getMessageAbort());
+    assertEquals(action.getMessageAbort(), action2.getMessageAbort());
   }
 }

plugins/actions/abort/src/test/java/org/apache/hop/workflow/actions/abort/WorkflowActionAbortLoadSaveTest.java

@@ -19,13 +19,10 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.apache.hop.junit.rules.RestoreHopEngineEnvironment;
 import org.apache.hop.workflow.action.loadsave.WorkflowActionLoadSaveTestSupport;
-import org.junit.ClassRule;
 
 public class WorkflowActionAbortLoadSaveTest
     extends WorkflowActionLoadSaveTestSupport<ActionAbort> {
-  @ClassRule public static RestoreHopEngineEnvironment env = new RestoreHopEngineEnvironment();
 
   @Override
   protected Class<ActionAbort> getActionClass() {

plugins/actions/addresultfilenames/src/test/java/org/apache/hop/workflow/actions/addresultfilenames/WorkflowActionAddResultFilenamesLoadSaveTest.java

@@ -18,16 +18,13 @@
 package org.apache.hop.workflow.actions.addresultfilenames;
 
 import java.util.UUID;
-import org.apache.hop.junit.rules.RestoreHopEngineEnvironment;
 import org.apache.hop.pipeline.transforms.loadsave.validator.IFieldLoadSaveValidator;
 import org.apache.hop.pipeline.transforms.loadsave.validator.ListLoadSaveValidator;
 import org.apache.hop.workflow.action.loadsave.WorkflowActionLoadSaveTestSupport;
 import org.junit.Before;
-import org.junit.ClassRule;
 
 public class WorkflowActionAddResultFilenamesLoadSaveTest
     extends WorkflowActionLoadSaveTestSupport<ActionAddResultFilenames> {
-  @ClassRule public static RestoreHopEngineEnvironment env = new RestoreHopEngineEnvironment();
 
   @Override
   protected Class<ActionAddResultFilenames> getActionClass() {

plugins/actions/as400command/src/test/java/org/apache/hop/workflow/actions/as400command/ActionAs400CommandLoadSaveTest.java

@@ -19,13 +19,10 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import org.apache.hop.junit.rules.RestoreHopEngineEnvironment;
 import org.apache.hop.workflow.action.loadsave.WorkflowActionLoadSaveTestSupport;
-import org.junit.ClassRule;
 
 public class ActionAs400CommandLoadSaveTest
     extends WorkflowActionLoadSaveTestSupport<ActionAs400Command> {
-  @ClassRule public static RestoreHopEngineEnvironment env = new RestoreHopEngineEnvironment();
 
   @Override
   protected Class<ActionAs400Command> getActionClass() {

plugins/actions/checkdbconnection/src/test/java/org/apache/hop/workflow/actions/checkdbconnection/ActionCheckDbConnectionsTest.java

@@ -18,19 +18,17 @@
 
 package org.apache.hop.workflow.actions.checkdbconnection;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 import org.apache.hop.core.HopClientEnvironment;
 import org.apache.hop.core.database.DatabaseMeta;
 import org.apache.hop.metadata.serializer.memory.MemoryMetadataProvider;
 import org.apache.hop.workflow.action.ActionSerializationTestUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
-public class ActionCheckDbConnectionsTest {
+class ActionCheckDbConnectionsTest {
 
   @Test
-  public void testSerialization() throws Exception {
+  void testSerialization() throws Exception {
     HopClientEnvironment.init();
     DatabaseMeta databaseMeta = new DatabaseMeta();
     databaseMeta.setName("unit-test-db");
@@ -42,11 +40,12 @@ public void testSerialization() throws Exception {
         ActionSerializationTestUtil.testSerialization(
             "/check-db-connections-action.xml", ActionCheckDbConnections.class, provider);
 
-    assertEquals(1, action.getConnections().size());
-    assertNotNull(action.getConnections().get(0).getDatabaseMeta());
-    assertEquals("unit-test-db", action.getConnections().get(0).getDatabaseMeta().getName());
-    assertEquals("500", action.getConnections().get(0).getWaitTime());
-    assertEquals(
+    Assertions.assertEquals(1, action.getConnections().size());
+    Assertions.assertNotNull(action.getConnections().get(0).getDatabaseMeta());
+    Assertions.assertEquals(
+        "unit-test-db", action.getConnections().get(0).getDatabaseMeta().getName());
+    Assertions.assertEquals("500", action.getConnections().get(0).getWaitTime());
+    Assertions.assertEquals(
         ActionCheckDbConnections.WaitTimeUnit.MILLISECOND,
         action.getConnections().get(0).getWaitTimeUnit());
   }

plugins/actions/checkfilelocked/src/test/java/org/apache/hop/workflow/actions/checkfilelocked/ActionCheckFilesLockedTest.java

@@ -18,32 +18,29 @@
 
 package org.apache.hop.workflow.actions.checkfilelocked;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import org.apache.hop.core.HopClientEnvironment;
 import org.apache.hop.metadata.serializer.memory.MemoryMetadataProvider;
 import org.apache.hop.workflow.action.ActionSerializationTestUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
-public class ActionCheckFilesLockedTest {
+class ActionCheckFilesLockedTest {
 
   @Test
-  public void testSerialization() throws Exception {
+  void testSerialization() throws Exception {
     HopClientEnvironment.init();
     MemoryMetadataProvider provider = new MemoryMetadataProvider();
 
     ActionCheckFilesLocked action =
         ActionSerializationTestUtil.testSerialization(
             "/check-files-locked-action.xml", ActionCheckFilesLocked.class, provider);
 
-    assertFalse(action.isArgFromPrevious());
-    assertTrue(action.isIncludeSubfolders());
-    Assert.assertEquals(2, action.getCheckedFiles().size());
-    Assert.assertEquals("/tmp/folder1", action.getCheckedFiles().get(0).getName());
-    Assert.assertEquals(".*\\.txt$", action.getCheckedFiles().get(0).getWildcard());
-    Assert.assertEquals("/tmp/folder2", action.getCheckedFiles().get(1).getName());
-    Assert.assertEquals(".*\\.zip$", action.getCheckedFiles().get(1).getWildcard());
+    Assertions.assertFalse(action.isArgFromPrevious());
+    Assertions.assertTrue(action.isIncludeSubfolders());
+    Assertions.assertEquals(2, action.getCheckedFiles().size());
+    Assertions.assertEquals("/tmp/folder1", action.getCheckedFiles().get(0).getName());
+    Assertions.assertEquals(".*\\.txt$", action.getCheckedFiles().get(0).getWildcard());
+    Assertions.assertEquals("/tmp/folder2", action.getCheckedFiles().get(1).getName());
+    Assertions.assertEquals(".*\\.zip$", action.getCheckedFiles().get(1).getWildcard());
   }
 }

plugins/actions/columnsexist/src/test/java/org/apache/hop/workflow/actions/columnsexist/ActionColumnsExistTest.java

@@ -17,13 +17,12 @@
 
 package org.apache.hop.workflow.actions.columnsexist;
 
-import static org.junit.Assert.assertEquals;
-
 import org.apache.hop.core.HopClientEnvironment;
 import org.apache.hop.core.database.DatabaseMeta;
 import org.apache.hop.metadata.serializer.memory.MemoryMetadataProvider;
 import org.apache.hop.workflow.action.ActionSerializationTestUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /** Unit tests for column exist action. */
 public class ActionColumnsExistTest {
@@ -41,11 +40,11 @@ public void testSerialization() throws Exception {
         ActionSerializationTestUtil.testSerialization(
             "/columns-exist-action.xml", ActionColumnsExist.class, provider);
 
-    assertEquals("unit-test-db", action.getDatabaseMeta().getName());
-    assertEquals("SCHEMA", action.getSchemaName());
-    assertEquals("TABLE", action.getTableName());
-    assertEquals(2, action.getColumns().size());
-    assertEquals("F1", action.getColumns().get(0).getName());
-    assertEquals("F2", action.getColumns().get(1).getName());
+    Assertions.assertEquals("unit-test-db", action.getDatabaseMeta().getName());
+    Assertions.assertEquals("SCHEMA", action.getSchemaName());
+    Assertions.assertEquals("TABLE", action.getTableName());
+    Assertions.assertEquals(2, action.getColumns().size());
+    Assertions.assertEquals("F1", action.getColumns().get(0).getName());
+    Assertions.assertEquals("F2", action.getColumns().get(1).getName());
   }
 }

plugins/actions/copyfiles/src/test/java/org/apache/hop/workflow/actions/copyfiles/WorkflowActionCopyFilesLoadSaveTest.java

@@ -21,16 +21,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import org.apache.hop.junit.rules.RestoreHopEngineEnvironment;
 import org.apache.hop.pipeline.transforms.loadsave.validator.ArrayLoadSaveValidator;
 import org.apache.hop.pipeline.transforms.loadsave.validator.IFieldLoadSaveValidator;
 import org.apache.hop.pipeline.transforms.loadsave.validator.StringLoadSaveValidator;
 import org.apache.hop.workflow.action.loadsave.WorkflowActionLoadSaveTestSupport;
-import org.junit.ClassRule;
 
 public class WorkflowActionCopyFilesLoadSaveTest
     extends WorkflowActionLoadSaveTestSupport<ActionCopyFiles> {
-  @ClassRule public static RestoreHopEngineEnvironment env = new RestoreHopEngineEnvironment();
 
   @Override
   protected Class<ActionCopyFiles> getActionClass() {

plugins/actions/copyfiles/src/test/java/org/apache/hop/workflow/actions/copyfiles/WorkflowActionCopyFilesTest.java

@@ -16,9 +16,6 @@
  */
 package org.apache.hop.workflow.actions.copyfiles;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.atLeast;
@@ -38,22 +35,18 @@
 import org.apache.hop.workflow.WorkflowMeta;
 import org.apache.hop.workflow.engine.IWorkflowEngine;
 import org.apache.hop.workflow.engines.local.LocalWorkflowEngine;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-public class WorkflowActionCopyFilesTest {
+class WorkflowActionCopyFilesTest {
   private ActionCopyFiles entry;
 
   private static final String EMPTY = "";
 
-  @BeforeClass
-  public static void setUpBeforeClass() {
+  @BeforeEach
+  void setUp() {
     HopLogStore.init();
-  }
-
-  @Before
-  public void setUp() {
     entry = new ActionCopyFiles();
     IWorkflowEngine<WorkflowMeta> parentWorkflow = new LocalWorkflowEngine();
     entry.setParentWorkflow(parentWorkflow);
@@ -63,7 +56,7 @@ public void setUp() {
   }
 
   @Test
-  public void fileNotCopied() throws Exception {
+  void fileNotCopied() throws Exception {
     entry.sourceFileFolder = new String[] {EMPTY};
     entry.destinationFileFolder = new String[] {EMPTY};
     entry.wildcard = new String[] {EMPTY};
@@ -76,7 +69,7 @@ public void fileNotCopied() throws Exception {
   }
 
   @Test
-  public void fileCopied() throws Exception {
+  void fileCopied() throws Exception {
     String srcPath = "path/to/file";
     String destPath = "path/to/dir";
 
@@ -90,12 +83,12 @@ public void fileCopied() throws Exception {
         .processFileFolder(
             anyString(), anyString(), anyString(), any(Workflow.class), any(Result.class));
     verify(entry, atLeast(1)).preprocessfilefilder(any(String[].class));
-    assertFalse(result.getResult());
-    assertEquals(1, result.getNrErrors());
+    Assertions.assertFalse(result.getResult());
+    Assertions.assertEquals(1, result.getNrErrors());
   }
 
   @Test
-  public void filesCopied() throws Exception {
+  void filesCopied() throws Exception {
     String[] srcPath = new String[] {"path1", "path2", "path3"};
     String[] destPath = new String[] {"dest1", "dest2", "dest3"};
 
@@ -108,12 +101,12 @@ public void filesCopied() throws Exception {
     verify(entry, times(srcPath.length))
         .processFileFolder(
             anyString(), anyString(), anyString(), any(Workflow.class), any(Result.class));
-    assertFalse(result.getResult());
-    assertEquals(3, result.getNrErrors());
+    Assertions.assertFalse(result.getResult());
+    Assertions.assertEquals(3, result.getNrErrors());
   }
 
   @Test
-  public void saveLoad() throws Exception {
+  void saveLoad() throws Exception {
     String[] srcPath = new String[] {"EMPTY_SOURCE_URL-0-"};
     String[] destPath = new String[] {"EMPTY_DEST_URL-0-"};
 
@@ -122,15 +115,15 @@ public void saveLoad() throws Exception {
     entry.wildcard = new String[] {EMPTY};
 
     String xml = "<entry>" + entry.getXml() + "</entry>";
-    assertTrue(xml.contains(srcPath[0]));
-    assertTrue(xml.contains(destPath[0]));
+    Assertions.assertTrue(xml.contains(srcPath[0]));
+    Assertions.assertTrue(xml.contains(destPath[0]));
     ActionCopyFiles loadedentry = new ActionCopyFiles();
     InputStream is = new ByteArrayInputStream(xml.getBytes());
     loadedentry.loadXml(
         XmlHandler.getSubNode(XmlHandler.loadXmlFile(is, null, false, false), "entry"),
         null,
         new Variables());
-    assertEquals(loadedentry.destinationFileFolder[0], destPath[0]);
-    assertEquals(loadedentry.sourceFileFolder[0], srcPath[0]);
+    Assertions.assertEquals(loadedentry.destinationFileFolder[0], destPath[0]);
+    Assertions.assertEquals(loadedentry.sourceFileFolder[0], srcPath[0]);
   }
 }

ui/src/main/java/org/apache/hop/ui/core/metadata/MetadataEditor.java

@@ -20,6 +20,7 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Objects;
+import lombok.Getter;
 import org.apache.commons.lang.StringUtils;
 import org.apache.hop.core.Const;
 import org.apache.hop.core.exception.HopException;
@@ -55,14 +56,14 @@ public abstract class MetadataEditor<T extends IHopMetadata> extends MetadataFil
 
   private static final Class<?> PKG = MetadataEditorDialog.class;
 
-  protected HopGui hopGui;
+  @Getter protected HopGui hopGui;
   protected MetadataManager<T> manager;
   protected T metadata;
 
   protected String title;
   protected String toolTip;
   protected Image titleImage;
-  protected Image image;
+  @Getter protected Image image;
   protected boolean isChanged = false;
   protected String originalName;
 
@@ -133,10 +134,6 @@ protected Button createHelpButton(final Shell shell) {
     return HelpUtils.createHelpButton(shell, plugin);
   }
 
-  public HopGui getHopGui() {
-    return hopGui;
-  }
-
   public MetadataManager<T> getMetadataManager() {
     return manager;
   }
@@ -155,10 +152,6 @@ public Shell getShell() {
     return hopGui.getShell();
   }
 
-  public Image getImage() {
-    return image;
-  }
-
   protected void setImage(Image image) {
     this.image = image;
   }