Merge pull request #445 from EBISPOT/issue-435

issue-435: handle properly searching of non-existent terms
EBISPOT · Jul 28, 2023 · d12865e · d12865e
2 parents aa37fa7 + 9cf708a
commit d12865e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1TermController.java b/backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1TermController.java
@@ -70,6 +70,9 @@ private HttpEntity<PagedModel<V1Term>> getTerms(
                 terms = termRepository.findAllByShortForm(shortForm, lang, pageable);
             } else if (oboId != null) {
                 terms = termRepository.findAllByOboId(oboId, lang, pageable);
+            } else {
+                terms = termRepository.findAll(lang, pageable);
+                if (terms == null) throw new ResourceNotFoundException("Ontology not found");
             }
         } else {
             terms = termRepository.findAllByIri(id, lang, pageable);
@@ -80,10 +83,6 @@ private HttpEntity<PagedModel<V1Term>> getTerms(
                 }
             }
         }
-        if (terms == null || terms.getContent().isEmpty()) {
-            terms = termRepository.findAll(lang, pageable);
-            if (terms == null) throw new ResourceNotFoundException("Ontology not found");
-        }
 
         return new ResponseEntity<>(assembler.toModel(terms, termAssembler), HttpStatus.OK);
     }