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

[DS-2728] Remove the BundleBitstream object & replace by JPA mapping

Browse Source
This commit is contained in:
KevinVdV
2015-08-27 12:51:28 +02:00
parent f1060aac7b
commit ae19c42a7b
78 changed files with 362 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dspace-api/src/main/java/org/dspace/content/Bundle.java
View File

@@ -40,9 +40,14 @@ public class Bundle extends DSpaceObject implements DSpaceObjectLegacySupport
@JoinColumn(name = "primary_bitstream_id")
private Bitstream primaryBitstream;
@OneToMany(mappedBy = "bundle", fetch = FetchType.LAZY)
@OrderBy("bitstreamOrder asc")
private List<BundleBitstream> bitstreams = new ArrayList<>();
@ManyToMany(fetch = FetchType.LAZY)
@JoinTable(
name="bundle2bitstream",
joinColumns={@JoinColumn(name="bundle_id") },
inverseJoinColumns={@JoinColumn(name="bitstream_id") }
)
@OrderColumn(name="bitstream_order")
private List<Bitstream> bitstreams = new ArrayList<>();
@ManyToMany(fetch = FetchType.LAZY)
@JoinTable(
@@ -122,11 +127,11 @@ public class Bundle extends DSpaceObject implements DSpaceObjectLegacySupport
*
* @return the bitstreams
*/
public List<BundleBitstream> getBitstreams() {
public List<Bitstream> getBitstreams() {
return bitstreams;
}
void addBitstream(BundleBitstream bitstream){
void addBitstream(Bitstream bitstream){
bitstreams.add(bitstream);
}