Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/multiple datasinks #308

Merged
merged 25 commits into from
Jul 26, 2024
Merged

Feature/multiple datasinks #308

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3dc245a
Adds support for multiple datasinks in one route
Aegid1 Apr 7, 2024
b0e0bf8
adjusted the routes.json of databridge.examples
Aegid1 Apr 15, 2024
bfb03e1
Restores Example Configurations
jannisjung Jun 13, 2024
c8fcec6
Refactors Kafka JsonataMultipleAAS Example * Adds new Configuration m…
jannisjung Jun 13, 2024
dbec569
Refactors multiple datasinks in one route (PR #300) * Enables Usage o…
jannisjung Jun 13, 2024
1b99701
Updates typos
jannisjung Jun 14, 2024
46295bc
Resolves Review Comments
jannisjung Jun 24, 2024
38f9f12
Merge branch 'feature/multiple-datasinks' of https://github.com/janni…
jannisjung Jun 24, 2024
297f5a5
Improves PollingConsumer Tests
jannisjung Jul 18, 2024
409c259
Fixes jsonata-mqtt-test
jannisjung Jul 18, 2024
de247b3
Fixes dot-aas-v3 test
jannisjung Jul 18, 2024
0fc449f
fixes http-polling-jsonata-test
jannisjung Jul 18, 2024
e59ae82
fixes kafka-jsonata-test
jannisjung Jul 18, 2024
be54425
Fixes kafka-jsonatamultiple-test
jannisjung Jul 18, 2024
4742073
Fixes typo
jannisjung Jul 19, 2024
41b4da4
Fixes another typo
jannisjung Jul 19, 2024
e1639ed
Removes never used abstract method
jannisjung Jul 19, 2024
69273fe
Fixes typo
jannisjung Jul 19, 2024
ea66da5
Resolves Review Remarks
jannisjung Jul 22, 2024
741787e
Adds regression test
jannisjung Jul 25, 2024
be8cc84
Merge branch 'main' into feature/multiple-datasinks
jannisjung Jul 25, 2024
2f99945
Reworks regression test
jannisjung Jul 25, 2024
3546f3a
Merge branch 'feature/multiple-datasinks' of https://github.com/janni…
jannisjung Jul 25, 2024
4a6ecc0
Fixes typo
jannisjung Jul 26, 2024
c43e4d4
Resolves review remark
jannisjung Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions ...gitaltwin/basyx/databridge/executable/integration/ITTestDataBridgeAASPollingConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

import java.util.UUID;

import org.eclipse.basyx.aas.aggregator.api.IAASAggregator;
import org.eclipse.basyx.aas.aggregator.proxy.AASAggregatorProxy;
import org.eclipse.digitaltwin.basyx.databridge.executable.regression.DataBridgeSuiteAASPollingConsumer;
import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttException;
Expand All @@ -41,7 +39,6 @@
public class ITTestDataBridgeAASPollingConsumer extends DataBridgeSuiteAASPollingConsumer {

private static String BROKER_HOST = "broker.mqttdashboard.com";
private static String HOST = "localhost";

@Override
protected MqttClient getMqttClient() throws MqttException {
Expand All @@ -50,9 +47,5 @@ protected MqttClient getMqttClient() throws MqttException {

return new MqttClient("tcp://" + BROKER_HOST+ ":1883", publisherId, new MemoryPersistence());
}

@Override
protected IAASAggregator getAASAggregatorProxy() {
return new AASAggregatorProxy("http://" + HOST + ":4001");
}

jannisjung marked this conversation as resolved.
Show resolved Hide resolved
}
2 changes: 0 additions & 2 deletions ...digitaltwin/basyx/databridge/executable/regression/DataBridgeSuiteAASPollingConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;

import org.eclipse.basyx.aas.aggregator.api.IAASAggregator;
import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
import org.eclipse.paho.client.mqttv3.MqttCallback;
import org.eclipse.paho.client.mqttv3.MqttClient;
Expand All @@ -55,7 +54,6 @@
public abstract class DataBridgeSuiteAASPollingConsumer {

protected abstract MqttClient getMqttClient() throws MqttException;
protected abstract IAASAggregator getAASAggregatorProxy(); // FIXME: jungjan: This method is never used. Intended?
private static Logger logger = LoggerFactory.getLogger(DataBridgeSuiteAASPollingConsumer.class);
private static String user_name = "test1";
private static String password = "1234567";
Expand Down
10 changes: 2 additions & 8 deletions .../digitaltwin/basyx/databridge/executable/regression/TestDataBridgeAASPollingConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@

import java.io.IOException;
import java.util.UUID;
import org.eclipse.basyx.aas.aggregator.api.IAASAggregator;
import org.eclipse.basyx.aas.aggregator.proxy.AASAggregatorProxy;

jannisjung marked this conversation as resolved.
Show resolved Hide resolved
import org.eclipse.basyx.components.aas.AASServerComponent;
import org.eclipse.basyx.components.aas.configuration.AASServerBackend;
import org.eclipse.basyx.components.aas.configuration.BaSyxAASServerConfiguration;
Expand All @@ -39,6 +38,7 @@
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
import org.junit.AfterClass;
import org.junit.BeforeClass;

jannisjung marked this conversation as resolved.
Show resolved Hide resolved
import io.moquette.broker.Server;
import io.moquette.broker.config.ClasspathResourceLoader;
import io.moquette.broker.config.IConfig;
Expand All @@ -52,7 +52,6 @@
*/
public class TestDataBridgeAASPollingConsumer extends DataBridgeSuiteAASPollingConsumer {

private static final String AAS_AGGREGATOR_URL = "http://localhost:4001";
private static AASServerComponent aasServer;
private static String BROKER_URL = "tcp://broker.mqttdashboard.com:1883";
private static Server mqttBroker;
Expand All @@ -75,11 +74,6 @@ protected MqttClient getMqttClient() throws MqttException {
return new MqttClient(BROKER_URL, publisherId, new MemoryPersistence());
}

@Override
protected IAASAggregator getAASAggregatorProxy() {
return new AASAggregatorProxy(AAS_AGGREGATOR_URL);
}

private static void startMqttBroker() throws IOException {
mqttBroker = new Server();

Expand Down
Loading