remove @basic

git-svn-id: https://dev.intra.insomnia.fi/svn/trunk@54 8cf89bec-f6a3-4178-919f-364fb3449fe5

code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccessRight.java

@@ -31,10 +31,10 @@ import javax.persistence.Version;
 public class AccessRight implements ModelInterface {
 public class AccessRight implements ModelInterface {
     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 id;
     private Integer id;
-    @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/Bill.java

@@ -38,7 +38,7 @@ public class Bill implements ModelInterface {
 
 
     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 id;
     private Integer id;
     @Column(name = "due_date")
     @Column(name = "due_date")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine.java

@@ -34,19 +34,19 @@ import javax.persistence.Version;
 public class BillLine implements ModelInterface {
 public class BillLine implements ModelInterface {
     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 id;
     private Integer id;
-    @Basic(optional = false)
+    
     @Column(name = "product", nullable = false)
     @Column(name = "product", nullable = false)
     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

@@ -34,13 +34,13 @@ import javax.persistence.Version;
 public class CardTemplate implements ModelInterface {
 public class CardTemplate implements ModelInterface {
     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 id;
     private Integer id;
     @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)
     @Column(name = "template_name", nullable = false)
     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

@@ -43,10 +43,10 @@ import javax.persistence.Version;
 public class Compo implements ModelInterface {
 public class Compo implements ModelInterface {
     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 id;
     private Integer id;
-    @Basic(optional = false)
+    
     @Column(name = "compo_name", nullable = false)
     @Column(name = "compo_name", nullable = false)
     private String compoName;
     private String compoName;
     @Column(name = "compo_start")
     @Column(name = "compo_start")
@@ -64,7 +64,7 @@ public class Compo implements ModelInterface {
     @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

@@ -41,14 +41,14 @@ import javax.persistence.Version;
 public class CompoEntry implements ModelInterface {
 public class CompoEntry implements ModelInterface {
     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 id;
     private Integer id;
-    @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)
     @Column(name = "entry_name", nullable = false)
     private String entryName;
     private String entryName;
     @Column(name = "notes")
     @Column(name = "notes")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile.java

@@ -40,7 +40,7 @@ import javax.persistence.Version;
 public class CompoEntryFile implements ModelInterface {
 public class CompoEntryFile implements ModelInterface {
     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 id;
     private Integer id;
     @Column(name = "mime_type")
     @Column(name = "mime_type")
@@ -56,7 +56,7 @@ public class CompoEntryFile implements ModelInterface {
     @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

@@ -31,7 +31,7 @@ import javax.persistence.Version;
 public class CompoEntryParticipant implements ModelInterface {
 public class CompoEntryParticipant implements ModelInterface {
     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 id;
     private Integer id;
     @Column(name = "role")
     @Column(name = "role")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount.java

@@ -40,29 +40,29 @@ import javax.persistence.Version;
 public class Discount implements ModelInterface {
 public class Discount implements ModelInterface {
     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 id;
     private Integer id;
-    @Basic(optional = false)
+    
     @Column(name = "percentage", nullable = false)
     @Column(name = "percentage", nullable = false)
     private BigInteger percentage;
     private BigInteger percentage;
     @Column(name = "code")
     @Column(name = "code")
     private String code;
     private String code;
     @Column(name = "details")
     @Column(name = "details")
     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

@@ -28,7 +28,7 @@ public class DiscountInstance implements ModelInterface {
 
 
     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 id;
     private Integer id;
     @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

@@ -39,7 +39,7 @@ public class Event implements ModelInterface {
 
 
     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 id;
     private Integer id;
     @Column(name = "start_time")
     @Column(name = "start_time")
@@ -48,7 +48,7 @@ public class Event implements ModelInterface {
     @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)
     @Column(name = "name", nullable = false)
     private String name;
     private String name;
     @Column(name = "referer")
     @Column(name = "referer")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap.java

@@ -34,7 +34,7 @@ public class EventMap implements ModelInterface {
 
 
     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 id;
     private Integer id;
     @Lob
     @Lob

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventSettings.java

@@ -34,7 +34,7 @@ public class EventSettings implements ModelInterface {
 
 
     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 id;
     private Integer id;
     @Column(name = "resource_bundle")
     @Column(name = "resource_bundle")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventStatus.java

@@ -33,10 +33,10 @@ public class EventStatus implements ModelInterface {
 
 
     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 id;
     private Integer id;
-    @Basic(optional = false)
+    
     @Column(name = "status_name", nullable = false)
     @Column(name = "status_name", nullable = false)
     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

@@ -36,10 +36,10 @@ public class FoodWave implements ModelInterface {
 
 
     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 id;
     private Integer id;
-    @Basic(optional = false)
+    
     @Column(name = "wave_name", nullable = false)
     @Column(name = "wave_name", nullable = false)
     private String waveName;
     private String waveName;
     @Column(name = "wave_description")
     @Column(name = "wave_description")
@@ -47,7 +47,7 @@ public class FoodWave implements ModelInterface {
     @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

@@ -31,10 +31,10 @@ public class FoodWaveTemplate implements ModelInterface {
 
 
     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 id;
     private Integer id;
-    @Basic(optional = false)
+    
     @Column(name = "template_name", nullable = false)
     @Column(name = "template_name", nullable = false)
     private String templateName;
     private String templateName;
     @Column(name = "template_description")
     @Column(name = "template_description")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership.java

@@ -37,7 +37,7 @@ public class GroupMembership implements ModelInterface {
 
 
     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 id;
     private Integer id;
     @Column(name = "invite_accepted")
     @Column(name = "invite_accepted")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location.java

@@ -30,10 +30,10 @@ public class Location implements ModelInterface {
 
 
     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 id;
     private Integer id;
-    @Basic(optional = false)
+    
     @Column(name = "location_name", nullable = false)
     @Column(name = "location_name", nullable = false)
     private String locationName;
     private String locationName;
     @OneToMany(mappedBy = "locationsId")
     @OneToMany(mappedBy = "locationsId")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry.java

@@ -34,10 +34,10 @@ public class LogEntry implements ModelInterface {
 
 
     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 id;
     private Integer id;
-    @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

@@ -31,10 +31,10 @@ public class LogEntryType implements ModelInterface {
 
 
     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 id;
     private Integer id;
-    @Basic(optional = false)
+    
     @Column(name = "event_type_description", nullable = false)
     @Column(name = "event_type_description", nullable = false)
     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

@@ -38,10 +38,10 @@ public class News implements ModelInterface {
 
 
     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 id;
     private Integer id;
-    @Basic(optional = false)
+    
     @Column(name = "title", nullable = false)
     @Column(name = "title", nullable = false)
     private String title;
     private String title;
     @Column(name = "body")
     @Column(name = "body")
@@ -54,7 +54,7 @@ public class News implements ModelInterface {
     @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

@@ -35,15 +35,15 @@ public class NewsGroup implements ModelInterface {
 
 
     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 id;
     private Integer id;
-    @Basic(optional = false)
+    
     @Column(name = "group_name", nullable = false)
     @Column(name = "group_name", nullable = false)
     private String groupName;
     private String groupName;
     @Column(name = "group_description")
     @Column(name = "group_description")
     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

@@ -38,7 +38,7 @@ public class Place implements ModelInterface {
 
 
     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 id;
     private Integer id;
     @Column(name = "place_description")
     @Column(name = "place_description")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup.java

@@ -41,14 +41,14 @@ public class PlaceGroup implements ModelInterface {
 
 
     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 id;
     private Integer id;
-    @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 +56,7 @@ public class PlaceGroup implements ModelInterface {
     private String groupCode;
     private String groupCode;
     @Column(name = "group_name")
     @Column(name = "group_name")
     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")
     @Column(name = "group_details")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard.java

@@ -41,19 +41,19 @@ import javax.persistence.Version;
 public class PrintedCard implements ModelInterface {
 public class PrintedCard implements ModelInterface {
     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 id;
     private Integer id;
-    @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")
     @Column(name = "barcode")
     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")
     @Column(name = "rfid_uid")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product.java

@@ -39,15 +39,15 @@ public class Product implements ModelInterface {
 
 
     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 id;
     private Integer id;
     @Column(name = "product_name")
     @Column(name = "product_name")
     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")
     @Column(name = "barcode")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader.java

@@ -34,7 +34,7 @@ public class Reader implements ModelInterface {
 
 
     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 id;
     private Integer id;
     @Column(name = "reader_id")
     @Column(name = "reader_id")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent.java

@@ -35,10 +35,10 @@ public class ReaderEvent implements ModelInterface {
 
 
     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 id;
     private Integer id;
-    @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

@@ -34,10 +34,10 @@ public class Role implements ModelInterface {
 
 
     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 id;
     private Integer id;
-    @Basic(optional = false)
+    
     @Column(name = "role_name", nullable = false)
     @Column(name = "role_name", nullable = false)
     private String roleName;
     private String roleName;
     @OneToMany(mappedBy = "defaultRole")
     @OneToMany(mappedBy = "defaultRole")

code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleInheritance.java

@@ -32,7 +32,7 @@ public class RoleInheritance implements ModelInterface {
 
 
     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 id;
     private Integer id;
     @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

@@ -32,13 +32,13 @@ public class RoleRight implements ModelInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
     @Id
     @Id
-    @Basic(optional = false)
+    
     @Column(name = "role_rights_id", nullable = false)
     @Column(name = "role_rights_id", nullable = false)
     private Integer id;
     private Integer id;
-    @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;
     //TODO: add execute
     //TODO: add execute