Move plugins around

Author: donald-pinckney

…temporal/common/plugin/ClientPlugin.java …main/java/io/temporal/client/Plugin.javatemporal-sdk/src/main/java/io/temporal/common/plugin/ClientPlugin.java renamed to temporal-sdk/src/main/java/io/temporal/client/Plugin.java temporal-sdk/src/main/java/io/temporal/common/plugin/ClientPlugin.java renamed to temporal-sdk/src/main/java/io/temporal/client/Plugin.java

@@ -18,10 +18,10 @@
  * limitations under the License.
  */
 
-package io.temporal.common.plugin;
+package io.temporal.client;
 
-import io.temporal.client.WorkflowClientOptions;
 import io.temporal.common.Experimental;
+import io.temporal.common.PluginBase;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.serviceclient.WorkflowServiceStubs.ClientPluginCallback;
 import io.temporal.serviceclient.WorkflowServiceStubsOptions;
@@ -65,11 +65,11 @@
  * }
  * }</pre>
  *
- * @see WorkerPlugin
+ * @see io.temporal.worker.Plugin
  * @see PluginBase
  */
 @Experimental
-public interface ClientPlugin extends ClientPluginCallback {
+public interface Plugin extends ClientPluginCallback {
 
   /**
    * Returns a unique name for this plugin. Used for logging and duplicate detection. Recommended

temporal-sdk/src/main/java/io/temporal/client/WorkflowClientInternalImpl.java

@@ -15,7 +15,6 @@
 import io.temporal.common.WorkflowExecutionHistory;
 import io.temporal.common.interceptors.WorkflowClientCallsInterceptor;
 import io.temporal.common.interceptors.WorkflowClientInterceptor;
-import io.temporal.common.plugin.ClientPlugin;
 import io.temporal.internal.WorkflowThreadMarker;
 import io.temporal.internal.client.*;
 import io.temporal.internal.client.NexusStartWorkflowResponse;
@@ -788,8 +787,8 @@ private static WorkflowClientOptions applyClientPluginConfiguration(
 
     WorkflowClientOptions.Builder builder = WorkflowClientOptions.newBuilder(options);
     for (Object plugin : plugins) {
-      if (plugin instanceof ClientPlugin) {
-        builder = ((ClientPlugin) plugin).configureClient(builder);
+      if (plugin instanceof Plugin) {
+        builder = ((Plugin) plugin).configureClient(builder);
       }
     }
     return builder.build();

temporal-sdk/src/main/java/io/temporal/client/WorkflowClientOptions.java

@@ -140,15 +140,14 @@ public Builder setQueryRejectCondition(QueryRejectCondition queryRejectCondition
      * Sets the plugins to use with this client. Plugins can modify client and worker configuration,
      * intercept connection, and wrap execution lifecycle.
      *
-     * <p>Each plugin should implement {@link io.temporal.common.plugin.ClientPlugin} and/or {@link
-     * io.temporal.common.plugin.WorkerPlugin}. Plugins that implement both interfaces are
-     * automatically propagated to workers created from this client.
+     * <p>Each plugin should implement {@link io.temporal.client.Plugin} and/or {@link
+     * io.temporal.worker.Plugin}. Plugins that implement both interfaces are automatically
+     * propagated to workers created from this client.
      *
-     * @param plugins the list of plugins to use (each should implement ClientPlugin and/or
-     *     WorkerPlugin)
+     * @param plugins the list of plugins to use (each should implement Plugin)
      * @return this builder for chaining
-     * @see io.temporal.common.plugin.ClientPlugin
-     * @see io.temporal.common.plugin.WorkerPlugin
+     * @see io.temporal.client.Plugin
+     * @see io.temporal.worker.Plugin
      */
     @Experimental
     public Builder setPlugins(List<?> plugins) {
@@ -160,14 +159,14 @@ public Builder setPlugins(List<?> plugins) {
      * Adds a plugin to use with this client. Plugins can modify client and worker configuration,
      * intercept connection, and wrap execution lifecycle.
      *
-     * <p>The plugin should implement {@link io.temporal.common.plugin.ClientPlugin} and/or {@link
-     * io.temporal.common.plugin.WorkerPlugin}. Plugins that implement both interfaces are
-     * automatically propagated to workers created from this client.
+     * <p>The plugin should implement {@link io.temporal.client.Plugin} and/or {@link
+     * io.temporal.worker.Plugin}. Plugins that implement both interfaces are automatically
+     * propagated to workers created from this client.
      *
-     * @param plugin the plugin to add (should implement ClientPlugin and/or WorkerPlugin)
+     * @param plugin the plugin to add (should implement Plugin)
      * @return this builder for chaining
-     * @see io.temporal.common.plugin.ClientPlugin
-     * @see io.temporal.common.plugin.WorkerPlugin
+     * @see io.temporal.client.Plugin
+     * @see io.temporal.worker.Plugin
      */
     @Experimental
     public Builder addPlugin(Object plugin) {
@@ -293,9 +292,9 @@ public QueryRejectCondition getQueryRejectCondition() {
   /**
    * Returns the list of plugins configured for this client.
    *
-   * <p>Each plugin implements {@link io.temporal.common.plugin.ClientPlugin} and/or {@link
-   * io.temporal.common.plugin.WorkerPlugin}. Plugins that implement both interfaces are
-   * automatically propagated to workers created from this client.
+   * <p>Each plugin implements {@link io.temporal.client.Plugin} and/or {@link
+   * io.temporal.worker.Plugin}. Plugins that implement both interfaces are automatically propagated
+   * to workers created from this client.
    *
    * @return an unmodifiable list of plugins, never null
    */

…o/temporal/common/plugin/PluginBase.java …/java/io/temporal/common/PluginBase.javatemporal-sdk/src/main/java/io/temporal/common/plugin/PluginBase.java renamed to temporal-sdk/src/main/java/io/temporal/common/PluginBase.java temporal-sdk/src/main/java/io/temporal/common/plugin/PluginBase.java renamed to temporal-sdk/src/main/java/io/temporal/common/PluginBase.java

@@ -18,15 +18,15 @@
  * limitations under the License.
  */
 
-package io.temporal.common.plugin;
+package io.temporal.common;
 
-import io.temporal.common.Experimental;
+import io.temporal.client.Plugin;
 import java.util.Objects;
 import javax.annotation.Nonnull;
 
 /**
- * Convenience base class for plugins that implement both {@link ClientPlugin} and {@link
- * WorkerPlugin}. All methods have default no-op implementations.
+ * Convenience base class for plugins that implement both {@link io.temporal.client.Plugin} and
+ * {@link io.temporal.worker.Plugin}. All methods have default no-op implementations.
  *
  * <p>This is the recommended way to create plugins that need to customize both client and worker
  * behavior. Plugins that extend this class will automatically be propagated from the client to
@@ -59,11 +59,11 @@
  * }
  * }</pre>
  *
- * @see ClientPlugin
- * @see WorkerPlugin
+ * @see io.temporal.client.Plugin
+ * @see io.temporal.worker.Plugin
  */
 @Experimental
-public abstract class PluginBase implements ClientPlugin, WorkerPlugin {
+public abstract class PluginBase implements Plugin, io.temporal.worker.Plugin {
 
   private final String name;
 

…l/common/plugin/SimplePluginBuilder.java …temporal/common/SimplePluginBuilder.javatemporal-sdk/src/main/java/io/temporal/common/plugin/SimplePluginBuilder.java renamed to temporal-sdk/src/main/java/io/temporal/common/SimplePluginBuilder.java temporal-sdk/src/main/java/io/temporal/common/plugin/SimplePluginBuilder.java renamed to temporal-sdk/src/main/java/io/temporal/common/SimplePluginBuilder.java

@@ -18,10 +18,9 @@
  * limitations under the License.
  */
 
-package io.temporal.common.plugin;
+package io.temporal.common;
 
 import io.temporal.client.WorkflowClientOptions;
-import io.temporal.common.Experimental;
 import io.temporal.common.context.ContextPropagator;
 import io.temporal.common.interceptors.WorkerInterceptor;
 import io.temporal.common.interceptors.WorkflowClientInterceptor;
@@ -41,8 +40,8 @@
  * Builder for creating simple plugins that only need to modify configuration.
  *
  * <p>This builder provides a declarative way to create plugins for common use cases without
- * subclassing {@link PluginBase}. The resulting plugin implements both {@link ClientPlugin} and
- * {@link WorkerPlugin}.
+ * subclassing {@link PluginBase}. The resulting plugin implements both {@link
+ * io.temporal.client.Plugin} and {@link io.temporal.worker.Plugin}.
  *
  * <p>Example:
  *
@@ -59,8 +58,8 @@
  * }</pre>
  *
  * @see PluginBase
- * @see ClientPlugin
- * @see WorkerPlugin
+ * @see io.temporal.client.Plugin
+ * @see io.temporal.worker.Plugin
  */
 @Experimental
 public final class SimplePluginBuilder {
@@ -204,8 +203,8 @@ public SimplePluginBuilder addContextPropagators(ContextPropagator... propagator
   /**
    * Builds the plugin with the configured settings.
    *
-   * @return a new plugin instance that implements both {@link ClientPlugin} and {@link
-   *     WorkerPlugin}
+   * @return a new plugin instance that implements both {@link io.temporal.client.Plugin} and {@link
+   *     io.temporal.worker.Plugin}
    */
   public PluginBase build() {
     return new SimplePlugin(

…temporal/common/plugin/WorkerPlugin.java …main/java/io/temporal/worker/Plugin.javatemporal-sdk/src/main/java/io/temporal/common/plugin/WorkerPlugin.java renamed to temporal-sdk/src/main/java/io/temporal/worker/Plugin.java temporal-sdk/src/main/java/io/temporal/common/plugin/WorkerPlugin.java renamed to temporal-sdk/src/main/java/io/temporal/worker/Plugin.java

@@ -18,20 +18,17 @@
  * limitations under the License.
  */
 
-package io.temporal.common.plugin;
+package io.temporal.worker;
 
 import io.temporal.common.Experimental;
-import io.temporal.worker.Worker;
-import io.temporal.worker.WorkerFactory;
-import io.temporal.worker.WorkerFactoryOptions;
-import io.temporal.worker.WorkerOptions;
+import io.temporal.common.PluginBase;
 import javax.annotation.Nonnull;
 
 /**
  * Plugin interface for customizing Temporal worker configuration and lifecycle.
  *
- * <p>WorkerPlugins that also implement {@link ClientPlugin} are automatically propagated from the
- * client to workers created from that client.
+ * <p>Plugins that also implement {@link io.temporal.client.Plugin} are automatically propagated
+ * from the client to workers created from that client.
  *
  * <p>Example implementation:
  *
@@ -62,11 +59,11 @@
  * }
  * }</pre>
  *
- * @see ClientPlugin
+ * @see io.temporal.client.Plugin
  * @see PluginBase
  */
 @Experimental
-public interface WorkerPlugin {
+public interface Plugin {
 
   /**
    * Returns a unique name for this plugin. Used for logging and duplicate detection. Recommended

temporal-sdk/src/main/java/io/temporal/worker/WorkerFactory.java

@@ -8,7 +8,6 @@
 import io.temporal.client.WorkflowClient;
 import io.temporal.client.WorkflowClientOptions;
 import io.temporal.common.converter.DataConverter;
-import io.temporal.common.plugin.WorkerPlugin;
 import io.temporal.internal.client.WorkflowClientInternal;
 import io.temporal.internal.sync.WorkflowThreadExecutor;
 import io.temporal.internal.task.VirtualThreadDelegate;
@@ -173,8 +172,8 @@ public synchronized Worker newWorker(String taskQueue, WorkerOptions options) {
       // Go through the plugins to call plugin initializeWorker hooks (e.g. register workflows,
       // activities, etc.)
       for (Object plugin : plugins) {
-        if (plugin instanceof WorkerPlugin) {
-          ((WorkerPlugin) plugin).initializeWorker(taskQueue, worker);
+        if (plugin instanceof Plugin) {
+          ((Plugin) plugin).initializeWorker(taskQueue, worker);
         }
       }
 
@@ -241,9 +240,9 @@ public synchronized void start() {
     List<Object> reversed = new ArrayList<>(plugins);
     Collections.reverse(reversed);
     for (Object plugin : reversed) {
-      if (plugin instanceof WorkerPlugin) {
+      if (plugin instanceof Plugin) {
         final Runnable next = startChain;
-        final WorkerPlugin workerPlugin = (WorkerPlugin) plugin;
+        final Plugin workerPlugin = (Plugin) plugin;
         startChain =
             () -> {
               try {
@@ -345,9 +344,9 @@ private void shutdownInternal(boolean interruptUserTasks) {
     List<Object> reversed = new ArrayList<>(plugins);
     Collections.reverse(reversed);
     for (Object plugin : reversed) {
-      if (plugin instanceof WorkerPlugin) {
+      if (plugin instanceof Plugin) {
         final Runnable next = shutdownChain;
-        final WorkerPlugin workerPlugin = (WorkerPlugin) plugin;
+        final Plugin workerPlugin = (Plugin) plugin;
         shutdownChain =
             () -> {
               try {
@@ -442,7 +441,7 @@ public String toString() {
 
   /**
    * Extracts worker plugins from the client plugins list. Only plugins that implement {@link
-   * WorkerPlugin} are included.
+   * Plugin} are included.
    */
   private static List<Object> extractWorkerPlugins(List<?> clientPlugins) {
     if (clientPlugins == null || clientPlugins.isEmpty()) {
@@ -451,7 +450,7 @@ private static List<Object> extractWorkerPlugins(List<?> clientPlugins) {
 
     List<Object> workerPlugins = new ArrayList<>();
     for (Object plugin : clientPlugins) {
-      if (plugin instanceof WorkerPlugin) {
+      if (plugin instanceof Plugin) {
         workerPlugins.add(plugin);
       }
     }
@@ -474,8 +473,8 @@ private static WorkerFactoryOptions applyPluginConfiguration(
             : WorkerFactoryOptions.newBuilder(options);
 
     for (Object plugin : plugins) {
-      if (plugin instanceof WorkerPlugin) {
-        builder = ((WorkerPlugin) plugin).configureWorkerFactory(builder);
+      if (plugin instanceof Plugin) {
+        builder = ((Plugin) plugin).configureWorkerFactory(builder);
       }
     }
     return builder.build();
@@ -495,8 +494,8 @@ private static WorkerOptions applyWorkerPluginConfiguration(
         options == null ? WorkerOptions.newBuilder() : WorkerOptions.newBuilder(options);
 
     for (Object plugin : plugins) {
-      if (plugin instanceof WorkerPlugin) {
-        builder = ((WorkerPlugin) plugin).configureWorker(taskQueue, builder);
+      if (plugin instanceof Plugin) {
+        builder = ((Plugin) plugin).configureWorker(taskQueue, builder);
       }
     }
     return builder.build();

…gin/WorkflowClientOptionsPluginTest.java …ent/WorkflowClientOptionsPluginTest.javatemporal-sdk/src/test/java/io/temporal/common/plugin/WorkflowClientOptionsPluginTest.java renamed to temporal-sdk/src/test/java/io/temporal/client/WorkflowClientOptionsPluginTest.java temporal-sdk/src/test/java/io/temporal/common/plugin/WorkflowClientOptionsPluginTest.java renamed to temporal-sdk/src/test/java/io/temporal/client/WorkflowClientOptionsPluginTest.java

@@ -18,11 +18,11 @@
  * limitations under the License.
  */
 
-package io.temporal.common.plugin;
+package io.temporal.client;
 
 import static org.junit.Assert.*;
 
-import io.temporal.client.WorkflowClientOptions;
+import io.temporal.common.PluginBase;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.Test;
@@ -45,8 +45,8 @@ public void testSetPlugins() {
 
     List<?> plugins = options.getPlugins();
     assertEquals(2, plugins.size());
-    assertEquals("plugin1", ((ClientPlugin) plugins.get(0)).getName());
-    assertEquals("plugin2", ((ClientPlugin) plugins.get(1)).getName());
+    assertEquals("plugin1", ((Plugin) plugins.get(0)).getName());
+    assertEquals("plugin2", ((Plugin) plugins.get(1)).getName());
   }
 
   @Test
@@ -59,8 +59,8 @@ public void testAddPlugin() {
 
     List<?> plugins = options.getPlugins();
     assertEquals(2, plugins.size());
-    assertEquals("plugin1", ((ClientPlugin) plugins.get(0)).getName());
-    assertEquals("plugin2", ((ClientPlugin) plugins.get(1)).getName());
+    assertEquals("plugin1", ((Plugin) plugins.get(0)).getName());
+    assertEquals("plugin2", ((Plugin) plugins.get(1)).getName());
   }
 
   @Test
@@ -99,7 +99,7 @@ public void testToBuilder() {
     WorkflowClientOptions copy = original.toBuilder().build();
 
     assertEquals(1, copy.getPlugins().size());
-    assertEquals("plugin", ((ClientPlugin) copy.getPlugins().get(0)).getName());
+    assertEquals("plugin", ((Plugin) copy.getPlugins().get(0)).getName());
   }
 
   @Test
@@ -110,7 +110,7 @@ public void testValidateAndBuildWithDefaults() {
         WorkflowClientOptions.newBuilder().addPlugin(plugin).validateAndBuildWithDefaults();
 
     assertEquals(1, options.getPlugins().size());
-    assertEquals("plugin", ((ClientPlugin) options.getPlugins().get(0)).getName());
+    assertEquals("plugin", ((Plugin) options.getPlugins().get(0)).getName());
   }
 
   @Test