From cc1f67734e510adb7ffe19df31e4442d08ac152f Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Tue, 23 Mar 2021 14:02:25 +1300
Subject: [PATCH] [DS-4522] Refactor LogicalStatement.getResult() type to
 primitive boolean

---
 .../src/main/java/org/dspace/content/logic/DefaultFilter.java | 2 +-
 dspace-api/src/main/java/org/dspace/content/logic/Filter.java | 2 +-
 .../main/java/org/dspace/content/logic/LogicalStatement.java  | 2 +-
 .../main/java/org/dspace/content/logic/TestLogicRunner.java   | 4 ++--
 .../org/dspace/content/logic/condition/AbstractCondition.java | 2 +-
 .../content/logic/condition/BitstreamCountCondition.java      | 2 +-
 .../java/org/dspace/content/logic/condition/Condition.java    | 2 +-
 .../dspace/content/logic/condition/InCollectionCondition.java | 2 +-
 .../dspace/content/logic/condition/InCommunityCondition.java  | 2 +-
 .../dspace/content/logic/condition/IsWithdrawnCondition.java  | 2 +-
 .../content/logic/condition/MetadataValueMatchCondition.java  | 2 +-
 .../content/logic/condition/MetadataValuesMatchCondition.java | 2 +-
 .../content/logic/condition/ReadableByGroupCondition.java     | 2 +-
 .../org/dspace/content/logic/operator/AbstractOperator.java   | 2 +-
 .../src/main/java/org/dspace/content/logic/operator/And.java  | 2 +-
 .../src/main/java/org/dspace/content/logic/operator/Nand.java | 2 +-
 .../src/main/java/org/dspace/content/logic/operator/Nor.java  | 2 +-
 .../src/main/java/org/dspace/content/logic/operator/Not.java  | 2 +-
 .../src/main/java/org/dspace/content/logic/operator/Or.java   | 2 +-
 19 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/content/logic/DefaultFilter.java b/dspace-api/src/main/java/org/dspace/content/logic/DefaultFilter.java
