Issue 514: Improve logic around isEmpty()/!isEmpty() in query.

If the field is not empty but the value is empty, then the wildcard should be used. The entire "query" string can even be removed.
TAMULib · Feb 7, 2023 · 3d4bccc · 3d4bccc
1 parent a3cabab
commit 3d4bccc
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/src/main/java/edu/tamu/sage/service/SolrDiscoveryService.java b/src/main/java/edu/tamu/sage/service/SolrDiscoveryService.java
@@ -84,17 +84,9 @@ public DiscoveryContext buildDiscoveryContext(DiscoveryView discoveryView, Strin
             });
         }
 
-        String query = "";
-        if (search.getField().isEmpty() && search.getValue().isEmpty()) {
-            query = "*";
-        }
-        else {
-          query = search.getValue();
-        }
-
-        SolrQuery solrQuery = new SolrQuery(query);
+        SolrQuery solrQuery = new SolrQuery(StringUtils.isEmpty(search.getValue()) ? "*" : search.getValue());
 
-        if (!search.getField().isEmpty()) {
+        if (StringUtils.isNotEmpty(search.getField())) {
           solrQuery.add("df", search.getField());
         }