Make @Profile annotation work (#2501)

Make @Profile annotation work

Author: Quinn-With-Two-Ns

temporal-spring-boot-autoconfigure/src/main/java/io/temporal/spring/boot/autoconfigure/template/WorkersTemplate.java

@@ -311,7 +311,7 @@ private void configureNexusServiceBeansByWorkerName(
 
   private Collection<Class<?>> autoDiscoverWorkflowImplementations() {
     ClassPathScanningCandidateComponentProvider scanner =
-        new ClassPathScanningCandidateComponentProvider(false);
+        new ClassPathScanningCandidateComponentProvider(false, environment);
     scanner.addIncludeFilter(new AnnotationTypeFilter(WorkflowImpl.class));
     Set<Class<?>> implementations = new HashSet<>();
     for (String pckg : namespaceProperties.getWorkersAutoDiscovery().getPackages()) {

temporal-spring-boot-autoconfigure/src/test/java/io/temporal/spring/boot/autoconfigure/AutoDiscoveryWithProfileTest.java

@@ -0,0 +1,47 @@
+package io.temporal.spring.boot.autoconfigure;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import io.temporal.client.WorkflowClient;
+import io.temporal.client.WorkflowOptions;
+import io.temporal.spring.boot.autoconfigure.bytaskqueue.TestWorkflow;
+import io.temporal.testing.TestWorkflowEnvironment;
+import org.junit.jupiter.api.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.test.context.ActiveProfiles;
+
+@SpringBootTest(classes = AutoDiscoveryWithProfileTest.Configuration.class)
+@ActiveProfiles(profiles = "auto-discovery-with-profile")
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class AutoDiscoveryWithProfileTest {
+  @Autowired ConfigurableApplicationContext applicationContext;
+
+  @Autowired TestWorkflowEnvironment testWorkflowEnvironment;
+
+  @Autowired WorkflowClient workflowClient;
+
+  @BeforeEach
+  void setUp() {
+    applicationContext.start();
+  }
+
+  @Test
+  @Timeout(value = 10)
+  public void testAutoDiscoveryWithProfile() {
+    TestWorkflow testWorkflow =
+        workflowClient.newWorkflowStub(
+            TestWorkflow.class, WorkflowOptions.newBuilder().setTaskQueue("UnitTest").build());
+    assertEquals("other workflow discovered", testWorkflow.execute("profile"));
+  }
+
+  @ComponentScan(
+      excludeFilters =
+          @ComponentScan.Filter(
+              pattern = "io\\.temporal\\.spring\\.boot\\.autoconfigure\\.bytaskqueue\\..*",
+              type = FilterType.REGEX))
+  public static class Configuration {}
+}

temporal-spring-boot-autoconfigure/src/test/java/io/temporal/spring/boot/autoconfigure/byworkername/OtherTestActivityImpl.java

@@ -0,0 +1,15 @@
+package io.temporal.spring.boot.autoconfigure.byworkername;
+
+import io.temporal.spring.boot.ActivityImpl;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+
+@Component("TestActivityImpl")
+@ActivityImpl(workers = "mainWorker")
+@Profile("auto-discovery-with-profile")
+public class OtherTestActivityImpl implements TestActivity {
+  @Override
+  public String execute(String input) {
+    return "other workflow " + input;
+  }
+}

temporal-spring-boot-autoconfigure/src/test/java/io/temporal/spring/boot/autoconfigure/byworkername/OtherTestWorkflowImpl.java

@@ -0,0 +1,27 @@
+package io.temporal.spring.boot.autoconfigure.byworkername;
+
+import io.temporal.activity.ActivityOptions;
+import io.temporal.spring.boot.WorkflowImpl;
+import io.temporal.workflow.Workflow;
+import java.time.Duration;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Profile;
+
+@WorkflowImpl(workers = "mainWorker")
+@Profile("auto-discovery-with-profile")
+public class OtherTestWorkflowImpl implements TestWorkflow {
+
+  // Test auto-wiring of the application context works, this is not indicative of a real-world use
+  // case as the workflow implementation should be stateless.
+  public OtherTestWorkflowImpl(ConfigurableApplicationContext applicationContext) {}
+
+  @Override
+  public String execute(String input) {
+    return Workflow.newActivityStub(
+            TestActivity.class,
+            ActivityOptions.newBuilder()
+                .setStartToCloseTimeout(Duration.ofSeconds(1))
+                .validateAndBuildWithDefaults())
+        .execute("discovered");
+  }
+}

temporal-spring-boot-autoconfigure/src/test/java/io/temporal/spring/boot/autoconfigure/byworkername/TestActivityImpl.java

@@ -1,10 +1,12 @@
 package io.temporal.spring.boot.autoconfigure.byworkername;
 
 import io.temporal.spring.boot.ActivityImpl;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
 @Component("TestActivityImpl")
 @ActivityImpl(workers = "mainWorker")
+@Profile("!auto-discovery-with-profile")
 public class TestActivityImpl implements TestActivity {
   @Override
   public String execute(String input) {

temporal-spring-boot-autoconfigure/src/test/java/io/temporal/spring/boot/autoconfigure/byworkername/TestWorkflowImpl.java

@@ -7,8 +7,10 @@
 import io.temporal.workflow.Workflow;
 import java.time.Duration;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Profile;
 
 @WorkflowImpl(workers = "mainWorker")
+@Profile("!auto-discovery-with-profile")
 public class TestWorkflowImpl implements TestWorkflow {
 
   // Test auto-wiring of the application context works, this is not indicative of a real-world use

temporal-spring-boot-autoconfigure/src/test/resources/application.yml

@@ -59,6 +59,19 @@ spring:
       packages:
         - io.temporal.spring.boot.autoconfigure.byworkername
 
+---
+spring:
+  config:
+    activate:
+      on-profile: auto-discovery-with-profile
+  temporal:
+    workers:
+      - task-queue: UnitTest
+        name: mainWorker
+    workers-auto-discovery:
+      packages:
+        - io.temporal.spring.boot.autoconfigure.byworkername
+
 ---
 spring:
   config: