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

[DS-2779] Fix versioning due to service api

Browse Source
This commit is contained in:
KevinVdV
2015-10-02 12:20:12 +02:00
parent d69f00fe3e
commit 038e2c57c5
9 changed files with 49 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dspace-api/src/main/java/org/dspace/content/DSpaceObject.java
View File

@@ -7,6 +7,7 @@
*/
package org.dspace.content;
import org.apache.commons.collections.CollectionUtils;
import org.dspace.authorize.ResourcePolicy;
import org.dspace.handle.Handle;
import org.hibernate.annotations.GenericGenerator;
@@ -39,8 +40,12 @@ public abstract class DSpaceObject implements Serializable
@OrderBy("metadataField, place")
private List<MetadataValue> metadata = new ArrayList<>();
@OneToOne(fetch = FetchType.LAZY, mappedBy = "dso")
private Handle handle;
@OneToMany(fetch = FetchType.LAZY, mappedBy = "dso")
// Order by is here to ensure that the oldest handle is retrieved first,
// multiple handles are assigned to the latest version of an item the original handle will have the lowest identifier
// This handle is the prefered handle.
@OrderBy("handle_id ASC")
private List<Handle> handles = new ArrayList<>();
@OneToMany(fetch = FetchType.LAZY, mappedBy = "dSpaceObject", cascade={CascadeType.PERSIST}, orphanRemoval = false)
private List<ResourcePolicy> resourcePolicies = new ArrayList<>();
@@ -118,12 +123,21 @@ public abstract class DSpaceObject implements Serializable
*/
public String getHandle()
{
return (handle != null ? handle.getHandle() : null);
return (CollectionUtils.isNotEmpty(handles) ? handles.get(0).getHandle() : null);
}
public void setHandle(Handle handle)
void setHandle(List<Handle> handle)
{
this.handle = handle;
this.handles = handle;
}
public void addHandle(Handle handle)
{
this.handles.add(handle);
}
public List<Handle> getHandles() {
return handles;
}
protected List<MetadataValue> getMetadata() {