hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 22:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/w2p-57159_permission-to-create-relations' into w2p-58898_place-column-calculation-error

Browse Source 
# Conflicts:
#	dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java
#	dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java
This commit is contained in:
Ben Bosman
2019-01-29 09:58:22 +01:00
parent d7610ccf6e 7d961db6ce
commit 7abc5b01e2
10 changed files with 81 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
View File

@@ -247,7 +247,7 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
for (int i = 0; i < values.size(); i++) {
if (authorities != null && authorities.size() >= i) {
if (StringUtils.startsWith(authorities.get(i), "virtual::")) {
if (StringUtils.startsWith(authorities.get(i), Constants.VIRTUAL_AUTHORITY_PREFIX)) {
continue;
}
}
@@ -578,7 +578,7 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
});
for (MetadataValue metadataValue : metadataValues) {
//Retrieve & store the place for each metadata value
if (StringUtils.startsWith(metadataValue.getAuthority(), "virtual::") &&
if (StringUtils.startsWith(metadataValue.getAuthority(), Constants.VIRTUAL_AUTHORITY_PREFIX) &&
((RelationshipMetadataValue) metadataValue).isUseForPlace()) {
int mvPlace = getMetadataValuePlace(fieldToLastPlace, metadataValue);
metadataValue.setPlace(mvPlace);
@@ -592,7 +592,8 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
}
relationshipService.update(context, relationship);
} else if (!StringUtils.startsWith(metadataValue.getAuthority(), "virtual::")) {
} else if (!StringUtils.startsWith(metadataValue.getAuthority(),
Constants.VIRTUAL_AUTHORITY_PREFIX)) {
int mvPlace = getMetadataValuePlace(fieldToLastPlace, metadataValue);
metadataValue.setPlace(mvPlace);
}
@@ -605,7 +606,7 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
*
* @param fieldToLastPlace the map containing the latest place of each metadata field
* @param metadataValue the metadata value that needs to get a place
* @return The new place for the metadata valu
* @return The new place for the metadata value
*/
protected int getMetadataValuePlace(Map<MetadataField, Integer> fieldToLastPlace, MetadataValue metadataValue) {
MetadataField metadataField = metadataValue.getMetadataField();

11
dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
View File

@@ -1415,7 +1415,7 @@ prevent the generation of resource policy entry values with null dspace_object a
RelationshipMetadataValue metadataValue = constructMetadataValue(context,
MetadataSchemaEnum.RELATION
.getName() + "." + relationName);
metadataValue.setAuthority("virtual::" + relationshipId);
metadataValue.setAuthority(Constants.VIRTUAL_AUTHORITY_PREFIX + relationshipId);
metadataValue.setValue(otherItem.getID().toString());
return metadataValue;
}
@@ -1438,7 +1438,7 @@ prevent the generation of resource policy entry values with null dspace_object a
RelationshipMetadataValue metadataValue,
Integer relationshipId) {
metadataValue.setValue(value);
metadataValue.setAuthority("virtual::" + relationshipId);
metadataValue.setAuthority(Constants.VIRTUAL_AUTHORITY_PREFIX + relationshipId);
metadataValue.setConfidence(-1);
metadataValue.setDSpaceObject(item);
return metadataValue;
@@ -1454,10 +1454,9 @@ prevent the generation of resource policy entry values with null dspace_object a
MetadataField metadataField = metadataFieldService
.findByElement(context, metadataSchema, metadataElement, metadataQualifier);
if (metadataField == null) {
log.error(
"A MetadataValue was attempted to construct with MetadataField for paremeters: metadataschema: "
+ metadataSchema + ", metadataelement:" + metadataElement +
", metadataqualifier: " + metadataQualifier);
log.error("A MetadataValue was attempted to construct with MetadataField for parameters: " +
"metadataschema: {}, metadataelement: {}, metadataqualifier: {}",
metadataSchema, metadataElement, metadataQualifier);
return null;
}
metadataValue.setMetadataField(metadataField);

9
dspace-api/src/main/java/org/dspace/content/RelationshipMetadataValue.java
View File

@@ -9,8 +9,17 @@ package org.dspace.content;
import org.hibernate.proxy.HibernateProxyHelper;
/**
* This class is used as a representation of MetadataValues for the MetadataValues that are derived from the
* Relationships that the item has. This includes the useForPlace property which we'll have to use to determine
* whether these Values should be counted for place calculation on both the native MetadataValues and the
* Relationship's place attributes.
*/
public class RelationshipMetadataValue extends MetadataValue {
/**
* This property determines whether this RelationshipMetadataValue should be used in place calculation or not
*/
private boolean useForPlace;
public boolean isUseForPlace() {

1
dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java
View File

@@ -70,6 +70,7 @@ public class RelationshipServiceImpl implements RelationshipService {
}
}
@Override
public void updatePlaceInRelationship(Context context, Relationship relationship, boolean isCreation)
throws SQLException, AuthorizeException {
Item leftItem = relationship.getLeftItem();

13
dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java
View File

@@ -88,8 +88,19 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
RelationshipType relationshipType)
throws SQLException;
/**
* This method will update the place for the Relationship and all other relationships found by the items and
* relationship type of the given Relatonship. It will give this Relationship the last place in both the
* left and right place determined by querying for the list of leftRelationships and rightRelationships
* by the leftItem, rightItem and relationshipType of the given Relationship.
* @param context The relevant DSpace context
* @param relationship The Relationship object that will have it's place updated and that will be used
* to retrieve the other relationships whose place might need to be updated
* @param isCreation Is the relationship new or did it already exist
* @throws SQLException If something goes wrong
*/
public void updatePlaceInRelationship(Context context, Relationship relationship, boolean isCreation)
throws SQLException, AuthorizeException;
throws SQLException, AuthorizeException;
public void updateItem(Context context, Item leftItem) throws SQLException, AuthorizeException;

4
dspace-api/src/main/java/org/dspace/content/virtual/UUIDValue.java
View File

@@ -14,6 +14,10 @@ import java.util.List;
import org.dspace.content.Item;
import org.dspace.core.Context;
/**
* This class is used by the VirtualMetadataPopulator. It will simply take the ID of the item that's passed along
* to this and return that as it's value
*/
public class UUIDValue implements VirtualBean {
private boolean useForPlace;

1
dspace-api/src/main/java/org/dspace/core/Constants.java
View File

@@ -224,6 +224,7 @@ public class Constants {
public static final String DEFAULT_ENCODING = "UTF-8";
public static final String VIRTUAL_AUTHORITY_PREFIX = "virtual::";
/**
* Default constructor
*/

19
dspace-spring-rest/src/main/java/org/dspace/app/rest/RestResourceController.java
View File

@@ -986,6 +986,25 @@ public class RestResourceController implements InitializingBean {
return ControllerUtils.toEmptyResponse(HttpStatus.NO_CONTENT);
}
/**
* Execute a PUT request for an entity with id of type Integer;
*
* curl -X PUT http://<dspace.url>/dspace-spring-rest/api/{apiCategory}/{model}/{id}
*
* Example:
* <pre>
* {@code
* curl -X PUT http://<dspace.url>/dspace-spring-rest/api/core/metadatafield/1
* }
* </pre>
*
* @param request the http request
* @param apiCategory the API category e.g. "api"
* @param model the DSpace model e.g. "collection"
* @param id the ID of the target REST object
* @param jsonNode the part of the request body representing the updated rest object
* @return the relevant REST resource
*/
@RequestMapping(method = RequestMethod.PUT, value = REGEX_REQUESTMAPPING_IDENTIFIER_AS_DIGIT)
public DSpaceResource<RestAddressableModel> put(HttpServletRequest request,
@PathVariable String apiCategory, @PathVariable String model,

24
dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java
View File

@@ -408,6 +408,16 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
throw new RepositoryMethodNotImplementedException("No implementation found; Method not allowed!", "");
}
/**
* Method to support updating a DSpace instance.
*
* @param request the http request
* @param apiCategory the API category e.g. "api"
* @param model the DSpace model e.g. "metadatafield"
* @param id the ID of the target REST object
* @param jsonNode the part of the request body representing the updated rest object
* @return the updated REST object
*/
public T put(HttpServletRequest request, String apiCategory, String model, ID id, JsonNode jsonNode) {
Context context = obtainContext();
try {
@@ -419,6 +429,20 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
return findOne(id);
}
/**
* Implement this method in the subclass to support updating a DSpace instance.
*
* @param context the dspace context
* @param apiCategory the API category e.g. "api"
* @param model the DSpace model e.g. "metadatafield"
* @param id the ID of the target REST object
* @param jsonNode the part of the request body representing the updated rest object
* @return the updated REST object
* @throws AuthorizeException if the context user is not authorized to perform this operation
* @throws SQLException when the database returns an error
* @throws RepositoryMethodNotImplementedException
* returned by the default implementation when the operation is not supported for the entity
*/
protected T put(Context context, HttpServletRequest request, String apiCategory, String model, ID id,
JsonNode jsonNode)
throws RepositoryMethodNotImplementedException, SQLException, AuthorizeException {

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java
View File

@@ -191,7 +191,7 @@ public class RelationshipRestRepository extends DSpaceRestRepository<Relationshi
}
}
} catch (SQLException e) {
log.error(e.getMessage(), e);
log.error("Error deleting Relationship specified by ID:" + id, e);
}
}
}