This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch 2903-feat-add-data-sink-for-ros
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to
refs/heads/2903-feat-add-data-sink-for-ros by this push:
new eaca398050 feat(#2903): Add ROS data sink, add new connectors-ros
module
eaca398050 is described below
commit eaca3980507b482fdf9d26471dc4ada8f883dd96
Author: Dominik Riemer <[email protected]>
AuthorDate: Tue May 28 11:08:16 2024 +0200
feat(#2903): Add ROS data sink, add new connectors-ros module
---
streampipes-extensions/pom.xml | 1 +
.../streampipes-connect-adapters-iiot/pom.xml | 4 -
.../iiot/IIoTAdaptersExtensionModuleExport.java | 7 +-
.../pom.xml | 50 +++--------
.../connectors/ros/RosConnectorsModuleExport.java} | 32 +++----
.../connectors/ros/adapter}/RosBridgeAdapter.java | 44 ++++-----
.../connectors/ros/config/RosConfig.java | 43 +++++++++
.../migrations/RosBridgeAdapterMigrationV1.java | 9 +-
.../connectors/ros/sink/RosBridgeSink.java | 100 +++++++++++++++++++++
.../documentation.md | 0
.../icon.png | Bin
.../strings.en | 0
.../documentation.md | 8 +-
.../icon.png | Bin 0 -> 7079 bytes
.../strings.en | 10 +--
.../RosBridgeAdapterMigrationV1Test.java | 11 ++-
.../config/RosBridgeAdapterVersionedConfig.java | 22 ++---
.../streampipes-extensions-all-iiot/pom.xml | 5 ++
.../extensions/all/iiot/AllExtensionsIIoTInit.java | 2 +
.../streampipes-extensions-all-jvm/pom.xml | 5 ++
.../extensions/all/jvm/AllExtensionsInit.java | 2 +
21 files changed, 224 insertions(+), 131 deletions(-)
diff --git a/streampipes-extensions/pom.xml b/streampipes-extensions/pom.xml
index 49308f36d8..6b83199ed7 100644
--- a/streampipes-extensions/pom.xml
+++ b/streampipes-extensions/pom.xml
@@ -63,6 +63,7 @@
<module>streampipes-sinks-notifications-jvm</module>
<module>streampipes-connectors-plc</module>
<module>streampipes-extensions-iiot-minimal</module>
+ <module>streampipes-connectors-ros</module>
</modules>
<properties>
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
b/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
index 57c845a710..972d37d963 100644
--- a/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
@@ -56,10 +56,6 @@
</dependency>
<!-- External dependencies -->
- <dependency>
- <groupId>edu.wpi.rail</groupId>
- <artifactId>jrosbridge</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/IIoTAdaptersExtensionModuleExport.java
b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/IIoTAdaptersExtensionModuleExport.java
index 99b4ccbca7..ef2f44b7ec 100644
---
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/IIoTAdaptersExtensionModuleExport.java
+++
b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/IIoTAdaptersExtensionModuleExport.java
@@ -19,9 +19,7 @@
package org.apache.streampipes.connect.iiot;
import org.apache.streampipes.connect.iiot.adapters.iolink.IfmAlMqttAdapter;
-import
org.apache.streampipes.connect.iiot.adapters.migrations.RosBridgeAdapterMigrationV1;
import org.apache.streampipes.connect.iiot.adapters.oi4.Oi4Adapter;
-import org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter;
import
org.apache.streampipes.connect.iiot.adapters.simulator.machine.MachineDataSimulatorAdapter;
import org.apache.streampipes.connect.iiot.protocol.stream.FileReplayAdapter;
import org.apache.streampipes.connect.iiot.protocol.stream.HttpServerProtocol;
@@ -42,7 +40,6 @@ public class IIoTAdaptersExtensionModuleExport implements
IExtensionModuleExport
new FileReplayAdapter(),
new IfmAlMqttAdapter(),
new Oi4Adapter(),
- new RosBridgeAdapter(),
new HttpStreamProtocol(),
new HttpServerProtocol()
);
@@ -55,8 +52,6 @@ public class IIoTAdaptersExtensionModuleExport implements
IExtensionModuleExport
@Override
public List<IModelMigrator<?, ?>> migrators() {
- return List.of(
- new RosBridgeAdapterMigrationV1()
- );
+ return List.of();
}
}
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
b/streampipes-extensions/streampipes-connectors-ros/pom.xml
similarity index 57%
copy from streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
copy to streampipes-extensions/streampipes-connectors-ros/pom.xml
index 57c845a710..36946add5c 100644
--- a/streampipes-extensions/streampipes-connect-adapters-iiot/pom.xml
+++ b/streampipes-extensions/streampipes-connectors-ros/pom.xml
@@ -17,61 +17,45 @@
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-extensions</artifactId>
<version>0.97.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>streampipes-connect-adapters-iiot</artifactId>
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- </properties>
+ <artifactId>streampipes-connectors-ros</artifactId>
<dependencies>
- <!-- StreamPipes dependencies -->
<dependency>
<groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-connectors-mqtt</artifactId>
+ <artifactId>streampipes-extensions-api</artifactId>
<version>0.97.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-pipeline-elements-shared</artifactId>
+ <artifactId>streampipes-extensions-management</artifactId>
<version>0.97.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-client</artifactId>
+ <artifactId>streampipes-sdk</artifactId>
<version>0.97.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
- <artifactId>streampipes-service-extensions</artifactId>
+ <artifactId>streampipes-messaging</artifactId>
<version>0.97.0-SNAPSHOT</version>
</dependency>
- <!-- External dependencies -->
<dependency>
<groupId>edu.wpi.rail</groupId>
<artifactId>jrosbridge</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>fluent-hc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
<!-- Test dependencies -->
<dependency>
@@ -84,20 +68,8 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+
+
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <propertyExpansion>
-
checkstyle.config.base.path=${project.parent.parent.basedir}/tools/maven
- </propertyExpansion>
- </configuration>
- </plugin>
- </plugins>
- <finalName>streampipes-connect-adapters-iiot</finalName>
- </build>
</project>
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/IIoTAdaptersExtensionModuleExport.java
b/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/RosConnectorsModuleExport.java
similarity index 55%
copy from
streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/IIoTAdaptersExtensionModuleExport.java
copy to
streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/RosConnectorsModuleExport.java
index 99b4ccbca7..c2ab04b5f9 100644
---
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/IIoTAdaptersExtensionModuleExport.java
+++
b/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/RosConnectorsModuleExport.java
@@ -16,47 +16,35 @@
*
*/
-package org.apache.streampipes.connect.iiot;
+package org.apache.streampipes.connectors.ros;
-import org.apache.streampipes.connect.iiot.adapters.iolink.IfmAlMqttAdapter;
-import
org.apache.streampipes.connect.iiot.adapters.migrations.RosBridgeAdapterMigrationV1;
-import org.apache.streampipes.connect.iiot.adapters.oi4.Oi4Adapter;
-import org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter;
-import
org.apache.streampipes.connect.iiot.adapters.simulator.machine.MachineDataSimulatorAdapter;
-import org.apache.streampipes.connect.iiot.protocol.stream.FileReplayAdapter;
-import org.apache.streampipes.connect.iiot.protocol.stream.HttpServerProtocol;
-import org.apache.streampipes.connect.iiot.protocol.stream.HttpStreamProtocol;
+import org.apache.streampipes.connectors.ros.adapter.RosBridgeAdapter;
+import
org.apache.streampipes.connectors.ros.migrations.RosBridgeAdapterMigrationV1;
+import org.apache.streampipes.connectors.ros.sink.RosBridgeSink;
import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
import org.apache.streampipes.extensions.api.declarer.IExtensionModuleExport;
import org.apache.streampipes.extensions.api.migration.IModelMigrator;
import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
-import java.util.Collections;
import java.util.List;
-public class IIoTAdaptersExtensionModuleExport implements
IExtensionModuleExport {
+public class RosConnectorsModuleExport implements IExtensionModuleExport {
@Override
public List<StreamPipesAdapter> adapters() {
return List.of(
- new MachineDataSimulatorAdapter(),
- new FileReplayAdapter(),
- new IfmAlMqttAdapter(),
- new Oi4Adapter(),
- new RosBridgeAdapter(),
- new HttpStreamProtocol(),
- new HttpServerProtocol()
+ new RosBridgeAdapter()
);
}
@Override
public List<IStreamPipesPipelineElement<?>> pipelineElements() {
- return Collections.emptyList();
+ return List.of(
+ new RosBridgeSink()
+ );
}
@Override
public List<IModelMigrator<?, ?>> migrators() {
- return List.of(
- new RosBridgeAdapterMigrationV1()
- );
+ return List.of(new RosBridgeAdapterMigrationV1());
}
}
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/ros/RosBridgeAdapter.java
b/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/adapter/RosBridgeAdapter.java
similarity index 85%
rename from
streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/ros/RosBridgeAdapter.java
rename to
streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/adapter/RosBridgeAdapter.java
index 9ff1d9ecb2..8f825815d6 100644
---
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/ros/RosBridgeAdapter.java
+++
b/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/adapter/RosBridgeAdapter.java
@@ -16,10 +16,11 @@
*
*/
-package org.apache.streampipes.connect.iiot.adapters.ros;
+package org.apache.streampipes.connectors.ros.adapter;
import org.apache.streampipes.commons.exceptions.connect.AdapterException;
+import org.apache.streampipes.connectors.ros.config.RosConfig;
import org.apache.streampipes.extensions.api.connect.IAdapterConfiguration;
import org.apache.streampipes.extensions.api.connect.IEventCollector;
import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
@@ -31,11 +32,11 @@ import
org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOp
import
org.apache.streampipes.extensions.management.connect.adapter.parser.ParserUtils;
import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.guess.GuessSchema;
+import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.model.staticproperty.Option;
import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
import org.apache.streampipes.sdk.helpers.Labels;
import org.apache.streampipes.sdk.helpers.Locales;
-import org.apache.streampipes.sdk.utils.Assets;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -56,19 +57,18 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import static
org.apache.streampipes.connectors.ros.config.RosConfig.ROS_HOST_KEY;
+import static
org.apache.streampipes.connectors.ros.config.RosConfig.ROS_PORT_KEY;
+import static org.apache.streampipes.connectors.ros.config.RosConfig.TOPIC_KEY;
+
public class RosBridgeAdapter implements StreamPipesAdapter,
ResolvesContainerProvidedOptions {
public static final String ID =
"org.apache.streampipes.connect.iiot.adapters.ros";
- public static final String ROS_HOST_KEY = "ROS_HOST_KEY";
- public static final String ROS_PORT_KEY = "ROS_PORT_KEY";
- public static final String TOPIC_KEY = "TOPIC_KEY";
-
private String topic;
private String host;
private int port;
-
private final ObjectMapper mapper = new ObjectMapper();
private Ros ros;
@@ -94,7 +94,7 @@ public class RosBridgeAdapter implements StreamPipesAdapter,
ResolvesContainerPr
public IAdapterConfiguration declareConfig() {
return AdapterConfigurationBuilder.create(ID, 1, RosBridgeAdapter::new)
.withLocales(Locales.EN)
- .withAssets(Assets.DOCUMENTATION, Assets.ICON)
+ .withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withCategory(AdapterType.Manufacturing)
.requiredTextParameter(Labels.withId(ROS_HOST_KEY))
.requiredIntegerParameter(Labels.withId(ROS_PORT_KEY))
@@ -111,10 +111,10 @@ public class RosBridgeAdapter implements
StreamPipesAdapter, ResolvesContainerPr
this.ros = new Ros(this.host, this.port);
this.ros.connect();
- String topicType = getMethodType(this.ros, this.topic);
+ String topicType = RosConfig.getMethodType(this.ros, this.topic);
- Topic echoBack = new Topic(ros, this.topic, topicType);
- echoBack.subscribe(message -> {
+ Topic rosTopic = new Topic(ros, this.topic, topicType);
+ rosTopic.subscribe(message -> {
try {
Map<String, Object> result = mapper.readValue(message.toString(),
HashMap.class);
collector.collect(result);
@@ -144,17 +144,17 @@ public class RosBridgeAdapter implements
StreamPipesAdapter, ResolvesContainerPr
throw new AdapterException("Could not connect to ROS bridge Endpoint: "
+ host + " with port: " + port);
}
- String topicType = getMethodType(ros, topic);
+ String topicType = RosConfig.getMethodType(ros, topic);
GetNEvents getNEvents = new GetNEvents(topic, topicType, ros);
Thread t = new Thread(getNEvents);
t.start();
- while (getNEvents.getEvents().size() < 1) {
+ while (getNEvents.getEvents().isEmpty()) {
try {
TimeUnit.MILLISECONDS.sleep(100);
} catch (InterruptedException e) {
- e.printStackTrace();
+ throw new AdapterException(e.getMessage(), e);
}
}
@@ -171,7 +171,7 @@ public class RosBridgeAdapter implements
StreamPipesAdapter, ResolvesContainerPr
}
}
- private class GetNEvents implements Runnable {
+ private static class GetNEvents implements Runnable {
private final String topic;
private final String topicType;
@@ -188,8 +188,8 @@ public class RosBridgeAdapter implements
StreamPipesAdapter, ResolvesContainerPr
@Override
public void run() {
- Topic echoBack = new Topic(ros, this.topic, topicType);
- echoBack.subscribe(message -> events.add(message.toString()));
+ Topic rosTopic = new Topic(ros, this.topic, topicType);
+ rosTopic.subscribe(message -> events.add(message.toString()));
}
public List<String> getEvents() {
@@ -197,15 +197,6 @@ public class RosBridgeAdapter implements
StreamPipesAdapter, ResolvesContainerPr
}
}
- private String getMethodType(Ros ros, String topic) {
- Service addTwoInts = new Service(ros, "/rosapi/topic_type",
"rosapi/TopicType");
- ServiceRequest request = new ServiceRequest("{\"topic\": \"" + topic +
"\"}");
- ServiceResponse response = addTwoInts.callServiceAndWait(request);
-
- JsonObject ob = new
JsonParser().parse(response.toString()).getAsJsonObject();
- return ob.get("type").getAsString();
- }
-
private void getConfigurations(IStaticPropertyExtractor extractor) {
this.host = extractor.singleValueParameter(ROS_HOST_KEY, String.class);
this.topic = extractor.selectedSingleValue(TOPIC_KEY, String.class);
@@ -229,6 +220,5 @@ public class RosBridgeAdapter implements
StreamPipesAdapter, ResolvesContainerPr
}
return result;
-
}
}
diff --git
a/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/config/RosConfig.java
b/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/config/RosConfig.java
new file mode 100644
index 0000000000..ba4ed24d5f
--- /dev/null
+++
b/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/config/RosConfig.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.connectors.ros.config;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import edu.wpi.rail.jrosbridge.Ros;
+import edu.wpi.rail.jrosbridge.Service;
+import edu.wpi.rail.jrosbridge.services.ServiceRequest;
+import edu.wpi.rail.jrosbridge.services.ServiceResponse;
+
+public class RosConfig {
+
+ public static final String ROS_HOST_KEY = "ROS_HOST_KEY";
+ public static final String ROS_PORT_KEY = "ROS_PORT_KEY";
+ public static final String TOPIC_KEY = "TOPIC_KEY";
+
+
+ public static String getMethodType(Ros ros, String topic) {
+ Service addTwoInts = new Service(ros, "/rosapi/topic_type",
"rosapi/TopicType");
+ ServiceRequest request = new ServiceRequest("{\"topic\": \"" + topic +
"\"}");
+ ServiceResponse response = addTwoInts.callServiceAndWait(request);
+
+ JsonObject ob = new
JsonParser().parse(response.toString()).getAsJsonObject();
+ return ob.get("type").getAsString();
+ }
+}
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/migrations/RosBridgeAdapterMigrationV1.java
b/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/migrations/RosBridgeAdapterMigrationV1.java
similarity index 92%
rename from
streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/migrations/RosBridgeAdapterMigrationV1.java
rename to
streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/migrations/RosBridgeAdapterMigrationV1.java
index 3d41e7fbf5..893f720899 100644
---
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/migrations/RosBridgeAdapterMigrationV1.java
+++
b/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/migrations/RosBridgeAdapterMigrationV1.java
@@ -16,8 +16,9 @@
*
*/
-package org.apache.streampipes.connect.iiot.adapters.migrations;
+package org.apache.streampipes.connectors.ros.migrations;
+import org.apache.streampipes.connectors.ros.config.RosConfig;
import
org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
import org.apache.streampipes.extensions.api.migration.IAdapterMigrator;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
@@ -28,8 +29,6 @@ import
org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
import org.apache.streampipes.model.staticproperty.StaticProperty;
import org.apache.streampipes.vocabulary.XSD;
-import static
org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter.ROS_PORT_KEY;
-
public class RosBridgeAdapterMigrationV1 implements IAdapterMigrator {
@Override
@@ -59,6 +58,6 @@ public class RosBridgeAdapterMigrationV1 implements
IAdapterMigrator {
}
private boolean isPortConfig(StaticProperty config) {
- return config.getInternalName().equals(ROS_PORT_KEY);
+ return config.getInternalName().equals(RosConfig.ROS_PORT_KEY);
}
-}
\ No newline at end of file
+}
diff --git
a/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/sink/RosBridgeSink.java
b/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/sink/RosBridgeSink.java
new file mode 100644
index 0000000000..cac8ef5f6e
--- /dev/null
+++
b/streampipes-extensions/streampipes-connectors-ros/src/main/java/org/apache/streampipes/connectors/ros/sink/RosBridgeSink.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.connectors.ros.sink;
+
+import org.apache.streampipes.dataformat.SpDataFormatDefinition;
+import org.apache.streampipes.dataformat.json.JsonDataFormatDefinition;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataSink;
+import org.apache.streampipes.extensions.api.pe.config.IDataSinkConfiguration;
+import
org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.param.IDataSinkParameters;
+import org.apache.streampipes.model.DataSinkType;
+import org.apache.streampipes.model.extensions.ExtensionAssetType;
+import org.apache.streampipes.model.runtime.Event;
+import org.apache.streampipes.sdk.builder.DataSinkBuilder;
+import org.apache.streampipes.sdk.builder.StreamRequirementsBuilder;
+import org.apache.streampipes.sdk.builder.sink.DataSinkConfiguration;
+import org.apache.streampipes.sdk.helpers.EpRequirements;
+import org.apache.streampipes.sdk.helpers.Labels;
+import org.apache.streampipes.sdk.helpers.Locales;
+
+import edu.wpi.rail.jrosbridge.Ros;
+import edu.wpi.rail.jrosbridge.Topic;
+import edu.wpi.rail.jrosbridge.messages.Message;
+
+import static
org.apache.streampipes.connectors.ros.config.RosConfig.ROS_HOST_KEY;
+import static
org.apache.streampipes.connectors.ros.config.RosConfig.ROS_PORT_KEY;
+import static org.apache.streampipes.connectors.ros.config.RosConfig.TOPIC_KEY;
+
+public class RosBridgeSink implements IStreamPipesDataSink {
+
+ public static final String ID = "org.apache.streampipes.connectors.ros.sink";
+
+ private final SpDataFormatDefinition spDataFormatDefinition = new
JsonDataFormatDefinition();
+
+ private Ros ros;
+ private Topic topic;
+
+ @Override
+ public IDataSinkConfiguration declareConfig() {
+ return DataSinkConfiguration.create(
+ RosBridgeSink::new,
+ DataSinkBuilder.create(ID, 0)
+ .category(DataSinkType.MESSAGING)
+ .withLocales(Locales.EN)
+ .withAssets(ExtensionAssetType.DOCUMENTATION,
ExtensionAssetType.ICON)
+ .requiredStream(
+ StreamRequirementsBuilder
+ .create()
+ .requiredProperty(EpRequirements.anyProperty())
+ .build()
+ )
+ .requiredTextParameter(Labels.withId(ROS_HOST_KEY))
+ .requiredIntegerParameter(Labels.withId(ROS_PORT_KEY))
+ .requiredTextParameter(Labels.withId(TOPIC_KEY))
+ .build()
+ );
+ }
+
+ @Override
+ public void onPipelineStarted(IDataSinkParameters params,
+ EventSinkRuntimeContext runtimeContext) {
+ var extractor = params.extractor();
+ String rosHost = extractor.singleValueParameter(ROS_HOST_KEY,
String.class);
+ int rosPort = extractor.singleValueParameter(ROS_PORT_KEY, Integer.class);
+ String rosTopic = extractor.singleValueParameter(TOPIC_KEY, String.class);
+
+ ros = new Ros(rosHost, rosPort);
+ ros.connect();
+ topic = new Topic(ros, rosTopic, "std_msgs/String");
+ }
+
+ @Override
+ public void onEvent(Event event) {
+ if (ros.isConnected()) {
+ var jsonEvent = spDataFormatDefinition.fromMap(event.getRaw());
+ topic.publish(new Message(new String(jsonEvent)));
+ }
+ }
+
+ @Override
+ public void onPipelineStopped() {
+ ros.disconnect();
+ }
+}
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/documentation.md
b/streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/documentation.md
similarity index 100%
copy from
streampipes-extensions/streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/documentation.md
copy to
streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/documentation.md
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/icon.png
b/streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/icon.png
similarity index 100%
rename from
streampipes-extensions/streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/icon.png
rename to
streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/icon.png
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/strings.en
b/streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/strings.en
similarity index 100%
copy from
streampipes-extensions/streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/strings.en
copy to
streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/strings.en
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/documentation.md
b/streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connectors.ros.sink/documentation.md
similarity index 87%
rename from
streampipes-extensions/streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/documentation.md
rename to
streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connectors.ros.sink/documentation.md
index 3c4216514a..c7e03c0b81 100644
---
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/documentation.md
+++
b/streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connectors.ros.sink/documentation.md
@@ -26,16 +26,14 @@
## Description
-Connect Robots running on ROS
+This data sinks can publish events to ROS over websocket.
***
## Required input
-
-
-***
+User-defined parameters include the hostname of the ROS bridge, the port of
the ROS instance and the topic.
## Configuration
@@ -54,5 +52,3 @@ The port of the ROS instance.
Example: /battery (Starts with /)
-## Output
-
diff --git
a/streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connectors.ros.sink/icon.png
b/streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connectors.ros.sink/icon.png
new file mode 100644
index 0000000000..b85c4791e5
Binary files /dev/null and
b/streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connectors.ros.sink/icon.png
differ
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/strings.en
b/streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connectors.ros.sink/strings.en
similarity index 76%
rename from
streampipes-extensions/streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/strings.en
rename to
streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connectors.ros.sink/strings.en
index 89ea951a96..4e6f44cb96 100644
---
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/resources/org.apache.streampipes.connect.iiot.adapters.ros/strings.en
+++
b/streampipes-extensions/streampipes-connectors-ros/src/main/resources/org.apache.streampipes.connectors.ros.sink/strings.en
@@ -16,14 +16,14 @@
#
-org.apache.streampipes.connect.iiot.adapters.ros.title=ROS Bridge
-org.apache.streampipes.connect.iiot.adapters.ros.description=Connect Robots
running on ROS.
+org.apache.streampipes.connectors.ros.sink.title=ROS Bridge Sink
+org.apache.streampipes.connectors.ros.sink.description=Publish events to a ROS
Bridge over Websocket.
-ROS_HOST_KEY.title=Ros Bridge
+ROS_HOST_KEY.title=ROS Bridge Host
ROS_HOST_KEY.description=Example: test-server.com (No protocol)
-ROS_PORT_KEY.title=Port
+ROS_PORT_KEY.title=ROS Port
ROS_PORT_KEY.description=Example: 9090
TOPIC_KEY.title=Topic
-TOPIC_KEY.description=Example: /battery (Starts with /)
\ No newline at end of file
+TOPIC_KEY.description=Example: /battery (Starts with /)
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/test/java/org/apache/streampipes/connect/iiot/adapters/migrations/RosBridgeAdapterMigrationV1Test.java
b/streampipes-extensions/streampipes-connectors-ros/src/test/java/org/apache/streampipes/connectors/ros/migrations/RosBridgeAdapterMigrationV1Test.java
similarity index 87%
rename from
streampipes-extensions/streampipes-connect-adapters-iiot/src/test/java/org/apache/streampipes/connect/iiot/adapters/migrations/RosBridgeAdapterMigrationV1Test.java
rename to
streampipes-extensions/streampipes-connectors-ros/src/test/java/org/apache/streampipes/connectors/ros/migrations/RosBridgeAdapterMigrationV1Test.java
index e26e97ff7e..895ace3bb0 100644
---
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/test/java/org/apache/streampipes/connect/iiot/adapters/migrations/RosBridgeAdapterMigrationV1Test.java
+++
b/streampipes-extensions/streampipes-connectors-ros/src/test/java/org/apache/streampipes/connectors/ros/migrations/RosBridgeAdapterMigrationV1Test.java
@@ -16,9 +16,9 @@
*
*/
-package org.apache.streampipes.connect.iiot.adapters.migrations;
+package org.apache.streampipes.connectors.ros.migrations;
-import
org.apache.streampipes.connect.iiot.adapters.migrations.config.RosBridgeAdapterVersionedConfig;
+import
org.apache.streampipes.connectors.ros.migrations.config.RosBridgeAdapterVersionedConfig;
import
org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.vocabulary.XSD;
@@ -26,11 +26,10 @@ import org.apache.streampipes.vocabulary.XSD;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
import java.net.URI;
-import static org.mockito.Mockito.mock;
-
public class RosBridgeAdapterMigrationV1Test {
@@ -44,7 +43,7 @@ public class RosBridgeAdapterMigrationV1Test {
@Test
public void testMigrationV1(){
var rosBridgeAdapterDescriptionV0 =
RosBridgeAdapterVersionedConfig.getRosBridgeAdapterDescriptionV0();
- var extractorMock = mock(IStaticPropertyExtractor.class);
+ var extractorMock = Mockito.mock(IStaticPropertyExtractor.class);
var rosBridgeAdapterDescriptionV1 =
migrationV1.migrate(rosBridgeAdapterDescriptionV0 , extractorMock);
@@ -58,4 +57,4 @@ public class RosBridgeAdapterMigrationV1Test {
.getRequiredDatatype();
}
-}
\ No newline at end of file
+}
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/test/java/org/apache/streampipes/connect/iiot/adapters/migrations/config/RosBridgeAdapterVersionedConfig.java
b/streampipes-extensions/streampipes-connectors-ros/src/test/java/org/apache/streampipes/connectors/ros/migrations/config/RosBridgeAdapterVersionedConfig.java
similarity index 71%
rename from
streampipes-extensions/streampipes-connect-adapters-iiot/src/test/java/org/apache/streampipes/connect/iiot/adapters/migrations/config/RosBridgeAdapterVersionedConfig.java
rename to
streampipes-extensions/streampipes-connectors-ros/src/test/java/org/apache/streampipes/connectors/ros/migrations/config/RosBridgeAdapterVersionedConfig.java
index ef07a13a9e..4b27a5385e 100644
---
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/test/java/org/apache/streampipes/connect/iiot/adapters/migrations/config/RosBridgeAdapterVersionedConfig.java
+++
b/streampipes-extensions/streampipes-connectors-ros/src/test/java/org/apache/streampipes/connectors/ros/migrations/config/RosBridgeAdapterVersionedConfig.java
@@ -16,29 +16,29 @@
*
*/
-package org.apache.streampipes.connect.iiot.adapters.migrations.config;
+package org.apache.streampipes.connectors.ros.migrations.config;
-import org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter;
+import org.apache.streampipes.connectors.ros.adapter.RosBridgeAdapter;
import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
+import org.apache.streampipes.model.extensions.ExtensionAssetType;
import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
import org.apache.streampipes.sdk.helpers.Labels;
import org.apache.streampipes.sdk.helpers.Locales;
-import org.apache.streampipes.sdk.utils.Assets;
import java.util.Arrays;
-import static
org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter.ID;
-import static
org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter.ROS_HOST_KEY;
-import static
org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter.ROS_PORT_KEY;
-import static
org.apache.streampipes.connect.iiot.adapters.ros.RosBridgeAdapter.TOPIC_KEY;
+import static
org.apache.streampipes.connectors.ros.config.RosConfig.ROS_HOST_KEY;
+import static
org.apache.streampipes.connectors.ros.config.RosConfig.ROS_PORT_KEY;
+import static org.apache.streampipes.connectors.ros.config.RosConfig.TOPIC_KEY;
+
public class RosBridgeAdapterVersionedConfig {
public static AdapterDescription getRosBridgeAdapterDescriptionV0(){
- return AdapterConfigurationBuilder.create(ID, 0, RosBridgeAdapter::new)
+ return AdapterConfigurationBuilder.create(RosBridgeAdapter.ID, 0,
RosBridgeAdapter::new)
.withLocales(Locales.EN)
- .withAssets(Assets.DOCUMENTATION, Assets.ICON)
+ .withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withCategory(AdapterType.Manufacturing)
.requiredTextParameter(Labels.withId(ROS_HOST_KEY))
.requiredTextParameter(Labels.withId(ROS_PORT_KEY))
@@ -48,9 +48,9 @@ public class RosBridgeAdapterVersionedConfig {
}
public static AdapterDescription getRosBridgeAdapterDescriptionV1(){
- return AdapterConfigurationBuilder.create(ID, 1, RosBridgeAdapter::new)
+ return AdapterConfigurationBuilder.create(RosBridgeAdapter.ID, 1,
RosBridgeAdapter::new)
.withLocales(Locales.EN)
- .withAssets(Assets.DOCUMENTATION, Assets.ICON)
+ .withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withCategory(AdapterType.Manufacturing)
.requiredTextParameter(Labels.withId(ROS_HOST_KEY))
.requiredIntegerParameter(Labels.withId(ROS_PORT_KEY))
diff --git a/streampipes-extensions/streampipes-extensions-all-iiot/pom.xml
b/streampipes-extensions/streampipes-extensions-all-iiot/pom.xml
index 0c6076bfa0..b7730e28e1 100644
--- a/streampipes-extensions/streampipes-extensions-all-iiot/pom.xml
+++ b/streampipes-extensions/streampipes-extensions-all-iiot/pom.xml
@@ -106,6 +106,11 @@
<artifactId>streampipes-connectors-rocketmq</artifactId>
<version>0.97.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-connectors-ros</artifactId>
+ <version>0.97.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-connectors-tubemq</artifactId>
diff --git
a/streampipes-extensions/streampipes-extensions-all-iiot/src/main/java/org/apache/streampipes/extensions/all/iiot/AllExtensionsIIoTInit.java
b/streampipes-extensions/streampipes-extensions-all-iiot/src/main/java/org/apache/streampipes/extensions/all/iiot/AllExtensionsIIoTInit.java
index 33336d4f3f..34ec545b57 100644
---
a/streampipes-extensions/streampipes-extensions-all-iiot/src/main/java/org/apache/streampipes/extensions/all/iiot/AllExtensionsIIoTInit.java
+++
b/streampipes-extensions/streampipes-extensions-all-iiot/src/main/java/org/apache/streampipes/extensions/all/iiot/AllExtensionsIIoTInit.java
@@ -19,6 +19,7 @@
package org.apache.streampipes.extensions.all.iiot;
import org.apache.streampipes.connect.iiot.IIoTAdaptersExtensionModuleExport;
+import org.apache.streampipes.connectors.ros.RosConnectorsModuleExport;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
@@ -73,6 +74,7 @@ public class AllExtensionsIIoTInit extends
ExtensionsModelSubmitter {
new PlcConnectorsModuleExport(),
new PulsarConnectorsModuleExport(),
new RocketMqConnectorsModuleExport(),
+ new RosConnectorsModuleExport(),
new TubeMQConnectorsModuleExport(),
new ChangeDetectionExtensionModuleExport(),
diff --git a/streampipes-extensions/streampipes-extensions-all-jvm/pom.xml
b/streampipes-extensions/streampipes-extensions-all-jvm/pom.xml
index 7fd063cf54..c3867b86c1 100644
--- a/streampipes-extensions/streampipes-extensions-all-jvm/pom.xml
+++ b/streampipes-extensions/streampipes-extensions-all-jvm/pom.xml
@@ -104,6 +104,11 @@
<artifactId>streampipes-connectors-rocketmq</artifactId>
<version>0.97.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-connectors-ros</artifactId>
+ <version>0.97.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-connectors-tubemq</artifactId>
diff --git
a/streampipes-extensions/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/AllExtensionsInit.java
b/streampipes-extensions/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/AllExtensionsInit.java
index 20282a060f..d5b9bf6f92 100644
---
a/streampipes-extensions/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/AllExtensionsInit.java
+++
b/streampipes-extensions/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/AllExtensionsInit.java
@@ -19,6 +19,7 @@ package org.apache.streampipes.extensions.all.jvm;
import org.apache.streampipes.connect.GeneralAdaptersExtensionModuleExport;
import org.apache.streampipes.connect.iiot.IIoTAdaptersExtensionModuleExport;
+import org.apache.streampipes.connectors.ros.RosConnectorsModuleExport;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
import org.apache.streampipes.dataformat.fst.FstDataFormatFactory;
import org.apache.streampipes.dataformat.json.JsonDataFormatFactory;
@@ -78,6 +79,7 @@ public class AllExtensionsInit extends
ExtensionsModelSubmitter {
new PlcConnectorsModuleExport(),
new PulsarConnectorsModuleExport(),
new RocketMqConnectorsModuleExport(),
+ new RosConnectorsModuleExport(),
new TubeMQConnectorsModuleExport(),
new ChangeDetectionExtensionModuleExport(),