fix(startup): make constructor bean optional (#2247)

spinnaker · Dec 21, 2017 · 6ee3a95 · 6ee3a95
1 parent b96b579
commit 6ee3a95
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/...web/src/main/groovy/com/netflix/spinnaker/clouddriver/controllers/ArtifactController.java b/...web/src/main/groovy/com/netflix/spinnaker/clouddriver/controllers/ArtifactController.java
@@ -25,21 +25,27 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Slf4j
 @RestController
 @RequestMapping("/artifacts")
 public class ArtifactController {
   private ArtifactCredentialsRepository artifactCredentialsRepository;
 
-  @Autowired(required = false)
-  public ArtifactController(ArtifactCredentialsRepository artifactCredentialsRepository) {
-    this.artifactCredentialsRepository = artifactCredentialsRepository;
+  @Autowired
+  public ArtifactController(Optional<ArtifactCredentialsRepository> artifactCredentialsRepository) {
+    this.artifactCredentialsRepository = artifactCredentialsRepository.orElse(null);
   }
 
   @RequestMapping(method = RequestMethod.GET, value = "/credentials")
   List<ArtifactCredentials> list() {
-    return artifactCredentialsRepository.getAllCredentials();
+    if (artifactCredentialsRepository == null) {
+      return new ArrayList<>();
+    } else {
+      return artifactCredentialsRepository.getAllCredentials();
+    }
   }
 }