diff --git a/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorType.java b/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorType.java
index 30460e6..5ad22a7 100644
--- a/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorType.java
+++ b/executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorType.java
@@ -1,7 +1,7 @@
package ch.unisg.executorbase.executor.domain;
public enum ExecutorType {
- COMPUTATION, ROBOT, HUMIDITY;
+ COMPUTATION, SMALLROBOT, HUMIDITY;
/**
* Checks if the give executor type exists.
diff --git a/executor-computation/src/main/java/ch/unisg/executorcomputation/ExecutorcomputationApplication.java b/executor-computation/src/main/java/ch/unisg/executorcomputation/ExecutorcomputationApplication.java
index ea9910a..1ee615d 100644
--- a/executor-computation/src/main/java/ch/unisg/executorcomputation/ExecutorcomputationApplication.java
+++ b/executor-computation/src/main/java/ch/unisg/executorcomputation/ExecutorcomputationApplication.java
@@ -15,14 +15,6 @@ public class ExecutorcomputationApplication {
static Logger logger = Logger.getLogger(ExecutorcomputationApplication.class.getName());
public static void main(String[] args) {
-
- try {
- TimeUnit.SECONDS.sleep(1);
- } catch (InterruptedException e) {
- logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
- Thread.currentThread().interrupt();
- }
-
SpringApplication.run(ExecutorcomputationApplication.class, args);
Executor.getExecutor();
}
diff --git a/executor-robot/pom.xml b/executor-robot/pom.xml
index 570bd18..2fa8a0f 100644
--- a/executor-robot/pom.xml
+++ b/executor-robot/pom.xml
@@ -82,11 +82,10 @@
compile
- com.github.Interactions-HSG
- wot-td-java
- 0.1.1
- compile
-
+ com.github.Interactions-HSG
+ wot-td-java
+ master-SNAPSHOT
+
diff --git a/executor-robot/src/main/java/ch/unisg/executorrobot/ExecutorrobotApplication.java b/executor-robot/src/main/java/ch/unisg/executorrobot/ExecutorrobotApplication.java
index 79a204f..15e2491 100644
--- a/executor-robot/src/main/java/ch/unisg/executorrobot/ExecutorrobotApplication.java
+++ b/executor-robot/src/main/java/ch/unisg/executorrobot/ExecutorrobotApplication.java
@@ -11,14 +11,6 @@ import ch.unisg.executorrobot.executor.domain.Executor;
public class ExecutorrobotApplication {
public static void main(String[] args) {
-
- try {
- TimeUnit.SECONDS.sleep(40);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
SpringApplication.run(ExecutorrobotApplication.class, args);
Executor.getExecutor();
}
diff --git a/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/DeleteUserFromRobotAdapter.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/DeleteUserFromRobotAdapter.java
deleted file mode 100644
index 37b605a..0000000
--- a/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/DeleteUserFromRobotAdapter.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package ch.unisg.executorrobot.executor.adapter.out;
-import java.io.IOException;
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Component;
-
-import ch.unisg.executorrobot.executor.application.port.out.DeleteUserFromRobotPort;
-
-@Component
-@Primary
-public class DeleteUserFromRobotAdapter implements DeleteUserFromRobotPort {
-
- @Override
- public boolean deleteUserFromRobot(String key) {
-
- String url = "https://api.interactions.ics.unisg.ch/leubot1/v1.3.4/user/" + key;
-
- var request = HttpRequest.newBuilder()
- .uri(URI.create(url))
- .header("Content-Type", "application/json")
- .DELETE()
- .build();
-
- var client = HttpClient.newHttpClient();
-
- try {
- var response = client.send(request, HttpResponse.BodyHandlers.ofString());
- System.out.println(response.statusCode());
- return true;
- } catch (IOException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- return false;
- }
-
-}
diff --git a/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/InstructionToRobotAdapter.java b/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/InstructionToRobotAdapter.java
deleted file mode 100644
index 763e530..0000000
--- a/executor-robot/src/main/java/ch/unisg/executorrobot/executor/adapter/out/InstructionToRobotAdapter.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package ch.unisg.executorrobot.executor.adapter.out;
-import java.io.IOException;
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import ch.unisg.ics.interactions.wot.td.ThingDescription;
-import ch.unisg.ics.interactions.wot.td.affordances.ActionAffordance;
-import ch.unisg.ics.interactions.wot.td.affordances.Form;
-import ch.unisg.ics.interactions.wot.td.clients.TDHttpRequest;
-import ch.unisg.ics.interactions.wot.td.clients.TDHttpResponse;
-import ch.unisg.ics.interactions.wot.td.io.TDGraphReader;
-import ch.unisg.ics.interactions.wot.td.schemas.DataSchema;
-import ch.unisg.ics.interactions.wot.td.schemas.ObjectSchema;
-import ch.unisg.ics.interactions.wot.td.schemas.StringSchema;
-import ch.unisg.ics.interactions.wot.td.security.APIKeySecurityScheme;
-import ch.unisg.ics.interactions.wot.td.vocabularies.TD;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Component;
-
-import ch.unisg.executorrobot.executor.application.port.out.InstructionToRobotPort;
-
-@Component
-@Primary
-public class InstructionToRobotAdapter implements InstructionToRobotPort {
-
- @Override
- public boolean instructionToRobot(String key) {
-
- String endpoint = "https://api.interactions.ics.unisg.ch/search/searchEngine";
-
- String input = "@prefix dct: . select ?title where { ?title dct:title 'leubot1' }";
-
- var httpRequest = HttpRequest.newBuilder()
- .uri(URI.create(endpoint))
- .header("Content-Type", "application/json")
- .POST(HttpRequest.BodyPublishers.ofString(input))
- .build();
-
- var client = HttpClient.newHttpClient();
-
- try {
- var description = client.send(httpRequest, HttpResponse.BodyHandlers.ofString()).body();
-
- // Parse a TD from a string
- ThingDescription td = TDGraphReader.readFromString(ThingDescription.TDFormat.RDF_TURTLE, description);
-
- // Create the payload to be sent with the Http request
- Map elbowPayload = new HashMap<>();
- elbowPayload.put("http://www.w3.org/2001/XMLSchema#int", 400);
-
- // Get the affordance "setElbow" from the TD
- Optional action = td.getActionByName("setElbow");
-
- // Get the first form
- if (action.isPresent()) {
- Optional