index eb4c4cff35..c0649e9ea2 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/DefaultFilter.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/DefaultFilter.java
@@ -40,7 +40,7 @@ public class DefaultFilter implements Filter {
      * @return boolean
      * @throws LogicalStatementException
      */
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
         return this.statement.getResult(context, item);
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/Filter.java b/dspace-api/src/main/java/org/dspace/content/logic/Filter.java
index e156529651..bfacca837b 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/Filter.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/Filter.java
@@ -31,5 +31,5 @@ public interface Filter extends LogicalStatement {
      * @return boolean
      * @throws LogicalStatementException
      */
-    Boolean getResult(Context context, Item item) throws LogicalStatementException;
+    boolean getResult(Context context, Item item) throws LogicalStatementException;
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/LogicalStatement.java b/dspace-api/src/main/java/org/dspace/content/logic/LogicalStatement.java
index 38c1e298ee..5fc3e76cd5 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/LogicalStatement.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/LogicalStatement.java
@@ -27,5 +27,5 @@ public interface LogicalStatement {
      * @return boolean result of evaluation
      * @throws LogicalStatementException
      */
-    Boolean getResult(Context context, Item item) throws LogicalStatementException;
+    boolean getResult(Context context, Item item) throws LogicalStatementException;
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/TestLogicRunner.java b/dspace-api/src/main/java/org/dspace/content/logic/TestLogicRunner.java
index 814c608a5e..b78de7f190 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/TestLogicRunner.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/TestLogicRunner.java
@@ -110,7 +110,7 @@ public class TestLogicRunner {
                     DSpaceObject dso = handleService.resolveToObject(c, handle);
                     if (Constants.typeText[dso.getType()].equals("ITEM")) {
                         Item item = (Item) dso;
-                        System.out.println(filter.getResult(c, item).toString());
+                        System.out.println(filter.getResult(c, item));
                     } else {
                         System.out.println(handle + " is not an ITEM");
                     }
@@ -127,7 +127,7 @@ public class TestLogicRunner {
                         System.out.println(
                             "Testing '" + filter + "' on item " + i.getHandle() + " ('" + i.getName() + "')"
                         );
-                        System.out.println(filter.getResult(c, i).toString());
+                        System.out.println(filter.getResult(c, i));
 
                     }
                 } catch (SQLException | LogicalStatementException e) {
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/AbstractCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/AbstractCondition.java
index 255cbc7906..7a87e13066 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/AbstractCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/AbstractCondition.java
@@ -73,7 +73,7 @@ public abstract class AbstractCondition implements Condition {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
         if (item == null) {
             log.error("Error evaluating item. Passed item is null, returning false");
             return false;
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/BitstreamCountCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/BitstreamCountCondition.java
index dcb57c389e..635f0997d3 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/BitstreamCountCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/BitstreamCountCondition.java
@@ -30,7 +30,7 @@ public class BitstreamCountCondition extends AbstractCondition {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
 
         // This super call just throws some useful exceptions if required objects are null
         super.getResult(context, item);
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/Condition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/Condition.java
index c097263b03..325964efdb 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/Condition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/Condition.java
@@ -48,7 +48,7 @@ public interface Condition extends LogicalStatement {
      * @return boolean
      * @throws LogicalStatementException
      */
-    Boolean getResult(Context context, Item item) throws LogicalStatementException;
+    boolean getResult(Context context, Item item) throws LogicalStatementException;
 
     public void setItemService(ItemService itemService);
 
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/InCollectionCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/InCollectionCondition.java
index 35f4fd2815..0aaa1bff1d 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/InCollectionCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/InCollectionCondition.java
@@ -37,7 +37,7 @@ public class InCollectionCondition extends AbstractCondition {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
 
         List<String> collectionHandles = (List<String>)getParameters().get("collections");
 
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/InCommunityCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/InCommunityCondition.java
index b2a90ee325..b9c1d15d2a 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/InCommunityCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/InCommunityCondition.java
@@ -37,7 +37,7 @@ public class InCommunityCondition extends AbstractCondition {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
 
         List<String> communityHandles = (List<String>)getParameters().get("communities");
         List<Collection> itemCollections = item.getCollections();
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/IsWithdrawnCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/IsWithdrawnCondition.java
index ea3961744b..6475ef09e2 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/IsWithdrawnCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/IsWithdrawnCondition.java
@@ -30,7 +30,7 @@ public class IsWithdrawnCondition extends AbstractCondition {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
         log.debug("Result of isWithdrawn is " + item.isWithdrawn());
         return item.isWithdrawn();
     }
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValueMatchCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValueMatchCondition.java
index d39560c7a4..d9c774485a 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValueMatchCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValueMatchCondition.java
@@ -37,7 +37,7 @@ public class MetadataValueMatchCondition extends AbstractCondition {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
         String field = (String)getParameters().get("field");
         if (field == null) {
             return false;
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValuesMatchCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValuesMatchCondition.java
index 1fd30c4e88..df9cbfbf1d 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValuesMatchCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValuesMatchCondition.java
@@ -37,7 +37,7 @@ public class MetadataValuesMatchCondition extends AbstractCondition {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
         String field = (String)getParameters().get("field");
         if (field == null) {
             return false;
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/ReadableByGroupCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/ReadableByGroupCondition.java
index ae61bce2a6..e76772803c 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/condition/ReadableByGroupCondition.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/ReadableByGroupCondition.java
@@ -40,7 +40,7 @@ public class ReadableByGroupCondition extends AbstractCondition {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
 
         String group = (String)getParameters().get("group");
         String action = (String)getParameters().get("action");
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/operator/AbstractOperator.java b/dspace-api/src/main/java/org/dspace/content/logic/operator/AbstractOperator.java
index 826eb99a88..99ece622f7 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/operator/AbstractOperator.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/operator/AbstractOperator.java
@@ -65,7 +65,7 @@ public abstract class AbstractOperator implements LogicalStatement {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
         return false;
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/operator/And.java b/dspace-api/src/main/java/org/dspace/content/logic/operator/And.java
index cdc4b8b86d..26606f2099 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/operator/And.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/operator/And.java
@@ -47,7 +47,7 @@ public class And extends AbstractOperator {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
 
         for (LogicalStatement statement : getStatements()) {
             if (!statement.getResult(context, item)) {
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/operator/Nand.java b/dspace-api/src/main/java/org/dspace/content/logic/operator/Nand.java
index 8d1cec727e..1021ec6722 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/operator/Nand.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/operator/Nand.java
@@ -46,7 +46,7 @@ public class Nand extends AbstractOperator {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
         return !(new And(getStatements()).getResult(context, item));
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/operator/Nor.java b/dspace-api/src/main/java/org/dspace/content/logic/operator/Nor.java
index bc2de9e502..d28ac7578d 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/operator/Nor.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/operator/Nor.java
@@ -46,7 +46,7 @@ public class Nor extends AbstractOperator {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
         return !(new Or(getStatements()).getResult(context, item));
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/operator/Not.java b/dspace-api/src/main/java/org/dspace/content/logic/operator/Not.java
index 8d6a076c30..35c7bb22a7 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/operator/Not.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/operator/Not.java
@@ -63,7 +63,7 @@ public class Not implements LogicalStatement {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
         return !statement.getResult(context, item);
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/operator/Or.java b/dspace-api/src/main/java/org/dspace/content/logic/operator/Or.java
index 7943f09410..5110ac31ba 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/operator/Or.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/operator/Or.java
@@ -47,7 +47,7 @@ public class Or extends AbstractOperator {
      * @throws LogicalStatementException
      */
     @Override
-    public Boolean getResult(Context context, Item item) throws LogicalStatementException {
+    public boolean getResult(Context context, Item item) throws LogicalStatementException {
 
         for (LogicalStatement statement : getStatements()) {
             if (statement.getResult(context, item)) {