From cd2ce77bc8c836be9783b618b186df0d12ce7dac Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Fri, 7 Aug 2020 09:24:38 +0200
Subject: [PATCH] Remove scheme from config for ros2rag applications.
---
.../main/java/de/tudresden/inf/st/ros2rag/common/Util.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/ros2rag.common/src/main/java/de/tudresden/inf/st/ros2rag/common/Util.java b/ros2rag.common/src/main/java/de/tudresden/inf/st/ros2rag/common/Util.java
index a7a9103..5ba5e34 100644
--- a/ros2rag.common/src/main/java/de/tudresden/inf/st/ros2rag/common/Util.java
+++ b/ros2rag.common/src/main/java/de/tudresden/inf/st/ros2rag/common/Util.java
@@ -9,6 +9,7 @@ import de.tudresden.inf.st.ros2rag.common.DataConfiguration.ActualConfiguration;
import java.io.File;
import java.io.IOException;
+import java.net.URI;
import java.util.Map;
import java.util.SortedMap;
@@ -24,7 +25,11 @@ public class Util {
ObjectMapper mapper = new ObjectMapper(
new YAMLFactory().configure(JsonParser.Feature.ALLOW_YAML_COMMENTS, true)
);
- return mapper.readValue(configFile, DataConfiguration.class).panda_mqtt_connector;
+ ActualConfiguration config = mapper.readValue(configFile, DataConfiguration.class).panda_mqtt_connector;
+ URI serverUri = URI.create(config.server);
+ config.server = serverUri.getHost() + ":" + (serverUri.getPort() == -1 ? 1883 : serverUri.getPort())
+ + serverUri.getPath();
+ return config;
}
public static void setMqttHost(SetHost handler, ActualConfiguration config) throws IOException {
--
GitLab