Knowledge Synchronization and Admin REST (#18)

* Updates on the Planning related to Knowledge Synchronization
* Knowledge up to date.

* TMA-Admin-Rest first release

* TMA-Utils update:
-adding resourceId to Score interface
-adding executeBatch to DatabaseManager

* New JMX Probe to monitor Java AppServer apps.

common/tma-utils/src/main/java/eubr/atmosphere/tma/data/MetricData.java

@@ -0,0 +1,22 @@
+package eubr.atmosphere.tma.data;
+
+public class MetricData {
+
+    private int metricId;
+    private long valueTime;
+
+    public int getMetricId() {
+        return metricId;
+    }
+    public void setMetricId(int metricId) {
+        this.metricId = metricId;
+    }
+
+    public long getValueTime() {
+        return valueTime;
+    }
+
+    public void setValueTime(long valueTime) {
+        this.valueTime = valueTime;
+    }
+}

common/tma-utils/src/main/java/eubr/atmosphere/tma/data/Plan.java

@@ -25,7 +25,6 @@ public static STATUS valueOf(int ordinal) {
 
     private Integer planId;
     private int metricId;
-    private int qualityModelId;
     private long valueTime;
     private STATUS status; // TODO: define the possible status in a enum
     private List<ActionPlan> actionList;
@@ -51,14 +50,6 @@ public void setMetricId(int metricId) {
         this.metricId = metricId;
     }
 
-    public int getQualityModelId() {
-        return qualityModelId;
-    }
-
-    public void setQualityModelId(int qualityModelId) {
-        this.qualityModelId = qualityModelId;
-    }
-
     public STATUS getStatus() {
         return status;
     }

common/tma-utils/src/main/java/eubr/atmosphere/tma/utils/DatabaseManager.java

@@ -78,6 +78,29 @@ public static ResultSet executeQuery(PreparedStatement ps) {
         return rs;
     }
 
+    public int execute(PreparedStatement ps) {
+        int key = -1;
+        try {
+            ps.execute();
+            ResultSet generatedKeys = ps.getGeneratedKeys();
+            if (generatedKeys.next()) {
+                key = generatedKeys.getInt(1);
+            }
+        } catch (SQLException e) {
+            LOGGER.error(e.getMessage());
+        }
+        return key;
+    }
+
+    public int[] executeBatch(PreparedStatement ps) {
+        try {
+            return ps.executeBatch();
+        } catch (SQLException e) {
+            LOGGER.error(e.getMessage());
+        }
+        return null;
+    }
+
     public void close() {
         try {
             if (resultSet != null) {
@@ -95,18 +118,4 @@ public void close() {
             LOGGER.error(e.getMessage());
         }
     }
-
-    public int execute(PreparedStatement ps) {
-        int key = -1;
-        try {
-            ps.execute();
-            ResultSet generatedKeys = ps.getGeneratedKeys();
-            if (generatedKeys.next()) {
-                key = generatedKeys.getInt(1);
-            }
-        } catch (SQLException e) {
-            LOGGER.error(e.getMessage());
-        }
-        return key;
-    }
 }

common/tma-utils/src/main/java/eubr/atmosphere/tma/utils/PerformanceScore.java

@@ -16,6 +16,9 @@ public class PerformanceScore implements Score {
     private Double responseTime;
     private Double demand;
     private Double rateRequestUnderContracted;
+    private int metricId;
+    private int resourceId;
+    private long valueTime;
 
     public PerformanceScore() {
         super();
@@ -86,4 +89,31 @@ public Double getScore() {
 
         return this.score;
     }
+
+	@Override
+	public long getValueTime() {
+		return this.valueTime;
+	}
+
+	public void setValueTime(long valueTime) {
+		this.valueTime = valueTime;
+	}
+
+	@Override
+	public int getResourceId() {
+		return this.resourceId;
+	}
+
+	public void setResourceId(int resourceId) {
+		this.resourceId = resourceId;
+	}
+
+	@Override
+	public int getMetricId() {
+		return this.metricId;
+	}
+
+	public void setMetricId(int metricId) {
+		this.metricId = metricId;
+	}
 }

common/tma-utils/src/main/java/eubr/atmosphere/tma/utils/ResourceConsumptionScore.java

@@ -15,6 +15,9 @@ public ResourceConsumptionScore() {
     private Double cpuNode;
     private Double memoryNode;
     private Double score;
+    private int metricId;
+    private int resourceId;
+    private long valueTime;
 
     public Double getCpuPod() {
         return cpuPod;
@@ -79,4 +82,31 @@ public boolean isValid() {
          return this.getCpuNode()!= null && this.getCpuPod()!= null &&
                  this.getMemoryNode()!= null && this.getMemoryPod()!= null;
     }
+
+	@Override
+	public long getValueTime() {
+		return this.valueTime;
+	}
+
+	public void setValueTime(long valueTime) {
+		this.valueTime = valueTime;
+	}
+
+	@Override
+	public int getResourceId() {
+		return this.resourceId;
+	}
+
+	public void setResourceId(int resourceId) {
+		this.resourceId = resourceId;
+	}
+
+	@Override
+	public int getMetricId() {
+		return this.metricId;
+	}
+
+	public void setMetricId(int metricId) {
+		this.metricId = metricId;
+	}
 }

common/tma-utils/src/main/java/eubr/atmosphere/tma/utils/Score.java

@@ -3,4 +3,10 @@
 public interface Score {
 
     public Double getScore();
+
+    public long getValueTime();
+
+    public int getResourceId();
+
+    public int getMetricId();
 }

common/tma-utils/src/main/java/eubr/atmosphere/tma/utils/TrustworthinessScore.java

@@ -6,7 +6,9 @@ public class TrustworthinessScore implements Score {
     private ResourceConsumptionScore resourceConsumptionScore; 
     private PerformanceScore performanceScore;
     private Integer podCount;
-    private long timestamp;
+    private int metricId;
+    private int resourceId;
+    private long valueTime;
 
     public TrustworthinessScore(ResourceConsumptionScore resourceConsumptionPodScore, 
             PerformanceScore performanceScore) {
@@ -23,7 +25,7 @@ public String toString() {
                 + ", resourceConsumptionScore=" + resourceConsumptionScore
                 + ", performanceScore=" + performanceScore
                 + ", podCount=" + podCount
-                + ", timestamp=" + timestamp
+                + ", valueTime=" + valueTime
                 + "]";
     }
 
@@ -51,19 +53,38 @@ public void setPodCount(Integer podCount) {
         this.podCount = podCount;
     }
 
-    public long getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(long timestamp) {
-        this.timestamp = timestamp;
-    }
-
     public ResourceConsumptionScore getResourceConsumptionScore() {
         return this.resourceConsumptionScore;
     }
 
     public PerformanceScore getPerformanceScore() {
         return this.performanceScore;
     }
+
+	@Override
+	public long getValueTime() {
+		return this.valueTime;
+	}
+
+	public void setValueTime(long valueTime) {
+		this.valueTime = valueTime;
+	}
+
+	@Override
+	public int getResourceId() {
+		return this.resourceId;
+	}
+
+	public void setResourceId(int resourceId) {
+		this.resourceId = resourceId;
+	}
+
+	@Override
+	public int getMetricId() {
+		return this.metricId;
+	}
+
+	public void setMetricId(int metricId) {
+		this.metricId = metricId;
+	}
 }