Skip to content

Codecrew / Moya

Go to a project
Commit aa793e62 by jkj
Options

Removed @Basic() annotations 

git-svn-id: https://dev.intra.insomnia.fi/svn/trunk@46 8cf89bec-f6a3-4178-919f-364fb3449fe5
1 parent 23b32c47
Inline Side-by-side
Showing with 40 additions and 152 deletions
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccessRight.java
...@@ -30,10 +30,8 @@ import javax.persistence.Table; ...@@ -30,10 +30,8 @@ import javax.persistence.Table;
public class AccessRight implements Serializable { public class AccessRight implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "access_rights_id", nullable = false) @Column(name = "access_rights_id", nullable = false)
private Integer accessRightsId; private Integer accessRightsId;
@Basic(optional = false)
@Column(name = "access_right", nullable = false) @Column(name = "access_right", nullable = false)
private String accessRight; private String accessRight;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "accessRightsId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "accessRightsId")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent.java
...@@ -10,7 +10,6 @@ import java.math.BigInteger; ...@@ -10,7 +10,6 @@ import java.math.BigInteger;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -39,16 +38,12 @@ import javax.persistence.TemporalType; ...@@ -39,16 +38,12 @@ import javax.persistence.TemporalType;
public class AccountEvent implements Serializable { public class AccountEvent implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "account_events_id", nullable = false) @Column(name = "account_events_id", nullable = false)
private Integer accountEventsId; private Integer accountEventsId;
@Basic(optional = false)
@Column(name = "unit_price", nullable = false) @Column(name = "unit_price", nullable = false)
private BigInteger unitPrice; private BigInteger unitPrice;
@Basic(optional = false)
@Column(name = "unit_count", nullable = false) @Column(name = "unit_count", nullable = false)
private int unitCount; private int unitCount;
@Basic(optional = false)
@Column(name = "event_time", nullable = false) @Column(name = "event_time", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date eventTime; private Date eventTime;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill.java
...@@ -8,7 +8,6 @@ import java.io.Serializable; ...@@ -8,7 +8,6 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -22,23 +21,22 @@ import javax.persistence.Temporal; ...@@ -22,23 +21,22 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
/** /**
* *
* @author jkj * @author jkj
*/ */
@Entity @Entity
@Table(name = "bills") @Table(name = "bills")
@NamedQueries({ @NamedQueries( {
@NamedQuery(name = "Bill.findAll", query = "SELECT b FROM Bill b"), @NamedQuery(name = "Bill.findAll", query = "SELECT b FROM Bill b"),
@NamedQuery(name = "Bill.findByBillsId", query = "SELECT b FROM Bill b WHERE b.billsId = :billsId"), @NamedQuery(name = "Bill.findByBillsId", query = "SELECT b FROM Bill b WHERE b.billsId = :billsId"),
@NamedQuery(name = "Bill.findByDueDate", query = "SELECT b FROM Bill b WHERE b.dueDate = :dueDate"), @NamedQuery(name = "Bill.findByDueDate", query = "SELECT b FROM Bill b WHERE b.dueDate = :dueDate"),
@NamedQuery(name = "Bill.findByPaidDate", query = "SELECT b FROM Bill b WHERE b.paidDate = :paidDate"), @NamedQuery(name = "Bill.findByPaidDate", query = "SELECT b FROM Bill b WHERE b.paidDate = :paidDate"),
@NamedQuery(name = "Bill.findByReferenceNumber", query = "SELECT b FROM Bill b WHERE b.referenceNumber = :referenceNumber"), @NamedQuery(name = "Bill.findByReferenceNumber", query = "SELECT b FROM Bill b WHERE b.referenceNumber = :referenceNumber"),
@NamedQuery(name = "Bill.findByNotes", query = "SELECT b FROM Bill b WHERE b.notes = :notes")}) @NamedQuery(name = "Bill.findByNotes", query = "SELECT b FROM Bill b WHERE b.notes = :notes") })
public class Bill implements Serializable { public class Bill implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "bills_id", nullable = false) @Column(name = "bills_id", nullable = false)
private Integer billsId; private Integer billsId;
@Column(name = "due_date") @Column(name = "due_date")
...@@ -64,95 +62,97 @@ public class Bill implements Serializable { ...@@ -64,95 +62,97 @@ public class Bill implements Serializable {
} }
public Bill(Integer billsId) { public Bill(Integer billsId) {
this.billsId = billsId; this.billsId = billsId;
} }
public Integer getBillsId() { public Integer getBillsId() {
return billsId; return billsId;
} }
public void setBillsId(Integer billsId) { public void setBillsId(Integer billsId) {
this.billsId = billsId; this.billsId = billsId;
} }
public Date getDueDate() { public Date getDueDate() {
return dueDate; return dueDate;
} }
public void setDueDate(Date dueDate) { public void setDueDate(Date dueDate) {
this.dueDate = dueDate; this.dueDate = dueDate;
} }
public Date getPaidDate() { public Date getPaidDate() {
return paidDate; return paidDate;
} }
public void setPaidDate(Date paidDate) { public void setPaidDate(Date paidDate) {
this.paidDate = paidDate; this.paidDate = paidDate;
} }
public String getReferenceNumber() { public String getReferenceNumber() {
return referenceNumber; return referenceNumber;
} }
public void setReferenceNumber(String referenceNumber) { public void setReferenceNumber(String referenceNumber) {
this.referenceNumber = referenceNumber; this.referenceNumber = referenceNumber;
} }
public String getNotes() { public String getNotes() {
return notes; return notes;
} }
public void setNotes(String notes) { public void setNotes(String notes) {
this.notes = notes; this.notes = notes;
} }
public List<BillLine> getBillLineList() { public List<BillLine> getBillLineList() {
return billLineList; return billLineList;
} }
public void setBillLineList(List<BillLine> billLineList) { public void setBillLineList(List<BillLine> billLineList) {
this.billLineList = billLineList; this.billLineList = billLineList;
} }
public AccountEvent getAccoutEventsId() { public AccountEvent getAccoutEventsId() {
return accoutEventsId; return accoutEventsId;
} }
public void setAccoutEventsId(AccountEvent accoutEventsId) { public void setAccoutEventsId(AccountEvent accoutEventsId) {
this.accoutEventsId = accoutEventsId; this.accoutEventsId = accoutEventsId;
} }
public User getUsersId() { public User getUsersId() {
return usersId; return usersId;
} }
public void setUsersId(User usersId) { public void setUsersId(User usersId) {
this.usersId = usersId; this.usersId = usersId;
} }
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 0; int hash = 0;
hash += (billsId != null ? billsId.hashCode() : 0); hash += (billsId != null ? billsId.hashCode() : 0);
return hash; return hash;
} }
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
if (!(object instanceof Bill)) { // not set
return false; if (!(object instanceof Bill)) {
} return false;
Bill other = (Bill) object; }
if ((this.billsId == null && other.billsId != null) || (this.billsId != null && !this.billsId.equals(other.billsId))) { Bill other = (Bill) object;
return false; if ((this.billsId == null && other.billsId != null)
} || (this.billsId != null && !this.billsId.equals(other.billsId))) {
return true; return false;
}
return true;
} }
@Override @Override
public String toString() { public String toString() {
return "fi.insomnia.bortal.model.Bill[billsId=" + billsId + "]"; return "fi.insomnia.bortal.model.Bill[billsId=" + billsId + "]";
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine.java
...@@ -7,7 +7,6 @@ package fi.insomnia.bortal.model; ...@@ -7,7 +7,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -33,19 +32,14 @@ import javax.persistence.Table; ...@@ -33,19 +32,14 @@ import javax.persistence.Table;
public class BillLine implements Serializable { public class BillLine implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "bill_lines_id", nullable = false) @Column(name = "bill_lines_id", nullable = false)
private Integer billLinesId; private Integer billLinesId;
@Basic(optional = false)
@Column(name = "product", nullable = false, length = 2147483647) @Column(name = "product", nullable = false, length = 2147483647)
private String product; private String product;
@Basic(optional = false)
@Column(name = "units", nullable = false) @Column(name = "units", nullable = false)
private int units; private int units;
@Basic(optional = false)
@Column(name = "unit_price", nullable = false) @Column(name = "unit_price", nullable = false)
private float unitPrice; private float unitPrice;
@Basic(optional = false)
@Column(name = "vat", nullable = false) @Column(name = "vat", nullable = false)
private float vat; private float vat;
@JoinColumn(name = "bills_id", referencedColumnName = "bills_id") @JoinColumn(name = "bills_id", referencedColumnName = "bills_id")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -33,13 +32,11 @@ import javax.persistence.Table; ...@@ -33,13 +32,11 @@ import javax.persistence.Table;
public class CardTemplate implements Serializable { public class CardTemplate implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "card_templates_id", nullable = false) @Column(name = "card_templates_id", nullable = false)
private Integer cardTemplatesId; private Integer cardTemplatesId;
@Lob @Lob
@Column(name = "template_image") @Column(name = "template_image")
private byte[] templateImage; private byte[] templateImage;
@Basic(optional = false)
@Column(name = "template_name", nullable = false, length = 2147483647) @Column(name = "template_name", nullable = false, length = 2147483647)
private String templateName; private String templateName;
@JoinColumn(name = "events_id", referencedColumnName = "events_id") @JoinColumn(name = "events_id", referencedColumnName = "events_id")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo.java
...@@ -9,7 +9,6 @@ import java.io.Serializable; ...@@ -9,7 +9,6 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -42,10 +41,8 @@ import javax.persistence.TemporalType; ...@@ -42,10 +41,8 @@ import javax.persistence.TemporalType;
public class Compo implements Serializable { public class Compo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "compos_id", nullable = false) @Column(name = "compos_id", nullable = false)
private Integer composId; private Integer composId;
@Basic(optional = false)
@Column(name = "compo_name", nullable = false, length = 2147483647) @Column(name = "compo_name", nullable = false, length = 2147483647)
private String compoName; private String compoName;
@Column(name = "compo_start") @Column(name = "compo_start")
...@@ -63,7 +60,6 @@ public class Compo implements Serializable { ...@@ -63,7 +60,6 @@ public class Compo implements Serializable {
@Column(name = "submit_end") @Column(name = "submit_end")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date submitEnd; private Date submitEnd;
@Basic(optional = false)
@Column(name = "hold_voting", nullable = false) @Column(name = "hold_voting", nullable = false)
private boolean holdVoting; private boolean holdVoting;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "composId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "composId")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry.java
...@@ -9,7 +9,6 @@ import java.io.Serializable; ...@@ -9,7 +9,6 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -40,14 +39,11 @@ import javax.persistence.TemporalType; ...@@ -40,14 +39,11 @@ import javax.persistence.TemporalType;
public class CompoEntry implements Serializable { public class CompoEntry implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "entries_id", nullable = false) @Column(name = "entries_id", nullable = false)
private Integer entriesId; private Integer entriesId;
@Basic(optional = false)
@Column(name = "entry_created", nullable = false) @Column(name = "entry_created", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date entryCreated; private Date entryCreated;
@Basic(optional = false)
@Column(name = "entry_name", nullable = false, length = 2147483647) @Column(name = "entry_name", nullable = false, length = 2147483647)
private String entryName; private String entryName;
@Column(name = "notes", length = 2147483647) @Column(name = "notes", length = 2147483647)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -39,7 +38,6 @@ import javax.persistence.TemporalType; ...@@ -39,7 +38,6 @@ import javax.persistence.TemporalType;
public class CompoEntryFile implements Serializable { public class CompoEntryFile implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "entry_files_id", nullable = false) @Column(name = "entry_files_id", nullable = false)
private Integer entryFilesId; private Integer entryFilesId;
@Column(name = "mime_type", length = 2147483647) @Column(name = "mime_type", length = 2147483647)
...@@ -55,7 +53,6 @@ public class CompoEntryFile implements Serializable { ...@@ -55,7 +53,6 @@ public class CompoEntryFile implements Serializable {
@Lob @Lob
@Column(name = "file_data") @Column(name = "file_data")
private byte[] fileData; private byte[] fileData;
@Basic(optional = false)
@Column(name = "uploaded", nullable = false) @Column(name = "uploaded", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date uploaded; private Date uploaded;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant.java
...@@ -7,7 +7,6 @@ package fi.insomnia.bortal.model; ...@@ -7,7 +7,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -30,7 +29,6 @@ import javax.persistence.Table; ...@@ -30,7 +29,6 @@ import javax.persistence.Table;
public class CompoEntryParticipant implements Serializable { public class CompoEntryParticipant implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "entry_participations_id", nullable = false) @Column(name = "entry_participations_id", nullable = false)
private Integer entryParticipationsId; private Integer entryParticipationsId;
@Column(name = "role", length = 2147483647) @Column(name = "role", length = 2147483647)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount.java
...@@ -9,7 +9,6 @@ import java.io.Serializable; ...@@ -9,7 +9,6 @@ import java.io.Serializable;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -39,29 +38,22 @@ import javax.persistence.Table; ...@@ -39,29 +38,22 @@ import javax.persistence.Table;
public class Discount implements Serializable { public class Discount implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "discounts_id", nullable = false) @Column(name = "discounts_id", nullable = false)
private Integer discountsId; private Integer discountsId;
@Basic(optional = false)
@Column(name = "percentage", nullable = false) @Column(name = "percentage", nullable = false)
private BigInteger percentage; private BigInteger percentage;
@Column(name = "code", length = 2147483647) @Column(name = "code", length = 2147483647)
private String code; private String code;
@Column(name = "details", length = 2147483647) @Column(name = "details", length = 2147483647)
private String details; private String details;
@Basic(optional = false)
@Column(name = "amount_min", nullable = false) @Column(name = "amount_min", nullable = false)
private int amountMin; private int amountMin;
@Basic(optional = false)
@Column(name = "amount_max", nullable = false) @Column(name = "amount_max", nullable = false)
private int amountMax; private int amountMax;
@Basic(optional = false)
@Column(name = "active", nullable = false) @Column(name = "active", nullable = false)
private boolean active; private boolean active;
@Basic(optional = false)
@Column(name = "max_num", nullable = false) @Column(name = "max_num", nullable = false)
private int maxNum; private int maxNum;
@Basic(optional = false)
@Column(name = "per_user", nullable = false) @Column(name = "per_user", nullable = false)
private int perUser; private int perUser;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "discountsId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "discountsId")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance.java
...@@ -7,7 +7,6 @@ package fi.insomnia.bortal.model; ...@@ -7,7 +7,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -29,7 +28,6 @@ import javax.persistence.Table; ...@@ -29,7 +28,6 @@ import javax.persistence.Table;
public class DiscountInstance implements Serializable { public class DiscountInstance implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "discounts_instances_id", nullable = false) @Column(name = "discounts_instances_id", nullable = false)
private Integer discountsInstancesId; private Integer discountsInstancesId;
@JoinColumn(name = "account_events_id", referencedColumnName = "account_events_id") @JoinColumn(name = "account_events_id", referencedColumnName = "account_events_id")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Event.java
...@@ -9,7 +9,6 @@ import java.io.Serializable; ...@@ -9,7 +9,6 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -39,7 +38,6 @@ import javax.persistence.TemporalType; ...@@ -39,7 +38,6 @@ import javax.persistence.TemporalType;
public class Event implements Serializable { public class Event implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "events_id", nullable = false) @Column(name = "events_id", nullable = false)
private Integer eventsId; private Integer eventsId;
@Column(name = "start_time") @Column(name = "start_time")
...@@ -48,7 +46,6 @@ public class Event implements Serializable { ...@@ -48,7 +46,6 @@ public class Event implements Serializable {
@Column(name = "end_time") @Column(name = "end_time")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date endTime; private Date endTime;
@Basic(optional = false)
@Column(name = "name", nullable = false, length = 2147483647) @Column(name = "name", nullable = false, length = 2147483647)
private String name; private String name;
@Column(name = "referer", length = 2147483647) @Column(name = "referer", length = 2147483647)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -34,7 +33,6 @@ import javax.persistence.Table; ...@@ -34,7 +33,6 @@ import javax.persistence.Table;
public class EventMap implements Serializable { public class EventMap implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "maps_id", nullable = false) @Column(name = "maps_id", nullable = false)
private Integer mapsId; private Integer mapsId;
@Lob @Lob
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventSettings.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -34,7 +33,6 @@ import javax.persistence.Table; ...@@ -34,7 +33,6 @@ import javax.persistence.Table;
public class EventSettings implements Serializable { public class EventSettings implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "event_settings_id", nullable = false) @Column(name = "event_settings_id", nullable = false)
private Integer eventSettingsId; private Integer eventSettingsId;
@Column(name = "resource_bundle", length = 2147483647) @Column(name = "resource_bundle", length = 2147483647)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventStatus.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -32,10 +31,8 @@ import javax.persistence.UniqueConstraint; ...@@ -32,10 +31,8 @@ import javax.persistence.UniqueConstraint;
public class EventStatus implements Serializable { public class EventStatus implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "event_status_id", nullable = false) @Column(name = "event_status_id", nullable = false)
private Integer eventStatusId; private Integer eventStatusId;
@Basic(optional = false)
@Column(name = "status_name", nullable = false, length = 2147483647) @Column(name = "status_name", nullable = false, length = 2147483647)
private String statusName; private String statusName;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "eventStatusId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "eventStatusId")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java
...@@ -9,7 +9,6 @@ import java.io.Serializable; ...@@ -9,7 +9,6 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -36,10 +35,8 @@ import javax.persistence.TemporalType; ...@@ -36,10 +35,8 @@ import javax.persistence.TemporalType;
public class FoodWave implements Serializable { public class FoodWave implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "food_waves_id", nullable = false) @Column(name = "food_waves_id", nullable = false)
private Integer foodWavesId; private Integer foodWavesId;
@Basic(optional = false)
@Column(name = "wave_name", nullable = false, length = 2147483647) @Column(name = "wave_name", nullable = false, length = 2147483647)
private String waveName; private String waveName;
@Column(name = "wave_description", length = 2147483647) @Column(name = "wave_description", length = 2147483647)
...@@ -47,7 +44,6 @@ public class FoodWave implements Serializable { ...@@ -47,7 +44,6 @@ public class FoodWave implements Serializable {
@Column(name = "wave_time") @Column(name = "wave_time")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date waveTime; private Date waveTime;
@Basic(optional = false)
@Column(name = "wave_closed", nullable = false) @Column(name = "wave_closed", nullable = false)
private boolean waveClosed; private boolean waveClosed;
@OneToMany(mappedBy = "foodWavesId") @OneToMany(mappedBy = "foodWavesId")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -31,10 +30,8 @@ import javax.persistence.Table; ...@@ -31,10 +30,8 @@ import javax.persistence.Table;
public class FoodWaveTemplate implements Serializable { public class FoodWaveTemplate implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "food_wave_templates_id", nullable = false) @Column(name = "food_wave_templates_id", nullable = false)
private Integer foodWaveTemplatesId; private Integer foodWaveTemplatesId;
@Basic(optional = false)
@Column(name = "template_name", nullable = false, length = 2147483647) @Column(name = "template_name", nullable = false, length = 2147483647)
private String templateName; private String templateName;
@Column(name = "template_description", length = 2147483647) @Column(name = "template_description", length = 2147483647)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -37,7 +36,6 @@ import javax.persistence.UniqueConstraint; ...@@ -37,7 +36,6 @@ import javax.persistence.UniqueConstraint;
public class GroupMembership implements Serializable { public class GroupMembership implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "group_memberships_id", nullable = false) @Column(name = "group_memberships_id", nullable = false)
private Integer groupMembershipsId; private Integer groupMembershipsId;
@Column(name = "invite_accepted") @Column(name = "invite_accepted")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location.java
...@@ -30,10 +30,8 @@ import javax.persistence.Table; ...@@ -30,10 +30,8 @@ import javax.persistence.Table;
public class Location implements Serializable { public class Location implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "locations_id", nullable = false) @Column(name = "locations_id", nullable = false)
private Integer locationsId; private Integer locationsId;
@Basic(optional = false)
@Column(name = "location_name", nullable = false, length = 2147483647) @Column(name = "location_name", nullable = false, length = 2147483647)
private String locationName; private String locationName;
@OneToMany(mappedBy = "locationsId") @OneToMany(mappedBy = "locationsId")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -34,10 +33,8 @@ import javax.persistence.TemporalType; ...@@ -34,10 +33,8 @@ import javax.persistence.TemporalType;
public class LogEntry implements Serializable { public class LogEntry implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "event_log_id", nullable = false) @Column(name = "event_log_id", nullable = false)
private Integer eventLogId; private Integer eventLogId;
@Basic(optional = false)
@Column(name = "event_time", nullable = false) @Column(name = "event_time", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date eventTime; private Date eventTime;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntryType.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -31,10 +30,8 @@ import javax.persistence.Table; ...@@ -31,10 +30,8 @@ import javax.persistence.Table;
public class LogEntryType implements Serializable { public class LogEntryType implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "event_log_types_id", nullable = false) @Column(name = "event_log_types_id", nullable = false)
private Integer eventLogTypesId; private Integer eventLogTypesId;
@Basic(optional = false)
@Column(name = "event_type_description", nullable = false, length = 2147483647) @Column(name = "event_type_description", nullable = false, length = 2147483647)
private String eventTypeDescription; private String eventTypeDescription;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "eventLogTypesId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "eventLogTypesId")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/News.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -38,10 +37,8 @@ import javax.persistence.TemporalType; ...@@ -38,10 +37,8 @@ import javax.persistence.TemporalType;
public class News implements Serializable { public class News implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "news_id", nullable = false) @Column(name = "news_id", nullable = false)
private Integer newsId; private Integer newsId;
@Basic(optional = false)
@Column(name = "title", nullable = false, length = 2147483647) @Column(name = "title", nullable = false, length = 2147483647)
private String title; private String title;
@Column(name = "body", length = 2147483647) @Column(name = "body", length = 2147483647)
...@@ -54,7 +51,6 @@ public class News implements Serializable { ...@@ -54,7 +51,6 @@ public class News implements Serializable {
@Column(name = "expire") @Column(name = "expire")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date expire; private Date expire;
@Basic(optional = false)
@Column(name = "priority", nullable = false) @Column(name = "priority", nullable = false)
private int priority; private int priority;
@JoinColumn(name = "news_groups_id", referencedColumnName = "news_groups_id", nullable = false) @JoinColumn(name = "news_groups_id", referencedColumnName = "news_groups_id", nullable = false)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -35,15 +34,12 @@ import javax.persistence.Table; ...@@ -35,15 +34,12 @@ import javax.persistence.Table;
public class NewsGroup implements Serializable { public class NewsGroup implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "news_groups_id", nullable = false) @Column(name = "news_groups_id", nullable = false)
private Integer newsGroupsId; private Integer newsGroupsId;
@Basic(optional = false)
@Column(name = "group_name", nullable = false, length = 2147483647) @Column(name = "group_name", nullable = false, length = 2147483647)
private String groupName; private String groupName;
@Column(name = "group_description", length = 2147483647) @Column(name = "group_description", length = 2147483647)
private String groupDescription; private String groupDescription;
@Basic(optional = false)
@Column(name = "priority", nullable = false) @Column(name = "priority", nullable = false)
private int priority; private int priority;
@JoinColumn(name = "access_rights_id", referencedColumnName = "access_rights_id", nullable = false) @JoinColumn(name = "access_rights_id", referencedColumnName = "access_rights_id", nullable = false)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -38,7 +37,6 @@ import javax.persistence.Table; ...@@ -38,7 +37,6 @@ import javax.persistence.Table;
public class Place implements Serializable { public class Place implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "places_id", nullable = false) @Column(name = "places_id", nullable = false)
private Integer placesId; private Integer placesId;
@Column(name = "place_description", length = 2147483647) @Column(name = "place_description", length = 2147483647)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup.java
...@@ -9,7 +9,6 @@ import java.io.Serializable; ...@@ -9,7 +9,6 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -41,14 +40,11 @@ import javax.persistence.TemporalType; ...@@ -41,14 +40,11 @@ import javax.persistence.TemporalType;
public class PlaceGroup implements Serializable { public class PlaceGroup implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "groups_id", nullable = false) @Column(name = "groups_id", nullable = false)
private Integer groupsId; private Integer groupsId;
@Basic(optional = false)
@Column(name = "group_created", nullable = false) @Column(name = "group_created", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date groupCreated; private Date groupCreated;
@Basic(optional = false)
@Column(name = "group_edited", nullable = false) @Column(name = "group_edited", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date groupEdited; private Date groupEdited;
...@@ -56,7 +52,6 @@ public class PlaceGroup implements Serializable { ...@@ -56,7 +52,6 @@ public class PlaceGroup implements Serializable {
private String groupCode; private String groupCode;
@Column(name = "group_name", length = 2147483647) @Column(name = "group_name", length = 2147483647)
private String groupName; private String groupName;
@Basic(optional = false)
@Column(name = "group_active", nullable = false) @Column(name = "group_active", nullable = false)
private boolean groupActive; private boolean groupActive;
@Column(name = "group_details", length = 2147483647) @Column(name = "group_details", length = 2147483647)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard.java
...@@ -9,7 +9,6 @@ import java.io.Serializable; ...@@ -9,7 +9,6 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -40,19 +39,15 @@ import javax.persistence.TemporalType; ...@@ -40,19 +39,15 @@ import javax.persistence.TemporalType;
public class PrintedCard implements Serializable { public class PrintedCard implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "printed_cards_id", nullable = false) @Column(name = "printed_cards_id", nullable = false)
private Integer printedCardsId; private Integer printedCardsId;
@Basic(optional = false)
@Column(name = "event_roles_types_id", nullable = false) @Column(name = "event_roles_types_id", nullable = false)
private int eventRolesTypesId; private int eventRolesTypesId;
@Basic(optional = false)
@Column(name = "print_time", nullable = false) @Column(name = "print_time", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date printTime; private Date printTime;
@Column(name = "barcode", length = 2147483647) @Column(name = "barcode", length = 2147483647)
private String barcode; private String barcode;
@Basic(optional = false)
@Column(name = "card_enabled", nullable = false) @Column(name = "card_enabled", nullable = false)
private boolean cardEnabled; private boolean cardEnabled;
@Column(name = "rfid_uid", length = 2147483647) @Column(name = "rfid_uid", length = 2147483647)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product.java
...@@ -9,7 +9,6 @@ import java.io.Serializable; ...@@ -9,7 +9,6 @@ import java.io.Serializable;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -38,15 +37,12 @@ import javax.persistence.Table; ...@@ -38,15 +37,12 @@ import javax.persistence.Table;
public class Product implements Serializable { public class Product implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "products_id", nullable = false) @Column(name = "products_id", nullable = false)
private Integer productsId; private Integer productsId;
@Column(name = "product_name", length = 2147483647) @Column(name = "product_name", length = 2147483647)
private String productName; private String productName;
@Basic(optional = false)
@Column(name = "price", nullable = false) @Column(name = "price", nullable = false)
private BigInteger price; private BigInteger price;
@Basic(optional = false)
@Column(name = "sort", nullable = false) @Column(name = "sort", nullable = false)
private int sort; private int sort;
@Column(name = "barcode", length = 2147483647) @Column(name = "barcode", length = 2147483647)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -34,7 +33,6 @@ import javax.persistence.Table; ...@@ -34,7 +33,6 @@ import javax.persistence.Table;
public class Reader implements Serializable { public class Reader implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "readers_id", nullable = false) @Column(name = "readers_id", nullable = false)
private Integer readersId; private Integer readersId;
@Column(name = "reader_id", length = 2147483647) @Column(name = "reader_id", length = 2147483647)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -34,10 +33,8 @@ import javax.persistence.TemporalType; ...@@ -34,10 +33,8 @@ import javax.persistence.TemporalType;
public class ReaderEvent implements Serializable { public class ReaderEvent implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "reader_events_id", nullable = false) @Column(name = "reader_events_id", nullable = false)
private Integer readerEventsId; private Integer readerEventsId;
@Basic(optional = false)
@Column(name = "event_time", nullable = false) @Column(name = "event_time", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date eventTime; private Date eventTime;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role.java
...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model; ...@@ -8,7 +8,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -33,10 +32,8 @@ import javax.persistence.Table; ...@@ -33,10 +32,8 @@ import javax.persistence.Table;
public class Role implements Serializable { public class Role implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "roles_id", nullable = false) @Column(name = "roles_id", nullable = false)
private Integer rolesId; private Integer rolesId;
@Basic(optional = false)
@Column(name = "role_name", nullable = false, length = 2147483647) @Column(name = "role_name", nullable = false, length = 2147483647)
private String roleName; private String roleName;
@OneToMany(mappedBy = "defaultRole") @OneToMany(mappedBy = "defaultRole")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleInheritance.java
...@@ -31,7 +31,6 @@ import javax.persistence.UniqueConstraint; ...@@ -31,7 +31,6 @@ import javax.persistence.UniqueConstraint;
public class RoleInheritance implements Serializable { public class RoleInheritance implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "role_inheritance_id", nullable = false) @Column(name = "role_inheritance_id", nullable = false)
private Integer roleInheritanceId; private Integer roleInheritanceId;
@JoinColumn(name = "roles_id", referencedColumnName = "roles_id", nullable = false) @JoinColumn(name = "roles_id", referencedColumnName = "roles_id", nullable = false)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleMembership.java
...@@ -31,7 +31,6 @@ import javax.persistence.UniqueConstraint; ...@@ -31,7 +31,6 @@ import javax.persistence.UniqueConstraint;
public class RoleMembership implements Serializable { public class RoleMembership implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "role_memberships_id", nullable = false) @Column(name = "role_memberships_id", nullable = false)
private Integer roleMembershipsId; private Integer roleMembershipsId;
@JoinColumn(name = "roles_id", referencedColumnName = "roles_id", nullable = false) @JoinColumn(name = "roles_id", referencedColumnName = "roles_id", nullable = false)
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleRight.java
...@@ -7,7 +7,6 @@ package fi.insomnia.bortal.model; ...@@ -7,7 +7,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -31,13 +30,10 @@ import javax.persistence.Table; ...@@ -31,13 +30,10 @@ import javax.persistence.Table;
public class RoleRight implements Serializable { public class RoleRight implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "role_rights", nullable = false) @Column(name = "role_rights", nullable = false)
private Integer roleRights; private Integer roleRights;
@Basic(optional = false)
@Column(name = "read", nullable = false) @Column(name = "read", nullable = false)
private boolean read; private boolean read;
@Basic(optional = false)
@Column(name = "write", nullable = false) @Column(name = "write", nullable = false)
private boolean write; private boolean write;
@JoinColumn(name = "access_rights_id", referencedColumnName = "access_rights_id") @JoinColumn(name = "access_rights_id", referencedColumnName = "access_rights_id")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User.java
...@@ -9,7 +9,6 @@ import java.io.Serializable; ...@@ -9,7 +9,6 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -49,22 +48,17 @@ import javax.persistence.TemporalType; ...@@ -49,22 +48,17 @@ import javax.persistence.TemporalType;
public class User implements Serializable { public class User implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "users_id", nullable = false) @Column(name = "users_id", nullable = false)
private Integer usersId; private Integer usersId;
@Basic(optional = false)
@Column(name = "created", nullable = false) @Column(name = "created", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date created; private Date created;
@Basic(optional = false)
@Column(name = "active", nullable = false) @Column(name = "active", nullable = false)
private boolean active; private boolean active;
@Column(name = "password", length = 2147483647) @Column(name = "password", length = 2147483647)
private String password; private String password;
@Basic(optional = false)
@Column(name = "lastname", nullable = false, length = 2147483647) @Column(name = "lastname", nullable = false, length = 2147483647)
private String lastname; private String lastname;
@Basic(optional = false)
@Column(name = "firstnames", nullable = false, length = 2147483647) @Column(name = "firstnames", nullable = false, length = 2147483647)
private String firstnames; private String firstnames;
@Column(name = "birthday") @Column(name = "birthday")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage.java
...@@ -7,7 +7,6 @@ package fi.insomnia.bortal.model; ...@@ -7,7 +7,6 @@ package fi.insomnia.bortal.model;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
...@@ -33,7 +32,6 @@ import javax.persistence.Table; ...@@ -33,7 +32,6 @@ import javax.persistence.Table;
public class UserImage implements Serializable { public class UserImage implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "user_images_id", nullable = false) @Column(name = "user_images_id", nullable = false)
private Integer userImagesId; private Integer userImagesId;
@Column(name = "name", length = 2147483647) @Column(name = "name", length = 2147483647)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!