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

Merge pull request #1035 from KevinVdV/DS-2728-remove-bundle-bitstream-object

Browse Source 
[DS-2728] Remove the BundleBitstream object & replace by JPA mapping
This commit is contained in:
Kevin Van de Velde
2015-09-23 12:03:20 +02:00
parent 130ecb9a75 97d1a425bb
commit 1582645e6a
93 changed files with 418 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,9 +61,8 @@ public class Bitstream extends DSpaceObject implements DSpaceObjectLegacySupport
@JoinColumn(name = "bitstream_format_id")
private BitstreamFormat bitstreamFormat;
@OneToMany(mappedBy = "bitstream", fetch = FetchType.LAZY)
@OrderBy("bitstreamOrder asc")
private List<BundleBitstream> bundles = new ArrayList<>();
@ManyToMany(fetch = FetchType.LAZY, mappedBy = "bitstreams")
private List<Bundle> bundles = new ArrayList<>();
@OneToOne(fetch = FetchType.LAZY, mappedBy="logo")
private Community community;
@@ -265,12 +264,12 @@ public class Bitstream extends DSpaceObject implements DSpaceObjectLegacySupport
* @return array of <code>Bundle</code> s this bitstream appears in
* @throws SQLException
*/
public List<BundleBitstream> getBundles() throws SQLException
public List<Bundle> getBundles() throws SQLException
{
return bundles;
}
void setBundles(List<BundleBitstream> bundles) {
void setBundles(List<Bundle> bundles) {
this.bundles = bundles;
}