hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 07:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-4522] Refactor LogicalStatement.getResult() type to primitive boolean

Browse Source
This commit is contained in:
Kim Shepherd
2021-03-23 14:02:25 +13:00
parent a3beda1a05
commit cc1f67734e
19 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/content/logic/DefaultFilter.java
View File

@@ -40,7 +40,7 @@ public class DefaultFilter implements Filter {
* @return boolean * @return boolean
* @throws LogicalStatementException * @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); return this.statement.getResult(context, item);
} }
} }

2
dspace-api/src/main/java/org/dspace/content/logic/Filter.java
View File

@@ -31,5 +31,5 @@ public interface Filter extends LogicalStatement {
* @return boolean * @return boolean
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
Boolean getResult(Context context, Item item) throws LogicalStatementException; boolean getResult(Context context, Item item) throws LogicalStatementException;
} }

2
dspace-api/src/main/java/org/dspace/content/logic/LogicalStatement.java
View File

@@ -27,5 +27,5 @@ public interface LogicalStatement {
* @return boolean result of evaluation * @return boolean result of evaluation
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
Boolean getResult(Context context, Item item) throws LogicalStatementException; boolean getResult(Context context, Item item) throws LogicalStatementException;
} }

4
dspace-api/src/main/java/org/dspace/content/logic/TestLogicRunner.java
View File

