manager = getDSpaceObjectService(dso.getType());
- return manager;
+ return getDSpaceObjectService(dso.getType());
}
@SuppressWarnings("unchecked")
diff --git a/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactoryImpl.java b/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactoryImpl.java
index 6f123ae1ba..e970f0bdab 100644
--- a/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactoryImpl.java
@@ -28,8 +28,8 @@ import org.dspace.content.service.MetadataValueService;
import org.dspace.content.service.RelationshipService;
import org.dspace.content.service.RelationshipTypeService;
import org.dspace.content.service.SiteService;
-import org.dspace.content.service.SupervisedItemService;
import org.dspace.content.service.WorkspaceItemService;
+import org.dspace.eperson.service.SubscribeService;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -68,10 +68,9 @@ public class ContentServiceFactoryImpl extends ContentServiceFactory {
@Autowired(required = true)
private InstallItemService installItemService;
@Autowired(required = true)
- private SupervisedItemService supervisedItemService;
- @Autowired(required = true)
private SiteService siteService;
-
+ @Autowired(required = true)
+ private SubscribeService subscribeService;
@Autowired(required = true)
private RelationshipService relationshipService;
@Autowired(required = true)
@@ -149,13 +148,13 @@ public class ContentServiceFactoryImpl extends ContentServiceFactory {
}
@Override
- public SupervisedItemService getSupervisedItemService() {
- return supervisedItemService;
+ public SiteService getSiteService() {
+ return siteService;
}
@Override
- public SiteService getSiteService() {
- return siteService;
+ public SubscribeService getSubscribeService() {
+ return subscribeService ;
}
@Override
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 490c3949ea..1ac3930952 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
@@ -18,10 +18,10 @@ import org.dspace.core.Context;
* statement as a property (unlike an operator) and takes no parameters (unlike a condition)
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class DefaultFilter implements Filter {
private LogicalStatement statement;
+ private String name;
private final static Logger log = LogManager.getLogger();
/**
@@ -44,4 +44,15 @@ public class DefaultFilter implements Filter {
public boolean getResult(Context context, Item item) throws LogicalStatementException {
return this.statement.getResult(context, item);
}
+
+ @Override
+ public void setBeanName(String name) {
+ log.debug("Initialize bean " + name);
+ this.name = name;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
}
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 84e9d6bc08..f789860e77 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
@@ -9,6 +9,7 @@ package org.dspace.content.logic;
import org.dspace.content.Item;
import org.dspace.core.Context;
+import org.springframework.beans.factory.BeanNameAware;
/**
* The interface for Filter currently doesn't add anything to LogicalStatement but inherits from it
@@ -22,7 +23,7 @@ import org.dspace.core.Context;
* @author Kim Shepherd
* @see org.dspace.content.logic.DefaultFilter
*/
-public interface Filter extends LogicalStatement {
+public interface Filter extends LogicalStatement, BeanNameAware {
/**
* Get the result of logical evaluation for an item
* @param context DSpace context
@@ -32,4 +33,11 @@ public interface Filter extends LogicalStatement {
*/
@Override
boolean getResult(Context context, Item item) throws LogicalStatementException;
+
+ /**
+ * Get the name of a filter. This can be used by filters which make use of BeanNameAware
+ * to return the bean name.
+ * @return the id/name of this spring bean
+ */
+ String getName();
}
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/FilterUtils.java b/dspace-api/src/main/java/org/dspace/content/logic/FilterUtils.java
new file mode 100644
index 0000000000..a878d69e6e
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/content/logic/FilterUtils.java
@@ -0,0 +1,85 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.content.logic;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.dspace.identifier.DOI;
+import org.dspace.identifier.Handle;
+import org.dspace.identifier.Identifier;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * General utility methods for logical item filtering
+ *
+ * @author Kim Shepherd
+ */
+public class FilterUtils {
+
+ @Autowired(required = true)
+ ConfigurationService configurationService;
+
+ /**
+ * Get a Filter by configuration property name
+ * For example, if a module has implemented "my-feature.filter" configuration property
+ * this method will return a filter with the ID specified by the configuration property
+ * @param property DSpace configuration property name (Apache Commons config)
+ * @return Filter object, with a bean ID configured for this property key, or null
+ */
+ public static Filter getFilterFromConfiguration(String property) {
+ String filterName = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty(property);
+ if (filterName != null) {
+ return DSpaceServicesFactory.getInstance().getServiceManager().getServiceByName(filterName, Filter.class);
+ }
+ return null;
+ }
+
+ /**
+ * Get a Filter by configuration property name
+ * For example, if a module has implemented "my-feature.filter" configuration property
+ * this method will return a filter with the ID specified by the configuration property
+ * @param property DSpace configuration property name (Apache Commons config)
+ * @return Filter object, with a bean ID configured for this property key, or default filter
+ */
+ public static Filter getFilterFromConfiguration(String property, Filter defaultFilter) {
+ Filter filter = getFilterFromConfiguration(property);
+ if (filter != null) {
+ return filter;
+ }
+ return defaultFilter;
+ }
+
+ /**
+ * Get a map of identifier types and filters to use when creating workspace or archived items
+ * This is used by services installing new archived or workspace items to filter by identifier type
+ * as some filters should apply to DOI creation but not Handle creation, and so on.
+ * The in progress or archived status will be used to load the appropriate filter from configuration
+ *
+ * @param inProgress
+ * @return
+ */
+ public static Map, Filter> getIdentifierFilters(boolean inProgress) {
+ String configurationSuffix = "install";
+ if (inProgress) {
+ configurationSuffix = "workspace";
+ }
+ Map, Filter> filters = new HashMap<>();
+ // Put DOI 'can we create DOI on install / workspace?' filter
+ Filter filter = FilterUtils.getFilterFromConfiguration("identifiers.submission.filter." + configurationSuffix);
+ // A null filter should be handled safely by the identifier provier (default, or "always true")
+ filters.put(DOI.class, filter);
+ // This won't have an affect until handle providers implement filtering, but is an example of
+ // how the filters can be used for other types
+ filters.put(Handle.class, DSpaceServicesFactory.getInstance().getServiceManager().getServiceByName(
+ "always_true_filter", TrueFilter.class));
+ return filters;
+ }
+}
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 5fc3e76cd5..0119f48b51 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
@@ -17,7 +17,6 @@ import org.dspace.core.Context;
* used as sub-statements in other Filters and Operators.
*
* @author Kim Shepherd
- * @version $Revision$
*/
public interface LogicalStatement {
/**
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/LogicalStatementException.java b/dspace-api/src/main/java/org/dspace/content/logic/LogicalStatementException.java
index 758a0a7124..4e3b3e3b7d 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/LogicalStatementException.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/LogicalStatementException.java
@@ -12,7 +12,6 @@ package org.dspace.content.logic;
* defined as spring beans.
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class LogicalStatementException extends RuntimeException {
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 b78de7f190..bf218eaa8a 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
@@ -33,7 +33,6 @@ import org.dspace.services.factory.DSpaceServicesFactory;
* A command-line runner used for testing a logical filter against an item, or all items
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class TestLogicRunner {
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/TrueFilter.java b/dspace-api/src/main/java/org/dspace/content/logic/TrueFilter.java
new file mode 100644
index 0000000000..b15ab4eaaa
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/content/logic/TrueFilter.java
@@ -0,0 +1,41 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.content.logic;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * Extremely simple filter that always returns true!
+ * Useful to pass to methods that expect a filter, in order to effectively say "all items".
+ * This could be configured in Spring XML but it is more stable and reliable to have it hard-coded here
+ * so that any broken configuration doesn't silently break parts of DSpace that expect it to work.
+ *
+ * @author Kim Shepherd
+ */
+public class TrueFilter implements Filter {
+ private String name;
+ private final static Logger log = LogManager.getLogger();
+
+ public boolean getResult(Context context, Item item) throws LogicalStatementException {
+ return true;
+ }
+
+ @Override
+ public void setBeanName(String name) {
+ log.debug("Initialize bean " + name);
+ this.name = name;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+}
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 0202243265..ce5b274a8d 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
@@ -23,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
* Abstract class for conditions, to implement the basic getter and setter parameters
*
* @author Kim Shepherd
- * @version $Revision$
*/
public abstract class AbstractCondition implements Condition {
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 635f0997d3..36e506122e 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
@@ -18,7 +18,6 @@ import org.dspace.core.Context;
* A condition to evaluate an item based on how many bitstreams it has in a particular bundle
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class BitstreamCountCondition extends AbstractCondition {
/**
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 c86509899f..7647dce4a4 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
@@ -22,7 +22,6 @@ import org.dspace.core.Context;
* operator is not a condition but also a logical statement.
*
* @author Kim Shepherd
- * @version $Revision$
*/
public interface Condition extends LogicalStatement {
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 0aaa1bff1d..df94f183d1 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
@@ -23,7 +23,6 @@ import org.dspace.core.Context;
* if the item belongs to any of them.
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class InCollectionCondition extends AbstractCondition {
private static Logger log = LogManager.getLogger(InCollectionCondition.class);
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 9f588f9c3b..6a72011e73 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
@@ -24,7 +24,6 @@ import org.dspace.core.Context;
* if the item belongs to any of them.
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class InCommunityCondition extends AbstractCondition {
private final static Logger log = LogManager.getLogger();
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/condition/IsArchivedCondition.java b/dspace-api/src/main/java/org/dspace/content/logic/condition/IsArchivedCondition.java
new file mode 100644
index 0000000000..4f50d2b6f6
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/content/logic/condition/IsArchivedCondition.java
@@ -0,0 +1,37 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.content.logic.condition;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Item;
+import org.dspace.content.logic.LogicalStatementException;
+import org.dspace.core.Context;
+
+/**
+ * A condition that returns true if the item is archived
+ *
+ * @author Kim Shepherd
+ */
+public class IsArchivedCondition extends AbstractCondition {
+ private final static Logger log = LogManager.getLogger();
+
+ /**
+ * Return true if item is archived
+ * Return false if not
+ * @param context DSpace context
+ * @param item Item to evaluate
+ * @return boolean result of evaluation
+ * @throws LogicalStatementException
+ */
+ @Override
+ public boolean getResult(Context context, Item item) throws LogicalStatementException {
+ log.debug("Result of isArchived is " + item.isArchived());
+ return item.isArchived();
+ }
+}
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 6424e6f35f..850b69bda0 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
@@ -17,7 +17,6 @@ import org.dspace.core.Context;
* A condition that returns true if the item is withdrawn
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class IsWithdrawnCondition extends AbstractCondition {
private final static Logger log = LogManager.getLogger();
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 4e30c75a2a..e87c479de6 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
@@ -23,7 +23,6 @@ import org.dspace.core.Context;
* in a given metadata field
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class MetadataValueMatchCondition extends AbstractCondition {
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 74ccfa4ca8..c6ca9dfb9f 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
@@ -23,7 +23,6 @@ import org.dspace.core.Context;
* in a given metadata field
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class MetadataValuesMatchCondition extends AbstractCondition {
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 65f9925222..20138beb47 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
@@ -25,7 +25,6 @@ import org.dspace.core.Context;
* can perform the action on a given item
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class ReadableByGroupCondition extends AbstractCondition {
private final static Logger log = LogManager.getLogger();
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 99ece622f7..3882414def 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
@@ -22,7 +22,6 @@ import org.dspace.core.Context;
* as a logical result
*
* @author Kim Shepherd
- * @version $Revision$
*/
public abstract class AbstractOperator implements LogicalStatement {
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 26606f2099..79bc5c381e 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
@@ -19,7 +19,6 @@ import org.dspace.core.Context;
* true if all sub-statements return true
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class And extends AbstractOperator {
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 1021ec6722..2a4b6823b6 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
@@ -18,7 +18,6 @@ import org.dspace.core.Context;
* An operator that implements NAND by negating an AND operation
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class Nand extends AbstractOperator {
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 35c7bb22a7..277acdfd01 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
@@ -19,7 +19,6 @@ import org.dspace.core.Context;
* Not can have one sub-statement only, while and, or, nor, ... can have multiple sub-statements.
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class Not implements LogicalStatement {
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 5110ac31ba..e5697f8cc3 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
@@ -19,7 +19,6 @@ import org.dspace.core.Context;
* true if one or more sub-statements return true
*
* @author Kim Shepherd
- * @version $Revision$
*/
public class Or extends AbstractOperator {
diff --git a/dspace-api/src/main/java/org/dspace/content/service/BitstreamService.java b/dspace-api/src/main/java/org/dspace/content/service/BitstreamService.java
index 4621c95e7c..8effabf284 100644
--- a/dspace-api/src/main/java/org/dspace/content/service/BitstreamService.java
+++ b/dspace-api/src/main/java/org/dspace/content/service/BitstreamService.java
@@ -183,7 +183,7 @@ public interface BitstreamService extends DSpaceObjectService, DSpace
* @return a list of all bitstreams that have been "deleted"
* @throws SQLException if database error
*/
- public List findDeletedBitstreams(Context context) throws SQLException;
+ public List findDeletedBitstreams(Context context, int limit, int offset) throws SQLException;
/**
diff --git a/dspace-api/src/main/java/org/dspace/content/service/CollectionService.java b/dspace-api/src/main/java/org/dspace/content/service/CollectionService.java
index 522bdac224..a5b2b7d8d8 100644
--- a/dspace-api/src/main/java/org/dspace/content/service/CollectionService.java
+++ b/dspace-api/src/main/java/org/dspace/content/service/CollectionService.java
@@ -33,6 +33,11 @@ import org.dspace.eperson.Group;
public interface CollectionService
extends DSpaceObjectService, DSpaceObjectLegacySupportService {
+ /*
+ * Field used to sort community and collection lists at solr
+ */
+ public static final String SOLR_SORT_FIELD = "dc.title_sort";
+
/**
* Create a new collection with a new ID.
* Once created the collection is added to the given community
@@ -46,7 +51,6 @@ public interface CollectionService
public Collection create(Context context, Community community) throws SQLException,
AuthorizeException;
-
/**
* Create a new collection with the supplied handle and with a new ID.
* Once created the collection is added to the given community
diff --git a/dspace-api/src/main/java/org/dspace/content/service/ItemService.java b/dspace-api/src/main/java/org/dspace/content/service/ItemService.java
index 8b7badf223..b7a479469b 100644
--- a/dspace-api/src/main/java/org/dspace/content/service/ItemService.java
+++ b/dspace-api/src/main/java/org/dspace/content/service/ItemService.java
@@ -28,6 +28,7 @@ import org.dspace.content.MetadataValue;
import org.dspace.content.Thumbnail;
import org.dspace.content.WorkspaceItem;
import org.dspace.core.Context;
+import org.dspace.discovery.SearchServiceException;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group;
@@ -768,6 +769,27 @@ public interface ItemService
*/
int countWithdrawnItems(Context context) throws SQLException;
+ /**
+ * finds all items for which the current user has editing rights
+ * @param context DSpace context object
+ * @param offset page offset
+ * @param limit page size limit
+ * @return list of items for which the current user has editing rights
+ * @throws SQLException
+ * @throws SearchServiceException
+ */
+ public List- findItemsWithEdit(Context context, int offset, int limit)
+ throws SQLException, SearchServiceException;
+
+ /**
+ * counts all items for which the current user has editing rights
+ * @param context DSpace context object
+ * @return list of items for which the current user has editing rights
+ * @throws SQLException
+ * @throws SearchServiceException
+ */
+ public int countItemsWithEdit(Context context) throws SQLException, SearchServiceException;
+
/**
* Check if the supplied item is an inprogress submission
*
diff --git a/dspace-api/src/main/java/org/dspace/content/service/SupervisedItemService.java b/dspace-api/src/main/java/org/dspace/content/service/SupervisedItemService.java
deleted file mode 100644
index 883e0f9fd2..0000000000
--- a/dspace-api/src/main/java/org/dspace/content/service/SupervisedItemService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.content.service;
-
-import java.sql.SQLException;
-import java.util.List;
-
-import org.dspace.content.WorkspaceItem;
-import org.dspace.core.Context;
-import org.dspace.eperson.EPerson;
-
-/**
- * Class to handle WorkspaceItems which are being supervised.
- *
- * @author Richard Jones
- * @version $Revision$
- */
-public interface SupervisedItemService {
- /**
- * Get all workspace items which are being supervised
- *
- * @param context the context this object exists in
- * @return array of SupervisedItems
- * @throws SQLException if database error
- */
- public List getAll(Context context) throws SQLException;
-
-
- /**
- * Get items being supervised by given EPerson
- *
- * @param ep the eperson who's items to supervise we want
- * @param context the dspace context
- * @return the items eperson is supervising in an array
- * @throws SQLException if database error
- */
- public List findbyEPerson(Context context, EPerson ep)
- throws SQLException;
-}
diff --git a/dspace-api/src/main/java/org/dspace/content/service/WorkspaceItemService.java b/dspace-api/src/main/java/org/dspace/content/service/WorkspaceItemService.java
index 8f572f6108..c8df68e434 100644
--- a/dspace-api/src/main/java/org/dspace/content/service/WorkspaceItemService.java
+++ b/dspace-api/src/main/java/org/dspace/content/service/WorkspaceItemService.java
@@ -127,10 +127,6 @@ public interface WorkspaceItemService extends InProgressSubmissionService findAllSupervisedItems(Context context) throws SQLException;
-
- public List findSupervisedItemsByEPerson(Context context, EPerson ePerson) throws SQLException;
-
/**
* Get all workspace items in the whole system
*
diff --git a/dspace-api/src/main/java/org/dspace/core/Email.java b/dspace-api/src/main/java/org/dspace/core/Email.java
index 6db27c9e4f..64da629bcc 100644
--- a/dspace-api/src/main/java/org/dspace/core/Email.java
+++ b/dspace-api/src/main/java/org/dspace/core/Email.java
@@ -355,7 +355,7 @@ public class Email {
for (String headerName : config.getArrayProperty("mail.message.headers")) {
String headerValue = (String) vctx.get(headerName);
if ("subject".equalsIgnoreCase(headerName)) {
- if (null != subject) {
+ if (null != headerValue) {
subject = headerValue;
}
} else if ("charset".equalsIgnoreCase(headerName)) {
diff --git a/dspace-api/src/main/java/org/dspace/ctask/general/RegisterDOI.java b/dspace-api/src/main/java/org/dspace/ctask/general/RegisterDOI.java
index 4e777d70a8..0765d7b000 100644
--- a/dspace-api/src/main/java/org/dspace/ctask/general/RegisterDOI.java
+++ b/dspace-api/src/main/java/org/dspace/ctask/general/RegisterDOI.java
@@ -13,11 +13,15 @@ import java.sql.SQLException;
import org.apache.logging.log4j.Logger;
import org.dspace.content.DSpaceObject;
import org.dspace.content.Item;
+import org.dspace.content.logic.Filter;
+import org.dspace.content.logic.FilterUtils;
+import org.dspace.content.logic.TrueFilter;
import org.dspace.curate.AbstractCurationTask;
import org.dspace.curate.Curator;
import org.dspace.identifier.DOIIdentifierProvider;
import org.dspace.identifier.IdentifierException;
import org.dspace.identifier.doi.DOIIdentifierNotApplicableException;
+import org.dspace.services.factory.DSpaceServicesFactory;
import org.dspace.utils.DSpace;
/**
@@ -39,6 +43,7 @@ public class RegisterDOI extends AbstractCurationTask {
private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(RegisterDOI.class);
// DOI provider
private DOIIdentifierProvider provider;
+ private Filter trueFilter;
/**
* Initialise the curation task and read configuration, instantiate the DOI provider
@@ -46,14 +51,14 @@ public class RegisterDOI extends AbstractCurationTask {
@Override
public void init(Curator curator, String taskId) throws IOException {
super.init(curator, taskId);
- // Get 'skip filter' behaviour from configuration, with a default value of 'true'
- skipFilter = configurationService.getBooleanProperty(PLUGIN_PREFIX + ".skip-filter", true);
// Get distribution behaviour from configuration, with a default value of 'false'
distributed = configurationService.getBooleanProperty(PLUGIN_PREFIX + ".distributed", false);
log.debug("PLUGIN_PREFIX = " + PLUGIN_PREFIX + ", skipFilter = " + skipFilter +
", distributed = " + distributed);
// Instantiate DOI provider singleton
provider = new DSpace().getSingletonService(DOIIdentifierProvider.class);
+ trueFilter = DSpaceServicesFactory.getInstance().getServiceManager().getServiceByName(
+ "always_true_filter", TrueFilter.class);
}
/**
@@ -118,8 +123,9 @@ public class RegisterDOI extends AbstractCurationTask {
String doi = null;
// Attempt DOI registration and report successes and failures
try {
- log.debug("Registering DOI with skipFilter = " + skipFilter);
- doi = provider.register(Curator.curationContext(), item, skipFilter);
+ Filter filter = FilterUtils.getFilterFromConfiguration("identifiers.submission.filter.curation",
+ trueFilter);
+ doi = provider.register(Curator.curationContext(), item, filter);
if (doi != null) {
String message = "New DOI minted in database for item " + item.getHandle() + ": " + doi
+ ". This DOI will be registered online with the DOI provider when the queue is next run";
diff --git a/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java b/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java
index b2bd0fc5ff..00236d2bfe 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java
@@ -7,6 +7,8 @@
*/
package org.dspace.discovery;
+import static org.dspace.discovery.SolrServiceImpl.SOLR_FIELD_SUFFIX_FACET_PREFIXES;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -109,6 +111,9 @@ public class DiscoverResult {
if (facetValues.size() == 0 && field.getType().equals(DiscoveryConfigurationParameters.TYPE_DATE)) {
facetValues = getFacetResult(field.getIndexFieldName() + ".year");
}
+ if (facetValues.isEmpty()) {
+ facetValues = getFacetResult(field.getIndexFieldName() + SOLR_FIELD_SUFFIX_FACET_PREFIXES);
+ }
return ListUtils.emptyIfNull(facetValues);
}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/IndexClient.java b/dspace-api/src/main/java/org/dspace/discovery/IndexClient.java
index fcb3e79d1d..661c48d91c 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/IndexClient.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/IndexClient.java
@@ -56,37 +56,18 @@ public class IndexClient extends DSpaceRunnable indexableObject = Optional.empty();
+
+ if (indexClientOptions == IndexClientOptions.REMOVE || indexClientOptions == IndexClientOptions.INDEX) {
+ final String param = indexClientOptions == IndexClientOptions.REMOVE ? commandLine.getOptionValue('r') :
+ commandLine.getOptionValue('i');
UUID uuid = null;
try {
uuid = UUID.fromString(param);
} catch (Exception e) {
- // nothing to do, it should be an handle
+ // nothing to do, it should be a handle
}
- Optional indexableObject = Optional.empty();
+
if (uuid != null) {
final Item item = ContentServiceFactory.getInstance().getItemService().find(context, uuid);
if (item != null) {
@@ -118,7 +99,32 @@ public class IndexClient extends DSpaceRunnable
+ *
+ * @param context DSpace context object
+ * @param community Community for which we search the ancestors
+ * @return A list of ancestor communities.
+ * @throws SQLException if database error
+ */
+ static List getAncestorCommunities(Context context, Community community) throws SQLException {
+ ArrayList communities = new ArrayList<>();
+ while (community != null) {
+ communities.add(community);
+ community = (Community) ContentServiceFactory.getInstance().getDSpaceObjectService(community)
+ .getParentObject(context, community);
+ }
+ return communities;
+ }
+
+ /**
+ * Retrieve the ids of all groups that have ADMIN rights to the given community, either directly
+ * (through direct resource policy) or indirectly (through a policy on an ancestor community).
+ *
+ * @param context DSpace context object
+ * @param community Community for which we search the admin group IDs
+ * @return A list of admin group IDs
+ * @throws SQLException if database error
+ */
+ static List findTransitiveAdminGroupIds(Context context, Community community) throws SQLException {
+ return getAncestorCommunities(context, community).stream()
+ .filter(parent -> parent.getAdministrators() != null)
+ .map(parent -> parent.getAdministrators().getID())
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * Retrieve the ids of all groups that have ADMIN rights to the given collection, either directly
+ * (through direct resource policy) or indirectly (through a policy on its community, or one of
+ * its ancestor communities).
+ *
+ * @param context DSpace context object
+ * @param collection Collection for which we search the admin group IDs
+ * @return A list of admin group IDs
+ * @throws SQLException if database error
+ */
+ static List findTransitiveAdminGroupIds(Context context, Collection collection) throws SQLException {
+ List ids = new ArrayList<>();
+ if (collection.getAdministrators() != null) {
+ ids.add(collection.getAdministrators().getID());
+ }
+ for (Community community : collection.getCommunities()) {
+ for (UUID id : findTransitiveAdminGroupIds(context, community)) {
+ ids.add(id);
+ }
+ }
+ return ids;
+ }
+
+ /**
+ * Retrieve group and eperson IDs for all groups and eperson who have _any_ of the given authorizations
+ * on the given DSpaceObject. The resulting IDs are prefixed with "e" in the case of an eperson ID, and "g" in the
+ * case of a group ID.
+ *
+ * @param authService The authentication service
+ * @param context DSpace context object
+ * @param obj DSpaceObject for which we search the admin group IDs
+ * @return A stream of admin group IDs as Strings, prefixed with either "e" or "g", depending on whether it is a
+ * group or eperson ID.
+ * @throws SQLException if database error
+ */
+ static List findDirectlyAuthorizedGroupAndEPersonPrefixedIds(
+ AuthorizeService authService, Context context, DSpaceObject obj, int[] authorizations)
+ throws SQLException {
+ ArrayList prefixedIds = new ArrayList<>();
+ for (int auth : authorizations) {
+ for (ResourcePolicy policy : authService.getPoliciesActionFilter(context, obj, auth)) {
+ // Avoid NPE in cases where the policy does not have group or eperson
+ if (policy.getGroup() == null && policy.getEPerson() == null) {
+ continue;
+ }
+ String prefixedId = policy.getGroup() == null
+ ? "e" + policy.getEPerson().getID()
+ : "g" + policy.getGroup().getID();
+ prefixedIds.add(prefixedId);
+ context.uncacheEntity(policy);
+ }
+ }
+ return prefixedIds;
+ }
+}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
index 383121072d..0cf2aa50af 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
@@ -105,6 +105,10 @@ public class SolrServiceImpl implements SearchService, IndexingService {
private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SolrServiceImpl.class);
+ // Suffix of the solr field used to index the facet/filter so that the facet search can search all word in a
+ // facet by indexing "each word to end of value' partial value
+ public static final String SOLR_FIELD_SUFFIX_FACET_PREFIXES = "_prefix";
+
@Autowired
protected ContentServiceFactory contentServiceFactory;
@Autowired
@@ -252,7 +256,12 @@ public class SolrServiceImpl implements SearchService, IndexingService {
try {
if (solrSearchCore.getSolr() != null) {
- indexObjectServiceFactory.getIndexableObjectFactory(searchUniqueID).delete(searchUniqueID);
+ IndexFactory index = indexObjectServiceFactory.getIndexableObjectFactory(searchUniqueID);
+ if (index != null) {
+ index.delete(searchUniqueID);
+ } else {
+ log.warn("Object not found in Solr index: " + searchUniqueID);
+ }
if (commit) {
solrSearchCore.getSolr().commit();
}
@@ -905,6 +914,9 @@ public class SolrServiceImpl implements SearchService, IndexingService {
//Only add facet information if there are any facets
for (DiscoverFacetField facetFieldConfig : facetFields) {
String field = transformFacetField(facetFieldConfig, facetFieldConfig.getField(), false);
+ if (facetFieldConfig.getPrefix() != null) {
+ field = transformPrefixFacetField(facetFieldConfig, facetFieldConfig.getField(), false);
+ }
solrQuery.addFacetField(field);
// Setting the facet limit in this fashion ensures that each facet can have its own max
@@ -1344,7 +1356,31 @@ public class SolrServiceImpl implements SearchService, IndexingService {
}
}
+ /**
+ * Gets the solr field that contains the facet value split on each word break to the end, so can be searched
+ * on each word in the value, see {@link org.dspace.discovery.indexobject.ItemIndexFactoryImpl
+ * #saveFacetPrefixParts(SolrInputDocument, DiscoverySearchFilter, String, String)}
+ * Ony applicable to facets of type {@link DiscoveryConfigurationParameters.TYPE_TEXT}, otherwise uses the regular
+ * facet filter field
+ */
+ protected String transformPrefixFacetField(DiscoverFacetField facetFieldConfig, String field,
+ boolean removePostfix) {
+ if (facetFieldConfig.getType().equals(DiscoveryConfigurationParameters.TYPE_TEXT) ||
+ facetFieldConfig.getType().equals(DiscoveryConfigurationParameters.TYPE_HIERARCHICAL)) {
+ if (removePostfix) {
+ return field.substring(0, field.lastIndexOf(SOLR_FIELD_SUFFIX_FACET_PREFIXES));
+ } else {
+ return field + SOLR_FIELD_SUFFIX_FACET_PREFIXES;
+ }
+ } else {
+ return this.transformFacetField(facetFieldConfig, field, removePostfix);
+ }
+ }
+
protected String transformFacetField(DiscoverFacetField facetFieldConfig, String field, boolean removePostfix) {
+ if (field.contains(SOLR_FIELD_SUFFIX_FACET_PREFIXES)) {
+ return this.transformPrefixFacetField(facetFieldConfig, field, removePostfix);
+ }
if (facetFieldConfig.getType().equals(DiscoveryConfigurationParameters.TYPE_TEXT)) {
if (removePostfix) {
return field.substring(0, field.lastIndexOf("_filter"));
@@ -1390,7 +1426,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
if (field.equals("location.comm") || field.equals("location.coll")) {
value = locationToName(context, field, value);
} else if (field.endsWith("_filter") || field.endsWith("_ac")
- || field.endsWith("_acid")) {
+ || field.endsWith("_acid") || field.endsWith(SOLR_FIELD_SUFFIX_FACET_PREFIXES)) {
//We have a filter make sure we split !
String separator = DSpaceServicesFactory.getInstance().getConfigurationService()
.getProperty("discovery.solr.facets.split.char");
@@ -1422,7 +1458,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
return value;
}
if (field.endsWith("_filter") || field.endsWith("_ac")
- || field.endsWith("_acid")) {
+ || field.endsWith("_acid") || field.endsWith(SOLR_FIELD_SUFFIX_FACET_PREFIXES)) {
//We have a filter make sure we split !
String separator = DSpaceServicesFactory.getInstance().getConfigurationService()
.getProperty("discovery.solr.facets.split.char");
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexCollectionSubmittersPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexCollectionSubmittersPlugin.java
index 00b70f93d5..ee93f954a5 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexCollectionSubmittersPlugin.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexCollectionSubmittersPlugin.java
@@ -7,16 +7,17 @@
*/
package org.dspace.discovery;
+import static org.dspace.discovery.IndexingUtils.findDirectlyAuthorizedGroupAndEPersonPrefixedIds;
+import static org.dspace.discovery.IndexingUtils.findTransitiveAdminGroupIds;
+
import java.sql.SQLException;
import java.util.List;
+import java.util.UUID;
import org.apache.logging.log4j.Logger;
import org.apache.solr.common.SolrInputDocument;
-import org.dspace.authorize.ResourcePolicy;
import org.dspace.authorize.service.AuthorizeService;
import org.dspace.content.Collection;
-import org.dspace.content.Community;
-import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.core.Constants;
import org.dspace.core.Context;
import org.dspace.core.LogHelper;
@@ -42,29 +43,21 @@ public class SolrServiceIndexCollectionSubmittersPlugin implements SolrServiceIn
Collection col = ((IndexableCollection) idxObj).getIndexedObject();
if (col != null) {
try {
- String fieldValue = null;
- Community parent = (Community) ContentServiceFactory.getInstance().getDSpaceObjectService(col)
- .getParentObject(context, col);
- while (parent != null) {
- if (parent.getAdministrators() != null) {
- fieldValue = "g" + parent.getAdministrators().getID();
- document.addField("submit", fieldValue);
- }
- parent = (Community) ContentServiceFactory.getInstance().getDSpaceObjectService(parent)
- .getParentObject(context, parent);
+ // Index groups with ADMIN rights on the Collection, on
+ // Communities containing those Collections, and recursively on any Community containing such a
+ // Community.
+ // TODO: Strictly speaking we should also check for epersons who received admin rights directly,
+ // without being part of the admin group. Finding them may be a lot slower though.
+ for (UUID unprefixedId : findTransitiveAdminGroupIds(context, col)) {
+ document.addField("submit", "g" + unprefixedId);
}
- List policies = authorizeService.getPoliciesActionFilter(context,col,Constants.ADD);
- policies.addAll(authorizeService.getPoliciesActionFilter(context, col, Constants.ADMIN));
- for (ResourcePolicy resourcePolicy : policies) {
- if (resourcePolicy.getGroup() != null) {
- fieldValue = "g" + resourcePolicy.getGroup().getID();
- } else {
- fieldValue = "e" + resourcePolicy.getEPerson().getID();
-
- }
- document.addField("submit", fieldValue);
- context.uncacheEntity(resourcePolicy);
+ // Index groups and epersons with ADD or ADMIN rights on the Collection.
+ List prefixedIds = findDirectlyAuthorizedGroupAndEPersonPrefixedIds(
+ authorizeService, context, col, new int[] {Constants.ADD, Constants.ADMIN}
+ );
+ for (String prefixedId : prefixedIds) {
+ document.addField("submit", prefixedId);
}
} catch (SQLException e) {
log.error(LogHelper.getHeader(context, "Error while indexing resource policies",
@@ -73,5 +66,4 @@ public class SolrServiceIndexCollectionSubmittersPlugin implements SolrServiceIn
}
}
}
-
-}
\ No newline at end of file
+}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexItemEditorsPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexItemEditorsPlugin.java
new file mode 100644
index 0000000000..09308be759
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexItemEditorsPlugin.java
@@ -0,0 +1,71 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.discovery;
+
+import static org.dspace.discovery.IndexingUtils.findDirectlyAuthorizedGroupAndEPersonPrefixedIds;
+import static org.dspace.discovery.IndexingUtils.findTransitiveAdminGroupIds;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.solr.common.SolrInputDocument;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.core.LogHelper;
+import org.dspace.discovery.indexobject.IndexableItem;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Indexes policies that yield write access to items.
+ *
+ * @author Koen Pauwels at atmire.com
+ */
+public class SolrServiceIndexItemEditorsPlugin implements SolrServiceIndexPlugin {
+ private static final Logger log = org.apache.logging.log4j.LogManager
+ .getLogger(SolrServiceIndexItemEditorsPlugin.class);
+
+ @Autowired(required = true)
+ protected AuthorizeService authorizeService;
+
+ @Override
+ public void additionalIndex(Context context, IndexableObject idxObj, SolrInputDocument document) {
+ if (idxObj instanceof IndexableItem) {
+ Item item = ((IndexableItem) idxObj).getIndexedObject();
+ if (item != null) {
+ try {
+ // Index groups with ADMIN rights on Collections containing the Item, on
+ // Communities containing those Collections, and recursively on any Community containing ssuch a
+ // Community.
+ // TODO: Strictly speaking we should also check for epersons who received admin rights directly,
+ // without being part of the admin group. Finding them may be a lot slower though.
+ for (Collection collection : item.getCollections()) {
+ for (UUID unprefixedId : findTransitiveAdminGroupIds(context, collection)) {
+ document.addField("edit", "g" + unprefixedId);
+ }
+ }
+
+ // Index groups and epersons with WRITE or direct ADMIN rights on the Item.
+ List prefixedIds = findDirectlyAuthorizedGroupAndEPersonPrefixedIds(
+ authorizeService, context, item, new int[] {Constants.WRITE, Constants.ADMIN}
+ );
+ for (String prefixedId : prefixedIds) {
+ document.addField("edit", prefixedId);
+ }
+ } catch (SQLException e) {
+ log.error(LogHelper.getHeader(context, "Error while indexing resource policies",
+ "Item: (id " + item.getID() + " name " + item.getName() + ")" ));
+ }
+ }
+ }
+ }
+}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceMetadataBrowseIndexingPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceMetadataBrowseIndexingPlugin.java
index d03ea359f5..746a0cb832 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceMetadataBrowseIndexingPlugin.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceMetadataBrowseIndexingPlugin.java
@@ -7,6 +7,8 @@
*/
package org.dspace.discovery;
+import static org.dspace.discovery.SolrServiceImpl.SOLR_FIELD_SUFFIX_FACET_PREFIXES;
+
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -261,9 +263,9 @@ public class SolrServiceMetadataBrowseIndexingPlugin implements SolrServiceIndex
}
}
}
-
for (String facet : distFValues) {
document.addField(bi.getDistinctTableName() + "_filter", facet);
+ document.addField(bi.getDistinctTableName() + SOLR_FIELD_SUFFIX_FACET_PREFIXES, facet);
}
for (String facet : distFAuths) {
document.addField(bi.getDistinctTableName()
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceSupervisionOrderIndexingPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceSupervisionOrderIndexingPlugin.java
new file mode 100644
index 0000000000..116b5ec88d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceSupervisionOrderIndexingPlugin.java
@@ -0,0 +1,68 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.discovery;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.solr.common.SolrInputDocument;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.discovery.indexobject.IndexableInProgressSubmission;
+import org.dspace.discovery.indexobject.IndexableWorkflowItem;
+import org.dspace.discovery.indexobject.IndexableWorkspaceItem;
+import org.dspace.supervision.SupervisionOrder;
+import org.dspace.supervision.service.SupervisionOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * A Solr Indexing plugin responsible adding a `supervised` field.
+ * When item being indexed is a workspace or workflow item,
+ * and at least one supervision order is defined
+ * the 'supervised' field with value 'true' will be added to the solr document,
+ * if no supervision orders are defined field will be set to 'false'
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science dot it)
+ */
+public class SolrServiceSupervisionOrderIndexingPlugin implements SolrServiceIndexPlugin {
+
+ @Autowired(required = true)
+ private SupervisionOrderService supervisionOrderService;
+
+ @Override
+ public void additionalIndex(Context context, IndexableObject indexableObject, SolrInputDocument document) {
+ try {
+
+ if (!(indexableObject instanceof IndexableWorkspaceItem) &&
+ !(indexableObject instanceof IndexableWorkflowItem)) {
+ return;
+ }
+
+ Item item =
+ (((IndexableInProgressSubmission) indexableObject).getIndexedObject()).getItem();
+
+ if (Objects.isNull(item)) {
+ return;
+ }
+ addSupervisedField(context, item, document);
+ } catch (SQLException e) {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ }
+
+ private void addSupervisedField(Context context, Item item, SolrInputDocument document) throws SQLException {
+ List supervisionOrders = supervisionOrderService.findByItem(context, item);
+ if (CollectionUtils.isNotEmpty(supervisionOrders)) {
+ document.addField("supervised", true);
+ } else {
+ document.addField("supervised", false);
+ }
+ }
+}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceWorkspaceWorkflowRestrictionPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceWorkspaceWorkflowRestrictionPlugin.java
index fd05be1cb5..1618494756 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceWorkspaceWorkflowRestrictionPlugin.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceWorkspaceWorkflowRestrictionPlugin.java
@@ -40,6 +40,11 @@ public class SolrServiceWorkspaceWorkflowRestrictionPlugin implements SolrServic
*/
public static final String DISCOVER_WORKFLOW_ADMIN_CONFIGURATION_NAME = "workflowAdmin";
+ /**
+ * The name of the discover configuration used by administrators to search for workspace and workflow tasks
+ */
+ public static final String DISCOVER_SUPERVISION_CONFIGURATION_NAME = "supervision";
+
@Autowired(required = true)
protected GroupService groupService;
@@ -60,18 +65,22 @@ public class SolrServiceWorkspaceWorkflowRestrictionPlugin implements SolrServic
);
boolean isWorkflowAdmin = isAdmin(context)
&& DISCOVER_WORKFLOW_ADMIN_CONFIGURATION_NAME.equals(discoveryQuery.getDiscoveryConfigurationName());
+
+ boolean isSupervision =
+ DISCOVER_SUPERVISION_CONFIGURATION_NAME.equals(discoveryQuery.getDiscoveryConfigurationName());
+
EPerson currentUser = context.getCurrentUser();
// extra security check to avoid the possibility that an anonymous user
// get access to workspace or workflow
- if (currentUser == null && (isWorkflow || isWorkspace)) {
+ if (currentUser == null && (isWorkflow || isWorkspace || isSupervision)) {
throw new IllegalStateException(
"An anonymous user cannot perform a workspace or workflow search");
}
if (isWorkspace) {
// insert filter by submitter
solrQuery.addFilterQuery("submitter_authority:(" + currentUser.getID() + ")");
- } else if (isWorkflow && !isWorkflowAdmin) {
+ } else if ((isWorkflow && !isWorkflowAdmin) || (isSupervision && !isAdmin(context))) {
// Retrieve all the groups the current user is a member of !
Set groups;
try {
diff --git a/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoveryConfigurationService.java b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoveryConfigurationService.java
index 636e7ccd2a..c02c83ece6 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoveryConfigurationService.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoveryConfigurationService.java
@@ -139,4 +139,23 @@ public class DiscoveryConfigurationService {
}
}
}
+
+ /**
+ * Retrieves a list of all DiscoveryConfiguration objects where key starts with prefixConfigurationName
+ *
+ * @param prefixConfigurationName string as prefix key
+ */
+ public List getDiscoveryConfigurationWithPrefixName(final String prefixConfigurationName) {
+ List discoveryConfigurationList = new ArrayList<>();
+ if (StringUtils.isNotBlank(prefixConfigurationName)) {
+ for (String key : map.keySet()) {
+ if (key.equals(prefixConfigurationName) || key.startsWith(prefixConfigurationName)) {
+ DiscoveryConfiguration config = map.get(key);
+ discoveryConfigurationList.add(config);
+ }
+ }
+ }
+ return discoveryConfigurationList;
+ }
+
}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoveryRelatedItemConfiguration.java b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoveryRelatedItemConfiguration.java
new file mode 100644
index 0000000000..6c24a6bac6
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoveryRelatedItemConfiguration.java
@@ -0,0 +1,16 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.discovery.configuration;
+
+/**
+ * This class extends {@link DiscoveryConfiguration} and add method for set parameters
+ * to filter query list
+ *
+ * @author Danilo Di Nuzzo (danilo.dinuzzo at 4science.it)
+ */
+public class DiscoveryRelatedItemConfiguration extends DiscoveryConfiguration {}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySortFunctionConfiguration.java b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySortFunctionConfiguration.java
new file mode 100644
index 0000000000..7fb020cd56
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySortFunctionConfiguration.java
@@ -0,0 +1,66 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.discovery.configuration;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ *
+ * Extension of {@link DiscoverySortFieldConfiguration} used to configure sorting
+ * taking advantage of solr function feature.
+ *
+ * Order is evaluated by mean of function parameter value and passed in arguments as input.
+ *
+ * @author Corrado Lombardi (corrado.lombardi at 4science.it)
+ *
+ */
+public class DiscoverySortFunctionConfiguration extends DiscoverySortFieldConfiguration {
+
+ public static final String SORT_FUNCTION = "sort_function";
+ private String function;
+ private List arguments;
+ private String id;
+
+ public void setFunction(final String function) {
+ this.function = function;
+ }
+
+ public void setArguments(final List arguments) {
+ this.arguments = arguments;
+ }
+
+ @Override
+ public String getType() {
+ return SORT_FUNCTION;
+ }
+
+ @Override
+ public String getMetadataField() {
+ return id;
+ }
+
+ public void setId(final String id) {
+ this.id = id;
+ }
+
+ /**
+ * Returns the function to be used by solr to sort result
+ * @param functionArgs variable arguments to be inserted in function
+ * @return
+ */
+ public String getFunction(final Serializable... functionArgs) {
+ final String args = String.join(",", Optional.ofNullable(arguments).orElse(Collections.emptyList()));
+ final String result = function + "(" + args + ")";
+ return MessageFormat.format(result, functionArgs);
+ }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/InprogressSubmissionIndexFactoryImpl.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/InprogressSubmissionIndexFactoryImpl.java
index d0b0f363e6..8a24b997ff 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/indexobject/InprogressSubmissionIndexFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/InprogressSubmissionIndexFactoryImpl.java
@@ -22,6 +22,8 @@ import org.dspace.discovery.indexobject.factory.CollectionIndexFactory;
import org.dspace.discovery.indexobject.factory.InprogressSubmissionIndexFactory;
import org.dspace.discovery.indexobject.factory.ItemIndexFactory;
import org.dspace.eperson.EPerson;
+import org.dspace.supervision.SupervisionOrder;
+import org.dspace.supervision.service.SupervisionOrderService;
import org.dspace.util.SolrUtils;
import org.dspace.workflow.WorkflowItem;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +41,9 @@ public abstract class InprogressSubmissionIndexFactoryImpl
@Autowired
protected ItemIndexFactory indexableItemService;
+ @Autowired
+ protected SupervisionOrderService supervisionOrderService;
+
@Override
public SolrInputDocument buildDocument(Context context, T indexableObject) throws SQLException, IOException {
@@ -60,6 +65,8 @@ public abstract class InprogressSubmissionIndexFactoryImpl
submitter.getFullName());
}
+ addSupervisedByFacetIndex(context, item, doc);
+
doc.addField("inprogress.item", new IndexableItem(inProgressSubmission.getItem()).getUniqueIndexID());
// get the location string (for searching by collection & community)
@@ -82,4 +89,13 @@ public abstract class InprogressSubmissionIndexFactoryImpl
indexableItemService.addDiscoveryFields(doc, context, item, discoveryConfigurations);
indexableCollectionService.storeCommunityCollectionLocations(doc, locations);
}
+
+ private void addSupervisedByFacetIndex(Context context, Item item, SolrInputDocument doc) throws SQLException {
+ List supervisionOrders = supervisionOrderService.findByItem(context, item);
+ for (SupervisionOrder supervisionOrder : supervisionOrders) {
+ addFacetIndex(doc, "supervisedBy", supervisionOrder.getGroup().getID().toString(),
+ supervisionOrder.getGroup().getName());
+ }
+
+ }
}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/ItemIndexFactoryImpl.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/ItemIndexFactoryImpl.java
index 15a74b45d1..fc024cc524 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/indexobject/ItemIndexFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/ItemIndexFactoryImpl.java
@@ -7,6 +7,8 @@
*/
package org.dspace.discovery.indexobject;
+import static org.dspace.discovery.SolrServiceImpl.SOLR_FIELD_SUFFIX_FACET_PREFIXES;
+
import java.io.IOException;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -20,6 +22,8 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
@@ -27,6 +31,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.logging.log4j.Logger;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.common.SolrInputDocument;
+import org.dspace.authority.service.AuthorityValueService;
import org.dspace.content.Collection;
import org.dspace.content.Community;
import org.dspace.content.Item;
@@ -89,6 +94,8 @@ public class ItemIndexFactoryImpl extends DSpaceObjectIndexFactoryImpl
+ * E.g. Author "With Multiple Words" gets stored as:
+ *
+ *
+ * with multiple words ||| With Multiple Words,
+ * multiple words ||| With Multiple Words,
+ * words ||| With Multiple Words,
+ *
+ * in the author_prefix field.
+ * @param doc the solr document
+ * @param searchFilter the current discoverySearchFilter
+ * @param value the metadata value
+ * @param separator the separator being used to separate value part and original value
+ */
+ private void saveFacetPrefixParts(SolrInputDocument doc, DiscoverySearchFilter searchFilter, String value,
+ String separator, String authority, String preferedLabel) {
+ value = StringUtils.normalizeSpace(value);
+ Pattern pattern = Pattern.compile("\\b\\w+\\b", Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(value);
+ while (matcher.find()) {
+ int index = matcher.start();
+ String currentPart = StringUtils.substring(value, index);
+ if (authority != null) {
+ String facetValue = preferedLabel != null ? preferedLabel : currentPart;
+ doc.addField(searchFilter.getIndexFieldName() + SOLR_FIELD_SUFFIX_FACET_PREFIXES,
+ facetValue.toLowerCase() + separator + value
+ + SearchUtils.AUTHORITY_SEPARATOR + authority);
+ } else {
+ doc.addField(searchFilter.getIndexFieldName() + SOLR_FIELD_SUFFIX_FACET_PREFIXES,
+ currentPart.toLowerCase() + separator + value);
+ }
+ }
+ }
}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/utils/DiscoverQueryBuilder.java b/dspace-api/src/main/java/org/dspace/discovery/utils/DiscoverQueryBuilder.java
index d7a546d936..fa5cc32813 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/utils/DiscoverQueryBuilder.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/utils/DiscoverQueryBuilder.java
@@ -245,6 +245,7 @@ public class DiscoverQueryBuilder implements InitializingBean {
// "show more" url
int facetLimit = pageSize + 1;
//This should take care of the sorting for us
+ prefix = StringUtils.isNotBlank(prefix) ? prefix.toLowerCase() : null;
queryArgs.addFacetField(new DiscoverFacetField(facet.getIndexFieldName(), facet.getType(), facetLimit,
facet.getSortOrderSidebar(),
StringUtils.trimToNull(prefix)));
diff --git a/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
index d873d7230c..3d4eab125f 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
@@ -14,6 +14,7 @@ import javax.mail.MessagingException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.dspace.authenticate.service.AuthenticationService;
import org.dspace.authorize.AuthorizeException;
import org.dspace.core.Context;
import org.dspace.core.Email;
@@ -51,6 +52,9 @@ public class AccountServiceImpl implements AccountService {
@Autowired
private ConfigurationService configurationService;
+ @Autowired
+ private AuthenticationService authenticationService;
+
protected AccountServiceImpl() {
}
@@ -79,6 +83,9 @@ public class AccountServiceImpl implements AccountService {
if (!configurationService.getBooleanProperty("user.registration", true)) {
throw new IllegalStateException("The user.registration parameter was set to false");
}
+ if (!authenticationService.canSelfRegister(context, null, email)) {
+ throw new IllegalStateException("self registration is not allowed with this email address");
+ }
sendInfo(context, email, true, true);
}
diff --git a/dspace-api/src/main/java/org/dspace/eperson/FrequencyType.java b/dspace-api/src/main/java/org/dspace/eperson/FrequencyType.java
new file mode 100644
index 0000000000..72822fb871
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/eperson/FrequencyType.java
@@ -0,0 +1,81 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.eperson;
+
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+
+import org.apache.commons.codec.binary.StringUtils;
+
+/**
+ * This enum holds all the possible frequency types
+ * that can be used in "subscription-send" script
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public enum FrequencyType {
+ DAY("D"),
+ WEEK("W"),
+ MONTH("M");
+
+ private String shortName;
+
+ private FrequencyType(String shortName) {
+ this.shortName = shortName;
+ }
+
+ public static String findLastFrequency(String frequency) {
+ String startDate = "";
+ String endDate = "";
+ Calendar cal = Calendar.getInstance();
+ // Full ISO 8601 is e.g.
+ SimpleDateFormat fullIsoStart = new SimpleDateFormat("yyyy-MM-dd'T'00:00:00'Z'");
+ SimpleDateFormat fullIsoEnd = new SimpleDateFormat("yyyy-MM-dd'T'23:59:59'Z'");
+ switch (frequency) {
+ case "D":
+ cal.add(Calendar.DAY_OF_MONTH, -1);
+ endDate = fullIsoEnd.format(cal.getTime());
+ startDate = fullIsoStart.format(cal.getTime());
+ break;
+ case "M":
+ int dayOfMonth = cal.get(Calendar.DAY_OF_MONTH);
+ cal.add(Calendar.DAY_OF_MONTH, -dayOfMonth);
+ endDate = fullIsoEnd.format(cal.getTime());
+ cal.add(Calendar.MONTH, -1);
+ cal.add(Calendar.DAY_OF_MONTH, 1);
+ startDate = fullIsoStart.format(cal.getTime());
+ break;
+ case "W":
+ cal.add(Calendar.DAY_OF_WEEK, -1);
+ int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK) - 1;
+ cal.add(Calendar.DAY_OF_WEEK, -dayOfWeek);
+ endDate = fullIsoEnd.format(cal.getTime());
+ cal.add(Calendar.DAY_OF_WEEK, -6);
+ startDate = fullIsoStart.format(cal.getTime());
+ break;
+ default:
+ return null;
+ }
+ return "[" + startDate + " TO " + endDate + "]";
+ }
+
+ public static boolean isSupportedFrequencyType(String value) {
+ for (FrequencyType ft : Arrays.asList(FrequencyType.values())) {
+ if (StringUtils.equals(ft.getShortName(), value)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public String getShortName() {
+ return shortName;
+ }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/eperson/Group.java b/dspace-api/src/main/java/org/dspace/eperson/Group.java
index b2d3964895..6cb534146b 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/Group.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/Group.java
@@ -23,7 +23,6 @@ import javax.persistence.Transient;
import org.apache.commons.lang3.StringUtils;
import org.dspace.content.DSpaceObject;
import org.dspace.content.DSpaceObjectLegacySupport;
-import org.dspace.content.WorkspaceItem;
import org.dspace.core.Constants;
import org.dspace.core.Context;
import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -83,9 +82,6 @@ public class Group extends DSpaceObject implements DSpaceObjectLegacySupport {
@ManyToMany(fetch = FetchType.LAZY, mappedBy = "groups")
private final List parentGroups = new ArrayList<>();
- @ManyToMany(fetch = FetchType.LAZY, mappedBy = "supervisorGroups")
- private final List supervisedItems = new ArrayList<>();
-
@Transient
private boolean groupsChanged;
@@ -218,10 +214,6 @@ public class Group extends DSpaceObject implements DSpaceObjectLegacySupport {
return legacyId;
}
- public List getSupervisedItems() {
- return supervisedItems;
- }
-
/**
* May this Group be renamed or deleted? (The content of any group may be
* changed.)
diff --git a/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
index 2b23ecfeef..607e57af0b 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
@@ -353,8 +353,6 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl implements
List groupCache = group2GroupCacheDAO.findByChildren(context, groups);
// now we have all owning groups, also grab all parents of owning groups
- // yes, I know this could have been done as one big query and a union,
- // but doing the Oracle port taught me to keep to simple SQL!
for (Group2GroupCache group2GroupCache : groupCache) {
groups.add(group2GroupCache.getParent());
}
@@ -480,9 +478,6 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl implements
context.addEvent(new Event(Event.DELETE, Constants.GROUP, group.getID(),
group.getName(), getIdentifiers(context, group)));
- //Remove the supervised group from any workspace items linked to us.
- group.getSupervisedItems().clear();
-
// Remove any ResourcePolicies that reference this group
authorizeService.removeGroupPolicies(context, group);
diff --git a/dspace-api/src/main/java/org/dspace/eperson/SubscribeCLITool.java b/dspace-api/src/main/java/org/dspace/eperson/SubscribeCLITool.java
deleted file mode 100644
index 9e5ecaa4fb..0000000000
--- a/dspace-api/src/main/java/org/dspace/eperson/SubscribeCLITool.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.eperson;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.ResourceBundle;
-import java.util.TimeZone;
-import javax.mail.MessagingException;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.Logger;
-import org.dspace.content.Collection;
-import org.dspace.content.DCDate;
-import org.dspace.content.Item;
-import org.dspace.content.MetadataSchemaEnum;
-import org.dspace.content.MetadataValue;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.ItemService;
-import org.dspace.core.Context;
-import org.dspace.core.Email;
-import org.dspace.core.I18nUtil;
-import org.dspace.core.LogHelper;
-import org.dspace.eperson.factory.EPersonServiceFactory;
-import org.dspace.eperson.service.SubscribeService;
-import org.dspace.handle.factory.HandleServiceFactory;
-import org.dspace.handle.service.HandleService;
-import org.dspace.search.Harvest;
-import org.dspace.search.HarvestedItemInfo;
-import org.dspace.services.ConfigurationService;
-import org.dspace.services.factory.DSpaceServicesFactory;
-
-/**
- * CLI tool used for sending new item e-mail alerts to users
- *
- * @author Robert Tansley
- * @version $Revision$
- */
-public class SubscribeCLITool {
-
- private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SubscribeCLITool.class);
-
- private static final HandleService handleService
- = HandleServiceFactory.getInstance().getHandleService();
- private static final ItemService itemService
- = ContentServiceFactory.getInstance().getItemService();
- private static final SubscribeService subscribeService
- = EPersonServiceFactory.getInstance().getSubscribeService();
- private static final ConfigurationService configurationService
- = DSpaceServicesFactory.getInstance().getConfigurationService();
-
- /**
- * Default constructor
- */
- private SubscribeCLITool() { }
-
- /**
- * Process subscriptions. This must be invoked only once a day. Messages are
- * only sent out when a collection has actually received new items, so that
- * people's mailboxes are not clogged with many "no new items" mails.
- *
- * Yesterday's newly available items are included. If this is run at for
- * example midday, any items that have been made available during the
- * current day will not be included, but will be included in the next day's
- * run.
- *
- * For example, if today's date is 2002-10-10 (in UTC) items made available
- * during 2002-10-09 (UTC) will be included.
- *
- * @param context The relevant DSpace Context.
- * @param test If true, do a "dry run", i.e. don't actually send email, just log the attempt
- * @throws SQLException An exception that provides information on a database access error or other errors.
- * @throws IOException A general class of exceptions produced by failed or interrupted I/O operations.
- */
- public static void processDaily(Context context, boolean test) throws SQLException,
- IOException {
- // Grab the subscriptions
-
- List subscriptions = subscribeService.findAll(context);
-
- EPerson currentEPerson = null;
- List collections = null; // List of Collections
-
- // Go through the list collating subscriptions for each e-person
- for (Subscription subscription : subscriptions) {
- // Does this row relate to the same e-person as the last?
- if ((currentEPerson == null)
- || (!subscription.getePerson().getID().equals(currentEPerson
- .getID()))) {
- // New e-person. Send mail for previous e-person
- if (currentEPerson != null) {
-
- try {
- sendEmail(context, currentEPerson, collections, test);
- } catch (MessagingException me) {
- log.error("Failed to send subscription to eperson_id="
- + currentEPerson.getID());
- log.error(me);
- }
- }
-
- currentEPerson = subscription.getePerson();
- collections = new ArrayList<>();
- }
-
- collections.add(subscription.getCollection());
- }
-
- // Process the last person
- if (currentEPerson != null) {
- try {
- sendEmail(context, currentEPerson, collections, test);
- } catch (MessagingException me) {
- log.error("Failed to send subscription to eperson_id="
- + currentEPerson.getID());
- log.error(me);
- }
- }
- }
-
- /**
- * Sends an email to the given e-person with details of new items in the
- * given collections, items that appeared yesterday. No e-mail is sent if
- * there aren't any new items in any of the collections.
- *
- * @param context DSpace context object
- * @param eperson eperson to send to
- * @param collections List of collection IDs (Integers)
- * @param test If true, do a "dry run", i.e. don't actually send email, just log the attempt
- * @throws IOException A general class of exceptions produced by failed or interrupted I/O operations.
- * @throws MessagingException A general class of exceptions for sending email.
- * @throws SQLException An exception that provides information on a database access error or other errors.
- */
- public static void sendEmail(Context context, EPerson eperson,
- List collections, boolean test) throws IOException, MessagingException,
- SQLException {
- // Get a resource bundle according to the eperson language preferences
- Locale supportedLocale = I18nUtil.getEPersonLocale(eperson);
- ResourceBundle labels = ResourceBundle.getBundle("Messages", supportedLocale);
-
- // Get the start and end dates for yesterday
-
- // The date should reflect the timezone as well. Otherwise we stand to lose that information
- // in truncation and roll to an earlier date than intended.
- Calendar cal = Calendar.getInstance(TimeZone.getDefault());
- cal.setTime(new Date());
-
- // What we actually want to pass to Harvest is "Midnight of yesterday in my current timezone"
- // Truncation will actually pass in "Midnight of yesterday in UTC", which will be,
- // at least in CDT, "7pm, the day before yesterday, in my current timezone".
- cal.add(Calendar.HOUR, -24);
- cal.set(Calendar.HOUR_OF_DAY, 0);
- cal.set(Calendar.MINUTE, 0);
- cal.set(Calendar.SECOND, 0);
- Date midnightYesterday = cal.getTime();
-
-
- // FIXME: text of email should be more configurable from an
- // i18n viewpoint
- StringBuilder emailText = new StringBuilder();
- boolean isFirst = true;
-
- for (int i = 0; i < collections.size(); i++) {
- Collection c = collections.get(i);
-
- try {
- boolean includeAll = configurationService
- .getBooleanProperty("harvest.includerestricted.subscription", true);
-
- // we harvest all the changed item from yesterday until now
- List itemInfos = Harvest
- .harvest(context, c, new DCDate(midnightYesterday).toString(), null, 0, // Limit
- // and
- // offset
- // zero,
- // get
- // everything
- 0, true, // Need item objects
- false, // But not containers
- false, // Or withdrawals
- includeAll);
-
- if (configurationService.getBooleanProperty("eperson.subscription.onlynew", false)) {
- // get only the items archived yesterday
- itemInfos = filterOutModified(itemInfos);
- } else {
- // strip out the item archived today or
- // not archived yesterday and modified today
- itemInfos = filterOutToday(itemInfos);
- }
-
- // Only add to buffer if there are new items
- if (itemInfos.size() > 0) {
- if (!isFirst) {
- emailText
- .append("\n---------------------------------------\n");
- } else {
- isFirst = false;
- }
-
- emailText.append(labels.getString("org.dspace.eperson.Subscribe.new-items")).append(" ").append(
- c.getName()).append(": ").append(
- itemInfos.size()).append("\n\n");
-
- for (int j = 0; j < itemInfos.size(); j++) {
- HarvestedItemInfo hii = (HarvestedItemInfo) itemInfos
- .get(j);
-
- String title = hii.item.getName();
- emailText.append(" ").append(labels.getString("org.dspace.eperson.Subscribe.title"))
- .append(" ");
-
- if (StringUtils.isNotBlank(title)) {
- emailText.append(title);
- } else {
- emailText.append(labels.getString("org.dspace.eperson.Subscribe.untitled"));
- }
-
- List authors = itemService
- .getMetadata(hii.item, MetadataSchemaEnum.DC.getName(), "contributor", Item.ANY, Item.ANY);
-
- if (authors.size() > 0) {
- emailText.append("\n ").append(labels.getString("org.dspace.eperson.Subscribe.authors"))
- .append(" ").append(
- authors.get(0).getValue());
-
- for (int k = 1; k < authors.size(); k++) {
- emailText.append("\n ").append(
- authors.get(k).getValue());
- }
- }
-
- emailText.append("\n ").append(labels.getString("org.dspace.eperson.Subscribe.id"))
- .append(" ").append(
- handleService.getCanonicalForm(hii.handle)).append(
- "\n\n");
- }
- }
- } catch (ParseException pe) {
- // This should never get thrown as the Dates are auto-generated
- }
- }
-
- // Send an e-mail if there were any new items
- if (emailText.length() > 0) {
-
- if (test) {
- log.info(LogHelper.getHeader(context, "subscription:", "eperson=" + eperson.getEmail()));
- log.info(LogHelper.getHeader(context, "subscription:", "text=" + emailText.toString()));
-
- } else {
-
- Email email = Email.getEmail(I18nUtil.getEmailFilename(supportedLocale, "subscription"));
- email.addRecipient(eperson.getEmail());
- email.addArgument(emailText.toString());
- email.send();
-
- log.info(LogHelper.getHeader(context, "sent_subscription", "eperson_id=" + eperson.getID()));
-
- }
-
-
- }
- }
-
- /**
- * Method for invoking subscriptions via the command line
- *
- * @param argv the command line arguments given
- */
- public static void main(String[] argv) {
- String usage = "org.dspace.eperson.Subscribe [-t] or nothing to send out subscriptions.";
-
- Options options = new Options();
- HelpFormatter formatter = new HelpFormatter();
- CommandLine line = null;
-
- {
- Option opt = new Option("t", "test", false, "Run test session");
- opt.setRequired(false);
- options.addOption(opt);
- }
-
- {
- Option opt = new Option("h", "help", false, "Print this help message");
- opt.setRequired(false);
- options.addOption(opt);
- }
-
- try {
- line = new DefaultParser().parse(options, argv);
- } catch (org.apache.commons.cli.ParseException e) {
- // automatically generate the help statement
- formatter.printHelp(usage, e.getMessage(), options, "");
- System.exit(1);
- }
-
- if (line.hasOption("h")) {
- // automatically generate the help statement
- formatter.printHelp(usage, options);
- System.exit(1);
- }
-
- boolean test = line.hasOption("t");
-
- Context context = null;
-
- try {
- context = new Context(Context.Mode.READ_ONLY);
- processDaily(context, test);
- context.complete();
- } catch (IOException | SQLException e) {
- log.fatal(e);
- } finally {
- if (context != null && context.isValid()) {
- // Nothing is actually written
- context.abort();
- }
- }
- }
-
- private static List filterOutToday(List completeList) {
- log.debug("Filtering out all today item to leave new items list size="
- + completeList.size());
- List filteredList = new ArrayList<>();
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- String today = sdf.format(new Date());
- // Get the start and end dates for yesterday
- Date thisTimeYesterday = new Date(System.currentTimeMillis()
- - (24 * 60 * 60 * 1000));
- String yesterday = sdf.format(thisTimeYesterday);
-
- for (HarvestedItemInfo infoObject : completeList) {
- Date lastUpdate = infoObject.item.getLastModified();
- String lastUpdateStr = sdf.format(lastUpdate);
-
- // has the item modified today?
- if (lastUpdateStr.equals(today)) {
- List dateAccArr = itemService.getMetadata(infoObject.item, "dc",
- "date", "accessioned", Item.ANY);
- // we need only the item archived yesterday
- if (dateAccArr != null && dateAccArr.size() > 0) {
- for (MetadataValue date : dateAccArr) {
- if (date != null && date.getValue() != null) {
- // if it hasn't been archived today
- if (date.getValue().startsWith(yesterday)) {
- filteredList.add(infoObject);
- log.debug("adding : " + dateAccArr.get(0).getValue()
- + " : " + today + " : "
- + infoObject.handle);
- break;
- } else {
- log.debug("ignoring : " + dateAccArr.get(0).getValue()
- + " : " + today + " : "
- + infoObject.handle);
- }
- }
- }
- } else {
- log.debug("no date accessioned, adding : "
- + infoObject.handle);
- filteredList.add(infoObject);
- }
- } else {
- // the item has been modified yesterday...
- filteredList.add(infoObject);
- }
- }
-
- return filteredList;
- }
-
- private static List filterOutModified(List completeList) {
- log.debug("Filtering out all modified to leave new items list size=" + completeList.size());
- List filteredList = new ArrayList<>();
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- // Get the start and end dates for yesterday
- Date thisTimeYesterday = new Date(System.currentTimeMillis()
- - (24 * 60 * 60 * 1000));
- String yesterday = sdf.format(thisTimeYesterday);
-
- for (HarvestedItemInfo infoObject : completeList) {
- List dateAccArr = itemService
- .getMetadata(infoObject.item, "dc", "date", "accessioned", Item.ANY);
-
- if (dateAccArr != null && dateAccArr.size() > 0) {
- for (MetadataValue date : dateAccArr) {
- if (date != null && date.getValue() != null) {
- // if it has been archived yesterday
- if (date.getValue().startsWith(yesterday)) {
- filteredList.add(infoObject);
- log.debug("adding : " + dateAccArr.get(0)
- .getValue() + " : " + yesterday + " : " + infoObject
- .handle);
- break;
- } else {
- log.debug("ignoring : " + dateAccArr.get(0)
- .getValue() + " : " + yesterday + " : " + infoObject
- .handle);
- }
- }
- }
-
-
- } else {
- log.debug("no date accessioned, adding : " + infoObject.handle);
- filteredList.add(infoObject);
- }
- }
-
- return filteredList;
- }
-}
diff --git a/dspace-api/src/main/java/org/dspace/eperson/SubscribeServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/SubscribeServiceImpl.java
index 81c367f0ea..2e4d94f443 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/SubscribeServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/SubscribeServiceImpl.java
@@ -9,11 +9,16 @@ package org.dspace.eperson;
import java.sql.SQLException;
import java.util.List;
+import java.util.Objects;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.dspace.authorize.AuthorizeException;
import org.dspace.authorize.service.AuthorizeService;
import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.DSpaceObject;
import org.dspace.content.service.CollectionService;
import org.dspace.core.Constants;
import org.dspace.core.Context;
@@ -29,106 +34,177 @@ import org.springframework.beans.factory.annotation.Autowired;
* @version $Revision$
*/
public class SubscribeServiceImpl implements SubscribeService {
- /**
- * log4j logger
- */
- private Logger log = org.apache.logging.log4j.LogManager.getLogger(SubscribeServiceImpl.class);
+
+ private Logger log = LogManager.getLogger(SubscribeServiceImpl.class);
@Autowired(required = true)
- protected SubscriptionDAO subscriptionDAO;
-
+ private SubscriptionDAO subscriptionDAO;
@Autowired(required = true)
- protected AuthorizeService authorizeService;
+ private AuthorizeService authorizeService;
@Autowired(required = true)
- protected CollectionService collectionService;
-
- protected SubscribeServiceImpl() {
-
- }
+ private CollectionService collectionService;
@Override
- public List findAll(Context context) throws SQLException {
- return subscriptionDAO.findAllOrderedByEPerson(context);
- }
-
- @Override
- public void subscribe(Context context, EPerson eperson,
- Collection collection) throws SQLException, AuthorizeException {
- // Check authorisation. Must be administrator, or the eperson.
- if (authorizeService.isAdmin(context)
- || ((context.getCurrentUser() != null) && (context
- .getCurrentUser().getID().equals(eperson.getID())))) {
- if (!isSubscribed(context, eperson, collection)) {
- Subscription subscription = subscriptionDAO.create(context, new Subscription());
- subscription.setCollection(collection);
- subscription.setePerson(eperson);
- }
+ public List findAll(Context context, String resourceType, Integer limit, Integer offset)
+ throws Exception {
+ if (StringUtils.isBlank(resourceType)) {
+ return subscriptionDAO.findAllOrderedByDSO(context, limit, offset);
} else {
- throw new AuthorizeException(
- "Only admin or e-person themselves can subscribe");
+ if (resourceType.equals(Collection.class.getSimpleName()) ||
+ resourceType.equals(Community.class.getSimpleName())) {
+ return subscriptionDAO.findAllOrderedByIDAndResourceType(context, resourceType, limit, offset);
+ } else {
+ log.error("Resource type must be Collection or Community");
+ throw new Exception("Resource type must be Collection or Community");
+ }
}
}
@Override
- public void unsubscribe(Context context, EPerson eperson,
- Collection collection) throws SQLException, AuthorizeException {
+ public Subscription subscribe(Context context, EPerson eperson,
+ DSpaceObject dSpaceObject,
+ List subscriptionParameterList,
+ String type) throws SQLException, AuthorizeException {
// Check authorisation. Must be administrator, or the eperson.
if (authorizeService.isAdmin(context)
- || ((context.getCurrentUser() != null) && (context
- .getCurrentUser().getID().equals(eperson.getID())))) {
- if (collection == null) {
+ || ((context.getCurrentUser() != null) && (context
+ .getCurrentUser().getID().equals(eperson.getID())))) {
+ Subscription newSubscription = subscriptionDAO.create(context, new Subscription());
+ subscriptionParameterList.forEach(subscriptionParameter ->
+ newSubscription.addParameter(subscriptionParameter));
+ newSubscription.setEPerson(eperson);
+ newSubscription.setDSpaceObject(dSpaceObject);
+ newSubscription.setSubscriptionType(type);
+ return newSubscription;
+ } else {
+ throw new AuthorizeException("Only admin or e-person themselves can subscribe");
+ }
+ }
+
+ @Override
+ public void unsubscribe(Context context, EPerson eperson, DSpaceObject dSpaceObject)
+ throws SQLException, AuthorizeException {
+ // Check authorisation. Must be administrator, or the eperson.
+ if (authorizeService.isAdmin(context)
+ || ((context.getCurrentUser() != null) && (context
+ .getCurrentUser().getID().equals(eperson.getID())))) {
+ if (dSpaceObject == null) {
// Unsubscribe from all
subscriptionDAO.deleteByEPerson(context, eperson);
} else {
- subscriptionDAO.deleteByCollectionAndEPerson(context, collection, eperson);
+ subscriptionDAO.deleteByDSOAndEPerson(context, dSpaceObject, eperson);
log.info(LogHelper.getHeader(context, "unsubscribe",
"eperson_id=" + eperson.getID() + ",collection_id="
- + collection.getID()));
+ + dSpaceObject.getID()));
}
} else {
- throw new AuthorizeException(
- "Only admin or e-person themselves can unsubscribe");
+ throw new AuthorizeException("Only admin or e-person themselves can unsubscribe");
}
}
@Override
- public List getSubscriptions(Context context, EPerson eperson)
- throws SQLException {
- return subscriptionDAO.findByEPerson(context, eperson);
+ public List findSubscriptionsByEPerson(Context context, EPerson eperson, Integer limit,Integer offset)
+ throws SQLException {
+ return subscriptionDAO.findByEPerson(context, eperson, limit, offset);
}
@Override
- public List getAvailableSubscriptions(Context context)
- throws SQLException {
- return getAvailableSubscriptions(context, null);
+ public List findSubscriptionsByEPersonAndDso(Context context, EPerson eperson,
+ DSpaceObject dSpaceObject,
+ Integer limit, Integer offset) throws SQLException {
+ return subscriptionDAO.findByEPersonAndDso(context, eperson, dSpaceObject, limit, offset);
}
@Override
- public List getAvailableSubscriptions(Context context, EPerson eperson)
- throws SQLException {
- List collections;
- if (eperson != null) {
+ public List findAvailableSubscriptions(Context context) throws SQLException {
+ return findAvailableSubscriptions(context, null);
+ }
+
+ @Override
+ public List findAvailableSubscriptions(Context context, EPerson eperson) throws SQLException {
+ if (Objects.nonNull(eperson)) {
context.setCurrentUser(eperson);
}
- collections = collectionService.findAuthorized(context, null, Constants.ADD);
-
- return collections;
+ return collectionService.findAuthorized(context, null, Constants.ADD);
}
@Override
- public boolean isSubscribed(Context context, EPerson eperson,
- Collection collection) throws SQLException {
- return subscriptionDAO.findByCollectionAndEPerson(context, eperson, collection) != null;
+ public boolean isSubscribed(Context context, EPerson eperson, DSpaceObject dSpaceObject) throws SQLException {
+ return subscriptionDAO.findByEPersonAndDso(context, eperson, dSpaceObject, -1, -1) != null;
}
@Override
- public void deleteByCollection(Context context, Collection collection) throws SQLException {
- subscriptionDAO.deleteByCollection(context, collection);
+ public void deleteByDspaceObject(Context context, DSpaceObject dSpaceObject) throws SQLException {
+ subscriptionDAO.deleteByDspaceObject(context, dSpaceObject);
}
@Override
public void deleteByEPerson(Context context, EPerson ePerson) throws SQLException {
subscriptionDAO.deleteByEPerson(context, ePerson);
}
+
+ @Override
+ public Subscription findById(Context context, int id) throws SQLException {
+ return subscriptionDAO.findByID(context, Subscription.class, id);
+ }
+
+ @Override
+ public Subscription updateSubscription(Context context, Integer id, String subscriptionType,
+ List subscriptionParameterList)
+ throws SQLException {
+ Subscription subscriptionDB = subscriptionDAO.findByID(context, Subscription.class, id);
+ subscriptionDB.removeParameterList();
+ subscriptionDB.setSubscriptionType(subscriptionType);
+ subscriptionParameterList.forEach(x -> subscriptionDB.addParameter(x));
+ subscriptionDAO.save(context, subscriptionDB);
+ return subscriptionDB;
+ }
+
+ @Override
+ public Subscription addSubscriptionParameter(Context context, Integer id, SubscriptionParameter subscriptionParam)
+ throws SQLException {
+ Subscription subscriptionDB = subscriptionDAO.findByID(context, Subscription.class, id);
+ subscriptionDB.addParameter(subscriptionParam);
+ subscriptionDAO.save(context, subscriptionDB);
+ return subscriptionDB;
+ }
+
+ @Override
+ public Subscription removeSubscriptionParameter(Context context,Integer id, SubscriptionParameter subscriptionParam)
+ throws SQLException {
+ Subscription subscriptionDB = subscriptionDAO.findByID(context, Subscription.class, id);
+ subscriptionDB.removeParameter(subscriptionParam);
+ subscriptionDAO.save(context, subscriptionDB);
+ return subscriptionDB;
+ }
+
+ @Override
+ public void deleteSubscription(Context context, Subscription subscription) throws SQLException {
+ subscriptionDAO.delete(context, subscription);
+ }
+
+ @Override
+ public List findAllSubscriptionsBySubscriptionTypeAndFrequency(Context context,
+ String subscriptionType, String frequencyValue) throws SQLException {
+ return subscriptionDAO.findAllSubscriptionsBySubscriptionTypeAndFrequency(context, subscriptionType,
+ frequencyValue);
+ }
+
+ @Override
+ public Long countAll(Context context) throws SQLException {
+ return subscriptionDAO.countAll(context);
+ }
+
+ @Override
+ public Long countSubscriptionsByEPerson(Context context, EPerson ePerson) throws SQLException {
+ return subscriptionDAO.countAllByEPerson(context, ePerson);
+ }
+
+ @Override
+ public Long countByEPersonAndDSO(Context context, EPerson ePerson, DSpaceObject dSpaceObject)
+ throws SQLException {
+ return subscriptionDAO.countAllByEPersonAndDso(context, ePerson, dSpaceObject);
+ }
+
}
diff --git a/dspace-api/src/main/java/org/dspace/eperson/Subscription.java b/dspace-api/src/main/java/org/dspace/eperson/Subscription.java
index 1719888ca8..5db63740f4 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/Subscription.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/Subscription.java
@@ -7,6 +7,9 @@
*/
package org.dspace.eperson;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -15,10 +18,11 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import org.dspace.content.Collection;
+import org.dspace.content.DSpaceObject;
import org.dspace.core.Context;
import org.dspace.core.ReloadableEntity;
@@ -37,40 +41,78 @@ public class Subscription implements ReloadableEntity {
@SequenceGenerator(name = "subscription_seq", sequenceName = "subscription_seq", allocationSize = 1)
private Integer id;
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "collection_id")
- private Collection collection;
+ @ManyToOne(fetch = FetchType.EAGER)
+ @JoinColumn(name = "dspace_object_id")
+ private DSpaceObject dSpaceObject;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "eperson_id")
private EPerson ePerson;
/**
- * Protected constructor, create object using:
- * {@link org.dspace.eperson.service.SubscribeService#subscribe(Context, EPerson, Collection)}
+ * Represent subscription type, for example, "content" or "statistics".
+ *
+ * NOTE: Currently, in DSpace we use only one "content"
*/
- protected Subscription() {
+ @Column(name = "type")
+ private String subscriptionType;
- }
+ @OneToMany(fetch = FetchType.LAZY, mappedBy = "subscription", cascade = CascadeType.ALL, orphanRemoval = true)
+ private List subscriptionParameterList = new ArrayList<>();
+
+ /**
+ * Protected constructor, create object using:
+ * {@link org.dspace.eperson.service.SubscribeService#subscribe(Context, EPerson, DSpaceObject, List, String)}
+ */
+ protected Subscription() {}
@Override
public Integer getID() {
return id;
}
- public Collection getCollection() {
- return collection;
+ public DSpaceObject getDSpaceObject() {
+ return this.dSpaceObject;
}
- void setCollection(Collection collection) {
- this.collection = collection;
+ void setDSpaceObject(DSpaceObject dSpaceObject) {
+ this.dSpaceObject = dSpaceObject;
}
- public EPerson getePerson() {
+ public EPerson getEPerson() {
return ePerson;
}
- void setePerson(EPerson ePerson) {
+ public void setEPerson(EPerson ePerson) {
this.ePerson = ePerson;
}
-}
+
+ public String getSubscriptionType() {
+ return subscriptionType;
+ }
+
+ public void setSubscriptionType(String subscriptionType) {
+ this.subscriptionType = subscriptionType;
+ }
+
+ public List getSubscriptionParameterList() {
+ return subscriptionParameterList;
+ }
+
+ public void setSubscriptionParameterList(List subscriptionList) {
+ this.subscriptionParameterList = subscriptionList;
+ }
+
+ public void addParameter(SubscriptionParameter subscriptionParameter) {
+ subscriptionParameterList.add(subscriptionParameter);
+ subscriptionParameter.setSubscription(this);
+ }
+
+ public void removeParameterList() {
+ subscriptionParameterList.clear();
+ }
+
+ public void removeParameter(SubscriptionParameter subscriptionParameter) {
+ subscriptionParameterList.remove(subscriptionParameter);
+ }
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/eperson/SubscriptionParameter.java b/dspace-api/src/main/java/org/dspace/eperson/SubscriptionParameter.java
new file mode 100644
index 0000000000..7526535d7f
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/eperson/SubscriptionParameter.java
@@ -0,0 +1,98 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.eperson;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+import org.dspace.core.ReloadableEntity;
+
+/**
+ * Database entity representation of the subscription_parameter table
+ * SubscriptionParameter represents a frequency with which an user wants to be notified.
+ *
+ * @author Alba Aliu at atis.al
+ */
+@Entity
+@Table(name = "subscription_parameter")
+public class SubscriptionParameter implements ReloadableEntity {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "subscription_parameter_seq")
+ @SequenceGenerator(name = "subscription_parameter_seq", sequenceName = "subscription_parameter_seq",
+ allocationSize = 1)
+ @Column(name = "subscription_parameter_id", unique = true)
+ private Integer id;
+
+ @ManyToOne
+ @JoinColumn(name = "subscription_id", nullable = false)
+ private Subscription subscription;
+
+ /*
+ * Currently, we have only one use case for this attribute: "frequency"
+ */
+ @Column
+ private String name;
+
+ /*
+ * Currently, we use this attribute only with following values: "D", "W", "M".
+ * Where D stand for Day, W stand for Week and M stand for Month
+ */
+ @Column
+ private String value;
+
+ public SubscriptionParameter() {}
+
+ public SubscriptionParameter(Integer id, Subscription subscription, String name, String value) {
+ this.id = id;
+ this.subscription = subscription;
+ this.name = name;
+ this.value = value;
+ }
+
+ public Subscription getSubscription() {
+ return subscription;
+ }
+
+ public void setSubscription(Subscription subscription) {
+ this.subscription = subscription;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public Integer getID() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/eperson/SupervisorServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/SupervisorServiceImpl.java
deleted file mode 100644
index 64180a5e22..0000000000
--- a/dspace-api/src/main/java/org/dspace/eperson/SupervisorServiceImpl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.eperson;
-
-import java.sql.SQLException;
-
-import org.dspace.authorize.AuthorizeException;
-import org.dspace.authorize.ResourcePolicy;
-import org.dspace.authorize.service.ResourcePolicyService;
-import org.dspace.content.Item;
-import org.dspace.content.WorkspaceItem;
-import org.dspace.content.service.ItemService;
-import org.dspace.core.Constants;
-import org.dspace.core.Context;
-import org.dspace.eperson.service.SupervisorService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class SupervisorServiceImpl implements SupervisorService {
-
- @Autowired(required = true)
- protected ItemService itemService;
- @Autowired(required = true)
- protected ResourcePolicyService resourcePolicyService;
-
- protected SupervisorServiceImpl() {
- }
-
- @Override
- public boolean isOrder(Context context, WorkspaceItem workspaceItem, Group group)
- throws SQLException {
- return workspaceItem.getSupervisorGroups().contains(group);
- }
-
- @Override
- public void remove(Context context, WorkspaceItem workspaceItem, Group group)
- throws SQLException, AuthorizeException {
- // get the workspace item and the group from the request values
- workspaceItem.getSupervisorGroups().remove(group);
-
- // get the item and have it remove the policies for the group
- Item item = workspaceItem.getItem();
- itemService.removeGroupPolicies(context, item, group);
- }
-
- @Override
- public void add(Context context, Group group, WorkspaceItem workspaceItem, int policy)
- throws SQLException, AuthorizeException {
- // make a table row in the database table, and update with the relevant
- // details
- workspaceItem.getSupervisorGroups().add(group);
- group.getSupervisedItems().add(workspaceItem);
-
- // If a default policy type has been requested, apply the policies using
- // the DSpace API for doing so
- if (policy != POLICY_NONE) {
- Item item = workspaceItem.getItem();
-
- // "Editor" implies READ, WRITE, ADD permissions
- // "Observer" implies READ permissions
- if (policy == POLICY_EDITOR) {
- ResourcePolicy r = resourcePolicyService.create(context);
- r.setdSpaceObject(item);
- r.setGroup(group);
- r.setAction(Constants.READ);
- resourcePolicyService.update(context, r);
-
- r = resourcePolicyService.create(context);
- r.setdSpaceObject(item);
- r.setGroup(group);
- r.setAction(Constants.WRITE);
- resourcePolicyService.update(context, r);
-
- r = resourcePolicyService.create(context);
- r.setdSpaceObject(item);
- r.setGroup(group);
- r.setAction(Constants.ADD);
- resourcePolicyService.update(context, r);
-
- } else if (policy == POLICY_OBSERVER) {
- ResourcePolicy r = resourcePolicyService.create(context);
- r.setdSpaceObject(item);
- r.setGroup(group);
- r.setAction(Constants.READ);
- resourcePolicyService.update(context, r);
- }
- }
- }
-}
diff --git a/dspace-api/src/main/java/org/dspace/eperson/dao/SubscriptionDAO.java b/dspace-api/src/main/java/org/dspace/eperson/dao/SubscriptionDAO.java
index e9f2d57059..4d762c1775 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/dao/SubscriptionDAO.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/dao/SubscriptionDAO.java
@@ -10,7 +10,7 @@ package org.dspace.eperson.dao;
import java.sql.SQLException;
import java.util.List;
-import org.dspace.content.Collection;
+import org.dspace.content.DSpaceObject;
import org.dspace.core.Context;
import org.dspace.core.GenericDAO;
import org.dspace.eperson.EPerson;
@@ -26,17 +26,125 @@ import org.dspace.eperson.Subscription;
*/
public interface SubscriptionDAO extends GenericDAO {
- public void deleteByCollection(Context context, Collection collection) throws SQLException;
+ /**
+ * Delete all subscription of provided dSpaceObject
+ *
+ * @param context DSpace context object
+ * @param dSpaceObject DSpace resource
+ * @throws SQLException If database error
+ */
+ public void deleteByDspaceObject(Context context, DSpaceObject dSpaceObject) throws SQLException;
- public List findByEPerson(Context context, EPerson eperson) throws SQLException;
+ /**
+ * Return a paginated list of all subscriptions of the eperson
+ *
+ * @param context DSpace context object
+ * @param eperson ePerson whose subscriptions want to find
+ * @param limit Paging limit
+ * @param offset The position of the first result to return
+ * @return
+ * @throws SQLException If database error
+ */
+ public List findByEPerson(Context context, EPerson eperson, Integer limit, Integer offset)
+ throws SQLException;
- public Subscription findByCollectionAndEPerson(Context context, EPerson eperson, Collection collection)
- throws SQLException;
+ /**
+ * Return a paginated list of subscriptions related to a DSpaceObject belong to an ePerson
+ *
+ * @param context DSpace context object
+ * @param eperson ePerson whose subscriptions want to find
+ * @param dSpaceObject DSpaceObject of whom subscriptions want to find
+ * @param limit Paging limit
+ * @param offset The position of the first result to return
+ * @return
+ * @throws SQLException If database error
+ */
+ public List findByEPersonAndDso(Context context, EPerson eperson, DSpaceObject dSpaceObject,
+ Integer limit, Integer offset) throws SQLException;
+ /**
+ * Delete all subscription of provided ePerson
+ *
+ * @param context DSpace context object
+ * @param eperson ePerson whose subscriptions want to delete
+ * @throws SQLException If database error
+ */
public void deleteByEPerson(Context context, EPerson eperson) throws SQLException;
- public void deleteByCollectionAndEPerson(Context context, Collection collection, EPerson eperson)
- throws SQLException;
+ /**
+ * Delete all subscriptions related to a DSpaceObject belong to an ePerson
+ *
+ * @param context DSpace context object
+ * @param dSpaceObject DSpaceObject of whom subscriptions want to delete
+ * @param eperson ePerson whose subscriptions want to delete
+ * @throws SQLException If database error
+ */
+ public void deleteByDSOAndEPerson(Context context, DSpaceObject dSpaceObject, EPerson eperson) throws SQLException;
+
+ /**
+ * Return a paginated list of all subscriptions ordered by ID and resourceType
+ *
+ * @param context DSpace context object
+ * @param resourceType Could be Collection or Community
+ * @param limit Paging limit
+ * @param offset The position of the first result to return
+ * @return
+ * @throws SQLException If database error
+ */
+ public List findAllOrderedByIDAndResourceType(Context context, String resourceType,
+ Integer limit, Integer offset) throws SQLException;
+
+ /**
+ * Return a paginated list of subscriptions ordered by DSpaceObject
+ *
+ * @param context DSpace context object
+ * @param limit Paging limit
+ * @param offset The position of the first result to return
+ * @return
+ * @throws SQLException If database error
+ */
+ public List findAllOrderedByDSO(Context context, Integer limit, Integer offset) throws SQLException;
+
+ /**
+ * Return a list of all subscriptions by subscriptionType and frequency
+ *
+ * @param context DSpace context object
+ * @param subscriptionType Could be "content" or "statistics". NOTE: in DSpace we have only "content"
+ * @param frequencyValue Could be "D" stand for Day, "W" stand for Week, and "M" stand for Month
+ * @return
+ * @throws SQLException If database error
+ */
+ public List findAllSubscriptionsBySubscriptionTypeAndFrequency(Context context,
+ String subscriptionType, String frequencyValue) throws SQLException;
+
+ /**
+ * Count all subscriptions
+ *
+ * @param context DSpace context object
+ * @return Total of all subscriptions
+ * @throws SQLException If database error
+ */
+ public Long countAll(Context context) throws SQLException;
+
+ /**
+ * Count all subscriptions belong to an ePerson
+ *
+ * @param context DSpace context object
+ * @param ePerson ePerson whose subscriptions want count
+ * @return Total of all subscriptions belong to an ePerson
+ * @throws SQLException If database error
+ */
+ public Long countAllByEPerson(Context context, EPerson ePerson) throws SQLException;
+
+ /**
+ * Count all subscriptions related to a DSpaceObject belong to an ePerson
+ *
+ * @param context DSpace context object
+ * @param ePerson ePerson whose subscriptions want count
+ * @param dSpaceObject DSpaceObject of whom subscriptions want count
+ * @return
+ * @throws SQLException If database error
+ */
+ public Long countAllByEPersonAndDso(Context context, EPerson ePerson,DSpaceObject dSpaceObject) throws SQLException;
- public List findAllOrderedByEPerson(Context context) throws SQLException;
}
diff --git a/dspace-api/src/main/java/org/dspace/eperson/dao/SubscriptionParameterDAO.java b/dspace-api/src/main/java/org/dspace/eperson/dao/SubscriptionParameterDAO.java
new file mode 100644
index 0000000000..ea9c7b0bbd
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/eperson/dao/SubscriptionParameterDAO.java
@@ -0,0 +1,22 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.eperson.dao;
+import org.dspace.core.GenericDAO;
+import org.dspace.eperson.SubscriptionParameter;
+
+
+/**
+ * Database Access Object interface class for the SubscriptionParamter object.
+ * The implementation of this class is responsible for all database calls for the SubscriptionParameter object and is
+ * autowired by spring
+ * This class should only be accessed from a single service and should never be exposed outside of the API
+ *
+ * @author Alba Aliu at atis.al
+ */
+public interface SubscriptionParameterDAO extends GenericDAO {
+}
diff --git a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/SubscriptionDAOImpl.java b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/SubscriptionDAOImpl.java
index 6f2cb4b4fb..6c36211f31 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/SubscriptionDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/SubscriptionDAOImpl.java
@@ -9,17 +9,21 @@ package org.dspace.eperson.dao.impl;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
import javax.persistence.Query;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Join;
import javax.persistence.criteria.Root;
-import org.dspace.content.Collection;
+import org.dspace.content.DSpaceObject;
import org.dspace.core.AbstractHibernateDAO;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Subscription;
+import org.dspace.eperson.SubscriptionParameter;
+import org.dspace.eperson.SubscriptionParameter_;
import org.dspace.eperson.Subscription_;
import org.dspace.eperson.dao.SubscriptionDAO;
@@ -31,42 +35,50 @@ import org.dspace.eperson.dao.SubscriptionDAO;
* @author kevinvandevelde at atmire.com
*/
public class SubscriptionDAOImpl extends AbstractHibernateDAO implements SubscriptionDAO {
+
protected SubscriptionDAOImpl() {
super();
}
@Override
- public List findByEPerson(Context context, EPerson eperson) throws SQLException {
+ public List findByEPerson(Context context, EPerson eperson, Integer limit, Integer offset)
+ throws SQLException {
CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
javax.persistence.criteria.CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Subscription.class);
Root subscriptionRoot = criteriaQuery.from(Subscription.class);
criteriaQuery.select(subscriptionRoot);
criteriaQuery.where(criteriaBuilder.equal(subscriptionRoot.get(Subscription_.ePerson), eperson));
- return list(context, criteriaQuery, false, Subscription.class, -1, -1);
-
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.asc(subscriptionRoot.get(Subscription_.dSpaceObject)));
+ criteriaQuery.orderBy(orderList);
+ return list(context, criteriaQuery, false, Subscription.class, limit, offset);
}
@Override
- public Subscription findByCollectionAndEPerson(Context context, EPerson eperson, Collection collection)
- throws SQLException {
+ public List findByEPersonAndDso(Context context, EPerson eperson,
+ DSpaceObject dSpaceObject,
+ Integer limit, Integer offset) throws SQLException {
CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
- javax.persistence.criteria.CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Subscription.class);
+ javax.persistence.criteria.CriteriaQuery criteriaQuery =
+ getCriteriaQuery(criteriaBuilder, Subscription.class);
Root subscriptionRoot = criteriaQuery.from(Subscription.class);
criteriaQuery.select(subscriptionRoot);
- criteriaQuery
- .where(criteriaBuilder.and(criteriaBuilder.equal(subscriptionRoot.get(Subscription_.ePerson), eperson),
- criteriaBuilder.equal(subscriptionRoot.get(Subscription_.collection), collection)
- )
- );
- return singleResult(context, criteriaQuery);
+ criteriaQuery.where(criteriaBuilder.and(criteriaBuilder.equal(
+ subscriptionRoot.get(Subscription_.ePerson), eperson),
+ criteriaBuilder.equal(subscriptionRoot.get(Subscription_.dSpaceObject), dSpaceObject)
+ ));
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.asc(subscriptionRoot.get(Subscription_.dSpaceObject)));
+ criteriaQuery.orderBy(orderList);
+ return list(context, criteriaQuery, false, Subscription.class, limit, offset);
}
@Override
- public void deleteByCollection(Context context, Collection collection) throws SQLException {
- String hqlQuery = "delete from Subscription where collection=:collection";
+ public void deleteByDspaceObject(Context context, DSpaceObject dSpaceObject) throws SQLException {
+ String hqlQuery = "delete from Subscription where dSpaceObject=:dSpaceObject";
Query query = createQuery(context, hqlQuery);
- query.setParameter("collection", collection);
+ query.setParameter("dSpaceObject", dSpaceObject);
query.executeUpdate();
}
@@ -79,28 +91,98 @@ public class SubscriptionDAOImpl extends AbstractHibernateDAO impl
}
@Override
- public void deleteByCollectionAndEPerson(Context context, Collection collection, EPerson eperson)
- throws SQLException {
- String hqlQuery = "delete from Subscription where collection=:collection AND ePerson=:ePerson";
+ public void deleteByDSOAndEPerson(Context context, DSpaceObject dSpaceObject, EPerson eperson)
+ throws SQLException {
+ String hqlQuery = "delete from Subscription where dSpaceObject=:dSpaceObject AND ePerson=:ePerson";
Query query = createQuery(context, hqlQuery);
- query.setParameter("collection", collection);
+ query.setParameter("dSpaceObject", dSpaceObject);
query.setParameter("ePerson", eperson);
query.executeUpdate();
}
@Override
- public List findAllOrderedByEPerson(Context context) throws SQLException {
-
+ public List findAllOrderedByIDAndResourceType(Context context, String resourceType,
+ Integer limit, Integer offset) throws SQLException {
+ String hqlQuery = "select s from Subscription s join %s dso " +
+ "ON dso.id = s.dSpaceObject ORDER BY subscription_id";
+ if (resourceType != null) {
+ hqlQuery = String.format(hqlQuery, resourceType);
+ }
+ Query query = createQuery(context, hqlQuery);
+ if (limit != -1) {
+ query.setMaxResults(limit);
+ }
+ if (offset != -1) {
+ query.setFirstResult(offset);
+ }
+ query.setHint("org.hibernate.cacheable", false);
+ return query.getResultList();
+ }
+ @Override
+ public List findAllOrderedByDSO(Context context, Integer limit, Integer offset) throws SQLException {
CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Subscription.class);
Root subscriptionRoot = criteriaQuery.from(Subscription.class);
criteriaQuery.select(subscriptionRoot);
+ List orderList = new LinkedList<>();
+ orderList.add(criteriaBuilder.asc(subscriptionRoot.get(Subscription_.dSpaceObject)));
+ criteriaQuery.orderBy(orderList);
+ return list(context, criteriaQuery, false, Subscription.class, limit, offset);
+ }
+ @Override
+ public List findAllSubscriptionsBySubscriptionTypeAndFrequency(Context context,
+ String subscriptionType, String frequencyValue) throws SQLException {
+ CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+ CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Subscription.class);
+ Root subscriptionRoot = criteriaQuery.from(Subscription.class);
+ criteriaQuery.select(subscriptionRoot);
+ Join childJoin = subscriptionRoot.join("subscriptionParameterList");
+ criteriaQuery.where(
+ criteriaBuilder.and(
+ criteriaBuilder.equal(subscriptionRoot.get(Subscription_.SUBSCRIPTION_TYPE), subscriptionType),
+ criteriaBuilder.equal(childJoin.get(SubscriptionParameter_.name), "frequency"),
+ criteriaBuilder.equal(childJoin.get(SubscriptionParameter_.value), frequencyValue)
+ ));
List orderList = new ArrayList<>(1);
orderList.add(criteriaBuilder.asc(subscriptionRoot.get(Subscription_.ePerson)));
+ orderList.add(criteriaBuilder.asc(subscriptionRoot.get(Subscription_.id)));
criteriaQuery.orderBy(orderList);
-
- return list(context, criteriaQuery, false, Subscription.class, -1, -1);
+ return list(context, criteriaQuery, false, Subscription.class, 10000, -1);
}
+
+ @Override
+ public Long countAll(Context context) throws SQLException {
+ CriteriaBuilder qb = getCriteriaBuilder(context);
+ CriteriaQuery cq = qb.createQuery(Long.class);
+ cq.select(qb.count(cq.from(Subscription.class)));
+ Query query = this.getHibernateSession(context).createQuery(cq);
+ return (Long) query.getSingleResult();
+ }
+
+ @Override
+ public Long countAllByEPerson(Context context, EPerson ePerson) throws SQLException {
+ CriteriaBuilder qb = getCriteriaBuilder(context);
+ CriteriaQuery cq = qb.createQuery(Long.class);
+ Root subscriptionRoot = cq.from(Subscription.class);
+ cq.select(qb.count(subscriptionRoot));
+ cq.where(qb.equal(subscriptionRoot.get(Subscription_.ePerson), ePerson));
+ Query query = this.getHibernateSession(context).createQuery(cq);
+ return (Long) query.getSingleResult();
+ }
+
+ @Override
+ public Long countAllByEPersonAndDso(Context context,
+ EPerson ePerson, DSpaceObject dSpaceObject) throws SQLException {
+ CriteriaBuilder qb = getCriteriaBuilder(context);
+ CriteriaQuery cq = qb.createQuery(Long.class);
+ Root subscriptionRoot = cq.from(Subscription.class);
+ cq.select(qb.count(subscriptionRoot));
+ cq.where(qb.and(qb.equal(subscriptionRoot.get(Subscription_.ePerson)
+ , ePerson), qb.equal(subscriptionRoot.get(Subscription_.dSpaceObject), dSpaceObject)));
+ Query query = this.getHibernateSession(context).createQuery(cq);
+ return (Long) query.getSingleResult();
+ }
+
}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/SubscriptionParameterDAOImpl.java b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/SubscriptionParameterDAOImpl.java
new file mode 100644
index 0000000000..37af787ed3
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/SubscriptionParameterDAOImpl.java
@@ -0,0 +1,28 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.eperson.dao.impl;
+
+import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.eperson.SubscriptionParameter;
+import org.dspace.eperson.dao.SubscriptionParameterDAO;
+
+/**
+ * Hibernate implementation of the Database Access Object interface class for the SubscriptionParameter object.
+ * This class is responsible for all database calls for the SubscriptionParameter object and is autowired by spring
+ * This class should never be accessed directly.
+ *
+ * @author Alba Aliu at atis.al
+ */
+public class SubscriptionParameterDAOImpl extends AbstractHibernateDAO
+ implements SubscriptionParameterDAO {
+
+ protected SubscriptionParameterDAOImpl() {
+ super();
+ }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/eperson/factory/EPersonServiceFactory.java b/dspace-api/src/main/java/org/dspace/eperson/factory/EPersonServiceFactory.java
index f7ce13a8a3..b80c37f13f 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/factory/EPersonServiceFactory.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/factory/EPersonServiceFactory.java
@@ -12,7 +12,6 @@ import org.dspace.eperson.service.EPersonService;
import org.dspace.eperson.service.GroupService;
import org.dspace.eperson.service.RegistrationDataService;
import org.dspace.eperson.service.SubscribeService;
-import org.dspace.eperson.service.SupervisorService;
import org.dspace.services.factory.DSpaceServicesFactory;
/**
@@ -33,8 +32,6 @@ public abstract class EPersonServiceFactory {
public abstract SubscribeService getSubscribeService();
- public abstract SupervisorService getSupervisorService();
-
public static EPersonServiceFactory getInstance() {
return DSpaceServicesFactory.getInstance().getServiceManager()
.getServiceByName("ePersonServiceFactory", EPersonServiceFactory.class);
diff --git a/dspace-api/src/main/java/org/dspace/eperson/factory/EPersonServiceFactoryImpl.java b/dspace-api/src/main/java/org/dspace/eperson/factory/EPersonServiceFactoryImpl.java
index 33d9249b6b..c4a6cbe996 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/factory/EPersonServiceFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/factory/EPersonServiceFactoryImpl.java
@@ -12,7 +12,6 @@ import org.dspace.eperson.service.EPersonService;
import org.dspace.eperson.service.GroupService;
import org.dspace.eperson.service.RegistrationDataService;
import org.dspace.eperson.service.SubscribeService;
-import org.dspace.eperson.service.SupervisorService;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -33,8 +32,6 @@ public class EPersonServiceFactoryImpl extends EPersonServiceFactory {
private AccountService accountService;
@Autowired(required = true)
private SubscribeService subscribeService;
- @Autowired(required = true)
- private SupervisorService supervisorService;
@Override
public EPersonService getEPersonService() {
@@ -61,8 +58,4 @@ public class EPersonServiceFactoryImpl extends EPersonServiceFactory {
return subscribeService;
}
- @Override
- public SupervisorService getSupervisorService() {
- return supervisorService;
- }
}
diff --git a/dspace-api/src/main/java/org/dspace/eperson/service/SubscribeService.java b/dspace-api/src/main/java/org/dspace/eperson/service/SubscribeService.java
index 347c69bf5b..e70f40e0ed 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/service/SubscribeService.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/service/SubscribeService.java
@@ -12,9 +12,11 @@ import java.util.List;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Collection;
+import org.dspace.content.DSpaceObject;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Subscription;
+import org.dspace.eperson.SubscriptionParameter;
/**
* Service interface class for the Subscription object.
@@ -31,49 +33,74 @@ public interface SubscribeService {
* new item appears in the collection.
*
* @param context DSpace context
+ * @param limit Number of subscriptions to return
+ * @param offset Offset number
* @return list of Subscription objects
* @throws SQLException An exception that provides information on a database access error or other errors.
*/
- public List findAll(Context context) throws SQLException;
+ public List findAll(Context context, String resourceType, Integer limit, Integer offset)
+ throws Exception;
/**
- * Subscribe an e-person to a collection. An e-mail will be sent every day a
- * new item appears in the collection.
- *
- * @param context DSpace context
- * @param eperson EPerson to subscribe
- * @param collection Collection to subscribe to
- * @throws SQLException An exception that provides information on a database access error or other errors.
- * @throws AuthorizeException Exception indicating the current user of the context does not have permission
- * to perform a particular action.
+ * Subscribe an EPerson to a dSpaceObject (Collection or Community). An e-mail will be sent every day a
+ * new item appears in the Collection or Community.
+ *
+ * @param context DSpace context object
+ * @param eperson EPerson to subscribe
+ * @param dSpaceObject DSpaceObject to subscribe
+ * @param subscriptionParameters list of @SubscriptionParameter
+ * @param subscriptionType Currently supported only "content"
+ * @return
+ * @throws SQLException An exception that provides information on a database access error or other errors.
+ * @throws AuthorizeException Exception indicating the current user of the context does not have permission
+ * to perform a particular action.
*/
- public void subscribe(Context context, EPerson eperson,
- Collection collection) throws SQLException, AuthorizeException;
+ public Subscription subscribe(Context context, EPerson eperson, DSpaceObject dSpaceObject,
+ List subscriptionParameters,
+ String subscriptionType) throws SQLException, AuthorizeException;
/**
* Unsubscribe an e-person to a collection. Passing in null
* for the collection unsubscribes the e-person from all collections they
* are subscribed to.
*
- * @param context DSpace context
- * @param eperson EPerson to unsubscribe
- * @param collection Collection to unsubscribe from
+ * @param context DSpace context
+ * @param eperson EPerson to unsubscribe
+ * @param dSpaceObject DSpaceObject to unsubscribe from
* @throws SQLException An exception that provides information on a database access error or other errors.
* @throws AuthorizeException Exception indicating the current user of the context does not have permission
* to perform a particular action.
*/
- public void unsubscribe(Context context, EPerson eperson,
- Collection collection) throws SQLException, AuthorizeException;
+ public void unsubscribe(Context context, EPerson eperson, DSpaceObject dSpaceObject)
+ throws SQLException, AuthorizeException;
/**
* Find out which collections an e-person is subscribed to
*
* @param context DSpace context
* @param eperson EPerson
+ * @param limit Number of subscriptions to return
+ * @param offset Offset number
* @return array of collections e-person is subscribed to
* @throws SQLException An exception that provides information on a database access error or other errors.
*/
- public List getSubscriptions(Context context, EPerson eperson) throws SQLException;
+ public List findSubscriptionsByEPerson(Context context, EPerson eperson, Integer limit,Integer offset)
+ throws SQLException;
+
+ /**
+ * Find out which collections an e-person is subscribed to and related with dso
+ *
+ * @param context DSpace context
+ * @param eperson EPerson
+ * @param dSpaceObject DSpaceObject
+ * @param limit Number of subscriptions to return
+ * @param offset Offset number
+ * @return array of collections e-person is subscribed to and related with dso
+ * @throws SQLException An exception that provides information on a database access error or other errors.
+ */
+ public List findSubscriptionsByEPersonAndDso(Context context, EPerson eperson,
+ DSpaceObject dSpaceObject,
+ Integer limit, Integer offset) throws SQLException;
/**
* Find out which collections the currently logged in e-person can subscribe to
@@ -82,8 +109,7 @@ public interface SubscribeService {
* @return array of collections the currently logged in e-person can subscribe to
* @throws SQLException An exception that provides information on a database access error or other errors.
*/
- public List getAvailableSubscriptions(Context context)
- throws SQLException;
+ public List findAvailableSubscriptions(Context context) throws SQLException;
/**
* Find out which collections an e-person can subscribe to
@@ -93,29 +119,27 @@ public interface SubscribeService {
* @return array of collections e-person can subscribe to
* @throws SQLException An exception that provides information on a database access error or other errors.
*/
- public List getAvailableSubscriptions(Context context, EPerson eperson)
- throws SQLException;
+ public List findAvailableSubscriptions(Context context, EPerson eperson) throws SQLException;
/**
* Is that e-person subscribed to that collection?
*
- * @param context DSpace context
- * @param eperson find out if this e-person is subscribed
- * @param collection find out if subscribed to this collection
+ * @param context DSpace context
+ * @param eperson find out if this e-person is subscribed
+ * @param dSpaceObject find out if subscribed to this dSpaceObject
* @return true if they are subscribed
* @throws SQLException An exception that provides information on a database access error or other errors.
*/
- public boolean isSubscribed(Context context, EPerson eperson,
- Collection collection) throws SQLException;
+ public boolean isSubscribed(Context context, EPerson eperson, DSpaceObject dSpaceObject) throws SQLException;
/**
* Delete subscription by collection.
*
- * @param context DSpace context
- * @param collection find out if subscribed to this collection
+ * @param context DSpace context
+ * @param dSpaceObject find out if subscribed to this dSpaceObject
* @throws SQLException An exception that provides information on a database access error or other errors.
*/
- public void deleteByCollection(Context context, Collection collection) throws SQLException;
+ public void deleteByDspaceObject(Context context, DSpaceObject dSpaceObject) throws SQLException;
/**
* Delete subscription by eperson (subscriber).
@@ -125,4 +149,92 @@ public interface SubscribeService {
* @throws SQLException An exception that provides information on a database access error or other errors.
*/
public void deleteByEPerson(Context context, EPerson ePerson) throws SQLException;
-}
+
+ /**
+ * Finds a subscription by id
+ *
+ * @param context DSpace context
+ * @param id the id of subscription to be searched
+ * @throws SQLException An exception that provides information on a database access error or other errors.
+ */
+ public Subscription findById(Context context, int id) throws SQLException;
+
+ /**
+ * Updates a subscription by id
+ *
+ * @param context DSpace context
+ * @param id Integer id
+ * @param subscriptionParameterList List subscriptionParameterList
+ * @param subscriptionType type
+ * @throws SQLException An exception that provides information on a database access error or other errors.
+ */
+ public Subscription updateSubscription(Context context, Integer id, String subscriptionType,
+ List subscriptionParameterList) throws SQLException;
+
+ /**
+ * Adds a parameter to a subscription
+ *
+ * @param context DSpace context
+ * @param id Integer id
+ * @param subscriptionParameter SubscriptionParameter subscriptionParameter
+ * @throws SQLException An exception that provides information on a database access error or other errors.
+ */
+ public Subscription addSubscriptionParameter(Context context,Integer id,
+ SubscriptionParameter subscriptionParameter) throws SQLException;
+
+ /**
+ * Deletes a parameter from subscription
+ *
+ * @param context DSpace context
+ * @param id Integer id
+ * @param subscriptionParam SubscriptionParameter subscriptionParameter
+ * @throws SQLException An exception that provides information on a database access error or other errors.
+ */
+ public Subscription removeSubscriptionParameter(Context context, Integer id,
+ SubscriptionParameter subscriptionParam) throws SQLException;
+
+ /**
+ * Deletes a subscription
+ *
+ * @param context DSpace context
+ * @param subscription The subscription to delete
+ * @throws SQLException An exception that provides information on a database access error or other errors.
+ */
+ public void deleteSubscription(Context context, Subscription subscription) throws SQLException;
+
+ /**
+ * Finds all subscriptions by subscriptionType and frequency
+ *
+ * @param context DSpace context
+ * @param subscriptionType Could be "content" or "statistics". NOTE: in DSpace we have only "content"
+ * @param frequencyValue Could be "D" stand for Day, "W" stand for Week, and "M" stand for Month
+ * @throws SQLException An exception that provides information on a database access error or other errors.
+ */
+ public List findAllSubscriptionsBySubscriptionTypeAndFrequency(Context context,
+ String subscriptionType, String frequencyValue) throws SQLException;
+
+ /**
+ * Counts all subscriptions
+ *
+ * @param context DSpace context
+ */
+ public Long countAll(Context context) throws SQLException;
+
+ /**
+ * Counts all subscriptions by ePerson
+ *
+ * @param context DSpace context
+ * @param ePerson EPerson ePerson
+ */
+ public Long countSubscriptionsByEPerson(Context context, EPerson ePerson) throws SQLException;
+
+ /**
+ * Counts all subscriptions by ePerson and DSO
+ *
+ * @param context DSpace context
+ * @param ePerson EPerson ePerson
+ * @param dSpaceObject DSpaceObject dSpaceObject
+ */
+ public Long countByEPersonAndDSO(Context context, EPerson ePerson, DSpaceObject dSpaceObject) throws SQLException;
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/eperson/service/SupervisorService.java b/dspace-api/src/main/java/org/dspace/eperson/service/SupervisorService.java
deleted file mode 100644
index 470c9133e5..0000000000
--- a/dspace-api/src/main/java/org/dspace/eperson/service/SupervisorService.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.eperson.service;
-
-import java.sql.SQLException;
-
-import org.dspace.authorize.AuthorizeException;
-import org.dspace.content.WorkspaceItem;
-import org.dspace.core.Context;
-import org.dspace.eperson.Group;
-
-/**
- * Class to represent the supervisor, primarily for use in applying supervisor
- * activities to the database, such as setting and unsetting supervision
- * orders and so forth.
- *
- * @author Richard Jones
- * @version $Revision$
- */
-public interface SupervisorService {
-
- /**
- * value to use for no policy set
- */
- public static final int POLICY_NONE = 0;
-
- /**
- * value to use for editor policies
- */
- public static final int POLICY_EDITOR = 1;
-
- /**
- * value to use for observer policies
- */
- public static final int POLICY_OBSERVER = 2;
-
- /**
- * finds out if there is a supervision order that matches this set
- * of values
- *
- * @param context the context this object exists in
- * @param workspaceItem the workspace item to be supervised
- * @param group the group to be doing the supervising
- * @return boolean true if there is an order that matches, false if not
- * @throws SQLException An exception that provides information on a database access error or other errors.
- */
- public boolean isOrder(Context context, WorkspaceItem workspaceItem, Group group)
- throws SQLException;
-
- /**
- * removes the requested group from the requested workspace item in terms
- * of supervision. This also removes all the policies that group has
- * associated with the item
- *
- * @param context the context this object exists in
- * @param workspaceItem the ID of the workspace item
- * @param group the ID of the group to be removed from the item
- * @throws SQLException An exception that provides information on a database access error or other errors.
- * @throws AuthorizeException Exception indicating the current user of the context does not have permission
- * to perform a particular action.
- */
- public void remove(Context context, WorkspaceItem workspaceItem, Group group)
- throws SQLException, AuthorizeException;
-
- /**
- * adds a supervision order to the database
- *
- * @param context the context this object exists in
- * @param group the ID of the group which will supervise
- * @param workspaceItem the ID of the workspace item to be supervised
- * @param policy String containing the policy type to be used
- * @throws SQLException An exception that provides information on a database access error or other errors.
- * @throws AuthorizeException Exception indicating the current user of the context does not have permission
- * to perform a particular action.
- */
- public void add(Context context, Group group, WorkspaceItem workspaceItem, int policy)
- throws SQLException, AuthorizeException;
-}
diff --git a/dspace-api/src/main/java/org/dspace/event/Consumer.java b/dspace-api/src/main/java/org/dspace/event/Consumer.java
index 1a8b16e98a..f56efcc7ba 100644
--- a/dspace-api/src/main/java/org/dspace/event/Consumer.java
+++ b/dspace-api/src/main/java/org/dspace/event/Consumer.java
@@ -10,18 +10,16 @@ package org.dspace.event;
import org.dspace.core.Context;
/**
- * Interface for content event consumers. Note that the consumer cannot tell if
- * it is invoked synchronously or asynchronously; the consumer interface and
- * sequence of calls is the same for both. Asynchronous consumers may see more
- * consume() calls between the start and end of the event stream, if they are
- * invoked asynchronously, once in a long time period, rather than synchronously
- * after every Context.commit().
- *
- * @version $Revision$
+ * Interface for content event consumers. Note that the consumer cannot tell
+ * if it is invoked synchronously or asynchronously; the consumer interface
+ * and sequence of calls is the same for both. Asynchronous consumers may see
+ * more consume() calls between the start and end of the event stream, if they
+ * are invoked asynchronously, once in a long time period, rather than
+ * synchronously after every Context.commit().
*/
public interface Consumer {
/**
- * Initialize - allocate any resources required to operate. This may include
+ * Allocate any resources required to operate. This may include
* initializing any pooled JMS resources. Called ONCE when created by the
* dispatcher pool. This should be used to set up expensive resources that
* will remain for the lifetime of the consumer.
@@ -31,12 +29,17 @@ public interface Consumer {
public void initialize() throws Exception;
/**
- * Consume an event; events may get filtered at the dispatcher level, hiding
- * it from the consumer. This behavior is based on the dispatcher/consumer
- * configuration. Should include logic to initialize any resources required
- * for a batch of events.
+ * Consume an event. Events may be filtered by a dispatcher, hiding them
+ * from the consumer. This behavior is based on the dispatcher/consumer
+ * configuration. Should include logic to initialize any resources
+ * required for a batch of events.
*
- * @param ctx the execution context object
+ * This method must not commit the context. Committing causes
+ * re-dispatch of the event queue, which can result in infinite recursion
+ * leading to memory exhaustion as seen in
+ * {@link https://github.com/DSpace/DSpace/pull/8756}.
+ *
+ * @param ctx the current DSpace session
* @param event the content event
* @throws Exception if error
*/
diff --git a/dspace-api/src/main/java/org/dspace/event/package-info.java b/dspace-api/src/main/java/org/dspace/event/package-info.java
new file mode 100644
index 0000000000..544dfb271a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/event/package-info.java
@@ -0,0 +1,20 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+/**
+ * Actions which alter DSpace model objects can queue {@link Event}s, which
+ * are presented to {@link Consumer}s by a {@link Dispatcher}. A pool of
+ * {@code Dispatcher}s is managed by an {@link service.EventService}, guided
+ * by configuration properties {@code event.dispatcher.*}.
+ *
+ *
One must be careful not to commit the current DSpace {@code Context}
+ * during event dispatch. {@code commit()} triggers event dispatching, and
+ * doing this during event dispatch can lead to infinite recursion and
+ * memory exhaustion.
+ */
+
+package org.dspace.event;
diff --git a/dspace-api/src/main/java/org/dspace/external/OpenAIRERestConnector.java b/dspace-api/src/main/java/org/dspace/external/OpenAIRERestConnector.java
index 5e45d6324d..b0aa4aba13 100644
--- a/dspace-api/src/main/java/org/dspace/external/OpenAIRERestConnector.java
+++ b/dspace-api/src/main/java/org/dspace/external/OpenAIRERestConnector.java
@@ -335,7 +335,7 @@ public class OpenAIRERestConnector {
/**
* tokenUsage true to enable the usage of an access token
*
- * @param tokenUsage
+ * @param tokenEnabled true/false
*/
@Autowired(required = false)
public void setTokenEnabled(boolean tokenEnabled) {
diff --git a/dspace-api/src/main/java/org/dspace/external/provider/impl/LiveImportDataProvider.java b/dspace-api/src/main/java/org/dspace/external/provider/impl/LiveImportDataProvider.java
index 962183fa6f..2e934462c9 100644
--- a/dspace-api/src/main/java/org/dspace/external/provider/impl/LiveImportDataProvider.java
+++ b/dspace-api/src/main/java/org/dspace/external/provider/impl/LiveImportDataProvider.java
@@ -57,7 +57,7 @@ public class LiveImportDataProvider extends AbstractExternalDataProvider {
/**
* This method set the MetadataSource for the ExternalDataProvider
- * @param metadataSource {@link org.dspace.importer.external.service.components.MetadataSource} implementation used to process the input data
+ * @param querySource Source {@link org.dspace.importer.external.service.components.QuerySource} implementation used to process the input data
*/
public void setMetadataSource(QuerySource querySource) {
this.querySource = querySource;
diff --git a/dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java b/dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java
index 0efaea75e0..aa730fe2b1 100644
--- a/dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java
@@ -9,6 +9,7 @@ package org.dspace.handle;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -211,17 +212,17 @@ public class HandleServiceImpl implements HandleService {
@Override
public void unbindHandle(Context context, DSpaceObject dso)
throws SQLException {
- List handles = getInternalHandles(context, dso);
- if (CollectionUtils.isNotEmpty(handles)) {
- for (Handle handle : handles) {
+ Iterator handles = dso.getHandles().iterator();
+ if (handles.hasNext()) {
+ while (handles.hasNext()) {
+ final Handle handle = handles.next();
+ handles.remove();
//Only set the "resouce_id" column to null when unbinding a handle.
// We want to keep around the "resource_type_id" value, so that we
// can verify during a restore whether the same *type* of resource
// is reusing this handle!
handle.setDSpaceObject(null);
- //Also remove the handle from the DSO list to keep a consistent model
- dso.getHandles().remove(handle);
handleDAO.save(context, handle);
@@ -256,7 +257,7 @@ public class HandleServiceImpl implements HandleService {
@Override
public String findHandle(Context context, DSpaceObject dso)
throws SQLException {
- List handles = getInternalHandles(context, dso);
+ List