UI adaptation for supporting ONAP portal SDK

[validation.git] / ui / src / main / java / org / akraino / validation / ui / entity / Timeslot.java

diff --git a/ui/src/main/java/org/akraino/validation/ui/entity/Timeslot.java b/ui/src/main/java/org/akraino/validation/ui/entity/Timeslot.java
index c53fa49..ee23efb 100644 (file)
--- a/ui/src/main/java/org/akraino/validation/ui/entity/Timeslot.java
+++ b/ui/src/main/java/org/akraino/validation/ui/entity/Timeslot.java
@@ -1,17 +1,17 @@
 /*
  * Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 package org.akraino.validation.ui.entity;
 
@@ -22,13 +22,12 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.akraino.validation.ui.data.Lab;
-
 @Entity
-@Table(name = "akraino.timeslot")
+@Table(name = "timeslot")
 public class Timeslot implements Serializable {
 
     /**
@@ -37,19 +36,19 @@ public class Timeslot implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "timeslot_id_generator")
-    @SequenceGenerator(name = "timeslot_id_generator", sequenceName = "akraino.seq_timeslot", allocationSize = 1)
-    @Column(name = "timeslot_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
     private int timeslotId;
 
     @Column(name = "start_date_time")
     private String startDateTime;
 
     @Column(name = "duration")
-    private int duration;
+    private String duration;
 
-    @Column(name = "lab")
-    private Lab lab;
+    @ManyToOne
+    @JoinColumn(name = "lab_id")
+    private LabInfo lab;
 
     public void setTimeslotId(int timeslotId) {
         this.timeslotId = timeslotId;
@@ -67,19 +66,19 @@ public class Timeslot implements Serializable {
         return startDateTime;
     }
 
-    public void setDuration(int duration) {
+    public void setDuration(String duration) {
         this.duration = duration;
     }
 
-    public int getDuration() {
+    public String getDuration() {
         return duration;
     }
 
-    public void setLab(Lab lab) {
+    public void setLab(LabInfo lab) {
         this.lab = lab;
     }
 
-    public Lab getLab() {
+    public LabInfo getLab() {
         return lab;
     }
 }