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/06/16 22:10:53 UTC
[incubator-streampipes] branch STREAMPIPES-319 updated:
[STREAMPIPES-376] Remove Empire annotations from model classes
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-319
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/STREAMPIPES-319 by this push:
new 3aff7b6 [STREAMPIPES-376] Remove Empire annotations from model classes
3aff7b6 is described below
commit 3aff7b6282bb8be644c7cfe516501382143252d8
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Thu Jun 17 00:10:34 2021 +0200
[STREAMPIPES-376] Remove Empire annotations from model classes
---
.../stream/EventRateTransformationRule.java | 5 --
streampipes-model/pom.xml | 12 -----
.../apache/streampipes/model/ApplicationLink.java | 13 -----
.../apache/streampipes/model/ErrorMessageLd.java | 6 ---
.../org/apache/streampipes/model/MessageLd.java | 21 +-------
.../apache/streampipes/model/NotificationLd.java | 15 ------
.../org/apache/streampipes/model/SpDataSet.java | 14 -----
.../org/apache/streampipes/model/SpDataStream.java | 23 ---------
.../streampipes/model/SpDataStreamContainer.java | 14 -----
.../model/base/AbstractStreamPipesEntity.java | 31 +-----------
.../model/base/ConsumableStreamPipesEntity.java | 15 ------
.../model/base/InvocableStreamPipesEntity.java | 25 ---------
.../model/base/NamedStreamPipesEntity.java | 23 ---------
.../apache/streampipes/model/base/Namespaces.java | 8 +--
.../model/base/StreamPipesJsonLdContainer.java | 59 ----------------------
.../model/connect/adapter/AdapterDescription.java | 25 ---------
.../connect/adapter/AdapterDescriptionList.java | 14 +----
.../connect/adapter/AdapterSetDescription.java | 10 ----
.../connect/adapter/AdapterStreamDescription.java | 10 ----
.../adapter/GenericAdapterSetDescription.java | 11 ----
.../adapter/GenericAdapterStreamDescription.java | 11 ----
.../adapter/SpecificAdapterSetDescription.java | 7 ---
.../adapter/SpecificAdapterStreamDescription.java | 7 ---
.../model/connect/grounding/FormatDescription.java | 13 -----
.../connect/grounding/FormatDescriptionList.java | 14 -----
.../connect/grounding/ProtocolDescription.java | 18 -------
.../connect/grounding/ProtocolDescriptionList.java | 15 ------
.../connect/grounding/ProtocolSetDescription.java | 6 ---
.../grounding/ProtocolStreamDescription.java | 6 ---
.../connect/guess/DomainPropertyProbability.java | 11 ----
.../guess/DomainPropertyProbabilityList.java | 14 -----
.../model/connect/guess/GuessSchema.java | 15 ------
.../rules/TransformationRuleDescription.java | 8 ---
.../rules/schema/CreateNestedRuleDescription.java | 12 +----
.../rules/schema/DeleteRuleDescription.java | 12 +----
.../connect/rules/schema/MoveRuleDescription.java | 12 -----
.../rules/schema/RenameRuleDescription.java | 12 -----
.../SchemaTransformationRuleDescription.java | 1 -
.../EventRateTransformationRuleDescription.java | 12 -----
...oveDuplicatesTransformationRuleDescription.java | 12 -----
.../rules/value/AddTimestampRuleDescription.java | 11 ----
.../AddValueTransformationRuleDescription.java | 12 -----
...rrectionValueTransformationRuleDescription.java | 13 -----
.../TimestampTranfsformationRuleDescription.java | 14 -----
.../rules/value/UnitTransformRuleDescription.java | 13 -----
.../connect/worker/ConnectWorkerContainer.java | 18 -------
.../model/dashboard/DashboardEntity.java | 11 ----
.../model/dashboard/DashboardModel.java | 7 ---
.../model/dashboard/DashboardWidgetSettings.java | 16 ------
.../model/datalake/DataExplorerWidgetModel.java | 20 --------
.../model/datalake/DataLakeMeasure.java | 14 -----
.../model/graph/DataProcessorDescription.java | 15 ------
.../model/graph/DataProcessorInvocation.java | 15 ------
.../model/graph/DataSinkDescription.java | 14 +----
.../model/graph/DataSinkInvocation.java | 12 -----
.../model/graph/DataSourceDescription.java | 14 +----
.../model/graph/PipelineElementContainer.java | 12 -----
.../model/grounding/EventGrounding.java | 16 +-----
.../model/grounding/JmsTransportProtocol.java | 11 +---
.../model/grounding/KafkaTransportProtocol.java | 18 -------
.../model/grounding/MqttTransportProtocol.java | 9 ----
.../model/grounding/SimpleTopicDefinition.java | 7 ---
.../model/grounding/TopicDefinition.java | 10 ----
.../model/grounding/TransportFormat.java | 16 +-----
.../model/grounding/TransportProtocol.java | 11 ----
.../model/grounding/WildcardTopicDefinition.java | 14 -----
.../model/grounding/WildcardTopicMapping.java | 10 ----
.../apache/streampipes/model/labeling/Label.java | 1 -
.../monitoring/ElementStatusInfoSettings.java | 12 -----
.../model/output/AppendOutputStrategy.java | 13 -----
.../model/output/CustomOutputStrategy.java | 17 +------
.../output/CustomTransformOutputStrategy.java | 13 -----
.../model/output/FixedOutputStrategy.java | 15 +-----
.../model/output/KeepOutputStrategy.java | 10 ----
.../model/output/ListOutputStrategy.java | 9 ----
.../streampipes/model/output/OutputStrategy.java | 11 ----
.../model/output/PropertyRenameRule.java | 9 ----
.../model/output/TransformOperation.java | 11 ----
.../model/output/TransformOutputStrategy.java | 13 -----
.../model/output/UserDefinedOutputStrategy.java | 12 -----
.../model/pipeline/ElementComposition.java | 5 --
.../streampipes/model/pipeline/Pipeline.java | 6 ---
.../apache/streampipes/model/quality/Accuracy.java | 12 +----
.../quality/EventPropertyQualityDefinition.java | 8 ---
.../quality/EventPropertyQualityRequirement.java | 14 -----
.../quality/EventStreamQualityDefinition.java | 10 +---
.../quality/EventStreamQualityRequirement.java | 15 ------
.../streampipes/model/quality/Frequency.java | 10 ----
.../apache/streampipes/model/quality/Latency.java | 12 +----
.../model/quality/MeasurementCapability.java | 10 +---
.../model/quality/MeasurementObject.java | 10 +---
.../model/quality/MeasurementProperty.java | 6 ---
.../model/quality/MeasurementRange.java | 11 ----
.../streampipes/model/quality/Precision.java | 12 +----
.../streampipes/model/quality/Resolution.java | 12 +----
.../model/runtime/RuntimeOptionsRequest.java | 17 -------
.../model/runtime/RuntimeOptionsResponse.java | 12 -----
.../streampipes/model/schema/Enumeration.java | 25 ++-------
.../streampipes/model/schema/EventProperty.java | 25 ---------
.../model/schema/EventPropertyList.java | 12 -----
.../model/schema/EventPropertyNested.java | 15 +-----
.../model/schema/EventPropertyPrimitive.java | 14 -----
.../streampipes/model/schema/EventSchema.java | 15 ------
.../model/schema/QuantitativeValue.java | 13 +----
.../model/schema/ValueSpecification.java | 8 ---
.../model/staticproperty/AnyStaticProperty.java | 7 ---
.../staticproperty/CodeInputStaticProperty.java | 11 ----
.../staticproperty/CollectionStaticProperty.java | 18 -------
.../staticproperty/ColorPickerStaticProperty.java | 9 ----
.../model/staticproperty/DomainStaticProperty.java | 13 -----
.../model/staticproperty/FileStaticProperty.java | 10 ----
.../staticproperty/FreeTextStaticProperty.java | 22 --------
.../model/staticproperty/MappingProperty.java | 14 -----
.../model/staticproperty/MappingPropertyNary.java | 13 -----
.../model/staticproperty/MappingPropertyUnary.java | 9 ----
.../staticproperty/MatchingStaticProperty.java | 12 +----
.../model/staticproperty/OneOfStaticProperty.java | 6 ---
.../streampipes/model/staticproperty/Option.java | 12 +----
.../staticproperty/PropertyValueSpecification.java | 16 ++----
.../staticproperty/RemoteOneOfStaticProperty.java | 16 ------
.../RuntimeResolvableAnyStaticProperty.java | 13 -----
.../RuntimeResolvableOneOfStaticProperty.java | 13 -----
.../model/staticproperty/SecretStaticProperty.java | 10 ----
.../staticproperty/SelectionStaticProperty.java | 11 ----
.../model/staticproperty/StaticProperty.java | 17 -------
.../staticproperty/StaticPropertyAlternative.java | 16 ------
.../staticproperty/StaticPropertyAlternatives.java | 14 -----
.../model/staticproperty/StaticPropertyGroup.java | 15 ------
.../model/staticproperty/SupportedProperty.java | 11 ----
.../model/template/BoundPipelineElement.java | 13 -----
.../template/PipelineTemplateDescription.java | 12 -----
.../PipelineTemplateDescriptionContainer.java | 12 -----
.../model/template/PipelineTemplateInvocation.java | 12 -----
133 files changed, 30 insertions(+), 1707 deletions(-)
diff --git a/streampipes-connect/src/main/java/org/apache/streampipes/connect/adapter/preprocessing/transform/stream/EventRateTransformationRule.java b/streampipes-connect/src/main/java/org/apache/streampipes/connect/adapter/preprocessing/transform/stream/EventRateTransformationRule.java
index 2277f94..86b4a88 100644
--- a/streampipes-connect/src/main/java/org/apache/streampipes/connect/adapter/preprocessing/transform/stream/EventRateTransformationRule.java
+++ b/streampipes-connect/src/main/java/org/apache/streampipes/connect/adapter/preprocessing/transform/stream/EventRateTransformationRule.java
@@ -18,19 +18,14 @@
package org.apache.streampipes.connect.adapter.preprocessing.transform.stream;
-import io.fogsy.empire.annotations.RdfProperty;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
import java.util.LinkedList;
import java.util.Map;
public class EventRateTransformationRule implements StreamTransformationRule {
- @RdfProperty(StreamPipes.FILTER_TIME_WINDOW)
private long aggregationTimeWindow;
//none (Values from last event), max, min, mean, sum (of the values in the time window)
- @RdfProperty(StreamPipes.AGGREGATION_TYPE)
private String aggregationType;
private LinkedList<Map<String, Object>> eventStorage = new LinkedList<>();
diff --git a/streampipes-model/pom.xml b/streampipes-model/pom.xml
index ad55eeb..33d05c0 100644
--- a/streampipes-model/pom.xml
+++ b/streampipes-model/pom.xml
@@ -64,18 +64,6 @@
<groupId>com.github.drapostolos</groupId>
<artifactId>type-parser</artifactId>
</dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- </dependency>
- <dependency>
- <groupId>io.fogsy</groupId>
- <artifactId>empire-api</artifactId>
- </dependency>
- <dependency>
- <groupId>io.fogsy</groupId>
- <artifactId>empire-annotations</artifactId>
- </dependency>
<!-- Test dependencies -->
<dependency>
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/ApplicationLink.java b/streampipes-model/src/main/java/org/apache/streampipes/model/ApplicationLink.java
index 64615dc..24340b1 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/ApplicationLink.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/ApplicationLink.java
@@ -18,31 +18,18 @@
package org.apache.streampipes.model;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.RDFS;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.APPLICATION_LINK)
-@Entity
public class ApplicationLink extends UnnamedStreamPipesEntity {
- @RdfProperty(RDFS.LABEL)
private String applicationName;
- @RdfProperty(RDFS.DESCRIPTION)
private String applicationDescription;
- @RdfProperty(StreamPipes.APPLICATION_URL)
private String applicationUrl;
- @RdfProperty(StreamPipes.ICON_URL)
private String applicationIconUrl;
- @RdfProperty(StreamPipes.APPLICATION_LINK_TYPE)
private String applicationLinkType;
public ApplicationLink() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/ErrorMessageLd.java b/streampipes-model/src/main/java/org/apache/streampipes/model/ErrorMessageLd.java
index 46d5ea0..091f35b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/ErrorMessageLd.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/ErrorMessageLd.java
@@ -18,14 +18,8 @@
package org.apache.streampipes.model;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
import java.util.List;
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.ERROR_MESSAGE)
public class ErrorMessageLd extends MessageLd {
public ErrorMessageLd() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/MessageLd.java b/streampipes-model/src/main/java/org/apache/streampipes/model/MessageLd.java
index f8231cf..67529e4 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/MessageLd.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/MessageLd.java
@@ -19,40 +19,21 @@
package org.apache.streampipes.model;
import org.apache.commons.lang.RandomStringUtils;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfId;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.MESSAGE)
-@Entity
public class MessageLd {
private static final String prefix = "urn:streampipes.org:spi:";
- @RdfId
- @RdfProperty(StreamPipes.HAS_ELEMENT_NAME)
private String elementId;
- @RdfProperty(StreamPipes.MESSAGE_SUCCESS)
private boolean success;
- @RdfProperty(StreamPipes.MESSAGE_ELEMENT_NAME)
private String elementName;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.NOTIFICATIONS)
private List<NotificationLd> notifications;
public MessageLd() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/NotificationLd.java b/streampipes-model/src/main/java/org/apache/streampipes/model/NotificationLd.java
index 131c59f..7cbb272 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/NotificationLd.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/NotificationLd.java
@@ -19,32 +19,17 @@
package org.apache.streampipes.model;
import org.apache.commons.lang.RandomStringUtils;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfId;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.NOTIFICATION)
-@Entity
public class NotificationLd {
private static final String prefix = "urn:streampipes.org:spi:";
- @RdfId
- @RdfProperty(StreamPipes.HAS_ELEMENT_NAME)
private String elementId;
- @RdfProperty(StreamPipes.NOTIFICATION_TITLE)
private String title;
- @RdfProperty(StreamPipes.NOTIFICATION_DESCRIPTION)
private String description;
- @RdfProperty(StreamPipes.NOTIFICATION_ADDITIONAL_INFORMATION)
private String additionalInformation;
public NotificationLd() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataSet.java b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataSet.java
index 918786d..66bf4d2 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataSet.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataSet.java
@@ -17,34 +17,20 @@
*/
package org.apache.streampipes.model;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.grounding.EventGrounding;
import org.apache.streampipes.model.quality.EventStreamQualityDefinition;
import org.apache.streampipes.model.schema.EventSchema;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToOne;
import java.util.List;
-@RdfsClass(StreamPipes.DATA_SET)
-@Entity
public class SpDataSet extends SpDataStream {
private static final String prefix = "urn:fzi.de:dataset:";
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.SUPPORTED_GROUNDING)
private EventGrounding supportedGrounding;
- @RdfProperty(StreamPipes.DATA_SET_INVOCATION_ID)
private String datasetInvocationId;
- @RdfProperty(StreamPipes.CORRESPONDING_PIPELINE)
private String correspondingPipeline;
public SpDataSet(String uri, String name, String description, String iconUrl, List<EventStreamQualityDefinition>
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStream.java b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStream.java
index 5e3b483..7d45e3a 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStream.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStream.java
@@ -19,8 +19,6 @@
package org.apache.streampipes.model;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.grounding.EventGrounding;
@@ -30,15 +28,11 @@ import org.apache.streampipes.model.quality.MeasurementCapability;
import org.apache.streampipes.model.quality.MeasurementObject;
import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.*;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-@RdfsClass(StreamPipes.DATA_STREAM)
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(SpDataStream.class),
@JsonSubTypes.Type(SpDataSet.class)
@@ -49,37 +43,20 @@ public class SpDataStream extends NamedStreamPipesEntity {
private static final String prefix = "urn:fzi.de:eventstream:";
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.PERSIST, CascadeType.MERGE})
- @RdfProperty(StreamPipes.HAS_EVENT_STREAM_QUALITY_DEFINITION)
protected transient List<EventStreamQualityDefinition> hasEventStreamQualities;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.PERSIST, CascadeType.MERGE})
- @RdfProperty(StreamPipes.HAS_EVENT_STREAM_QUALITY_REQUIREMENT)
protected transient List<EventStreamQualityRequirement> requiresEventStreamQualities;
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.PERSIST, CascadeType.MERGE})
- @RdfProperty(StreamPipes.HAS_GROUNDING)
protected EventGrounding eventGrounding;
- @OneToOne(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_SCHEMA)
protected EventSchema eventSchema;
- @RdfProperty(StreamPipes.HAS_MEASUREMENT_CAPABILTIY)
- @OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
protected List<MeasurementCapability> measurementCapability;
- @RdfProperty(StreamPipes.HAS_MEASUREMENT_OBJECT)
- @OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
protected List<MeasurementObject> measurementObject;
- @RdfProperty(StreamPipes.INDEX)
private int index;
- @RdfProperty(StreamPipes.HAS_CORRESPONDING_ADAPTER_ID)
private String correspondingAdapterId;
protected List<String> category;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStreamContainer.java b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStreamContainer.java
index 67e7625..93bf310 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStreamContainer.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStreamContainer.java
@@ -17,27 +17,13 @@
*/
package org.apache.streampipes.model;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass(StreamPipes.DATA_STREAM_CONTAINER)
-@Entity
public class SpDataStreamContainer extends UnnamedStreamPipesEntity {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty("sp:list")
private List<SpDataStream> list;
public SpDataStreamContainer() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/base/AbstractStreamPipesEntity.java b/streampipes-model/src/main/java/org/apache/streampipes/model/base/AbstractStreamPipesEntity.java
index 546b77a..d73a476 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/base/AbstractStreamPipesEntity.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/base/AbstractStreamPipesEntity.java
@@ -19,19 +19,11 @@
package org.apache.streampipes.model.base;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.google.gson.annotations.SerializedName;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfId;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.api.SupportsRdfId;
-import org.apache.streampipes.model.shared.annotation.TsIgnore;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import org.apache.streampipes.vocabulary.*;
import java.io.Serializable;
-import java.net.URI;
import java.util.Objects;
@@ -39,17 +31,12 @@ import java.util.Objects;
* top-level StreamPipes element
*/
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS,
- "dc", "http://purl.org/dc/terms/", RDFS.NS_PREFIX, RDFS.NS, RDF.NS_PREFIX, RDF.NS, SO.NS_PREFIX, SO.NS,
- SSN.NS_PREFIX, SSN.NS})
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property="@class")
@TsModel
-public class AbstractStreamPipesEntity implements SupportsRdfId, Serializable {
+public class AbstractStreamPipesEntity implements Serializable {
private static final long serialVersionUID = -8593749314663582071L;
- @RdfProperty(StreamPipes.HAS_URI)
- @RdfId
protected @SerializedName("_id") String elementId;
AbstractStreamPipesEntity() {
@@ -60,22 +47,6 @@ public class AbstractStreamPipesEntity implements SupportsRdfId, Serializable {
this.elementId = other.getElementId();
}
- @SuppressWarnings("rawtypes")
- @Override
- @JsonIgnore
- @TsIgnore
- public RdfKey getRdfId() {
- return new URIKey(URI.create(getElementId()));
- }
-
- @SuppressWarnings("rawtypes")
- @Override
- @JsonIgnore
- @TsIgnore
- public void setRdfId(RdfKey arg0) {
- this.elementId = arg0.toString();
- }
-
public String getElementId() {
return elementId;
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/base/ConsumableStreamPipesEntity.java b/streampipes-model/src/main/java/org/apache/streampipes/model/base/ConsumableStreamPipesEntity.java
index 6ecf3af..67be041 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/base/ConsumableStreamPipesEntity.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/base/ConsumableStreamPipesEntity.java
@@ -18,17 +18,11 @@
package org.apache.streampipes.model.base;
-import io.fogsy.empire.annotations.RdfProperty;
import org.apache.streampipes.model.SpDataStream;
import org.apache.streampipes.model.grounding.EventGrounding;
import org.apache.streampipes.model.staticproperty.StaticProperty;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
import java.util.ArrayList;
import java.util.List;
@@ -36,19 +30,10 @@ public abstract class ConsumableStreamPipesEntity extends NamedStreamPipesEntity
private static final long serialVersionUID = -6617391345752016449L;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.REQUIRES_STREAM)
protected List<SpDataStream> spDataStreams;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_STATIC_PROPERTY)
protected List<StaticProperty> staticProperties;
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.SUPPORTED_GROUNDING)
private EventGrounding supportedGrounding;
public ConsumableStreamPipesEntity() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/base/InvocableStreamPipesEntity.java b/streampipes-model/src/main/java/org/apache/streampipes/model/base/InvocableStreamPipesEntity.java
index b3b087e..e4a7517 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/base/InvocableStreamPipesEntity.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/base/InvocableStreamPipesEntity.java
@@ -18,7 +18,6 @@
package org.apache.streampipes.model.base;
-import io.fogsy.empire.annotations.RdfProperty;
import org.apache.streampipes.logging.LoggerFactory;
import org.apache.streampipes.logging.api.Logger;
import org.apache.streampipes.model.SpDataStream;
@@ -26,53 +25,29 @@ import org.apache.streampipes.model.grounding.EventGrounding;
import org.apache.streampipes.model.monitoring.ElementStatusInfoSettings;
import org.apache.streampipes.model.staticproperty.StaticProperty;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
import java.util.List;
public abstract class InvocableStreamPipesEntity extends NamedStreamPipesEntity {
private static final long serialVersionUID = 2727573914765473470L;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.RECEIVES_STREAM)
protected List<SpDataStream> inputStreams;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_STATIC_PROPERTY)
protected List<StaticProperty> staticProperties;
- @RdfProperty(StreamPipes.BELONGS_TO)
private String belongsTo;
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.PERSIST, CascadeType.MERGE})
- @RdfProperty(StreamPipes.STATUS_INFO_SETTINGS)
private ElementStatusInfoSettings statusInfoSettings;
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.PERSIST, CascadeType.MERGE})
- @RdfProperty(StreamPipes.SUPPORTED_GROUNDING)
private EventGrounding supportedGrounding;
- @RdfProperty(StreamPipes.CORRESPONDING_PIPELINE)
private String correspondingPipeline;
- @RdfProperty(StreamPipes.CORRESPONDING_USER)
private String correspondingUser;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.REQUIRES_STREAM)
private List<SpDataStream> streamRequirements;
- //@RdfProperty(StreamPipes.PE_CONFIGURED)
private boolean configured;
private boolean uncompleted;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/base/NamedStreamPipesEntity.java b/streampipes-model/src/main/java/org/apache/streampipes/model/base/NamedStreamPipesEntity.java
index f3f8319..b714d59 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/base/NamedStreamPipesEntity.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/base/NamedStreamPipesEntity.java
@@ -21,15 +21,9 @@ package org.apache.streampipes.model.base;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
-import io.fogsy.empire.annotations.RdfProperty;
import org.apache.streampipes.model.ApplicationLink;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.RDFS;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
@@ -40,44 +34,27 @@ public abstract class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
private static final long serialVersionUID = -98951691820519795L;
- @RdfProperty("sp:couchDbRev")
@JsonProperty("_rev")
protected @SerializedName("_rev") String rev;
- @RdfProperty(RDFS.LABEL)
private String name;
- @RdfProperty(RDFS.DESCRIPTION)
private String description;
- @RdfProperty(StreamPipes.ICON_URL)
private String iconUrl;
- @RdfProperty(StreamPipes.HAS_APP_ID)
private String appId;
- @RdfProperty(StreamPipes.INCLUDES_ASSETS)
private boolean includesAssets;
- @RdfProperty(StreamPipes.INCLUDES_LOCALES)
private boolean includesLocales;
- @RdfProperty(StreamPipes.INCLUDED_ASSETS)
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
private List<String> includedAssets;
- @RdfProperty(StreamPipes.INCLUDED_LOCALES)
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
private List<String> includedLocales;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_APPLICATION_LINK)
private List<ApplicationLink> applicationLinks;
- @RdfProperty(StreamPipes.IS_INTERNALLY_MANAGED)
private boolean internallyManaged;
protected String DOM;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/base/Namespaces.java b/streampipes-model/src/main/java/org/apache/streampipes/model/base/Namespaces.java
index cbe84de..23c57a7 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/base/Namespaces.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/base/Namespaces.java
@@ -18,14 +18,8 @@
package org.apache.streampipes.model.base;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
public class Namespaces {
- public static final String SP = StreamPipes.NS;
- public static final String DC = "http://purl.org/dc/terms/";
- public static final String RDFS = org.apache.streampipes.vocabulary.RDFS.NS;
- public static final String RDF = org.apache.streampipes.vocabulary.RDF.NS;
public static final String SO = org.apache.streampipes.vocabulary.SO.NS;
- public static final String SSN = org.apache.streampipes.vocabulary.SSN.NS;
+
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/base/StreamPipesJsonLdContainer.java b/streampipes-model/src/main/java/org/apache/streampipes/model/base/StreamPipesJsonLdContainer.java
deleted file mode 100644
index d6761a8..0000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/base/StreamPipesJsonLdContainer.java
+++ /dev/null
@@ -1,59 +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.model.base;
-
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.CascadeType;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import java.util.List;
-
-@RdfsClass(StreamPipes.ENTITY_CONTAINER)
-public class StreamPipesJsonLdContainer extends UnnamedStreamPipesEntity {
-
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.CONTAINS_ELEMENTS)
- private List<? extends AbstractStreamPipesEntity> containedElements;
-
- public StreamPipesJsonLdContainer() {
- super();
- }
-
- public StreamPipesJsonLdContainer(List<? extends AbstractStreamPipesEntity> containedElements) {
- super();
- this.containedElements = containedElements;
- }
-
- public StreamPipesJsonLdContainer(StreamPipesJsonLdContainer other) {
- super(other);
- this.containedElements = other.getContainedElements();
- }
-
- public List<? extends AbstractStreamPipesEntity> getContainedElements() {
- return containedElements;
- }
-
- public void setContainedElements(List<AbstractStreamPipesEntity> containedElements) {
- this.containedElements = containedElements;
- }
-}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
index f11f8d1..d434e68 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescription.java
@@ -19,9 +19,6 @@
package org.apache.streampipes.model.connect.adapter;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.connect.rules.TransformationRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.SchemaTransformationRuleDescription;
@@ -31,19 +28,11 @@ import org.apache.streampipes.model.grounding.*;
import org.apache.streampipes.model.shared.annotation.TsModel;
import org.apache.streampipes.model.staticproperty.StaticProperty;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass("sp:AdapterDescription")
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(GenericAdapterSetDescription.class),
@JsonSubTypes.Type(GenericAdapterStreamDescription.class),
@@ -60,34 +49,20 @@ public abstract class AdapterDescription extends NamedStreamPipesEntity {
// @JsonProperty("_rev")
// private @SerializedName("_rev") String rev;
- @RdfProperty("sp:adapterId")
private String adapterId;
- @RdfProperty("sp:userName")
private String userName;
- @RdfProperty("sp:grounding")
private EventGrounding eventGrounding;
- @RdfProperty("sp:adapterType")
private String adapterType;
- @RdfProperty("sp:icon")
private String icon;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty("sp:config")
private List<StaticProperty> config;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty("sp:rules")
private List<TransformationRuleDescription> rules;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_ADAPTER_TYPE)
private List<String> category;
private long createdAt;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescriptionList.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescriptionList.java
index bed7d4b..5718aa3 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescriptionList.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterDescriptionList.java
@@ -18,27 +18,15 @@
package org.apache.streampipes.model.connect.adapter;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass("sp:AdapterDescriptionList")
-@Entity
@TsModel
public class AdapterDescriptionList extends NamedStreamPipesEntity {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty("sp:list")
+
private List<AdapterDescription> list;
public AdapterDescriptionList() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterSetDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterSetDescription.java
index 5a20ef7..a46138d 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterSetDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterSetDescription.java
@@ -19,16 +19,8 @@
package org.apache.streampipes.model.connect.adapter;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.SpDataSet;
-import javax.persistence.Entity;
-
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass("sp:AdapterSetDescription")
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(GenericAdapterSetDescription.class),
@JsonSubTypes.Type(SpecificAdapterSetDescription.class)
@@ -47,10 +39,8 @@ public abstract class AdapterSetDescription extends AdapterDescription {
if (other.getDataSet() != null) this.setDataSet(new SpDataSet(other.getDataSet()));
}
- @RdfProperty("sp:hasDataSet")
private SpDataSet dataSet;
- @RdfProperty("sp:stopPipeline")
private boolean stopPipeline;
public SpDataSet getDataSet() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterStreamDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterStreamDescription.java
index 211b3f1..7713ff8 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterStreamDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/AdapterStreamDescription.java
@@ -18,24 +18,14 @@
package org.apache.streampipes.model.connect.adapter;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.SpDataStream;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass(StreamPipes.ADAPTER_STREAM_DESCRIPTION)
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(SpecificAdapterStreamDescription.class),
@JsonSubTypes.Type(SpecificAdapterStreamDescription.class)
})
public abstract class AdapterStreamDescription extends AdapterDescription {
- @RdfProperty("sp:hasDataStream")
private SpDataStream dataStream;
private boolean running;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterSetDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterSetDescription.java
index dd13b47..51c49be 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterSetDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterSetDescription.java
@@ -18,31 +18,20 @@
package org.apache.streampipes.model.connect.adapter;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.connect.grounding.FormatDescription;
import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
import org.apache.streampipes.model.connect.grounding.ProtocolSetDescription;
import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass(StreamPipes.GENERIC_ADAPTER_SET_DESCRIPTION)
-@Entity
@TsModel
public class GenericAdapterSetDescription extends AdapterSetDescription implements GenericAdapterDescription {
public static final String ID = "http://streampipes.org/genericadaptersetdescription";
// private String sourceType = "org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription";
- @RdfProperty("sp:hasFormat")
private FormatDescription formatDescription;
- @RdfProperty("sp:hasProtocol")
private ProtocolDescription protocolDescription;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterStreamDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterStreamDescription.java
index bef7a09..3500783 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterStreamDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/GenericAdapterStreamDescription.java
@@ -18,30 +18,19 @@
package org.apache.streampipes.model.connect.adapter;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.connect.grounding.FormatDescription;
import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
import org.apache.streampipes.model.connect.grounding.ProtocolStreamDescription;
import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass(StreamPipes.GENERIC_ADAPTER_STREAM_DESCRIPTION)
-@Entity
@TsModel
public class GenericAdapterStreamDescription extends AdapterStreamDescription implements GenericAdapterDescription{
public static final String ID = "http://streampipes.org/genericadapterstreamdescription";
- @RdfProperty("sp:hasFormat")
private FormatDescription formatDescription;
- @RdfProperty("sp:hasProtocol")
private ProtocolDescription protocolDescription;
public GenericAdapterStreamDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterSetDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterSetDescription.java
index 8f15123..a3fb416 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterSetDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterSetDescription.java
@@ -18,15 +18,8 @@
package org.apache.streampipes.model.connect.adapter;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import javax.persistence.Entity;
-
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass("sp:SpecificAdapterSetDescription")
-@Entity
@TsModel
public class SpecificAdapterSetDescription extends AdapterSetDescription {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterStreamDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterStreamDescription.java
index 2abc1af..d5f2aa5 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterStreamDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/adapter/SpecificAdapterStreamDescription.java
@@ -18,15 +18,8 @@
package org.apache.streampipes.model.connect.adapter;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import javax.persistence.Entity;
-
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass("sp:SpecificAdapterStreamDescription")
-@Entity
@TsModel
public class SpecificAdapterStreamDescription extends AdapterStreamDescription {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescription.java
index 6c0fac4..810f969 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescription.java
@@ -19,29 +19,16 @@
package org.apache.streampipes.model.connect.grounding;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.staticproperty.StaticProperty;
import org.apache.streampipes.model.util.Cloner;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass("sp:FormatDescription")
-@Entity
public class FormatDescription extends NamedStreamPipesEntity {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty("sp:config")
private List<StaticProperty> config;
public FormatDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescriptionList.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescriptionList.java
index 703254b..1cf6103 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescriptionList.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/FormatDescriptionList.java
@@ -18,29 +18,15 @@
package org.apache.streampipes.model.connect.grounding;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass("sp:FormatDescriptionList")
-@Entity
@TsModel
public class FormatDescriptionList extends NamedStreamPipesEntity {
-
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty("sp:list")
private List<FormatDescription> list;
public FormatDescriptionList() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescription.java
index 870acad..5761dc3 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescription.java
@@ -18,42 +18,24 @@
package org.apache.streampipes.model.connect.grounding;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.shared.annotation.TsModel;
import org.apache.streampipes.model.staticproperty.StaticProperty;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass("sp:ProtocolDescription")
-@Entity
@TsModel
public class ProtocolDescription extends NamedStreamPipesEntity {
//Remove for new classes
@Deprecated
- @RdfProperty("sp:sourceType")
String sourceType;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty("sp:config")
List<StaticProperty> config;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_ADAPTER_TYPE)
private List<String> category;
public ProtocolDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescriptionList.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescriptionList.java
index d801f74..5b91368 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescriptionList.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolDescriptionList.java
@@ -19,32 +19,17 @@
package org.apache.streampipes.model.connect.grounding;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass("sp:ProtocolDescriptionList")
-@Entity
@TsModel
public class ProtocolDescriptionList extends NamedStreamPipesEntity {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty("sp:list")
private List<ProtocolDescription> list;
-// private List<StaticProperty> list;
- @RdfProperty("rdfs:label")
protected String label;
public ProtocolDescriptionList() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolSetDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolSetDescription.java
index 56a8ec4..ea5e9e6 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolSetDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolSetDescription.java
@@ -18,16 +18,10 @@
package org.apache.streampipes.model.connect.grounding;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.staticproperty.StaticProperty;
-import javax.persistence.Entity;
import java.util.List;
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass("sp:ProtocolSetDescription")
-@Entity
public class ProtocolSetDescription extends ProtocolDescription {
public ProtocolSetDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolStreamDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolStreamDescription.java
index aeddd08..b67f9c3 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolStreamDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/grounding/ProtocolStreamDescription.java
@@ -18,16 +18,10 @@
package org.apache.streampipes.model.connect.grounding;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.staticproperty.StaticProperty;
-import javax.persistence.Entity;
import java.util.List;
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass("sp:ProtocolStreamDescription")
-@Entity
public class ProtocolStreamDescription extends ProtocolDescription {
public ProtocolStreamDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/DomainPropertyProbability.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/DomainPropertyProbability.java
index 2bf67e4..17d04af 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/DomainPropertyProbability.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/DomainPropertyProbability.java
@@ -18,23 +18,12 @@
package org.apache.streampipes.model.connect.guess;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import javax.persistence.Entity;
-
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass("sp:DomainPropertyProbability")
-@Entity
public class DomainPropertyProbability extends UnnamedStreamPipesEntity {
- @RdfProperty("sp:domainProperty")
private String domainProperty;
-
- @RdfProperty("sp:probability")
private String probability;
public DomainPropertyProbability() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/DomainPropertyProbabilityList.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/DomainPropertyProbabilityList.java
index e4b674f..9727ae1 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/DomainPropertyProbabilityList.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/DomainPropertyProbabilityList.java
@@ -18,29 +18,15 @@
package org.apache.streampipes.model.connect.guess;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/\""})
-@RdfsClass("sp:DomainPropertyProbabilityList")
-@Entity
public class DomainPropertyProbabilityList extends UnnamedStreamPipesEntity {
- @RdfProperty("sp:runtimeName")
private String runtimeName;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty("sp:list")
private List<DomainPropertyProbability> list;
public DomainPropertyProbabilityList() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/GuessSchema.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/GuessSchema.java
index ccb2866..c4610d3 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/GuessSchema.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/guess/GuessSchema.java
@@ -18,33 +18,18 @@
package org.apache.streampipes.model.connect.guess;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass(StreamPipes.GUESS_SCHEMA)
-@Entity
@TsModel
public class GuessSchema extends UnnamedStreamPipesEntity {
- @RdfProperty("sp:hasEventSchema")
public EventSchema eventSchema;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty("sp:propertyProbabilityList")
public List<DomainPropertyProbabilityList> propertyProbabilityList;
public GuessSchema() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/TransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/TransformationRuleDescription.java
index 0c2e983..bd1b85b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/TransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/TransformationRuleDescription.java
@@ -19,8 +19,6 @@
package org.apache.streampipes.model.connect.rules;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription;
@@ -30,13 +28,7 @@ import org.apache.streampipes.model.connect.rules.stream.EventRateTransformation
import org.apache.streampipes.model.connect.rules.stream.RemoveDuplicatesTransformationRuleDescription;
import org.apache.streampipes.model.connect.rules.value.*;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.TRANSFORM_RULE_DESCRIPTION)
-@Entity
@TsModel
@JsonSubTypes({
@JsonSubTypes.Type(AddTimestampRuleDescription.class),
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/CreateNestedRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/CreateNestedRuleDescription.java
index 6390cc6..d065e0b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/CreateNestedRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/CreateNestedRuleDescription.java
@@ -18,18 +18,8 @@
package org.apache.streampipes.model.connect.rules.schema;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.CREATE_NESTED_RULE_DESCRIPTION)
-@Entity
public class CreateNestedRuleDescription extends SchemaTransformationRuleDescription {
- @RdfProperty(StreamPipes.RUNTIME_KEY)
+
private String runtimeKey;
public CreateNestedRuleDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/DeleteRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/DeleteRuleDescription.java
index 0c3aad7..9dafc16 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/DeleteRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/DeleteRuleDescription.java
@@ -18,18 +18,8 @@
package org.apache.streampipes.model.connect.rules.schema;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.DELETE_RULE_DESCRIPTION)
-@Entity
public class DeleteRuleDescription extends SchemaTransformationRuleDescription {
- @RdfProperty(StreamPipes.RUNTIME_KEY)
+
private String runtimeKey;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/MoveRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/MoveRuleDescription.java
index f8402c3..312d165 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/MoveRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/MoveRuleDescription.java
@@ -18,22 +18,10 @@
package org.apache.streampipes.model.connect.rules.schema;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.MOVE_RULE_DESCRIPTION)
-@Entity
public class MoveRuleDescription extends SchemaTransformationRuleDescription {
- @RdfProperty(StreamPipes.OLD_RUNTIME_NAME)
private String oldRuntimeKey;
- @RdfProperty(StreamPipes.NEW_RUNTIME_NAME)
private String newRuntimeKey;
public MoveRuleDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/RenameRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/RenameRuleDescription.java
index b38dd8e..1634e8d 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/RenameRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/RenameRuleDescription.java
@@ -18,22 +18,10 @@
package org.apache.streampipes.model.connect.rules.schema;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.RENAME_RULE_DESCRIPTION)
-@Entity
public class RenameRuleDescription extends SchemaTransformationRuleDescription {
- @RdfProperty(StreamPipes.OLD_RUNTIME_NAME)
private String oldRuntimeKey;
- @RdfProperty(StreamPipes.NEW_RUNTIME_NAME)
private String newRuntimeKey;
public RenameRuleDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/SchemaTransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/SchemaTransformationRuleDescription.java
index 51b3cbf..a996c80 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/SchemaTransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/SchemaTransformationRuleDescription.java
@@ -18,7 +18,6 @@
package org.apache.streampipes.model.connect.rules.schema;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.streampipes.model.connect.rules.TransformationRuleDescription;
public abstract class SchemaTransformationRuleDescription extends TransformationRuleDescription {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/EventRateTransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/EventRateTransformationRuleDescription.java
index 5465844..c37a889 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/EventRateTransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/EventRateTransformationRuleDescription.java
@@ -18,23 +18,11 @@
package org.apache.streampipes.model.connect.rules.stream;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.EVENT_RATE_RULE_DESCRIPTION)
-@Entity
public class EventRateTransformationRuleDescription extends StreamTransformationRuleDescription {
- @RdfProperty(StreamPipes.AGGREGATION_TIME_WINDOW)
private long aggregationTimeWindow;
//None (Values from last event), max, min, mean, sum (of the values in the time window)
- @RdfProperty(StreamPipes.AGGREGATION_TYPE)
private String aggregationType;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/RemoveDuplicatesTransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/RemoveDuplicatesTransformationRuleDescription.java
index 24c4b00..0a69a1b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/RemoveDuplicatesTransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/stream/RemoveDuplicatesTransformationRuleDescription.java
@@ -18,22 +18,10 @@
package org.apache.streampipes.model.connect.rules.stream;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.REMOVE_DUPLICATES_RULE_DESCRIPTION)
-@Entity
public class RemoveDuplicatesTransformationRuleDescription extends StreamTransformationRuleDescription {
- @RdfProperty(StreamPipes.FILTER_TIME_WINDOW)
private String filterTimeWindow;
-
public RemoveDuplicatesTransformationRuleDescription() {
super();
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddTimestampRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddTimestampRuleDescription.java
index 7f73730..572c37c 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddTimestampRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddTimestampRuleDescription.java
@@ -18,19 +18,8 @@
package org.apache.streampipes.model.connect.rules.value;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.ADD_TIMESTAMP_RULE_DESCRIPTION)
-@Entity
public class AddTimestampRuleDescription extends ValueTransformationRuleDescription {
- @RdfProperty(StreamPipes.RUNTIME_KEY)
private String runtimeKey;
public AddTimestampRuleDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddValueTransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddValueTransformationRuleDescription.java
index 084bc14..19e068b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddValueTransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/AddValueTransformationRuleDescription.java
@@ -18,22 +18,10 @@
package org.apache.streampipes.model.connect.rules.value;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.ADD_VALUE_TRANSFORMATION_RULE_DESCRIPTION)
-@Entity
public class AddValueTransformationRuleDescription extends ValueTransformationRuleDescription {
- @RdfProperty(StreamPipes.RUNTIME_KEY)
private String runtimeKey;
- @RdfProperty(StreamPipes.STATIC_VALUE)
private String staticValue;
public AddValueTransformationRuleDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/CorrectionValueTransformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/CorrectionValueTransformationRuleDescription.java
index 24b26ae..2041482 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/CorrectionValueTransformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/CorrectionValueTransformationRuleDescription.java
@@ -16,25 +16,12 @@ package org.apache.streampipes.model.connect.rules.value;/*
*
*/
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.CORRECTION_VALUE_TRANSFORM_RULE_DESCRIPTION)
-@Entity
public class CorrectionValueTransformationRuleDescription extends ValueTransformationRuleDescription {
- @RdfProperty(StreamPipes.RUNTIME_KEY)
private String runtimeKey;
- @RdfProperty(StreamPipes.CORRECTION_VALUE)
private double correctionValue;
- @RdfProperty(StreamPipes.OPERATOR)
private String operator;
public CorrectionValueTransformationRuleDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/TimestampTranfsformationRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/TimestampTranfsformationRuleDescription.java
index ba3c6d5..951fa21 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/TimestampTranfsformationRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/TimestampTranfsformationRuleDescription.java
@@ -18,28 +18,14 @@
package org.apache.streampipes.model.connect.rules.value;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.TIMESTAMP_TRANSFORMATION_RULE_DESCRIPTION)
-@Entity
public class TimestampTranfsformationRuleDescription extends ValueTransformationRuleDescription {
- @RdfProperty(StreamPipes.RUNTIME_KEY)
private String runtimeKey;
- @RdfProperty(StreamPipes.HAS_MODE)
private String mode;
- @RdfProperty(StreamPipes.FORMAT_STRING)
private String formatString;
- @RdfProperty(StreamPipes.MULTIPLIER)
private long multiplier;
public TimestampTranfsformationRuleDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/UnitTransformRuleDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/UnitTransformRuleDescription.java
index c2bbcf2..6641f47 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/UnitTransformRuleDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/value/UnitTransformRuleDescription.java
@@ -18,25 +18,12 @@
package org.apache.streampipes.model.connect.rules.value;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@Namespaces({StreamPipes.NS_PREFIX, StreamPipes.NS})
-@RdfsClass(StreamPipes.UNIT_TRANSFORM_RULE_DESCRIPTION)
-@Entity
public class UnitTransformRuleDescription extends ValueTransformationRuleDescription {
- @RdfProperty(StreamPipes.RUNTIME_KEY)
private String runtimeKey;
- @RdfProperty(StreamPipes.FROM_UNIT)
private String fromUnitRessourceURL;
- @RdfProperty(StreamPipes.TO_UNIT)
private String toUnitRessourceURL;
public UnitTransformRuleDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/worker/ConnectWorkerContainer.java b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/worker/ConnectWorkerContainer.java
index 001a685..f41ad26 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/worker/ConnectWorkerContainer.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/worker/ConnectWorkerContainer.java
@@ -19,24 +19,13 @@
package org.apache.streampipes.model.connect.worker;
import com.google.gson.annotations.SerializedName;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass(StreamPipes.CONNECT_WORKER_CONTAINER)
-@Entity
public class ConnectWorkerContainer extends UnnamedStreamPipesEntity {
private @SerializedName("_rev") String rev;
@@ -47,17 +36,10 @@ public class ConnectWorkerContainer extends UnnamedStreamPipesEntity {
this.protocols = new ArrayList<>();
}
- @RdfProperty("sp:endpointUrl")
private String endpointUrl;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty("sp:protocols")
private List<ProtocolDescription> protocols;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty("sp:list")
private List<AdapterDescription> adapters;
public ConnectWorkerContainer(String endpointUrl, List<ProtocolDescription> protocols, List<AdapterDescription> adapters) {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardEntity.java b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardEntity.java
index 98acdb7..8aa2e21 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardEntity.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardEntity.java
@@ -21,29 +21,18 @@ package org.apache.streampipes.model.dashboard;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.google.gson.annotations.SerializedName;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.datalake.DataExplorerWidgetModel;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-
-@RdfsClass(StreamPipes.DASHBOARD_ENTITY)
-@MappedSuperclass
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(DashboardWidgetModel.class),
@JsonSubTypes.Type(DataExplorerWidgetModel.class)
})
public abstract class DashboardEntity extends UnnamedStreamPipesEntity {
- @RdfProperty("sp:couchDbId")
@JsonProperty("_id")
private @SerializedName("_id") String id;
- @RdfProperty("sp:couchDbRev")
@JsonProperty("_rev")
private @SerializedName("_rev") String rev;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardModel.java b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardModel.java
index 100288e..4301b7d 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardModel.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardModel.java
@@ -20,17 +20,10 @@ package org.apache.streampipes.model.dashboard;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
import java.util.List;
-@RdfsClass(StreamPipes.DASHBOARD_MODEL)
-@MappedSuperclass
-@Entity
@TsModel
public class DashboardModel {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardWidgetSettings.java b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardWidgetSettings.java
index 14a6b72..7521557 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardWidgetSettings.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/dashboard/DashboardWidgetSettings.java
@@ -18,42 +18,26 @@
package org.apache.streampipes.model.dashboard;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.model.shared.annotation.TsModel;
import org.apache.streampipes.model.staticproperty.StaticProperty;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.*;
import java.util.List;
-@RdfsClass(StreamPipes.DASHBOARD_WIDGET_SETTINGS)
-@Entity
@TsModel
public class DashboardWidgetSettings extends UnnamedStreamPipesEntity {
- @RdfProperty(StreamPipes.HAS_DASHBOARD_WIDGET_LABEL)
private String widgetLabel;
- @RdfProperty(StreamPipes.HAS_DASHBOARD_WIDGET_NAME)
private String widgetName;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_STATIC_PROPERTY)
private List<StaticProperty> config;
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.PERSIST, CascadeType.MERGE})
- @RdfProperty(StreamPipes.HAS_SCHEMA)
private EventSchema requiredSchema;
- @RdfProperty(StreamPipes.HAS_WIDGET_ICON_NAME)
private String widgetIconName;
- @RdfProperty(StreamPipes.HAS_WIDGET_DESCRIPTION)
private String widgetDescription;
public DashboardWidgetSettings() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataExplorerWidgetModel.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataExplorerWidgetModel.java
index 36a951b..8f16a3b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataExplorerWidgetModel.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataExplorerWidgetModel.java
@@ -18,36 +18,16 @@
package org.apache.streampipes.model.datalake;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.dashboard.DashboardEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToOne;
-
-@RdfsClass(StreamPipes.DATA_EXPLORER_WIDGET_MODEL)
-@Entity
public class DataExplorerWidgetModel extends DashboardEntity {
-
- @RdfProperty(StreamPipes.HAS_DASHBOARD_WIDGET_ID)
private String widgetId;
- @RdfProperty(StreamPipes.HAS_DASHBOARD_WIDGET_TYPE)
private String widgetType;
- @RdfProperty(StreamPipes.HAS_DASHBOARD_WIDGET_TYPE)
private String selectedKeys;
-// @RdfProperty(StreamPipes.HAS_MEASUREMENT_NAME)
-// private String measureName;
-
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.PERSIST, CascadeType.MERGE})
- @RdfProperty(StreamPipes.HAS_DATA_LAKE_MEASURE)
private DataLakeMeasure dataLakeMeasure;
public DataExplorerWidgetModel() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
index 42b7af2..72e3461 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/datalake/DataLakeMeasure.java
@@ -18,27 +18,13 @@
package org.apache.streampipes.model.datalake;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.schema.EventSchema;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToOne;
-
-@RdfsClass(StreamPipes.DATA_LAKE_MEASURE)
-@Entity
public class DataLakeMeasure extends UnnamedStreamPipesEntity {
- @RdfProperty(StreamPipes.HAS_MEASUREMENT_NAME)
private String measureName;
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.PERSIST, CascadeType.MERGE})
- @RdfProperty(StreamPipes.HAS_EVENT_SCHEMA)
private EventSchema eventSchema;
public DataLakeMeasure() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorDescription.java
index 0921ed4..e63d339 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorDescription.java
@@ -18,38 +18,23 @@
package org.apache.streampipes.model.graph;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.SpDataStream;
import org.apache.streampipes.model.base.ConsumableStreamPipesEntity;
import org.apache.streampipes.model.output.OutputStrategy;
import org.apache.streampipes.model.staticproperty.StaticProperty;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.DATA_PROCESSOR_DESCRIPTION)
-@Entity
public class DataProcessorDescription extends ConsumableStreamPipesEntity {
private static final long serialVersionUID = 3995767921861518597L;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_OUTPUT_STRATEGY)
private List<OutputStrategy> outputStrategies;
private String pathName;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_EPA_TYPE)
private List<String> category;
public DataProcessorDescription(DataProcessorDescription other) {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorInvocation.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorInvocation.java
index 4f1aba0..1551b38 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorInvocation.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataProcessorInvocation.java
@@ -18,42 +18,27 @@
package org.apache.streampipes.model.graph;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.SpDataStream;
import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
import org.apache.streampipes.model.output.OutputStrategy;
import org.apache.streampipes.model.staticproperty.StaticProperty;
import org.apache.streampipes.model.util.Cloner;
import org.apache.streampipes.model.util.ElementIdGenerator;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.*;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.DATA_PROCESSOR_INVOCATION)
-@Entity
public class DataProcessorInvocation extends InvocableStreamPipesEntity implements Serializable {
private static final long serialVersionUID = 865870355944824186L;
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.PERSIST, CascadeType.MERGE})
- @RdfProperty(StreamPipes.PRODUCES)
private SpDataStream outputStream;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_OUTPUT_STRATEGY)
private List<OutputStrategy> outputStrategies;
private String pathName;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_EPA_TYPE)
private List<String> category;
public DataProcessorInvocation(DataProcessorDescription sepa) {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkDescription.java
index 3b7b4d6..6703e83 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkDescription.java
@@ -18,28 +18,16 @@
package org.apache.streampipes.model.graph;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.ConsumableStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.DATA_SINK_DESCRIPTION)
-@Entity
public class DataSinkDescription extends ConsumableStreamPipesEntity {
private static final long serialVersionUID = -6553066396392585731L;
-
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_EC_TYPE)
+
private List<String> category;
public DataSinkDescription(String uri, String name, String description, String iconUrl)
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkInvocation.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkInvocation.java
index 658d70a..4f3b1cf 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkInvocation.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSinkInvocation.java
@@ -18,29 +18,17 @@
package org.apache.streampipes.model.graph;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
import org.apache.streampipes.model.staticproperty.StaticProperty;
import org.apache.streampipes.model.util.ElementIdGenerator;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.DATA_SINK_INVOCATION)
-@Entity
public class DataSinkInvocation extends InvocableStreamPipesEntity {
private static final long serialVersionUID = -2345635798917416757L;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_EC_TYPE)
private List<String> category;
public DataSinkInvocation(DataSinkInvocation sec) {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSourceDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSourceDescription.java
index a37db0d..320dada 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSourceDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSourceDescription.java
@@ -18,18 +18,11 @@
package org.apache.streampipes.model.graph;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.SpDataStream;
-import org.apache.streampipes.model.shared.annotation.TsModel;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
+import org.apache.streampipes.model.shared.annotation.TsModel;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -37,17 +30,12 @@ import java.util.List;
/**
* class that represents Semantic Event Producers.
*/
-@RdfsClass(StreamPipes.DATA_SOURCE_DESCRIPTION)
-@Entity
@TsModel
@Deprecated
public class DataSourceDescription extends NamedStreamPipesEntity {
private static final long serialVersionUID = 5607030219013954697L;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.PRODUCES)
private List<SpDataStream> spDataStreams;
private String correspondingSourceId;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/PipelineElementContainer.java b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/PipelineElementContainer.java
index 47561c8..c77769c 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/PipelineElementContainer.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/graph/PipelineElementContainer.java
@@ -17,26 +17,14 @@
*/
package org.apache.streampipes.model.graph;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.PIPELINE_ELEMENT_CONTAINER)
-@Entity
public class PipelineElementContainer extends NamedStreamPipesEntity {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_PIPELINE_ELEMENTS)
private List<NamedStreamPipesEntity> pipelineElementDescriptions;
public PipelineElementContainer(PipelineElementContainer other) {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/EventGrounding.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/EventGrounding.java
index 42d576f..3a8ff4e 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/EventGrounding.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/EventGrounding.java
@@ -19,34 +19,20 @@
package org.apache.streampipes.model.grounding;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-@RdfsClass(StreamPipes.EVENT_GROUNDING)
-@Entity
public class EventGrounding extends UnnamedStreamPipesEntity {
private static final long serialVersionUID = 3149070517282698799L;
- @OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_TRANSPORT_PROTOCOL)
private List<TransportProtocol> transportProtocols;
-
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_TRANSPORT_FORMAT)
+
private List<TransportFormat> transportFormats;
public EventGrounding()
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/JmsTransportProtocol.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/JmsTransportProtocol.java
index e1858a5..b156861 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/JmsTransportProtocol.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/JmsTransportProtocol.java
@@ -18,19 +18,10 @@
package org.apache.streampipes.model.grounding;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.JMS_TRANSPORT_PROTOCOL)
-@Entity
public class JmsTransportProtocol extends TransportProtocol {
private static final long serialVersionUID = -5650426611208789835L;
-
- @RdfProperty(StreamPipes.JMS_PORT)
+
private int port;
public JmsTransportProtocol(String uri, int port, String topicName)
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/KafkaTransportProtocol.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/KafkaTransportProtocol.java
index 9e91127..a37a712 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/KafkaTransportProtocol.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/KafkaTransportProtocol.java
@@ -18,46 +18,28 @@
package org.apache.streampipes.model.grounding;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.KAFKA_TRANSPORT_PROTOCOL)
-@Entity
public class KafkaTransportProtocol extends TransportProtocol {
private static final long serialVersionUID = -4067982203807146257L;
- @RdfProperty(StreamPipes.ZOOKEEPER_HOST)
private String zookeeperHost;
- @RdfProperty(StreamPipes.ZOOKEEPER_PORT)
private int zookeeperPort;
- @RdfProperty(StreamPipes.KAFKA_PORT)
private int kafkaPort;
- @RdfProperty(StreamPipes.KAFKA_LINGER_MS)
private Integer lingerMs;
- @RdfProperty(StreamPipes.KAFKA_MESSAGE_MAX_BYTES)
private String messageMaxBytes;
- @RdfProperty(StreamPipes.KAFKA_MAX_REQUEST_SIZE)
private String maxRequestSize;
- @RdfProperty(StreamPipes.KAFKA_ACKS)
private String acks;
- @RdfProperty(StreamPipes.KAFKA_BATCH_SIZE)
private String batchSize;
- @RdfProperty(StreamPipes.KAFKA_OFFSET)
private String offset;
- @RdfProperty(StreamPipes.KAFKA_GROUP_ID)
private String groupId;
public KafkaTransportProtocol(String kafkaHost, int kafkaPort, String topic) {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/MqttTransportProtocol.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/MqttTransportProtocol.java
index 95b30bd..8158838 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/MqttTransportProtocol.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/MqttTransportProtocol.java
@@ -16,17 +16,8 @@
*/
package org.apache.streampipes.model.grounding;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.MQTT_TRANSPORT_PROTOCOL)
-@Entity
public class MqttTransportProtocol extends TransportProtocol {
- @RdfProperty(StreamPipes.HAS_MQTT_PORT)
private int port;
public MqttTransportProtocol(String hostname, int port, String topicName)
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/SimpleTopicDefinition.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/SimpleTopicDefinition.java
index 01d454d..9a04203 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/SimpleTopicDefinition.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/SimpleTopicDefinition.java
@@ -18,13 +18,6 @@
package org.apache.streampipes.model.grounding;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.SIMPLE_TOPIC_DEFINITION)
-@Entity
public class SimpleTopicDefinition extends TopicDefinition {
public SimpleTopicDefinition(String topicName) {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TopicDefinition.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TopicDefinition.java
index 9588096..caa05d8 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TopicDefinition.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TopicDefinition.java
@@ -19,24 +19,14 @@
package org.apache.streampipes.model.grounding;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-
-@RdfsClass(StreamPipes.TOPIC_DEFINITION)
-@Entity
-@MappedSuperclass
@JsonSubTypes({
@JsonSubTypes.Type(SimpleTopicDefinition.class),
@JsonSubTypes.Type(WildcardTopicDefinition.class)
})
public abstract class TopicDefinition extends UnnamedStreamPipesEntity {
- @RdfProperty(StreamPipes.HAS_ACTUAL_TOPIC_NAME)
private String actualTopicName;
public TopicDefinition() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportFormat.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportFormat.java
index 8d9c5bf..2fc0031 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportFormat.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportFormat.java
@@ -18,30 +18,16 @@
package org.apache.streampipes.model.grounding;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.RDF;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-@RdfsClass(StreamPipes.TRANSPORT_FORMAT)
-@Entity
public class TransportFormat extends UnnamedStreamPipesEntity {
private static final long serialVersionUID = -525073244975968386L;
-
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(RDF.TYPE)
+
private List<URI> rdfType;
public TransportFormat()
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportProtocol.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportProtocol.java
index 8d89064..1e1c7d2 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportProtocol.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportProtocol.java
@@ -19,17 +19,9 @@
package org.apache.streampipes.model.grounding;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.*;
-
-@RdfsClass(StreamPipes.TRANSPORT_PROTOCOL)
-@Entity
-@MappedSuperclass
@JsonSubTypes({
@JsonSubTypes.Type(JmsTransportProtocol.class),
@JsonSubTypes.Type(KafkaTransportProtocol.class),
@@ -39,11 +31,8 @@ public abstract class TransportProtocol extends UnnamedStreamPipesEntity {
private static final long serialVersionUID = 7625791395504335184L;
- @RdfProperty(StreamPipes.BROKER_HOSTNAME)
private String brokerHostname;
- @OneToOne(fetch = FetchType.EAGER,cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.TOPIC)
private TopicDefinition topicDefinition;
public TransportProtocol() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/WildcardTopicDefinition.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/WildcardTopicDefinition.java
index 9bd3c10..503f43a 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/WildcardTopicDefinition.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/WildcardTopicDefinition.java
@@ -17,29 +17,15 @@
*/
package org.apache.streampipes.model.grounding;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-@RdfsClass(StreamPipes.WILDCARD_TOPIC_DEFINITION)
-@Entity
public class WildcardTopicDefinition extends TopicDefinition {
- @RdfProperty(StreamPipes.HAS_WILDCARD_TOPIC_NAME)
private String wildcardTopicName;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_WILDCARD_TOPIC_MAPPING)
private List<WildcardTopicMapping> wildcardTopicMappings;
public WildcardTopicDefinition() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/WildcardTopicMapping.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/WildcardTopicMapping.java
index afc0627..71930b3 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/WildcardTopicMapping.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/WildcardTopicMapping.java
@@ -17,24 +17,14 @@
*/
package org.apache.streampipes.model.grounding;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.WILDCARD_TOPIC_MAPPING)
-@Entity
public class WildcardTopicMapping extends UnnamedStreamPipesEntity {
- @RdfProperty(StreamPipes.HAS_TOPIC_PARAMETER_TYPE)
private String topicParameterType;
- @RdfProperty(StreamPipes.HAS_TOPIC_MAPPING_ID)
private String mappingId;
- @RdfProperty(StreamPipes.HAS_MAPPED_RUNTIME_NAME)
private String mappedRuntimeName;
private String selectedMapping;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/labeling/Label.java b/streampipes-model/src/main/java/org/apache/streampipes/model/labeling/Label.java
index 5bb1a05..07bfd29 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/labeling/Label.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/labeling/Label.java
@@ -20,7 +20,6 @@ package org.apache.streampipes.model.labeling;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
-import io.fogsy.empire.annotations.RdfProperty;
import org.apache.streampipes.model.shared.annotation.TsModel;
@TsModel
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/monitoring/ElementStatusInfoSettings.java b/streampipes-model/src/main/java/org/apache/streampipes/model/monitoring/ElementStatusInfoSettings.java
index 5a2cd49..179c3fd 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/monitoring/ElementStatusInfoSettings.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/monitoring/ElementStatusInfoSettings.java
@@ -18,30 +18,18 @@
package org.apache.streampipes.model.monitoring;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.ELEMENT_STATUS_INFO_SETTINGS)
-@Entity
public class ElementStatusInfoSettings extends UnnamedStreamPipesEntity {
- @RdfProperty(StreamPipes.ELEMENT_IDENTIFIER)
private String elementIdentifier;
- @RdfProperty(StreamPipes.KAFKA_HOST)
private String kafkaHost;
- @RdfProperty(StreamPipes.KAFKA_PORT)
private int kafkaPort;
- @RdfProperty(StreamPipes.ERROR_TOPIC)
private String errorTopic;
- @RdfProperty(StreamPipes.STATS_TOPIC)
private String statsTopic;
public ElementStatusInfoSettings() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/output/AppendOutputStrategy.java b/streampipes-model/src/main/java/org/apache/streampipes/model/output/AppendOutputStrategy.java
index 11e5338..9d22313 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/output/AppendOutputStrategy.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/output/AppendOutputStrategy.java
@@ -18,29 +18,16 @@
package org.apache.streampipes.model.output;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.schema.EventProperty;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-@RdfsClass(StreamPipes.APPEND_OUTPUT_STRATEGY)
-@Entity
public class AppendOutputStrategy extends OutputStrategy {
private static final long serialVersionUID = 7202888911899551012L;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.APPENDS_PROPERTY)
private List<EventProperty> eventProperties;
public AppendOutputStrategy() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/output/CustomOutputStrategy.java b/streampipes-model/src/main/java/org/apache/streampipes/model/output/CustomOutputStrategy.java
index 18278e4..4468ba1 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/output/CustomOutputStrategy.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/output/CustomOutputStrategy.java
@@ -18,30 +18,15 @@
package org.apache.streampipes.model.output;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-@RdfsClass(StreamPipes.CUSTOM_OUTPUT_STRATEGY)
-@Entity
public class CustomOutputStrategy extends OutputStrategy {
private static final long serialVersionUID = -5858193127308435472L;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.PRODUCES_PROPERTY)
private List<String> selectedPropertyKeys;
- @RdfProperty(StreamPipes.OUTPUT_RIGHT)
private boolean outputRight;
private List<String> availablePropertyKeys;
@@ -92,4 +77,4 @@ public class CustomOutputStrategy extends OutputStrategy {
public void setAvailablePropertyKeys(List<String> availablePropertyKeys) {
this.availablePropertyKeys = availablePropertyKeys;
}
-}
\ No newline at end of file
+}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/output/CustomTransformOutputStrategy.java b/streampipes-model/src/main/java/org/apache/streampipes/model/output/CustomTransformOutputStrategy.java
index 7f65ffd..b1668f0 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/output/CustomTransformOutputStrategy.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/output/CustomTransformOutputStrategy.java
@@ -17,27 +17,14 @@
*/
package org.apache.streampipes.model.output;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.schema.EventProperty;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-@RdfsClass(StreamPipes.CUSTOM_TRANSFORM_OUTPUT_STRATEGY)
-@Entity
public class CustomTransformOutputStrategy extends OutputStrategy {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.PRODUCES_PROPERTY)
private List<EventProperty> eventProperties;
public CustomTransformOutputStrategy()
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/output/FixedOutputStrategy.java b/streampipes-model/src/main/java/org/apache/streampipes/model/output/FixedOutputStrategy.java
index 45e24e2..e698348 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/output/FixedOutputStrategy.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/output/FixedOutputStrategy.java
@@ -18,28 +18,15 @@
package org.apache.streampipes.model.output;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.schema.EventProperty;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-@RdfsClass(StreamPipes.FIXED_OUTPUT_STRATEGY)
-@Entity
public class FixedOutputStrategy extends OutputStrategy {
private static final long serialVersionUID = 812840089727019773L;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.PRODUCES_PROPERTY)
private List<EventProperty> eventProperties;
public FixedOutputStrategy() {
@@ -64,4 +51,4 @@ public class FixedOutputStrategy extends OutputStrategy {
}
-}
\ No newline at end of file
+}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/output/KeepOutputStrategy.java b/streampipes-model/src/main/java/org/apache/streampipes/model/output/KeepOutputStrategy.java
index 764d17a..d455e7b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/output/KeepOutputStrategy.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/output/KeepOutputStrategy.java
@@ -18,23 +18,13 @@
package org.apache.streampipes.model.output;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.KEEP_OUTPUT_STRATEGY)
-@Entity
public class KeepOutputStrategy extends OutputStrategy {
private static final long serialVersionUID = 7643705399683055563L;
@Deprecated
- @RdfProperty(StreamPipes.EVENT_NAME)
String eventName;
- @RdfProperty(StreamPipes.KEEP_BOTH)
private boolean keepBoth;
public KeepOutputStrategy() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/output/ListOutputStrategy.java b/streampipes-model/src/main/java/org/apache/streampipes/model/output/ListOutputStrategy.java
index 72e982f..4040d93 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/output/ListOutputStrategy.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/output/ListOutputStrategy.java
@@ -18,19 +18,10 @@
package org.apache.streampipes.model.output;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.LIST_OUTPUT_STRATEGY)
-@Entity
public class ListOutputStrategy extends OutputStrategy {
private static final long serialVersionUID = -6400256021072543325L;
- @RdfProperty(StreamPipes.LIST_PROPERTY_NAME)
private String propertyName;
public ListOutputStrategy() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/output/OutputStrategy.java b/streampipes-model/src/main/java/org/apache/streampipes/model/output/OutputStrategy.java
index 5916039..c817361 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/output/OutputStrategy.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/output/OutputStrategy.java
@@ -19,19 +19,12 @@
package org.apache.streampipes.model.output;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.*;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.OUTPUT_STRATEGY)
-@MappedSuperclass
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(AppendOutputStrategy.class),
@JsonSubTypes.Type(CustomOutputStrategy.class),
@@ -46,12 +39,8 @@ public abstract class OutputStrategy extends UnnamedStreamPipesEntity {
private static final long serialVersionUID = 1953204905003864143L;
- @RdfProperty(StreamPipes.HAS_NAME)
private String name;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_RENAME_RULE)
private List<PropertyRenameRule> renameRules;
public OutputStrategy() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/output/PropertyRenameRule.java b/streampipes-model/src/main/java/org/apache/streampipes/model/output/PropertyRenameRule.java
index 03cd67d..88baee4 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/output/PropertyRenameRule.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/output/PropertyRenameRule.java
@@ -17,23 +17,14 @@
*/
package org.apache.streampipes.model.output;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.io.Serializable;
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.RENAME_RULE)
-@Entity
public class PropertyRenameRule extends UnnamedStreamPipesEntity implements Serializable {
- @RdfProperty(StreamPipes.HAS_RUNTIME_ID)
private String runtimeId;
- @RdfProperty(StreamPipes.HAS_NEW_RUNTIME_NAME)
private String newRuntimeName;
public PropertyRenameRule() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/output/TransformOperation.java b/streampipes-model/src/main/java/org/apache/streampipes/model/output/TransformOperation.java
index b045725..444f923 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/output/TransformOperation.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/output/TransformOperation.java
@@ -17,39 +17,28 @@
*/
package org.apache.streampipes.model.output;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.TRANSFORM_OPERATION)
-@Entity
public class TransformOperation extends UnnamedStreamPipesEntity{
/**
* the internal name of the mapping property that linkes to an event property related to this transform operation
*/
- @RdfProperty(StreamPipes.HAS_LINKED_MAPPING_PROPERTY_ID)
private String mappingPropertyInternalName;
/**
* the static property which value is used to replace the schema
*/
- @RdfProperty(StreamPipes.HAS_SOURCE_PROPERTY_INTERNAL_NAME)
private String sourceStaticProperty;
/**
* the URI of the affected schema part
*/
- @RdfProperty(StreamPipes.HAS_TRANSFORMATION_SCOPE)
private String transformationScope;
/**
* the static target value if no static property is given
*/
- @RdfProperty(StreamPipes.HAS_TARGET_VALUE)
private String targetValue;
public TransformOperation() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/output/TransformOutputStrategy.java b/streampipes-model/src/main/java/org/apache/streampipes/model/output/TransformOutputStrategy.java
index 15ab6e6..1ca9516 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/output/TransformOutputStrategy.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/output/TransformOutputStrategy.java
@@ -17,26 +17,13 @@
*/
package org.apache.streampipes.model.output;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-@RdfsClass(StreamPipes.TRANSFORM_OUTPUT_STRATEGY)
-@Entity
public class TransformOutputStrategy extends OutputStrategy {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_TRANSFORM_OPERATION)
private List<TransformOperation> transformOperations;
public TransformOutputStrategy() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/output/UserDefinedOutputStrategy.java b/streampipes-model/src/main/java/org/apache/streampipes/model/output/UserDefinedOutputStrategy.java
index e364dc3..7f8f725 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/output/UserDefinedOutputStrategy.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/output/UserDefinedOutputStrategy.java
@@ -18,24 +18,12 @@
package org.apache.streampipes.model.output;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.schema.EventProperty;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.List;
-@RdfsClass(StreamPipes.USER_DEFINED_OUTPUT_STRATEGY)
-@Entity
public class UserDefinedOutputStrategy extends OutputStrategy {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.PRODUCES_PROPERTY)
private List<EventProperty> eventProperties;
public UserDefinedOutputStrategy() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/pipeline/ElementComposition.java b/streampipes-model/src/main/java/org/apache/streampipes/model/pipeline/ElementComposition.java
index 4ef9b56..4e149a2 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/pipeline/ElementComposition.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/pipeline/ElementComposition.java
@@ -24,16 +24,11 @@ import org.apache.streampipes.model.graph.DataProcessorInvocation;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.OneToMany;
-
public abstract class ElementComposition {
- @OneToMany(cascade = CascadeType.ALL)
protected List<DataProcessorInvocation> sepas;
- @OneToMany(cascade = CascadeType.ALL)
protected List<SpDataStream> streams;
protected String name;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/pipeline/Pipeline.java b/streampipes-model/src/main/java/org/apache/streampipes/model/pipeline/Pipeline.java
index e52ebcd..3249a65 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/pipeline/Pipeline.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/pipeline/Pipeline.java
@@ -23,20 +23,14 @@ import com.google.gson.annotations.SerializedName;
import org.apache.streampipes.model.graph.DataSinkInvocation;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.OneToOne;
import java.util.ArrayList;
import java.util.List;
-@Entity
@TsModel
public class Pipeline extends ElementComposition {
- @OneToOne(cascade = CascadeType.ALL)
private List<DataSinkInvocation> actions;
- @OneToOne(cascade = CascadeType.ALL)
private boolean running;
private boolean restartOnSystemReboot;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Accuracy.java b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Accuracy.java
index 140a84b..162ea2d 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Accuracy.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Accuracy.java
@@ -18,15 +18,6 @@
package org.apache.streampipes.model.quality;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.SSN;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(SSN.ACCURACY)
-@Entity
public class Accuracy extends EventPropertyQualityDefinition {
private static final long serialVersionUID = -4368302218285302897L;
@@ -43,8 +34,7 @@ public class Accuracy extends EventPropertyQualityDefinition {
super(other);
this.quantityValue = other.getQuantityValue();
}
-
- @RdfProperty(StreamPipes.HAS_QUANTITY_VALUE)
+
private float quantityValue;
public float getQuantityValue() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventPropertyQualityDefinition.java b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventPropertyQualityDefinition.java
index 19581da..60045de 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventPropertyQualityDefinition.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventPropertyQualityDefinition.java
@@ -19,15 +19,7 @@
package org.apache.streampipes.model.quality;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-
-@RdfsClass(StreamPipes.EVENT_PROPERTY_QUALITY_DEFINITION)
-@MappedSuperclass
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(Accuracy.class),
@JsonSubTypes.Type(MeasurementRange.class),
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventPropertyQualityRequirement.java b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventPropertyQualityRequirement.java
index 8e2c657..aff4946 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventPropertyQualityRequirement.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventPropertyQualityRequirement.java
@@ -18,30 +18,16 @@
package org.apache.streampipes.model.quality;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToOne;
import java.util.Objects;
-@RdfsClass(StreamPipes.EVENT_PROPERTY_QUALITY_REQUIREMENT)
-@MappedSuperclass
-@Entity
public class EventPropertyQualityRequirement extends UnnamedStreamPipesEntity {
private static final long serialVersionUID = -8173312776233284351L;
- @OneToOne(cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.MINIMUM_EVENT_PROPERTY_QUALITY)
private transient EventPropertyQualityDefinition minimumPropertyQuality;
- @OneToOne(cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.MAXIMUM_EVENT_PROPERTY_QUALITY)
private transient EventPropertyQualityDefinition maximumPropertyQuality;
public EventPropertyQualityRequirement() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventStreamQualityDefinition.java b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventStreamQualityDefinition.java
index 1b50c83..36244ff 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventStreamQualityDefinition.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventStreamQualityDefinition.java
@@ -19,15 +19,7 @@
package org.apache.streampipes.model.quality;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-
-@RdfsClass(StreamPipes.EVENT_STREAM_QUALITY_DEFINITION)
-@MappedSuperclass
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(Frequency.class),
@JsonSubTypes.Type(Latency.class),
@@ -45,4 +37,4 @@ public class EventStreamQualityDefinition extends MeasurementProperty {
}
-}
\ No newline at end of file
+}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventStreamQualityRequirement.java b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventStreamQualityRequirement.java
index 045f2cb..d78ec00 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventStreamQualityRequirement.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventStreamQualityRequirement.java
@@ -18,29 +18,14 @@
package org.apache.streampipes.model.quality;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToOne;
-
-@RdfsClass(StreamPipes.Event_STREAM_QUALITY_REQUIREMENT)
-@MappedSuperclass
-@Entity
public class EventStreamQualityRequirement extends UnnamedStreamPipesEntity {
private static final long serialVersionUID = 1484115035721357275L;
- @OneToOne(cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.MINIMUM_EVENT_STREAM_QUALITY)
private transient EventStreamQualityDefinition minimumStreamQuality;
- @OneToOne(cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.MAXIMUM_EVENT_STREAM_QUALITY)
private transient EventStreamQualityDefinition maximumStreamQuality;
public EventStreamQualityRequirement(EventStreamQualityDefinition minimumStreamQuality,
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Frequency.java b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Frequency.java
index a966975..3cf2439 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Frequency.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Frequency.java
@@ -18,15 +18,6 @@
package org.apache.streampipes.model.quality;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.SSN;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(SSN.FREQUENCY)
-@Entity
public class Frequency extends EventStreamQualityDefinition {
private static final long serialVersionUID = 8196363710990038633L;
@@ -48,7 +39,6 @@ public class Frequency extends EventStreamQualityDefinition {
/**
* The unit of qualityValue is Hertz [Hz]
*/
- @RdfProperty(StreamPipes.HAS_QUANTITY_VALUE)
float quantityValue;
public float getQuantityValue() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Latency.java b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Latency.java
index 5703fb2..7441500 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Latency.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Latency.java
@@ -18,20 +18,10 @@
package org.apache.streampipes.model.quality;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.SSN;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(SSN.LATENCY)
-@Entity
public class Latency extends EventStreamQualityDefinition {
private static final long serialVersionUID = -9211064635743833555L;
-
- @RdfProperty(StreamPipes.HAS_QUANTITY_VALUE)
+
private float quantityValue;
public Latency() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementCapability.java b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementCapability.java
index 52116ad..ab62b88 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementCapability.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementCapability.java
@@ -18,22 +18,14 @@
package org.apache.streampipes.model.quality;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.net.URI;
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.MEASUREMENT_CAPABILITY)
-@Entity
public class MeasurementCapability extends UnnamedStreamPipesEntity {
private static final long serialVersionUID = -7561544835976781403L;
-
- @RdfProperty(StreamPipes.HAS_CAPABILTIY)
+
private URI capability;
public MeasurementCapability() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementObject.java b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementObject.java
index f0c0915..1a8f62f 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementObject.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementObject.java
@@ -18,22 +18,14 @@
package org.apache.streampipes.model.quality;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.net.URI;
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.MEASUREMENT_OBJECT)
-@Entity
public class MeasurementObject extends UnnamedStreamPipesEntity {
private static final long serialVersionUID = 4391097898611686930L;
-
- @RdfProperty(StreamPipes.MEASURES_OBJECT)
+
private URI measuresObject;
public MeasurementObject() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementProperty.java
index 5beb21a..043cfb4 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementProperty.java
@@ -19,14 +19,8 @@
package org.apache.streampipes.model.quality;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.SSN;
-import javax.persistence.Entity;
-
-@RdfsClass(SSN.MEASUREMENT_PROPERTY)
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(EventPropertyQualityDefinition.class),
@JsonSubTypes.Type(EventStreamQualityDefinition.class)
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementRange.java b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementRange.java
index d09eb5c..22399f5 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementRange.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementRange.java
@@ -18,23 +18,12 @@
package org.apache.streampipes.model.quality;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.SSN;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(SSN.MEASUREMENT_RANGE)
-@Entity
public class MeasurementRange extends EventPropertyQualityDefinition {
private static final long serialVersionUID = 4853190183770515968L;
- @RdfProperty(StreamPipes.HAS_MEASUREMENT_PROPERTY_MIN_VALUE)
private float minValue;
- @RdfProperty(StreamPipes.HAS_MEASUREMENT_PROPERTY_MAX_VALUE)
private float maxValue;
public MeasurementRange() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Precision.java b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Precision.java
index 8910779..17cdd74 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Precision.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Precision.java
@@ -18,20 +18,10 @@
package org.apache.streampipes.model.quality;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.SSN;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(SSN.PRECISION)
-@Entity
public class Precision extends EventPropertyQualityDefinition {
private static final long serialVersionUID = -1090184880089982077L;
-
- @RdfProperty(StreamPipes.HAS_QUANTITY_VALUE)
+
private float quantityValue;
public Precision() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Resolution.java b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Resolution.java
index 4bd3f37..be50781 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Resolution.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Resolution.java
@@ -18,20 +18,10 @@
package org.apache.streampipes.model.quality;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.SSN;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(SSN.RESOLUTION)
-@Entity
public class Resolution extends EventPropertyQualityDefinition {
private static final long serialVersionUID = -8794648771727880619L;
-
- @RdfProperty(StreamPipes.HAS_QUANTITY_VALUE)
+
private float quantityValue;
public Resolution() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/runtime/RuntimeOptionsRequest.java b/streampipes-model/src/main/java/org/apache/streampipes/model/runtime/RuntimeOptionsRequest.java
index bc270d1..5be9681 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/runtime/RuntimeOptionsRequest.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/runtime/RuntimeOptionsRequest.java
@@ -17,39 +17,22 @@
*/
package org.apache.streampipes.model.runtime;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.SpDataStream;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.shared.annotation.TsModel;
import org.apache.streampipes.model.staticproperty.StaticProperty;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.List;
-@RdfsClass(StreamPipes.RUNTIME_OPTIONS_REQUEST)
-@Entity
@TsModel
public class RuntimeOptionsRequest extends UnnamedStreamPipesEntity {
- @RdfProperty(StreamPipes.HAS_REQUEST_ID)
protected String requestId;
- @RdfProperty(StreamPipes.HAS_APP_ID)
protected String appId;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_STATIC_PROPERTY)
protected List<StaticProperty> staticProperties;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.RECEIVES_STREAM)
protected List<SpDataStream> inputStreams;
private String belongsTo;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/runtime/RuntimeOptionsResponse.java b/streampipes-model/src/main/java/org/apache/streampipes/model/runtime/RuntimeOptionsResponse.java
index cf73f9b..b56d02b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/runtime/RuntimeOptionsResponse.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/runtime/RuntimeOptionsResponse.java
@@ -17,27 +17,15 @@
*/
package org.apache.streampipes.model.runtime;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.shared.annotation.TsModel;
import org.apache.streampipes.model.staticproperty.Option;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.RUNTIME_OPTIONS_RESPONSE)
-@Entity
@TsModel
public class RuntimeOptionsResponse extends RuntimeOptionsRequest {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_OPTION)
private List<Option> options;
public RuntimeOptionsResponse() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/Enumeration.java b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/Enumeration.java
index 33ee65a..7bd6462 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/Enumeration.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/Enumeration.java
@@ -18,35 +18,16 @@
package org.apache.streampipes.model.schema;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.RDFS;
-import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-
-@RdfsClass(SO.Enumeration)
-@Entity
public class Enumeration extends ValueSpecification {
private static final long serialVersionUID = 1L;
-
- @RdfProperty(RDFS.LABEL)
+
private String label;
-
- @RdfProperty(RDFS.DESCRIPTION)
+
private String description;
-
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_RUNTIME_VALUE)
+
private List<String> runtimeValues;
public Enumeration() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventProperty.java
index 6e2960a..a057ea9 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventProperty.java
@@ -19,26 +19,18 @@
package org.apache.streampipes.model.schema;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.commons.collections.ListUtils;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.quality.EventPropertyQualityDefinition;
import org.apache.streampipes.model.quality.EventPropertyQualityRequirement;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.RDFS;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.*;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
-@RdfsClass(StreamPipes.EVENT_PROPERTY)
-@MappedSuperclass
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(EventPropertyList.class),
@JsonSubTypes.Type(EventPropertyNested.class),
@@ -50,39 +42,22 @@ public abstract class EventProperty extends UnnamedStreamPipesEntity {
protected static final String prefix = "urn:streampipes.org:spi:";
- @RdfProperty(RDFS.LABEL)
private String label;
- @RdfProperty(RDFS.DESCRIPTION)
private String description;
- @RdfProperty(StreamPipes.HAS_RUNTIME_NAME)
private String runtimeName;
- @RdfProperty(StreamPipes.REQUIRED)
private boolean required;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.DOMAIN_PROPERTY)
private List<URI> domainProperties;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.PERSIST, CascadeType.MERGE})
- @RdfProperty(StreamPipes.HAS_EVENT_PROPERTY_QUALITY_DEFINITION)
private List<EventPropertyQualityDefinition> eventPropertyQualities;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.PERSIST, CascadeType.MERGE})
- @RdfProperty(StreamPipes.HAS_EVENT_PROPERTY_QUALITY_REQUIREMENT)
private List<EventPropertyQualityRequirement> requiresEventPropertyQualities;
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_PROPERTY_SCOPE)
private String propertyScope;
- @RdfProperty(StreamPipes.INDEX)
private int index = 0;
private String runtimeId;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventPropertyList.java b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventPropertyList.java
index dd15a84..19f706d 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventPropertyList.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventPropertyList.java
@@ -18,27 +18,15 @@
package org.apache.streampipes.model.schema;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.net.URI;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToOne;
-
-@RdfsClass(StreamPipes.EVENT_PROPERTY_LIST)
-@Entity
public class EventPropertyList extends EventProperty {
private static final long serialVersionUID = -2636018143426727534L;
- @OneToOne(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_EVENT_PROPERTY)
private EventProperty eventProperty;
public EventPropertyList() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventPropertyNested.java b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventPropertyNested.java
index 7710b0c..8c9ab8b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventPropertyNested.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventPropertyNested.java
@@ -18,28 +18,15 @@
package org.apache.streampipes.model.schema;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-@RdfsClass(StreamPipes.EVENT_PROPERTY_NESTED)
-@Entity
public class EventPropertyNested extends EventProperty {
private static final long serialVersionUID = 6565569954878135195L;
-
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_EVENT_PROPERTY)
+
private List<EventProperty> eventProperties;
public EventPropertyNested()
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventPropertyPrimitive.java b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventPropertyPrimitive.java
index 06d0fcd..033e081 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventPropertyPrimitive.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventPropertyPrimitive.java
@@ -18,34 +18,20 @@
package org.apache.streampipes.model.schema;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.quality.EventPropertyQualityDefinition;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.net.URI;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.OneToOne;
-
-@RdfsClass(StreamPipes.EVENT_PROPERTY_PRIMITIVE)
-@Entity
public class EventPropertyPrimitive extends EventProperty {
private static final long serialVersionUID = 665989638281665875L;
- @RdfProperty(StreamPipes.HAS_PROPERTY_TYPE)
private String runtimeType;
- @RdfProperty(StreamPipes.HAS_MEASUREMENT_UNIT)
- @OneToOne(cascade = {CascadeType.ALL})
private URI measurementUnit;
- @RdfProperty(StreamPipes.HAS_VALUE_SPECIFICATION)
- @OneToOne(cascade = {CascadeType.ALL})
private ValueSpecification valueSpecification;
public EventPropertyPrimitive() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventSchema.java b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventSchema.java
index 0ea16eb..146055e 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventSchema.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/EventSchema.java
@@ -18,32 +18,17 @@
package org.apache.streampipes.model.schema;
-import io.fogsy.empire.annotations.Namespaces;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.commons.collections.ListUtils;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-@Namespaces({"sp", "https://streampipes.org/vocabulary/v1/"})
-@RdfsClass(StreamPipes.EVENT_SCHEMA)
-@Entity
public class EventSchema extends UnnamedStreamPipesEntity {
private static final long serialVersionUID = -3994041794693686406L;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_EVENT_PROPERTY)
private List<EventProperty> eventProperties;
public EventSchema(List<EventProperty> eventProperties) {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/QuantitativeValue.java b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/QuantitativeValue.java
index f5a0856..942a964 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/QuantitativeValue.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/QuantitativeValue.java
@@ -18,25 +18,14 @@
package org.apache.streampipes.model.schema;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.SO;
-
-import javax.persistence.Entity;
-
-@RdfsClass(SO.QuantitativeValue)
-@Entity
public class QuantitativeValue extends ValueSpecification {
private static final long serialVersionUID = 1L;
- @RdfProperty(SO.MinValue)
private Float minValue;
-
- @RdfProperty(SO.MaxValue)
+
private Float maxValue;
- @RdfProperty(SO.Step)
private Float step;
public QuantitativeValue() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/ValueSpecification.java b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/ValueSpecification.java
index 7ee076c..4b7a5de 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/schema/ValueSpecification.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/schema/ValueSpecification.java
@@ -19,16 +19,8 @@
package org.apache.streampipes.model.schema;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-
-@RdfsClass(StreamPipes.VALUE_SPECIFICATION)
-@MappedSuperclass
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(QuantitativeValue.class),
@JsonSubTypes.Type(Enumeration.class),
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/AnyStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/AnyStaticProperty.java
index 1132a8c..74fb6c7 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/AnyStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/AnyStaticProperty.java
@@ -18,13 +18,6 @@
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.ANY_STATIC_PROPERTY)
-@Entity
public class AnyStaticProperty extends SelectionStaticProperty {
private static final long serialVersionUID = -7046019539598560494L;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/CodeInputStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/CodeInputStaticProperty.java
index 1d2ae74..cb64f82 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/CodeInputStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/CodeInputStaticProperty.java
@@ -18,23 +18,12 @@
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.CODE_INPUT_STATIC_PROPERTY)
-@Entity
public class CodeInputStaticProperty extends StaticProperty {
- @RdfProperty(StreamPipes.HAS_LANGUAGE)
private String language;
- @RdfProperty(StreamPipes.HAS_CODE_TEMPLATE)
private String codeTemplate;
- @RdfProperty(StreamPipes.HAS_CODE_INPUT)
private String value;
public CodeInputStaticProperty() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/CollectionStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/CollectionStaticProperty.java
index 22b582a..8120047 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/CollectionStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/CollectionStaticProperty.java
@@ -18,37 +18,19 @@
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-
-@RdfsClass(StreamPipes.COLLECTION_STATIC_PROPERTY)
-@Entity
public class CollectionStaticProperty extends StaticProperty {
private static final long serialVersionUID = 1L;
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_STATIC_PROPERTY)
private StaticProperty staticPropertyTemplate;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.MEMBER)
private List<StaticProperty> members;
- @RdfProperty(StreamPipes.MEMBER_TYPE)
private String memberType;
public CollectionStaticProperty() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/ColorPickerStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/ColorPickerStaticProperty.java
index ac5fb57..8093ac1 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/ColorPickerStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/ColorPickerStaticProperty.java
@@ -17,17 +17,8 @@
*/
package org.apache.streampipes.model.staticproperty;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.COLOR_PICKER_STATIC_PROPERTY)
-@Entity
public class ColorPickerStaticProperty extends StaticProperty {
- @RdfProperty(StreamPipes.SELECTED_COLOR)
private String selectedColor;
public ColorPickerStaticProperty() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/DomainStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/DomainStaticProperty.java
index 6ca2bc5..3328b19 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/DomainStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/DomainStaticProperty.java
@@ -18,29 +18,16 @@
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.List;
-@RdfsClass(StreamPipes.DOMAIN_STATIC_PROPERTY)
-@Entity
public class DomainStaticProperty extends StaticProperty {
private static final long serialVersionUID = 1L;
- @RdfProperty(StreamPipes.REQUIRED_CLASS)
private String requiredClass;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_SUPPORTED_PROPERTY)
private List<SupportedProperty> supportedProperties;
public DomainStaticProperty() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/FileStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/FileStaticProperty.java
index 8cd267c..f2e7704 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/FileStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/FileStaticProperty.java
@@ -18,27 +18,17 @@
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.FILE_STATIC_PROPERTY)
-@Entity
public class FileStaticProperty extends StaticProperty {
private static final long serialVersionUID = 1L;
- @RdfProperty(StreamPipes.HAS_ENDPOINT_URL)
private String endpointUrl;
- @RdfProperty(StreamPipes.HAS_LOCATION_PATH)
private String locationPath;
- @RdfProperty(StreamPipes.HAS_REQUIRED_FILETYPES)
private List<String> requiredFiletypes;
public FileStaticProperty() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/FreeTextStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/FreeTextStaticProperty.java
index 000e635..063ab29 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/FreeTextStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/FreeTextStaticProperty.java
@@ -18,50 +18,28 @@
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
import java.net.URI;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToOne;
-
-@RdfsClass(StreamPipes.FREE_TEXT_STATIC_PROPERTY)
-@Entity
public class FreeTextStaticProperty extends StaticProperty {
private static final long serialVersionUID = 1L;
- @RdfProperty(StreamPipes.HAS_VALUE)
private String value;
- @RdfProperty(StreamPipes.REQUIRED_DATATYPE)
private URI requiredDatatype;
- @RdfProperty(StreamPipes.REQUIRED_DOMAIN_PROPERTY)
private URI requiredDomainProperty;
- @RdfProperty(StreamPipes.MAPS_TO)
private String mapsTo;
- @RdfProperty(StreamPipes.MULTI_LINE)
private boolean multiLine;
- @RdfProperty(StreamPipes.HTML_ALLOWED)
private boolean htmlAllowed;
- @RdfProperty(StreamPipes.HTML_FONT_FORMAT)
private boolean htmlFontFormat;
- @RdfProperty(StreamPipes.PLACEHOLDERS_SUPPORTED)
private boolean placeholdersSupported;
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.PERSIST, CascadeType.MERGE})
- @RdfProperty(StreamPipes.HAS_VALUE_SPECIFICATION)
private PropertyValueSpecification valueSpecification;
public FreeTextStaticProperty() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MappingProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MappingProperty.java
index 2e9ef39..3350872 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MappingProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MappingProperty.java
@@ -19,17 +19,10 @@
package org.apache.streampipes.model.staticproperty;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.*;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.MAPPING_PROPERTY)
-@MappedSuperclass
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(MappingPropertyNary.class),
@JsonSubTypes.Type(MappingPropertyUnary.class)
@@ -49,17 +42,10 @@ public abstract class MappingProperty extends StaticProperty {
* The value of the requirementSelector will be r0::number-mapping.
*
*/
- @RdfProperty(StreamPipes.MAPS_FROM)
private String requirementSelector;
- @RdfProperty(StreamPipes.MAPS_FROM_OPTIONS)
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
private List<String> mapsFromOptions;
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_PROPERTY_SCOPE)
private String propertyScope;
public MappingProperty() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MappingPropertyNary.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MappingPropertyNary.java
index 91c205e..d45b281 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MappingPropertyNary.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MappingPropertyNary.java
@@ -18,26 +18,13 @@
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.MAPPING_PROPERTY_NARY)
-@Entity
public class MappingPropertyNary extends MappingProperty {
private static final long serialVersionUID = 7570213252902343160L;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.MAPS_TO)
private List<String> selectedProperties;
public MappingPropertyNary() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MappingPropertyUnary.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MappingPropertyUnary.java
index 04c8387..ae2a9a4 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MappingPropertyUnary.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MappingPropertyUnary.java
@@ -18,19 +18,10 @@
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.MAPPING_PROPERTY_UNARY)
-@Entity
public class MappingPropertyUnary extends MappingProperty {
private static final long serialVersionUID = 2903529966128844426L;
- @RdfProperty(StreamPipes.MAPS_TO)
private String selectedProperty;
public MappingPropertyUnary() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MatchingStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MatchingStaticProperty.java
index f187614..f74cdde 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MatchingStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/MatchingStaticProperty.java
@@ -18,24 +18,14 @@
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
import java.net.URI;
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.MATCHING_STATIC_PROPERTY)
-@Entity
public class MatchingStaticProperty extends StaticProperty{
private static final long serialVersionUID = -6033310221105761979L;
- @RdfProperty(StreamPipes.MATCH_LEFT)
private URI matchLeft;
-
- @RdfProperty(StreamPipes.MATCH_RIGHT)
+
private URI matchRight;
public MatchingStaticProperty()
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/OneOfStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/OneOfStaticProperty.java
index ead1a48..27f520d 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/OneOfStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/OneOfStaticProperty.java
@@ -19,13 +19,7 @@
package org.apache.streampipes.model.staticproperty;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.ONE_OF_STATIC_PROPERTY)
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(RuntimeResolvableOneOfStaticProperty.class),
})
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/Option.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/Option.java
index bc5e446..5b9b563 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/Option.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/Option.java
@@ -18,26 +18,16 @@
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.OPTION)
-@Entity
public class Option extends UnnamedStreamPipesEntity {
private static final long serialVersionUID = 8536995294188662931L;
- @RdfProperty(StreamPipes.HAS_NAME)
private String name;
-
- @RdfProperty(StreamPipes.IS_SELECTED)
+
private boolean selected;
- @RdfProperty(StreamPipes.INTERNAL_NAME)
private String internalName;
public Option()
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/PropertyValueSpecification.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/PropertyValueSpecification.java
index 259f1ef..36c991c 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/PropertyValueSpecification.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/PropertyValueSpecification.java
@@ -18,26 +18,16 @@
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.SO;
-import javax.persistence.Entity;
-
-@RdfsClass(SO.PropertyValueSpecification)
-@Entity
public class PropertyValueSpecification extends UnnamedStreamPipesEntity {
private static final long serialVersionUID = 1L;
-
- @RdfProperty(SO.MinValue)
+
private double minValue;
-
- @RdfProperty(SO.MaxValue)
+
private double maxValue;
-
- @RdfProperty(SO.Step)
+
private double step;
public PropertyValueSpecification(double minValue, double maxValue,
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RemoteOneOfStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RemoteOneOfStaticProperty.java
index 786f589..7954170 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RemoteOneOfStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RemoteOneOfStaticProperty.java
@@ -19,40 +19,24 @@
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
@Deprecated
-@RdfsClass(StreamPipes.REMOTE_ONE_OF_STATIC_PROPERTY)
-@Entity
public class RemoteOneOfStaticProperty extends StaticProperty {
private static final long serialVersionUID = 3483290363677184344L;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_OPTION)
private List<Option> options;
- @RdfProperty(StreamPipes.REMOTE_URL)
private String remoteUrl;
- @RdfProperty(StreamPipes.VALUE_FIELD_NAME)
private String valueFieldName;
- @RdfProperty(StreamPipes.LABEL_FIELD_NAME)
private String labelFieldName;
- @RdfProperty(StreamPipes.DESCRIPTION_FIELD_NAME)
private String descriptionFieldName;
public RemoteOneOfStaticProperty() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RuntimeResolvableAnyStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RuntimeResolvableAnyStaticProperty.java
index 9cb27ca..6b5aea9 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RuntimeResolvableAnyStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RuntimeResolvableAnyStaticProperty.java
@@ -17,23 +17,10 @@
*/
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.List;
-@RdfsClass(StreamPipes.RUNTIME_RESOLVABLE_ANY_STATIC_PROPERTY)
-@Entity
public class RuntimeResolvableAnyStaticProperty extends AnyStaticProperty {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.DEPENDS_ON_STATIC_PROPERTY)
private List<String> dependsOn;
public RuntimeResolvableAnyStaticProperty() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RuntimeResolvableOneOfStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RuntimeResolvableOneOfStaticProperty.java
index d03b8fc..f992814 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RuntimeResolvableOneOfStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RuntimeResolvableOneOfStaticProperty.java
@@ -17,23 +17,10 @@
*/
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.List;
-@RdfsClass(StreamPipes.RUNTIME_RESOLVABLE_ONE_OF_STATIC_PROPERTY)
-@Entity
public class RuntimeResolvableOneOfStaticProperty extends OneOfStaticProperty {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.DEPENDS_ON_STATIC_PROPERTY)
private List<String> dependsOn;
public RuntimeResolvableOneOfStaticProperty() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/SecretStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/SecretStaticProperty.java
index 644e8f5..8d70ad2 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/SecretStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/SecretStaticProperty.java
@@ -17,24 +17,14 @@
*/
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.SECRET_STATIC_PROPERTY)
-@Entity
public class SecretStaticProperty extends StaticProperty {
public SecretStaticProperty() {
super(StaticPropertyType.SecretStaticProperty);
}
- @RdfProperty(StreamPipes.HAS_VALUE)
private String value;
- @RdfProperty(StreamPipes.IS_ENCRYPTED)
private Boolean encrypted;
public SecretStaticProperty(SecretStaticProperty other) {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/SelectionStaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/SelectionStaticProperty.java
index c6e278c..5913ddb 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/SelectionStaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/SelectionStaticProperty.java
@@ -18,30 +18,19 @@
package org.apache.streampipes.model.staticproperty;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.*;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.SELECTION_STATIC_PROPERTY)
-@MappedSuperclass
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(AnyStaticProperty.class),
@JsonSubTypes.Type(OneOfStaticProperty.class)
})
public abstract class SelectionStaticProperty extends StaticProperty {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_OPTION)
private List<Option> options;
- @RdfProperty(StreamPipes.IS_HORIZONTAL_RENDERING)
private boolean horizontalRendering;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticProperty.java
index e72f893..8e8f79b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticProperty.java
@@ -19,20 +19,9 @@
package org.apache.streampipes.model.staticproperty;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.shared.annotation.TsModel;
-import org.apache.streampipes.vocabulary.RDFS;
-import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-
-@RdfsClass(StreamPipes.STATIC_PROPERTY)
-@MappedSuperclass
-@Entity
@JsonSubTypes({
@JsonSubTypes.Type(AnyStaticProperty.class),
@JsonSubTypes.Type(CodeInputStaticProperty.class),
@@ -57,22 +46,16 @@ public abstract class StaticProperty extends UnnamedStreamPipesEntity {
private static final long serialVersionUID = 2509153122084646025L;
- @RdfProperty(StreamPipes.INDEX)
private int index;
- @RdfProperty(RDFS.LABEL)
private String label;
- @RdfProperty(RDFS.DESCRIPTION)
private String description;
- @RdfProperty(StreamPipes.INTERNAL_NAME)
private String internalName;
- @RdfProperty(SO.ValueRequired)
protected boolean valueRequired;
- @RdfProperty(StreamPipes.IS_PREDEFINED)
private boolean predefined;
protected StaticPropertyType staticPropertyType;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternative.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternative.java
index 8da3907..dcc161e 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternative.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternative.java
@@ -17,28 +17,12 @@
*/
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToOne;
-
-@RdfsClass(StreamPipes.STATIC_PROPERTY_ALTERNATIVE)
-@Entity
public class StaticPropertyAlternative extends StaticProperty {
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.IS_SELECTED)
private Boolean selected;
- @OneToOne(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_STATIC_PROPERTY)
private StaticProperty staticProperty;
public StaticPropertyAlternative() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternatives.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternatives.java
index 2b57233..66be300 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternatives.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyAlternatives.java
@@ -17,25 +17,11 @@
*/
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
-import org.apache.streampipes.vocabulary.StreamPipes;
-
import java.util.List;
import java.util.stream.Collectors;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-@RdfsClass(StreamPipes.STATIC_PROPERTY_ALTERNATIVES)
-@Entity
public class StaticPropertyAlternatives extends StaticProperty {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_STATIC_PROPERTY_ALTERNATIVE)
private List<StaticPropertyAlternative> alternatives;
public StaticPropertyAlternatives() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyGroup.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyGroup.java
index 9868fba..5e2d3a2 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyGroup.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyGroup.java
@@ -17,31 +17,16 @@
*/
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-@RdfsClass(StreamPipes.STATIC_PROPERTY_GROUP)
-@Entity
public class StaticPropertyGroup extends StaticProperty {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_STATIC_PROPERTY)
private List<StaticProperty> staticProperties;
- @RdfProperty(StreamPipes.SHOW_LABEL)
private Boolean showLabel;
- @RdfProperty(StreamPipes.IS_HORIZONTAL_RENDERING)
private boolean horizontalRendering;
public StaticPropertyGroup() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/SupportedProperty.java b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/SupportedProperty.java
index 4fd2356..f6b2ae4 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/SupportedProperty.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/SupportedProperty.java
@@ -18,27 +18,16 @@
package org.apache.streampipes.model.staticproperty;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.Entity;
-
-@RdfsClass(StreamPipes.SUPPORTED_PROPERTY)
-@Entity
public class SupportedProperty extends UnnamedStreamPipesEntity {
private static final long serialVersionUID = 1L;
- @RdfProperty(StreamPipes.REQUIRES_PROPERTY)
private String propertyId;
- @RdfProperty(SO.ValueRequired)
private boolean valueRequired;
- @RdfProperty(SO.Value)
private String value;
public SupportedProperty(SupportedProperty other) {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/template/BoundPipelineElement.java b/streampipes-model/src/main/java/org/apache/streampipes/model/template/BoundPipelineElement.java
index d431cf8..1321d23 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/template/BoundPipelineElement.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/template/BoundPipelineElement.java
@@ -17,30 +17,17 @@
*/
package org.apache.streampipes.model.template;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.BOUND_PIPELINE_ELEMENT)
-@Entity
public class BoundPipelineElement extends UnnamedStreamPipesEntity {
- @RdfProperty(StreamPipes.HAS_PIPELINE_ELEMENT_TEMPLATE)
private InvocableStreamPipesEntity pipelineElementTemplate;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.IS_CONNECTED_TO)
private List<BoundPipelineElement> connectedTo;
public BoundPipelineElement() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/template/PipelineTemplateDescription.java b/streampipes-model/src/main/java/org/apache/streampipes/model/template/PipelineTemplateDescription.java
index b1f295c..2f2c1d9 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/template/PipelineTemplateDescription.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/template/PipelineTemplateDescription.java
@@ -17,22 +17,13 @@
*/
package org.apache.streampipes.model.template;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.SpDataStream;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.PIPELINE_TEMPLATE_DESCRIPTION)
-@Entity
public class PipelineTemplateDescription extends NamedStreamPipesEntity {
//@RdfProperty(RDFS.LABEL)
@@ -44,9 +35,6 @@ public class PipelineTemplateDescription extends NamedStreamPipesEntity {
//@RdfProperty(RDFS.DESCRIPTION)
//private String pipelineTemplateDescription;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.IS_CONNECTED_TO)
private List<BoundPipelineElement> boundTo;
public PipelineTemplateDescription() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/template/PipelineTemplateDescriptionContainer.java b/streampipes-model/src/main/java/org/apache/streampipes/model/template/PipelineTemplateDescriptionContainer.java
index 0d12efc..838e02f 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/template/PipelineTemplateDescriptionContainer.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/template/PipelineTemplateDescriptionContainer.java
@@ -17,25 +17,13 @@
*/
package org.apache.streampipes.model.template;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.PIPELINE_TEMPLATE_DESCRIPTION_CONTAINER)
-@Entity
public class PipelineTemplateDescriptionContainer extends UnnamedStreamPipesEntity {
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty("sp:list")
private List<PipelineTemplateDescription> list;
public PipelineTemplateDescriptionContainer() {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/template/PipelineTemplateInvocation.java b/streampipes-model/src/main/java/org/apache/streampipes/model/template/PipelineTemplateInvocation.java
index 4446fe6..8a1a636 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/template/PipelineTemplateInvocation.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/template/PipelineTemplateInvocation.java
@@ -17,28 +17,19 @@
*/
package org.apache.streampipes.model.template;
-import io.fogsy.empire.annotations.RdfProperty;
-import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.staticproperty.StaticProperty;
import org.apache.streampipes.model.util.Cloner;
-import org.apache.streampipes.vocabulary.StreamPipes;
-import javax.persistence.*;
import java.util.ArrayList;
import java.util.List;
-@RdfsClass(StreamPipes.PIPELINE_TEMPLATE_INVOCATION)
-@Entity
public class PipelineTemplateInvocation extends UnnamedStreamPipesEntity {
- @RdfProperty(StreamPipes.HAS_NAME)
private String kviName;
- @RdfProperty(StreamPipes.HAS_DATASET_ID)
private String dataSetId;
- @RdfProperty(StreamPipes.INTERNAL_NAME)
private String pipelineTemplateId;
//@RdfProperty(StreamPipes.HAS_PIPELINE_TEMPLATE_DESCRIPTION)
@@ -46,9 +37,6 @@ public class PipelineTemplateInvocation extends UnnamedStreamPipesEntity {
// cascade = {CascadeType.PERSIST, CascadeType.MERGE})
private PipelineTemplateDescription pipelineTemplateDescription;
- @OneToMany(fetch = FetchType.EAGER,
- cascade = {CascadeType.ALL})
- @RdfProperty(StreamPipes.HAS_STATIC_PROPERTY)
private List<StaticProperty> staticProperties;
public PipelineTemplateInvocation() {