Merge pull request #141 from jeyrschabu/fix_exception_on_empty_result

Fix an unintended 404 on application search of non existent application
spinnaker · Sep 26, 2016 · 8cb497f · 8cb497f
2 parents 2d67b6f + 53ce8b4
commit 8cb497f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/...groovy/com/netflix/spinnaker/front50/model/application/CassandraApplicationDAOSpec.groovy b/...groovy/com/netflix/spinnaker/front50/model/application/CassandraApplicationDAOSpec.groovy
@@ -130,10 +130,10 @@ class CassandraApplicationDAOSpec extends Specification {
     foundApplications*.persistedProperties == [newApplication]*.persistedProperties
 
     when:
-    cassandraApplicationDAO.search([name: newApplicationAttrs.name, group: "does not exist"])
+    def result = cassandraApplicationDAO.search([name: newApplicationAttrs.name, group: "does not exist"])
 
     then:
-    thrown(NotFoundException)
+    result.isEmpty()
 
     when:
     foundApplications = cassandraApplicationDAO.search([name: "app"])

diff --git a/...ore/src/main/groovy/com/netflix/spinnaker/front50/model/application/ApplicationDAO.groovy b/...ore/src/main/groovy/com/netflix/spinnaker/front50/model/application/ApplicationDAO.groovy
@@ -62,10 +62,6 @@ public interface ApplicationDAO extends ItemDAO<Application> {
         return result
       } as Set
 
-      if (!items) {
-        throw new NotFoundException("No Application found for search criteria $attributes")
-      }
-
       return items.sort { Application a, Application b ->
         return score(b, attributes) - score(a, attributes)
       }

diff --git a/...-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisApplicationDAOSpec.groovy b/...-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisApplicationDAOSpec.groovy
@@ -130,10 +130,10 @@ class RedisApplicationDAOSpec extends Specification {
     foundApplications*.persistedProperties == [newApplication]*.persistedProperties
 
     when:
-    redisApplicationDAO.search([name: newApplicationAttrs.name, group: "does not exist"])
+    def result = redisApplicationDAO.search([name: newApplicationAttrs.name, group: "does not exist"])
 
     then:
-    thrown(NotFoundException)
+    result.isEmpty()
 
     when:
     foundApplications = redisApplicationDAO.search([name: "app"])

diff --git a/...test/groovy/com/netflix/spinnaker/front50/controllers/v2/ApplicationsControllerTck.groovy b/...test/groovy/com/netflix/spinnaker/front50/controllers/v2/ApplicationsControllerTck.groovy
@@ -323,6 +323,17 @@ abstract class ApplicationsControllerTck extends Specification {
     response.andExpect status().isOk()
     response.andExpect content().string(new ObjectMapper().writeValueAsString([dao.findByName("SAMPLEAPP")]))
 
+    when:
+    response = mockMvc.perform(
+      get("/v2/applications?name=non-existent")
+    )
+
+    then:
+    response.andExpect status().isOk()
+    notThrown(NotFoundException)
+    response.andExpect content().string("[]")
+
+
     when:
     response = mockMvc.perform(
       get("/v2/applications?name=sample&pageSize=9999")