fix communication issue with measure platform

Author: aabherve

application.properties

@@ -1,3 +1,3 @@
-measure.repository.path=C:/work/MEASURE/Platform/storage/repository_remote
-measure.server.adress=localhost:8085
-measure.agent.name=TestAgent(AAB)
+measure.repository.path=C:/Users/aabherve/Desktop/MeasureAgent/storage
+measure.server.adress=194.2.241.244/measure
+measure.agent.name=Modelio Internal

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.measure.platform</groupId>
 	<artifactId>measure-agent</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0</version>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -29,11 +29,11 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.measure.smmmeasure.api</groupId>
-			<artifactId>SMMMeasureApi</artifactId>
-			<version>0.4.00</version>
-		</dependency>
+        <dependency>
+            <groupId>org.measure.smmmeasure.api</groupId>
+            <artifactId>SMMMeasureApi</artifactId>
+            <version>0.6.01</version>
+        </dependency>
 
 		<dependency>
 			<groupId>commons-io</groupId>
@@ -55,6 +55,12 @@
 			<version>1</version>
 		</dependency>
 
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>8.0.8-dmr</version>
+		</dependency>
+
 	</dependencies>
 
 	<properties>
@@ -77,9 +83,9 @@
 			<url>https://repo.spring.io/libs-release</url>
 		</repository>
 		<repository>
-                         <id>Modelio</id>
-                         <url>http://repository.modelio.org/</url>
-               </repository>
+			<id>Modelio</id>
+			<url>http://repository.modelio.org/</url>
+		</repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>

src/main/java/org/measure/platform/agent/repository/impl/MeasureCatalogueService.java

@@ -38,9 +38,11 @@ public List<SMMMeasure> getAllMeasures() {
 		List<SMMMeasure> result = new ArrayList<SMMMeasure>();
 		try {
 			File repository = new File(measurePath);
-			for (File file : repository.listFiles()) {
-				result.add(MeasurePackager.getMeasureData(file.toPath().resolve(MeasurePackager.MEATADATAFILE)));
-			}
+			if(repository.exists()){
+				for (File file : repository.listFiles()) {
+					result.add(MeasurePackager.getMeasureData(file.toPath().resolve(MeasurePackager.MEATADATAFILE)));
+				}
+			}		
 		} catch (JAXBException | IOException e) {
 			log.error(e.getLocalizedMessage());
 		}

src/main/java/org/measure/platform/agent/smmengine/impl/RemoteExecutionService.java

@@ -1,5 +1,6 @@
 package org.measure.platform.agent.smmengine.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -14,6 +15,7 @@
 import org.measure.smm.log.MeasureLog;
 import org.measure.smm.measure.api.IDirectMeasure;
 import org.measure.smm.measure.api.IMeasurement;
+import org.measure.smm.measure.defaultimpl.measurements.DefaultMeasurement;
 import org.measure.smm.remote.RemoteMeasureInstance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,7 +41,8 @@ public MeasureLog executeMeasure(RemoteMeasureInstance measureData, IDirectMeasu
 		MeasureLog executionLog = new MeasureLog();
 
 		executionLog.setMeasureInstanceName(measureData.getInstanceName());
-		executionLog.setMeasureName(measureData.getMeasureName());
+		String measureName = measureData.getMeasureName().replace(" ("+agentName+")", "");
+		executionLog.setMeasureName(measureName);
 		executionLog.setMeasureInstanceId(measureData.getMeasureId());
 
 		try {
@@ -51,6 +54,17 @@ public MeasureLog executeMeasure(RemoteMeasureInstance measureData, IDirectMeasu
 
 				Date start = new Date();
 				List<IMeasurement> measurements = measure.getMeasurement();
+				
+				
+				List<DefaultMeasurement> defaultMeasurements = new ArrayList<>();
+				for (IMeasurement measirement : measurements) {
+					DefaultMeasurement newDef = new DefaultMeasurement();
+				
+					for(Entry<String,Object> entry : measirement.getValues().entrySet()){
+						newDef.addValue(entry.getKey(), entry.getValue());
+					}
+					defaultMeasurements.add(newDef);
+				}
 
 				for (String key : ollProperties.keySet()) {
 					if (ollProperties.get(key) != null && !ollProperties.get(key).equals(measure.getProperties().get(key))) {
@@ -60,7 +74,7 @@ public MeasureLog executeMeasure(RemoteMeasureInstance measureData, IDirectMeasu
 
 				executionLog.setExectionDate(new Date());
 				executionLog.setExecutionTime(new Date().getTime() - start.getTime());
-				executionLog.setMesurement(measurements);
+				executionLog.setMesurement(defaultMeasurements);
 				executionLog.setSuccess(true);
 
 				// Store Updated Properties

src/main/java/org/measure/platform/agent/smmengine/impl/sheduller/SchedulingService.java

@@ -1,7 +1,6 @@
 package org.measure.platform.agent.smmengine.impl.sheduller;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ScheduledFuture;
@@ -10,13 +9,11 @@
 import javax.inject.Inject;
 
 import org.measure.platform.agent.repository.api.IMeasureCatalogueService;
-import org.measure.platform.agent.serviceregistrator.PlatformRegistrator;
 import org.measure.platform.agent.smmengine.api.IRemoteExecutionService;
 import org.measure.platform.agent.smmengine.api.IShedulingService;
 import org.measure.platform.agent.smmengine.impl.RemoteExecutionService;
 import org.measure.smm.log.MeasureLog;
 import org.measure.smm.measure.api.IDirectMeasure;
-import org.measure.smm.measure.api.IMeasure;
 import org.measure.smm.remote.RemoteMeasureInstance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;