Merged dspace/master into dspace/configurable_entities

dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java

@@ -277,6 +277,15 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
         return collectionDAO.findByID(context, Collection.class, id);
     }
 
+    @Override
+    /**
+     * This method is an alias of the find method needed to avoid ambiguity between the IndexableObjectService interface
+     * and the DSpaceObjectService interface
+     */
+    public Collection findIndexableObject(Context context, UUID id) throws SQLException {
+        return collectionDAO.findByID(context, Collection.class, id);
+    }
+
     @Override
     public void setMetadata(Context context, Collection collection, String field, String value)
         throws MissingResourceException, SQLException {
@@ -783,6 +792,15 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
         return Constants.COLLECTION;
     }
 
+    @Override
+    /**
+     * This method is an alias of the getSupportsTypeConstant method needed to avoid ambiguity between the
+     * IndexableObjectService interface and the DSpaceObjectService interface
+     */
+    public int getSupportsIndexableObjectTypeConstant() {
+        return getSupportsTypeConstant();
+    }
+
     @Override
     public List<Collection> findAuthorized(Context context, Community community, int actionID) throws SQLException {
         List<Collection> myResults = new ArrayList<>();