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

[Task 65568] updated javadoc and comments

Browse Source
This commit is contained in:
Raf Ponsaerts
2019-10-15 13:48:44 +02:00
parent 6c762d52fe
commit b0b886d16f
4 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,7 +250,8 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
} }
} }
MetadataValue metadataValue = metadataValueService.create(context, dso, metadataField); MetadataValue metadataValue = metadataValueService.create(context, dso, metadataField);
//Set place to list length //Set place to list length of all metadatavalues for the given schema.element.qualifier combination.
// Subtract one to adhere to the 0 as first element rule
metadataValue.setPlace( metadataValue.setPlace(
this.getMetadata(dso, metadataField.getMetadataSchema().getName(), metadataField.getElement(), this.getMetadata(dso, metadataField.getMetadataSchema().getName(), metadataField.getElement(),
metadataField.getQualifier(), Item.ANY).size() - 1); metadataField.getQualifier(), Item.ANY).size() - 1);

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

@@ -82,6 +82,8 @@ public class RelationshipServiceImpl implements RelationshipService {
if (isRelationshipValidToCreate(context, relationship)) { if (isRelationshipValidToCreate(context, relationship)) {
if (authorizeService.authorizeActionBoolean(context, relationship.getLeftItem(), Constants.WRITE) || if (authorizeService.authorizeActionBoolean(context, relationship.getLeftItem(), Constants.WRITE) ||
authorizeService.authorizeActionBoolean(context, relationship.getRightItem(), Constants.WRITE)) { authorizeService.authorizeActionBoolean(context, relationship.getRightItem(), Constants.WRITE)) {
// This order of execution should be handled in the creation (create, updateplace, update relationship)
// for a proper place allocation
Relationship relationshipToReturn = relationshipDAO.create(context, relationship); Relationship relationshipToReturn = relationshipDAO.create(context, relationship);
updatePlaceInRelationship(context, relationshipToReturn); updatePlaceInRelationship(context, relationshipToReturn);
update(context, relationshipToReturn); update(context, relationshipToReturn);
@@ -100,6 +102,8 @@ public class RelationshipServiceImpl implements RelationshipService {
public void updatePlaceInRelationship(Context context, Relationship relationship) public void updatePlaceInRelationship(Context context, Relationship relationship)
throws SQLException, AuthorizeException { throws SQLException, AuthorizeException {
Item leftItem = relationship.getLeftItem(); Item leftItem = relationship.getLeftItem();
// Max value is used to ensure that these will get added to the back of the list and thus receive the highest
// (last) place as it's set to a -1 for creation
if (relationship.getLeftPlace() == -1) { if (relationship.getLeftPlace() == -1) {
relationship.setLeftPlace(Integer.MAX_VALUE); relationship.setLeftPlace(Integer.MAX_VALUE);
} }

16
dspace-api/src/main/java/org/dspace/content/dao/RelationshipDAO.java
View File

@@ -37,23 +37,23 @@ public interface RelationshipDAO extends GenericDAO<Relationship> {
List<Relationship> findByItem(Context context,Item item) throws SQLException; List<Relationship> findByItem(Context context,Item item) throws SQLException;
/** /**
* This method returns the highest leftplace integer for all the relationships where this * This method returns the next leftplace integer to use for a relationship with this item as the leftItem
* item is the leftitem so that we can set a proper leftplace attribute on the next relationship *
* @param context The relevant DSpace context * @param context The relevant DSpace context
* @param item The item to be matched on leftItem * @param item The item to be matched on leftItem
* @return The integer for the highest leftPlace value for all the relatonship objects * @return The next integer to be used for the leftplace of a relationship with the given item
* that have the given item as leftItem * as a left item
* @throws SQLException If something goes wrong * @throws SQLException If something goes wrong
*/ */
int findNextLeftPlaceByLeftItem(Context context, Item item) throws SQLException; int findNextLeftPlaceByLeftItem(Context context, Item item) throws SQLException;
/** /**
* This method returns the highest rightplace integer for all the relationships where this * This method returns the next rightplace integer to use for a relationship with this item as the rightItem
* item is the rightitem so that we can set a proper rightplace attribute on the next relationship *
* @param context The relevant DSpace context * @param context The relevant DSpace context
* @param item The item to be matched on rightItem * @param item The item to be matched on rightItem
* @return The integer for the highest rightPlace value for all the relatonship objects * @return The next integer to be used for the rightplace of a relationship with the given item
* that have the given item as rightItem * as a right item
* @throws SQLException If something goes wrong * @throws SQLException If something goes wrong
*/ */
int findNextRightPlaceByRightItem(Context context, Item item) throws SQLException; int findNextRightPlaceByRightItem(Context context, Item item) throws SQLException;

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

@@ -52,23 +52,23 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
public Relationship create(Context context, Relationship relationship) throws SQLException, AuthorizeException; public Relationship create(Context context, Relationship relationship) throws SQLException, AuthorizeException;
/** /**
* Retrieves the highest integer value for the leftplace property of a Relationship for all relationships * This method returns the next leftplace integer to use for a relationship with this item as the leftItem
* that have the given item as a left item *
* @param context The relevant DSpace context * @param context The relevant DSpace context
* @param item The item that has to be the leftItem of a relationship for it to qualify * @param item The item that has to be the leftItem of a relationship for it to qualify
* @return The integer value of the highest left place property of all relationships * @return The next integer to be used for the leftplace of a relationship with the given item
* that have the given item as a leftitem property * as a left item
* @throws SQLException If something goes wrong * @throws SQLException If something goes wrong
*/ */
int findNextLeftPlaceByLeftItem(Context context, Item item) throws SQLException; int findNextLeftPlaceByLeftItem(Context context, Item item) throws SQLException;
/** /**
* Retrieves the highest integer value for the rightplace property of a Relationship for all relationships * This method returns the next rightplace integer to use for a relationship with this item as the rightItem
* that have the given item as a right item *
* @param context The relevant DSpace context * @param context The relevant DSpace context
* @param item The item that has to be the rightitem of a relationship for it to qualify * @param item The item that has to be the rightitem of a relationship for it to qualify
* @return The integer value of the highest right place property of all relationships * @return The next integer to be used for the rightplace of a relationship with the given item
* that have the given item as a rightitem property * as a right item
* @throws SQLException If something goes wrong * @throws SQLException If something goes wrong
*/ */
int findNextRightPlaceByRightItem(Context context, Item item) throws SQLException; int findNextRightPlaceByRightItem(Context context, Item item) throws SQLException;