Improve Spring modules with auto-configuration

conductor-clients/java/conductor-java-sdk/conductor-client-spring/src/main/java/com/netflix/conductor/client/spring/ConductorClientAutoConfiguration.java

@@ -16,10 +16,14 @@
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
 import org.springframework.core.env.Environment;
 
 import com.netflix.conductor.client.automator.TaskRunnerConfigurer;
@@ -32,34 +36,39 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
+@AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE)
 @EnableConfigurationProperties(ClientProperties.class)
 @Slf4j
 public class ConductorClientAutoConfiguration {
 
-    @ConditionalOnMissingBean
     @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnProperty(prefix = "conductor.client", name = "rootUri")
     public ConductorClient conductorClient(ClientProperties clientProperties) {
         // TODO allow configuration of other properties via application.properties
         return ConductorClient.builder()
                 .basePath(clientProperties.getRootUri())
                 .build();
     }
 
-    @ConditionalOnMissingBean
     @Bean
+    @ConditionalOnBean(ConductorClient.class)
+    @ConditionalOnMissingBean
     public TaskClient taskClient(ConductorClient client) {
         return new TaskClient(client);
     }
 
-    @ConditionalOnMissingBean
     @Bean
+    @ConditionalOnBean(ConductorClient.class)
+    @ConditionalOnMissingBean
     public AnnotatedWorkerExecutor annotatedWorkerExecutor(TaskClient taskClient) {
         return new AnnotatedWorkerExecutor(taskClient);
     }
 
-    @ConditionalOnMissingBean
     @Bean(initMethod = "init", destroyMethod = "shutdown")
+    @ConditionalOnMissingBean
+    @ConditionalOnBean(ConductorClient.class)
     public TaskRunnerConfigurer taskRunnerConfigurer(Environment env,
                                                      TaskClient taskClient,
                                                      ClientProperties clientProperties,
@@ -90,12 +99,15 @@ public TaskRunnerConfigurer taskRunnerConfigurer(Environment env,
     }
 
     @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnBean(ConductorClient.class)
     public WorkflowExecutor workflowExecutor(ConductorClient client, AnnotatedWorkerExecutor annotatedWorkerExecutor) {
         return new WorkflowExecutor(client, annotatedWorkerExecutor);
     }
 
-    @ConditionalOnMissingBean
     @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnBean(ConductorClient.class)
     public WorkflowClient workflowClient(ConductorClient client) {
         return new WorkflowClient(client);
     }

conductor-clients/java/conductor-java-sdk/conductor-client-spring/src/main/java/com/netflix/conductor/client/spring/ConductorWorkerAutoConfiguration.java

@@ -14,26 +14,32 @@
 
 import java.util.Map;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.Ordered;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
 import com.netflix.conductor.client.http.TaskClient;
 import com.netflix.conductor.sdk.workflow.executor.task.AnnotatedWorkerExecutor;
 import com.netflix.conductor.sdk.workflow.executor.task.WorkerConfiguration;
 
-@Component
-public class ConductorWorkerAutoConfiguration implements ApplicationListener<ContextRefreshedEvent> {
+@AutoConfiguration
+@AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE)
+@ConditionalOnBean(TaskClient.class)
+public class ConductorWorkerAutoConfiguration {
 
     private final TaskClient taskClient;
 
     public ConductorWorkerAutoConfiguration(TaskClient taskClient) {
         this.taskClient = taskClient;
     }
 
-    @Override
+    @EventListener(ContextRefreshedEvent.class)
     public void onApplicationEvent(ContextRefreshedEvent refreshedEvent) {
         ApplicationContext applicationContext = refreshedEvent.getApplicationContext();
         Environment environment = applicationContext.getEnvironment();

conductor-clients/java/conductor-java-sdk/conductor-client-spring/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
+com.netflix.conductor.client.spring.ConductorClientAutoConfiguration
+com.netflix.conductor.client.spring.ConductorWorkerAutoConfiguration

conductor-clients/java/conductor-java-sdk/gradle.properties

@@ -1 +1 @@
-version=4.0.0
+version=4.0.1-alpha5

conductor-clients/java/conductor-java-sdk/orkes-spring/src/main/java/io/orkes/conductor/client/spring/OrkesConductorClientAutoConfiguration.java

@@ -13,9 +13,10 @@
 package io.orkes.conductor.client.spring;
 
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 
 import io.orkes.conductor.client.ApiClient;
@@ -30,7 +31,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @Slf4j
 public class OrkesConductorClientAutoConfiguration {
 
@@ -95,41 +96,56 @@ public ApiClient orkesConductorClient(Environment env) {
     }
 
     @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnBean(ApiClient.class)
     public OrkesClients orkesClients(ApiClient client) {
         return new OrkesClients(client);
     }
 
     @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnBean(ApiClient.class)
     public OrkesTaskClient orkesTaskClient(OrkesClients clients) {
         return clients.getTaskClient();
     }
 
     @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnBean(ApiClient.class)
     public OrkesMetadataClient orkesMetadataClient(OrkesClients clients) {
         return clients.getMetadataClient();
     }
 
     @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnBean(ApiClient.class)
     public OrkesWorkflowClient orkesWorkflowClient(OrkesClients clients) {
         return clients.getWorkflowClient();
     }
 
     @Bean
+    @ConditionalOnMissingBean
     public AuthorizationClient orkesAuthorizationClient(OrkesClients clients) {
         return clients.getAuthorizationClient();
     }
 
     @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnBean(ApiClient.class)
     public OrkesEventClient orkesEventClient(OrkesClients clients) {
         return clients.getEventClient();
     }
 
     @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnBean(ApiClient.class)
     public SchedulerClient orkesSchedulerClient(OrkesClients clients) {
         return clients.getSchedulerClient();
     }
 
     @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnBean(ApiClient.class)
     public SecretClient orkesSecretClient(OrkesClients clients) {
         return clients.getSecretClient();
     }

conductor-clients/java/conductor-java-sdk/orkes-spring/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+io.orkes.conductor.client.spring.OrkesConductorClientAutoConfiguration