This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 0284cb36f4 fix(#3278): Remove methods related to the legacy domain
property concept. Replace with semantic type. (#3447)
0284cb36f4 is described below
commit 0284cb36f47ff809d98fd0cdacec95db7e0d5c1a
Author: Philipp Zehnder <[email protected]>
AuthorDate: Mon Feb 3 08:23:18 2025 +0100
fix(#3278): Remove methods related to the legacy domain property concept.
Replace with semantic type. (#3447)
---
.../adapter/parser/json/GeoJsonParserTest.java | 4 +-
.../machine/MachineDataSimulatorUtils.java | 22 +++---
.../connectors/influx/adapter/InfluxDbClient.java | 4 +-
.../buffergeometry/BufferGeomProcessor.java | 4 +-
.../bufferpoint/BufferPointProcessor.java | 4 +-
.../geo/jvm/jts/processor/epsg/EpsgProcessor.java | 2 +-
.../LatLngToJtsPointProcessor.java | 8 +--
.../reprojection/ReprojectionProcessor.java | 4 +-
.../trajectory/TrajectoryFromPointsProcessor.java | 4 +-
.../complex/TopologyValidationProcessor.java | 4 +-
.../simple/GeometryValidationProcessor.java | 4 +-
.../HaversineDistanceCalculatorProcessor.java | 10 +--
...HaversineStaticDistanceCalculatorProcessor.java | 6 +-
.../geocityname/GeoCityNameRevdecodeProcessor.java | 4 +-
.../speedcalculator/SpeedCalculatorProcessor.java | 6 +-
.../jvm/processor/commons/RequiredBoxStream.java | 6 +-
.../GenericImageClassificationProcessor.java | 2 +-
.../processor/qrreader/QrCodeReaderProcessor.java | 2 +-
.../state/buffer/StateBufferProcessor.java | 2 +-
.../jvm/processor/state/labeler/LabelerUtils.java | 2 +-
.../buffer/StateBufferLabelerProcessor.java | 2 +-
.../manager/matching/v2/ListPropertyMatchTest.java | 2 +-
.../matching/v2/TestPrimitivePropertyMatch.java | 2 +-
.../manager/matching/v2/TestSchemaMatch.java | 4 +-
.../manager/selector/TestSelectorUtils.java | 4 +-
.../sdk/builder/PrimitivePropertyBuilder.java | 14 ----
.../streampipes/sdk/helpers/EpProperties.java | 80 +++++++++++-----------
.../streampipes/sdk/helpers/EpRequirements.java | 43 ++++--------
28 files changed, 111 insertions(+), 144 deletions(-)
diff --git
a/streampipes-extensions-management/src/test/java/org/apache/streampipes/extensions/management/connect/adapter/parser/json/GeoJsonParserTest.java
b/streampipes-extensions-management/src/test/java/org/apache/streampipes/extensions/management/connect/adapter/parser/json/GeoJsonParserTest.java
index cd5135a26c..399e1de02d 100644
---
a/streampipes-extensions-management/src/test/java/org/apache/streampipes/extensions/management/connect/adapter/parser/json/GeoJsonParserTest.java
+++
b/streampipes-extensions-management/src/test/java/org/apache/streampipes/extensions/management/connect/adapter/parser/json/GeoJsonParserTest.java
@@ -60,13 +60,13 @@ public class GeoJsonParserTest {
var expected = GuessSchemaBuilder.create()
.property(PrimitivePropertyBuilder
.create(Datatypes.Float, "longitude")
- .domainProperty(Geo.LNG)
+ .semanticType(Geo.LNG)
.description("")
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.build())
.property(PrimitivePropertyBuilder
.create(Datatypes.Float, "latitude")
- .domainProperty(Geo.LAT)
+ .semanticType(Geo.LAT)
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.description("")
.build())
diff --git
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/simulator/machine/MachineDataSimulatorUtils.java
b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/simulator/machine/MachineDataSimulatorUtils.java
index f8d42d15af..1a3a27865d 100644
---
a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/simulator/machine/MachineDataSimulatorUtils.java
+++
b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/simulator/machine/MachineDataSimulatorUtils.java
@@ -61,7 +61,7 @@ public class MachineDataSimulatorUtils {
.create(Datatypes.String, SENSOR_ID)
.label("Sensor ID")
.description("The ID of the sensor")
- .domainProperty(HAS_SENSOR_ID)
+ .semanticType(HAS_SENSOR_ID)
.scope(PropertyScope.DIMENSION_PROPERTY)
.build())
.sample(SENSOR_ID, "sensor01")
@@ -69,7 +69,7 @@ public class MachineDataSimulatorUtils {
.create(Datatypes.Float, "level")
.label("Water Level")
.description("Denotes the current water level in the container")
- .domainProperty(SO.NUMBER)
+ .semanticType(SO.NUMBER)
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.build())
.sample("level", 5.25f)
@@ -77,7 +77,7 @@ public class MachineDataSimulatorUtils {
.create(Datatypes.Boolean, "overflow")
.label("Overflow")
.description("Indicates whether the tank overflows")
- .domainProperty(SO.NUMBER)
+ .semanticType(SO.NUMBER)
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.build())
.sample("overflow", true)
@@ -92,7 +92,7 @@ public class MachineDataSimulatorUtils {
.create(Datatypes.String, SENSOR_ID)
.label("Sensor ID")
.description("The ID of the sensor")
- .domainProperty(HAS_SENSOR_ID)
+ .semanticType(HAS_SENSOR_ID)
.scope(PropertyScope.DIMENSION_PROPERTY)
.build())
.sample(SENSOR_ID, "sensor01")
@@ -100,7 +100,7 @@ public class MachineDataSimulatorUtils {
.create(Datatypes.Float, "pressure")
.label("Pressure")
.description("Denotes the current pressure in the pressure tank")
- .domainProperty(SO.NUMBER)
+ .semanticType(SO.NUMBER)
.valueSpecification(0.0f, 100.0f, 0.5f)
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.build())
@@ -116,7 +116,7 @@ public class MachineDataSimulatorUtils {
.create(Datatypes.String, SENSOR_ID)
.label("Sensor ID")
.description("The ID of the sensor")
- .domainProperty(HAS_SENSOR_ID)
+ .semanticType(HAS_SENSOR_ID)
.scope(PropertyScope.DIMENSION_PROPERTY)
.build())
.sample(SENSOR_ID, "sensor01")
@@ -124,7 +124,7 @@ public class MachineDataSimulatorUtils {
.create(Datatypes.Float, MASS_FLOW)
.label("Mass Flow")
.description("Denotes the current mass flow in the sensor")
- .domainProperty(SO.NUMBER)
+ .semanticType(SO.NUMBER)
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.build())
.sample(MASS_FLOW, 5.76f)
@@ -132,7 +132,7 @@ public class MachineDataSimulatorUtils {
.create(Datatypes.Float, "volume_flow")
.label("Volume Flow")
.description("Denotes the current volume flow")
- .domainProperty(SO.NUMBER)
+ .semanticType(SO.NUMBER)
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.build())
.sample("volume_flow", 3.34f)
@@ -140,7 +140,7 @@ public class MachineDataSimulatorUtils {
.create(Datatypes.Float, TEMPERATURE)
.label("Temperature")
.description("Denotes the current temperature in degrees celsius")
- .domainProperty(SO.NUMBER)
+ .semanticType(SO.NUMBER)
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.measurementUnit(URI.create("http://qudt.org/vocab/unit#DegreeCelsius";))
.valueSpecification(0.0f, 100.0f, 0.1f)
@@ -150,7 +150,7 @@ public class MachineDataSimulatorUtils {
.create(Datatypes.Float, "density")
.label("Density")
.description("Denotes the current density of the fluid")
- .domainProperty(SO.NUMBER)
+ .semanticType(SO.NUMBER)
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.build())
.sample("density", 5.0f)
@@ -158,7 +158,7 @@ public class MachineDataSimulatorUtils {
.create(Datatypes.Boolean, "sensor_fault_flags")
.label("Sensor Fault Flags")
.description("Any fault flags of the sensors")
- .domainProperty(SO.BOOLEAN)
+ .semanticType(SO.BOOLEAN)
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.build())
.sample("sensor_fault_flags", true)
diff --git
a/streampipes-extensions/streampipes-connectors-influx/src/main/java/org/apache/streampipes/extensions/connectors/influx/adapter/InfluxDbClient.java
b/streampipes-extensions/streampipes-connectors-influx/src/main/java/org/apache/streampipes/extensions/connectors/influx/adapter/InfluxDbClient.java
index 6c83056cd4..432e3fa3ff 100644
---
a/streampipes-extensions/streampipes-connectors-influx/src/main/java/org/apache/streampipes/extensions/connectors/influx/adapter/InfluxDbClient.java
+++
b/streampipes-extensions/streampipes-connectors-influx/src/main/java/org/apache/streampipes/extensions/connectors/influx/adapter/InfluxDbClient.java
@@ -138,9 +138,9 @@ public class InfluxDbClient extends SharedInfluxClient {
PrimitivePropertyBuilder property = PrimitivePropertyBuilder
.create(column.getDatatypes(), column.getName())
.label(column.getName());
- // Setting the timestamp field to the correct domainProperty
+ // Setting the timestamp field to the correct semantic type
if (column.getName().equals("time")) {
- property.domainProperty(DATE_TIME);
+ property.semanticType(DATE_TIME);
}
allProperties.add(property.build());
}
diff --git
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/buffergeometry/BufferGeomProcessor.java
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/buffergeometry/BufferGeomProcessor.java
index 6c97cfe0df..99c9dea163 100644
---
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/buffergeometry/BufferGeomProcessor.java
+++
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/buffergeometry/BufferGeomProcessor.java
@@ -81,11 +81,11 @@ public class BufferGeomProcessor extends
StreamPipesDataProcessor {
.requiredStream(StreamRequirementsBuilder
.create()
.requiredPropertyWithUnaryMapping(
-
EpRequirements.domainPropertyReq("http://www.opengis.net/ont/geosparql#Geometry";),
+
EpRequirements.semanticTypeReq("http://www.opengis.net/ont/geosparql#Geometry";),
Labels.withId(GEOM_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.requiredPropertyWithUnaryMapping(
-
EpRequirements.domainPropertyReq("http://data.ign.fr/def/ignf#CartesianCS";),
+
EpRequirements.semanticTypeReq("http://data.ign.fr/def/ignf#CartesianCS";),
Labels.withId(EPSG_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.build())
diff --git
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/bufferpoint/BufferPointProcessor.java
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/bufferpoint/BufferPointProcessor.java
index d9577aa93f..25a4aff818 100644
---
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/bufferpoint/BufferPointProcessor.java
+++
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/bufferpoint/BufferPointProcessor.java
@@ -74,11 +74,11 @@ public class BufferPointProcessor extends
StreamPipesDataProcessor {
.requiredStream(StreamRequirementsBuilder
.create()
.requiredPropertyWithUnaryMapping(
-
EpRequirements.domainPropertyReq("http://www.opengis.net/ont/geosparql#Geometry";),
+
EpRequirements.semanticTypeReq("http://www.opengis.net/ont/geosparql#Geometry";),
Labels.withId(GEOM_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.requiredPropertyWithUnaryMapping(
-
EpRequirements.domainPropertyReq("http://data.ign.fr/def/ignf#CartesianCS";),
+
EpRequirements.semanticTypeReq("http://data.ign.fr/def/ignf#CartesianCS";),
Labels.withId(EPSG_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.build())
diff --git
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/epsg/EpsgProcessor.java
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/epsg/EpsgProcessor.java
index 1ea86f4c2e..3126196d84 100644
---
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/epsg/EpsgProcessor.java
+++
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/epsg/EpsgProcessor.java
@@ -53,7 +53,7 @@ public class EpsgProcessor extends StreamPipesDataProcessor {
.build())
.outputStrategy(OutputStrategies.append(PrimitivePropertyBuilder
.create(Datatypes.Integer, EPSG_RUNTIME)
- .domainProperty("http://data.ign.fr/def/ignf#CartesianCS";)
+ .semanticType("http://data.ign.fr/def/ignf#CartesianCS";)
.build())
)
.requiredIntegerParameter(Labels.withId(EPSG_KEY), 4326)
diff --git
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/latlngtojtspoint/LatLngToJtsPointProcessor.java
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/latlngtojtspoint/LatLngToJtsPointProcessor.java
index 4d51338dba..3117685f79 100644
---
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/latlngtojtspoint/LatLngToJtsPointProcessor.java
+++
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/latlngtojtspoint/LatLngToJtsPointProcessor.java
@@ -63,13 +63,13 @@ public class LatLngToJtsPointProcessor extends
StreamPipesDataProcessor {
.requiredStream(
StreamRequirementsBuilder
.create()
-
.requiredPropertyWithUnaryMapping(EpRequirements.domainPropertyReq(Geo.LAT),
+
.requiredPropertyWithUnaryMapping(EpRequirements.semanticTypeReq(Geo.LAT),
Labels.withId(LAT_KEY), PropertyScope.MEASUREMENT_PROPERTY)
.requiredPropertyWithUnaryMapping(
- EpRequirements.domainPropertyReq(Geo.LNG),
+ EpRequirements.semanticTypeReq(Geo.LNG),
Labels.withId(LNG_KEY), PropertyScope.MEASUREMENT_PROPERTY)
.requiredPropertyWithUnaryMapping(
-
EpRequirements.domainPropertyReq("http://data.ign.fr/def/ignf#CartesianCS";),
+
EpRequirements.semanticTypeReq("http://data.ign.fr/def/ignf#CartesianCS";),
Labels.withId(EPSG_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.build()
)
@@ -77,7 +77,7 @@ public class LatLngToJtsPointProcessor extends
StreamPipesDataProcessor {
OutputStrategies.append(
PrimitivePropertyBuilder
.create(Datatypes.String, GEOMETRY_RUNTIME)
-
.domainProperty("http://www.opengis.net/ont/geosparql#Geometry";)
+
.semanticType("http://www.opengis.net/ont/geosparql#Geometry";)
.build()
)
)
diff --git
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/reprojection/ReprojectionProcessor.java
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/reprojection/ReprojectionProcessor.java
index 13f5d807b6..d1f8696732 100644
---
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/reprojection/ReprojectionProcessor.java
+++
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/reprojection/ReprojectionProcessor.java
@@ -64,11 +64,11 @@ public class ReprojectionProcessor extends
StreamPipesDataProcessor {
.requiredStream(StreamRequirementsBuilder
.create()
.requiredPropertyWithUnaryMapping(
-
EpRequirements.domainPropertyReq("http://www.opengis.net/ont/geosparql#Geometry";),
+
EpRequirements.semanticTypeReq("http://www.opengis.net/ont/geosparql#Geometry";),
Labels.withId(GEOM_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.requiredPropertyWithUnaryMapping(
-
EpRequirements.domainPropertyReq("http://data.ign.fr/def/ignf#CartesianCS";),
+
EpRequirements.semanticTypeReq("http://data.ign.fr/def/ignf#CartesianCS";),
Labels.withId(SOURCE_EPSG_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.build())
diff --git
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/trajectory/TrajectoryFromPointsProcessor.java
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/trajectory/TrajectoryFromPointsProcessor.java
index a52194658c..cdc18fcdab 100644
---
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/trajectory/TrajectoryFromPointsProcessor.java
+++
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/trajectory/TrajectoryFromPointsProcessor.java
@@ -72,11 +72,11 @@ public class TrajectoryFromPointsProcessor extends
StreamPipesDataProcessor {
.requiredStream(
StreamRequirementsBuilder
.create()
-
.requiredPropertyWithUnaryMapping(EpRequirements.domainPropertyReq
+
.requiredPropertyWithUnaryMapping(EpRequirements.semanticTypeReq
("http://www.opengis.net/ont/geosparql#Geometry";),
Labels.withId(POINT_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.requiredPropertyWithUnaryMapping(
- EpRequirements.domainPropertyReq
+ EpRequirements.semanticTypeReq
("http://data.ign.fr/def/ignf#CartesianCS";),
Labels.withId(EPSG_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.requiredPropertyWithUnaryMapping(
diff --git
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/complex/TopologyValidationProcessor.java
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/complex/TopologyValidationProcessor.java
index 16ceff5a0b..74544e68df 100644
---
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/complex/TopologyValidationProcessor.java
+++
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/complex/TopologyValidationProcessor.java
@@ -69,11 +69,11 @@ public class TopologyValidationProcessor extends
StreamPipesDataProcessor {
.requiredStream(StreamRequirementsBuilder
.create()
.requiredPropertyWithUnaryMapping(
-
EpRequirements.domainPropertyReq("http://www.opengis.net/ont/geosparql#Geometry";),
+
EpRequirements.semanticTypeReq("http://www.opengis.net/ont/geosparql#Geometry";),
Labels.withId(GEOM_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.requiredPropertyWithUnaryMapping(
-
EpRequirements.domainPropertyReq("http://data.ign.fr/def/ignf#CartesianCS";),
+
EpRequirements.semanticTypeReq("http://data.ign.fr/def/ignf#CartesianCS";),
Labels.withId(EPSG_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.build())
diff --git
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/simple/GeometryValidationProcessor.java
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/simple/GeometryValidationProcessor.java
index 422d89d2f7..48362ef36f 100644
---
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/simple/GeometryValidationProcessor.java
+++
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/simple/GeometryValidationProcessor.java
@@ -69,11 +69,11 @@ public class GeometryValidationProcessor extends
StreamPipesDataProcessor {
.requiredStream(StreamRequirementsBuilder
.create()
.requiredPropertyWithUnaryMapping(
-
EpRequirements.domainPropertyReq("http://www.opengis.net/ont/geosparql#Geometry";),
+
EpRequirements.semanticTypeReq("http://www.opengis.net/ont/geosparql#Geometry";),
Labels.withId(GEOM_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.requiredPropertyWithUnaryMapping(
-
EpRequirements.domainPropertyReq("http://data.ign.fr/def/ignf#CartesianCS";),
+
EpRequirements.semanticTypeReq("http://data.ign.fr/def/ignf#CartesianCS";),
Labels.withId(EPSG_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.build())
diff --git
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversine/HaversineDistanceCalculatorProcessor.java
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversine/HaversineDistanceCalculatorProcessor.java
index 1a0b7d7d30..a80a143be0 100644
---
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversine/HaversineDistanceCalculatorProcessor.java
+++
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversine/HaversineDistanceCalculatorProcessor.java
@@ -62,19 +62,19 @@ public class HaversineDistanceCalculatorProcessor extends
StreamPipesDataProcess
.withLocales(Locales.EN)
.requiredStream(StreamRequirementsBuilder
.create()
-
.requiredPropertyWithUnaryMapping(EpRequirements.domainPropertyReq(Geo.LAT),
+
.requiredPropertyWithUnaryMapping(EpRequirements.semanticTypeReq(Geo.LAT),
Labels.withId(LAT_1_KEY), PropertyScope.MEASUREMENT_PROPERTY)
-
.requiredPropertyWithUnaryMapping(EpRequirements.domainPropertyReq(Geo.LNG),
+
.requiredPropertyWithUnaryMapping(EpRequirements.semanticTypeReq(Geo.LNG),
Labels.withId(LONG_1_KEY), PropertyScope.MEASUREMENT_PROPERTY)
-
.requiredPropertyWithUnaryMapping(EpRequirements.domainPropertyReq(Geo.LAT),
+
.requiredPropertyWithUnaryMapping(EpRequirements.semanticTypeReq(Geo.LAT),
Labels.withId(LAT_2_KEY), PropertyScope.MEASUREMENT_PROPERTY)
-
.requiredPropertyWithUnaryMapping(EpRequirements.domainPropertyReq(Geo.LNG),
+
.requiredPropertyWithUnaryMapping(EpRequirements.semanticTypeReq(Geo.LNG),
Labels.withId(LONG_2_KEY), PropertyScope.MEASUREMENT_PROPERTY)
.build()
)
.outputStrategy(OutputStrategies.append(PrimitivePropertyBuilder
.create(Datatypes.Float, DISTANCE_RUNTIME_NAME)
- .domainProperty(SO.NUMBER)
+ .semanticType(SO.NUMBER)
.measurementUnit(URI.create("http://qudt.org/vocab/unit#Kilometer";))
.build())
)
diff --git
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversinestatic/HaversineStaticDistanceCalculatorProcessor.java
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversinestatic/HaversineStaticDistanceCalculatorProcessor.java
index 320d69bbe7..187dce6633 100644
---
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversinestatic/HaversineStaticDistanceCalculatorProcessor.java
+++
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversinestatic/HaversineStaticDistanceCalculatorProcessor.java
@@ -65,11 +65,11 @@ public class HaversineStaticDistanceCalculatorProcessor
extends StreamPipesDataP
.requiredStream(StreamRequirementsBuilder
.create()
.requiredPropertyWithUnaryMapping(
- EpRequirements.domainPropertyReq(Geo.LAT),
+ EpRequirements.semanticTypeReq(Geo.LAT),
Labels.withId(LATITUDE_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.requiredPropertyWithUnaryMapping(
- EpRequirements.domainPropertyReq(Geo.LNG),
+ EpRequirements.semanticTypeReq(Geo.LNG),
Labels.withId(LONGITUDE_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.build()
@@ -78,7 +78,7 @@ public class HaversineStaticDistanceCalculatorProcessor
extends StreamPipesDataP
.requiredFloatParameter(Labels.withId(SELECTED_LONGITUDE_KEY))
.outputStrategy(OutputStrategies.append(PrimitivePropertyBuilder
.create(Datatypes.Float, DISTANCE_RUNTIME_NAME)
- .domainProperty(SO.NUMBER)
+ .semanticType(SO.NUMBER)
.measurementUnit(URI.create("http://qudt.org/vocab/unit#Kilometer";))
.build())
)
diff --git
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/revgeocoder/geocityname/GeoCityNameRevdecodeProcessor.java
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/revgeocoder/geocityname/GeoCityNameRevdecodeProcessor.java
index 17f7e0cd70..67c40690b7 100644
---
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/revgeocoder/geocityname/GeoCityNameRevdecodeProcessor.java
+++
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/revgeocoder/geocityname/GeoCityNameRevdecodeProcessor.java
@@ -65,10 +65,10 @@ public class GeoCityNameRevdecodeProcessor extends
StreamPipesDataProcessor {
.withLocales(Locales.EN)
.requiredStream(StreamRequirementsBuilder
.create()
-
.requiredPropertyWithUnaryMapping(EpRequirements.domainPropertyReq(Geo.LAT),
+
.requiredPropertyWithUnaryMapping(EpRequirements.semanticTypeReq(Geo.LAT),
Labels.withId(LATITUDE_MAPPING_KEY),
PropertyScope.NONE)
-
.requiredPropertyWithUnaryMapping(EpRequirements.domainPropertyReq(Geo.LNG),
+
.requiredPropertyWithUnaryMapping(EpRequirements.semanticTypeReq(Geo.LNG),
Labels.withId(LONGITUDE_MAPPING_KEY),
PropertyScope.NONE)
.build())
diff --git
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/speedcalculator/SpeedCalculatorProcessor.java
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/speedcalculator/SpeedCalculatorProcessor.java
index 8ce6949610..a67f3bfd64 100644
---
a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/speedcalculator/SpeedCalculatorProcessor.java
+++
b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/speedcalculator/SpeedCalculatorProcessor.java
@@ -67,16 +67,16 @@ public class SpeedCalculatorProcessor extends
StreamPipesDataProcessor {
.create()
.requiredPropertyWithUnaryMapping(EpRequirements.timestampReq(),
Labels.withId(TIMESTAMP_KEY), PropertyScope.HEADER_PROPERTY)
-
.requiredPropertyWithUnaryMapping(EpRequirements.domainPropertyReq(Geo.LAT)
+
.requiredPropertyWithUnaryMapping(EpRequirements.semanticTypeReq(Geo.LAT)
, Labels.withId(LATITUDE_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
-
.requiredPropertyWithUnaryMapping(EpRequirements.domainPropertyReq(Geo.LNG)
+
.requiredPropertyWithUnaryMapping(EpRequirements.semanticTypeReq(Geo.LNG)
, Labels.withId(LONGITUDE_KEY),
PropertyScope.MEASUREMENT_PROPERTY)
.build())
.requiredIntegerParameter(Labels.withId(COUNT_WINDOW_KEY))
.outputStrategy(
OutputStrategies.append(PrimitivePropertyBuilder
.create(Datatypes.Float, SPEED_RUNTIME_NAME)
- .domainProperty(SO.NUMBER)
+ .semanticType(SO.NUMBER)
.measurementUnit(URI.create("http://qudt.org/vocab/unit#KilometerPerHour";))
.build())
)
diff --git
a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/commons/RequiredBoxStream.java
b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/commons/RequiredBoxStream.java
index 93c0547385..8f417af6c7 100644
---
a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/commons/RequiredBoxStream.java
+++
b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/commons/RequiredBoxStream.java
@@ -31,10 +31,10 @@ public class RequiredBoxStream {
public static CollectedStreamRequirements getBoxStream() {
return StreamRequirementsBuilder
.create()
-
.requiredPropertyWithUnaryMapping(EpRequirements.domainPropertyReq("https://image.com";),
Labels
+
.requiredPropertyWithUnaryMapping(EpRequirements.semanticTypeReq("https://image.com";),
Labels
.withId(IMAGE_PROPERTY),
- PropertyScope.NONE)
-
.requiredPropertyWithUnaryMapping(EpRequirements.domainPropertyReqList("https://streampipes.org/boundingboxes";),
+ PropertyScope.NONE)
+
.requiredPropertyWithUnaryMapping(EpRequirements.semanticTypeReqList("https://streampipes.org/boundingboxes";),
Labels.withId(BOX_ARRAY_PROPERTY),
PropertyScope.NONE)
.build();
diff --git
a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/genericclassification/GenericImageClassificationProcessor.java
b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/genericclassification/GenericImageClassificationProcessor.java
index d4be3b03a9..a3262ff440 100644
---
a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/genericclassification/GenericImageClassificationProcessor.java
+++
b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/genericclassification/GenericImageClassificationProcessor.java
@@ -72,7 +72,7 @@ public class GenericImageClassificationProcessor extends
StreamPipesDataProcesso
.requiredStream(StreamRequirementsBuilder
.create()
.requiredPropertyWithUnaryMapping(EpRequirements
- .domainPropertyReq("https://image.com";), Labels.withId(
+ .semanticTypeReq("https://image.com";), Labels.withId(
ImagePropertyConstants.IMAGE_MAPPING.getProperty()),
PropertyScope.NONE)
.build())
.outputStrategy(OutputStrategies.append(
diff --git
a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/qrreader/QrCodeReaderProcessor.java
b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/qrreader/QrCodeReaderProcessor.java
index 59982cbfe9..182f98ae59 100644
---
a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/qrreader/QrCodeReaderProcessor.java
+++
b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/qrreader/QrCodeReaderProcessor.java
@@ -69,7 +69,7 @@ public class QrCodeReaderProcessor extends
StreamPipesDataProcessor {
.withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
.withLocales(Locales.EN)
.requiredStream(StreamRequirementsBuilder.create()
-
.requiredPropertyWithUnaryMapping(EpRequirements.domainPropertyReq("https://image.com";),
+
.requiredPropertyWithUnaryMapping(EpRequirements.semanticTypeReq("https://image.com";),
Labels.withId(RequiredBoxStream.IMAGE_PROPERTY),
PropertyScope.NONE)
.build())
.requiredSingleValueSelection(Labels.withId(SEND_IF_NO_RESULT),
Options.from("Yes", "No"))
diff --git
a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/buffer/StateBufferProcessor.java
b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/buffer/StateBufferProcessor.java
index c9a7d12812..734ff69d09 100644
---
a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/buffer/StateBufferProcessor.java
+++
b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/buffer/StateBufferProcessor.java
@@ -72,7 +72,7 @@ public class StateBufferProcessor extends
StreamPipesDataProcessor {
Labels.withId(TIMESTAMP_FIELD_ID),
PropertyScope.HEADER_PROPERTY)
.requiredPropertyWithUnaryMapping(
- EpRequirements.domainPropertyReqList(SPSensor.STATE),
+ EpRequirements.semanticTypeReqList(SPSensor.STATE),
Labels.withId(STATE_FIELD_ID),
PropertyScope.NONE)
.requiredPropertyWithUnaryMapping(
diff --git
a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/LabelerUtils.java
b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/LabelerUtils.java
index 6985af67b2..6736036787 100644
---
a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/LabelerUtils.java
+++
b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/LabelerUtils.java
@@ -43,7 +43,7 @@ public class LabelerUtils {
properties.add(PrimitivePropertyBuilder
.create(Datatypes.String, labelName)
.valueSpecification(labelName, "possible label values", labelStrings)
- .domainProperty(SPSensor.STATE)
+ .semanticType(SPSensor.STATE)
.scope(PropertyScope.DIMENSION_PROPERTY)
.build());
diff --git
a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/buffer/StateBufferLabelerProcessor.java
b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/buffer/StateBufferLabelerProcessor.java
index 85b5c948ca..8a09b578ac 100644
---
a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/buffer/StateBufferLabelerProcessor.java
+++
b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/buffer/StateBufferLabelerProcessor.java
@@ -94,7 +94,7 @@ public class StateBufferLabelerProcessor extends
StreamPipesDataProcessor
Labels.withId(SENSOR_VALUE_ID),
PropertyScope.NONE)
.requiredPropertyWithUnaryMapping(
- EpRequirements.domainPropertyReqList(SPSensor.STATE),
+ EpRequirements.semanticTypeReqList(SPSensor.STATE),
Labels.withId(STATE_FIELD_ID),
PropertyScope.NONE)
.build())
diff --git
a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/ListPropertyMatchTest.java
b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/ListPropertyMatchTest.java
index e84ba4c087..e238b533ff 100644
---
a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/ListPropertyMatchTest.java
+++
b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/ListPropertyMatchTest.java
@@ -31,7 +31,7 @@ public class ListPropertyMatchTest {
@Test
- public void matchSameDomainProperty() {
+ public void matchSameSemanticType() {
var semanticType = "http://test.org/property";;
EventPropertyList offer = new EventPropertyList();
diff --git
a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/TestPrimitivePropertyMatch.java
b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/TestPrimitivePropertyMatch.java
index 726f6d9af0..b5ef176135 100644
---
a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/TestPrimitivePropertyMatch.java
+++
b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/TestPrimitivePropertyMatch.java
@@ -61,7 +61,7 @@ public class TestPrimitivePropertyMatch {
public void testNegativePrimitivePropertyMatchDomain() {
EventPropertyPrimitive offer = EpProperties.integerEp(Labels.empty(),
"timestamp", Geo.LAT);
- EventPropertyPrimitive requirement =
EpRequirements.domainPropertyReq(Geo.LNG);
+ EventPropertyPrimitive requirement =
EpRequirements.semanticTypeReq(Geo.LNG);
List<MatchingResultMessage> errorLog = new ArrayList<>();
diff --git
a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/TestSchemaMatch.java
b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/TestSchemaMatch.java
index df5e6b4e78..524958c9ab 100644
---
a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/TestSchemaMatch.java
+++
b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/matching/v2/TestSchemaMatch.java
@@ -78,7 +78,7 @@ public class TestSchemaMatch {
EventPropertyPrimitive offer1 = EpProperties.integerEp(Labels.empty(),
"timestamp", Geo.LAT);
EventPropertyPrimitive offer2 = EpProperties.integerEp(Labels.empty(),
"timestamp", Geo.LNG);
- EventPropertyPrimitive requirement1 =
EpRequirements.domainPropertyReq(Geo.LAT);
+ EventPropertyPrimitive requirement1 =
EpRequirements.semanticTypeReq(Geo.LAT);
EventPropertyPrimitive requirement2 = EpRequirements.stringReq();
EventSchema offeredSchema = new EventSchema(Arrays.asList(offer1, offer2));
@@ -96,7 +96,7 @@ public class TestSchemaMatch {
EventPropertyPrimitive offer1 = EpProperties.integerEp(Labels.empty(),
"timestamp", Geo.LAT);
EventPropertyPrimitive offer2 = EpProperties.integerEp(Labels.empty(),
"timestamp", Geo.LNG);
- EventPropertyPrimitive requirement1 =
EpRequirements.domainPropertyReq(Geo.LAT);
+ EventPropertyPrimitive requirement1 =
EpRequirements.semanticTypeReq(Geo.LAT);
EventPropertyPrimitive requirement2 = EpRequirements.integerReq();
EventSchema offeredSchema = new EventSchema(Arrays.asList(offer1, offer2));
diff --git
a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/selector/TestSelectorUtils.java
b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/selector/TestSelectorUtils.java
index e830b41602..a257c335fd 100644
---
a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/selector/TestSelectorUtils.java
+++
b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/selector/TestSelectorUtils.java
@@ -35,12 +35,12 @@ public class TestSelectorUtils {
.property(EpProperties.timestampProperty("timestamp"))
.property(PrimitivePropertyBuilder
.create(Datatypes.Integer, "testMeasurement")
- .domainProperty(SO.NUMBER)
+ .semanticType(SO.NUMBER)
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.build())
.property(PrimitivePropertyBuilder
.create(Datatypes.Integer, "testDimension")
- .domainProperty(SO.NUMBER)
+ .semanticType(SO.NUMBER)
.scope(PropertyScope.DIMENSION_PROPERTY)
.build())
.property(EpProperties.stringEp(Labels.from("", "string", "string
description"), "testString",
diff --git
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/PrimitivePropertyBuilder.java
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/PrimitivePropertyBuilder.java
index d313fe301d..82cea97cbe 100644
---
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/PrimitivePropertyBuilder.java
+++
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/PrimitivePropertyBuilder.java
@@ -61,20 +61,6 @@ public class PrimitivePropertyBuilder {
return this;
}
- /**
- * @deprecated use {@link PrimitivePropertyBuilder#semanticType(String)}
instead.
- * Specifies the semantics of the property (e.g., whether a double value
stands for a latitude coordinate).
- *
- * @param semanticType The semantic type as a String. Use some
- * existing vocabulary from {@link
org.apache.streampipes.vocabulary} or create your own.
- * @return PrimitivePropertyBuilder
- */
- @Deprecated(forRemoval = true, since = "0.97.0")
- public PrimitivePropertyBuilder domainProperty(String semanticType) {
- this.eventProperty.setSemanticType(semanticType);
- return this;
- }
-
/**
* Defines the measurement unit (e.g., tons) of the event property.
*
diff --git
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/EpProperties.java
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/EpProperties.java
index a17247a2f3..daec2d22b1 100644
---
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/EpProperties.java
+++
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/EpProperties.java
@@ -95,13 +95,13 @@ public class EpProperties {
*
* @param label A human-readable label of the property
* @param runtimeName The field identifier of the event property at
runtime.
- * @param domainProperty The semantics of the list property as a String. The
string should correspond to a URI
+ * @param semanticType The semantics of the list property as a String. The
string should correspond to a URI
* provided by a vocabulary. Use one of the
vocabularies provided in
* {@link org.apache.streampipes.vocabulary} or create
your own domain-specific vocabulary.
* @return {@link org.apache.streampipes.model.schema.EventPropertyPrimitive}
*/
- public static EventPropertyList listIntegerEp(Label label, String
runtimeName, String domainProperty) {
- return listEp(label, runtimeName, Datatypes.Integer, domainProperty);
+ public static EventPropertyList listIntegerEp(Label label, String
runtimeName, String semanticType) {
+ return listEp(label, runtimeName, Datatypes.Integer, semanticType);
}
/**
@@ -109,13 +109,13 @@ public class EpProperties {
*
* @param label A human-readable label of the property
* @param runtimeName The field identifier of the event property at
runtime.
- * @param domainProperty The semantics of the list property as a String. The
string should correspond to a URI
+ * @param semanticType The semantics of the list property as a String. The
string should correspond to a URI
* provided by a vocabulary. Use one of the
vocabularies provided in
* {@link org.apache.streampipes.vocabulary} or create
your own domain-specific vocabulary.
* @return {@link org.apache.streampipes.model.schema.EventPropertyPrimitive}
*/
- public static EventPropertyList listLongEp(Label label, String runtimeName,
String domainProperty) {
- return listEp(label, runtimeName, Datatypes.Long, domainProperty);
+ public static EventPropertyList listLongEp(Label label, String runtimeName,
String semanticType) {
+ return listEp(label, runtimeName, Datatypes.Long, semanticType);
}
/**
@@ -123,13 +123,13 @@ public class EpProperties {
*
* @param label A human-readable label of the property
* @param runtimeName The field identifier of the event property at
runtime.
- * @param domainProperty The semantics of the list property as a String. The
string should correspond to a URI
+ * @param semanticType The semantics of the list property as a String. The
string should correspond to a URI
* provided by a vocabulary. Use one of the
vocabularies provided in
* {@link org.apache.streampipes.vocabulary} or create
your own domain-specific vocabulary.
* @return {@link org.apache.streampipes.model.schema.EventPropertyPrimitive}
*/
- public static EventPropertyList listDoubleEp(Label label, String
runtimeName, String domainProperty) {
- return listEp(label, runtimeName, Datatypes.Double, domainProperty);
+ public static EventPropertyList listDoubleEp(Label label, String
runtimeName, String semanticType) {
+ return listEp(label, runtimeName, Datatypes.Double, semanticType);
}
/**
@@ -137,13 +137,13 @@ public class EpProperties {
*
* @param label A human-readable label of the property
* @param runtimeName The field identifier of the event property at
runtime.
- * @param domainProperty The semantics of the list property as a String. The
string should correspond to a URI
+ * @param semanticType The semantics of the list property as a String. The
string should correspond to a URI
* provided by a vocabulary. Use one of the
vocabularies provided in
* {@link org.apache.streampipes.vocabulary} or create
your own domain-specific vocabulary.
* @return {@link org.apache.streampipes.model.schema.EventPropertyPrimitive}
*/
- public static EventPropertyList listStringEp(Label label, String
runtimeName, String domainProperty) {
- return listEp(label, runtimeName, Datatypes.String, domainProperty);
+ public static EventPropertyList listStringEp(Label label, String
runtimeName, String semanticType) {
+ return listEp(label, runtimeName, Datatypes.String, semanticType);
}
/**
@@ -151,21 +151,21 @@ public class EpProperties {
*
* @param label A human-readable label of the property
* @param runtimeName The field identifier of the event property at
runtime.
- * @param domainProperty The semantics of the list property as a String. The
string should correspond to a URI
+ * @param semanticType The semantics of the list property as a String. The
string should correspond to a URI
* provided by a vocabulary. Use one of the
vocabularies provided in
* {@link org.apache.streampipes.vocabulary} or create
your own domain-specific vocabulary.
* @return {@link org.apache.streampipes.model.schema.EventPropertyPrimitive}
*/
- public static EventPropertyList listBooleanEp(Label label, String
runtimeName, String domainProperty) {
- return listEp(label, runtimeName, Datatypes.Boolean, domainProperty);
+ public static EventPropertyList listBooleanEp(Label label, String
runtimeName, String semanticType) {
+ return listEp(label, runtimeName, Datatypes.Boolean, semanticType);
}
public static EventPropertyList listEp(Label label, String runtimeName,
Datatypes runtimeType, String
- domainProperty) {
+ semanticType) {
return getPreparedProperty(label, new EventPropertyList(runtimeName,
ep(Labels.empty(), runtimeType
.toString(),
runtimeName,
- domainProperty)));
+ semanticType)));
}
/**
@@ -197,54 +197,54 @@ public class EpProperties {
* Creates a new primitive property of type boolean and the provided domain
property.
*
* @param runtimeName The field identifier of the event property at
runtime.
- * @param domainProperty The semantics of the list property as a String. The
string should correspond to a URI
+ * @param semanticType The semantics of the list property as a String. The
string should correspond to a URI
* provided by a vocabulary. Use one of the
vocabularies provided in
* {@link org.apache.streampipes.vocabulary} or create
your own domain-specific vocabulary.
* @return {@link org.apache.streampipes.model.schema.EventPropertyPrimitive}
*/
- public static EventPropertyPrimitive booleanEp(Label label, String
runtimeName, String domainProperty) {
- return ep(label, XSD.BOOLEAN.toString(), runtimeName, domainProperty);
+ public static EventPropertyPrimitive booleanEp(Label label, String
runtimeName, String semanticType) {
+ return ep(label, XSD.BOOLEAN.toString(), runtimeName, semanticType);
}
/**
* Creates a new primitive property of type number and the provided domain
property.
*
* @param runtimeName The field identifier of the event property at
runtime.
- * @param domainProperty The semantics of the list property as a String. The
string should correspond to a URI
+ * @param semanticType The semantics of the list property as a String. The
string should correspond to a URI
* provided by a vocabulary. Use one of the
vocabularies provided in
* {@link org.apache.streampipes.vocabulary} or create
your own domain-specific vocabulary.
* @return {@link org.apache.streampipes.model.schema.EventPropertyPrimitive}
*/
- public static EventPropertyPrimitive numberEp(Label label, String
runtimeName, String domainProperty) {
- return ep(label, SO.NUMBER, runtimeName, domainProperty);
+ public static EventPropertyPrimitive numberEp(Label label, String
runtimeName, String semanticType) {
+ return ep(label, SO.NUMBER, runtimeName, semanticType);
}
/**
* Creates a new primitive property of type string and the provided domain
property.
*
* @param runtimeName The field identifier of the event property at
runtime.
- * @param domainProperty The semantics of the list property as a String. The
string should correspond to a URI
+ * @param semanticType The semantics of the list property as a String. The
string should correspond to a URI
* provided by a vocabulary. Use one of the
vocabularies provided in
* {@link org.apache.streampipes.vocabulary} or create
your own domain-specific vocabulary.
* @return {@link org.apache.streampipes.model.schema.EventPropertyPrimitive}
*/
- public static EventPropertyPrimitive stringEp(Label label, String
runtimeName, String domainProperty) {
- return ep(label, XSD.STRING.toString(), runtimeName, domainProperty);
+ public static EventPropertyPrimitive stringEp(Label label, String
runtimeName, String semanticType) {
+ return ep(label, XSD.STRING.toString(), runtimeName, semanticType);
}
/**
* Creates a new primitive property of type string and the provided domain
property.
*
* @param runtimeName The field identifier of the event property at
runtime.
- * @param domainProperty The semantics of the list property as a String. The
string should correspond to a URI
+ * @param semanticType The semantics of the list property as a String. The
string should correspond to a URI
* provided by a vocabulary. Use one of the
vocabularies provided in
* {@link org.apache.streampipes.vocabulary} or create
your own domain-specific vocabulary.
* @param propertyScope The scope for the property, whether it is a HEADER,
MEASUREMENT, od DIMENSION property
* @return {@link org.apache.streampipes.model.schema.EventPropertyPrimitive}
*/
- public static EventPropertyPrimitive stringEp(Label label, String
runtimeName, String domainProperty,
+ public static EventPropertyPrimitive stringEp(Label label, String
runtimeName, String semanticType,
PropertyScope propertyScope) {
- EventPropertyPrimitive ep = ep(label, XSD.STRING.toString(), runtimeName,
domainProperty);
+ EventPropertyPrimitive ep = ep(label, XSD.STRING.toString(), runtimeName,
semanticType);
ep.setPropertyScope(propertyScope.name());
return ep;
}
@@ -254,15 +254,15 @@ public class EpProperties {
* of the property is restricted to the defined {@link
org.apache.streampipes.model.schema.Enumeration}
*
* @param runtimeName The field identifier of the event property at
runtime.
- * @param domainProperty The semantics of the list property as a String. The
string should correspond to a URI
+ * @param semanticType The semantics of the list property as a String. The
string should correspond to a URI
* provided by a vocabulary. Use one of the
vocabularies provided in
* {@link org.apache.streampipes.vocabulary} or create
your own domain-specific vocabulary.
* @param enumeration The allowed values of the event property at runtime.
* @return {@link org.apache.streampipes.model.schema.EventPropertyPrimitive}
*/
- public static EventPropertyPrimitive stringEp(Label label, String
runtimeName, String domainProperty, Enumeration
+ public static EventPropertyPrimitive stringEp(Label label, String
runtimeName, String semanticType, Enumeration
enumeration) {
- EventPropertyPrimitive ep = ep(label, XSD.STRING.toString(), runtimeName,
domainProperty);
+ EventPropertyPrimitive ep = ep(label, XSD.STRING.toString(), runtimeName,
semanticType);
ep.setValueSpecification(enumeration);
return ep;
}
@@ -329,25 +329,25 @@ public class EpProperties {
return ep(label, XSD.LONG.toString(), runtimeName, domainProperties);
}
- public static EventPropertyPrimitive integerEp(Label label, String
runtimeName, String domainProperty, Float
+ public static EventPropertyPrimitive integerEp(Label label, String
runtimeName, String semanticType, Float
minValue, Float maxValue, Float step) {
- return integerEp(label, runtimeName, domainProperty, new
QuantitativeValue(minValue, maxValue, step));
+ return integerEp(label, runtimeName, semanticType, new
QuantitativeValue(minValue, maxValue, step));
}
- public static EventPropertyPrimitive integerEp(Label label, String
runtimeName, String domainProperty,
+ public static EventPropertyPrimitive integerEp(Label label, String
runtimeName, String semanticType,
QuantitativeValue
valueSpecification) {
- EventPropertyPrimitive ep = ep(label, XSD.INTEGER.toString(), runtimeName,
domainProperty);
+ EventPropertyPrimitive ep = ep(label, XSD.INTEGER.toString(), runtimeName,
semanticType);
ep.setValueSpecification(valueSpecification);
return ep;
}
- public static EventPropertyPrimitive doubleEp(Label label, String
runtimeName, String domainProperty) {
- return ep(label, XSD.DOUBLE.toString(), runtimeName, domainProperty);
+ public static EventPropertyPrimitive doubleEp(Label label, String
runtimeName, String semanticType) {
+ return ep(label, XSD.DOUBLE.toString(), runtimeName, semanticType);
}
- public static EventPropertyPrimitive doubleEp(Label label, String
runtimeName, String domainProperty, Float minValue,
+ public static EventPropertyPrimitive doubleEp(Label label, String
runtimeName, String semanticType, Float minValue,
Float maxValue, Float step) {
- EventPropertyPrimitive ep = ep(label, XSD.DOUBLE.toString(), runtimeName,
domainProperty);
+ EventPropertyPrimitive ep = ep(label, XSD.DOUBLE.toString(), runtimeName,
semanticType);
ep.setValueSpecification(new QuantitativeValue(minValue, maxValue, step));
return ep;
}
diff --git
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/EpRequirements.java
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/EpRequirements.java
index 77afed7fe7..7be564dd3c 100644
---
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/EpRequirements.java
+++
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/EpRequirements.java
@@ -103,24 +103,24 @@ public class EpRequirements {
return new EventPropertyPrimitive();
}
- public static EventPropertyPrimitive booleanReq(String domainProperty) {
- return appendDomainProperty(datatypeReq(XSD.BOOLEAN.toString()),
domainProperty);
+ public static EventPropertyPrimitive booleanReq(String semanticType) {
+ return appendSemanticType(datatypeReq(XSD.BOOLEAN.toString()),
semanticType);
}
- public static EventPropertyPrimitive integerReq(String domainProperty) {
- return appendDomainProperty(datatypeReq(XSD.INTEGER.toString()),
domainProperty);
+ public static EventPropertyPrimitive integerReq(String semanticType) {
+ return appendSemanticType(datatypeReq(XSD.INTEGER.toString()),
semanticType);
}
- public static EventPropertyPrimitive doubleReq(String domainProperty) {
- return appendDomainProperty(datatypeReq(XSD.DOUBLE.toString()),
domainProperty);
+ public static EventPropertyPrimitive doubleReq(String semanticType) {
+ return appendSemanticType(datatypeReq(XSD.DOUBLE.toString()),
semanticType);
}
- public static EventPropertyPrimitive stringReq(String domainProperty) {
- return appendDomainProperty(datatypeReq(XSD.STRING.toString()),
domainProperty);
+ public static EventPropertyPrimitive stringReq(String semanticType) {
+ return appendSemanticType(datatypeReq(XSD.STRING.toString()),
semanticType);
}
- public static EventPropertyPrimitive numberReq(String domainProperty) {
- return appendDomainProperty(datatypeReq(SO.NUMBER), domainProperty);
+ public static EventPropertyPrimitive numberReq(String semanticType) {
+ return appendSemanticType(datatypeReq(SO.NUMBER), semanticType);
}
private static <T extends EventProperty> EventProperty
semanticTypeReq(String semanticType,
@@ -143,32 +143,13 @@ public class EpRequirements {
return (EventPropertyList) semanticTypeReq(semanticType,
EventPropertyList.class);
}
- /**
- * @param domainProperty the semantic type
- * @return EventPropertyPrimitive
- * @deprecated Use {@link EpRequirements#semanticTypeReq(String)} instead
- */
- @Deprecated(forRemoval = true, since = "0.97.0")
- public static EventPropertyPrimitive domainPropertyReq(String
domainProperty) {
- return (EventPropertyPrimitive) semanticTypeReq(domainProperty,
EventPropertyPrimitive.class);
- }
-
- /**
- * @param domainProperty the semantic type
- * @return EventPropertyList
- * @deprecated Use {@link EpRequirements#semanticTypeReqList(String)} instead
- */
- @Deprecated(forRemoval = true, since = "0.97.0")
- public static EventPropertyList domainPropertyReqList(String domainProperty)
{
- return (EventPropertyList) semanticTypeReq(domainProperty,
EventPropertyList.class);
- }
- private static EventPropertyPrimitive
appendDomainProperty(EventPropertyPrimitive property, String semanticType) {
+ private static EventPropertyPrimitive
appendSemanticType(EventPropertyPrimitive property, String semanticType) {
property.setSemanticType(semanticType);
return property;
}
public static EventPropertyPrimitive timestampReq() {
- return domainPropertyReq("http://schema.org/DateTime";);
+ return semanticTypeReq("http://schema.org/DateTime";);
}
}
