Address review comments

Author: Kowser

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

@@ -85,6 +85,7 @@ public TaskRunnerConfigurer taskRunnerConfigurer(Environment env,
                                                      TaskClient taskClient,
                                                      ClientProperties clientProperties,
                                                      List<Worker> workers,
+                                                     Optional<FileClient> fileClient,
                                                      Optional<MetricsCollector> metricsCollector) {
         Map<String, Integer> taskThreadCount = new HashMap<>();
         for (Worker worker : workers) {
@@ -108,6 +109,7 @@ public TaskRunnerConfigurer taskRunnerConfigurer(Environment env,
                 .withTaskToDomain(clientProperties.getTaskToDomain())
                 .withShutdownGracePeriodSeconds(clientProperties.getShutdownGracePeriodSeconds())
                 .withTaskPollTimeout(clientProperties.getTaskPollTimeout());
+        fileClient.ifPresent(builder::withFileClient);
         metricsCollector.ifPresent(builder::withMetricsCollector);
         return builder.build();
     }
@@ -128,6 +130,7 @@ public WorkflowClient workflowClient(ConductorClient client) {
 
     @Bean
     @ConfigurationProperties("conductor.file-client")
+    @ConditionalOnBean(ConductorClient.class)
     @ConditionalOnMissingBean
     public FileClientProperties fileClientProperties() {
         return new FileClientProperties();

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

@@ -14,9 +14,11 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.conductoross.conductor.client.FileClient;
+import org.conductoross.conductor.client.FileClientProperties;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
@@ -130,9 +132,17 @@ public SecretClient orkesSecretClient(OrkesClients clients) {
     }
 
     @Bean
+    @ConfigurationProperties("conductor.file-client")
     @ConditionalOnBean(ApiClient.class)
     @ConditionalOnMissingBean
-    public FileClient fileClient(ApiClient client) {
-        return new FileClient(client);
+    public FileClientProperties fileClientProperties() {
+        return new FileClientProperties();
+    }
+
+    @Bean
+    @ConditionalOnBean(ApiClient.class)
+    @ConditionalOnMissingBean
+    public FileClient fileClient(ApiClient client, FileClientProperties fileClientProperties) {
+        return new FileClient(client, fileClientProperties, null);
     }
 }

conductor-client/src/main/java/com/netflix/conductor/common/metadata/tasks/Task.java

@@ -189,13 +189,18 @@ public boolean isRetriable() {
     private transient WorkflowFileClient workflowFileClient;
 
     @JsonIgnore
-    public FileUploader getFileUploader() { return workflowFileClient; }
+    public FileUploader getFileUploader() {
+        return workflowFileClient;
+    }
 
     public void setWorkflowFileClient(WorkflowFileClient workflowFileClient) {
         this.workflowFileClient = workflowFileClient;
     }
 
     public FileHandler getInputFileHandler(String key) {
+        if (workflowFileClient == null) {
+            throw new FileStorageException("FileClient is not configured; cannot access file input for key '" + key + "'");
+        }
         Object value = getInputData().get(key);
         String fileHandleId = FileHandler.extractFileHandleId(value);
         if (FileHandler.isFileHandleId(fileHandleId)) {