[UI] Common class for results

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

diff --git a/ui/src/main/java/org/akraino/validation/ui/entity/BlueprintInstance.java b/ui/src/main/java/org/akraino/validation/ui/entity/BlueprintInstance.java
index 93206db..30722e2 100644 (file)
--- a/ui/src/main/java/org/akraino/validation/ui/entity/BlueprintInstance.java
+++ b/ui/src/main/java/org/akraino/validation/ui/entity/BlueprintInstance.java
@@ -16,22 +16,24 @@
 package org.akraino.validation.ui.entity;
 
 import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
-import org.akraino.validation.ui.data.BlueprintLayer;
-
 @Entity
-@Table(name = "akraino.blueprint_instance")
+@Table(name = "blueprint_instance")
 public class BlueprintInstance implements Serializable {
 
     /**
@@ -40,10 +42,8 @@ public class BlueprintInstance implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "blueprint_instance_id_generator")
-    @SequenceGenerator(name = "blueprint_instance_id_generator", sequenceName = "akraino.seq_blueprint_instance",
-            allocationSize = 1)
-    @Column(name = "blueprint_instance_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
     private int blueprintInstId;
 
     @ManyToOne
@@ -53,15 +53,11 @@ public class BlueprintInstance implements Serializable {
     @Column(name = "version")
     private String version;
 
-    @Column(name = "layer")
-    private BlueprintLayer layer;
-
-    @Column(name = "layer_description")
-    private String layerDescription;
-
-    @OneToOne
-    @JoinColumn(name = "timeslot_id")
-    private Timeslot timeslot;
+    @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @JoinTable(name = "blueprint_instance_blueprint_layer", joinColumns = {
+            @JoinColumn(name = "blueprint_instance_id") }, inverseJoinColumns = {
+                    @JoinColumn(name = "blueprint_layer_id") })
+    private Set<BlueprintLayer> blueprintLayers = new HashSet<>();
 
     public int getBlueprintInstanceId() {
         return blueprintInstId;
@@ -87,28 +83,12 @@ public class BlueprintInstance implements Serializable {
         return version;
     }
 
-    public BlueprintLayer getLayer() {
-        return layer;
-    }
-
-    public void setLayer(BlueprintLayer layer) {
-        this.layer = layer;
-    }
-
-    public void setLayerDescription(String layerDescription) {
-        this.layerDescription = layerDescription;
-    }
-
-    public String getLayerDescription() {
-        return layerDescription;
-    }
-
-    public void setTimeslot(Timeslot timeslot) {
-        this.timeslot = timeslot;
+    public Set<BlueprintLayer> getBlueprintLayers() {
+        return blueprintLayers;
     }
 
-    public Timeslot getTimeslot() {
-        return this.timeslot;
+    public void setBlueprintLayers(Set<BlueprintLayer> blueprintLayers) {
+        this.blueprintLayers = blueprintLayers;
     }
 
 }