Use SimplePlugin builder for VectorStore and EmbeddingModel plugins

Replace VectorStorePlugin and EmbeddingModelPlugin subclasses with
SimplePlugin.newBuilder().registerActivitiesImplementations() in the
auto-config classes. These plugins are trivial activity registrations
that don't need custom subclasses when the builder already supports
this.

SpringAiPlugin stays as a subclass (has getter API for chat models).
McpPlugin stays as a subclass (needs SmartInitializingSingleton for
deferred registration).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: donald-pinckney

temporal-spring-ai/src/main/java/io/temporal/springai/autoconfigure/SpringAiEmbeddingAutoConfiguration.java

@@ -1,6 +1,7 @@
 package io.temporal.springai.autoconfigure;
 
-import io.temporal.springai.plugin.EmbeddingModelPlugin;
+import io.temporal.common.SimplePlugin;
+import io.temporal.springai.activity.EmbeddingModelActivityImpl;
 import org.springframework.ai.embedding.EmbeddingModel;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -10,7 +11,8 @@
 /**
  * Auto-configuration for EmbeddingModel integration with Temporal.
  *
- * <p>Conditionally creates an {@link EmbeddingModelPlugin} when {@code spring-ai-rag} is on the
+ * <p>Conditionally creates a plugin that registers {@link
+ * io.temporal.springai.activity.EmbeddingModelActivity} when {@code spring-ai-rag} is on the
  * classpath and an {@link EmbeddingModel} bean is available.
  */
 @AutoConfiguration(after = SpringAiTemporalAutoConfiguration.class)
@@ -19,7 +21,9 @@
 public class SpringAiEmbeddingAutoConfiguration {
 
   @Bean
-  public EmbeddingModelPlugin embeddingModelPlugin(EmbeddingModel embeddingModel) {
-    return new EmbeddingModelPlugin(embeddingModel);
+  public SimplePlugin embeddingModelPlugin(EmbeddingModel embeddingModel) {
+    return SimplePlugin.newBuilder("io.temporal.spring-ai-embedding")
+        .registerActivitiesImplementations(new EmbeddingModelActivityImpl(embeddingModel))
+        .build();
   }
 }

temporal-spring-ai/src/main/java/io/temporal/springai/autoconfigure/SpringAiVectorStoreAutoConfiguration.java

@@ -1,6 +1,7 @@
 package io.temporal.springai.autoconfigure;
 
-import io.temporal.springai.plugin.VectorStorePlugin;
+import io.temporal.common.SimplePlugin;
+import io.temporal.springai.activity.VectorStoreActivityImpl;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -10,16 +11,19 @@
 /**
  * Auto-configuration for VectorStore integration with Temporal.
  *
- * <p>Conditionally creates a {@link VectorStorePlugin} when {@code spring-ai-rag} is on the
- * classpath and a {@link VectorStore} bean is available.
+ * <p>Conditionally creates a plugin that registers {@link
+ * io.temporal.springai.activity.VectorStoreActivity} when {@code spring-ai-rag} is on the classpath
+ * and a {@link VectorStore} bean is available.
  */
 @AutoConfiguration(after = SpringAiTemporalAutoConfiguration.class)
 @ConditionalOnClass(name = "org.springframework.ai.vectorstore.VectorStore")
 @ConditionalOnBean(VectorStore.class)
 public class SpringAiVectorStoreAutoConfiguration {
 
   @Bean
-  public VectorStorePlugin vectorStorePlugin(VectorStore vectorStore) {
-    return new VectorStorePlugin(vectorStore);
+  public SimplePlugin vectorStorePlugin(VectorStore vectorStore) {
+    return SimplePlugin.newBuilder("io.temporal.spring-ai-vectorstore")
+        .registerActivitiesImplementations(new VectorStoreActivityImpl(vectorStore))
+        .build();
   }
 }

temporal-spring-ai/src/main/java/io/temporal/springai/plugin/EmbeddingModelPlugin.java

@@ -22,8 +22,8 @@
  * auto-configuration:
  *
  * <ul>
- *   <li>{@link VectorStorePlugin} - when {@code spring-ai-rag} is on the classpath
- *   <li>{@link EmbeddingModelPlugin} - when {@code spring-ai-rag} is on the classpath
+ *   <li>VectorStore plugin - when {@code spring-ai-rag} is on the classpath
+ *   <li>EmbeddingModel plugin - when {@code spring-ai-rag} is on the classpath
  *   <li>{@link McpPlugin} - when {@code spring-ai-mcp} is on the classpath
  * </ul>
  *

temporal-spring-ai/src/main/java/io/temporal/springai/plugin/SpringAiPlugin.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
+import io.temporal.common.SimplePlugin;
 import io.temporal.springai.activity.ChatModelActivityImpl;
 import io.temporal.springai.activity.EmbeddingModelActivityImpl;
 import io.temporal.springai.activity.VectorStoreActivityImpl;
@@ -109,28 +110,32 @@ void emptyChatModelsMap_throwsIllegalArgument() {
         IllegalArgumentException.class, () -> new SpringAiPlugin(new LinkedHashMap<>(), null));
   }
 
-  // --- VectorStorePlugin tests ---
+  // --- Builder-based plugin tests ---
 
   @Test
-  void vectorStorePlugin_registersActivity() {
+  void vectorStorePlugin_viaBuilder_registersActivity() {
     VectorStore vectorStore = mock(VectorStore.class);
     Worker worker = mock(Worker.class);
 
-    VectorStorePlugin plugin = new VectorStorePlugin(vectorStore);
+    SimplePlugin plugin =
+        SimplePlugin.newBuilder("io.temporal.spring-ai-vectorstore")
+            .registerActivitiesImplementations(new VectorStoreActivityImpl(vectorStore))
+            .build();
     plugin.initializeWorker("test-queue", worker);
 
     Set<Class<?>> types = activityTypes(captureRegisteredActivities(worker));
     assertTrue(types.contains(VectorStoreActivityImpl.class));
   }
 
-  // --- EmbeddingModelPlugin tests ---
-
   @Test
-  void embeddingModelPlugin_registersActivity() {
+  void embeddingModelPlugin_viaBuilder_registersActivity() {
     EmbeddingModel embeddingModel = mock(EmbeddingModel.class);
     Worker worker = mock(Worker.class);
 
-    EmbeddingModelPlugin plugin = new EmbeddingModelPlugin(embeddingModel);
+    SimplePlugin plugin =
+        SimplePlugin.newBuilder("io.temporal.spring-ai-embedding")
+            .registerActivitiesImplementations(new EmbeddingModelActivityImpl(embeddingModel))
+            .build();
     plugin.initializeWorker("test-queue", worker);
 
     Set<Class<?>> types = activityTypes(captureRegisteredActivities(worker));