Skip to content
Snippets Groups Projects
Commit a11a9053 authored by René Schöne's avatar René Schöne
Browse files

fix path to coordinator config

- address some build warnings
parent 870fb3ac
No related branches found
No related tags found
1 merge request!1Multiple scenes, multiple robots and more
Pipeline #9853 passed
...@@ -28,8 +28,8 @@ public abstract class SharedMainParts<MqttHandler extends SharedMainParts.MqttHa ...@@ -28,8 +28,8 @@ public abstract class SharedMainParts<MqttHandler extends SharedMainParts.MqttHa
private final String TOPIC_EXIT; private final String TOPIC_EXIT;
private final String TOPIC_SCENE_INIT; private final String TOPIC_SCENE_INIT;
private final String TOPIC_SUFFIX_COORDINATOR_STATUS = "status"; private static final String TOPIC_SUFFIX_COORDINATOR_STATUS = "status";
private final String TOPIC_SUFFIX_COORDINATOR_COMMAND = "command"; private static final String TOPIC_SUFFIX_COORDINATOR_COMMAND = "command";
protected MqttHandler mainHandler; protected MqttHandler mainHandler;
protected WorldModel model; protected WorldModel model;
...@@ -193,6 +193,7 @@ public abstract class SharedMainParts<MqttHandler extends SharedMainParts.MqttHa ...@@ -193,6 +193,7 @@ public abstract class SharedMainParts<MqttHandler extends SharedMainParts.MqttHa
SELF setHost(String host) throws java.io.IOException; SELF setHost(String host) throws java.io.IOException;
@SuppressWarnings("UnusedReturnValue")
boolean waitUntilReady(long value, TimeUnit unit); boolean waitUntilReady(long value, TimeUnit unit);
} }
......
...@@ -14,7 +14,9 @@ import java.nio.file.Files; ...@@ -14,7 +14,9 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
/** /**
* Helper method dealing with config. * Helper method dealing with config.
...@@ -58,11 +60,18 @@ public class Util { ...@@ -58,11 +60,18 @@ public class Util {
return pathToModuleDirectory("ros3rag.common"); return pathToModuleDirectory("ros3rag.common");
} }
private final static Set<String> modules = new HashSet<>() {{
add("ros3rag.placeA");
add("ros3rag.placeB");
add("ros3rag.common");
add("ros3rag.coordinator");
}};
public static Path pathToModuleDirectory(String moduleName) { public static Path pathToModuleDirectory(String moduleName) {
Path current = Paths.get("").toAbsolutePath(); Path current = Paths.get("").toAbsolutePath();
String currentFileName = current.getFileName().toString(); String currentFileName = current.getFileName().toString();
Path repoRoot; Path repoRoot;
if (currentFileName.equals("ros3rag.placeA") || currentFileName.equals("ros3rag.placeB") || currentFileName.equals("ros3rag.common")) { if (modules.contains(currentFileName)) {
// we are in some module, use parent // we are in some module, use parent
repoRoot = current.getParent(); repoRoot = current.getParent();
} else if (current.resolve(moduleName).toFile().exists()) { } else if (current.resolve(moduleName).toFile().exists()) {
......
...@@ -29,6 +29,7 @@ dependencies { ...@@ -29,6 +29,7 @@ dependencies {
jastadd2 fileTree(include: ['jastadd2.jar'], dir: '../libs') jastadd2 fileTree(include: ['jastadd2.jar'], dir: '../libs')
api group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' api group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15'
implementation project(':ros3rag.common')
} }
sourceCompatibility = 11 sourceCompatibility = 11
......
...@@ -6,12 +6,12 @@ import de.tudresden.inf.st.coordinator.ast.Coordinator; ...@@ -6,12 +6,12 @@ import de.tudresden.inf.st.coordinator.ast.Coordinator;
import de.tudresden.inf.st.coordinator.ast.MqttHandler; import de.tudresden.inf.st.coordinator.ast.MqttHandler;
import de.tudresden.inf.st.coordinator.parser.CoordinatorParser; import de.tudresden.inf.st.coordinator.parser.CoordinatorParser;
import de.tudresden.inf.st.coordinator.scanner.CoordinatorScanner; import de.tudresden.inf.st.coordinator.scanner.CoordinatorScanner;
import de.tudresden.inf.st.ros3rag.common.Util;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
...@@ -88,7 +88,8 @@ public class MainCoordinator { ...@@ -88,7 +88,8 @@ public class MainCoordinator {
} }
private void parsedBuild() throws IOException, Parser.Exception { private void parsedBuild() throws IOException, Parser.Exception {
Reader in = Files.newBufferedReader(Paths.get("src", "main", "resources", "ros3rag.coordinator")); Reader in = Files.newBufferedReader(Util.pathToModuleDirectory("ros3rag.coordinator")
.resolve("src/main/resources/ros3rag.coordinator"));
CoordinatorScanner scanner = new CoordinatorScanner(in); CoordinatorScanner scanner = new CoordinatorScanner(in);
CoordinatorParser parser = new CoordinatorParser(); CoordinatorParser parser = new CoordinatorParser();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment