You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2021/01/02 18:31:45 UTC
[incubator-streampipes-extensions] branch STREAMPIPES-272 created
(now fd14dd7)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch STREAMPIPES-272
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git.
at fd14dd7 [STREAMPIPES-273] Refactor data simulators
This branch includes the following new commits:
new fd14dd7 [STREAMPIPES-273] Refactor data simulators
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-streampipes-extensions] 01/01: [STREAMPIPES-273]
Refactor data simulators
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-272
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
commit fd14dd729f52c0cbb9f5e972369eef2f48f90f9a
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sat Jan 2 19:31:29 2021 +0100
[STREAMPIPES-273] Refactor data simulators
---
.../vehicle/simulator/VehicleSimulatorInit.java | 4 +-
.../vehicle/simulator/vehicle/VehicleSource.java | 42 --------------------
.../simulator/vehicle/streams/VehicleStream.java | 3 +-
.../simulator/WatertankSimulatorInit.java | 8 +++-
.../simulator/watertank/WaterTankSource.java | 45 ----------------------
.../watertank/streams/FlowRate1Stream.java | 5 +--
.../watertank/streams/FlowRate2Stream.java | 3 +-
.../watertank/streams/PressureTankStream.java | 3 +-
.../watertank/streams/WaterLevel1Stream.java | 3 +-
.../watertank/streams/WaterLevel2Stream.java | 5 +--
10 files changed, 16 insertions(+), 105 deletions(-)
diff --git a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/VehicleSimulatorInit.java b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/VehicleSimulatorInit.java
index 7fd778d..6daff2b 100644
--- a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/VehicleSimulatorInit.java
+++ b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/VehicleSimulatorInit.java
@@ -21,12 +21,12 @@ package org.apache.streampipes.sources.vehicle.simulator;
import org.apache.streampipes.container.init.DeclarersSingleton;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.sources.vehicle.simulator.config.VehicleSimulatorConfig;
-import org.apache.streampipes.sources.vehicle.simulator.vehicle.VehicleSource;
+import org.apache.streampipes.sources.vehicle.simulator.vehicle.streams.VehicleStream;
public class VehicleSimulatorInit extends StandaloneModelSubmitter {
public static void main(String[] args) {
- DeclarersSingleton.getInstance().add(new VehicleSource());
+ DeclarersSingleton.getInstance().add(new VehicleStream());
new VehicleSimulatorInit().init(VehicleSimulatorConfig.INSTANCE);
}
diff --git a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/vehicle/VehicleSource.java b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/vehicle/VehicleSource.java
deleted file mode 100644
index 4615be7..0000000
--- a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/vehicle/VehicleSource.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.sources.vehicle.simulator.vehicle;
-
-import org.apache.streampipes.container.declarer.DataStreamDeclarer;
-import org.apache.streampipes.container.declarer.SemanticEventProducerDeclarer;
-import org.apache.streampipes.model.graph.DataSourceDescription;
-import org.apache.streampipes.sdk.builder.DataSourceBuilder;
-import org.apache.streampipes.sources.vehicle.simulator.vehicle.streams.VehicleStream;
-
-import java.util.Arrays;
-import java.util.List;
-
-
-public class VehicleSource implements SemanticEventProducerDeclarer {
-
- public DataSourceDescription declareModel() {
- return DataSourceBuilder.create("source-vehicle", "Vehicle Source", "A data source that " +
- "holds event streams produced by vehicles.")
- .build();
- }
-
- public List<DataStreamDeclarer> getEventStreams() {
- return Arrays.asList(new VehicleStream());
- }
-}
\ No newline at end of file
diff --git a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/vehicle/streams/VehicleStream.java b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/vehicle/streams/VehicleStream.java
index 64aa131..30a93fd 100644
--- a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/vehicle/streams/VehicleStream.java
+++ b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/vehicle/streams/VehicleStream.java
@@ -20,7 +20,6 @@ package org.apache.streampipes.sources.vehicle.simulator.vehicle.streams;
import org.apache.streampipes.model.SpDataStream;
-import org.apache.streampipes.model.graph.DataSourceDescription;
import org.apache.streampipes.sdk.builder.DataStreamBuilder;
import org.apache.streampipes.sdk.helpers.EpProperties;
import org.apache.streampipes.sdk.helpers.Formats;
@@ -34,7 +33,7 @@ import org.apache.streampipes.vocabulary.Geo;
public class VehicleStream extends AbstractAdapterIncludedStream {
@Override
- public SpDataStream declareModel(DataSourceDescription sep) {
+ public SpDataStream declareModel() {
return DataStreamBuilder.create("vehicle-position", "Vehicle Position", "An event stream " +
"that produces current vehicle positions")
.property(EpProperties.timestampProperty("timestamp"))
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/WatertankSimulatorInit.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/WatertankSimulatorInit.java
index 67886ff..6de6f6f 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/WatertankSimulatorInit.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/WatertankSimulatorInit.java
@@ -21,13 +21,17 @@ package org.apache.streampipes.sources.watertank.simulator;
import org.apache.streampipes.container.init.DeclarersSingleton;
import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter;
import org.apache.streampipes.sources.watertank.simulator.config.WatertankSimulatorConfig;
-import org.apache.streampipes.sources.watertank.simulator.watertank.WaterTankSource;
+import org.apache.streampipes.sources.watertank.simulator.watertank.streams.*;
public class WatertankSimulatorInit extends StandaloneModelSubmitter {
public static void main(String[] args) {
DeclarersSingleton.getInstance()
- .add(new WaterTankSource());
+ .add(new WaterLevel1Stream())
+ .add(new WaterLevel2Stream())
+ .add(new FlowRate1Stream())
+ .add(new PressureTankStream())
+ .add(new FlowRate2Stream());
new WatertankSimulatorInit().init(WatertankSimulatorConfig.INSTANCE);
}
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/WaterTankSource.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/WaterTankSource.java
deleted file mode 100644
index 64d8a01..0000000
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/WaterTankSource.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.sources.watertank.simulator.watertank;
-
-import org.apache.streampipes.container.declarer.DataStreamDeclarer;
-import org.apache.streampipes.container.declarer.SemanticEventProducerDeclarer;
-import org.apache.streampipes.model.graph.DataSourceDescription;
-import org.apache.streampipes.sdk.builder.DataSourceBuilder;
-import org.apache.streampipes.sources.watertank.simulator.watertank.streams.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class WaterTankSource implements SemanticEventProducerDeclarer {
-
- public DataSourceDescription declareModel() {
- return DataSourceBuilder.create("water-tank", "Water Tank Source", "A data source that " +
- "holds event streams produces by a water tank system.")
- .build();
- }
-
- public List<DataStreamDeclarer> getEventStreams() {
- return Arrays.asList(new WaterLevel1Stream(),
- new WaterLevel2Stream(),
- new FlowRate1Stream(),
- new PressureTankStream(),
- new FlowRate2Stream());
- }
-}
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate1Stream.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate1Stream.java
index 4545f75..781755d 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate1Stream.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate1Stream.java
@@ -19,7 +19,6 @@
package org.apache.streampipes.sources.watertank.simulator.watertank.streams;
import org.apache.streampipes.model.SpDataStream;
-import org.apache.streampipes.model.graph.DataSourceDescription;
import org.apache.streampipes.model.schema.PropertyScope;
import org.apache.streampipes.sdk.builder.DataStreamBuilder;
import org.apache.streampipes.sdk.builder.PrimitivePropertyBuilder;
@@ -39,7 +38,7 @@ import java.net.URI;
public class FlowRate1Stream extends AbstractAdapterIncludedStream {
@Override
- public SpDataStream declareModel(DataSourceDescription sep) {
+ public SpDataStream declareModel() {
return DataStreamBuilder.create("org.apache.streampipes.sources.simulator.flowrate1")
.withLocales(Locales.EN)
.withAssets(Assets.DOCUMENTATION, Assets.ICON)
@@ -79,4 +78,4 @@ public class FlowRate1Stream extends AbstractAdapterIncludedStream {
thread.start();
}
-}
\ No newline at end of file
+}
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate2Stream.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate2Stream.java
index b44d603..efb281b 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate2Stream.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate2Stream.java
@@ -19,7 +19,6 @@
package org.apache.streampipes.sources.watertank.simulator.watertank.streams;
import org.apache.streampipes.model.SpDataStream;
-import org.apache.streampipes.model.graph.DataSourceDescription;
import org.apache.streampipes.model.schema.PropertyScope;
import org.apache.streampipes.sdk.builder.DataStreamBuilder;
import org.apache.streampipes.sdk.builder.PrimitivePropertyBuilder;
@@ -37,7 +36,7 @@ public class FlowRate2Stream extends AbstractAlreadyExistingStream {
@Override
- public SpDataStream declareModel(DataSourceDescription sep) {
+ public SpDataStream declareModel() {
return DataStreamBuilder.create("org.apache.streampipes.sources.simulator.flowrate2")
.withLocales(Locales.EN)
.withAssets(Assets.DOCUMENTATION, Assets.ICON)
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/PressureTankStream.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/PressureTankStream.java
index 1831fd8..436dce0 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/PressureTankStream.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/PressureTankStream.java
@@ -19,7 +19,6 @@
package org.apache.streampipes.sources.watertank.simulator.watertank.streams;
import org.apache.streampipes.model.SpDataStream;
-import org.apache.streampipes.model.graph.DataSourceDescription;
import org.apache.streampipes.model.schema.PropertyScope;
import org.apache.streampipes.sdk.builder.DataStreamBuilder;
import org.apache.streampipes.sdk.builder.PrimitivePropertyBuilder;
@@ -36,7 +35,7 @@ import org.apache.streampipes.sources.watertank.simulator.vocabulary.WaterTankVo
public class PressureTankStream extends AbstractAlreadyExistingStream {
@Override
- public SpDataStream declareModel(DataSourceDescription sep) {
+ public SpDataStream declareModel() {
return DataStreamBuilder.create("org.apache.streampipes.sources.simulator.pressure")
.withLocales(Locales.EN)
.withAssets(Assets.DOCUMENTATION, Assets.ICON)
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel1Stream.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel1Stream.java
index 85308eb..cdea01b 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel1Stream.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel1Stream.java
@@ -19,7 +19,6 @@
package org.apache.streampipes.sources.watertank.simulator.watertank.streams;
import org.apache.streampipes.model.SpDataStream;
-import org.apache.streampipes.model.graph.DataSourceDescription;
import org.apache.streampipes.model.schema.PropertyScope;
import org.apache.streampipes.sdk.builder.DataStreamBuilder;
import org.apache.streampipes.sdk.builder.PrimitivePropertyBuilder;
@@ -37,7 +36,7 @@ import org.apache.streampipes.sources.watertank.simulator.vocabulary.WaterTankVo
public class WaterLevel1Stream extends AbstractAlreadyExistingStream {
@Override
- public SpDataStream declareModel(DataSourceDescription sep) {
+ public SpDataStream declareModel() {
return DataStreamBuilder.create("org.apache.streampipes.sources.simulator.waterlevel1")
.withLocales(Locales.EN)
.withAssets(Assets.DOCUMENTATION, Assets.ICON)
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel2Stream.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel2Stream.java
index 3095ee2..c1a33e4 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel2Stream.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel2Stream.java
@@ -19,7 +19,6 @@
package org.apache.streampipes.sources.watertank.simulator.watertank.streams;
import org.apache.streampipes.model.SpDataStream;
-import org.apache.streampipes.model.graph.DataSourceDescription;
import org.apache.streampipes.model.schema.PropertyScope;
import org.apache.streampipes.sdk.builder.DataStreamBuilder;
import org.apache.streampipes.sdk.builder.PrimitivePropertyBuilder;
@@ -36,7 +35,7 @@ import org.apache.streampipes.sources.watertank.simulator.vocabulary.WaterTankVo
public class WaterLevel2Stream extends AbstractAlreadyExistingStream {
@Override
- public SpDataStream declareModel(DataSourceDescription sep) {
+ public SpDataStream declareModel() {
return DataStreamBuilder.create("org.apache.streampipes.sources.simulator.waterlevel2")
.withLocales(Locales.EN)
.withAssets(Assets.DOCUMENTATION, Assets.ICON)
@@ -67,4 +66,4 @@ public class WaterLevel2Stream extends AbstractAlreadyExistingStream {
"org.apache.streampipes.examples.waterlevel2"))
.build();
}
-}
\ No newline at end of file
+}