hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-15 14:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-4166 renamed BrowsableDSpaceObject in BrowsableObject

Browse Source
This commit is contained in:
Andrea Bollini
2019-03-07 01:11:14 +01:00
parent 6a5838461a
commit 499fdcd61c
33 changed files with 129 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dspace-api/src/main/java/org/dspace/app/util/OpenSearchServiceImpl.java
View File

@@ -22,7 +22,7 @@ import com.sun.syndication.feed.module.opensearch.impl.OpenSearchModuleImpl;
import com.sun.syndication.io.FeedException; import com.sun.syndication.io.FeedException;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.dspace.app.util.service.OpenSearchService; import org.dspace.app.util.service.OpenSearchService;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.DSpaceObject; import org.dspace.content.DSpaceObject;
import org.dspace.core.Constants; import org.dspace.core.Constants;
import org.dspace.core.Context; import org.dspace.core.Context;
@@ -119,7 +119,7 @@ public class OpenSearchServiceImpl implements OpenSearchService {
@Override @Override
public String getResultsString(Context context, String format, String query, int totalResults, int start, public String getResultsString(Context context, String format, String query, int totalResults, int start,
int pageSize, int pageSize,
DSpaceObject scope, List<BrowsableDSpaceObject> results, DSpaceObject scope, List<BrowsableObject> results,
Map<String, String> labels) throws IOException { Map<String, String> labels) throws IOException {
try { try {
return getResults(context, format, query, totalResults, start, pageSize, scope, results, labels) return getResults(context, format, query, totalResults, start, pageSize, scope, results, labels)
@@ -133,7 +133,7 @@ public class OpenSearchServiceImpl implements OpenSearchService {
@Override @Override
public Document getResultsDoc(Context context, String format, String query, int totalResults, int start, public Document getResultsDoc(Context context, String format, String query, int totalResults, int start,
int pageSize, int pageSize,
DSpaceObject scope, List<BrowsableDSpaceObject> results, Map<String, String> labels) DSpaceObject scope, List<BrowsableObject> results, Map<String, String> labels)
throws IOException { throws IOException {
try { try {
return getResults(context, format, query, totalResults, start, pageSize, scope, results, labels) return getResults(context, format, query, totalResults, start, pageSize, scope, results, labels)
@@ -146,7 +146,7 @@ public class OpenSearchServiceImpl implements OpenSearchService {
protected SyndicationFeed getResults(Context context, String format, String query, int totalResults, int start, protected SyndicationFeed getResults(Context context, String format, String query, int totalResults, int start,
int pageSize, DSpaceObject scope, int pageSize, DSpaceObject scope,
List<BrowsableDSpaceObject> results, Map<String, String> labels) { List<BrowsableObject> results, Map<String, String> labels) {
// Encode results in requested format // Encode results in requested format
if ("rss".equals(format)) { if ("rss".equals(format)) {
format = "rss_2.0"; format = "rss_2.0";

6
dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java
View File

@@ -37,7 +37,7 @@ import com.sun.syndication.io.SyndFeedOutput;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.Bitstream; import org.dspace.content.Bitstream;
import org.dspace.content.Bundle; import org.dspace.content.Bundle;
import org.dspace.content.Collection; import org.dspace.content.Collection;
@@ -185,7 +185,7 @@ public class SyndicationFeed {
* @param labels label map * @param labels label map
*/ */
public void populate(HttpServletRequest request, Context context, DSpaceObject dso, public void populate(HttpServletRequest request, Context context, DSpaceObject dso,
List<BrowsableDSpaceObject> items, Map<String, String> labels) { List<BrowsableObject> items, Map<String, String> labels) {
String logoURL = null; String logoURL = null;
String objectURL = null; String objectURL = null;
String defaultTitle = null; String defaultTitle = null;
@@ -248,7 +248,7 @@ public class SyndicationFeed {
// add entries for items // add entries for items
if (items != null) { if (items != null) {
List<SyndEntry> entries = new ArrayList<SyndEntry>(); List<SyndEntry> entries = new ArrayList<SyndEntry>();
for (BrowsableDSpaceObject itemDSO : items) { for (BrowsableObject itemDSO : items) {
if (itemDSO.getType() != Constants.ITEM) { if (itemDSO.getType() != Constants.ITEM) {
continue; continue;
} }

6
dspace-api/src/main/java/org/dspace/app/util/service/OpenSearchService.java
View File

@@ -12,7 +12,7 @@ import java.sql.SQLException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.DSpaceObject; import org.dspace.content.DSpaceObject;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.w3c.dom.Document; import org.w3c.dom.Document;
@@ -92,7 +92,7 @@ public interface OpenSearchService {
*/ */
public String getResultsString(Context context, String format, String query, int totalResults, int start, public String getResultsString(Context context, String format, String query, int totalResults, int start,
int pageSize, int pageSize,
DSpaceObject scope, List<BrowsableDSpaceObject> results, DSpaceObject scope, List<BrowsableObject> results,
Map<String, String> labels) throws IOException; Map<String, String> labels) throws IOException;
/** /**
@@ -112,7 +112,7 @@ public interface OpenSearchService {
*/ */
public Document getResultsDoc(Context context, String format, String query, int totalResults, int start, public Document getResultsDoc(Context context, String format, String query, int totalResults, int start,
int pageSize, int pageSize,
DSpaceObject scope, List<BrowsableDSpaceObject> results, Map<String, String> labels) DSpaceObject scope, List<BrowsableObject> results, Map<String, String> labels)
throws IOException; throws IOException;
public DSpaceObject resolveScope(Context context, String scope) throws SQLException; public DSpaceObject resolveScope(Context context, String scope) throws SQLException;

2
dspace-api/src/main/java/org/dspace/browse/BrowserScope.java
View File

@@ -133,7 +133,7 @@ public class BrowserScope {
* @param dso the container object; a Community or Collection * @param dso the container object; a Community or Collection
* @throws BrowseException if browse error * @throws BrowseException if browse error
*/ */
public void setBrowseContainer(BrowsableDSpaceObject dso) public void setBrowseContainer(BrowsableObject dso)
throws BrowseException { throws BrowseException {
if (dso instanceof Collection) { if (dso instanceof Collection) {
this.collection = (Collection) dso; this.collection = (Collection) dso;

2
dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java
View File

@@ -307,7 +307,7 @@ public class SolrBrowseDAO implements BrowseDAO {
DiscoverResult resp = getSolrResponse(); DiscoverResult resp = getSolrResponse();
List<Item> bitems = new ArrayList<>(); List<Item> bitems = new ArrayList<>();
for (BrowsableDSpaceObject<UUID> solrDoc : resp.getDspaceObjects()) { for (BrowsableObject<UUID> solrDoc : resp.getDspaceObjects()) {
// FIXME introduce project, don't retrieve Item immediately when // FIXME introduce project, don't retrieve Item immediately when
// processing the query... // processing the query...
Item item = (Item) solrDoc; Item item = (Item) solrDoc;

8
dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactory.java
View File

@@ -42,7 +42,7 @@ import org.dspace.workflow.factory.WorkflowServiceFactory;
*/ */
public abstract class ContentServiceFactory { public abstract class ContentServiceFactory {
public abstract List<BrowsableObjectService> getBrowsableDSpaceObjectServices(); public abstract List<BrowsableObjectService> getBrowsableObjectServices();
public abstract List<DSpaceObjectService<? extends DSpaceObject>> getDSpaceObjectServices(); public abstract List<DSpaceObjectService<? extends DSpaceObject>> getDSpaceObjectServices();
@@ -104,9 +104,9 @@ public abstract class ContentServiceFactory {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T extends BrowsableObject<PK>, PK extends Serializable> BrowsableObjectService<T, PK> public <T extends BrowsableObject<PK>, PK extends Serializable> BrowsableObjectService<T, PK>
getBrowsableDSpaceObjectService(int type) { getBrowsableObjectService(int type) {
for (int i = 0; i < getBrowsableDSpaceObjectServices().size(); i++) { for (int i = 0; i < getBrowsableObjectServices().size(); i++) {
BrowsableObjectService objectService = getBrowsableDSpaceObjectServices().get(i); BrowsableObjectService objectService = getBrowsableObjectServices().get(i);
if (objectService.getSupportsTypeConstant() == type) { if (objectService.getSupportsTypeConstant() == type) {
return (BrowsableObjectService<T, PK>) objectService; return (BrowsableObjectService<T, PK>) objectService;
} }

2
dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactoryImpl.java
View File

@@ -70,7 +70,7 @@ public class ContentServiceFactoryImpl extends ContentServiceFactory {
private SiteService siteService; private SiteService siteService;
@Override @Override
public List<BrowsableObjectService> getBrowsableDSpaceObjectServices() { public List<BrowsableObjectService> getBrowsableObjectServices() {
return new DSpace().getServiceManager().getServicesByType(BrowsableObjectService.class); return new DSpace().getServiceManager().getServicesByType(BrowsableObjectService.class);
} }

4
dspace-api/src/main/java/org/dspace/content/service/BrowsableObjectService.java
View File

@@ -14,7 +14,7 @@ import org.dspace.browse.BrowsableObject;
import org.dspace.core.Context; import org.dspace.core.Context;
/** /**
* Service interface class for any BrowsableDSpaceObject. * Service interface class for any BrowsableObject.
* All BrowsableObject service classes should implement this class since it offers some basic methods which all * All BrowsableObject service classes should implement this class since it offers some basic methods which all
* BrowsableObjects are required to have. * BrowsableObjects are required to have.
* *
@@ -38,7 +38,7 @@ public interface BrowsableObjectService<T extends BrowsableObject<PK>, PK extend
/** /**
* Returns the Constants which this service supports * Returns the Constants which this service supports
* *
* @return a org.dspace.core.Constants that represents a BrowsableDSpaceObject type * @return a org.dspace.core.Constants that represents a BrowsableObject type
*/ */
public int getSupportsTypeConstant(); public int getSupportsTypeConstant();
} }

26
dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java
View File

@@ -15,7 +15,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.ListUtils;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.discovery.configuration.DiscoveryConfigurationParameters; import org.dspace.discovery.configuration.DiscoveryConfigurationParameters;
import org.dspace.discovery.configuration.DiscoverySearchFilterFacet; import org.dspace.discovery.configuration.DiscoverySearchFilterFacet;
@@ -28,7 +28,7 @@ public class DiscoverResult {
private long totalSearchResults; private long totalSearchResults;
private int start; private int start;
private List<BrowsableDSpaceObject> dspaceObjects; private List<BrowsableObject> dspaceObjects;
private Map<String, List<FacetResult>> facetResults; private Map<String, List<FacetResult>> facetResults;
private Map<String, List<FacetResult>> facetQueryResults; private Map<String, List<FacetResult>> facetQueryResults;
private Map<String, List<FacetResult>> facetFieldResults; private Map<String, List<FacetResult>> facetFieldResults;
@@ -43,7 +43,7 @@ public class DiscoverResult {
private String spellCheckQuery; private String spellCheckQuery;
public DiscoverResult() { public DiscoverResult() {
dspaceObjects = new ArrayList<BrowsableDSpaceObject>(); dspaceObjects = new ArrayList<BrowsableObject>();
facetResults = new LinkedHashMap<String, List<FacetResult>>(); facetResults = new LinkedHashMap<String, List<FacetResult>>();
facetQueryResults = new LinkedHashMap<String, List<FacetResult>>(); facetQueryResults = new LinkedHashMap<String, List<FacetResult>>();
facetFieldResults = new LinkedHashMap<String, List<FacetResult>>(); facetFieldResults = new LinkedHashMap<String, List<FacetResult>>();
@@ -51,11 +51,11 @@ public class DiscoverResult {
highlightedResults = new HashMap<String, DSpaceObjectHighlightResult>(); highlightedResults = new HashMap<String, DSpaceObjectHighlightResult>();
} }
public void addDSpaceObject(BrowsableDSpaceObject dso) { public void addDSpaceObject(BrowsableObject dso) {
this.dspaceObjects.add(dso); this.dspaceObjects.add(dso);
} }
public List<BrowsableDSpaceObject> getDspaceObjects() { public List<BrowsableObject> getDspaceObjects() {
return dspaceObjects; return dspaceObjects;
} }
@@ -151,11 +151,11 @@ public class DiscoverResult {
return ListUtils.emptyIfNull(facetValues); return ListUtils.emptyIfNull(facetValues);
} }
public DSpaceObjectHighlightResult getHighlightedResults(BrowsableDSpaceObject dso) { public DSpaceObjectHighlightResult getHighlightedResults(BrowsableObject dso) {
return highlightedResults.get(dso.getUniqueIndexID()); return highlightedResults.get(dso.getUniqueIndexID());
} }
public void addHighlightedResult(BrowsableDSpaceObject dso, DSpaceObjectHighlightResult highlightedResult) { public void addHighlightedResult(BrowsableObject dso, DSpaceObjectHighlightResult highlightedResult) {
this.highlightedResults.put(dso.getUniqueIndexID(), highlightedResult); this.highlightedResults.put(dso.getUniqueIndexID(), highlightedResult);
} }
@@ -219,18 +219,18 @@ public class DiscoverResult {
} }
public static final class DSpaceObjectHighlightResult { public static final class DSpaceObjectHighlightResult {
private BrowsableDSpaceObject dso; private BrowsableObject dso;
private Map<String, List<String>> highlightResults; private Map<String, List<String>> highlightResults;
private Map<String, List<String[]>> highlightResultsWithAuthority; private Map<String, List<String[]>> highlightResultsWithAuthority;
public DSpaceObjectHighlightResult(BrowsableDSpaceObject dso, Map<String, List<String>> highlightResults, public DSpaceObjectHighlightResult(BrowsableObject dso, Map<String, List<String>> highlightResults,
Map<String, List<String[]>> highlightResultsWithAuthority) { Map<String, List<String[]>> highlightResultsWithAuthority) {
this.dso = dso; this.dso = dso;
this.highlightResults = highlightResults; this.highlightResults = highlightResults;
this.highlightResultsWithAuthority = highlightResultsWithAuthority; this.highlightResultsWithAuthority = highlightResultsWithAuthority;
} }
public BrowsableDSpaceObject getDso() { public BrowsableObject getDso() {
return dso; return dso;
} }
@@ -247,7 +247,7 @@ public class DiscoverResult {
} }
} }
public void addSearchDocument(BrowsableDSpaceObject dso, SearchDocument searchDocument) { public void addSearchDocument(BrowsableObject dso, SearchDocument searchDocument) {
String dsoString = SearchDocument.getDspaceObjectStringRepresentation(dso); String dsoString = SearchDocument.getDspaceObjectStringRepresentation(dso);
List<SearchDocument> docs = searchDocuments.get(dsoString); List<SearchDocument> docs = searchDocuments.get(dsoString);
if (docs == null) { if (docs == null) {
@@ -264,7 +264,7 @@ public class DiscoverResult {
* the dspace object we want our search documents for * the dspace object we want our search documents for
* @return the search documents list * @return the search documents list
*/ */
public List<SearchDocument> getSearchDocument(BrowsableDSpaceObject dso) { public List<SearchDocument> getSearchDocument(BrowsableObject dso) {
String dsoString = SearchDocument.getDspaceObjectStringRepresentation(dso); String dsoString = SearchDocument.getDspaceObjectStringRepresentation(dso);
List<SearchDocument> result = searchDocuments.get(dsoString); List<SearchDocument> result = searchDocuments.get(dsoString);
if (result == null) { if (result == null) {
@@ -305,7 +305,7 @@ public class DiscoverResult {
} }
} }
public static String getDspaceObjectStringRepresentation(BrowsableDSpaceObject dso) { public static String getDspaceObjectStringRepresentation(BrowsableObject dso) {
return dso.getType() + ":" + dso.getID(); return dso.getType() + ":" + dso.getID();
} }
} }

6
dspace-api/src/main/java/org/dspace/discovery/FacetYearRange.java
View File

@@ -11,7 +11,7 @@ import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.discovery.configuration.DiscoverySearchFilterFacet; import org.dspace.discovery.configuration.DiscoverySearchFilterFacet;
@@ -46,7 +46,7 @@ public class FacetYearRange {
return oldestYear != -1 && newestYear != -1; return oldestYear != -1 && newestYear != -1;
} }
public void calculateRange(Context context, List<String> filterQueries, BrowsableDSpaceObject scope, public void calculateRange(Context context, List<String> filterQueries, BrowsableObject scope,
SearchService searchService, DiscoverQuery parentQuery) throws SearchServiceException { SearchService searchService, DiscoverQuery parentQuery) throws SearchServiceException {
dateFacet = facet.getIndexFieldName() + ".year"; dateFacet = facet.getIndexFieldName() + ".year";
//Get a range query so we can create facet queries ranging from our first to our last date //Get a range query so we can create facet queries ranging from our first to our last date
@@ -94,7 +94,7 @@ public class FacetYearRange {
} }
private void calculateNewRangeBasedOnSearchIndex(Context context, List<String> filterQueries, private void calculateNewRangeBasedOnSearchIndex(Context context, List<String> filterQueries,
BrowsableDSpaceObject scope, SearchService searchService, BrowsableObject scope, SearchService searchService,
DiscoverQuery parentQuery) throws SearchServiceException { DiscoverQuery parentQuery) throws SearchServiceException {
DiscoverQuery yearRangeQuery = new DiscoverQuery(); DiscoverQuery yearRangeQuery = new DiscoverQuery();
yearRangeQuery.setDiscoveryConfigurationName(parentQuery.getDiscoveryConfigurationName()); yearRangeQuery.setDiscoveryConfigurationName(parentQuery.getDiscoveryConfigurationName());

8
dspace-api/src/main/java/org/dspace/discovery/IndexClient.java
View File

@@ -24,7 +24,7 @@ import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options; import org.apache.commons.cli.Options;
import org.apache.commons.cli.PosixParser; import org.apache.commons.cli.PosixParser;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.Collection; import org.dspace.content.Collection;
import org.dspace.content.Community; import org.dspace.content.Community;
import org.dspace.content.Item; import org.dspace.content.Item;
@@ -177,7 +177,7 @@ public class IndexClient {
String[] identifiers = optionValue.split("\\s*,\\s*"); String[] identifiers = optionValue.split("\\s*,\\s*");
for (String id : identifiers) { for (String id : identifiers) {
if (id.startsWith(ConfigurationManager.getProperty("handle.prefix")) || id.startsWith("123456789/")) { if (id.startsWith(ConfigurationManager.getProperty("handle.prefix")) || id.startsWith("123456789/")) {
BrowsableDSpaceObject dso = (BrowsableDSpaceObject) HandleServiceFactory.getInstance() BrowsableObject dso = (BrowsableObject) HandleServiceFactory.getInstance()
.getHandleService().resolveToObject(context, id); .getHandleService().resolveToObject(context, id);
indexer.indexContent(context, dso, line.hasOption("f")); indexer.indexContent(context, dso, line.hasOption("f"));
} }
@@ -215,7 +215,7 @@ public class IndexClient {
} }
} else if (line.hasOption('i')) { } else if (line.hasOption('i')) {
final String handle = line.getOptionValue('i'); final String handle = line.getOptionValue('i');
final BrowsableDSpaceObject dso = (BrowsableDSpaceObject) HandleServiceFactory.getInstance() final BrowsableObject dso = (BrowsableObject) HandleServiceFactory.getInstance()
.getHandleService().resolveToObject(context, handle); .getHandleService().resolveToObject(context, handle);
if (dso == null) { if (dso == null) {
throw new IllegalArgumentException("Cannot resolve " + handle + " to a DSpace object"); throw new IllegalArgumentException("Cannot resolve " + handle + " to a DSpace object");
@@ -249,7 +249,7 @@ public class IndexClient {
private static long indexAll(final IndexingService indexingService, private static long indexAll(final IndexingService indexingService,
final ItemService itemService, final ItemService itemService,
final Context context, final Context context,
final BrowsableDSpaceObject dso) final BrowsableObject dso)
throws IOException, SearchServiceException, SQLException { throws IOException, SearchServiceException, SQLException {
long count = 0; long count = 0;

12
dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
View File

@@ -11,7 +11,7 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.Bundle; import org.dspace.content.Bundle;
import org.dspace.content.DSpaceObject; import org.dspace.content.DSpaceObject;
import org.dspace.core.Constants; import org.dspace.core.Constants;
@@ -34,7 +34,7 @@ public class IndexEventConsumer implements Consumer {
private static Logger log = org.apache.logging.log4j.LogManager.getLogger(IndexEventConsumer.class); private static Logger log = org.apache.logging.log4j.LogManager.getLogger(IndexEventConsumer.class);
// collect Items, Collections, Communities that need indexing // collect Items, Collections, Communities that need indexing
private Set<BrowsableDSpaceObject> objectsToUpdate = null; private Set<BrowsableObject> objectsToUpdate = null;
// unique search IDs to delete // unique search IDs to delete
private Set<String> uniqueIdsToDelete = null; private Set<String> uniqueIdsToDelete = null;
@@ -59,7 +59,7 @@ public class IndexEventConsumer implements Consumer {
public void consume(Context ctx, Event event) throws Exception { public void consume(Context ctx, Event event) throws Exception {
if (objectsToUpdate == null) { if (objectsToUpdate == null) {
objectsToUpdate = new HashSet<BrowsableDSpaceObject>(); objectsToUpdate = new HashSet<BrowsableObject>();
uniqueIdsToDelete = new HashSet<String>(); uniqueIdsToDelete = new HashSet<String>();
} }
@@ -108,7 +108,7 @@ public class IndexEventConsumer implements Consumer {
+ ", perhaps it has been deleted."); + ", perhaps it has been deleted.");
} else { } else {
log.debug("consume() adding event to update queue: " + event.toString()); log.debug("consume() adding event to update queue: " + event.toString());
objectsToUpdate.add((BrowsableDSpaceObject)subject); objectsToUpdate.add((BrowsableObject)subject);
} }
break; break;
@@ -121,7 +121,7 @@ public class IndexEventConsumer implements Consumer {
+ ", perhaps it has been deleted."); + ", perhaps it has been deleted.");
} else { } else {
log.debug("consume() adding event to update queue: " + event.toString()); log.debug("consume() adding event to update queue: " + event.toString());
objectsToUpdate.add((BrowsableDSpaceObject)object); objectsToUpdate.add((BrowsableObject)object);
} }
break; break;
@@ -155,7 +155,7 @@ public class IndexEventConsumer implements Consumer {
if (objectsToUpdate != null && uniqueIdsToDelete != null) { if (objectsToUpdate != null && uniqueIdsToDelete != null) {
// update the changed Items not deleted because they were on create list // update the changed Items not deleted because they were on create list
for (BrowsableDSpaceObject iu : objectsToUpdate) { for (BrowsableObject iu : objectsToUpdate) {
/* we let all types through here and /* we let all types through here and
* allow the search indexer to make * allow the search indexer to make
* decisions on indexing and/or removal * decisions on indexing and/or removal

16
dspace-api/src/main/java/org/dspace/discovery/IndexingService.java
View File

@@ -12,11 +12,11 @@ import java.sql.SQLException;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.core.Context; import org.dspace.core.Context;
/** /**
* Interface used for indexing BrowsableDSpaceObject into discovery * Interface used for indexing BrowsableObject into discovery
* *
* @author Kevin Van de Velde (kevin at atmire dot com) * @author Kevin Van de Velde (kevin at atmire dot com)
* @author Mark Diggory (markd at atmire dot com) * @author Mark Diggory (markd at atmire dot com)
@@ -24,19 +24,19 @@ import org.dspace.core.Context;
*/ */
public interface IndexingService { public interface IndexingService {
void indexContent(Context context, BrowsableDSpaceObject dso) void indexContent(Context context, BrowsableObject dso)
throws SQLException; throws SQLException;
void indexContent(Context context, BrowsableDSpaceObject dso, void indexContent(Context context, BrowsableObject dso,
boolean force) throws SQLException; boolean force) throws SQLException;
void indexContent(Context context, BrowsableDSpaceObject dso, void indexContent(Context context, BrowsableObject dso,
boolean force, boolean commit) throws SQLException, SearchServiceException; boolean force, boolean commit) throws SQLException, SearchServiceException;
void unIndexContent(Context context, BrowsableDSpaceObject dso) void unIndexContent(Context context, BrowsableObject dso)
throws SQLException, IOException; throws SQLException, IOException;
void unIndexContent(Context context, BrowsableDSpaceObject dso, boolean commit) void unIndexContent(Context context, BrowsableObject dso, boolean commit)
throws SQLException, IOException; throws SQLException, IOException;
void unIndexContent(Context context, String uniqueSearchID) void unIndexContent(Context context, String uniqueSearchID)
@@ -45,7 +45,7 @@ public interface IndexingService {
void unIndexContent(Context context, String uniqueSearchID, boolean commit) void unIndexContent(Context context, String uniqueSearchID, boolean commit)
throws IOException; throws IOException;
void reIndexContent(Context context, BrowsableDSpaceObject dso) void reIndexContent(Context context, BrowsableObject dso)
throws SQLException, IOException; throws SQLException, IOException;
void createIndex(Context context) throws SQLException, IOException; void createIndex(Context context) throws SQLException, IOException;

10
dspace-api/src/main/java/org/dspace/discovery/SearchService.java
View File

@@ -10,7 +10,7 @@ package org.dspace.discovery;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.List; import java.util.List;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.Item; import org.dspace.content.Item;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.discovery.configuration.DiscoveryMoreLikeThisConfiguration; import org.dspace.discovery.configuration.DiscoveryMoreLikeThisConfiguration;
@@ -49,7 +49,7 @@ public interface SearchService {
* @return discovery search result object * @return discovery search result object
* @throws SearchServiceException if search error * @throws SearchServiceException if search error
*/ */
DiscoverResult search(Context context, BrowsableDSpaceObject dso, DiscoverQuery query) DiscoverResult search(Context context, BrowsableObject dso, DiscoverQuery query)
throws SearchServiceException; throws SearchServiceException;
/** /**
@@ -73,10 +73,10 @@ public interface SearchService {
* @return discovery search result object * @return discovery search result object
* @throws SearchServiceException if search error * @throws SearchServiceException if search error
*/ */
DiscoverResult search(Context context, BrowsableDSpaceObject dso, DiscoverQuery query, boolean includeWithdrawn) DiscoverResult search(Context context, BrowsableObject dso, DiscoverQuery query, boolean includeWithdrawn)
throws SearchServiceException; throws SearchServiceException;
List<BrowsableDSpaceObject> search(Context context, String query, String orderfield, boolean ascending, int offset, List<BrowsableObject> search(Context context, String query, String orderfield, boolean ascending, int offset,
int max, String... filterquery); int max, String... filterquery);
/** /**
@@ -129,7 +129,7 @@ public interface SearchService {
*/ */
String escapeQueryChars(String query); String escapeQueryChars(String query);
FacetYearRange getFacetYearRange(Context context, BrowsableDSpaceObject scope, DiscoverySearchFilterFacet facet, FacetYearRange getFacetYearRange(Context context, BrowsableObject scope, DiscoverySearchFilterFacet facet,
List<String> filterQueries, DiscoverQuery parentQuery) List<String> filterQueries, DiscoverQuery parentQuery)
throws SearchServiceException; throws SearchServiceException;

4
dspace-api/src/main/java/org/dspace/discovery/SolrServiceContentInOriginalBundleFilterPlugin.java
View File

@@ -10,7 +10,7 @@ package org.dspace.discovery;
import java.util.List; import java.util.List;
import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputDocument;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.Bitstream; import org.dspace.content.Bitstream;
import org.dspace.content.Bundle; import org.dspace.content.Bundle;
import org.dspace.content.Item; import org.dspace.content.Item;
@@ -30,7 +30,7 @@ import org.dspace.core.Context;
public class SolrServiceContentInOriginalBundleFilterPlugin implements SolrServiceIndexPlugin { public class SolrServiceContentInOriginalBundleFilterPlugin implements SolrServiceIndexPlugin {
@Override @Override
public void additionalIndex(Context context, BrowsableDSpaceObject dso, SolrInputDocument document) { public void additionalIndex(Context context, BrowsableObject dso, SolrInputDocument document) {
if (dso instanceof Item) { if (dso instanceof Item) {
Item item = (Item) dso; Item item = (Item) dso;
boolean hasOriginalBundleWithContent = hasOriginalBundleWithContent(item); boolean hasOriginalBundleWithContent = hasOriginalBundleWithContent(item);

4
dspace-api/src/main/java/org/dspace/discovery/SolrServiceFileInfoPlugin.java
View File

@@ -10,7 +10,7 @@ package org.dspace.discovery;
import java.util.List; import java.util.List;
import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputDocument;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.Bitstream; import org.dspace.content.Bitstream;
import org.dspace.content.Bundle; import org.dspace.content.Bundle;
import org.dspace.content.Item; import org.dspace.content.Item;
@@ -41,7 +41,7 @@ public class SolrServiceFileInfoPlugin implements SolrServiceIndexPlugin {
private static final String SOLR_FIELD_NAME_FOR_DESCRIPTIONS = "original_bundle_descriptions"; private static final String SOLR_FIELD_NAME_FOR_DESCRIPTIONS = "original_bundle_descriptions";
@Override @Override
public void additionalIndex(Context context, BrowsableDSpaceObject dso, SolrInputDocument document) { public void additionalIndex(Context context, BrowsableObject dso, SolrInputDocument document) {
if (dso instanceof Item) { if (dso instanceof Item) {
Item item = (Item) dso; Item item = (Item) dso;
List<Bundle> bundles = item.getBundles(); List<Bundle> bundles = item.getBundles();

44
dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
View File

@@ -69,7 +69,7 @@ import org.apache.solr.handler.extraction.ExtractingParams;
import org.dspace.app.util.Util; import org.dspace.app.util.Util;
import org.dspace.authorize.ResourcePolicy; import org.dspace.authorize.ResourcePolicy;
import org.dspace.authorize.factory.AuthorizeServiceFactory; import org.dspace.authorize.factory.AuthorizeServiceFactory;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.Collection; import org.dspace.content.Collection;
import org.dspace.content.Community; import org.dspace.content.Community;
import org.dspace.content.DSpaceObject; import org.dspace.content.DSpaceObject;
@@ -244,7 +244,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
* @throws SQLException if error * @throws SQLException if error
*/ */
@Override @Override
public void indexContent(Context context, BrowsableDSpaceObject dso) public void indexContent(Context context, BrowsableObject dso)
throws SQLException { throws SQLException {
indexContent(context, dso, false); indexContent(context, dso, false);
} }
@@ -260,7 +260,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
* @throws SQLException if error * @throws SQLException if error
*/ */
@Override @Override
public void indexContent(Context context, BrowsableDSpaceObject dso, public void indexContent(Context context, BrowsableObject dso,
boolean force) throws SQLException { boolean force) throws SQLException {
try { try {
@@ -320,7 +320,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
* @throws IOException if IO error * @throws IOException if IO error
*/ */
@Override @Override
public void unIndexContent(Context context, BrowsableDSpaceObject dso) public void unIndexContent(Context context, BrowsableObject dso)
throws SQLException, IOException { throws SQLException, IOException {
unIndexContent(context, dso, false); unIndexContent(context, dso, false);
} }
@@ -335,7 +335,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
* @throws IOException if IO error * @throws IOException if IO error
*/ */
@Override @Override
public void unIndexContent(Context context, BrowsableDSpaceObject dso, boolean commit) public void unIndexContent(Context context, BrowsableObject dso, boolean commit)
throws SQLException, IOException { throws SQLException, IOException {
try { try {
if (dso == null) { if (dso == null) {
@@ -401,7 +401,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
* @param dso object to re-index * @param dso object to re-index
*/ */
@Override @Override
public void reIndexContent(Context context, BrowsableDSpaceObject dso) public void reIndexContent(Context context, BrowsableObject dso)
throws SQLException, IOException { throws SQLException, IOException {
try { try {
indexContent(context, dso); indexContent(context, dso);
@@ -591,7 +591,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
String uniqueID = (String) doc.getFieldValue(RESOURCE_UNIQUE_ID); String uniqueID = (String) doc.getFieldValue(RESOURCE_UNIQUE_ID);
BrowsableDSpaceObject o = findDSpaceObject(context, doc); BrowsableObject o = findDSpaceObject(context, doc);
if (o == null) { if (o == null) {
log.info("Deleting: " + uniqueID); log.info("Deleting: " + uniqueID);
@@ -1869,14 +1869,14 @@ public class SolrServiceImpl implements SearchService, IndexingService {
} }
@Override @Override
public DiscoverResult search(Context context, BrowsableDSpaceObject dso, public DiscoverResult search(Context context, BrowsableObject dso,
DiscoverQuery query) DiscoverQuery query)
throws SearchServiceException { throws SearchServiceException {
return search(context, dso, query, false); return search(context, dso, query, false);
} }
@Override @Override
public DiscoverResult search(Context context, BrowsableDSpaceObject dso, DiscoverQuery discoveryQuery, public DiscoverResult search(Context context, BrowsableObject dso, DiscoverQuery discoveryQuery,
boolean includeUnDiscoverable) throws SearchServiceException { boolean includeUnDiscoverable) throws SearchServiceException {
if (dso != null) { if (dso != null) {
if (dso instanceof Community) { if (dso instanceof Community) {
@@ -2054,7 +2054,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
List<String> searchFields = query.getSearchFields(); List<String> searchFields = query.getSearchFields();
for (SolrDocument doc : solrQueryResponse.getResults()) { for (SolrDocument doc : solrQueryResponse.getResults()) {
BrowsableDSpaceObject dso = findDSpaceObject(context, doc); BrowsableObject dso = findDSpaceObject(context, doc);
if (dso != null) { if (dso != null) {
result.addDSpaceObject(dso); result.addDSpaceObject(dso);
@@ -2204,11 +2204,11 @@ public class SolrServiceImpl implements SearchService, IndexingService {
* @return DSpace object * @return DSpace object
* @throws SQLException An exception that provides information on a database access error or other errors. * @throws SQLException An exception that provides information on a database access error or other errors.
*/ */
protected BrowsableDSpaceObject findDSpaceObject(Context context, SolrDocument doc) throws SQLException { protected BrowsableObject findDSpaceObject(Context context, SolrDocument doc) throws SQLException {
Integer type = (Integer) doc.getFirstValue(RESOURCE_TYPE_FIELD); Integer type = (Integer) doc.getFirstValue(RESOURCE_TYPE_FIELD);
Object id = doc.getFirstValue(RESOURCE_ID_FIELD); Object id = doc.getFirstValue(RESOURCE_ID_FIELD);
String handle = (String) doc.getFirstValue(HANDLE_FIELD); String handle = (String) doc.getFirstValue(HANDLE_FIELD);
BrowsableDSpaceObject o = null; BrowsableObject o = null;
Serializable uid = null; Serializable uid = null;
if (type != null && id != null) { if (type != null && id != null) {
switch (type) { switch (type) {
@@ -2225,7 +2225,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
} }
if (uid != null) { if (uid != null) {
o = (BrowsableDSpaceObject) contentServiceFactory.getBrowsableDSpaceObjectService(type).find(context, uid); o = (BrowsableObject) contentServiceFactory.getBrowsableObjectService(type).find(context, uid);
} }
if (o != null) { if (o != null) {
@@ -2239,13 +2239,13 @@ public class SolrServiceImpl implements SearchService, IndexingService {
return o; return o;
} }
public List<BrowsableDSpaceObject> search(Context context, String query, int offset, int max, public List<BrowsableObject> search(Context context, String query, int offset, int max,
String... filterquery) { String... filterquery) {
return search(context, query, null, true, offset, max, filterquery); return search(context, query, null, true, offset, max, filterquery);
} }
@Override @Override
public List<BrowsableDSpaceObject> search(Context context, String query, String orderfield, boolean ascending, public List<BrowsableObject> search(Context context, String query, String orderfield, boolean ascending,
int offset, int max, String... filterquery) { int offset, int max, String... filterquery) {
try { try {
@@ -2269,12 +2269,12 @@ public class SolrServiceImpl implements SearchService, IndexingService {
SolrDocumentList docs = rsp.getResults(); SolrDocumentList docs = rsp.getResults();
Iterator iter = docs.iterator(); Iterator iter = docs.iterator();
List<BrowsableDSpaceObject> result = new ArrayList<BrowsableDSpaceObject>(); List<BrowsableObject> result = new ArrayList<BrowsableObject>();
while (iter.hasNext()) { while (iter.hasNext()) {
SolrDocument doc = (SolrDocument) iter.next(); SolrDocument doc = (SolrDocument) iter.next();
BrowsableDSpaceObject o = (BrowsableDSpaceObject)contentServiceFactory BrowsableObject o = (BrowsableObject)contentServiceFactory
.getBrowsableDSpaceObjectService((Integer) doc.getFirstValue(RESOURCE_TYPE_FIELD)) .getBrowsableObjectService((Integer) doc.getFirstValue(RESOURCE_TYPE_FIELD))
.find(context, UUID.fromString((String) doc.getFirstValue(RESOURCE_ID_FIELD))); .find(context, UUID.fromString((String) doc.getFirstValue(RESOURCE_ID_FIELD)));
if (o != null) { if (o != null) {
@@ -2286,7 +2286,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
// Any acception that we get ignore it. // Any acception that we get ignore it.
// We do NOT want any crashed to shown by the user // We do NOT want any crashed to shown by the user
log.error(LogManager.getHeader(context, "Error while quering solr", "Query: " + query), e); log.error(LogManager.getHeader(context, "Error while quering solr", "Query: " + query), e);
return new ArrayList<BrowsableDSpaceObject>(0); return new ArrayList<BrowsableObject>(0);
} }
} }
@@ -2379,7 +2379,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
SolrDocumentList relatedDocs = (SolrDocumentList) mltResults.get(item.getType() + "-" + item.getID()); SolrDocumentList relatedDocs = (SolrDocumentList) mltResults.get(item.getType() + "-" + item.getID());
for (Object relatedDoc : relatedDocs) { for (Object relatedDoc : relatedDocs) {
SolrDocument relatedDocument = (SolrDocument) relatedDoc; SolrDocument relatedDocument = (SolrDocument) relatedDoc;
BrowsableDSpaceObject relatedItem = findDSpaceObject(context, relatedDocument); BrowsableObject relatedItem = findDSpaceObject(context, relatedDocument);
if (relatedItem.getType() == Constants.ITEM) { if (relatedItem.getType() == Constants.ITEM) {
results.add((Item) relatedItem); results.add((Item) relatedItem);
} }
@@ -2540,7 +2540,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
} }
@Override @Override
public void indexContent(Context context, BrowsableDSpaceObject dso, boolean force, public void indexContent(Context context, BrowsableObject dso, boolean force,
boolean commit) throws SearchServiceException, SQLException { boolean commit) throws SearchServiceException, SQLException {
indexContent(context, dso, force); indexContent(context, dso, force);
if (commit) { if (commit) {
@@ -2569,7 +2569,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
} }
@Override @Override
public FacetYearRange getFacetYearRange(Context context, BrowsableDSpaceObject scope, public FacetYearRange getFacetYearRange(Context context, BrowsableObject scope,
DiscoverySearchFilterFacet facet, List<String> filterQueries, DiscoverySearchFilterFacet facet, List<String> filterQueries,
DiscoverQuery parentQuery) throws SearchServiceException { DiscoverQuery parentQuery) throws SearchServiceException {
FacetYearRange result = new FacetYearRange(facet); FacetYearRange result = new FacetYearRange(facet);

4
dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexOutputPlugin.java
View File

@@ -8,7 +8,7 @@
package org.dspace.discovery; package org.dspace.discovery;
import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputDocument;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.core.Context; import org.dspace.core.Context;
@@ -20,7 +20,7 @@ import org.dspace.core.Context;
public class SolrServiceIndexOutputPlugin implements SolrServiceIndexPlugin { public class SolrServiceIndexOutputPlugin implements SolrServiceIndexPlugin {
@Override @Override
public void additionalIndex(Context context, BrowsableDSpaceObject dso, SolrInputDocument document) { public void additionalIndex(Context context, BrowsableObject dso, SolrInputDocument document) {
System.out.println("Currently indexing: " + dso.getUniqueIndexID()); System.out.println("Currently indexing: " + dso.getUniqueIndexID());
} }
} }

4
dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexPlugin.java
View File

@@ -8,7 +8,7 @@
package org.dspace.discovery; package org.dspace.discovery;
import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputDocument;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.core.Context; import org.dspace.core.Context;
/** /**
@@ -20,5 +20,5 @@ import org.dspace.core.Context;
*/ */
public interface SolrServiceIndexPlugin { public interface SolrServiceIndexPlugin {
public void additionalIndex(Context context, BrowsableDSpaceObject dso, SolrInputDocument document); public void additionalIndex(Context context, BrowsableObject dso, SolrInputDocument document);
} }

4
dspace-api/src/main/java/org/dspace/discovery/SolrServiceMetadataBrowseIndexingPlugin.java
View File

@@ -15,7 +15,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputDocument;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.browse.BrowseException; import org.dspace.browse.BrowseException;
import org.dspace.browse.BrowseIndex; import org.dspace.browse.BrowseIndex;
import org.dspace.content.Item; import org.dspace.content.Item;
@@ -57,7 +57,7 @@ public class SolrServiceMetadataBrowseIndexingPlugin implements SolrServiceIndex
protected ChoiceAuthorityService choiceAuthorityService; protected ChoiceAuthorityService choiceAuthorityService;
@Override @Override
public void additionalIndex(Context context, BrowsableDSpaceObject dso, SolrInputDocument document) { public void additionalIndex(Context context, BrowsableObject dso, SolrInputDocument document) {
// Only works for Items // Only works for Items
if (!(dso instanceof Item)) { if (!(dso instanceof Item)) {
return; return;

4
dspace-api/src/main/java/org/dspace/discovery/SolrServiceResourceRestrictionPlugin.java
View File

@@ -18,7 +18,7 @@ import org.apache.solr.common.SolrInputDocument;
import org.dspace.authorize.ResourcePolicy; import org.dspace.authorize.ResourcePolicy;
import org.dspace.authorize.service.AuthorizeService; import org.dspace.authorize.service.AuthorizeService;
import org.dspace.authorize.service.ResourcePolicyService; import org.dspace.authorize.service.ResourcePolicyService;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.DSpaceObject; import org.dspace.content.DSpaceObject;
import org.dspace.content.service.CollectionService; import org.dspace.content.service.CollectionService;
import org.dspace.content.service.CommunityService; import org.dspace.content.service.CommunityService;
@@ -56,7 +56,7 @@ public class SolrServiceResourceRestrictionPlugin implements SolrServiceIndexPlu
protected ResourcePolicyService resourcePolicyService; protected ResourcePolicyService resourcePolicyService;
@Override @Override
public void additionalIndex(Context context, BrowsableDSpaceObject bdso, SolrInputDocument document) { public void additionalIndex(Context context, BrowsableObject bdso, SolrInputDocument document) {
if (!(bdso instanceof DSpaceObject)) { if (!(bdso instanceof DSpaceObject)) {
return; return;
} }

4
dspace-api/src/main/java/org/dspace/discovery/SolrServiceSpellIndexingPlugin.java
View File

@@ -10,7 +10,7 @@ package org.dspace.discovery;
import java.util.List; import java.util.List;
import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputDocument;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.Item; import org.dspace.content.Item;
import org.dspace.content.MetadataValue; import org.dspace.content.MetadataValue;
import org.dspace.content.service.ItemService; import org.dspace.content.service.ItemService;
@@ -30,7 +30,7 @@ public class SolrServiceSpellIndexingPlugin implements SolrServiceIndexPlugin {
protected ItemService itemService; protected ItemService itemService;
@Override @Override
public void additionalIndex(Context context, BrowsableDSpaceObject dso, SolrInputDocument document) { public void additionalIndex(Context context, BrowsableObject dso, SolrInputDocument document) {
if (dso instanceof Item) { if (dso instanceof Item) {
Item item = (Item) dso; Item item = (Item) dso;
List<MetadataValue> dcValues = itemService.getMetadata(item, Item.ANY, Item.ANY, Item.ANY, Item.ANY); List<MetadataValue> dcValues = itemService.getMetadata(item, Item.ANY, Item.ANY, Item.ANY, Item.ANY);

6
dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoveryConfigurationService.java
View File

@@ -12,7 +12,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.services.factory.DSpaceServicesFactory; import org.dspace.services.factory.DSpaceServicesFactory;
/** /**
@@ -48,7 +48,7 @@ public class DiscoveryConfigurationService {
this.toIgnoreMetadataFields = toIgnoreMetadataFields; this.toIgnoreMetadataFields = toIgnoreMetadataFields;
} }
public DiscoveryConfiguration getDiscoveryConfiguration(BrowsableDSpaceObject dso) { public DiscoveryConfiguration getDiscoveryConfiguration(BrowsableObject dso) {
String name; String name;
if (dso == null) { if (dso == null) {
name = "site"; name = "site";
@@ -73,7 +73,7 @@ public class DiscoveryConfigurationService {
} }
public DiscoveryConfiguration getDiscoveryConfigurationByNameOrDso(final String configurationName, public DiscoveryConfiguration getDiscoveryConfigurationByNameOrDso(final String configurationName,
final BrowsableDSpaceObject dso) { final BrowsableObject dso) {
if (StringUtils.isNotBlank(configurationName) && getMap().containsKey(configurationName)) { if (StringUtils.isNotBlank(configurationName) && getMap().containsKey(configurationName)) {
return getMap().get(configurationName); return getMap().get(configurationName);
} else { } else {

4
dspace-api/src/main/java/org/dspace/search/Harvest.java
View File

@@ -17,7 +17,7 @@ import java.util.List;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.dspace.authorize.factory.AuthorizeServiceFactory; import org.dspace.authorize.factory.AuthorizeServiceFactory;
import org.dspace.authorize.service.AuthorizeService; import org.dspace.authorize.service.AuthorizeService;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.Collection; import org.dspace.content.Collection;
import org.dspace.content.Community; import org.dspace.content.Community;
import org.dspace.content.DCDate; import org.dspace.content.DCDate;
@@ -140,7 +140,7 @@ public class Harvest {
DiscoverResult discoverResult = SearchUtils.getSearchService().search(context, discoverQuery); DiscoverResult discoverResult = SearchUtils.getSearchService().search(context, discoverQuery);
// Process results of query into HarvestedItemInfo objects // Process results of query into HarvestedItemInfo objects
Iterator<BrowsableDSpaceObject> dsoIterator = discoverResult.getDspaceObjects().iterator(); Iterator<BrowsableObject> dsoIterator = discoverResult.getDspaceObjects().iterator();
while (dsoIterator.hasNext() && ((limit == 0) || (itemCounter < limit))) { while (dsoIterator.hasNext() && ((limit == 0) || (itemCounter < limit))) {
// the query is limited to ITEM // the query is limited to ITEM
DSpaceObject dso = (DSpaceObject) dsoIterator.next(); DSpaceObject dso = (DSpaceObject) dsoIterator.next();

4
dspace-spring-rest/src/main/java/org/dspace/app/rest/OpenSearchController.java
View File

@@ -30,7 +30,7 @@ import org.dspace.app.util.factory.UtilServiceFactory;
import org.dspace.app.util.service.OpenSearchService; import org.dspace.app.util.service.OpenSearchService;
import org.dspace.authorize.factory.AuthorizeServiceFactory; import org.dspace.authorize.factory.AuthorizeServiceFactory;
import org.dspace.authorize.service.AuthorizeService; import org.dspace.authorize.service.AuthorizeService;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.DSpaceObject; import org.dspace.content.DSpaceObject;
import org.dspace.content.factory.ContentServiceFactory; import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.CollectionService; import org.dspace.content.service.CollectionService;
@@ -141,7 +141,7 @@ public class OpenSearchController {
// format and return results // format and return results
Map<String, String> labelMap = getLabels(request); Map<String, String> labelMap = getLabels(request);
List<BrowsableDSpaceObject> dsoResults = qResults.getDspaceObjects(); List<BrowsableObject> dsoResults = qResults.getDspaceObjects();
Document resultsDoc = openSearchService.getResultsDoc(context, format, query, Document resultsDoc = openSearchService.getResultsDoc(context, format, query,
(int) qResults.getTotalSearchResults(), qResults.getStart(), (int) qResults.getTotalSearchResults(), qResults.getStart(),
qResults.getMaxResults(), container, dsoResults, labelMap); qResults.getMaxResults(), container, dsoResults, labelMap);

4
dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/BrowsableDSpaceObjectConverter.java
View File

@@ -23,8 +23,8 @@ public abstract class BrowsableDSpaceObjectConverter<M extends BrowsableObject,
/** /**
* *
* @param bdso * @param bdso
* the browsableDSpaceObject to check * the BrowsableObject to check
* @return true if the actual converter implementation is able to manage the supplied BrowsableDSpaceObject * @return true if the actual converter implementation is able to manage the supplied BrowsableObject
*/ */
public abstract boolean supportsModel(BrowsableObject bdso); public abstract boolean supportsModel(BrowsableObject bdso);

8
dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/DiscoverResultConverter.java
View File

@@ -18,7 +18,7 @@ import org.dspace.app.rest.model.RestAddressableModel;
import org.dspace.app.rest.model.SearchResultEntryRest; import org.dspace.app.rest.model.SearchResultEntryRest;
import org.dspace.app.rest.model.SearchResultsRest; import org.dspace.app.rest.model.SearchResultsRest;
import org.dspace.app.rest.parameter.SearchFilter; import org.dspace.app.rest.parameter.SearchFilter;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.discovery.DiscoverResult; import org.dspace.discovery.DiscoverResult;
import org.dspace.discovery.configuration.DiscoveryConfiguration; import org.dspace.discovery.configuration.DiscoveryConfiguration;
@@ -66,7 +66,7 @@ public class DiscoverResultConverter {
} }
private void addSearchResults(final DiscoverResult searchResult, final SearchResultsRest resultsRest) { private void addSearchResults(final DiscoverResult searchResult, final SearchResultsRest resultsRest) {
for (BrowsableDSpaceObject dspaceObject : CollectionUtils.emptyIfNull(searchResult.getDspaceObjects())) { for (BrowsableObject dspaceObject : CollectionUtils.emptyIfNull(searchResult.getDspaceObjects())) {
SearchResultEntryRest resultEntry = new SearchResultEntryRest(); SearchResultEntryRest resultEntry = new SearchResultEntryRest();
//Convert the DSpace Object to its REST model //Convert the DSpace Object to its REST model
@@ -86,8 +86,8 @@ public class DiscoverResultConverter {
} }
} }
private RestAddressableModel convertDSpaceObject(final BrowsableDSpaceObject dspaceObject) { private RestAddressableModel convertDSpaceObject(final BrowsableObject dspaceObject) {
for (BrowsableDSpaceObjectConverter<BrowsableDSpaceObject, RestAddressableModel> converter : converters) { for (BrowsableDSpaceObjectConverter<BrowsableObject, RestAddressableModel> converter : converters) {
if (converter.supportsModel(dspaceObject)) { if (converter.supportsModel(dspaceObject)) {
return converter.convert(dspaceObject); return converter.convert(dspaceObject);
} }

4
dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/WorkspaceItemConverter.java
View File

@@ -21,7 +21,7 @@ import org.dspace.app.rest.submit.SubmissionService;
import org.dspace.app.util.SubmissionConfigReader; import org.dspace.app.util.SubmissionConfigReader;
import org.dspace.app.util.SubmissionConfigReaderException; import org.dspace.app.util.SubmissionConfigReaderException;
import org.dspace.app.util.SubmissionStepConfig; import org.dspace.app.util.SubmissionStepConfig;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.content.Collection; import org.dspace.content.Collection;
import org.dspace.content.Item; import org.dspace.content.Item;
import org.dspace.content.WorkspaceItem; import org.dspace.content.WorkspaceItem;
@@ -155,7 +155,7 @@ public class WorkspaceItemConverter
} }
@Override @Override
public boolean supportsModel(BrowsableDSpaceObject object) { public boolean supportsModel(BrowsableObject object) {
return object instanceof WorkspaceItem; return object instanceof WorkspaceItem;
} }
} }

4
dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseEntryLinkRepository.java
View File

@@ -20,7 +20,7 @@ import org.dspace.app.rest.model.BrowseEntryRest;
import org.dspace.app.rest.model.BrowseIndexRest; import org.dspace.app.rest.model.BrowseIndexRest;
import org.dspace.app.rest.model.hateoas.BrowseEntryResource; import org.dspace.app.rest.model.hateoas.BrowseEntryResource;
import org.dspace.app.rest.utils.ScopeResolver; import org.dspace.app.rest.utils.ScopeResolver;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.browse.BrowseEngine; import org.dspace.browse.BrowseEngine;
import org.dspace.browse.BrowseException; import org.dspace.browse.BrowseException;
import org.dspace.browse.BrowseIndex; import org.dspace.browse.BrowseIndex;
@@ -73,7 +73,7 @@ public class BrowseEntryLinkRepository extends AbstractDSpaceRestRepository
BrowseEngine be = new BrowseEngine(context); BrowseEngine be = new BrowseEngine(context);
BrowserScope bs = new BrowserScope(context); BrowserScope bs = new BrowserScope(context);
BrowsableDSpaceObject scopeObj = scopeResolver.resolveScope(context, scope); BrowsableObject scopeObj = scopeResolver.resolveScope(context, scope);
// process the input, performing some inline validation // process the input, performing some inline validation
final BrowseIndex bi; final BrowseIndex bi;

6
dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java
View File

@@ -19,7 +19,7 @@ import org.dspace.app.rest.model.BrowseIndexRest;
import org.dspace.app.rest.model.ItemRest; import org.dspace.app.rest.model.ItemRest;
import org.dspace.app.rest.model.hateoas.ItemResource; import org.dspace.app.rest.model.hateoas.ItemResource;
import org.dspace.app.rest.utils.ScopeResolver; import org.dspace.app.rest.utils.ScopeResolver;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.browse.BrowseEngine; import org.dspace.browse.BrowseEngine;
import org.dspace.browse.BrowseException; import org.dspace.browse.BrowseException;
import org.dspace.browse.BrowseIndex; import org.dspace.browse.BrowseIndex;
@@ -75,7 +75,7 @@ public class BrowseItemLinkRepository extends AbstractDSpaceRestRepository
BrowseEngine be = new BrowseEngine(context); BrowseEngine be = new BrowseEngine(context);
BrowserScope bs = new BrowserScope(context); BrowserScope bs = new BrowserScope(context);
BrowsableDSpaceObject scopeObj = scopeResolver.resolveScope(context, scope); BrowsableObject scopeObj = scopeResolver.resolveScope(context, scope);
// process the input, performing some inline validation // process the input, performing some inline validation
BrowseIndex bi = null; BrowseIndex bi = null;
@@ -152,7 +152,7 @@ public class BrowseItemLinkRepository extends AbstractDSpaceRestRepository
Pageable pageResultInfo = Pageable pageResultInfo =
new PageRequest((binfo.getStart() - 1) / binfo.getResultsPerPage(), binfo.getResultsPerPage()); new PageRequest((binfo.getStart() - 1) / binfo.getResultsPerPage(), binfo.getResultsPerPage());
List<Item> tmpResult = new ArrayList<Item>(); List<Item> tmpResult = new ArrayList<Item>();
for (BrowsableDSpaceObject bb : binfo.getBrowseItemResults()) { for (BrowsableObject bb : binfo.getBrowseItemResults()) {
tmpResult.add((Item) bb); tmpResult.add((Item) bb);
} }
Page<ItemRest> page = new PageImpl<Item>(tmpResult, pageResultInfo, binfo.getTotal()).map(converter); Page<ItemRest> page = new PageImpl<Item>(tmpResult, pageResultInfo, binfo.getTotal()).map(converter);

12
dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java
View File

@@ -26,7 +26,7 @@ import org.dspace.app.rest.model.SearchSupportRest;
import org.dspace.app.rest.parameter.SearchFilter; import org.dspace.app.rest.parameter.SearchFilter;
import org.dspace.app.rest.utils.DiscoverQueryBuilder; import org.dspace.app.rest.utils.DiscoverQueryBuilder;
import org.dspace.app.rest.utils.ScopeResolver; import org.dspace.app.rest.utils.ScopeResolver;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.discovery.DiscoverQuery; import org.dspace.discovery.DiscoverQuery;
import org.dspace.discovery.DiscoverResult; import org.dspace.discovery.DiscoverResult;
@@ -82,7 +82,7 @@ public class DiscoveryRestRepository extends AbstractDSpaceRestRepository {
public SearchConfigurationRest getSearchConfiguration(final String dsoScope, final String configuration) { public SearchConfigurationRest getSearchConfiguration(final String dsoScope, final String configuration) {
Context context = obtainContext(); Context context = obtainContext();
BrowsableDSpaceObject scopeObject = scopeResolver.resolveScope(context, dsoScope); BrowsableObject scopeObject = scopeResolver.resolveScope(context, dsoScope);
DiscoveryConfiguration discoveryConfiguration = searchConfigurationService DiscoveryConfiguration discoveryConfiguration = searchConfigurationService
.getDiscoveryConfigurationByNameOrDso(configuration, scopeObject); .getDiscoveryConfigurationByNameOrDso(configuration, scopeObject);
@@ -94,7 +94,7 @@ public class DiscoveryRestRepository extends AbstractDSpaceRestRepository {
final List<SearchFilter> searchFilters, final Pageable page) final List<SearchFilter> searchFilters, final Pageable page)
throws InvalidRequestException { throws InvalidRequestException {
Context context = obtainContext(); Context context = obtainContext();
BrowsableDSpaceObject scopeObject = scopeResolver.resolveScope(context, dsoScope); BrowsableObject scopeObject = scopeResolver.resolveScope(context, dsoScope);
DiscoveryConfiguration discoveryConfiguration = searchConfigurationService DiscoveryConfiguration discoveryConfiguration = searchConfigurationService
.getDiscoveryConfigurationByNameOrDso(configuration, scopeObject); .getDiscoveryConfigurationByNameOrDso(configuration, scopeObject);
@@ -119,7 +119,7 @@ public class DiscoveryRestRepository extends AbstractDSpaceRestRepository {
public FacetConfigurationRest getFacetsConfiguration(final String dsoScope, final String configuration) { public FacetConfigurationRest getFacetsConfiguration(final String dsoScope, final String configuration) {
Context context = obtainContext(); Context context = obtainContext();
BrowsableDSpaceObject scopeObject = scopeResolver.resolveScope(context, dsoScope); BrowsableObject scopeObject = scopeResolver.resolveScope(context, dsoScope);
DiscoveryConfiguration discoveryConfiguration = searchConfigurationService DiscoveryConfiguration discoveryConfiguration = searchConfigurationService
.getDiscoveryConfigurationByNameOrDso(configuration, scopeObject); .getDiscoveryConfigurationByNameOrDso(configuration, scopeObject);
@@ -136,7 +136,7 @@ public class DiscoveryRestRepository extends AbstractDSpaceRestRepository {
Context context = obtainContext(); Context context = obtainContext();
BrowsableDSpaceObject scopeObject = scopeResolver.resolveScope(context, dsoScope); BrowsableObject scopeObject = scopeResolver.resolveScope(context, dsoScope);
DiscoveryConfiguration discoveryConfiguration = searchConfigurationService DiscoveryConfiguration discoveryConfiguration = searchConfigurationService
.getDiscoveryConfigurationByNameOrDso(configuration, scopeObject); .getDiscoveryConfigurationByNameOrDso(configuration, scopeObject);
@@ -162,7 +162,7 @@ public class DiscoveryRestRepository extends AbstractDSpaceRestRepository {
Context context = obtainContext(); Context context = obtainContext();
Pageable page = new PageRequest(1, 1); Pageable page = new PageRequest(1, 1);
BrowsableDSpaceObject scopeObject = scopeResolver.resolveScope(context, dsoScope); BrowsableObject scopeObject = scopeResolver.resolveScope(context, dsoScope);
DiscoveryConfiguration discoveryConfiguration = searchConfigurationService DiscoveryConfiguration discoveryConfiguration = searchConfigurationService
.getDiscoveryConfigurationByNameOrDso(configuration, scopeObject); .getDiscoveryConfigurationByNameOrDso(configuration, scopeObject);

12
dspace-spring-rest/src/main/java/org/dspace/app/rest/utils/DiscoverQueryBuilder.java
View File

@@ -22,7 +22,7 @@ import org.dspace.app.rest.exception.InvalidSearchFacetException;
import org.dspace.app.rest.exception.InvalidSearchFilterException; import org.dspace.app.rest.exception.InvalidSearchFilterException;
import org.dspace.app.rest.exception.InvalidSortingException; import org.dspace.app.rest.exception.InvalidSortingException;
import org.dspace.app.rest.parameter.SearchFilter; import org.dspace.app.rest.parameter.SearchFilter;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.core.Constants; import org.dspace.core.Constants;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.core.LogManager; import org.dspace.core.LogManager;
@@ -67,7 +67,7 @@ public class DiscoverQueryBuilder implements InitializingBean {
pageSizeLimit = configurationService.getIntProperty("rest.search.max.results", 100); pageSizeLimit = configurationService.getIntProperty("rest.search.max.results", 100);
} }
public DiscoverQuery buildQuery(Context context, BrowsableDSpaceObject scope, public DiscoverQuery buildQuery(Context context, BrowsableObject scope,
DiscoveryConfiguration discoveryConfiguration, DiscoveryConfiguration discoveryConfiguration,
String query, List<SearchFilter> searchFilters, String query, List<SearchFilter> searchFilters,
String dsoType, Pageable page) String dsoType, Pageable page)
@@ -100,7 +100,7 @@ public class DiscoverQueryBuilder implements InitializingBean {
} }
} }
public DiscoverQuery buildFacetQuery(Context context, BrowsableDSpaceObject scope, public DiscoverQuery buildFacetQuery(Context context, BrowsableObject scope,
DiscoveryConfiguration discoveryConfiguration, DiscoveryConfiguration discoveryConfiguration,
String prefix, String query, List<SearchFilter> searchFilters, String prefix, String query, List<SearchFilter> searchFilters,
String dsoType, Pageable page, String facetName) String dsoType, Pageable page, String facetName)
@@ -127,7 +127,7 @@ public class DiscoverQueryBuilder implements InitializingBean {
} }
} }
private DiscoverQuery addFacetingForFacets(Context context, BrowsableDSpaceObject scope, String prefix, private DiscoverQuery addFacetingForFacets(Context context, BrowsableObject scope, String prefix,
DiscoverQuery queryArgs, DiscoveryConfiguration discoveryConfiguration, String facetName, Pageable page) DiscoverQuery queryArgs, DiscoveryConfiguration discoveryConfiguration, String facetName, Pageable page)
throws InvalidSearchFacetException { throws InvalidSearchFacetException {
@@ -145,7 +145,7 @@ public class DiscoverQueryBuilder implements InitializingBean {
return queryArgs; return queryArgs;
} }
private void fillFacetIntoQueryArgs(Context context, BrowsableDSpaceObject scope, String prefix, private void fillFacetIntoQueryArgs(Context context, BrowsableObject scope, String prefix,
DiscoverQuery queryArgs, DiscoverySearchFilterFacet facet, final int pageSize) { DiscoverQuery queryArgs, DiscoverySearchFilterFacet facet, final int pageSize) {
if (facet.getType().equals(DiscoveryConfigurationParameters.TYPE_DATE)) { if (facet.getType().equals(DiscoveryConfigurationParameters.TYPE_DATE)) {
try { try {
@@ -310,7 +310,7 @@ public class DiscoverQueryBuilder implements InitializingBean {
return filterQueries.toArray(new String[filterQueries.size()]); return filterQueries.toArray(new String[filterQueries.size()]);
} }
private DiscoverQuery addFaceting(Context context, BrowsableDSpaceObject scope, DiscoverQuery queryArgs, private DiscoverQuery addFaceting(Context context, BrowsableObject scope, DiscoverQuery queryArgs,
DiscoveryConfiguration discoveryConfiguration) { DiscoveryConfiguration discoveryConfiguration) {
List<DiscoverySearchFilterFacet> facets = discoveryConfiguration.getSidebarFacets(); List<DiscoverySearchFilterFacet> facets = discoveryConfiguration.getSidebarFacets();

6
dspace-spring-rest/src/test/java/org/dspace/app/rest/utils/DiscoverQueryBuilderTest.java
View File

@@ -28,7 +28,7 @@ import org.dspace.app.rest.exception.InvalidSearchFacetException;
import org.dspace.app.rest.exception.InvalidSearchFilterException; import org.dspace.app.rest.exception.InvalidSearchFilterException;
import org.dspace.app.rest.exception.InvalidSortingException; import org.dspace.app.rest.exception.InvalidSortingException;
import org.dspace.app.rest.parameter.SearchFilter; import org.dspace.app.rest.parameter.SearchFilter;
import org.dspace.browse.BrowsableDSpaceObject; import org.dspace.browse.BrowsableObject;
import org.dspace.core.Constants; import org.dspace.core.Constants;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.discovery.DiscoverFacetField; import org.dspace.discovery.DiscoverFacetField;
@@ -75,7 +75,7 @@ public class DiscoverQueryBuilderTest {
private Context context; private Context context;
@Mock @Mock
private BrowsableDSpaceObject scope; private BrowsableObject scope;
private DiscoveryConfiguration discoveryConfiguration; private DiscoveryConfiguration discoveryConfiguration;
private String query; private String query;
@@ -92,7 +92,7 @@ public class DiscoverQueryBuilderTest {
.then(invocation -> invocation.getArguments()[0] + "_sort"); .then(invocation -> invocation.getArguments()[0] + "_sort");
when(searchService when(searchService
.getFacetYearRange(eq(context), any(BrowsableDSpaceObject.class), any(DiscoverySearchFilterFacet.class), .getFacetYearRange(eq(context), any(BrowsableObject.class), any(DiscoverySearchFilterFacet.class),
any(), any(DiscoverQuery.class))) any(), any(DiscoverQuery.class)))
.then(invocation -> new FacetYearRange((DiscoverySearchFilterFacet) invocation.getArguments()[2])); .then(invocation -> new FacetYearRange((DiscoverySearchFilterFacet) invocation.getArguments()[2]));