ZFIN-9029 handle NPE on antibody page when expression result is null (Z…

…FIN#937) * ZFIN-9029 handle NPE on antibody page when expression result is null * ZFIN-9029 refactor logic to handle nulls more elegantly * ZFIN-9029 refactor logic to handle nulls more elegantly
rtaylorzfin · Jan 30, 2024 · d6cdb4b · d6cdb4b
1 parent e6b8349
commit d6cdb4b
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/source/org/zfin/antibody/AntibodyService.java b/source/org/zfin/antibody/AntibodyService.java
@@ -144,33 +144,30 @@ public int getNumberOfDistinctComposedTerms() {
             if (!(geno.isWildtype() && exp.isStandardOrGenericControl())) {
                 continue;
             }
-            if (results != null) {
-                for (ExpressionResult2 result : results) {
-                    if (!result.isExpressionFound()) {
-                        continue;
-                    }
-                    Term term = result.getSuperTerm();
-                    Term subterm = result.getSubTerm();
-                    String composedTermName = term.getZdbID();
-                    if (subterm != null) {
-                        composedTermName += subterm.getZdbID();
-                    }
-                    distinctTerms.add(composedTermName);
+            for (ExpressionResult2 result : results) {
+                if (!result.isExpressionFound()) {
+                    continue;
+                }
+                Term term = result.getSuperTerm();
+                Term subterm = result.getSubTerm();
+                String composedTermName = term.getZdbID();
+                if (subterm != null) {
+                    composedTermName += subterm.getZdbID();
                 }
+                distinctTerms.add(composedTermName);
             }
         }
         return distinctTerms.size();
     }
 
     private static Set<ExpressionResult2> getExpressionResult2s(ExpressionExperiment2 experiment) {
-        Set<ExpressionResult2> results = null;
         if (CollectionUtils.isNotEmpty(experiment.getFigureStageSet())) {
-            results = experiment.getFigureStageSet().stream()
+            return experiment.getFigureStageSet().stream()
                 .map(ExpressionFigureStage::getExpressionResultSet)
                 .flatMap(Collection::stream)
                 .collect(Collectors.toSet());
         }
-        return results;
+        return Collections.emptySet();
     }
 
     /**
@@ -509,7 +506,7 @@ private List<ExpressionStatement> getDistinctExpressionStatements(Set<Expression
                         .collect(Collectors.toSet());
                 }
                 if (results != null) {
-                    for (ExpressionResult2 result :results) {
+                    for (ExpressionResult2 result : results) {
                         if (result.isExpressionFound()) {
                             ExpressionStatement statement = new ExpressionStatement();
                             statement.setEntity(result.getEntity());