From c2fc88cd43aee1a0af1b86c195e25afad086b5eb Mon Sep 17 00:00:00 2001 From: rschoene <rene.schoene@tu-dresden.de> Date: Mon, 6 Jul 2020 17:33:41 +0200 Subject: [PATCH] Updating receiver and sender stubs. Fixed error to not handle YAML correctly. --- ros2rag.receiverstub/build.gradle | 14 +++++++------- .../receiverstub/{Main.java => ReceiverMain.java} | 9 +++++---- ros2rag.senderstub/build.gradle | 11 ++++------- .../senderstub/{Main.java => SenderMain.java} | 2 +- ros2rag.starter/build.gradle | 10 +++++----- 5 files changed, 22 insertions(+), 24 deletions(-) rename ros2rag.receiverstub/src/main/java/de/tudresden/inf/st/ros2rag/receiverstub/{Main.java => ReceiverMain.java} (94%) rename ros2rag.senderstub/src/main/java/de/tudresden/inf/st/ros2rag/senderstub/{Main.java => SenderMain.java} (97%) diff --git a/ros2rag.receiverstub/build.gradle b/ros2rag.receiverstub/build.gradle index 59f2bcc..9602982 100644 --- a/ros2rag.receiverstub/build.gradle +++ b/ros2rag.receiverstub/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.google.protobuf' sourceCompatibility = 1.8 -mainClassName = 'de.tudresden.inf.st.ros2rag.receiverstub.Main' +mainClassName = 'de.tudresden.inf.st.ros2rag.receiverstub.ReceiverMain' repositories { jcenter() @@ -17,16 +17,16 @@ buildscript { } sourceSets.main.java.srcDir "src/gen/java" -jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.ros2rag.receiverstub.Main') +jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.ros2rag.receiverstub.ReceiverMain') dependencies { implementation project(':ros2rag.starter') - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jackson_version}" - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}" - implementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' - implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' - implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' +// implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}" +// implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: "${jackson_version}" +// implementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' +// implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' +// implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' protobuf files("$projectDir/../ros2rag.example/src/main/proto") } diff --git a/ros2rag.receiverstub/src/main/java/de/tudresden/inf/st/ros2rag/receiverstub/Main.java b/ros2rag.receiverstub/src/main/java/de/tudresden/inf/st/ros2rag/receiverstub/ReceiverMain.java similarity index 94% rename from ros2rag.receiverstub/src/main/java/de/tudresden/inf/st/ros2rag/receiverstub/Main.java rename to ros2rag.receiverstub/src/main/java/de/tudresden/inf/st/ros2rag/receiverstub/ReceiverMain.java index 56e0426..54b8458 100644 --- a/ros2rag.receiverstub/src/main/java/de/tudresden/inf/st/ros2rag/receiverstub/Main.java +++ b/ros2rag.receiverstub/src/main/java/de/tudresden/inf/st/ros2rag/receiverstub/ReceiverMain.java @@ -1,6 +1,7 @@ package de.tudresden.inf.st.ros2rag.receiverstub; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.google.protobuf.InvalidProtocolBufferException; import config.Dataconfig.DataConfig; import config.Robotconfig.RobotConfig; @@ -19,14 +20,14 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -public class Main { +public class ReceiverMain { - private static final Logger logger = LogManager.getLogger(Main.class); + private static final Logger logger = LogManager.getLogger(ReceiverMain.class); private String topicPattern; public static void main(String[] args) throws Exception { - Main main = new Main(); - ObjectMapper mapper = new ObjectMapper(); + ReceiverMain main = new ReceiverMain(); + ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); File configFile = new File(args[0]); System.out.println("Using config file: " + configFile.getAbsolutePath()); ActualConfiguration config = mapper.readValue(configFile, DataConfiguration.class).panda_mqtt_connector; diff --git a/ros2rag.senderstub/build.gradle b/ros2rag.senderstub/build.gradle index a7900a9..4de593d 100644 --- a/ros2rag.senderstub/build.gradle +++ b/ros2rag.senderstub/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.google.protobuf' sourceCompatibility = 1.8 -mainClassName = 'de.tudresden.inf.st.ros2rag.senderstub.Main' +mainClassName = 'de.tudresden.inf.st.ros2rag.senderstub.SenderMain' repositories { jcenter() @@ -17,16 +17,13 @@ buildscript { } sourceSets.main.java.srcDir "src/gen/java" -jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.ros2rag.senderstub.Main') +jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.ros2rag.senderstub.SenderMain') dependencies { implementation project(':ros2rag.starter') - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jackson_version}" - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}" - implementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' - implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' - implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' +// implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' +// implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' protobuf files("$projectDir/../ros2rag.example/src/main/proto") } diff --git a/ros2rag.senderstub/src/main/java/de/tudresden/inf/st/ros2rag/senderstub/Main.java b/ros2rag.senderstub/src/main/java/de/tudresden/inf/st/ros2rag/senderstub/SenderMain.java similarity index 97% rename from ros2rag.senderstub/src/main/java/de/tudresden/inf/st/ros2rag/senderstub/Main.java rename to ros2rag.senderstub/src/main/java/de/tudresden/inf/st/ros2rag/senderstub/SenderMain.java index 5beeb15..e518c86 100644 --- a/ros2rag.senderstub/src/main/java/de/tudresden/inf/st/ros2rag/senderstub/Main.java +++ b/ros2rag.senderstub/src/main/java/de/tudresden/inf/st/ros2rag/senderstub/SenderMain.java @@ -5,7 +5,7 @@ import panda.Linkstate; import java.util.concurrent.TimeUnit; -public class Main { +public class SenderMain { public static void main(String[] args) throws Exception { // assume 4 arguments if (args.length < 4) { diff --git a/ros2rag.starter/build.gradle b/ros2rag.starter/build.gradle index b4aec98..748b742 100644 --- a/ros2rag.starter/build.gradle +++ b/ros2rag.starter/build.gradle @@ -28,12 +28,12 @@ jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.ros2rag.starter.Start dependencies { implementation project (':ros2rag.base') baseRuntimeClasspath project (':ros2rag.base') - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jackson_version}" - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}" - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: "${jackson_version}" +// implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jackson_version}" + api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}" + api group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: "${jackson_version}" implementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' - implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' - implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' + api group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' + api group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' jastadd2 "org.jastadd:jastadd:2.3.4" } -- GitLab