@@ -110,7 +110,7 @@ public class TestLogicRunner {
DSpaceObject dso = handleService.resolveToObject(c, handle); DSpaceObject dso = handleService.resolveToObject(c, handle);
if (Constants.typeText[dso.getType()].equals("ITEM")) { if (Constants.typeText[dso.getType()].equals("ITEM")) {
Item item = (Item) dso; Item item = (Item) dso;
System.out.println(filter.getResult(c, item).toString()); System.out.println(filter.getResult(c, item));
} else { } else {
System.out.println(handle + " is not an ITEM"); System.out.println(handle + " is not an ITEM");
} }
@@ -127,7 +127,7 @@ public class TestLogicRunner {
System.out.println( System.out.println(
"Testing '" + filter + "' on item " + i.getHandle() + " ('" + i.getName() + "')" "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) { } catch (SQLException | LogicalStatementException e) {

2
dspace-api/src/main/java/org/dspace/content/logic/condition/AbstractCondition.java
View File

@@ -73,7 +73,7 @@ public abstract class AbstractCondition implements Condition {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @Override
public Boolean getResult(Context context, Item item) throws LogicalStatementException { public boolean getResult(Context context, Item item) throws LogicalStatementException {
if (item == null) { if (item == null) {
log.error("Error evaluating item. Passed item is null, returning false"); log.error("Error evaluating item. Passed item is null, returning false");
return false; return false;

2
dspace-api/src/main/java/org/dspace/content/logic/condition/BitstreamCountCondition.java
View File

@@ -30,7 +30,7 @@ public class BitstreamCountCondition extends AbstractCondition {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @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 // This super call just throws some useful exceptions if required objects are null
super.getResult(context, item); super.getResult(context, item);

2
dspace-api/src/main/java/org/dspace/content/logic/condition/Condition.java
View File

@@ -48,7 +48,7 @@ public interface Condition extends LogicalStatement {
* @return boolean * @return boolean
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
Boolean getResult(Context context, Item item) throws LogicalStatementException; boolean getResult(Context context, Item item) throws LogicalStatementException;
public void setItemService(ItemService itemService); public void setItemService(ItemService itemService);

2
dspace-api/src/main/java/org/dspace/content/logic/condition/InCollectionCondition.java
View File

@@ -37,7 +37,7 @@ public class InCollectionCondition extends AbstractCondition {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @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"); List<String> collectionHandles = (List<String>)getParameters().get("collections");

2
dspace-api/src/main/java/org/dspace/content/logic/condition/InCommunityCondition.java
View File

@@ -37,7 +37,7 @@ public class InCommunityCondition extends AbstractCondition {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @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<String> communityHandles = (List<String>)getParameters().get("communities");
List<Collection> itemCollections = item.getCollections(); List<Collection> itemCollections = item.getCollections();

2
dspace-api/src/main/java/org/dspace/content/logic/condition/IsWithdrawnCondition.java
View File

@@ -30,7 +30,7 @@ public class IsWithdrawnCondition extends AbstractCondition {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @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()); log.debug("Result of isWithdrawn is " + item.isWithdrawn());
return item.isWithdrawn(); return item.isWithdrawn();
} }

2
dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValueMatchCondition.java
View File

@@ -37,7 +37,7 @@ public class MetadataValueMatchCondition extends AbstractCondition {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @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"); String field = (String)getParameters().get("field");
if (field == null) { if (field == null) {
return false; return false;

2
dspace-api/src/main/java/org/dspace/content/logic/condition/MetadataValuesMatchCondition.java
View File

@@ -37,7 +37,7 @@ public class MetadataValuesMatchCondition extends AbstractCondition {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @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"); String field = (String)getParameters().get("field");
if (field == null) { if (field == null) {
return false; return false;

2
dspace-api/src/main/java/org/dspace/content/logic/condition/ReadableByGroupCondition.java
View File

@@ -40,7 +40,7 @@ public class ReadableByGroupCondition extends AbstractCondition {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @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 group = (String)getParameters().get("group");
String action = (String)getParameters().get("action"); String action = (String)getParameters().get("action");

2
dspace-api/src/main/java/org/dspace/content/logic/operator/AbstractOperator.java
View File

@@ -65,7 +65,7 @@ public abstract class AbstractOperator implements LogicalStatement {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @Override
public Boolean getResult(Context context, Item item) throws LogicalStatementException { public boolean getResult(Context context, Item item) throws LogicalStatementException {
return false; return false;
} }
} }

2
dspace-api/src/main/java/org/dspace/content/logic/operator/And.java
View File

@@ -47,7 +47,7 @@ public class And extends AbstractOperator {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @Override
public Boolean getResult(Context context, Item item) throws LogicalStatementException { public boolean getResult(Context context, Item item) throws LogicalStatementException {
for (LogicalStatement statement : getStatements()) { for (LogicalStatement statement : getStatements()) {
if (!statement.getResult(context, item)) { if (!statement.getResult(context, item)) {

2
dspace-api/src/main/java/org/dspace/content/logic/operator/Nand.java
View File

@@ -46,7 +46,7 @@ public class Nand extends AbstractOperator {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @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)); return !(new And(getStatements()).getResult(context, item));
} }
} }

2
dspace-api/src/main/java/org/dspace/content/logic/operator/Nor.java
View File

@@ -46,7 +46,7 @@ public class Nor extends AbstractOperator {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @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)); return !(new Or(getStatements()).getResult(context, item));
} }
} }

2
dspace-api/src/main/java/org/dspace/content/logic/operator/Not.java
View File

@@ -63,7 +63,7 @@ public class Not implements LogicalStatement {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @Override
public Boolean getResult(Context context, Item item) throws LogicalStatementException { public boolean getResult(Context context, Item item) throws LogicalStatementException {
return !statement.getResult(context, item); return !statement.getResult(context, item);
} }
} }

2
dspace-api/src/main/java/org/dspace/content/logic/operator/Or.java
View File

@@ -47,7 +47,7 @@ public class Or extends AbstractOperator {
* @throws LogicalStatementException * @throws LogicalStatementException
*/ */
@Override @Override
public Boolean getResult(Context context, Item item) throws LogicalStatementException { public boolean getResult(Context context, Item item) throws LogicalStatementException {
for (LogicalStatement statement : getStatements()) { for (LogicalStatement statement : getStatements()) {
if (statement.getResult(context, item)) { if (statement.getResult(context, item)) {