(hop) branch main updated: deprecate setCarteObjectId, fixes #4882 (#7560)

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/main by this push:
     new b49fc5e32d deprecate setCarteObjectId, fixes #4882 (#7560)
b49fc5e32d is described below

commit b49fc5e32da5051acb353fab82d4141efed66aed
Author: Hans Van Akelyen <hans.van.akel...@gmail.com>
AuthorDate: Fri Jul 17 19:06:12 2026 +0200

    deprecate setCarteObjectId, fixes #4882 (#7560)
---
 .../apache/hop/pipeline/transform/BaseTransform.java   | 18 ++++++------------
 .../java/org/apache/hop/server/HopServerMetaTest.java  |  6 ------
 .../java/org/apache/hop/www/RemoteHopServerTest.java   |  6 ------
 plugins/engines/beam/pom.xml                           | 10 ++++++++++
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git 
a/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransform.java 
b/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransform.java
index ece1b49418..23d19ebc0a 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransform.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransform.java
@@ -37,6 +37,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hop.core.BlockingRowSet;
 import org.apache.hop.core.Const;
@@ -141,7 +143,7 @@ public class BaseTransform<Meta extends ITransformMeta, 
Data extends ITransformD
 
   private ILogChannel log;
 
-  private String containerObjectId;
+  @Getter @Setter private String containerId;
 
   private final IPipelineEngine<PipelineMeta> pipeline;
 
@@ -3847,23 +3849,15 @@ public class BaseTransform<Meta extends ITransformMeta, 
Data extends ITransformD
     }
   }
 
-  /**
-   * Returns the container object ID.
-   *
-   * @return the containerObjectId
-   */
-  @Override
-  public String getContainerId() {
-    return containerObjectId;
-  }
-
   /**
    * Sets the container object ID.
    *
    * @param containerObjectId the containerObjectId to set
+   * @deprecated Use {@code setContainerId(String)} instead
    */
+  @Deprecated(since = "2.19.0")
   public void setCarteObjectId(String containerObjectId) {
-    this.containerObjectId = containerObjectId;
+    setContainerId(containerObjectId);
   }
 
   /**
diff --git a/engine/src/test/java/org/apache/hop/server/HopServerMetaTest.java 
b/engine/src/test/java/org/apache/hop/server/HopServerMetaTest.java
index 854ebddef1..bf4f43dcd8 100644
--- a/engine/src/test/java/org/apache/hop/server/HopServerMetaTest.java
+++ b/engine/src/test/java/org/apache/hop/server/HopServerMetaTest.java
@@ -30,7 +30,6 @@ import org.apache.hop.core.exception.HopException;
 import org.apache.hop.core.plugins.PluginRegistry;
 import org.apache.hop.core.util.EnvUtil;
 import org.apache.hop.utils.TestUtils;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -46,11 +45,6 @@ class HopServerMetaTest {
     Encr.init(passwordEncoderPluginID);
   }
 
-  @AfterAll
-  static void tearDown() {
-    PluginRegistry.getInstance().reset();
-  }
-
   @Test
   void testModifyingName() {
     HopServerMeta hopServer = spy(new HopServerMeta());
diff --git a/engine/src/test/java/org/apache/hop/www/RemoteHopServerTest.java 
b/engine/src/test/java/org/apache/hop/www/RemoteHopServerTest.java
index ff73fb63b6..64abc3c541 100644
--- a/engine/src/test/java/org/apache/hop/www/RemoteHopServerTest.java
+++ b/engine/src/test/java/org/apache/hop/www/RemoteHopServerTest.java
@@ -60,7 +60,6 @@ import org.apache.hop.core.variables.IVariables;
 import org.apache.hop.core.variables.Variables;
 import org.apache.hop.server.HopServerMeta;
 import org.apache.hop.server.ServerConnectionManager;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -84,11 +83,6 @@ class RemoteHopServerTest {
     Encr.init(passwordEncoderPluginID);
   }
 
-  @AfterAll
-  static void tearDown() {
-    PluginRegistry.getInstance().reset();
-  }
-
   @BeforeEach
   void init() throws Exception {
     ServerConnectionManager connectionManager = 
ServerConnectionManager.getInstance();
diff --git a/plugins/engines/beam/pom.xml b/plugins/engines/beam/pom.xml
index 6e7b8483fc..13714cfa61 100644
--- a/plugins/engines/beam/pom.xml
+++ b/plugins/engines/beam/pom.xml
@@ -69,6 +69,16 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-client-api</artifactId>
+                <version>${hadoop.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-client-runtime</artifactId>
+                <version>${hadoop.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>