diff --git a/dspace-api/src/main/java/org/dspace/app/util/OpenSearchServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/util/OpenSearchServiceImpl.java index 4ff93680d4..6ce2408e66 100644 --- a/dspace-api/src/main/java/org/dspace/app/util/OpenSearchServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/app/util/OpenSearchServiceImpl.java @@ -22,7 +22,7 @@ import com.sun.syndication.feed.module.opensearch.impl.OpenSearchModuleImpl; import com.sun.syndication.io.FeedException; import org.apache.logging.log4j.Logger; 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.core.Constants; import org.dspace.core.Context; @@ -119,7 +119,7 @@ public class OpenSearchServiceImpl implements OpenSearchService { @Override public String getResultsString(Context context, String format, String query, int totalResults, int start, int pageSize, - DSpaceObject scope, List results, + DSpaceObject scope, List results, Map labels) throws IOException { try { return getResults(context, format, query, totalResults, start, pageSize, scope, results, labels) @@ -133,7 +133,7 @@ public class OpenSearchServiceImpl implements OpenSearchService { @Override public Document getResultsDoc(Context context, String format, String query, int totalResults, int start, int pageSize, - DSpaceObject scope, List results, Map labels) + DSpaceObject scope, List results, Map labels) throws IOException { try { 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, int pageSize, DSpaceObject scope, - List results, Map labels) { + List results, Map labels) { // Encode results in requested format if ("rss".equals(format)) { format = "rss_2.0"; diff --git a/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java b/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java index d60787937e..09b2100dd5 100644 --- a/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java +++ b/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java @@ -37,7 +37,7 @@ import com.sun.syndication.io.SyndFeedOutput; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; 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.Bundle; import org.dspace.content.Collection; @@ -185,7 +185,7 @@ public class SyndicationFeed { * @param labels label map */ public void populate(HttpServletRequest request, Context context, DSpaceObject dso, - List items, Map labels) { + List items, Map labels) { String logoURL = null; String objectURL = null; String defaultTitle = null; @@ -248,7 +248,7 @@ public class SyndicationFeed { // add entries for items if (items != null) { List entries = new ArrayList(); - for (BrowsableDSpaceObject itemDSO : items) { + for (BrowsableObject itemDSO : items) { if (itemDSO.getType() != Constants.ITEM) { continue; } diff --git a/dspace-api/src/main/java/org/dspace/app/util/service/OpenSearchService.java b/dspace-api/src/main/java/org/dspace/app/util/service/OpenSearchService.java index 7732ed944b..173e9e912a 100644 --- a/dspace-api/src/main/java/org/dspace/app/util/service/OpenSearchService.java +++ b/dspace-api/src/main/java/org/dspace/app/util/service/OpenSearchService.java @@ -12,7 +12,7 @@ import java.sql.SQLException; import java.util.List; import java.util.Map; -import org.dspace.browse.BrowsableDSpaceObject; +import org.dspace.browse.BrowsableObject; import org.dspace.content.DSpaceObject; import org.dspace.core.Context; 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, int pageSize, - DSpaceObject scope, List results, + DSpaceObject scope, List results, Map labels) throws IOException; /** @@ -112,7 +112,7 @@ public interface OpenSearchService { */ public Document getResultsDoc(Context context, String format, String query, int totalResults, int start, int pageSize, - DSpaceObject scope, List results, Map labels) + DSpaceObject scope, List results, Map labels) throws IOException; public DSpaceObject resolveScope(Context context, String scope) throws SQLException; diff --git a/dspace-api/src/main/java/org/dspace/browse/BrowserScope.java b/dspace-api/src/main/java/org/dspace/browse/BrowserScope.java index 09eead59b8..6d79f52ded 100644 --- a/dspace-api/src/main/java/org/dspace/browse/BrowserScope.java +++ b/dspace-api/src/main/java/org/dspace/browse/BrowserScope.java @@ -133,7 +133,7 @@ public class BrowserScope { * @param dso the container object; a Community or Collection * @throws BrowseException if browse error */ - public void setBrowseContainer(BrowsableDSpaceObject dso) + public void setBrowseContainer(BrowsableObject dso) throws BrowseException { if (dso instanceof Collection) { this.collection = (Collection) dso; diff --git a/dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java b/dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java index 6efb88adf8..41766f0da1 100644 --- a/dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java +++ b/dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java @@ -307,7 +307,7 @@ public class SolrBrowseDAO implements BrowseDAO { DiscoverResult resp = getSolrResponse(); List bitems = new ArrayList<>(); - for (BrowsableDSpaceObject solrDoc : resp.getDspaceObjects()) { + for (BrowsableObject solrDoc : resp.getDspaceObjects()) { // FIXME introduce project, don't retrieve Item immediately when // processing the query... Item item = (Item) solrDoc; diff --git a/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactory.java b/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactory.java index 928441066b..23a4d7a032 100644 --- a/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactory.java +++ b/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactory.java @@ -42,7 +42,7 @@ import org.dspace.workflow.factory.WorkflowServiceFactory; */ public abstract class ContentServiceFactory { - public abstract List getBrowsableDSpaceObjectServices(); + public abstract List getBrowsableObjectServices(); public abstract List> getDSpaceObjectServices(); @@ -104,9 +104,9 @@ public abstract class ContentServiceFactory { @SuppressWarnings("unchecked") public , PK extends Serializable> BrowsableObjectService - getBrowsableDSpaceObjectService(int type) { - for (int i = 0; i < getBrowsableDSpaceObjectServices().size(); i++) { - BrowsableObjectService objectService = getBrowsableDSpaceObjectServices().get(i); + getBrowsableObjectService(int type) { + for (int i = 0; i < getBrowsableObjectServices().size(); i++) { + BrowsableObjectService objectService = getBrowsableObjectServices().get(i); if (objectService.getSupportsTypeConstant() == type) { return (BrowsableObjectService) objectService; } 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 afc0d1d06d..cbfa045f33 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 @@ -70,7 +70,7 @@ public class ContentServiceFactoryImpl extends ContentServiceFactory { private SiteService siteService; @Override - public List getBrowsableDSpaceObjectServices() { + public List getBrowsableObjectServices() { return new DSpace().getServiceManager().getServicesByType(BrowsableObjectService.class); } diff --git a/dspace-api/src/main/java/org/dspace/content/service/BrowsableObjectService.java b/dspace-api/src/main/java/org/dspace/content/service/BrowsableObjectService.java index 578efed548..3902832eff 100644 --- a/dspace-api/src/main/java/org/dspace/content/service/BrowsableObjectService.java +++ b/dspace-api/src/main/java/org/dspace/content/service/BrowsableObjectService.java @@ -14,7 +14,7 @@ import org.dspace.browse.BrowsableObject; 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 * BrowsableObjects are required to have. * @@ -38,7 +38,7 @@ public interface BrowsableObjectService, PK extend /** * 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(); } 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 18e60d7adf..4a88adbcc2 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java +++ b/dspace-api/src/main/java/org/dspace/discovery/DiscoverResult.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; 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.DiscoverySearchFilterFacet; @@ -28,7 +28,7 @@ public class DiscoverResult { private long totalSearchResults; private int start; - private List dspaceObjects; + private List dspaceObjects; private Map> facetResults; private Map> facetQueryResults; private Map> facetFieldResults; @@ -43,7 +43,7 @@ public class DiscoverResult { private String spellCheckQuery; public DiscoverResult() { - dspaceObjects = new ArrayList(); + dspaceObjects = new ArrayList(); facetResults = new LinkedHashMap>(); facetQueryResults = new LinkedHashMap>(); facetFieldResults = new LinkedHashMap>(); @@ -51,11 +51,11 @@ public class DiscoverResult { highlightedResults = new HashMap(); } - public void addDSpaceObject(BrowsableDSpaceObject dso) { + public void addDSpaceObject(BrowsableObject dso) { this.dspaceObjects.add(dso); } - public List getDspaceObjects() { + public List getDspaceObjects() { return dspaceObjects; } @@ -151,11 +151,11 @@ public class DiscoverResult { return ListUtils.emptyIfNull(facetValues); } - public DSpaceObjectHighlightResult getHighlightedResults(BrowsableDSpaceObject dso) { + public DSpaceObjectHighlightResult getHighlightedResults(BrowsableObject dso) { 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); } @@ -219,18 +219,18 @@ public class DiscoverResult { } public static final class DSpaceObjectHighlightResult { - private BrowsableDSpaceObject dso; + private BrowsableObject dso; private Map> highlightResults; private Map> highlightResultsWithAuthority; - public DSpaceObjectHighlightResult(BrowsableDSpaceObject dso, Map> highlightResults, + public DSpaceObjectHighlightResult(BrowsableObject dso, Map> highlightResults, Map> highlightResultsWithAuthority) { this.dso = dso; this.highlightResults = highlightResults; this.highlightResultsWithAuthority = highlightResultsWithAuthority; } - public BrowsableDSpaceObject getDso() { + public BrowsableObject getDso() { 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); List docs = searchDocuments.get(dsoString); if (docs == null) { @@ -264,7 +264,7 @@ public class DiscoverResult { * the dspace object we want our search documents for * @return the search documents list */ - public List getSearchDocument(BrowsableDSpaceObject dso) { + public List getSearchDocument(BrowsableObject dso) { String dsoString = SearchDocument.getDspaceObjectStringRepresentation(dso); List result = searchDocuments.get(dsoString); 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(); } } diff --git a/dspace-api/src/main/java/org/dspace/discovery/FacetYearRange.java b/dspace-api/src/main/java/org/dspace/discovery/FacetYearRange.java index e6638ee0c5..3b5b76458a 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/FacetYearRange.java +++ b/dspace-api/src/main/java/org/dspace/discovery/FacetYearRange.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.dspace.browse.BrowsableDSpaceObject; +import org.dspace.browse.BrowsableObject; import org.dspace.core.Context; import org.dspace.discovery.configuration.DiscoverySearchFilterFacet; @@ -46,7 +46,7 @@ public class FacetYearRange { return oldestYear != -1 && newestYear != -1; } - public void calculateRange(Context context, List filterQueries, BrowsableDSpaceObject scope, + public void calculateRange(Context context, List filterQueries, BrowsableObject scope, SearchService searchService, DiscoverQuery parentQuery) throws SearchServiceException { dateFacet = facet.getIndexFieldName() + ".year"; //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 filterQueries, - BrowsableDSpaceObject scope, SearchService searchService, + BrowsableObject scope, SearchService searchService, DiscoverQuery parentQuery) throws SearchServiceException { DiscoverQuery yearRangeQuery = new DiscoverQuery(); yearRangeQuery.setDiscoveryConfigurationName(parentQuery.getDiscoveryConfigurationName()); 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 eb3ca84e91..16bbfaac05 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/IndexClient.java +++ b/dspace-api/src/main/java/org/dspace/discovery/IndexClient.java @@ -24,7 +24,7 @@ import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; import org.apache.commons.cli.PosixParser; 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.Community; import org.dspace.content.Item; @@ -177,7 +177,7 @@ public class IndexClient { String[] identifiers = optionValue.split("\\s*,\\s*"); for (String id : identifiers) { if (id.startsWith(ConfigurationManager.getProperty("handle.prefix")) || id.startsWith("123456789/")) { - BrowsableDSpaceObject dso = (BrowsableDSpaceObject) HandleServiceFactory.getInstance() + BrowsableObject dso = (BrowsableObject) HandleServiceFactory.getInstance() .getHandleService().resolveToObject(context, id); indexer.indexContent(context, dso, line.hasOption("f")); } @@ -215,7 +215,7 @@ public class IndexClient { } } else if (line.hasOption('i')) { final String handle = line.getOptionValue('i'); - final BrowsableDSpaceObject dso = (BrowsableDSpaceObject) HandleServiceFactory.getInstance() + final BrowsableObject dso = (BrowsableObject) HandleServiceFactory.getInstance() .getHandleService().resolveToObject(context, handle); if (dso == null) { throw new IllegalArgumentException("Cannot resolve " + handle + " to a DSpace object"); @@ -249,7 +249,7 @@ public class IndexClient { private static long indexAll(final IndexingService indexingService, final ItemService itemService, final Context context, - final BrowsableDSpaceObject dso) + final BrowsableObject dso) throws IOException, SearchServiceException, SQLException { long count = 0; diff --git a/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java b/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java index dda91ce23a..e6b4884c85 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java +++ b/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java @@ -11,7 +11,7 @@ import java.util.HashSet; import java.util.Set; 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.DSpaceObject; 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); // collect Items, Collections, Communities that need indexing - private Set objectsToUpdate = null; + private Set objectsToUpdate = null; // unique search IDs to delete private Set uniqueIdsToDelete = null; @@ -59,7 +59,7 @@ public class IndexEventConsumer implements Consumer { public void consume(Context ctx, Event event) throws Exception { if (objectsToUpdate == null) { - objectsToUpdate = new HashSet(); + objectsToUpdate = new HashSet(); uniqueIdsToDelete = new HashSet(); } @@ -108,7 +108,7 @@ public class IndexEventConsumer implements Consumer { + ", perhaps it has been deleted."); } else { log.debug("consume() adding event to update queue: " + event.toString()); - objectsToUpdate.add((BrowsableDSpaceObject)subject); + objectsToUpdate.add((BrowsableObject)subject); } break; @@ -121,7 +121,7 @@ public class IndexEventConsumer implements Consumer { + ", perhaps it has been deleted."); } else { log.debug("consume() adding event to update queue: " + event.toString()); - objectsToUpdate.add((BrowsableDSpaceObject)object); + objectsToUpdate.add((BrowsableObject)object); } break; @@ -155,7 +155,7 @@ public class IndexEventConsumer implements Consumer { if (objectsToUpdate != null && uniqueIdsToDelete != null) { // 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 * allow the search indexer to make * decisions on indexing and/or removal diff --git a/dspace-api/src/main/java/org/dspace/discovery/IndexingService.java b/dspace-api/src/main/java/org/dspace/discovery/IndexingService.java index 38c35802df..c231817193 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/IndexingService.java +++ b/dspace-api/src/main/java/org/dspace/discovery/IndexingService.java @@ -12,11 +12,11 @@ import java.sql.SQLException; import java.util.List; import java.util.UUID; -import org.dspace.browse.BrowsableDSpaceObject; +import org.dspace.browse.BrowsableObject; 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 Mark Diggory (markd at atmire dot com) @@ -24,19 +24,19 @@ import org.dspace.core.Context; */ public interface IndexingService { - void indexContent(Context context, BrowsableDSpaceObject dso) + void indexContent(Context context, BrowsableObject dso) throws SQLException; - void indexContent(Context context, BrowsableDSpaceObject dso, + void indexContent(Context context, BrowsableObject dso, boolean force) throws SQLException; - void indexContent(Context context, BrowsableDSpaceObject dso, + void indexContent(Context context, BrowsableObject dso, boolean force, boolean commit) throws SQLException, SearchServiceException; - void unIndexContent(Context context, BrowsableDSpaceObject dso) + void unIndexContent(Context context, BrowsableObject dso) throws SQLException, IOException; - void unIndexContent(Context context, BrowsableDSpaceObject dso, boolean commit) + void unIndexContent(Context context, BrowsableObject dso, boolean commit) throws SQLException, IOException; void unIndexContent(Context context, String uniqueSearchID) @@ -45,7 +45,7 @@ public interface IndexingService { void unIndexContent(Context context, String uniqueSearchID, boolean commit) throws IOException; - void reIndexContent(Context context, BrowsableDSpaceObject dso) + void reIndexContent(Context context, BrowsableObject dso) throws SQLException, IOException; void createIndex(Context context) throws SQLException, IOException; diff --git a/dspace-api/src/main/java/org/dspace/discovery/SearchService.java b/dspace-api/src/main/java/org/dspace/discovery/SearchService.java index 9b246045e5..872c0c9271 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/SearchService.java +++ b/dspace-api/src/main/java/org/dspace/discovery/SearchService.java @@ -10,7 +10,7 @@ package org.dspace.discovery; import java.sql.SQLException; import java.util.List; -import org.dspace.browse.BrowsableDSpaceObject; +import org.dspace.browse.BrowsableObject; import org.dspace.content.Item; import org.dspace.core.Context; import org.dspace.discovery.configuration.DiscoveryMoreLikeThisConfiguration; @@ -49,7 +49,7 @@ public interface SearchService { * @return discovery search result object * @throws SearchServiceException if search error */ - DiscoverResult search(Context context, BrowsableDSpaceObject dso, DiscoverQuery query) + DiscoverResult search(Context context, BrowsableObject dso, DiscoverQuery query) throws SearchServiceException; /** @@ -73,10 +73,10 @@ public interface SearchService { * @return discovery search result object * @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; - List search(Context context, String query, String orderfield, boolean ascending, int offset, + List search(Context context, String query, String orderfield, boolean ascending, int offset, int max, String... filterquery); /** @@ -129,7 +129,7 @@ public interface SearchService { */ String escapeQueryChars(String query); - FacetYearRange getFacetYearRange(Context context, BrowsableDSpaceObject scope, DiscoverySearchFilterFacet facet, + FacetYearRange getFacetYearRange(Context context, BrowsableObject scope, DiscoverySearchFilterFacet facet, List filterQueries, DiscoverQuery parentQuery) throws SearchServiceException; diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceContentInOriginalBundleFilterPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceContentInOriginalBundleFilterPlugin.java index 737ec63770..66edf33914 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceContentInOriginalBundleFilterPlugin.java +++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceContentInOriginalBundleFilterPlugin.java @@ -10,7 +10,7 @@ package org.dspace.discovery; import java.util.List; 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.Bundle; import org.dspace.content.Item; @@ -30,7 +30,7 @@ import org.dspace.core.Context; public class SolrServiceContentInOriginalBundleFilterPlugin implements SolrServiceIndexPlugin { @Override - public void additionalIndex(Context context, BrowsableDSpaceObject dso, SolrInputDocument document) { + public void additionalIndex(Context context, BrowsableObject dso, SolrInputDocument document) { if (dso instanceof Item) { Item item = (Item) dso; boolean hasOriginalBundleWithContent = hasOriginalBundleWithContent(item); diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceFileInfoPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceFileInfoPlugin.java index 226044b8c6..44ff23f0cd 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceFileInfoPlugin.java +++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceFileInfoPlugin.java @@ -10,7 +10,7 @@ package org.dspace.discovery; import java.util.List; 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.Bundle; 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"; @Override - public void additionalIndex(Context context, BrowsableDSpaceObject dso, SolrInputDocument document) { + public void additionalIndex(Context context, BrowsableObject dso, SolrInputDocument document) { if (dso instanceof Item) { Item item = (Item) dso; List bundles = item.getBundles(); 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 962694f393..de9576e871 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java @@ -69,7 +69,7 @@ import org.apache.solr.handler.extraction.ExtractingParams; import org.dspace.app.util.Util; import org.dspace.authorize.ResourcePolicy; 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.Community; import org.dspace.content.DSpaceObject; @@ -244,7 +244,7 @@ public class SolrServiceImpl implements SearchService, IndexingService { * @throws SQLException if error */ @Override - public void indexContent(Context context, BrowsableDSpaceObject dso) + public void indexContent(Context context, BrowsableObject dso) throws SQLException { indexContent(context, dso, false); } @@ -260,7 +260,7 @@ public class SolrServiceImpl implements SearchService, IndexingService { * @throws SQLException if error */ @Override - public void indexContent(Context context, BrowsableDSpaceObject dso, + public void indexContent(Context context, BrowsableObject dso, boolean force) throws SQLException { try { @@ -320,7 +320,7 @@ public class SolrServiceImpl implements SearchService, IndexingService { * @throws IOException if IO error */ @Override - public void unIndexContent(Context context, BrowsableDSpaceObject dso) + public void unIndexContent(Context context, BrowsableObject dso) throws SQLException, IOException { unIndexContent(context, dso, false); } @@ -335,7 +335,7 @@ public class SolrServiceImpl implements SearchService, IndexingService { * @throws IOException if IO error */ @Override - public void unIndexContent(Context context, BrowsableDSpaceObject dso, boolean commit) + public void unIndexContent(Context context, BrowsableObject dso, boolean commit) throws SQLException, IOException { try { if (dso == null) { @@ -401,7 +401,7 @@ public class SolrServiceImpl implements SearchService, IndexingService { * @param dso object to re-index */ @Override - public void reIndexContent(Context context, BrowsableDSpaceObject dso) + public void reIndexContent(Context context, BrowsableObject dso) throws SQLException, IOException { try { indexContent(context, dso); @@ -591,7 +591,7 @@ public class SolrServiceImpl implements SearchService, IndexingService { String uniqueID = (String) doc.getFieldValue(RESOURCE_UNIQUE_ID); - BrowsableDSpaceObject o = findDSpaceObject(context, doc); + BrowsableObject o = findDSpaceObject(context, doc); if (o == null) { log.info("Deleting: " + uniqueID); @@ -1869,14 +1869,14 @@ public class SolrServiceImpl implements SearchService, IndexingService { } @Override - public DiscoverResult search(Context context, BrowsableDSpaceObject dso, + public DiscoverResult search(Context context, BrowsableObject dso, DiscoverQuery query) throws SearchServiceException { return search(context, dso, query, false); } @Override - public DiscoverResult search(Context context, BrowsableDSpaceObject dso, DiscoverQuery discoveryQuery, + public DiscoverResult search(Context context, BrowsableObject dso, DiscoverQuery discoveryQuery, boolean includeUnDiscoverable) throws SearchServiceException { if (dso != null) { if (dso instanceof Community) { @@ -2054,7 +2054,7 @@ public class SolrServiceImpl implements SearchService, IndexingService { List searchFields = query.getSearchFields(); for (SolrDocument doc : solrQueryResponse.getResults()) { - BrowsableDSpaceObject dso = findDSpaceObject(context, doc); + BrowsableObject dso = findDSpaceObject(context, doc); if (dso != null) { result.addDSpaceObject(dso); @@ -2204,11 +2204,11 @@ public class SolrServiceImpl implements SearchService, IndexingService { * @return DSpace object * @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); Object id = doc.getFirstValue(RESOURCE_ID_FIELD); String handle = (String) doc.getFirstValue(HANDLE_FIELD); - BrowsableDSpaceObject o = null; + BrowsableObject o = null; Serializable uid = null; if (type != null && id != null) { switch (type) { @@ -2225,7 +2225,7 @@ public class SolrServiceImpl implements SearchService, IndexingService { } if (uid != null) { - o = (BrowsableDSpaceObject) contentServiceFactory.getBrowsableDSpaceObjectService(type).find(context, uid); + o = (BrowsableObject) contentServiceFactory.getBrowsableObjectService(type).find(context, uid); } if (o != null) { @@ -2239,13 +2239,13 @@ public class SolrServiceImpl implements SearchService, IndexingService { return o; } - public List search(Context context, String query, int offset, int max, + public List search(Context context, String query, int offset, int max, String... filterquery) { return search(context, query, null, true, offset, max, filterquery); } @Override - public List search(Context context, String query, String orderfield, boolean ascending, + public List search(Context context, String query, String orderfield, boolean ascending, int offset, int max, String... filterquery) { try { @@ -2269,12 +2269,12 @@ public class SolrServiceImpl implements SearchService, IndexingService { SolrDocumentList docs = rsp.getResults(); Iterator iter = docs.iterator(); - List result = new ArrayList(); + List result = new ArrayList(); while (iter.hasNext()) { SolrDocument doc = (SolrDocument) iter.next(); - BrowsableDSpaceObject o = (BrowsableDSpaceObject)contentServiceFactory - .getBrowsableDSpaceObjectService((Integer) doc.getFirstValue(RESOURCE_TYPE_FIELD)) + BrowsableObject o = (BrowsableObject)contentServiceFactory + .getBrowsableObjectService((Integer) doc.getFirstValue(RESOURCE_TYPE_FIELD)) .find(context, UUID.fromString((String) doc.getFirstValue(RESOURCE_ID_FIELD))); if (o != null) { @@ -2286,7 +2286,7 @@ public class SolrServiceImpl implements SearchService, IndexingService { // Any acception that we get ignore it. // We do NOT want any crashed to shown by the user log.error(LogManager.getHeader(context, "Error while quering solr", "Query: " + query), e); - return new ArrayList(0); + return new ArrayList(0); } } @@ -2379,7 +2379,7 @@ public class SolrServiceImpl implements SearchService, IndexingService { SolrDocumentList relatedDocs = (SolrDocumentList) mltResults.get(item.getType() + "-" + item.getID()); for (Object relatedDoc : relatedDocs) { SolrDocument relatedDocument = (SolrDocument) relatedDoc; - BrowsableDSpaceObject relatedItem = findDSpaceObject(context, relatedDocument); + BrowsableObject relatedItem = findDSpaceObject(context, relatedDocument); if (relatedItem.getType() == Constants.ITEM) { results.add((Item) relatedItem); } @@ -2540,7 +2540,7 @@ public class SolrServiceImpl implements SearchService, IndexingService { } @Override - public void indexContent(Context context, BrowsableDSpaceObject dso, boolean force, + public void indexContent(Context context, BrowsableObject dso, boolean force, boolean commit) throws SearchServiceException, SQLException { indexContent(context, dso, force); if (commit) { @@ -2569,7 +2569,7 @@ public class SolrServiceImpl implements SearchService, IndexingService { } @Override - public FacetYearRange getFacetYearRange(Context context, BrowsableDSpaceObject scope, + public FacetYearRange getFacetYearRange(Context context, BrowsableObject scope, DiscoverySearchFilterFacet facet, List filterQueries, DiscoverQuery parentQuery) throws SearchServiceException { FacetYearRange result = new FacetYearRange(facet); diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexOutputPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexOutputPlugin.java index 7dde0135ec..b3c7ea4a95 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexOutputPlugin.java +++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexOutputPlugin.java @@ -8,7 +8,7 @@ package org.dspace.discovery; import org.apache.solr.common.SolrInputDocument; -import org.dspace.browse.BrowsableDSpaceObject; +import org.dspace.browse.BrowsableObject; import org.dspace.core.Context; @@ -20,7 +20,7 @@ import org.dspace.core.Context; public class SolrServiceIndexOutputPlugin implements SolrServiceIndexPlugin { @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()); } } diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexPlugin.java index ae8c7fab27..2754c84483 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexPlugin.java +++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexPlugin.java @@ -8,7 +8,7 @@ package org.dspace.discovery; import org.apache.solr.common.SolrInputDocument; -import org.dspace.browse.BrowsableDSpaceObject; +import org.dspace.browse.BrowsableObject; import org.dspace.core.Context; /** @@ -20,5 +20,5 @@ import org.dspace.core.Context; */ public interface SolrServiceIndexPlugin { - public void additionalIndex(Context context, BrowsableDSpaceObject dso, SolrInputDocument document); + public void additionalIndex(Context context, BrowsableObject dso, SolrInputDocument document); } 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 1a4285b87f..cc97f5836f 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceMetadataBrowseIndexingPlugin.java +++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceMetadataBrowseIndexingPlugin.java @@ -15,7 +15,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; 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.BrowseIndex; import org.dspace.content.Item; @@ -57,7 +57,7 @@ public class SolrServiceMetadataBrowseIndexingPlugin implements SolrServiceIndex protected ChoiceAuthorityService choiceAuthorityService; @Override - public void additionalIndex(Context context, BrowsableDSpaceObject dso, SolrInputDocument document) { + public void additionalIndex(Context context, BrowsableObject dso, SolrInputDocument document) { // Only works for Items if (!(dso instanceof Item)) { return; diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceResourceRestrictionPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceResourceRestrictionPlugin.java index 1d4ec8f812..2432be1db8 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceResourceRestrictionPlugin.java +++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceResourceRestrictionPlugin.java @@ -18,7 +18,7 @@ import org.apache.solr.common.SolrInputDocument; import org.dspace.authorize.ResourcePolicy; import org.dspace.authorize.service.AuthorizeService; 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.service.CollectionService; import org.dspace.content.service.CommunityService; @@ -56,7 +56,7 @@ public class SolrServiceResourceRestrictionPlugin implements SolrServiceIndexPlu protected ResourcePolicyService resourcePolicyService; @Override - public void additionalIndex(Context context, BrowsableDSpaceObject bdso, SolrInputDocument document) { + public void additionalIndex(Context context, BrowsableObject bdso, SolrInputDocument document) { if (!(bdso instanceof DSpaceObject)) { return; } diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceSpellIndexingPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceSpellIndexingPlugin.java index 2ae8d44e0e..cf702b333e 100644 --- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceSpellIndexingPlugin.java +++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceSpellIndexingPlugin.java @@ -10,7 +10,7 @@ package org.dspace.discovery; import java.util.List; 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.MetadataValue; import org.dspace.content.service.ItemService; @@ -30,7 +30,7 @@ public class SolrServiceSpellIndexingPlugin implements SolrServiceIndexPlugin { protected ItemService itemService; @Override - public void additionalIndex(Context context, BrowsableDSpaceObject dso, SolrInputDocument document) { + public void additionalIndex(Context context, BrowsableObject dso, SolrInputDocument document) { if (dso instanceof Item) { Item item = (Item) dso; List dcValues = itemService.getMetadata(item, Item.ANY, Item.ANY, Item.ANY, Item.ANY); 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 33b1827327..eb487099ad 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 @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.dspace.browse.BrowsableDSpaceObject; +import org.dspace.browse.BrowsableObject; import org.dspace.services.factory.DSpaceServicesFactory; /** @@ -48,7 +48,7 @@ public class DiscoveryConfigurationService { this.toIgnoreMetadataFields = toIgnoreMetadataFields; } - public DiscoveryConfiguration getDiscoveryConfiguration(BrowsableDSpaceObject dso) { + public DiscoveryConfiguration getDiscoveryConfiguration(BrowsableObject dso) { String name; if (dso == null) { name = "site"; @@ -73,7 +73,7 @@ public class DiscoveryConfigurationService { } public DiscoveryConfiguration getDiscoveryConfigurationByNameOrDso(final String configurationName, - final BrowsableDSpaceObject dso) { + final BrowsableObject dso) { if (StringUtils.isNotBlank(configurationName) && getMap().containsKey(configurationName)) { return getMap().get(configurationName); } else { diff --git a/dspace-api/src/main/java/org/dspace/search/Harvest.java b/dspace-api/src/main/java/org/dspace/search/Harvest.java index 1e97dbc6d9..f826a252a0 100644 --- a/dspace-api/src/main/java/org/dspace/search/Harvest.java +++ b/dspace-api/src/main/java/org/dspace/search/Harvest.java @@ -17,7 +17,7 @@ import java.util.List; import org.apache.logging.log4j.Logger; import org.dspace.authorize.factory.AuthorizeServiceFactory; 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.Community; import org.dspace.content.DCDate; @@ -140,7 +140,7 @@ public class Harvest { DiscoverResult discoverResult = SearchUtils.getSearchService().search(context, discoverQuery); // Process results of query into HarvestedItemInfo objects - Iterator dsoIterator = discoverResult.getDspaceObjects().iterator(); + Iterator dsoIterator = discoverResult.getDspaceObjects().iterator(); while (dsoIterator.hasNext() && ((limit == 0) || (itemCounter < limit))) { // the query is limited to ITEM DSpaceObject dso = (DSpaceObject) dsoIterator.next(); diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/OpenSearchController.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/OpenSearchController.java index 004e67950b..28383641d1 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/OpenSearchController.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/OpenSearchController.java @@ -30,7 +30,7 @@ import org.dspace.app.util.factory.UtilServiceFactory; import org.dspace.app.util.service.OpenSearchService; import org.dspace.authorize.factory.AuthorizeServiceFactory; 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.factory.ContentServiceFactory; import org.dspace.content.service.CollectionService; @@ -141,7 +141,7 @@ public class OpenSearchController { // format and return results Map labelMap = getLabels(request); - List dsoResults = qResults.getDspaceObjects(); + List dsoResults = qResults.getDspaceObjects(); Document resultsDoc = openSearchService.getResultsDoc(context, format, query, (int) qResults.getTotalSearchResults(), qResults.getStart(), qResults.getMaxResults(), container, dsoResults, labelMap); diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/BrowsableDSpaceObjectConverter.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/BrowsableDSpaceObjectConverter.java index 6f018db8dd..7192ad7803 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/BrowsableDSpaceObjectConverter.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/BrowsableDSpaceObjectConverter.java @@ -23,8 +23,8 @@ public abstract class BrowsableDSpaceObjectConverter converter : converters) { + private RestAddressableModel convertDSpaceObject(final BrowsableObject dspaceObject) { + for (BrowsableDSpaceObjectConverter converter : converters) { if (converter.supportsModel(dspaceObject)) { return converter.convert(dspaceObject); } diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/WorkspaceItemConverter.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/WorkspaceItemConverter.java index 43bf74de4e..901107a8d6 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/WorkspaceItemConverter.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/WorkspaceItemConverter.java @@ -21,7 +21,7 @@ import org.dspace.app.rest.submit.SubmissionService; import org.dspace.app.util.SubmissionConfigReader; import org.dspace.app.util.SubmissionConfigReaderException; 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.Item; import org.dspace.content.WorkspaceItem; @@ -155,7 +155,7 @@ public class WorkspaceItemConverter } @Override - public boolean supportsModel(BrowsableDSpaceObject object) { + public boolean supportsModel(BrowsableObject object) { return object instanceof WorkspaceItem; } } diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseEntryLinkRepository.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseEntryLinkRepository.java index dae531dab8..0048d45318 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseEntryLinkRepository.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseEntryLinkRepository.java @@ -20,7 +20,7 @@ import org.dspace.app.rest.model.BrowseEntryRest; import org.dspace.app.rest.model.BrowseIndexRest; import org.dspace.app.rest.model.hateoas.BrowseEntryResource; 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.BrowseException; import org.dspace.browse.BrowseIndex; @@ -73,7 +73,7 @@ public class BrowseEntryLinkRepository extends AbstractDSpaceRestRepository BrowseEngine be = new BrowseEngine(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 final BrowseIndex bi; diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java index 4ae5edf6a1..6308171cb3 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java @@ -19,7 +19,7 @@ import org.dspace.app.rest.model.BrowseIndexRest; import org.dspace.app.rest.model.ItemRest; import org.dspace.app.rest.model.hateoas.ItemResource; 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.BrowseException; import org.dspace.browse.BrowseIndex; @@ -75,7 +75,7 @@ public class BrowseItemLinkRepository extends AbstractDSpaceRestRepository BrowseEngine be = new BrowseEngine(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 BrowseIndex bi = null; @@ -152,7 +152,7 @@ public class BrowseItemLinkRepository extends AbstractDSpaceRestRepository Pageable pageResultInfo = new PageRequest((binfo.getStart() - 1) / binfo.getResultsPerPage(), binfo.getResultsPerPage()); List tmpResult = new ArrayList(); - for (BrowsableDSpaceObject bb : binfo.getBrowseItemResults()) { + for (BrowsableObject bb : binfo.getBrowseItemResults()) { tmpResult.add((Item) bb); } Page page = new PageImpl(tmpResult, pageResultInfo, binfo.getTotal()).map(converter); diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java index d2749c06c8..a1c5b27ead 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java @@ -26,7 +26,7 @@ import org.dspace.app.rest.model.SearchSupportRest; import org.dspace.app.rest.parameter.SearchFilter; import org.dspace.app.rest.utils.DiscoverQueryBuilder; 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.discovery.DiscoverQuery; import org.dspace.discovery.DiscoverResult; @@ -82,7 +82,7 @@ public class DiscoveryRestRepository extends AbstractDSpaceRestRepository { public SearchConfigurationRest getSearchConfiguration(final String dsoScope, final String configuration) { Context context = obtainContext(); - BrowsableDSpaceObject scopeObject = scopeResolver.resolveScope(context, dsoScope); + BrowsableObject scopeObject = scopeResolver.resolveScope(context, dsoScope); DiscoveryConfiguration discoveryConfiguration = searchConfigurationService .getDiscoveryConfigurationByNameOrDso(configuration, scopeObject); @@ -94,7 +94,7 @@ public class DiscoveryRestRepository extends AbstractDSpaceRestRepository { final List searchFilters, final Pageable page) throws InvalidRequestException { Context context = obtainContext(); - BrowsableDSpaceObject scopeObject = scopeResolver.resolveScope(context, dsoScope); + BrowsableObject scopeObject = scopeResolver.resolveScope(context, dsoScope); DiscoveryConfiguration discoveryConfiguration = searchConfigurationService .getDiscoveryConfigurationByNameOrDso(configuration, scopeObject); @@ -119,7 +119,7 @@ public class DiscoveryRestRepository extends AbstractDSpaceRestRepository { public FacetConfigurationRest getFacetsConfiguration(final String dsoScope, final String configuration) { Context context = obtainContext(); - BrowsableDSpaceObject scopeObject = scopeResolver.resolveScope(context, dsoScope); + BrowsableObject scopeObject = scopeResolver.resolveScope(context, dsoScope); DiscoveryConfiguration discoveryConfiguration = searchConfigurationService .getDiscoveryConfigurationByNameOrDso(configuration, scopeObject); @@ -136,7 +136,7 @@ public class DiscoveryRestRepository extends AbstractDSpaceRestRepository { Context context = obtainContext(); - BrowsableDSpaceObject scopeObject = scopeResolver.resolveScope(context, dsoScope); + BrowsableObject scopeObject = scopeResolver.resolveScope(context, dsoScope); DiscoveryConfiguration discoveryConfiguration = searchConfigurationService .getDiscoveryConfigurationByNameOrDso(configuration, scopeObject); @@ -162,7 +162,7 @@ public class DiscoveryRestRepository extends AbstractDSpaceRestRepository { Context context = obtainContext(); Pageable page = new PageRequest(1, 1); - BrowsableDSpaceObject scopeObject = scopeResolver.resolveScope(context, dsoScope); + BrowsableObject scopeObject = scopeResolver.resolveScope(context, dsoScope); DiscoveryConfiguration discoveryConfiguration = searchConfigurationService .getDiscoveryConfigurationByNameOrDso(configuration, scopeObject); diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/utils/DiscoverQueryBuilder.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/utils/DiscoverQueryBuilder.java index 2ecf5cadcd..e05cf23762 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/utils/DiscoverQueryBuilder.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/utils/DiscoverQueryBuilder.java @@ -22,7 +22,7 @@ import org.dspace.app.rest.exception.InvalidSearchFacetException; import org.dspace.app.rest.exception.InvalidSearchFilterException; import org.dspace.app.rest.exception.InvalidSortingException; 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.Context; import org.dspace.core.LogManager; @@ -67,7 +67,7 @@ public class DiscoverQueryBuilder implements InitializingBean { pageSizeLimit = configurationService.getIntProperty("rest.search.max.results", 100); } - public DiscoverQuery buildQuery(Context context, BrowsableDSpaceObject scope, + public DiscoverQuery buildQuery(Context context, BrowsableObject scope, DiscoveryConfiguration discoveryConfiguration, String query, List searchFilters, 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, String prefix, String query, List searchFilters, 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) throws InvalidSearchFacetException { @@ -145,7 +145,7 @@ public class DiscoverQueryBuilder implements InitializingBean { 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) { if (facet.getType().equals(DiscoveryConfigurationParameters.TYPE_DATE)) { try { @@ -310,7 +310,7 @@ public class DiscoverQueryBuilder implements InitializingBean { 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) { List facets = discoveryConfiguration.getSidebarFacets(); diff --git a/dspace-spring-rest/src/test/java/org/dspace/app/rest/utils/DiscoverQueryBuilderTest.java b/dspace-spring-rest/src/test/java/org/dspace/app/rest/utils/DiscoverQueryBuilderTest.java index d39ba43efa..f220f32cc5 100644 --- a/dspace-spring-rest/src/test/java/org/dspace/app/rest/utils/DiscoverQueryBuilderTest.java +++ b/dspace-spring-rest/src/test/java/org/dspace/app/rest/utils/DiscoverQueryBuilderTest.java @@ -28,7 +28,7 @@ import org.dspace.app.rest.exception.InvalidSearchFacetException; import org.dspace.app.rest.exception.InvalidSearchFilterException; import org.dspace.app.rest.exception.InvalidSortingException; 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.Context; import org.dspace.discovery.DiscoverFacetField; @@ -75,7 +75,7 @@ public class DiscoverQueryBuilderTest { private Context context; @Mock - private BrowsableDSpaceObject scope; + private BrowsableObject scope; private DiscoveryConfiguration discoveryConfiguration; private String query; @@ -92,7 +92,7 @@ public class DiscoverQueryBuilderTest { .then(invocation -> invocation.getArguments()[0] + "_sort"); when(searchService - .getFacetYearRange(eq(context), any(BrowsableDSpaceObject.class), any(DiscoverySearchFilterFacet.class), + .getFacetYearRange(eq(context), any(BrowsableObject.class), any(DiscoverySearchFilterFacet.class), any(), any(DiscoverQuery.class))) .then(invocation -> new FacetYearRange((DiscoverySearchFilterFacet) invocation.getArguments()[2]));