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

fix conflict

Browse Source
This commit is contained in:
Tom Desair
2016-04-07 16:31:10 +02:00
committed by dylan
parent b19189634d
commit 8db0faed33
102 changed files with 665 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dspace-api/src/main/java/org/dspace/eperson/Subscription.java
View File

@@ -9,6 +9,7 @@ package org.dspace.eperson;
import org.dspace.content.Collection;
import org.dspace.core.Context;
import org.dspace.core.ReloadableEntity;
import javax.persistence.*;
@@ -19,13 +20,13 @@ import javax.persistence.*;
*/
@Entity
@Table(name = "subscription")
public class Subscription {
public class Subscription implements ReloadableEntity<Integer> {
@Id
@Column(name = "subscription_id", unique = true, nullable = false)
@GeneratedValue(strategy = GenerationType.SEQUENCE ,generator="subscription_seq")
@SequenceGenerator(name="subscription_seq", sequenceName="subscription_seq", allocationSize = 1)
private int id;
private Integer id;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "collection_id")
@@ -45,7 +46,7 @@ public class Subscription {
}
public int getId() {
public Integer getID() {
return id;
}