fix(pipelinetemplate): NPE on listing pipeline templates with redis s…

…torage (#640)
spinnaker · Dec 5, 2019 · d4a133e · d4a133e
1 parent 444366b
commit d4a133e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/.../main/groovy/com/netflix/spinnaker/front50/model/pipeline/DefaultPipelineTemplateDAO.java b/.../main/groovy/com/netflix/spinnaker/front50/model/pipeline/DefaultPipelineTemplateDAO.java
@@ -20,9 +20,6 @@
 import com.netflix.spinnaker.front50.model.ObjectType;
 import com.netflix.spinnaker.front50.model.StorageService;
 import com.netflix.spinnaker.front50.model.StorageServiceSupport;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
 import org.springframework.util.Assert;
 import rx.Scheduler;
 
@@ -46,14 +43,6 @@ public DefaultPipelineTemplateDAO(
         registry);
   }
 
-  @Override
-  public Collection<PipelineTemplate> getPipelineTemplatesByScope(List<String> scope) {
-    if (scope == null || scope.isEmpty()) {
-      return all();
-    }
-    return all().stream().filter(pt -> pt.containsAnyScope(scope)).collect(Collectors.toList());
-  }
-
   @Override
   public PipelineTemplate create(String id, PipelineTemplate item) {
     Assert.notNull(item.getId(), "id field must NOT to be null!");

diff --git a/...ore/src/main/groovy/com/netflix/spinnaker/front50/model/pipeline/PipelineTemplateDAO.java b/...ore/src/main/groovy/com/netflix/spinnaker/front50/model/pipeline/PipelineTemplateDAO.java
@@ -18,8 +18,15 @@
 import com.netflix.spinnaker.front50.model.ItemDAO;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public interface PipelineTemplateDAO extends ItemDAO<PipelineTemplate> {
 
-  Collection<PipelineTemplate> getPipelineTemplatesByScope(List<String> scope);
+  default Collection<PipelineTemplate> getPipelineTemplatesByScope(List<String> scope) {
+    if (scope == null || scope.isEmpty()) {
+      return all();
+    }
+
+    return all().stream().filter(pt -> pt.containsAnyScope(scope)).collect(Collectors.toList());
+  }
 }
diff --git a/...0-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineTemplateDAO.java b/...0-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineTemplateDAO.java
@@ -21,7 +21,6 @@
 import com.netflix.spinnaker.front50.model.pipeline.PipelineTemplateDAO;
 import java.io.IOException;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import java.util.Spliterators;
 import java.util.stream.Collectors;
@@ -37,11 +36,6 @@ public class RedisPipelineTemplateDAO implements PipelineTemplateDAO {
 
   RedisTemplate<String, PipelineTemplate> redisTemplate;
 
-  @Override
-  public Collection<PipelineTemplate> getPipelineTemplatesByScope(List<String> scope) {
-    return all().stream().filter(it -> it.containsAnyScope(scope)).collect(Collectors.toList());
-  }
-
   @Override
   public PipelineTemplate findById(String id) throws NotFoundException {
     PipelineTemplate pipelineTemplate =