hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-08 10:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dspace-api module per new code style

Browse Source
This commit is contained in:
Tim Donohue
2018-02-14 10:53:46 -06:00
parent 8ffc97f7f9
commit 8a48f782ea
1051 changed files with 53347 additions and 63373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

239
dspace-api/src/main/java/org/dspace/content/BundleServiceImpl.java
View File

@@ -7,6 +7,14 @@
*/
package org.dspace.content;
import java.io.IOException;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -25,10 +33,6 @@ import org.dspace.core.LogManager;
import org.dspace.event.Event;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.IOException;
import java.sql.SQLException;
import java.util.*;
/**
* Service implementation for the Bundle object.
* This class is responsible for all business logic calls for the Bundle object and is autowired by spring.
@@ -38,7 +42,9 @@ import java.util.*;
*/
public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implements BundleService {
/** log4j logger */
/**
* log4j logger
*/
private static Logger log = Logger.getLogger(Bundle.class);
@Autowired(required = true)
@@ -53,32 +59,25 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
@Autowired(required = true)
protected ResourcePolicyService resourcePolicyService;
protected BundleServiceImpl()
{
protected BundleServiceImpl() {
super();
}
@Override
public Bundle find(Context context, UUID id) throws SQLException
{
public Bundle find(Context context, UUID id) throws SQLException {
// First check the cache
Bundle bundle = bundleDAO.findByID(context, Bundle.class, id);
if (bundle == null)
{
if (log.isDebugEnabled())
{
if (bundle == null) {
if (log.isDebugEnabled()) {
log.debug(LogManager.getHeader(context, "find_bundle",
"not_found,bundle_id=" + id));
"not_found,bundle_id=" + id));
}
return null;
}
else
{
if (log.isDebugEnabled())
{
} else {
if (log.isDebugEnabled()) {
log.debug(LogManager.getHeader(context, "find_bundle",
"bundle_id=" + id));
"bundle_id=" + id));
}
return bundle;
@@ -87,8 +86,7 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
@Override
public Bundle create(Context context, Item item, String name) throws SQLException, AuthorizeException {
if (StringUtils.isBlank(name))
{
if (StringUtils.isBlank(name)) {
throw new SQLException("Bundle must be created with non-null name");
}
authorizeService.authorizeAction(context, item, Constants.ADD);
@@ -98,14 +96,13 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
Bundle bundle = bundleDAO.create(context, new Bundle());
bundle.setName(context, name);
itemService.addBundle(context, item, bundle);
if(!bundle.getItems().contains(item))
{
if (!bundle.getItems().contains(item)) {
bundle.addItem(item);
}
log.info(LogManager.getHeader(context, "create_bundle", "bundle_id="
+ bundle.getID()));
+ bundle.getID()));
// if we ever use the identifier service for bundles, we should
// create the bundle before we create the Event and should add all
@@ -130,12 +127,13 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
}
@Override
public void addBitstream(Context context, Bundle bundle, Bitstream bitstream) throws SQLException, AuthorizeException {
public void addBitstream(Context context, Bundle bundle, Bitstream bitstream)
throws SQLException, AuthorizeException {
// Check authorisation
authorizeService.authorizeAction(context, bundle, Constants.ADD);
log.info(LogManager.getHeader(context, "add_bitstream", "bundle_id="
+ bundle.getID() + ",bitstream_id=" + bitstream.getID()));
+ bundle.getID() + ",bitstream_id=" + bitstream.getID()));
// First check that the bitstream isn't already in the list
List<Bitstream> bitstreams = bundle.getBitstreams();
@@ -153,8 +151,8 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
context.addEvent(new Event(Event.ADD, Constants.BUNDLE, bundle.getID(),
Constants.BITSTREAM, bitstream.getID(), String.valueOf(bitstream.getSequenceID()),
getIdentifiers(context, bundle)));
Constants.BITSTREAM, bitstream.getID(), String.valueOf(bitstream.getSequenceID()),
getIdentifiers(context, bundle)));
// copy authorization policies from bundle to bitstream
// FIXME: multiple inclusion is affected by this...
@@ -163,22 +161,22 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
}
@Override
public void removeBitstream(Context context, Bundle bundle, Bitstream bitstream) throws AuthorizeException, SQLException, IOException {
public void removeBitstream(Context context, Bundle bundle, Bitstream bitstream)
throws AuthorizeException, SQLException, IOException {
// Check authorisation
authorizeService.authorizeAction(context, bundle, Constants.REMOVE);
log.info(LogManager.getHeader(context, "remove_bitstream",
"bundle_id=" + bundle.getID() + ",bitstream_id=" + bitstream.getID()));
"bundle_id=" + bundle.getID() + ",bitstream_id=" + bitstream.getID()));
context.addEvent(new Event(Event.REMOVE, Constants.BUNDLE, bundle.getID(),
Constants.BITSTREAM, bitstream.getID(), String.valueOf(bitstream.getSequenceID()),
getIdentifiers(context, bundle)));
Constants.BITSTREAM, bitstream.getID(), String.valueOf(bitstream.getSequenceID()),
getIdentifiers(context, bundle)));
//Ensure that the last modified from the item is triggered !
Item owningItem = (Item) getParentObject(context, bundle);
if(owningItem != null)
{
if (owningItem != null) {
itemService.updateLastModified(context, owningItem);
itemService.update(context, owningItem);
}
@@ -186,45 +184,42 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
// In the event that the bitstream to remove is actually
// the primary bitstream, be sure to unset the primary
// bitstream.
if (bitstream.equals(bundle.getPrimaryBitstream()))
{
if (bitstream.equals(bundle.getPrimaryBitstream())) {
bundle.unsetPrimaryBitstreamID();
}
// Check if our bitstream is part of a single or no bundle.
// Bitstream.getBundles() may be empty (the delete() method clears
// Check if our bitstream is part of a single or no bundle.
// Bitstream.getBundles() may be empty (the delete() method clears
// the bundles). We should not delete the bitstream, if it is used
// in another bundle, instead we just remove the link between bitstream
// and this bundle.
if(bitstream.getBundles().size() <= 1)
{
// We don't need to remove the link between bundle & bitstream,
if (bitstream.getBundles().size() <= 1) {
// We don't need to remove the link between bundle & bitstream,
// this will be handled in the delete() method.
bitstreamService.delete(context, bitstream);
}else{
} else {
bundle.removeBitstream(bitstream);
bitstream.getBundles().remove(bundle);
}
}
@Override
public void inheritCollectionDefaultPolicies(Context context, Bundle bundle, Collection collection) throws SQLException, AuthorizeException {
public void inheritCollectionDefaultPolicies(Context context, Bundle bundle, Collection collection)
throws SQLException, AuthorizeException {
List<ResourcePolicy> policies = authorizeService.getPoliciesActionFilter(context, collection,
Constants.DEFAULT_BITSTREAM_READ);
Constants.DEFAULT_BITSTREAM_READ);
// change the action to just READ
// just don't call update on the resourcepolicies!!!
Iterator<ResourcePolicy> i = policies.iterator();
if (!i.hasNext())
{
if (!i.hasNext()) {
throw new java.sql.SQLException("Collection " + collection.getID()
+ " has no default bitstream READ policies");
+ " has no default bitstream READ policies");
}
List<ResourcePolicy> newPolicies = new ArrayList<ResourcePolicy>();
while (i.hasNext())
{
while (i.hasNext()) {
ResourcePolicy rp = resourcePolicyService.clone(context, i.next());
rp.setAction(Constants.READ);
newPolicies.add(rp);
@@ -234,12 +229,11 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
}
@Override
public void replaceAllBitstreamPolicies(Context context, Bundle bundle, List<ResourcePolicy> newpolicies) throws SQLException, AuthorizeException {
public void replaceAllBitstreamPolicies(Context context, Bundle bundle, List<ResourcePolicy> newpolicies)
throws SQLException, AuthorizeException {
List<Bitstream> bitstreams = bundle.getBitstreams();
if (CollectionUtils.isNotEmpty(bitstreams))
{
for (Bitstream bs : bitstreams)
{
if (CollectionUtils.isNotEmpty(bitstreams)) {
for (Bitstream bs : bitstreams) {
// change bitstream policies
authorizeService.removeAllPolicies(context, bs);
authorizeService.addPolicies(context, newpolicies, bs);
@@ -254,10 +248,8 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
public List<ResourcePolicy> getBitstreamPolicies(Context context, Bundle bundle) throws SQLException {
List<ResourcePolicy> list = new ArrayList<ResourcePolicy>();
List<Bitstream> bitstreams = bundle.getBitstreams();
if (CollectionUtils.isNotEmpty(bitstreams))
{
for (Bitstream bs : bitstreams)
{
if (CollectionUtils.isNotEmpty(bitstreams)) {
for (Bitstream bs : bitstreams) {
list.addAll(authorizeService.getPolicies(context, bs));
}
}
@@ -282,37 +274,40 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
Bitstream bitstream = bitstreamService.find(context, bitstreamId);
// If we have an invalid Bitstream ID, just ignore it, but log a warning
if(bitstream == null) {
if (bitstream == null) {
//This should never occur but just in case
log.warn(LogManager.getHeader(context, "Invalid bitstream id while changing bitstream order", "Bundle: " + bundle.getID() + ", bitstream id: " + bitstreamId));
log.warn(LogManager.getHeader(context, "Invalid bitstream id while changing bitstream order",
"Bundle: " + bundle.getID() + ", bitstream id: " + bitstreamId));
continue;
}
// If we have a Bitstream not in the current list, log a warning & exit immediately
if(!currentBitstreams.contains(bitstream))
{
log.warn(LogManager.getHeader(context, "Encountered a bitstream not in this bundle while changing bitstream order. Bitstream order will not be changed.", "Bundle: " + bundle.getID() + ", bitstream id: " + bitstreamId));
if (!currentBitstreams.contains(bitstream)) {
log.warn(LogManager.getHeader(context,
"Encountered a bitstream not in this bundle while changing bitstream " +
"order. Bitstream order will not be changed.",
"Bundle: " + bundle.getID() + ", bitstream id: " + bitstreamId));
return;
}
updatedBitstreams.add(bitstream);
}
// If our lists are different sizes, exit immediately
if(updatedBitstreams.size()!=currentBitstreams.size())
{
log.warn(LogManager.getHeader(context, "Size of old list and new list do not match. Bitstream order will not be changed.", "Bundle: " + bundle.getID()));
if (updatedBitstreams.size() != currentBitstreams.size()) {
log.warn(LogManager.getHeader(context,
"Size of old list and new list do not match. Bitstream order will not be " +
"changed.",
"Bundle: " + bundle.getID()));
return;
}
// As long as the order has changed, update it
if(CollectionUtils.isNotEmpty(updatedBitstreams) && !updatedBitstreams.equals(currentBitstreams))
{
if (CollectionUtils.isNotEmpty(updatedBitstreams) && !updatedBitstreams.equals(currentBitstreams)) {
//First clear out the existing list of bitstreams
bundle.clearBitstreams();
// Now add them back in the proper order
for (Bitstream bitstream : updatedBitstreams)
{
for (Bitstream bitstream : updatedBitstreams) {
bitstream.getBundles().remove(bundle);
bundle.addBitstream(bitstream);
bitstream.getBundles().add(bundle);
@@ -321,8 +316,7 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
//The order of the bitstreams has changed, ensure that we update the last modified of our item
Item owningItem = (Item) getParentObject(context, bundle);
if(owningItem != null)
{
if (owningItem != null) {
itemService.updateLastModified(context, owningItem);
itemService.update(context, owningItem);
@@ -336,51 +330,38 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
Item item = (Item) getParentObject(context, bundle);
Collection collection = null;
Community community = null;
if (item != null)
{
if (item != null) {
collection = item.getOwningCollection();
if (collection != null)
{
if (collection != null) {
community = collection.getCommunities().get(0);
}
}
switch (action)
{
case Constants.REMOVE:
if (AuthorizeConfiguration.canItemAdminPerformBitstreamDeletion())
{
adminObject = item;
}
else if (AuthorizeConfiguration.canCollectionAdminPerformBitstreamDeletion())
{
adminObject = collection;
}
else if (AuthorizeConfiguration
.canCommunityAdminPerformBitstreamDeletion())
{
adminObject = community;
}
break;
case Constants.ADD:
if (AuthorizeConfiguration.canItemAdminPerformBitstreamCreation())
{
adminObject = item;
}
else if (AuthorizeConfiguration
.canCollectionAdminPerformBitstreamCreation())
{
adminObject = collection;
}
else if (AuthorizeConfiguration
.canCommunityAdminPerformBitstreamCreation())
{
adminObject = community;
}
break;
switch (action) {
case Constants.REMOVE:
if (AuthorizeConfiguration.canItemAdminPerformBitstreamDeletion()) {
adminObject = item;
} else if (AuthorizeConfiguration.canCollectionAdminPerformBitstreamDeletion()) {
adminObject = collection;
} else if (AuthorizeConfiguration
.canCommunityAdminPerformBitstreamDeletion()) {
adminObject = community;
}
break;
case Constants.ADD:
if (AuthorizeConfiguration.canItemAdminPerformBitstreamCreation()) {
adminObject = item;
} else if (AuthorizeConfiguration
.canCollectionAdminPerformBitstreamCreation()) {
adminObject = collection;
} else if (AuthorizeConfiguration
.canCommunityAdminPerformBitstreamCreation()) {
adminObject = community;
}
break;
default:
adminObject = bundle;
break;
default:
adminObject = bundle;
break;
}
return adminObject;
}
@@ -388,10 +369,9 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
@Override
public DSpaceObject getParentObject(Context context, Bundle bundle) throws SQLException {
List<Item> items = bundle.getItems();
if(CollectionUtils.isNotEmpty(items))
{
if (CollectionUtils.isNotEmpty(items)) {
return items.iterator().next();
}else{
} else {
return null;
}
}
@@ -403,21 +383,21 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
@Override
public void update(Context context, Bundle bundle) throws SQLException, AuthorizeException {
// Check authorisation
// Check authorisation
//AuthorizeManager.authorizeAction(ourContext, this, Constants.WRITE);
log.info(LogManager.getHeader(context, "update_bundle", "bundle_id="
+ bundle.getID()));
+ bundle.getID()));
super.update(context, bundle);
bundleDAO.save(context, bundle);
if (bundle.isModified() || bundle.isMetadataModified())
{
if(bundle.isMetadataModified()){
context.addEvent(new Event(Event.MODIFY_METADATA, bundle.getType(), bundle.getID(), bundle.getDetails(), getIdentifiers(context, bundle)));
if (bundle.isModified() || bundle.isMetadataModified()) {
if (bundle.isMetadataModified()) {
context.addEvent(new Event(Event.MODIFY_METADATA, bundle.getType(), bundle.getID(), bundle.getDetails(),
getIdentifiers(context, bundle)));
}
context.addEvent(new Event(Event.MODIFY, Constants.BUNDLE, bundle.getID(),
null, getIdentifiers(context, bundle)));
null, getIdentifiers(context, bundle)));
bundle.clearModified();
bundle.clearDetails();
}
@@ -426,12 +406,12 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
@Override
public void delete(Context context, Bundle bundle) throws SQLException, AuthorizeException, IOException {
log.info(LogManager.getHeader(context, "delete_bundle", "bundle_id="
+ bundle.getID()));
+ bundle.getID()));
authorizeService.authorizeAction(context, bundle, Constants.DELETE);
context.addEvent(new Event(Event.DELETE, Constants.BUNDLE, bundle.getID(),
bundle.getName(), getIdentifiers(context, bundle)));
bundle.getName(), getIdentifiers(context, bundle)));
// Remove bitstreams
List<Bitstream> bitstreams = bundle.getBitstreams();
@@ -439,7 +419,7 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
for (Bitstream bitstream : bitstreams) {
removeBitstream(context, bundle, bitstream);
}
List<Item> items = new LinkedList<>(bundle.getItems());
bundle.getItems().clear();
for (Item item : items) {
@@ -457,12 +437,9 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
@Override
public Bundle findByIdOrLegacyId(Context context, String id) throws SQLException {
if(StringUtils.isNumeric(id))
{
if (StringUtils.isNumeric(id)) {
return findByLegacyId(context, Integer.parseInt(id));
}
else
{
} else {
return find(context, UUID.fromString(id));
}
}