Remove CallBackAdress parameter

ITEA3-Measure · Apr 28, 2017 · 5fe02b1 · 5fe02b1
1 parent ee61188
commit 5fe02b1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-target/
+target/
+application.properties
diff --git a/application.properties b/application.properties
@@ -1,4 +1,3 @@
-measure.repository.path=C:/Users/aabherve/Desktop/Platform/storage/repository_remote
+measure.repository.path=C:/work/MEASURE/Platform/storage/repository_remote
 measure.server.adress=localhost:80
-measure.callback.adress=localhost
-measure.agent.name=TestAgent
+measure.agent.name=AABAgent
diff --git a/src/main/java/org/measure/platform/agent/serviceregistrator/PlatformRegistrator.java b/src/main/java/org/measure/platform/agent/serviceregistrator/PlatformRegistrator.java
@@ -24,9 +24,6 @@ public class PlatformRegistrator implements SchedulingConfigurer {
 	@Value("${measure.server.adress}")
 	private String serverAdress;
 
-	@Value("${measure.callback.adress}")
-	private String callbackAdress;
-
 	@Value("${measure.agent.name}")
 	private String agentName;
 
@@ -54,8 +51,6 @@ public void reportCurrentTime() {
 
 	private void registerMeasures(){
 		for (SMMMeasure measure : catalogueService.getAllMeasures()) {
-
-			measure.setCallbackAdress(callbackAdress);
 			measure.setCallbackLable(agentName);
 			measure.setName(measure.getName() + " (" + agentName + ")");
 

diff --git a/src/main/java/org/measure/platform/agent/smmengine/impl/RemoteExecutionService.java b/src/main/java/org/measure/platform/agent/smmengine/impl/RemoteExecutionService.java
@@ -28,9 +28,6 @@ public class RemoteExecutionService implements IRemoteExecutionService {
 	@Value("${measure.server.adress}")
 	private String serverAdress;
 
-	@Value("${measure.callback.adress}")
-	private String callbackAdress;
-
 	@Value("${measure.agent.name}")
 	private String agentName;
 

diff --git a/...java/org/measure/platform/agent/smmengine/impl/sheduller/MeasureSchedulingConfigurer.java b/...java/org/measure/platform/agent/smmengine/impl/sheduller/MeasureSchedulingConfigurer.java
@@ -31,9 +31,6 @@ public class MeasureSchedulingConfigurer implements SchedulingConfigurer {
 	@Value("${measure.server.adress}")
 	private String serverAdress;
 
-	@Value("${measure.callback.adress}")
-	private String callbackAdress;
-
 	@Value("${measure.agent.name}")
 	private String agentName;
 
@@ -63,7 +60,7 @@ public void reportCurrentTime() {
 			System.out.println(url);
 
 			MultiValueMap<String, String> map = new LinkedMultiValueMap<String, String>();
-			map.add("id", callbackAdress);
+			map.add("id", agentName);