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

Refactor PUT endpoint json parsing to make use of objectmapper

Browse Source
This commit is contained in:
Jelle Pelgrims
2019-08-01 15:26:04 +02:00
parent c40dabf9c6
commit 0377e0a605
4 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/content/Relationship.java
View File

@@ -184,7 +184,7 @@ public class Relationship implements ReloadableEntity<Integer> {
/**
* Standard getter for the leftwardLabel String in this Relationship
* @return the leftWardlabel String for this relationship
* @return the leftwardlabel String for this relationship
*/
public String getLeftwardLabel() {
return leftwardLabel;

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

@@ -64,7 +64,7 @@ public class RelationshipServiceImpl implements RelationshipService {
@Override
public Relationship create(Context c, Item leftItem, Item rightItem, RelationshipType relationshipType,
int leftPlace, int rightPlace, String leftWardLabel, String rightWardLabel)
int leftPlace, int rightPlace, String leftwardLabel, String rightwardLabel)
throws AuthorizeException, SQLException {
Relationship relationship = new Relationship();
relationship.setLeftItem(leftItem);
@@ -72,8 +72,8 @@ public class RelationshipServiceImpl implements RelationshipService {
relationship.setRelationshipType(relationshipType);
relationship.setLeftPlace(leftPlace);
relationship.setRightPlace(rightPlace);
relationship.setLeftwardLabel(leftWardLabel);
relationship.setRightwardLabel(rightWardLabel);
relationship.setLeftwardLabel(leftwardLabel);
relationship.setRightwardLabel(rightwardLabel);
return create(c, relationship);
}

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

@@ -134,14 +134,14 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
* @param relationshipType The RelationshipType object for the relationship
* @param leftPlace The leftPlace integer for the relationship
* @param rightPlace The rightPlace integer for the relationship
* @param leftWardLabel The leftWardLabel integer for the relationship
* @param rightWardLabel The rightWardLabel integer for the relationship
* @param leftwardLabel The leftwardLabel integer for the relationship
* @param rightwardLabel The rightwardLabel integer for the relationship
* @return The created Relationship object with the given properties
* @throws AuthorizeException If something goes wrong
* @throws SQLException If something goes wrong
*/
Relationship create(Context c, Item leftItem, Item rightItem, RelationshipType relationshipType,
int leftPlace, int rightPlace, String leftWardLabel, String rightWardLabel)
int leftPlace, int rightPlace, String leftwardLabel, String rightwardLabel)
throws AuthorizeException, SQLException;

49
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java
View File

@@ -7,6 +7,7 @@
*/
package org.dspace.app.rest.repository;
import java.io.IOException;
import java.sql.SQLException;
import java.util.LinkedList;
import java.util.List;
@@ -14,6 +15,7 @@ import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.log4j.Logger;
import org.dspace.app.rest.Parameter;
import org.dspace.app.rest.SearchRestMethod;
@@ -110,14 +112,14 @@ public class RelationshipRestRepository extends DSpaceRestRepository<Relationshi
RelationshipType relationshipType = relationshipTypeService
.find(context, Integer.parseInt(req.getParameter("relationshipType")));
String leftWardLabel = req.getParameter("leftwardLabel");
String rightWardLabel = req.getParameter("rightwardLabel");
String leftwardLabel = req.getParameter("leftwardLabel");
String rightwardLabel = req.getParameter("rightwardLabel");
EPerson ePerson = context.getCurrentUser();
if (authorizeService.authorizeActionBoolean(context, leftItem, Constants.WRITE) ||
authorizeService.authorizeActionBoolean(context, rightItem, Constants.WRITE)) {
Relationship relationship = relationshipService.create(context, leftItem, rightItem,
relationshipType, 0, 0, leftWardLabel, rightWardLabel);
relationshipType, 0, 0, leftwardLabel, rightwardLabel);
// The above if check deals with the case that a Relationship can be created if the user has write
// rights on one of the two items. The following updateItem calls can however call the
// ItemService.update() functions which would fail if the user doesn't have permission on both items.
@@ -231,39 +233,26 @@ public class RelationshipRestRepository extends DSpaceRestRepository<Relationshi
throw new ResourceNotFoundException("Relationship" + " with id: " + id + " not found");
}
Integer leftPlace = null;
Integer rightPlace = null;
String leftwardLabel = null;
String rightwardLabel = null;
if (jsonNode.hasNonNull("leftwardLabel")) {
leftwardLabel = jsonNode.get("leftwardLabel").asText();
}
if (jsonNode.hasNonNull("rightwardLabel")) {
rightwardLabel = jsonNode.get("rightwardLabel").asText();
}
if (jsonNode.hasNonNull("leftPlace")) {
leftPlace = jsonNode.get("leftPlace").asInt();
}
if (jsonNode.hasNonNull("rightPlace")) {
rightPlace = jsonNode.get("rightPlace").asInt();
}
try {
if (leftPlace != null) {
relationship.setLeftPlace(leftPlace);
RelationshipRest relationshipRest;
try {
relationshipRest = new ObjectMapper().readValue(jsonNode.toString(), RelationshipRest.class);
} catch (IOException e) {
throw new UnprocessableEntityException("Error parsing request body: " + e.toString());
}
if (rightPlace != null) {
relationship.setRightPlace(rightPlace);
relationship.setLeftwardLabel(relationshipRest.getLeftwardLabel());
relationship.setRightwardLabel(relationshipRest.getRightwardLabel());
if (jsonNode.hasNonNull("rightPlace")) {
relationship.setRightPlace(relationshipRest.getRightPlace());
}
relationship.setLeftwardLabel(leftwardLabel);
relationship.setRightwardLabel(rightwardLabel);
if (jsonNode.hasNonNull("leftPlace")) {
relationship.setRightPlace(relationshipRest.getLeftPlace());
}
relationshipService.update(context, relationship);
context.commit();