diff --git a/dspace-api/src/main/java/org/dspace/content/BitstreamServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/BitstreamServiceImpl.java index 5dff3287ac..834f6cf181 100644 --- a/dspace-api/src/main/java/org/dspace/content/BitstreamServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/content/BitstreamServiceImpl.java @@ -254,7 +254,6 @@ public class BitstreamServiceImpl extends DSpaceObjectServiceImpl imp bundle.getBitstreams().remove(bitstream); } //Remove all bundles from the bitstream object, clearing the connection in 2 ways - bundles.clear(); // Remove policies @@ -263,8 +262,8 @@ public class BitstreamServiceImpl extends DSpaceObjectServiceImpl imp // Remove bitstream itself bitstream.setDeleted(true); update(context, bitstream); - // Remove policies from the file, we do this at the end since the methods above still require write rights. - authorizeService.removeAllPolicies(context, bitstream); + + bundles.clear(); } @Override diff --git a/dspace-api/src/main/java/org/dspace/content/BundleServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/BundleServiceImpl.java index 73043d6451..f3c905be8c 100644 --- a/dspace-api/src/main/java/org/dspace/content/BundleServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/content/BundleServiceImpl.java @@ -412,10 +412,6 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl implement item.removeBundle(bundle); } - - // remove our authorization policies - authorizeService.removeAllPolicies(context, bundle); - // Remove ourself bundleDAO.delete(context, bundle); } diff --git a/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java index 28e35b0531..c4f9399c41 100644 --- a/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java @@ -744,9 +744,6 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl i owningCommunity.getCollections().remove(collection); } - // Remove all authorization policies - authorizeService.removeAllPolicies(context, collection); - collectionDAO.delete(context, collection); } diff --git a/dspace-api/src/main/java/org/dspace/content/CommunityServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/CommunityServiceImpl.java index baefeaab3e..eaeb93ebc3 100644 --- a/dspace-api/src/main/java/org/dspace/content/CommunityServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/content/CommunityServiceImpl.java @@ -527,9 +527,6 @@ public class CommunityServiceImpl extends DSpaceObjectServiceImpl imp // Remove the logo setLogo(context, community, null); - // Remove all authorization policies - authorizeService.removeAllPolicies(context, community); - // Remove any Handle handleService.unbindHandle(context, community); diff --git a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java index 5277f9916a..ca32a500ab 100644 --- a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java @@ -294,17 +294,10 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl implements It log.info(LogManager.getHeader(context, "remove_bundle", "item_id=" + item.getID() + ",bundle_id=" + bundle.getID())); - - item.removeBundle(bundle); - bundle.removeItem(item); - - context.addEvent(new Event(Event.REMOVE, Constants.ITEM, item.getID(), Constants.BUNDLE, bundle.getID(), bundle.getName(), getIdentifiers(context, item))); - if (CollectionUtils.isEmpty(bundle.getItems())) { bundleService.delete(context, bundle); - } } @Override @@ -618,9 +611,6 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl implements It item.getCollections().clear(); item.setOwningCollection(null); - // remove all of our authorization policies - authorizeService.removeAllPolicies(context, item); - // Remove any Handle handleService.unbindHandle(context, item);