UI adaptation for supporting ONAP portal SDK

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

diff --git a/ui/src/main/java/org/akraino/validation/ui/entity/Submission.java b/ui/src/main/java/org/akraino/validation/ui/entity/Submission.java
index 1d5d157..797343f 100644 (file)
--- a/ui/src/main/java/org/akraino/validation/ui/entity/Submission.java
+++ b/ui/src/main/java/org/akraino/validation/ui/entity/Submission.java
@@ -15,6 +15,8 @@
  */
 package org.akraino.validation.ui.entity;
 
+import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -22,14 +24,13 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 import org.akraino.validation.ui.data.SubmissionStatus;
 
 @Entity
-@Table(name = "akraino.submission")
-public class Submission {
+@Table(name = "submission")
+public class Submission implements Serializable {
 
     /**
      *
@@ -37,9 +38,8 @@ public class Submission {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "submission_id_generator")
-    @SequenceGenerator(name = "submission_id_generator", sequenceName = "akraino.seq_submission", allocationSize = 1)
-    @Column(name = "submission_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
     private int submissionId;
 
     @Column(name = "status")
@@ -52,8 +52,12 @@ public class Submission {
     private String nexusResultUrl;
 
     @ManyToOne
-    @JoinColumn(name = "blueprint_instance_id")
-    private BlueprintInstance blueprintInstance;
+    @JoinColumn(name = "blueprint_instance_for_validation_id")
+    private BlueprintInstanceForValidation blueprintInst;
+
+    @ManyToOne
+    @JoinColumn(name = "timeslot_id")
+    private Timeslot timeslot;
 
     public void setSubmissionId(int submissionId) {
         this.submissionId = submissionId;
@@ -87,12 +91,22 @@ public class Submission {
         this.nexusResultUrl = nexusResultUrl;
     }
 
-    public void setBlueprintInstance(BlueprintInstance blueprintInstance) {
-        this.blueprintInstance = blueprintInstance;
+    public void setBlueprintInstanceForValidation(BlueprintInstanceForValidation blueprintInst) {
+        this.blueprintInst = blueprintInst;
     }
 
-    public BlueprintInstance getBlueprintInstance() {
-        return this.blueprintInstance;
+    public BlueprintInstanceForValidation getBlueprintInstanceForValidation() {
+        return this.blueprintInst;
     }
 
+
+    public void setTimeslot(Timeslot timeslot) {
+        this.timeslot = timeslot;
+    }
+
+    public Timeslot getTimeslot() {
+        return this.timeslot;
+    }
+
+
 }