Merge branch 'get-monitors' into 'proactive-dev'

Change get monitors to get EmsDeploymentRequest class instances

See merge request !131

scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/PAGateway.java

@@ -183,11 +183,11 @@ public class PAGateway {
 
     /**
      *
-     * @return the list of all available monitors
+     * @return the list of all available EMS deployment monitor requests
      */
-    public List<Monitor> getMonitorsList() {
-        return EntityManagerHelper.createQuery("SELECT mon FROM Monitor mon",
-                Monitor.class).getResultList();
+    public List<EmsDeploymentRequest> getMonitorsList() {
+        return EntityManagerHelper.createQuery("SELECT emsdr FROM EmsDeploymentRequest emsdr",
+                                               EmsDeploymentRequest.class).getResultList();
     }
 
 

scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/Monitor.java

-package org.activeeon.morphemic.model;
-
-import lombok.*;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@AllArgsConstructor
-@NoArgsConstructor
-@ToString(callSuper = true)
-@Getter
-@Setter
-@Entity
-@Table(name = "MONITOR")
-public class Monitor implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "MONITOR_ID")
-    private int monitorId;
-}

scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/model/Task.java

@@ -43,10 +43,6 @@ public class Task implements Serializable {
     @Fetch(value = FetchMode.SUBSELECT)
     private List<Port> portsToOpen;
 
-    @OneToMany(fetch = FetchType.EAGER, orphanRemoval = true, cascade = CascadeType.REFRESH)
-    @Fetch(value = FetchMode.SUBSELECT)
-    private List<Monitor> monitors;
-
     @Column(name = "PARENT_TASKS")
     @ElementCollection(targetClass=String.class)
     private List<String> parentTasks;

scheduling-abstraction-layer/src/main/resources/META-INF/persistence.xml

@@ -11,7 +11,6 @@
         <class>org.activeeon.morphemic.model.PACloud</class>
         <class>org.activeeon.morphemic.model.Deployment</class>
         <class>org.activeeon.morphemic.model.Port</class>
-        <class>org.activeeon.morphemic.model.Monitor</class>
         <class>org.activeeon.morphemic.model.Credentials</class>
         <class>org.activeeon.morphemic.model.EmsDeploymentRequest</class>
         <class>org.activeeon.morphemic.model.NodeCandidate</class>