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 2023/01/08 16:56:48 UTC
[streampipes] branch SP-1058 created (now 64c9c198f)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch SP-1058
in repository https://gitbox.apache.org/repos/asf/streampipes.git
at 64c9c198f Eliminate Abstract and UnnamedStreamPipesEntity classes (#SP-1058)
This branch includes the following new commits:
new dbdac1ad2 Remove unused classes (#1058)
new d0d68b550 Remove obsolete event property quality classes (#1058)
new 64c9c198f Eliminate Abstract and UnnamedStreamPipesEntity classes (#SP-1058)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[streampipes] 03/03: Eliminate Abstract and UnnamedStreamPipesEntity classes (#SP-1058)
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch SP-1058
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 64c9c198fb756e7cc6be027afeb7128dead189c8
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Sun Jan 8 17:56:25 2023 +0100
Eliminate Abstract and UnnamedStreamPipesEntity classes (#SP-1058)
---
.../streampipes/model/SpDataStreamContainer.java | 8 +-
.../model/base/AbstractStreamPipesEntity.java | 71 -
.../model/base/NamedStreamPipesEntity.java | 35 +-
.../model/base/UnnamedStreamPipesEntity.java | 45 -
.../model/connect/guess/GuessSchema.java | 7 +-
.../rules/TransformationRuleDescription.java | 9 +-
.../model/dashboard/DashboardWidgetSettings.java | 3 +-
.../model/datalake/DataLakeMeasure.java | 16 +-
.../model/grounding/EventGrounding.java | 4 +-
.../model/grounding/TopicDefinition.java | 7 +-
.../model/grounding/TransportFormat.java | 5 +-
.../model/grounding/TransportProtocol.java | 18 +-
.../model/grounding/WildcardTopicMapping.java | 4 +-
.../monitoring/ElementStatusInfoSettings.java | 5 +-
.../streampipes/model/output/OutputStrategy.java | 6 +-
.../model/output/PropertyRenameRule.java | 5 +-
.../model/output/TransformOperation.java | 5 +-
.../model/runtime/RuntimeOptionsRequest.java | 6 +-
.../streampipes/model/schema/Enumeration.java | 1 -
.../streampipes/model/schema/EventProperty.java | 21 +-
.../streampipes/model/schema/EventSchema.java | 4 +-
.../model/schema/QuantitativeValue.java | 3 -
.../model/schema/ValueSpecification.java | 10 +-
.../streampipes/model/staticproperty/Option.java | 26 +-
.../staticproperty/PropertyValueSpecification.java | 4 +-
.../model/staticproperty/StaticProperty.java | 6 +-
.../staticproperty/StaticPropertyAlternative.java | 13 +
.../model/staticproperty/SupportedProperty.java | 4 +-
.../model/template/BoundPipelineElement.java | 5 +-
.../PipelineTemplateDescriptionContainer.java | 4 +-
.../model/template/PipelineTemplateInvocation.java | 7 +-
.../streampipes/model/util/ElementIdGenerator.java | 2 +-
.../matching/output/ListOutputSchemaGenerator.java | 1 -
.../matching/output/PropertyDuplicateRemover.java | 3 -
.../output/TransformOutputSchemaGenerator.java | 7 +-
.../monitoring/pipeline/ExtensionsLogProvider.java | 6 +-
.../AbstractPipelineElementResourceManager.java | 3 +-
.../src/lib/model/gen/streampipes-model.ts | 1403 ++++++--------------
ui/src/app/editor/editor.component.ts | 20 +-
39 files changed, 566 insertions(+), 1246 deletions(-)
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 075f303f9..a59d6fb3a 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,12 +17,16 @@
*/
package org.apache.streampipes.model;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.util.ArrayList;
import java.util.List;
-public class SpDataStreamContainer extends UnnamedStreamPipesEntity {
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
+@TsModel
+public class SpDataStreamContainer {
private List<SpDataStream> list;
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
deleted file mode 100644
index 0c1165d78..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/base/AbstractStreamPipesEntity.java
+++ /dev/null
@@ -1,71 +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 org.apache.streampipes.model.shared.annotation.TsModel;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.google.gson.annotations.SerializedName;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-
-/**
- * top-level StreamPipes element
- */
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
-@TsModel
-public class AbstractStreamPipesEntity implements Serializable {
-
- private static final long serialVersionUID = -8593749314663582071L;
-
- protected @SerializedName("_id") String elementId;
-
- AbstractStreamPipesEntity() {
-
- }
-
- AbstractStreamPipesEntity(AbstractStreamPipesEntity other) {
- this.elementId = other.getElementId();
- }
-
- public String getElementId() {
- return elementId;
- }
-
- public void setElementId(String elementId) {
- this.elementId = elementId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- AbstractStreamPipesEntity that = (AbstractStreamPipesEntity) o;
- return Objects.equals(elementId, that.elementId);
- }
-
-}
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 b1adb60f1..1e7e1a8bb 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
@@ -19,21 +19,32 @@
package org.apache.streampipes.model.base;
+import org.apache.streampipes.model.shared.annotation.TsModel;
+
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* named pipeline element, can be accessed via the URI provided in @RdfId
*/
-public abstract class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
+
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
+@TsModel
+public abstract class NamedStreamPipesEntity implements Serializable {
private static final long serialVersionUID = -98951691820519795L;
+ protected @SerializedName("_id") String elementId;
+
@JsonProperty("_rev")
protected @SerializedName("_rev") String rev;
+
protected String dom;
protected List<String> connectedTo;
private String name;
@@ -73,7 +84,7 @@ public abstract class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
}
public NamedStreamPipesEntity(NamedStreamPipesEntity other) {
- super(other);
+ this.elementId = other.getElementId();
this.rev = other.getRev();
this.description = other.getDescription();
this.name = other.getName();
@@ -198,4 +209,24 @@ public abstract class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
public void setRev(String rev) {
this.rev = rev;
}
+
+ public String getElementId() {
+ return elementId;
+ }
+
+ public void setElementId(String elementId) {
+ this.elementId = elementId;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ NamedStreamPipesEntity that = (NamedStreamPipesEntity) o;
+ return Objects.equals(elementId, that.elementId);
+ }
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/base/UnnamedStreamPipesEntity.java b/streampipes-model/src/main/java/org/apache/streampipes/model/base/UnnamedStreamPipesEntity.java
deleted file mode 100644
index 85cfdb918..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/base/UnnamedStreamPipesEntity.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.streampipes.model.base;
-
-
-import org.apache.streampipes.model.util.ElementIdGenerator;
-
-/**
- * unnamed SEPA elements (that do not require any readable identifier)
- */
-public abstract class UnnamedStreamPipesEntity extends AbstractStreamPipesEntity {
-
- private static final long serialVersionUID = 8051137255998890188L;
-
- public UnnamedStreamPipesEntity() {
- super();
- this.elementId = ElementIdGenerator.makeElementId(this);
- }
-
- public UnnamedStreamPipesEntity(UnnamedStreamPipesEntity other) {
- this();
- }
-
- public UnnamedStreamPipesEntity(String elementId) {
- super();
- this.elementId = elementId;
- }
-
-}
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 020de7710..59c65321f 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,17 +18,19 @@
package org.apache.streampipes.model.connect.guess;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.model.shared.annotation.TsModel;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
@TsModel
-public class GuessSchema extends UnnamedStreamPipesEntity {
+public class GuessSchema {
public EventSchema eventSchema;
@@ -43,7 +45,6 @@ public class GuessSchema extends UnnamedStreamPipesEntity {
}
public GuessSchema(GuessSchema other) {
- super(other);
this.eventSchema = other.getEventSchema() != null ? new EventSchema(other.getEventSchema()) : null;
this.eventPreview = other.getEventPreview();
this.fieldStatusInfo = other.getFieldStatusInfo();
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 443f53601..a4a42b8f2 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
@@ -18,7 +18,6 @@
package org.apache.streampipes.model.connect.rules;
-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;
import org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription;
@@ -34,7 +33,9 @@ import org.apache.streampipes.model.connect.rules.value.UnitTransformRuleDescrip
import org.apache.streampipes.model.shared.annotation.TsModel;
import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
@TsModel
@JsonSubTypes({
@JsonSubTypes.Type(AddTimestampRuleDescription.class),
@@ -51,14 +52,10 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
@JsonSubTypes.Type(CorrectionValueTransformationRuleDescription.class),
@JsonSubTypes.Type(DebugSinkRuleDescription.class)
})
-public abstract class TransformationRuleDescription extends UnnamedStreamPipesEntity {
+public abstract class TransformationRuleDescription {
public TransformationRuleDescription() {
super();
}
-
- public TransformationRuleDescription(TransformationRuleDescription other) {
- super();
- }
}
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 7521557c4..c28e823b7 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,7 +18,6 @@
package org.apache.streampipes.model.dashboard;
-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;
@@ -26,7 +25,7 @@ import org.apache.streampipes.model.staticproperty.StaticProperty;
import java.util.List;
@TsModel
-public class DashboardWidgetSettings extends UnnamedStreamPipesEntity {
+public class DashboardWidgetSettings {
private String widgetLabel;
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 ed15c746d..03714088d 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,21 +18,24 @@
package org.apache.streampipes.model.datalake;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.schema.EventSchema;
import org.apache.streampipes.model.shared.annotation.TsIgnore;
import org.apache.streampipes.model.shared.annotation.TsModel;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.google.gson.annotations.SerializedName;
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
@TsModel
-public class DataLakeMeasure extends UnnamedStreamPipesEntity {
+public class DataLakeMeasure {
public static final String CURRENT_SCHEMA_VERSION = "1.1";
public static final String ASSERTION_ERROR_MESSAGE = "timestamp field requires a stream prefix (e.g. s0::timestamp)";
private static final String STREAM_PREFIX_DELIMITER = "::";
+
+ protected @SerializedName("_id") String elementId;
@JsonProperty("_rev")
private @SerializedName("_rev") String rev;
@@ -51,7 +54,6 @@ public class DataLakeMeasure extends UnnamedStreamPipesEntity {
}
public DataLakeMeasure(DataLakeMeasure other) {
- super(other);
this.measureName = other.getMeasureName();
this.eventSchema = new EventSchema(other.getEventSchema());
@@ -143,4 +145,12 @@ public class DataLakeMeasure extends UnnamedStreamPipesEntity {
public void setRev(String rev) {
this.rev = rev;
}
+
+ public String getElementId() {
+ return elementId;
+ }
+
+ public void setElementId(String elementId) {
+ this.elementId = elementId;
+ }
}
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 2a32bdce9..79e497a02 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
@@ -18,7 +18,6 @@
package org.apache.streampipes.model.grounding;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -28,7 +27,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-public class EventGrounding extends UnnamedStreamPipesEntity {
+public class EventGrounding {
private static final long serialVersionUID = 3149070517282698799L;
@@ -49,7 +48,6 @@ public class EventGrounding extends UnnamedStreamPipesEntity {
}
public EventGrounding(EventGrounding other) {
- super(other);
this.transportProtocols = new Cloner().protocols(other.getTransportProtocols());
this.transportFormats = new Cloner().transportFormats(other.getTransportFormats());
}
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 e57e4fe05..3551876b4 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
@@ -18,15 +18,15 @@
package org.apache.streampipes.model.grounding;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
@JsonSubTypes({
@JsonSubTypes.Type(SimpleTopicDefinition.class),
@JsonSubTypes.Type(WildcardTopicDefinition.class)
})
-public abstract class TopicDefinition extends UnnamedStreamPipesEntity {
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
+public abstract class TopicDefinition {
private String actualTopicName;
@@ -40,7 +40,6 @@ public abstract class TopicDefinition extends UnnamedStreamPipesEntity {
}
public TopicDefinition(TopicDefinition other) {
- super(other);
this.actualTopicName = other.getActualTopicName();
}
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 93d9a66ce..a585787f1 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,13 +18,11 @@
package org.apache.streampipes.model.grounding;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-public class TransportFormat extends UnnamedStreamPipesEntity {
+public class TransportFormat {
private static final long serialVersionUID = -525073244975968386L;
@@ -42,7 +40,6 @@ public class TransportFormat extends UnnamedStreamPipesEntity {
}
public TransportFormat(TransportFormat other) {
- super(other);
this.rdfType = other.getRdfType();
}
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 29c30a8f5..e4f738d7f 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
@@ -18,10 +18,11 @@
package org.apache.streampipes.model.grounding;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
+import org.apache.streampipes.model.util.ElementIdGenerator;
import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
@JsonSubTypes({
@JsonSubTypes.Type(JmsTransportProtocol.class),
@@ -29,16 +30,20 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
@JsonSubTypes.Type(MqttTransportProtocol.class),
@JsonSubTypes.Type(NatsTransportProtocol.class)
})
-public abstract class TransportProtocol extends UnnamedStreamPipesEntity {
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
+public abstract class TransportProtocol {
private static final long serialVersionUID = 7625791395504335184L;
+ private String elementId;
+
private String brokerHostname;
private TopicDefinition topicDefinition;
public TransportProtocol() {
super();
+ this.elementId = ElementIdGenerator.makeElementId(TransportProtocol.class);
}
public TransportProtocol(String hostname, TopicDefinition topicDefinition) {
@@ -48,7 +53,7 @@ public abstract class TransportProtocol extends UnnamedStreamPipesEntity {
}
public TransportProtocol(TransportProtocol other) {
- super(other);
+ this.elementId = other.getElementId();
this.brokerHostname = other.getBrokerHostname();
if (other.getTopicDefinition() != null) {
this.topicDefinition = new Cloner().topicDefinition(other.getTopicDefinition());
@@ -71,4 +76,11 @@ public abstract class TransportProtocol extends UnnamedStreamPipesEntity {
this.topicDefinition = topicDefinition;
}
+ public String getElementId() {
+ return elementId;
+ }
+
+ public void setElementId(String elementId) {
+ this.elementId = elementId;
+ }
}
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 71930b39b..a210caf0e 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,9 +17,7 @@
*/
package org.apache.streampipes.model.grounding;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
-public class WildcardTopicMapping extends UnnamedStreamPipesEntity {
+public class WildcardTopicMapping {
private String topicParameterType;
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 2efc9d7ed..f3731d2a0 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,9 +18,7 @@
package org.apache.streampipes.model.monitoring;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
-public class ElementStatusInfoSettings extends UnnamedStreamPipesEntity {
+public class ElementStatusInfoSettings {
private String elementIdentifier;
@@ -37,7 +35,6 @@ public class ElementStatusInfoSettings extends UnnamedStreamPipesEntity {
}
public ElementStatusInfoSettings(ElementStatusInfoSettings other) {
- super(other);
this.kafkaHost = other.getKafkaHost();
this.kafkaPort = other.getKafkaPort();
this.errorTopic = other.getErrorTopic();
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 ef27446aa..05484f167 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
@@ -18,10 +18,10 @@
package org.apache.streampipes.model.output;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.util.ArrayList;
import java.util.List;
@@ -36,7 +36,8 @@ import java.util.List;
@JsonSubTypes.Type(TransformOutputStrategy.class),
@JsonSubTypes.Type(UserDefinedOutputStrategy.class),
})
-public abstract class OutputStrategy extends UnnamedStreamPipesEntity {
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
+public abstract class OutputStrategy {
private static final long serialVersionUID = 1953204905003864143L;
@@ -50,7 +51,6 @@ public abstract class OutputStrategy extends UnnamedStreamPipesEntity {
}
public OutputStrategy(OutputStrategy other) {
- super(other);
this.name = other.getName();
this.renameRules = new Cloner().renameRules(other.getRenameRules());
}
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 88baee424..b31a72f3f 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,11 +17,9 @@
*/
package org.apache.streampipes.model.output;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
import java.io.Serializable;
-public class PropertyRenameRule extends UnnamedStreamPipesEntity implements Serializable {
+public class PropertyRenameRule implements Serializable {
private String runtimeId;
@@ -38,7 +36,6 @@ public class PropertyRenameRule extends UnnamedStreamPipesEntity implements Seri
}
public PropertyRenameRule(PropertyRenameRule other) {
- super(other);
this.runtimeId = other.getRuntimeId();
this.newRuntimeName = other.getNewRuntimeName();
}
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 611a5b481..47e8d6812 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,9 +17,7 @@
*/
package org.apache.streampipes.model.output;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
-public class TransformOperation extends UnnamedStreamPipesEntity {
+public class TransformOperation {
/**
* the internal name of the mapping property that linkes to an event property related to this transform operation
@@ -51,7 +49,6 @@ public class TransformOperation extends UnnamedStreamPipesEntity {
}
public TransformOperation(TransformOperation other) {
- super(other);
this.mappingPropertyInternalName = other.getMappingPropertyInternalName();
this.sourceStaticProperty = other.getSourceStaticProperty();
this.transformationScope = other.getTransformationScope();
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 5be968127..0f5efe241 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
@@ -18,14 +18,16 @@
package org.apache.streampipes.model.runtime;
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 com.fasterxml.jackson.annotation.JsonTypeInfo;
+
import java.util.List;
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
@TsModel
-public class RuntimeOptionsRequest extends UnnamedStreamPipesEntity {
+public class RuntimeOptionsRequest {
protected String requestId;
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 c8f8147e0..bc120c95e 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
@@ -42,7 +42,6 @@ public class Enumeration extends ValueSpecification {
}
public Enumeration(Enumeration other) {
- super(other);
this.label = other.getLabel();
this.description = other.getDescription();
this.runtimeValues = other.getRuntimeValues();
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 d97e3cb05..3abb7e5c5 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
@@ -18,26 +18,29 @@
package org.apache.streampipes.model.schema;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
+import org.apache.streampipes.model.util.ElementIdGenerator;
import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
import org.apache.commons.collections.ListUtils;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import java.util.UUID;
@JsonSubTypes({
@JsonSubTypes.Type(EventPropertyList.class),
@JsonSubTypes.Type(EventPropertyNested.class),
@JsonSubTypes.Type(EventPropertyPrimitive.class)
})
-public abstract class EventProperty extends UnnamedStreamPipesEntity {
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
+public abstract class EventProperty {
protected static final String PREFIX = "urn:streampipes.org:spi:";
private static final long serialVersionUID = 7079045979946059387L;
+
+ private String elementId;
private String label;
private String description;
@@ -56,12 +59,12 @@ public abstract class EventProperty extends UnnamedStreamPipesEntity {
public EventProperty() {
- super(PREFIX + UUID.randomUUID().toString());
+ this.elementId = ElementIdGenerator.makeElementId(EventProperty.class);
this.domainProperties = new ArrayList<>();
}
public EventProperty(EventProperty other) {
- super(other);
+ this.elementId = other.getElementId();
this.label = other.getLabel();
this.description = other.getDescription();
this.required = other.isRequired();
@@ -175,4 +178,12 @@ public abstract class EventProperty extends UnnamedStreamPipesEntity {
public void setIndex(int index) {
this.index = index;
}
+
+ public String getElementId() {
+ return elementId;
+ }
+
+ public void setElementId(String elementId) {
+ this.elementId = elementId;
+ }
}
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 e241fe20a..469b63ec1 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,7 +18,6 @@
package org.apache.streampipes.model.schema;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
import org.apache.commons.collections.ListUtils;
@@ -26,7 +25,7 @@ import org.apache.commons.collections.ListUtils;
import java.util.ArrayList;
import java.util.List;
-public class EventSchema extends UnnamedStreamPipesEntity {
+public class EventSchema {
private static final long serialVersionUID = -3994041794693686406L;
@@ -43,7 +42,6 @@ public class EventSchema extends UnnamedStreamPipesEntity {
}
public EventSchema(EventSchema other) {
- super(other);
this.eventProperties = new Cloner().properties(other.getEventProperties());
}
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 21e32e5fb..4756fdc09 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
@@ -20,8 +20,6 @@ package org.apache.streampipes.model.schema;
public class QuantitativeValue extends ValueSpecification {
- private static final long serialVersionUID = 1L;
-
private Float minValue;
private Float maxValue;
@@ -40,7 +38,6 @@ public class QuantitativeValue extends ValueSpecification {
}
public QuantitativeValue(QuantitativeValue other) {
- super(other);
this.minValue = other.getMinValue();
this.maxValue = other.getMaxValue();
this.step = other.getStep();
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 9d27b68dd..20e2465a2 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
@@ -18,15 +18,15 @@
package org.apache.streampipes.model.schema;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
@JsonSubTypes({
@JsonSubTypes.Type(QuantitativeValue.class),
@JsonSubTypes.Type(Enumeration.class),
})
-public abstract class ValueSpecification extends UnnamedStreamPipesEntity {
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
+public abstract class ValueSpecification {
private static final long serialVersionUID = 1L;
@@ -34,8 +34,4 @@ public abstract class ValueSpecification extends UnnamedStreamPipesEntity {
super();
}
- public ValueSpecification(ValueSpecification other) {
- super(other);
- }
-
}
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 c5935f543..033bc2262 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,11 +18,11 @@
package org.apache.streampipes.model.staticproperty;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
+import org.apache.streampipes.model.util.ElementIdGenerator;
-public class Option extends UnnamedStreamPipesEntity {
+public class Option {
- private static final long serialVersionUID = 8536995294188662931L;
+ private String elementId;
private String name;
@@ -31,34 +31,40 @@ public class Option extends UnnamedStreamPipesEntity {
private String internalName;
public Option() {
- super();
+ this.elementId = ElementIdGenerator.makeElementId(Option.class);
}
public Option(String name) {
- super();
+ this();
this.name = name;
}
public Option(String name, String internalName) {
- super();
- this.name = name;
+ this(name);
this.internalName = internalName;
}
public Option(String name, boolean selected) {
- super();
- this.name = name;
+ this(name);
this.selected = selected;
}
public Option(Option o) {
- super(o);
+ this.elementId = o.getElementId();
this.name = o.getName();
this.selected = o.isSelected();
this.internalName = o.getInternalName();
}
+ public String getElementId() {
+ return elementId;
+ }
+
+ public void setElementId(String elementId) {
+ this.elementId = elementId;
+ }
+
public String getName() {
return name;
}
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 f48c78484..6374bfd77 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,9 +18,7 @@
package org.apache.streampipes.model.staticproperty;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
-public class PropertyValueSpecification extends UnnamedStreamPipesEntity {
+public class PropertyValueSpecification {
private static final long serialVersionUID = 1L;
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 86e2b9e3c..6b8e40682 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
@@ -18,10 +18,10 @@
package org.apache.streampipes.model.staticproperty;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.shared.annotation.TsModel;
import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
@JsonSubTypes({
@JsonSubTypes.Type(AnyStaticProperty.class),
@@ -45,7 +45,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
@JsonSubTypes.Type(SlideToggleStaticProperty.class)
})
@TsModel
-public abstract class StaticProperty extends UnnamedStreamPipesEntity {
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
+public abstract class StaticProperty {
private static final long serialVersionUID = 2509153122084646025L;
protected boolean valueRequired;
@@ -68,7 +69,6 @@ public abstract class StaticProperty extends UnnamedStreamPipesEntity {
}
public StaticProperty(StaticProperty other) {
- super(other);
this.index = other.getIndex();
this.description = other.getDescription();
this.internalName = other.getInternalName();
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 a5d4c526f..fd0d57faf 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
@@ -18,30 +18,43 @@
package org.apache.streampipes.model.staticproperty;
import org.apache.streampipes.model.util.Cloner;
+import org.apache.streampipes.model.util.ElementIdGenerator;
public class StaticPropertyAlternative extends StaticProperty {
+ private String elementId;
private boolean selected;
private StaticProperty staticProperty;
public StaticPropertyAlternative() {
super(StaticPropertyType.StaticPropertyAlternative);
+ this.elementId = ElementIdGenerator.makeElementId(StaticPropertyAlternative.class);
}
public StaticPropertyAlternative(String internalName,
String label, String description) {
super(StaticPropertyType.StaticPropertyAlternative, internalName, label, description);
+ this.elementId = ElementIdGenerator.makeElementId(StaticPropertyAlternative.class);
}
public StaticPropertyAlternative(StaticPropertyAlternative other) {
super(other);
+ this.elementId = other.getElementId();
this.selected = other.getSelected();
if (other.getStaticProperty() != null) {
this.staticProperty = new Cloner().staticProperty(other.getStaticProperty());
}
}
+ public String getElementId() {
+ return elementId;
+ }
+
+ public void setElementId(String elementId) {
+ this.elementId = elementId;
+ }
+
public Boolean getSelected() {
return selected;
}
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 f6b2ae40a..69545cea8 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,9 +18,7 @@
package org.apache.streampipes.model.staticproperty;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
-public class SupportedProperty extends UnnamedStreamPipesEntity {
+public class SupportedProperty {
private static final long serialVersionUID = 1L;
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 1321d235d..267b3511b 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
@@ -18,13 +18,12 @@
package org.apache.streampipes.model.template;
import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
import java.util.ArrayList;
import java.util.List;
-public class BoundPipelineElement extends UnnamedStreamPipesEntity {
+public class BoundPipelineElement {
private InvocableStreamPipesEntity pipelineElementTemplate;
@@ -36,8 +35,6 @@ public class BoundPipelineElement extends UnnamedStreamPipesEntity {
}
public BoundPipelineElement(BoundPipelineElement other) {
- // TODO add cloner
- super(other);
this.pipelineElementTemplate = other.getPipelineElementTemplate();
this.connectedTo = new Cloner().boundPipelineElements(other.getConnectedTo());
}
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 201ada511..e523fa0bb 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,12 +17,10 @@
*/
package org.apache.streampipes.model.template;
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
import java.util.ArrayList;
import java.util.List;
-public class PipelineTemplateDescriptionContainer extends UnnamedStreamPipesEntity {
+public class PipelineTemplateDescriptionContainer {
private List<PipelineTemplateDescription> list;
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 2a96ad64b..73139d11b 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,16 +17,18 @@
*/
package org.apache.streampipes.model.template;
-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.model.util.Cloner;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
import java.util.ArrayList;
import java.util.List;
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
@TsModel
-public class PipelineTemplateInvocation extends UnnamedStreamPipesEntity {
+public class PipelineTemplateInvocation {
private String kviName;
@@ -44,7 +46,6 @@ public class PipelineTemplateInvocation extends UnnamedStreamPipesEntity {
}
public PipelineTemplateInvocation(PipelineTemplateInvocation other) {
- super(other);
this.kviName = other.getKviName();
this.dataSetId = other.getDataSetId();
this.pipelineTemplateId = other.getPipelineTemplateId();
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/util/ElementIdGenerator.java b/streampipes-model/src/main/java/org/apache/streampipes/model/util/ElementIdGenerator.java
index 83a7041b0..18d29f1e8 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/util/ElementIdGenerator.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/util/ElementIdGenerator.java
@@ -21,7 +21,7 @@ import org.apache.commons.lang3.RandomStringUtils;
public class ElementIdGenerator {
- private static final String prefix = "urn:streampipes.apache.org:spi:";
+ private static final String prefix = "sp:";
public static String makeElementId(Object obj) {
return makeElementId(obj.getClass());
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/output/ListOutputSchemaGenerator.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/output/ListOutputSchemaGenerator.java
index 55212a112..7b1edd2fd 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/output/ListOutputSchemaGenerator.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/output/ListOutputSchemaGenerator.java
@@ -58,7 +58,6 @@ public class ListOutputSchemaGenerator extends OutputSchemaGenerator<ListOutputS
EventPropertyList list = new EventPropertyList();
//list.setEventProperties(schemaProperties);
list.setRuntimeName(propertyName);
- list.setElementId(schemaProperties.get(0).getElementId() + "-list");
EventSchema schema = new EventSchema();
schema.setEventProperties(Utils.createList(list));
return schema;
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/output/PropertyDuplicateRemover.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/output/PropertyDuplicateRemover.java
index 811e11216..4106f664d 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/output/PropertyDuplicateRemover.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/output/PropertyDuplicateRemover.java
@@ -47,7 +47,6 @@ public class PropertyDuplicateRemover {
EventPropertyPrimitive primitive = (EventPropertyPrimitive) newProperty;
newProperty = new EventPropertyPrimitive(primitive.getRuntimeType(), primitive.getRuntimeName() + i, "",
primitive.getDomainProperties());
- newProperty.setElementId(primitive.getElementId() + i);
}
if (newProperty instanceof EventPropertyNested) {
EventPropertyNested nested = (EventPropertyNested) newProperty;
@@ -61,14 +60,12 @@ public class PropertyDuplicateRemover {
EventProperty newNested =
new EventPropertyPrimitive(thisPrimitive.getRuntimeType(), thisPrimitive.getRuntimeName(), "",
thisPrimitive.getDomainProperties());
- newNested.setElementId(thisPrimitive.getElementId());
nestedProperties.add(newNested);
}
}
newProperty = new EventPropertyNested(nested.getRuntimeName() + i, nestedProperties);
//newProperty = new EventPropertyNested(nested.getPropertyName() +i, nested.getEventProperties());
- newProperty.setElementId(nested.getElementId() + i);
}
i++;
}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/output/TransformOutputSchemaGenerator.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/output/TransformOutputSchemaGenerator.java
index 711b5c18f..656d10a4a 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/output/TransformOutputSchemaGenerator.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/output/TransformOutputSchemaGenerator.java
@@ -18,6 +18,7 @@
package org.apache.streampipes.manager.matching.output;
import org.apache.streampipes.model.SpDataStream;
+import org.apache.streampipes.model.constants.PropertySelectorConstants;
import org.apache.streampipes.model.graph.DataProcessorInvocation;
import org.apache.streampipes.model.output.OutputStrategy;
import org.apache.streampipes.model.output.TransformOperation;
@@ -79,7 +80,7 @@ public class TransformOutputSchemaGenerator extends OutputSchemaGenerator<Transf
if (eventPropertyOpt.isPresent()) {
EventProperty eventProperty = eventPropertyOpt.get();
- modifiedEventProperties.put(eventProperty.getElementId(), modifyEventProperty(cloneEp(eventProperty), to,
+ modifiedEventProperties.put(eventProperty.getRuntimeName(), modifyEventProperty(cloneEp(eventProperty), to,
staticProperties));
}
}
@@ -88,7 +89,7 @@ public class TransformOutputSchemaGenerator extends OutputSchemaGenerator<Transf
List<EventProperty> newProperties = inSchema.getEventProperties()
.stream()
- .map(ep -> modifiedEventProperties.getOrDefault(ep.getElementId(), ep))
+ .map(ep -> modifiedEventProperties.getOrDefault(ep.getRuntimeName(), ep))
.collect(Collectors.toList());
outSchema.setEventProperties(newProperties);
@@ -176,7 +177,7 @@ public class TransformOutputSchemaGenerator extends OutputSchemaGenerator<Transf
}
private String removePrefix(String propertySelector) {
- return propertySelector.split("::")[1];
+ return propertySelector.split(PropertySelectorConstants.PROPERTY_DELIMITER)[1];
}
private EventProperty cloneEp(EventProperty ep) {
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/monitoring/pipeline/ExtensionsLogProvider.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/monitoring/pipeline/ExtensionsLogProvider.java
index ee14cec6c..013b55a6e 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/monitoring/pipeline/ExtensionsLogProvider.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/monitoring/pipeline/ExtensionsLogProvider.java
@@ -19,7 +19,7 @@
package org.apache.streampipes.manager.monitoring.pipeline;
import org.apache.streampipes.manager.pipeline.PipelineManager;
-import org.apache.streampipes.model.base.AbstractStreamPipesEntity;
+import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.monitoring.SpEndpointMonitoringInfo;
import org.apache.streampipes.model.monitoring.SpLogEntry;
import org.apache.streampipes.model.monitoring.SpMetricsEntry;
@@ -112,8 +112,8 @@ public enum ExtensionsLogProvider {
private List<String> collectPipelineElementIds(Pipeline pipeline) {
return Stream.concat(
- pipeline.getSepas().stream().map(AbstractStreamPipesEntity::getElementId),
- pipeline.getActions().stream().map(AbstractStreamPipesEntity::getElementId)
+ pipeline.getSepas().stream().map(NamedStreamPipesEntity::getElementId),
+ pipeline.getActions().stream().map(NamedStreamPipesEntity::getElementId)
).collect(Collectors.toList());
}
diff --git a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/AbstractPipelineElementResourceManager.java b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/AbstractPipelineElementResourceManager.java
index 8820087bc..ed67ee914 100644
--- a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/AbstractPipelineElementResourceManager.java
+++ b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/AbstractPipelineElementResourceManager.java
@@ -17,7 +17,6 @@
*/
package org.apache.streampipes.resource.management;
-import org.apache.streampipes.model.base.AbstractStreamPipesEntity;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.client.user.Permission;
import org.apache.streampipes.storage.api.CRUDStorage;
@@ -37,7 +36,7 @@ public abstract class AbstractPipelineElementResourceManager<T extends CRUDStora
}
public List<String> findAllIdsOnly() {
- return db.getAll().stream().map(AbstractStreamPipesEntity::getElementId).collect(Collectors.toList());
+ return db.getAll().stream().map(NamedStreamPipesEntity::getElementId).collect(Collectors.toList());
}
public List<X> findAllAsInvocation() {
diff --git a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
index 3e0231922..a52d4b2f1 100644
--- a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
@@ -19,12 +19,10 @@
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
-// Generated using typescript-generator version 2.27.744 on 2022-10-23 22:36:57.
+// Generated using typescript-generator version 3.1.1185 on 2023-01-08 16:02:05.
-export class AbstractStreamPipesEntity {
+export class NamedStreamPipesEntity {
'@class':
- | 'org.apache.streampipes.model.base.AbstractStreamPipesEntity'
- | 'org.apache.streampipes.model.base.NamedStreamPipesEntity'
| 'org.apache.streampipes.model.connect.adapter.AdapterDescription'
| 'org.apache.streampipes.model.connect.adapter.AdapterSetDescription'
| 'org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription'
@@ -33,352 +31,19 @@ export class AbstractStreamPipesEntity {
| 'org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription'
| 'org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription'
| 'org.apache.streampipes.model.connect.grounding.ProtocolDescription'
- | 'org.apache.streampipes.model.graph.DataSourceDescription'
| 'org.apache.streampipes.model.template.PipelineTemplateDescription'
- | 'org.apache.streampipes.model.connect.grounding.FormatDescription'
| 'org.apache.streampipes.model.SpDataStream'
| 'org.apache.streampipes.model.SpDataSet'
- | 'org.apache.streampipes.model.base.InvocableStreamPipesEntity'
- | 'org.apache.streampipes.model.graph.DataProcessorInvocation'
- | 'org.apache.streampipes.model.graph.DataSinkInvocation'
- | 'org.apache.streampipes.model.base.UnnamedStreamPipesEntity'
- | 'org.apache.streampipes.model.connect.guess.GuessSchema'
- | 'org.apache.streampipes.model.connect.rules.TransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.ValueTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.AddTimestampRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.AddValueTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.TimestampTranfsformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.UnitTransformRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.ChangeDatatypeTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.CorrectionValueTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.stream.StreamTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.stream.EventRateTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.stream.RemoveDuplicatesTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.schema.SchemaTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.schema.RenameRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription'
- | 'org.apache.streampipes.model.dashboard.DashboardWidgetSettings'
- | 'org.apache.streampipes.model.datalake.DataLakeMeasure'
- | 'org.apache.streampipes.model.runtime.RuntimeOptionsRequest'
- | 'org.apache.streampipes.model.runtime.RuntimeOptionsResponse'
- | 'org.apache.streampipes.model.staticproperty.StaticProperty'
- | 'org.apache.streampipes.model.staticproperty.CodeInputStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.CollectionStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.DomainStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.FileStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.FreeTextStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.MatchingStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.RuntimeResolvableTreeInputStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.SecretStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.StaticPropertyAlternative'
- | 'org.apache.streampipes.model.staticproperty.StaticPropertyAlternatives'
- | 'org.apache.streampipes.model.staticproperty.StaticPropertyGroup'
- | 'org.apache.streampipes.model.staticproperty.SlideToggleStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.SelectionStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.AnyStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.RuntimeResolvableAnyStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.OneOfStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.RuntimeResolvableOneOfStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.MappingProperty'
- | 'org.apache.streampipes.model.staticproperty.MappingPropertyUnary'
- | 'org.apache.streampipes.model.staticproperty.MappingPropertyNary'
- | 'org.apache.streampipes.model.template.PipelineTemplateInvocation'
- | 'org.apache.streampipes.model.ApplicationLink'
- | 'org.apache.streampipes.model.grounding.EventGrounding'
- | 'org.apache.streampipes.model.schema.EventSchema'
- | 'org.apache.streampipes.model.template.BoundPipelineElement'
- | 'org.apache.streampipes.model.grounding.TransportProtocol'
- | 'org.apache.streampipes.model.grounding.JmsTransportProtocol'
- | 'org.apache.streampipes.model.grounding.KafkaTransportProtocol'
- | 'org.apache.streampipes.model.grounding.MqttTransportProtocol'
- | 'org.apache.streampipes.model.grounding.NatsTransportProtocol'
- | 'org.apache.streampipes.model.grounding.TransportFormat'
- | 'org.apache.streampipes.model.quality.EventStreamQualityRequirement'
- | 'org.apache.streampipes.model.quality.MeasurementCapability'
- | 'org.apache.streampipes.model.quality.MeasurementObject'
- | 'org.apache.streampipes.model.schema.EventProperty'
- | 'org.apache.streampipes.model.schema.EventPropertyList'
- | 'org.apache.streampipes.model.schema.EventPropertyNested'
- | 'org.apache.streampipes.model.schema.EventPropertyPrimitive'
- | 'org.apache.streampipes.model.output.OutputStrategy'
- | 'org.apache.streampipes.model.output.AppendOutputStrategy'
- | 'org.apache.streampipes.model.output.CustomOutputStrategy'
- | 'org.apache.streampipes.model.output.CustomTransformOutputStrategy'
- | 'org.apache.streampipes.model.output.FixedOutputStrategy'
- | 'org.apache.streampipes.model.output.KeepOutputStrategy'
- | 'org.apache.streampipes.model.output.ListOutputStrategy'
- | 'org.apache.streampipes.model.output.TransformOutputStrategy'
- | 'org.apache.streampipes.model.output.UserDefinedOutputStrategy'
- | 'org.apache.streampipes.model.monitoring.ElementStatusInfoSettings'
- | 'org.apache.streampipes.model.staticproperty.Option'
- | 'org.apache.streampipes.model.staticproperty.SupportedProperty'
- | 'org.apache.streampipes.model.staticproperty.PropertyValueSpecification'
- | 'org.apache.streampipes.model.grounding.TopicDefinition'
- | 'org.apache.streampipes.model.grounding.SimpleTopicDefinition'
- | 'org.apache.streampipes.model.grounding.WildcardTopicDefinition'
- | 'org.apache.streampipes.model.quality.MeasurementProperty'
- | 'org.apache.streampipes.model.quality.EventStreamQualityDefinition'
- | 'org.apache.streampipes.model.quality.Frequency'
- | 'org.apache.streampipes.model.quality.Latency'
- | 'org.apache.streampipes.model.quality.EventPropertyQualityDefinition'
- | 'org.apache.streampipes.model.quality.Accuracy'
- | 'org.apache.streampipes.model.quality.MeasurementRange'
- | 'org.apache.streampipes.model.quality.Precision'
- | 'org.apache.streampipes.model.quality.Resolution'
- | 'org.apache.streampipes.model.quality.EventPropertyQualityRequirement'
- | 'org.apache.streampipes.model.output.PropertyRenameRule'
- | 'org.apache.streampipes.model.schema.ValueSpecification'
- | 'org.apache.streampipes.model.schema.QuantitativeValue'
- | 'org.apache.streampipes.model.schema.Enumeration'
- | 'org.apache.streampipes.model.output.TransformOperation'
- | 'org.apache.streampipes.model.grounding.WildcardTopicMapping';
- 'elementId': string;
-
- static 'fromData'(
- data: AbstractStreamPipesEntity,
- target?: AbstractStreamPipesEntity,
- ): AbstractStreamPipesEntity {
- if (!data) {
- return data;
- }
- const instance = target || new AbstractStreamPipesEntity();
- instance['@class'] = data['@class'];
- instance.elementId = data.elementId;
- return instance;
- }
-}
-
-export class UnnamedStreamPipesEntity extends AbstractStreamPipesEntity {
- '@class':
- | 'org.apache.streampipes.model.base.UnnamedStreamPipesEntity'
- | 'org.apache.streampipes.model.connect.guess.GuessSchema'
- | 'org.apache.streampipes.model.connect.rules.TransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.ValueTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.AddTimestampRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.AddValueTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.TimestampTranfsformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.UnitTransformRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.ChangeDatatypeTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.value.CorrectionValueTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.stream.StreamTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.stream.EventRateTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.stream.RemoveDuplicatesTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.schema.SchemaTransformationRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.schema.RenameRuleDescription'
- | 'org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription'
- | 'org.apache.streampipes.model.dashboard.DashboardWidgetSettings'
- | 'org.apache.streampipes.model.datalake.DataLakeMeasure'
- | 'org.apache.streampipes.model.runtime.RuntimeOptionsRequest'
- | 'org.apache.streampipes.model.runtime.RuntimeOptionsResponse'
- | 'org.apache.streampipes.model.staticproperty.StaticProperty'
- | 'org.apache.streampipes.model.staticproperty.CodeInputStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.CollectionStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.DomainStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.FileStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.FreeTextStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.MatchingStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.RuntimeResolvableTreeInputStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.SecretStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.StaticPropertyAlternative'
- | 'org.apache.streampipes.model.staticproperty.StaticPropertyAlternatives'
- | 'org.apache.streampipes.model.staticproperty.StaticPropertyGroup'
- | 'org.apache.streampipes.model.staticproperty.SlideToggleStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.SelectionStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.AnyStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.RuntimeResolvableAnyStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.OneOfStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.RuntimeResolvableOneOfStaticProperty'
- | 'org.apache.streampipes.model.staticproperty.MappingProperty'
- | 'org.apache.streampipes.model.staticproperty.MappingPropertyUnary'
- | 'org.apache.streampipes.model.staticproperty.MappingPropertyNary'
- | 'org.apache.streampipes.model.template.PipelineTemplateInvocation'
- | 'org.apache.streampipes.model.ApplicationLink'
- | 'org.apache.streampipes.model.grounding.EventGrounding'
- | 'org.apache.streampipes.model.schema.EventSchema'
- | 'org.apache.streampipes.model.template.BoundPipelineElement'
- | 'org.apache.streampipes.model.grounding.TransportProtocol'
- | 'org.apache.streampipes.model.grounding.JmsTransportProtocol'
- | 'org.apache.streampipes.model.grounding.KafkaTransportProtocol'
- | 'org.apache.streampipes.model.grounding.MqttTransportProtocol'
- | 'org.apache.streampipes.model.grounding.NatsTransportProtocol'
- | 'org.apache.streampipes.model.grounding.TransportFormat'
- | 'org.apache.streampipes.model.quality.EventStreamQualityRequirement'
- | 'org.apache.streampipes.model.quality.MeasurementCapability'
- | 'org.apache.streampipes.model.quality.MeasurementObject'
- | 'org.apache.streampipes.model.schema.EventProperty'
- | 'org.apache.streampipes.model.schema.EventPropertyList'
- | 'org.apache.streampipes.model.schema.EventPropertyNested'
- | 'org.apache.streampipes.model.schema.EventPropertyPrimitive'
- | 'org.apache.streampipes.model.output.OutputStrategy'
- | 'org.apache.streampipes.model.output.AppendOutputStrategy'
- | 'org.apache.streampipes.model.output.CustomOutputStrategy'
- | 'org.apache.streampipes.model.output.CustomTransformOutputStrategy'
- | 'org.apache.streampipes.model.output.FixedOutputStrategy'
- | 'org.apache.streampipes.model.output.KeepOutputStrategy'
- | 'org.apache.streampipes.model.output.ListOutputStrategy'
- | 'org.apache.streampipes.model.output.TransformOutputStrategy'
- | 'org.apache.streampipes.model.output.UserDefinedOutputStrategy'
- | 'org.apache.streampipes.model.monitoring.ElementStatusInfoSettings'
- | 'org.apache.streampipes.model.staticproperty.Option'
- | 'org.apache.streampipes.model.staticproperty.SupportedProperty'
- | 'org.apache.streampipes.model.staticproperty.PropertyValueSpecification'
- | 'org.apache.streampipes.model.grounding.TopicDefinition'
- | 'org.apache.streampipes.model.grounding.SimpleTopicDefinition'
- | 'org.apache.streampipes.model.grounding.WildcardTopicDefinition'
- | 'org.apache.streampipes.model.quality.MeasurementProperty'
- | 'org.apache.streampipes.model.quality.EventStreamQualityDefinition'
- | 'org.apache.streampipes.model.quality.Frequency'
- | 'org.apache.streampipes.model.quality.Latency'
- | 'org.apache.streampipes.model.quality.EventPropertyQualityDefinition'
- | 'org.apache.streampipes.model.quality.Accuracy'
- | 'org.apache.streampipes.model.quality.MeasurementRange'
- | 'org.apache.streampipes.model.quality.Precision'
- | 'org.apache.streampipes.model.quality.Resolution'
- | 'org.apache.streampipes.model.quality.EventPropertyQualityRequirement'
- | 'org.apache.streampipes.model.output.PropertyRenameRule'
- | 'org.apache.streampipes.model.schema.ValueSpecification'
- | 'org.apache.streampipes.model.schema.QuantitativeValue'
- | 'org.apache.streampipes.model.schema.Enumeration'
- | 'org.apache.streampipes.model.output.TransformOperation'
- | 'org.apache.streampipes.model.grounding.WildcardTopicMapping';
-
- static 'fromData'(
- data: UnnamedStreamPipesEntity,
- target?: UnnamedStreamPipesEntity,
- ): UnnamedStreamPipesEntity {
- if (!data) {
- return data;
- }
- const instance = target || new UnnamedStreamPipesEntity();
- super.fromData(data, instance);
- return instance;
- }
-}
-
-export class MeasurementProperty extends UnnamedStreamPipesEntity {
- '@class':
- | 'org.apache.streampipes.model.quality.MeasurementProperty'
- | 'org.apache.streampipes.model.quality.EventStreamQualityDefinition'
- | 'org.apache.streampipes.model.quality.Frequency'
- | 'org.apache.streampipes.model.quality.Latency'
- | 'org.apache.streampipes.model.quality.EventPropertyQualityDefinition'
- | 'org.apache.streampipes.model.quality.Accuracy'
- | 'org.apache.streampipes.model.quality.MeasurementRange'
- | 'org.apache.streampipes.model.quality.Precision'
- | 'org.apache.streampipes.model.quality.Resolution';
-
- static 'fromData'(
- data: MeasurementProperty,
- target?: MeasurementProperty,
- ): MeasurementProperty {
- if (!data) {
- return data;
- }
- const instance = target || new MeasurementProperty();
- super.fromData(data, instance);
- return instance;
- }
-
- static 'fromDataUnion'(
- data: MeasurementPropertyUnion,
- ): MeasurementPropertyUnion {
- if (!data) {
- return data;
- }
- switch (data['@class']) {
- case 'org.apache.streampipes.model.quality.EventPropertyQualityDefinition':
- return EventPropertyQualityDefinition.fromData(data);
- case 'org.apache.streampipes.model.quality.EventStreamQualityDefinition':
- return EventStreamQualityDefinition.fromData(data);
- }
- }
-}
-
-export class EventPropertyQualityDefinition extends MeasurementProperty {
- '@class':
- | 'org.apache.streampipes.model.quality.EventPropertyQualityDefinition'
- | 'org.apache.streampipes.model.quality.Accuracy'
- | 'org.apache.streampipes.model.quality.MeasurementRange'
- | 'org.apache.streampipes.model.quality.Precision'
- | 'org.apache.streampipes.model.quality.Resolution';
-
- static 'fromData'(
- data: EventPropertyQualityDefinition,
- target?: EventPropertyQualityDefinition,
- ): EventPropertyQualityDefinition {
- if (!data) {
- return data;
- }
- const instance = target || new EventPropertyQualityDefinition();
- super.fromData(data, instance);
- return instance;
- }
-
- static 'fromDataUnion'(
- data: EventPropertyQualityDefinitionUnion,
- ): EventPropertyQualityDefinitionUnion {
- if (!data) {
- return data;
- }
- switch (data['@class']) {
- case 'org.apache.streampipes.model.quality.Accuracy':
- return Accuracy.fromData(data);
- case 'org.apache.streampipes.model.quality.MeasurementRange':
- return MeasurementRange.fromData(data);
- case 'org.apache.streampipes.model.quality.Precision':
- return Precision.fromData(data);
- case 'org.apache.streampipes.model.quality.Resolution':
- return Resolution.fromData(data);
- }
- }
-}
-
-export class Accuracy extends EventPropertyQualityDefinition {
- '@class': 'org.apache.streampipes.model.quality.Accuracy';
- 'quantityValue': number;
-
- static 'fromData'(data: Accuracy, target?: Accuracy): Accuracy {
- if (!data) {
- return data;
- }
- const instance = target || new Accuracy();
- super.fromData(data, instance);
- instance.quantityValue = data.quantityValue;
- return instance;
- }
-}
-
-export class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
- '@class':
- | 'org.apache.streampipes.model.base.NamedStreamPipesEntity'
- | 'org.apache.streampipes.model.connect.adapter.AdapterDescription'
- | 'org.apache.streampipes.model.connect.adapter.AdapterSetDescription'
- | 'org.apache.streampipes.model.connect.adapter.GenericAdapterSetDescription'
- | 'org.apache.streampipes.model.connect.adapter.SpecificAdapterSetDescription'
- | 'org.apache.streampipes.model.connect.adapter.AdapterStreamDescription'
- | 'org.apache.streampipes.model.connect.adapter.GenericAdapterStreamDescription'
- | 'org.apache.streampipes.model.connect.adapter.SpecificAdapterStreamDescription'
- | 'org.apache.streampipes.model.connect.grounding.ProtocolDescription'
- | 'org.apache.streampipes.model.graph.DataSourceDescription'
- | 'org.apache.streampipes.model.template.PipelineTemplateDescription'
| 'org.apache.streampipes.model.connect.grounding.FormatDescription'
- | 'org.apache.streampipes.model.SpDataStream'
- | 'org.apache.streampipes.model.SpDataSet'
| 'org.apache.streampipes.model.base.InvocableStreamPipesEntity'
| 'org.apache.streampipes.model.graph.DataProcessorInvocation'
| 'org.apache.streampipes.model.graph.DataSinkInvocation';
'_rev': string;
'appId': string;
- 'applicationLinks': ApplicationLink[];
'connectedTo': string[];
'description': string;
'dom': string;
+ 'elementId': string;
'iconUrl': string;
'includedAssets': string[];
'includedLocales': string[];
@@ -386,6 +51,9 @@ export class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
'includesLocales': boolean;
'internallyManaged': boolean;
'name': string;
+ /**
+ * @deprecated
+ */
'uri': string;
static 'fromData'(
@@ -396,29 +64,27 @@ export class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
return data;
}
const instance = target || new NamedStreamPipesEntity();
- super.fromData(data, instance);
- instance.name = data.name;
+ instance['@class'] = data['@class'];
+ instance._rev = data._rev;
+ instance.appId = data.appId;
+ instance.connectedTo = __getCopyArrayFn(__identity<string>())(
+ data.connectedTo,
+ );
instance.description = data.description;
+ instance.dom = data.dom;
+ instance.elementId = data.elementId;
instance.iconUrl = data.iconUrl;
- instance.appId = data.appId;
- instance.includesAssets = data.includesAssets;
- instance.includesLocales = data.includesLocales;
instance.includedAssets = __getCopyArrayFn(__identity<string>())(
data.includedAssets,
);
instance.includedLocales = __getCopyArrayFn(__identity<string>())(
data.includedLocales,
);
- instance.applicationLinks = __getCopyArrayFn(ApplicationLink.fromData)(
- data.applicationLinks,
- );
+ instance.includesAssets = data.includesAssets;
+ instance.includesLocales = data.includesLocales;
instance.internallyManaged = data.internallyManaged;
- instance.connectedTo = __getCopyArrayFn(__identity<string>())(
- data.connectedTo,
- );
- instance.dom = data.dom;
+ instance.name = data.name;
instance.uri = data.uri;
- instance._rev = data._rev;
return instance;
}
}
@@ -436,6 +102,9 @@ export class AdapterDescription extends NamedStreamPipesEntity {
'category': string[];
'config': StaticPropertyUnion[];
'correspondingDataStreamElementId': string;
+ /**
+ * @deprecated
+ */
'correspondingServiceGroup': string;
'createdAt': number;
'eventGrounding': EventGrounding;
@@ -455,29 +124,29 @@ export class AdapterDescription extends NamedStreamPipesEntity {
}
const instance = target || new AdapterDescription();
super.fromData(data, instance);
- instance.eventGrounding = EventGrounding.fromData(data.eventGrounding);
instance.adapterType = data.adapterType;
- instance.icon = data.icon;
+ instance.category = __getCopyArrayFn(__identity<string>())(
+ data.category,
+ );
instance.config = __getCopyArrayFn(StaticProperty.fromDataUnion)(
data.config,
);
+ instance.correspondingDataStreamElementId =
+ data.correspondingDataStreamElementId;
+ instance.correspondingServiceGroup = data.correspondingServiceGroup;
+ instance.createdAt = data.createdAt;
+ instance.eventGrounding = EventGrounding.fromData(data.eventGrounding);
+ instance.icon = data.icon;
instance.rules = __getCopyArrayFn(
TransformationRuleDescription.fromDataUnion,
)(data.rules);
- instance.category = __getCopyArrayFn(__identity<string>())(
- data.category,
- );
- instance.createdAt = data.createdAt;
+ instance.schemaRules = __getCopyArrayFn(
+ TransformationRuleDescription.fromDataUnion,
+ )(data.schemaRules);
instance.selectedEndpointUrl = data.selectedEndpointUrl;
- instance.correspondingServiceGroup = data.correspondingServiceGroup;
- instance.correspondingDataStreamElementId =
- data.correspondingDataStreamElementId;
instance.streamRules = __getCopyArrayFn(
TransformationRuleDescription.fromDataUnion,
)(data.streamRules);
- instance.schemaRules = __getCopyArrayFn(
- TransformationRuleDescription.fromDataUnion,
- )(data.schemaRules);
instance.valueRules = __getCopyArrayFn(
TransformationRuleDescription.fromDataUnion,
)(data.valueRules);
@@ -515,12 +184,12 @@ export class AdapterEventPreview {
return data;
}
const instance = target || new AdapterEventPreview();
- instance.rules = __getCopyArrayFn(
- TransformationRuleDescription.fromDataUnion,
- )(data.rules);
instance.inputData = __getCopyObjectFn(GuessTypeInfo.fromData)(
data.inputData,
);
+ instance.rules = __getCopyArrayFn(
+ TransformationRuleDescription.fromDataUnion,
+ )(data.rules);
return instance;
}
}
@@ -607,16 +276,16 @@ export class AdapterType {
return data;
}
const instance = target || new AdapterType();
- instance.label = data.label;
- instance.description = data.description;
instance.code = data.code;
+ instance.description = data.description;
+ instance.label = data.label;
return instance;
}
}
-export class TransformationRuleDescription extends UnnamedStreamPipesEntity {
+export class TransformationRuleDescription {
'@class':
- | 'org.apache.streampipes.model.connect.rules.TransformationRuleDescription'
+ | 'org.apache.streampipes.model.connect.rules.DebugSinkRuleDescription'
| 'org.apache.streampipes.model.connect.rules.value.ValueTransformationRuleDescription'
| 'org.apache.streampipes.model.connect.rules.value.AddTimestampRuleDescription'
| 'org.apache.streampipes.model.connect.rules.value.AddValueTransformationRuleDescription'
@@ -641,7 +310,7 @@ export class TransformationRuleDescription extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new TransformationRuleDescription();
- super.fromData(data, instance);
+ instance['@class'] = data['@class'];
return instance;
}
@@ -682,6 +351,8 @@ export class TransformationRuleDescription extends UnnamedStreamPipesEntity {
return CorrectionValueTransformationRuleDescription.fromData(
data,
);
+ case 'org.apache.streampipes.model.connect.rules.DebugSinkRuleDescription':
+ return DebugSinkRuleDescription.fromData(data);
}
}
}
@@ -769,9 +440,8 @@ export class AddValueTransformationRuleDescription extends ValueTransformationRu
}
}
-export class StaticProperty extends UnnamedStreamPipesEntity {
+export class StaticProperty {
'@class':
- | 'org.apache.streampipes.model.staticproperty.StaticProperty'
| 'org.apache.streampipes.model.staticproperty.CodeInputStaticProperty'
| 'org.apache.streampipes.model.staticproperty.CollectionStaticProperty'
| 'org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty'
@@ -809,14 +479,14 @@ export class StaticProperty extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new StaticProperty();
- super.fromData(data, instance);
- instance.index = data.index;
- instance.label = data.label;
+ instance['@class'] = data['@class'];
instance.description = data.description;
+ instance.index = data.index;
instance.internalName = data.internalName;
- instance.valueRequired = data.valueRequired;
+ instance.label = data.label;
instance.predefined = data.predefined;
instance.staticPropertyType = data.staticPropertyType;
+ instance.valueRequired = data.valueRequired;
return instance;
}
@@ -886,8 +556,8 @@ export class SelectionStaticProperty extends StaticProperty {
}
const instance = target || new SelectionStaticProperty();
super.fromData(data, instance);
- instance.options = __getCopyArrayFn(Option.fromData)(data.options);
instance.horizontalRendering = data.horizontalRendering;
+ instance.options = __getCopyArrayFn(Option.fromData)(data.options);
return instance;
}
@@ -924,9 +594,8 @@ export class AnyStaticProperty extends SelectionStaticProperty {
}
}
-export class OutputStrategy extends UnnamedStreamPipesEntity {
+export class OutputStrategy {
'@class':
- | 'org.apache.streampipes.model.output.OutputStrategy'
| 'org.apache.streampipes.model.output.AppendOutputStrategy'
| 'org.apache.streampipes.model.output.CustomOutputStrategy'
| 'org.apache.streampipes.model.output.CustomTransformOutputStrategy'
@@ -946,7 +615,7 @@ export class OutputStrategy extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new OutputStrategy();
- super.fromData(data, instance);
+ instance['@class'] = data['@class'];
instance.name = data.name;
instance.renameRules = __getCopyArrayFn(PropertyRenameRule.fromData)(
data.renameRules,
@@ -999,32 +668,6 @@ export class AppendOutputStrategy extends OutputStrategy {
}
}
-export class ApplicationLink extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.ApplicationLink';
- 'applicationDescription': string;
- 'applicationIconUrl': string;
- 'applicationLinkType': string;
- 'applicationName': string;
- 'applicationUrl': string;
-
- static 'fromData'(
- data: ApplicationLink,
- target?: ApplicationLink,
- ): ApplicationLink {
- if (!data) {
- return data;
- }
- const instance = target || new ApplicationLink();
- super.fromData(data, instance);
- instance.applicationName = data.applicationName;
- instance.applicationDescription = data.applicationDescription;
- instance.applicationUrl = data.applicationUrl;
- instance.applicationIconUrl = data.applicationIconUrl;
- instance.applicationLinkType = data.applicationLinkType;
- return instance;
- }
-}
-
export class AssetExportConfiguration {
adapters: ExportItem[];
assetId: string;
@@ -1046,39 +689,38 @@ export class AssetExportConfiguration {
return data;
}
const instance = target || new AssetExportConfiguration();
- instance.assetId = data.assetId;
- instance.assetName = data.assetName;
- instance.assets = __getCopyArrayFn(ExportItem.fromData)(data.assets);
instance.adapters = __getCopyArrayFn(ExportItem.fromData)(
data.adapters,
);
+ instance.assetId = data.assetId;
+ instance.assetName = data.assetName;
+ instance.assets = __getCopyArrayFn(ExportItem.fromData)(data.assets);
instance.dashboards = __getCopyArrayFn(ExportItem.fromData)(
data.dashboards,
);
- instance.dataViews = __getCopyArrayFn(ExportItem.fromData)(
- data.dataViews,
- );
instance.dataLakeMeasures = __getCopyArrayFn(ExportItem.fromData)(
data.dataLakeMeasures,
);
instance.dataSources = __getCopyArrayFn(ExportItem.fromData)(
data.dataSources,
);
- instance.pipelines = __getCopyArrayFn(ExportItem.fromData)(
- data.pipelines,
+ instance.dataViews = __getCopyArrayFn(ExportItem.fromData)(
+ data.dataViews,
);
instance.files = __getCopyArrayFn(ExportItem.fromData)(data.files);
instance.overrideBrokerSettings = data.overrideBrokerSettings;
+ instance.pipelines = __getCopyArrayFn(ExportItem.fromData)(
+ data.pipelines,
+ );
return instance;
}
}
-export class BoundPipelineElement extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.template.BoundPipelineElement';
- 'connectedTo': BoundPipelineElement[];
- 'pipelineElementTemplate': InvocableStreamPipesEntity;
+export class BoundPipelineElement {
+ connectedTo: BoundPipelineElement[];
+ pipelineElementTemplate: InvocableStreamPipesEntity;
- static 'fromData'(
+ static fromData(
data: BoundPipelineElement,
target?: BoundPipelineElement,
): BoundPipelineElement {
@@ -1086,13 +728,12 @@ export class BoundPipelineElement extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new BoundPipelineElement();
- super.fromData(data, instance);
- instance.pipelineElementTemplate = InvocableStreamPipesEntity.fromData(
- data.pipelineElementTemplate,
- );
instance.connectedTo = __getCopyArrayFn(BoundPipelineElement.fromData)(
data.connectedTo,
);
+ instance.pipelineElementTemplate = InvocableStreamPipesEntity.fromData(
+ data.pipelineElementTemplate,
+ );
return instance;
}
}
@@ -1128,12 +769,12 @@ export class Category {
return data;
}
const instance = target || new Category();
- instance.name = data.name;
- instance.internalName = data.internalName;
- instance.superLabelId = data.superLabelId;
instance._id = data._id;
instance._rev = data._rev;
+ instance.internalName = data.internalName;
+ instance.name = data.name;
instance.superLabel = data.superLabel;
+ instance.superLabelId = data.superLabelId;
return instance;
}
}
@@ -1154,8 +795,8 @@ export class ChangeDatatypeTransformationRuleDescription extends ValueTransforma
const instance =
target || new ChangeDatatypeTransformationRuleDescription();
super.fromData(data, instance);
- instance.runtimeKey = data.runtimeKey;
instance.originalDatatypeXsd = data.originalDatatypeXsd;
+ instance.runtimeKey = data.runtimeKey;
instance.targetDatatypeXsd = data.targetDatatypeXsd;
return instance;
}
@@ -1176,8 +817,8 @@ export class CodeInputStaticProperty extends StaticProperty {
}
const instance = target || new CodeInputStaticProperty();
super.fromData(data, instance);
- instance.language = data.language;
instance.codeTemplate = data.codeTemplate;
+ instance.language = data.language;
instance.value = data.value;
return instance;
}
@@ -1198,13 +839,13 @@ export class CollectionStaticProperty extends StaticProperty {
}
const instance = target || new CollectionStaticProperty();
super.fromData(data, instance);
- instance.staticPropertyTemplate = StaticProperty.fromDataUnion(
- data.staticPropertyTemplate,
- );
+ instance.memberType = data.memberType;
instance.members = __getCopyArrayFn(StaticProperty.fromDataUnion)(
data.members,
);
- instance.memberType = data.memberType;
+ instance.staticPropertyTemplate = StaticProperty.fromDataUnion(
+ data.staticPropertyTemplate,
+ );
return instance;
}
}
@@ -1236,8 +877,8 @@ export class MessagesInfo {
return data;
}
const instance = target || new MessagesInfo();
- instance.topicName = data.topicName;
instance.groupId = data.groupId;
+ instance.topicName = data.topicName;
return instance;
}
}
@@ -1256,11 +897,11 @@ export class ConsumedMessagesInfo extends MessagesInfo {
}
const instance = target || new ConsumedMessagesInfo();
super.fromData(data, instance);
- instance.totalMessagesSincePipelineStart =
- data.totalMessagesSincePipelineStart;
instance.consumedMessagesSincePipelineStart =
data.consumedMessagesSincePipelineStart;
instance.lag = data.lag;
+ instance.totalMessagesSincePipelineStart =
+ data.totalMessagesSincePipelineStart;
return instance;
}
}
@@ -1281,9 +922,9 @@ export class CorrectionValueTransformationRuleDescription extends ValueTransform
const instance =
target || new CorrectionValueTransformationRuleDescription();
super.fromData(data, instance);
- instance.runtimeKey = data.runtimeKey;
instance.correctionValue = data.correctionValue;
instance.operator = data.operator;
+ instance.runtimeKey = data.runtimeKey;
return instance;
}
}
@@ -1342,13 +983,13 @@ export class CustomOutputStrategy extends OutputStrategy {
}
const instance = target || new CustomOutputStrategy();
super.fromData(data, instance);
- instance.selectedPropertyKeys = __getCopyArrayFn(__identity<string>())(
- data.selectedPropertyKeys,
- );
- instance.outputRight = data.outputRight;
instance.availablePropertyKeys = __getCopyArrayFn(__identity<string>())(
data.availablePropertyKeys,
);
+ instance.outputRight = data.outputRight;
+ instance.selectedPropertyKeys = __getCopyArrayFn(__identity<string>())(
+ data.selectedPropertyKeys,
+ );
return instance;
}
}
@@ -1409,14 +1050,14 @@ export class DashboardItem {
return data;
}
const instance = target || new DashboardItem();
+ instance.cols = data.cols;
+ instance.component = data.component;
instance.id = data.id;
instance.name = data.name;
- instance.component = data.component;
+ instance.rows = data.rows;
instance.settings = __getCopyArrayFn(__identity<string>())(
data.settings,
);
- instance.cols = data.cols;
- instance.rows = data.rows;
instance.x = data.x;
instance.y = data.y;
return instance;
@@ -1442,21 +1083,21 @@ export class DashboardModel {
return data;
}
const instance = target || new DashboardModel();
- instance.id = data.id;
- instance.name = data.name;
- instance.description = data.description;
- instance.displayHeader = data.displayHeader;
- instance.dashboardTimeSettings = __getCopyObjectFn(__identity<any>())(
- data.dashboardTimeSettings,
- );
+ instance._id = data._id;
+ instance._rev = data._rev;
instance.dashboardGeneralSettings = __getCopyObjectFn(
__identity<any>(),
)(data.dashboardGeneralSettings);
+ instance.dashboardTimeSettings = __getCopyObjectFn(__identity<any>())(
+ data.dashboardTimeSettings,
+ );
+ instance.description = data.description;
+ instance.displayHeader = data.displayHeader;
+ instance.id = data.id;
+ instance.name = data.name;
instance.widgets = __getCopyArrayFn(DashboardItem.fromData)(
data.widgets,
);
- instance._id = data._id;
- instance._rev = data._rev;
return instance;
}
}
@@ -1477,27 +1118,26 @@ export class DashboardWidgetModel extends DashboardEntity {
}
const instance = target || new DashboardWidgetModel();
super.fromData(data, instance);
- instance.widgetId = data.widgetId;
- instance.widgetType = data.widgetType;
instance.dashboardWidgetSettings = DashboardWidgetSettings.fromData(
data.dashboardWidgetSettings,
);
instance.pipelineId = data.pipelineId;
instance.visualizationName = data.visualizationName;
+ instance.widgetId = data.widgetId;
+ instance.widgetType = data.widgetType;
return instance;
}
}
-export class DashboardWidgetSettings extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.dashboard.DashboardWidgetSettings';
- 'config': StaticPropertyUnion[];
- 'requiredSchema': EventSchema;
- 'widgetDescription': string;
- 'widgetIconName': string;
- 'widgetLabel': string;
- 'widgetName': string;
+export class DashboardWidgetSettings {
+ config: StaticPropertyUnion[];
+ requiredSchema: EventSchema;
+ widgetDescription: string;
+ widgetIconName: string;
+ widgetLabel: string;
+ widgetName: string;
- static 'fromData'(
+ static fromData(
data: DashboardWidgetSettings,
target?: DashboardWidgetSettings,
): DashboardWidgetSettings {
@@ -1505,15 +1145,14 @@ export class DashboardWidgetSettings extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new DashboardWidgetSettings();
- super.fromData(data, instance);
- instance.widgetLabel = data.widgetLabel;
- instance.widgetName = data.widgetName;
instance.config = __getCopyArrayFn(StaticProperty.fromDataUnion)(
data.config,
);
instance.requiredSchema = EventSchema.fromData(data.requiredSchema);
- instance.widgetIconName = data.widgetIconName;
instance.widgetDescription = data.widgetDescription;
+ instance.widgetIconName = data.widgetIconName;
+ instance.widgetLabel = data.widgetLabel;
+ instance.widgetName = data.widgetName;
return instance;
}
}
@@ -1536,26 +1175,27 @@ export class DataExplorerWidgetModel extends DashboardEntity {
}
const instance = target || new DataExplorerWidgetModel();
super.fromData(data, instance);
- instance.widgetId = data.widgetId;
- instance.widgetType = data.widgetType;
instance.baseAppearanceConfig = __getCopyObjectFn(__identity<any>())(
data.baseAppearanceConfig,
);
- instance.visualizationConfig = __getCopyObjectFn(__identity<any>())(
- data.visualizationConfig,
- );
instance.dataConfig = __getCopyObjectFn(__identity<any>())(
data.dataConfig,
);
- instance.pipelineId = data.pipelineId;
instance.measureName = data.measureName;
+ instance.pipelineId = data.pipelineId;
+ instance.visualizationConfig = __getCopyObjectFn(__identity<any>())(
+ data.visualizationConfig,
+ );
+ instance.widgetId = data.widgetId;
+ instance.widgetType = data.widgetType;
return instance;
}
}
-export class DataLakeMeasure extends UnnamedStreamPipesEntity {
+export class DataLakeMeasure {
'@class': 'org.apache.streampipes.model.datalake.DataLakeMeasure';
'_rev': string;
+ 'elementId': string;
'eventSchema': EventSchema;
'measureName': string;
'pipelineId': string;
@@ -1572,15 +1212,16 @@ export class DataLakeMeasure extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new DataLakeMeasure();
- super.fromData(data, instance);
- instance.measureName = data.measureName;
- instance.timestampField = data.timestampField;
+ instance['@class'] = data['@class'];
+ instance._rev = data._rev;
+ instance.elementId = data.elementId;
instance.eventSchema = EventSchema.fromData(data.eventSchema);
+ instance.measureName = data.measureName;
instance.pipelineId = data.pipelineId;
- instance.pipelineName = data.pipelineName;
instance.pipelineIsRunning = data.pipelineIsRunning;
+ instance.pipelineName = data.pipelineName;
instance.schemaVersion = data.schemaVersion;
- instance._rev = data._rev;
+ instance.timestampField = data.timestampField;
return instance;
}
}
@@ -1611,27 +1252,27 @@ export class InvocableStreamPipesEntity extends NamedStreamPipesEntity {
}
const instance = target || new InvocableStreamPipesEntity();
super.fromData(data, instance);
+ instance.belongsTo = data.belongsTo;
+ instance.configured = data.configured;
+ instance.correspondingPipeline = data.correspondingPipeline;
+ instance.correspondingUser = data.correspondingUser;
instance.inputStreams = __getCopyArrayFn(SpDataStream.fromDataUnion)(
data.inputStreams,
);
+ instance.selectedEndpointUrl = data.selectedEndpointUrl;
instance.staticProperties = __getCopyArrayFn(
StaticProperty.fromDataUnion,
)(data.staticProperties);
- instance.belongsTo = data.belongsTo;
instance.statusInfoSettings = ElementStatusInfoSettings.fromData(
data.statusInfoSettings,
);
- instance.supportedGrounding = EventGrounding.fromData(
- data.supportedGrounding,
- );
- instance.correspondingPipeline = data.correspondingPipeline;
- instance.correspondingUser = data.correspondingUser;
instance.streamRequirements = __getCopyArrayFn(
SpDataStream.fromDataUnion,
)(data.streamRequirements);
- instance.configured = data.configured;
+ instance.supportedGrounding = EventGrounding.fromData(
+ data.supportedGrounding,
+ );
instance.uncompleted = data.uncompleted;
- instance.selectedEndpointUrl = data.selectedEndpointUrl;
return instance;
}
}
@@ -1652,14 +1293,14 @@ export class DataProcessorInvocation extends InvocableStreamPipesEntity {
}
const instance = target || new DataProcessorInvocation();
super.fromData(data, instance);
- instance.outputStream = SpDataStream.fromDataUnion(data.outputStream);
+ instance.category = __getCopyArrayFn(__identity<string>())(
+ data.category,
+ );
instance.outputStrategies = __getCopyArrayFn(
OutputStrategy.fromDataUnion,
)(data.outputStrategies);
+ instance.outputStream = SpDataStream.fromDataUnion(data.outputStream);
instance.pathName = data.pathName;
- instance.category = __getCopyArrayFn(__identity<string>())(
- data.category,
- );
return instance;
}
}
@@ -1677,9 +1318,9 @@ export class DataProcessorType {
return data;
}
const instance = target || new DataProcessorType();
- instance.label = data.label;
- instance.description = data.description;
instance.code = data.code;
+ instance.description = data.description;
+ instance.label = data.label;
return instance;
}
}
@@ -1695,12 +1336,12 @@ export class DataSeries {
return data;
}
const instance = target || new DataSeries();
- instance.total = data.total;
+ instance.headers = __getCopyArrayFn(__identity<string>())(data.headers);
instance.rows = __getCopyArrayFn(__getCopyArrayFn(__identity<any>()))(
data.rows,
);
instance.tags = __getCopyObjectFn(__identity<string>())(data.tags);
- instance.headers = __getCopyArrayFn(__identity<string>())(data.headers);
+ instance.total = data.total;
return instance;
}
}
@@ -1715,11 +1356,11 @@ export class Message {
return data;
}
const instance = target || new Message();
- instance.success = data.success;
instance.elementName = data.elementName;
instance.notifications = __getCopyArrayFn(Notification.fromData)(
data.notifications,
);
+ instance.success = data.success;
return instance;
}
}
@@ -1773,31 +1414,25 @@ export class DataSinkType {
return data;
}
const instance = target || new DataSinkType();
- instance.label = data.label;
- instance.description = data.description;
instance.code = data.code;
+ instance.description = data.description;
+ instance.label = data.label;
return instance;
}
}
-export class DataSourceDescription extends NamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.graph.DataSourceDescription';
- 'correspondingSourceId': string;
- 'spDataStreams': SpDataStreamUnion[];
+export class DebugSinkRuleDescription extends TransformationRuleDescription {
+ '@class': 'org.apache.streampipes.model.connect.rules.DebugSinkRuleDescription';
static 'fromData'(
- data: DataSourceDescription,
- target?: DataSourceDescription,
- ): DataSourceDescription {
+ data: DebugSinkRuleDescription,
+ target?: DebugSinkRuleDescription,
+ ): DebugSinkRuleDescription {
if (!data) {
return data;
}
- const instance = target || new DataSourceDescription();
+ const instance = target || new DebugSinkRuleDescription();
super.fromData(data, instance);
- instance.spDataStreams = __getCopyArrayFn(SpDataStream.fromDataUnion)(
- data.spDataStreams,
- );
- instance.correspondingSourceId = data.correspondingSourceId;
return instance;
}
}
@@ -1854,10 +1489,10 @@ export class EdgeValidationStatus {
return data;
}
const instance = target || new EdgeValidationStatus();
- instance.validationStatusType = data.validationStatusType;
instance.notifications = __getCopyArrayFn(Notification.fromData)(
data.notifications,
);
+ instance.validationStatusType = data.validationStatusType;
return instance;
}
}
@@ -1876,27 +1511,26 @@ export class ElementComposition {
return data;
}
const instance = target || new ElementComposition();
+ instance.description = data.description;
+ instance.name = data.name;
instance.sepas = __getCopyArrayFn(DataProcessorInvocation.fromData)(
data.sepas,
);
instance.streams = __getCopyArrayFn(SpDataStream.fromDataUnion)(
data.streams,
);
- instance.name = data.name;
- instance.description = data.description;
return instance;
}
}
-export class ElementStatusInfoSettings extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.monitoring.ElementStatusInfoSettings';
- 'elementIdentifier': string;
- 'errorTopic': string;
- 'kafkaHost': string;
- 'kafkaPort': number;
- 'statsTopic': string;
+export class ElementStatusInfoSettings {
+ elementIdentifier: string;
+ errorTopic: string;
+ kafkaHost: string;
+ kafkaPort: number;
+ statsTopic: string;
- static 'fromData'(
+ static fromData(
data: ElementStatusInfoSettings,
target?: ElementStatusInfoSettings,
): ElementStatusInfoSettings {
@@ -1904,19 +1538,17 @@ export class ElementStatusInfoSettings extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new ElementStatusInfoSettings();
- super.fromData(data, instance);
instance.elementIdentifier = data.elementIdentifier;
+ instance.errorTopic = data.errorTopic;
instance.kafkaHost = data.kafkaHost;
instance.kafkaPort = data.kafkaPort;
- instance.errorTopic = data.errorTopic;
instance.statsTopic = data.statsTopic;
return instance;
}
}
-export class ValueSpecification extends UnnamedStreamPipesEntity {
+export class ValueSpecification {
'@class':
- | 'org.apache.streampipes.model.schema.ValueSpecification'
| 'org.apache.streampipes.model.schema.QuantitativeValue'
| 'org.apache.streampipes.model.schema.Enumeration';
@@ -1928,7 +1560,7 @@ export class ValueSpecification extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new ValueSpecification();
- super.fromData(data, instance);
+ instance['@class'] = data['@class'];
return instance;
}
@@ -1959,8 +1591,8 @@ export class Enumeration extends ValueSpecification {
}
const instance = target || new Enumeration();
super.fromData(data, instance);
- instance.label = data.label;
instance.description = data.description;
+ instance.label = data.label;
instance.runtimeValues = __getCopyArrayFn(__identity<string>())(
data.runtimeValues,
);
@@ -1979,12 +1611,11 @@ export class ErrorMessage extends Message {
}
}
-export class EventGrounding extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.grounding.EventGrounding';
- 'transportFormats': TransportFormat[];
- 'transportProtocols': TransportProtocolUnion[];
+export class EventGrounding {
+ transportFormats: TransportFormat[];
+ transportProtocols: TransportProtocolUnion[];
- static 'fromData'(
+ static fromData(
data: EventGrounding,
target?: EventGrounding,
): EventGrounding {
@@ -1992,31 +1623,28 @@ export class EventGrounding extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new EventGrounding();
- super.fromData(data, instance);
- instance.transportProtocols = __getCopyArrayFn(
- TransportProtocol.fromDataUnion,
- )(data.transportProtocols);
instance.transportFormats = __getCopyArrayFn(TransportFormat.fromData)(
data.transportFormats,
);
+ instance.transportProtocols = __getCopyArrayFn(
+ TransportProtocol.fromDataUnion,
+ )(data.transportProtocols);
return instance;
}
}
-export class EventProperty extends UnnamedStreamPipesEntity {
+export class EventProperty {
'@class':
- | 'org.apache.streampipes.model.schema.EventProperty'
| 'org.apache.streampipes.model.schema.EventPropertyList'
| 'org.apache.streampipes.model.schema.EventPropertyNested'
| 'org.apache.streampipes.model.schema.EventPropertyPrimitive';
'description': string;
'domainProperties': string[];
- 'eventPropertyQualities': EventPropertyQualityDefinitionUnion[];
+ 'elementId': string;
'index': number;
'label': string;
'propertyScope': string;
'required': boolean;
- 'requiresEventPropertyQualities': EventPropertyQualityRequirement[];
'runtimeId': string;
'runtimeName': string;
@@ -2028,23 +1656,18 @@ export class EventProperty extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new EventProperty();
- super.fromData(data, instance);
- instance.label = data.label;
+ instance['@class'] = data['@class'];
instance.description = data.description;
- instance.runtimeName = data.runtimeName;
- instance.required = data.required;
instance.domainProperties = __getCopyArrayFn(__identity<string>())(
data.domainProperties,
);
- instance.eventPropertyQualities = __getCopyArrayFn(
- EventPropertyQualityDefinition.fromDataUnion,
- )(data.eventPropertyQualities);
- instance.requiresEventPropertyQualities = __getCopyArrayFn(
- EventPropertyQualityRequirement.fromData,
- )(data.requiresEventPropertyQualities);
- instance.propertyScope = data.propertyScope;
+ instance.elementId = data.elementId;
instance.index = data.index;
+ instance.label = data.label;
+ instance.propertyScope = data.propertyScope;
+ instance.required = data.required;
instance.runtimeId = data.runtimeId;
+ instance.runtimeName = data.runtimeName;
return instance;
}
@@ -2118,8 +1741,8 @@ export class EventPropertyPrimitive extends EventProperty {
}
const instance = target || new EventPropertyPrimitive();
super.fromData(data, instance);
- instance.runtimeType = data.runtimeType;
instance.measurementUnit = data.measurementUnit;
+ instance.runtimeType = data.runtimeType;
instance.valueSpecification = ValueSpecification.fromDataUnion(
data.valueSpecification,
);
@@ -2127,32 +1750,6 @@ export class EventPropertyPrimitive extends EventProperty {
}
}
-export class EventPropertyQualityRequirement extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.quality.EventPropertyQualityRequirement';
- 'maximumPropertyQuality': EventPropertyQualityDefinitionUnion;
- 'minimumPropertyQuality': EventPropertyQualityDefinitionUnion;
-
- static 'fromData'(
- data: EventPropertyQualityRequirement,
- target?: EventPropertyQualityRequirement,
- ): EventPropertyQualityRequirement {
- if (!data) {
- return data;
- }
- const instance = target || new EventPropertyQualityRequirement();
- super.fromData(data, instance);
- instance.minimumPropertyQuality =
- EventPropertyQualityDefinition.fromDataUnion(
- data.minimumPropertyQuality,
- );
- instance.maximumPropertyQuality =
- EventPropertyQualityDefinition.fromDataUnion(
- data.maximumPropertyQuality,
- );
- return instance;
- }
-}
-
export class StreamTransformationRuleDescription extends TransformationRuleDescription {
'@class':
| 'org.apache.streampipes.model.connect.rules.stream.StreamTransformationRuleDescription'
@@ -2208,16 +1805,14 @@ export class EventRateTransformationRuleDescription extends StreamTransformation
}
}
-export class EventSchema extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.schema.EventSchema';
- 'eventProperties': EventPropertyUnion[];
+export class EventSchema {
+ eventProperties: EventPropertyUnion[];
- static 'fromData'(data: EventSchema, target?: EventSchema): EventSchema {
+ static fromData(data: EventSchema, target?: EventSchema): EventSchema {
if (!data) {
return data;
}
const instance = target || new EventSchema();
- super.fromData(data, instance);
instance.eventProperties = __getCopyArrayFn(
EventProperty.fromDataUnion,
)(data.eventProperties);
@@ -2225,65 +1820,6 @@ export class EventSchema extends UnnamedStreamPipesEntity {
}
}
-export class EventStreamQualityDefinition extends MeasurementProperty {
- '@class':
- | 'org.apache.streampipes.model.quality.EventStreamQualityDefinition'
- | 'org.apache.streampipes.model.quality.Frequency'
- | 'org.apache.streampipes.model.quality.Latency';
-
- static 'fromData'(
- data: EventStreamQualityDefinition,
- target?: EventStreamQualityDefinition,
- ): EventStreamQualityDefinition {
- if (!data) {
- return data;
- }
- const instance = target || new EventStreamQualityDefinition();
- super.fromData(data, instance);
- return instance;
- }
-
- static 'fromDataUnion'(
- data: EventStreamQualityDefinitionUnion,
- ): EventStreamQualityDefinitionUnion {
- if (!data) {
- return data;
- }
- switch (data['@class']) {
- case 'org.apache.streampipes.model.quality.Frequency':
- return Frequency.fromData(data);
- case 'org.apache.streampipes.model.quality.Latency':
- return Latency.fromData(data);
- }
- }
-}
-
-export class EventStreamQualityRequirement extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.quality.EventStreamQualityRequirement';
- 'maximumStreamQuality': EventStreamQualityDefinitionUnion;
- 'minimumStreamQuality': EventStreamQualityDefinitionUnion;
-
- static 'fromData'(
- data: EventStreamQualityRequirement,
- target?: EventStreamQualityRequirement,
- ): EventStreamQualityRequirement {
- if (!data) {
- return data;
- }
- const instance = target || new EventStreamQualityRequirement();
- super.fromData(data, instance);
- instance.minimumStreamQuality =
- EventStreamQualityDefinition.fromDataUnion(
- data.minimumStreamQuality,
- );
- instance.maximumStreamQuality =
- EventStreamQualityDefinition.fromDataUnion(
- data.maximumStreamQuality,
- );
- return instance;
- }
-}
-
export class ExportConfiguration {
assetExportConfiguration: AssetExportConfiguration[];
@@ -2312,8 +1848,8 @@ export class ExportItem {
return data;
}
const instance = target || new ExportItem();
- instance.resourceId = data.resourceId;
instance.label = data.label;
+ instance.resourceId = data.resourceId;
instance.selected = data.selected;
return instance;
}
@@ -2332,9 +1868,9 @@ export class FieldStatusInfo {
return data;
}
const instance = target || new FieldStatusInfo();
- instance.fieldStatus = data.fieldStatus;
instance.additionalInfo = data.additionalInfo;
instance.changesRequired = data.changesRequired;
+ instance.fieldStatus = data.fieldStatus;
return instance;
}
}
@@ -2354,14 +1890,14 @@ export class FileMetadata {
return data;
}
const instance = target || new FileMetadata();
+ instance.createdAt = data.createdAt;
+ instance.createdByUser = data.createdByUser;
instance.fileId = data.fileId;
- instance.rev = data.rev;
- instance.internalFilename = data.internalFilename;
- instance.originalFilename = data.originalFilename;
instance.filetype = data.filetype;
- instance.createdAt = data.createdAt;
+ instance.internalFilename = data.internalFilename;
instance.lastModified = data.lastModified;
- instance.createdByUser = data.createdByUser;
+ instance.originalFilename = data.originalFilename;
+ instance.rev = data.rev;
return instance;
}
}
@@ -2453,14 +1989,14 @@ export class FreeTextStaticProperty extends StaticProperty {
}
const instance = target || new FreeTextStaticProperty();
super.fromData(data, instance);
- instance.value = data.value;
- instance.requiredDatatype = data.requiredDatatype;
- instance.requiredDomainProperty = data.requiredDomainProperty;
- instance.mapsTo = data.mapsTo;
- instance.multiLine = data.multiLine;
instance.htmlAllowed = data.htmlAllowed;
instance.htmlFontFormat = data.htmlFontFormat;
+ instance.mapsTo = data.mapsTo;
+ instance.multiLine = data.multiLine;
instance.placeholdersSupported = data.placeholdersSupported;
+ instance.requiredDatatype = data.requiredDatatype;
+ instance.requiredDomainProperty = data.requiredDomainProperty;
+ instance.value = data.value;
instance.valueSpecification = PropertyValueSpecification.fromData(
data.valueSpecification,
);
@@ -2468,21 +2004,6 @@ export class FreeTextStaticProperty extends StaticProperty {
}
}
-export class Frequency extends EventStreamQualityDefinition {
- '@class': 'org.apache.streampipes.model.quality.Frequency';
- 'quantityValue': number;
-
- static 'fromData'(data: Frequency, target?: Frequency): Frequency {
- if (!data) {
- return data;
- }
- const instance = target || new Frequency();
- super.fromData(data, instance);
- instance.quantityValue = data.quantityValue;
- return instance;
- }
-}
-
export class FunctionDefinition {
consumedStreams: string[];
functionId: FunctionId;
@@ -2495,10 +2016,10 @@ export class FunctionDefinition {
return data;
}
const instance = target || new FunctionDefinition();
- instance.functionId = FunctionId.fromData(data.functionId);
instance.consumedStreams = __getCopyArrayFn(__identity<string>())(
data.consumedStreams,
);
+ instance.functionId = FunctionId.fromData(data.functionId);
return instance;
}
}
@@ -2543,13 +2064,13 @@ export class GenericAdapterSetDescription
}
const instance = target || new GenericAdapterSetDescription();
super.fromData(data, instance);
+ instance.eventSchema = EventSchema.fromData(data.eventSchema);
instance.formatDescription = FormatDescription.fromData(
data.formatDescription,
);
instance.protocolDescription = ProtocolDescription.fromData(
data.protocolDescription,
);
- instance.eventSchema = EventSchema.fromData(data.eventSchema);
return instance;
}
}
@@ -2572,18 +2093,18 @@ export class GenericAdapterStreamDescription
}
const instance = target || new GenericAdapterStreamDescription();
super.fromData(data, instance);
+ instance.eventSchema = EventSchema.fromData(data.eventSchema);
instance.formatDescription = FormatDescription.fromData(
data.formatDescription,
);
instance.protocolDescription = ProtocolDescription.fromData(
data.protocolDescription,
);
- instance.eventSchema = EventSchema.fromData(data.eventSchema);
return instance;
}
}
-export class GuessSchema extends UnnamedStreamPipesEntity {
+export class GuessSchema {
'@class': 'org.apache.streampipes.model.connect.guess.GuessSchema';
'eventPreview': { [index: string]: GuessTypeInfo }[];
'eventSchema': EventSchema;
@@ -2594,11 +2115,11 @@ export class GuessSchema extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new GuessSchema();
- super.fromData(data, instance);
- instance.eventSchema = EventSchema.fromData(data.eventSchema);
+ instance['@class'] = data['@class'];
instance.eventPreview = __getCopyArrayFn(
__getCopyObjectFn(GuessTypeInfo.fromData),
)(data.eventPreview);
+ instance.eventSchema = EventSchema.fromData(data.eventSchema);
instance.fieldStatusInfo = __getCopyObjectFn(FieldStatusInfo.fromData)(
data.fieldStatusInfo,
);
@@ -2624,14 +2145,14 @@ export class GuessTypeInfo {
}
}
-export class TransportProtocol extends UnnamedStreamPipesEntity {
+export class TransportProtocol {
'@class':
- | 'org.apache.streampipes.model.grounding.TransportProtocol'
| 'org.apache.streampipes.model.grounding.JmsTransportProtocol'
| 'org.apache.streampipes.model.grounding.KafkaTransportProtocol'
| 'org.apache.streampipes.model.grounding.MqttTransportProtocol'
| 'org.apache.streampipes.model.grounding.NatsTransportProtocol';
'brokerHostname': string;
+ 'elementId': string;
'topicDefinition': TopicDefinitionUnion;
static 'fromData'(
@@ -2642,8 +2163,9 @@ export class TransportProtocol extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new TransportProtocol();
- super.fromData(data, instance);
+ instance['@class'] = data['@class'];
instance.brokerHostname = data.brokerHostname;
+ instance.elementId = data.elementId;
instance.topicDefinition = TopicDefinition.fromDataUnion(
data.topicDefinition,
);
@@ -2709,16 +2231,16 @@ export class KafkaTransportProtocol extends TransportProtocol {
}
const instance = target || new KafkaTransportProtocol();
super.fromData(data, instance);
- instance.zookeeperHost = data.zookeeperHost;
- instance.zookeeperPort = data.zookeeperPort;
+ instance.acks = data.acks;
+ instance.batchSize = data.batchSize;
+ instance.groupId = data.groupId;
instance.kafkaPort = data.kafkaPort;
instance.lingerMs = data.lingerMs;
- instance.messageMaxBytes = data.messageMaxBytes;
instance.maxRequestSize = data.maxRequestSize;
- instance.acks = data.acks;
- instance.batchSize = data.batchSize;
+ instance.messageMaxBytes = data.messageMaxBytes;
instance.offset = data.offset;
- instance.groupId = data.groupId;
+ instance.zookeeperHost = data.zookeeperHost;
+ instance.zookeeperPort = data.zookeeperPort;
return instance;
}
}
@@ -2756,27 +2278,12 @@ export class Label {
return data;
}
const instance = target || new Label();
- instance.name = data.name;
- instance.color = data.color;
- instance.internalName = data.internalName;
- instance.categoryId = data.categoryId;
instance._id = data._id;
instance._rev = data._rev;
- return instance;
- }
-}
-
-export class Latency extends EventStreamQualityDefinition {
- '@class': 'org.apache.streampipes.model.quality.Latency';
- 'quantityValue': number;
-
- static 'fromData'(data: Latency, target?: Latency): Latency {
- if (!data) {
- return data;
- }
- const instance = target || new Latency();
- super.fromData(data, instance);
- instance.quantityValue = data.quantityValue;
+ instance.categoryId = data.categoryId;
+ instance.color = data.color;
+ instance.internalName = data.internalName;
+ instance.name = data.name;
return instance;
}
}
@@ -2817,11 +2324,11 @@ export class MappingProperty extends StaticProperty {
}
const instance = target || new MappingProperty();
super.fromData(data, instance);
- instance.requirementSelector = data.requirementSelector;
instance.mapsFromOptions = __getCopyArrayFn(__identity<string>())(
data.mapsFromOptions,
);
instance.propertyScope = data.propertyScope;
+ instance.requirementSelector = data.requirementSelector;
return instance;
}
@@ -2896,62 +2403,6 @@ export class MatchingStaticProperty extends StaticProperty {
}
}
-export class MeasurementCapability extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.quality.MeasurementCapability';
- 'capability': string;
-
- static 'fromData'(
- data: MeasurementCapability,
- target?: MeasurementCapability,
- ): MeasurementCapability {
- if (!data) {
- return data;
- }
- const instance = target || new MeasurementCapability();
- super.fromData(data, instance);
- instance.capability = data.capability;
- return instance;
- }
-}
-
-export class MeasurementObject extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.quality.MeasurementObject';
- 'measuresObject': string;
-
- static 'fromData'(
- data: MeasurementObject,
- target?: MeasurementObject,
- ): MeasurementObject {
- if (!data) {
- return data;
- }
- const instance = target || new MeasurementObject();
- super.fromData(data, instance);
- instance.measuresObject = data.measuresObject;
- return instance;
- }
-}
-
-export class MeasurementRange extends EventPropertyQualityDefinition {
- '@class': 'org.apache.streampipes.model.quality.MeasurementRange';
- 'maxValue': number;
- 'minValue': number;
-
- static 'fromData'(
- data: MeasurementRange,
- target?: MeasurementRange,
- ): MeasurementRange {
- if (!data) {
- return data;
- }
- const instance = target || new MeasurementRange();
- super.fromData(data, instance);
- instance.minValue = data.minValue;
- instance.maxValue = data.maxValue;
- return instance;
- }
-}
-
export class MessageCounter {
counter: number;
lastTimestamp: number;
@@ -2964,8 +2415,8 @@ export class MessageCounter {
return data;
}
const instance = target || new MessageCounter();
- instance.lastTimestamp = data.lastTimestamp;
instance.counter = data.counter;
+ instance.lastTimestamp = data.lastTimestamp;
return instance;
}
}
@@ -2984,8 +2435,8 @@ export class MoveRuleDescription extends SchemaTransformationRuleDescription {
}
const instance = target || new MoveRuleDescription();
super.fromData(data, instance);
- instance.oldRuntimeKey = data.oldRuntimeKey;
instance.newRuntimeKey = data.newRuntimeKey;
+ instance.oldRuntimeKey = data.oldRuntimeKey;
return instance;
}
}
@@ -3036,9 +2487,9 @@ export class Notification {
return data;
}
const instance = target || new Notification();
- instance.title = data.title;
- instance.description = data.description;
instance.additionalInformation = data.additionalInformation;
+ instance.description = data.description;
+ instance.title = data.title;
return instance;
}
}
@@ -3073,21 +2524,21 @@ export class OneOfStaticProperty extends SelectionStaticProperty {
}
}
-export class Option extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.staticproperty.Option';
- 'internalName': string;
- 'name': string;
- 'selected': boolean;
+export class Option {
+ elementId: string;
+ internalName: string;
+ name: string;
+ selected: boolean;
- static 'fromData'(data: Option, target?: Option): Option {
+ static fromData(data: Option, target?: Option): Option {
if (!data) {
return data;
}
const instance = target || new Option();
- super.fromData(data, instance);
+ instance.elementId = data.elementId;
+ instance.internalName = data.internalName;
instance.name = data.name;
instance.selected = data.selected;
- instance.internalName = data.internalName;
return instance;
}
}
@@ -3122,10 +2573,10 @@ export class PersistedDataStream {
return data;
}
const instance = target || new PersistedDataStream();
+ instance.measureName = data.measureName;
instance.pipelineId = data.pipelineId;
instance.pipelineName = data.pipelineName;
instance.schema = EventSchema.fromData(data.schema);
- instance.measureName = data.measureName;
return instance;
}
}
@@ -3150,24 +2601,24 @@ export class Pipeline extends ElementComposition {
}
const instance = target || new Pipeline();
super.fromData(data, instance);
+ instance._id = data._id;
+ instance._rev = data._rev;
instance.actions = __getCopyArrayFn(DataSinkInvocation.fromData)(
data.actions,
);
- instance.running = data.running;
- instance.restartOnSystemReboot = data.restartOnSystemReboot;
- instance.startedAt = data.startedAt;
instance.createdAt = data.createdAt;
- instance.publicElement = data.publicElement;
instance.createdByUser = data.createdByUser;
+ instance.healthStatus = data.healthStatus;
instance.pipelineCategories = __getCopyArrayFn(__identity<string>())(
data.pipelineCategories,
);
instance.pipelineNotifications = __getCopyArrayFn(__identity<string>())(
data.pipelineNotifications,
);
- instance.healthStatus = data.healthStatus;
- instance._id = data._id;
- instance._rev = data._rev;
+ instance.publicElement = data.publicElement;
+ instance.restartOnSystemReboot = data.restartOnSystemReboot;
+ instance.running = data.running;
+ instance.startedAt = data.startedAt;
return instance;
}
}
@@ -3205,15 +2656,15 @@ export class PipelineCanvasMetadata {
return data;
}
const instance = target || new PipelineCanvasMetadata();
- instance.pipelineId = data.pipelineId;
- instance.pipelineElementMetadata = __getCopyObjectFn(
- PipelineElementMetadata.fromData,
- )(data.pipelineElementMetadata);
+ instance._id = data._id;
+ instance._rev = data._rev;
instance.comments = __getCopyArrayFn(PipelineCanvasComment.fromData)(
data.comments,
);
- instance._id = data._id;
- instance._rev = data._rev;
+ instance.pipelineElementMetadata = __getCopyObjectFn(
+ PipelineElementMetadata.fromData,
+ )(data.pipelineElementMetadata);
+ instance.pipelineId = data.pipelineId;
return instance;
}
}
@@ -3232,10 +2683,10 @@ export class PipelineCategory {
return data;
}
const instance = target || new PipelineCategory();
- instance.categoryName = data.categoryName;
- instance.categoryDescription = data.categoryDescription;
instance._id = data._id;
instance._rev = data._rev;
+ instance.categoryDescription = data.categoryDescription;
+ instance.categoryName = data.categoryName;
return instance;
}
}
@@ -3254,8 +2705,8 @@ export class PipelineEdgeValidation {
}
const instance = target || new PipelineEdgeValidation();
instance.sourceId = data.sourceId;
- instance.targetId = data.targetId;
instance.status = EdgeValidationStatus.fromData(data.status);
+ instance.targetId = data.targetId;
return instance;
}
}
@@ -3272,8 +2723,8 @@ export class PipelineElementMetadata {
return data;
}
const instance = target || new PipelineElementMetadata();
- instance.position = CanvasPosition.fromData(data.position);
instance.customName = data.customName;
+ instance.position = CanvasPosition.fromData(data.position);
return instance;
}
}
@@ -3294,13 +2745,13 @@ export class PipelineElementMonitoringInfo {
return data;
}
const instance = target || new PipelineElementMonitoringInfo();
- instance.pipelineElementId = data.pipelineElementId;
- instance.pipelineElementName = data.pipelineElementName;
instance.consumedMessageInfoExists = data.consumedMessageInfoExists;
- instance.producedMessageInfoExists = data.producedMessageInfoExists;
instance.consumedMessagesInfos = __getCopyArrayFn(
ConsumedMessagesInfo.fromData,
)(data.consumedMessagesInfos);
+ instance.pipelineElementId = data.pipelineElementId;
+ instance.pipelineElementName = data.pipelineElementName;
+ instance.producedMessageInfoExists = data.producedMessageInfoExists;
instance.producedMessagesInfo = ProducedMessagesInfo.fromData(
data.producedMessagesInfo,
);
@@ -3323,11 +2774,11 @@ export class PipelineElementRecommendation {
return data;
}
const instance = target || new PipelineElementRecommendation();
+ instance.count = data.count;
+ instance.description = data.description;
instance.elementId = data.elementId;
instance.name = data.name;
- instance.description = data.description;
instance.weight = data.weight;
- instance.count = data.count;
return instance;
}
}
@@ -3394,14 +2845,14 @@ export class PipelineElementTemplate {
return data;
}
const instance = target || new PipelineElementTemplate();
- instance.templateName = data.templateName;
- instance.templateDescription = data.templateDescription;
+ instance._id = data._id;
+ instance._rev = data._rev;
instance.basePipelineElementAppId = data.basePipelineElementAppId;
instance.templateConfigs = __getCopyObjectFn(
PipelineElementTemplateConfig.fromData,
)(data.templateConfigs);
- instance._id = data._id;
- instance._rev = data._rev;
+ instance.templateDescription = data.templateDescription;
+ instance.templateName = data.templateName;
return instance;
}
}
@@ -3419,8 +2870,8 @@ export class PipelineElementTemplateConfig {
return data;
}
const instance = target || new PipelineElementTemplateConfig();
- instance.editable = data.editable;
instance.displayed = data.displayed;
+ instance.editable = data.editable;
instance.value = data.value;
return instance;
}
@@ -3464,20 +2915,20 @@ export class PipelineModification {
const instance = target || new PipelineModification();
instance.domId = data.domId;
instance.elementId = data.elementId;
- instance.pipelineElementValid = data.pipelineElementValid;
- instance.validationInfos = __getCopyArrayFn(
- PipelineElementValidationInfo.fromData,
- )(data.validationInfos);
- instance.staticProperties = __getCopyArrayFn(
- StaticProperty.fromDataUnion,
- )(data.staticProperties);
- instance.outputStrategies = __getCopyArrayFn(
- OutputStrategy.fromDataUnion,
- )(data.outputStrategies);
instance.inputStreams = __getCopyArrayFn(SpDataStream.fromDataUnion)(
data.inputStreams,
);
+ instance.outputStrategies = __getCopyArrayFn(
+ OutputStrategy.fromDataUnion,
+ )(data.outputStrategies);
instance.outputStream = SpDataStream.fromDataUnion(data.outputStream);
+ instance.pipelineElementValid = data.pipelineElementValid;
+ instance.staticProperties = __getCopyArrayFn(
+ StaticProperty.fromDataUnion,
+ )(data.staticProperties);
+ instance.validationInfos = __getCopyArrayFn(
+ PipelineElementValidationInfo.fromData,
+ )(data.validationInfos);
return instance;
}
}
@@ -3496,13 +2947,13 @@ export class PipelineModificationMessage extends Message {
}
const instance = target || new PipelineModificationMessage();
super.fromData(data, instance);
+ instance.edgeValidations = __getCopyArrayFn(
+ PipelineEdgeValidation.fromData,
+ )(data.edgeValidations);
instance.pipelineModifications = __getCopyArrayFn(
PipelineModification.fromData,
)(data.pipelineModifications);
instance.pipelineValid = data.pipelineValid;
- instance.edgeValidations = __getCopyArrayFn(
- PipelineEdgeValidation.fromData,
- )(data.edgeValidations);
return instance;
}
}
@@ -3521,12 +2972,12 @@ export class PipelineMonitoringInfo {
return data;
}
const instance = target || new PipelineMonitoringInfo();
- instance.pipelineId = data.pipelineId;
instance.createdAt = data.createdAt;
- instance.startedAt = data.startedAt;
instance.pipelineElementMonitoringInfo = __getCopyArrayFn(
PipelineElementMonitoringInfo.fromData,
)(data.pipelineElementMonitoringInfo);
+ instance.pipelineId = data.pipelineId;
+ instance.startedAt = data.startedAt;
return instance;
}
}
@@ -3546,13 +2997,13 @@ export class PipelineOperationStatus {
return data;
}
const instance = target || new PipelineOperationStatus();
- instance.pipelineId = data.pipelineId;
- instance.pipelineName = data.pipelineName;
- instance.title = data.title;
- instance.success = data.success;
instance.elementStatus = __getCopyArrayFn(
PipelineElementStatus.fromData,
)(data.elementStatus);
+ instance.pipelineId = data.pipelineId;
+ instance.pipelineName = data.pipelineName;
+ instance.success = data.success;
+ instance.title = data.title;
return instance;
}
}
@@ -3591,10 +3042,10 @@ export class PipelineStatusMessage {
return data;
}
const instance = target || new PipelineStatusMessage();
+ instance.message = data.message;
+ instance.messageType = data.messageType;
instance.pipelineId = data.pipelineId;
instance.timestamp = data.timestamp;
- instance.messageType = data.messageType;
- instance.message = data.message;
return instance;
}
}
@@ -3618,14 +3069,14 @@ export class PipelineTemplateDescription extends NamedStreamPipesEntity {
instance.boundTo = __getCopyArrayFn(BoundPipelineElement.fromData)(
data.boundTo,
);
- instance.pipelineTemplateName = data.pipelineTemplateName;
- instance.pipelineTemplateId = data.pipelineTemplateId;
instance.pipelineTemplateDescription = data.pipelineTemplateDescription;
+ instance.pipelineTemplateId = data.pipelineTemplateId;
+ instance.pipelineTemplateName = data.pipelineTemplateName;
return instance;
}
}
-export class PipelineTemplateInvocation extends UnnamedStreamPipesEntity {
+export class PipelineTemplateInvocation {
'@class': 'org.apache.streampipes.model.template.PipelineTemplateInvocation';
'dataSetId': string;
'kviName': string;
@@ -3641,14 +3092,14 @@ export class PipelineTemplateInvocation extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new PipelineTemplateInvocation();
- super.fromData(data, instance);
- instance.kviName = data.kviName;
+ instance['@class'] = data['@class'];
instance.dataSetId = data.dataSetId;
- instance.pipelineTemplateId = data.pipelineTemplateId;
+ instance.kviName = data.kviName;
instance.pipelineTemplateDescription =
PipelineTemplateDescription.fromData(
data.pipelineTemplateDescription,
);
+ instance.pipelineTemplateId = data.pipelineTemplateId;
instance.staticProperties = __getCopyArrayFn(
StaticProperty.fromDataUnion,
)(data.staticProperties);
@@ -3656,21 +3107,6 @@ export class PipelineTemplateInvocation extends UnnamedStreamPipesEntity {
}
}
-export class Precision extends EventPropertyQualityDefinition {
- '@class': 'org.apache.streampipes.model.quality.Precision';
- 'quantityValue': number;
-
- static 'fromData'(data: Precision, target?: Precision): Precision {
- if (!data) {
- return data;
- }
- const instance = target || new Precision();
- super.fromData(data, instance);
- instance.quantityValue = data.quantityValue;
- return instance;
- }
-}
-
export class ProducedMessagesInfo extends MessagesInfo {
totalProducedMessages: number;
totalProducedMessagesSincePipelineStart: number;
@@ -3691,12 +3127,11 @@ export class ProducedMessagesInfo extends MessagesInfo {
}
}
-export class PropertyRenameRule extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.output.PropertyRenameRule';
- 'newRuntimeName': string;
- 'runtimeId': string;
+export class PropertyRenameRule {
+ newRuntimeName: string;
+ runtimeId: string;
- static 'fromData'(
+ static fromData(
data: PropertyRenameRule,
target?: PropertyRenameRule,
): PropertyRenameRule {
@@ -3704,20 +3139,18 @@ export class PropertyRenameRule extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new PropertyRenameRule();
- super.fromData(data, instance);
- instance.runtimeId = data.runtimeId;
instance.newRuntimeName = data.newRuntimeName;
+ instance.runtimeId = data.runtimeId;
return instance;
}
}
-export class PropertyValueSpecification extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.staticproperty.PropertyValueSpecification';
- 'maxValue': number;
- 'minValue': number;
- 'step': number;
+export class PropertyValueSpecification {
+ maxValue: number;
+ minValue: number;
+ step: number;
- static 'fromData'(
+ static fromData(
data: PropertyValueSpecification,
target?: PropertyValueSpecification,
): PropertyValueSpecification {
@@ -3725,9 +3158,8 @@ export class PropertyValueSpecification extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new PropertyValueSpecification();
- super.fromData(data, instance);
- instance.minValue = data.minValue;
instance.maxValue = data.maxValue;
+ instance.minValue = data.minValue;
instance.step = data.step;
return instance;
}
@@ -3748,13 +3180,13 @@ export class ProtocolDescription extends NamedStreamPipesEntity {
}
const instance = target || new ProtocolDescription();
super.fromData(data, instance);
- instance.sourceType = data.sourceType;
- instance.config = __getCopyArrayFn(StaticProperty.fromDataUnion)(
- data.config,
- );
instance.category = __getCopyArrayFn(__identity<string>())(
data.category,
);
+ instance.config = __getCopyArrayFn(StaticProperty.fromDataUnion)(
+ data.config,
+ );
+ instance.sourceType = data.sourceType;
return instance;
}
}
@@ -3774,8 +3206,8 @@ export class QuantitativeValue extends ValueSpecification {
}
const instance = target || new QuantitativeValue();
super.fromData(data, instance);
- instance.minValue = data.minValue;
instance.maxValue = data.maxValue;
+ instance.minValue = data.minValue;
instance.step = data.step;
return instance;
}
@@ -3814,28 +3246,13 @@ export class RenameRuleDescription extends SchemaTransformationRuleDescription {
}
const instance = target || new RenameRuleDescription();
super.fromData(data, instance);
- instance.oldRuntimeKey = data.oldRuntimeKey;
instance.newRuntimeKey = data.newRuntimeKey;
+ instance.oldRuntimeKey = data.oldRuntimeKey;
return instance;
}
}
-export class Resolution extends EventPropertyQualityDefinition {
- '@class': 'org.apache.streampipes.model.quality.Resolution';
- 'quantityValue': number;
-
- static 'fromData'(data: Resolution, target?: Resolution): Resolution {
- if (!data) {
- return data;
- }
- const instance = target || new Resolution();
- super.fromData(data, instance);
- instance.quantityValue = data.quantityValue;
- return instance;
- }
-}
-
-export class RuntimeOptionsRequest extends UnnamedStreamPipesEntity {
+export class RuntimeOptionsRequest {
'@class':
| 'org.apache.streampipes.model.runtime.RuntimeOptionsRequest'
| 'org.apache.streampipes.model.runtime.RuntimeOptionsResponse';
@@ -3853,16 +3270,16 @@ export class RuntimeOptionsRequest extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new RuntimeOptionsRequest();
- super.fromData(data, instance);
- instance.requestId = data.requestId;
+ instance['@class'] = data['@class'];
instance.appId = data.appId;
- instance.staticProperties = __getCopyArrayFn(
- StaticProperty.fromDataUnion,
- )(data.staticProperties);
+ instance.belongsTo = data.belongsTo;
instance.inputStreams = __getCopyArrayFn(SpDataStream.fromDataUnion)(
data.inputStreams,
);
- instance.belongsTo = data.belongsTo;
+ instance.requestId = data.requestId;
+ instance.staticProperties = __getCopyArrayFn(
+ StaticProperty.fromDataUnion,
+ )(data.staticProperties);
return instance;
}
}
@@ -3964,15 +3381,14 @@ export class SecretStaticProperty extends StaticProperty {
}
const instance = target || new SecretStaticProperty();
super.fromData(data, instance);
- instance.value = data.value;
instance.encrypted = data.encrypted;
+ instance.value = data.value;
return instance;
}
}
-export class TopicDefinition extends UnnamedStreamPipesEntity {
+export class TopicDefinition {
'@class':
- | 'org.apache.streampipes.model.grounding.TopicDefinition'
| 'org.apache.streampipes.model.grounding.SimpleTopicDefinition'
| 'org.apache.streampipes.model.grounding.WildcardTopicDefinition';
'actualTopicName': string;
@@ -3985,7 +3401,7 @@ export class TopicDefinition extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new TopicDefinition();
- super.fromData(data, instance);
+ instance['@class'] = data['@class'];
instance.actualTopicName = data.actualTopicName;
return instance;
}
@@ -4033,8 +3449,8 @@ export class SlideToggleStaticProperty extends StaticProperty {
}
const instance = target || new SlideToggleStaticProperty();
super.fromData(data, instance);
- instance.selected = data.selected;
instance.defaultValue = data.defaultValue;
+ instance.selected = data.selected;
return instance;
}
}
@@ -4047,11 +3463,7 @@ export class SpDataStream extends NamedStreamPipesEntity {
'correspondingAdapterId': string;
'eventGrounding': EventGrounding;
'eventSchema': EventSchema;
- 'hasEventStreamQualities': EventStreamQualityDefinitionUnion[];
'index': number;
- 'measurementCapability': MeasurementCapability[];
- 'measurementObject': MeasurementObject[];
- 'requiresEventStreamQualities': EventStreamQualityRequirement[];
static 'fromData'(data: SpDataStream, target?: SpDataStream): SpDataStream {
if (!data) {
@@ -4059,25 +3471,13 @@ export class SpDataStream extends NamedStreamPipesEntity {
}
const instance = target || new SpDataStream();
super.fromData(data, instance);
- instance.hasEventStreamQualities = __getCopyArrayFn(
- EventStreamQualityDefinition.fromDataUnion,
- )(data.hasEventStreamQualities);
- instance.requiresEventStreamQualities = __getCopyArrayFn(
- EventStreamQualityRequirement.fromData,
- )(data.requiresEventStreamQualities);
- instance.eventGrounding = EventGrounding.fromData(data.eventGrounding);
- instance.eventSchema = EventSchema.fromData(data.eventSchema);
- instance.measurementCapability = __getCopyArrayFn(
- MeasurementCapability.fromData,
- )(data.measurementCapability);
- instance.measurementObject = __getCopyArrayFn(
- MeasurementObject.fromData,
- )(data.measurementObject);
- instance.index = data.index;
- instance.correspondingAdapterId = data.correspondingAdapterId;
instance.category = __getCopyArrayFn(__identity<string>())(
data.category,
);
+ instance.correspondingAdapterId = data.correspondingAdapterId;
+ instance.eventGrounding = EventGrounding.fromData(data.eventGrounding);
+ instance.eventSchema = EventSchema.fromData(data.eventSchema);
+ instance.index = data.index;
return instance;
}
@@ -4109,14 +3509,32 @@ export class SpDataSet extends SpDataStream {
}
const instance = target || new SpDataSet();
super.fromData(data, instance);
+ instance.actualTopicName = data.actualTopicName;
+ instance.brokerHostname = data.brokerHostname;
+ instance.correspondingPipeline = data.correspondingPipeline;
+ instance.datasetInvocationId = data.datasetInvocationId;
+ instance.selectedEndpointUrl = data.selectedEndpointUrl;
instance.supportedGrounding = EventGrounding.fromData(
data.supportedGrounding,
);
- instance.datasetInvocationId = data.datasetInvocationId;
- instance.correspondingPipeline = data.correspondingPipeline;
- instance.selectedEndpointUrl = data.selectedEndpointUrl;
- instance.actualTopicName = data.actualTopicName;
- instance.brokerHostname = data.brokerHostname;
+ return instance;
+ }
+}
+
+export class SpDataStreamContainer {
+ '@class': 'org.apache.streampipes.model.SpDataStreamContainer';
+ 'list': SpDataStreamUnion[];
+
+ static 'fromData'(
+ data: SpDataStreamContainer,
+ target?: SpDataStreamContainer,
+ ): SpDataStreamContainer {
+ if (!data) {
+ return data;
+ }
+ const instance = target || new SpDataStreamContainer();
+ instance['@class'] = data['@class'];
+ instance.list = __getCopyArrayFn(SpDataStream.fromDataUnion)(data.list);
return instance;
}
}
@@ -4130,10 +3548,10 @@ export class SpLogEntry {
return data;
}
const instance = target || new SpLogEntry();
- instance.timestamp = data.timestamp;
instance.errorMessage = StreamPipesErrorMessage.fromData(
data.errorMessage,
);
+ instance.timestamp = data.timestamp;
return instance;
}
}
@@ -4176,14 +3594,14 @@ export class SpQueryResult {
return data;
}
const instance = target || new SpQueryResult();
- instance.total = data.total;
- instance.headers = __getCopyArrayFn(__identity<string>())(data.headers);
instance.allDataSeries = __getCopyArrayFn(DataSeries.fromData)(
data.allDataSeries,
);
+ instance.forId = data.forId;
+ instance.headers = __getCopyArrayFn(__identity<string>())(data.headers);
instance.sourceIndex = data.sourceIndex;
instance.spQueryStatus = data.spQueryStatus;
- instance.forId = data.forId;
+ instance.total = data.total;
return instance;
}
}
@@ -4222,6 +3640,7 @@ export class SpecificAdapterStreamDescription extends AdapterStreamDescription {
export class StaticPropertyAlternative extends StaticProperty {
'@class': 'org.apache.streampipes.model.staticproperty.StaticPropertyAlternative';
+ 'elementId': string;
'selected': boolean;
'staticProperty': StaticPropertyUnion;
@@ -4234,6 +3653,7 @@ export class StaticPropertyAlternative extends StaticProperty {
}
const instance = target || new StaticPropertyAlternative();
super.fromData(data, instance);
+ instance.elementId = data.elementId;
instance.selected = data.selected;
instance.staticProperty = StaticProperty.fromDataUnion(
data.staticProperty,
@@ -4277,11 +3697,11 @@ export class StaticPropertyGroup extends StaticProperty {
}
const instance = target || new StaticPropertyGroup();
super.fromData(data, instance);
+ instance.horizontalRendering = data.horizontalRendering;
+ instance.showLabel = data.showLabel;
instance.staticProperties = __getCopyArrayFn(
StaticProperty.fromDataUnion,
)(data.staticProperties);
- instance.showLabel = data.showLabel;
- instance.horizontalRendering = data.horizontalRendering;
return instance;
}
}
@@ -4309,30 +3729,15 @@ export class StreamPipesApplicationPackage {
return data;
}
const instance = target || new StreamPipesApplicationPackage();
- instance.requiredProcessorAppIds = __getCopyArrayFn(
- __identity<string>(),
- )(data.requiredProcessorAppIds);
- instance.requiredDataSinkAppIds = __getCopyArrayFn(
- __identity<string>(),
- )(data.requiredDataSinkAppIds);
- instance.requiredAdapterAppIds = __getCopyArrayFn(__identity<string>())(
- data.requiredAdapterAppIds,
- );
- instance.assets = __getCopyArrayFn(__identity<string>())(data.assets);
instance.adapters = __getCopyArrayFn(__identity<string>())(
data.adapters,
);
- instance.dashboards = __getCopyArrayFn(__identity<string>())(
- data.dashboards,
- );
+ instance.assets = __getCopyArrayFn(__identity<string>())(data.assets);
instance.dashboardWidgets = __getCopyArrayFn(__identity<string>())(
data.dashboardWidgets,
);
- instance.dataViews = __getCopyArrayFn(__identity<string>())(
- data.dataViews,
- );
- instance.dataViewWidgets = __getCopyArrayFn(__identity<string>())(
- data.dataViewWidgets,
+ instance.dashboards = __getCopyArrayFn(__identity<string>())(
+ data.dashboards,
);
instance.dataLakeMeasures = __getCopyArrayFn(__identity<string>())(
data.dataLakeMeasures,
@@ -4340,10 +3745,25 @@ export class StreamPipesApplicationPackage {
instance.dataSources = __getCopyArrayFn(__identity<string>())(
data.dataSources,
);
+ instance.dataViewWidgets = __getCopyArrayFn(__identity<string>())(
+ data.dataViewWidgets,
+ );
+ instance.dataViews = __getCopyArrayFn(__identity<string>())(
+ data.dataViews,
+ );
+ instance.files = __getCopyArrayFn(__identity<string>())(data.files);
instance.pipelines = __getCopyArrayFn(__identity<string>())(
data.pipelines,
);
- instance.files = __getCopyArrayFn(__identity<string>())(data.files);
+ instance.requiredAdapterAppIds = __getCopyArrayFn(__identity<string>())(
+ data.requiredAdapterAppIds,
+ );
+ instance.requiredDataSinkAppIds = __getCopyArrayFn(
+ __identity<string>(),
+ )(data.requiredDataSinkAppIds);
+ instance.requiredProcessorAppIds = __getCopyArrayFn(
+ __identity<string>(),
+ )(data.requiredProcessorAppIds);
return instance;
}
}
@@ -4363,11 +3783,11 @@ export class StreamPipesErrorMessage {
return data;
}
const instance = target || new StreamPipesErrorMessage();
- instance.level = data.level;
- instance.title = data.title;
- instance.detail = data.detail;
instance.cause = data.cause;
+ instance.detail = data.detail;
instance.fullStackTrace = data.fullStackTrace;
+ instance.level = data.level;
+ instance.title = data.title;
return instance;
}
}
@@ -4386,13 +3806,12 @@ export class SuccessMessage extends Message {
}
}
-export class SupportedProperty extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.staticproperty.SupportedProperty';
- 'propertyId': string;
- 'value': string;
- 'valueRequired': boolean;
+export class SupportedProperty {
+ propertyId: string;
+ value: string;
+ valueRequired: boolean;
- static 'fromData'(
+ static fromData(
data: SupportedProperty,
target?: SupportedProperty,
): SupportedProperty {
@@ -4400,10 +3819,9 @@ export class SupportedProperty extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new SupportedProperty();
- super.fromData(data, instance);
instance.propertyId = data.propertyId;
- instance.valueRequired = data.valueRequired;
instance.value = data.value;
+ instance.valueRequired = data.valueRequired;
return instance;
}
}
@@ -4425,22 +3843,21 @@ export class TimestampTranfsformationRuleDescription extends ValueTransformation
const instance =
target || new TimestampTranfsformationRuleDescription();
super.fromData(data, instance);
- instance.runtimeKey = data.runtimeKey;
- instance.mode = data.mode;
instance.formatString = data.formatString;
+ instance.mode = data.mode;
instance.multiplier = data.multiplier;
+ instance.runtimeKey = data.runtimeKey;
return instance;
}
}
-export class TransformOperation extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.output.TransformOperation';
- 'mappingPropertyInternalName': string;
- 'sourceStaticProperty': string;
- 'targetValue': string;
- 'transformationScope': string;
+export class TransformOperation {
+ mappingPropertyInternalName: string;
+ sourceStaticProperty: string;
+ targetValue: string;
+ transformationScope: string;
- static 'fromData'(
+ static fromData(
data: TransformOperation,
target?: TransformOperation,
): TransformOperation {
@@ -4448,11 +3865,10 @@ export class TransformOperation extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new TransformOperation();
- super.fromData(data, instance);
instance.mappingPropertyInternalName = data.mappingPropertyInternalName;
instance.sourceStaticProperty = data.sourceStaticProperty;
- instance.transformationScope = data.transformationScope;
instance.targetValue = data.targetValue;
+ instance.transformationScope = data.transformationScope;
return instance;
}
}
@@ -4477,11 +3893,10 @@ export class TransformOutputStrategy extends OutputStrategy {
}
}
-export class TransportFormat extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.grounding.TransportFormat';
- 'rdfType': string[];
+export class TransportFormat {
+ rdfType: string[];
- static 'fromData'(
+ static fromData(
data: TransportFormat,
target?: TransportFormat,
): TransportFormat {
@@ -4489,7 +3904,6 @@ export class TransportFormat extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new TransportFormat();
- super.fromData(data, instance);
instance.rdfType = __getCopyArrayFn(__identity<string>())(data.rdfType);
return instance;
}
@@ -4510,13 +3924,13 @@ export class TreeInputNode {
return data;
}
const instance = target || new TreeInputNode();
- instance.dataNode = data.dataNode;
- instance.selected = data.selected;
- instance.nodeName = data.nodeName;
- instance.internalNodeName = data.internalNodeName;
instance.children = __getCopyArrayFn(TreeInputNode.fromData)(
data.children,
);
+ instance.dataNode = data.dataNode;
+ instance.internalNodeName = data.internalNodeName;
+ instance.nodeName = data.nodeName;
+ instance.selected = data.selected;
return instance;
}
}
@@ -4536,8 +3950,8 @@ export class UnitTransformRuleDescription extends ValueTransformationRuleDescrip
}
const instance = target || new UnitTransformRuleDescription();
super.fromData(data, instance);
- instance.runtimeKey = data.runtimeKey;
instance.fromUnitRessourceURL = data.fromUnitRessourceURL;
+ instance.runtimeKey = data.runtimeKey;
instance.toUnitRessourceURL = data.toUnitRessourceURL;
return instance;
}
@@ -4575,11 +3989,11 @@ export class UserInfo {
return data;
}
const instance = target || new UserInfo();
- instance.username = data.username;
+ instance.darkMode = data.darkMode;
instance.displayName = data.displayName;
instance.roles = __getCopyArrayFn(__identity<string>())(data.roles);
instance.showTutorial = data.showTutorial;
- instance.darkMode = data.darkMode;
+ instance.username = data.username;
return instance;
}
}
@@ -4600,10 +4014,10 @@ export class VisualizablePipeline {
}
const instance = target || new VisualizablePipeline();
instance.pipelineId = data.pipelineId;
+ instance.pipelineName = data.pipelineName;
instance.schema = EventSchema.fromData(data.schema);
- instance.visualizationName = data.visualizationName;
instance.topic = data.topic;
- instance.pipelineName = data.pipelineName;
+ instance.visualizationName = data.visualizationName;
return instance;
}
}
@@ -4622,22 +4036,21 @@ export class WildcardTopicDefinition extends TopicDefinition {
}
const instance = target || new WildcardTopicDefinition();
super.fromData(data, instance);
- instance.wildcardTopicName = data.wildcardTopicName;
instance.wildcardTopicMappings = __getCopyArrayFn(
WildcardTopicMapping.fromData,
)(data.wildcardTopicMappings);
+ instance.wildcardTopicName = data.wildcardTopicName;
return instance;
}
}
-export class WildcardTopicMapping extends UnnamedStreamPipesEntity {
- '@class': 'org.apache.streampipes.model.grounding.WildcardTopicMapping';
- 'mappedRuntimeName': string;
- 'mappingId': string;
- 'selectedMapping': string;
- 'topicParameterType': string;
+export class WildcardTopicMapping {
+ mappedRuntimeName: string;
+ mappingId: string;
+ selectedMapping: string;
+ topicParameterType: string;
- static 'fromData'(
+ static fromData(
data: WildcardTopicMapping,
target?: WildcardTopicMapping,
): WildcardTopicMapping {
@@ -4645,11 +4058,10 @@ export class WildcardTopicMapping extends UnnamedStreamPipesEntity {
return data;
}
const instance = target || new WildcardTopicMapping();
- super.fromData(data, instance);
- instance.topicParameterType = data.topicParameterType;
- instance.mappingId = data.mappingId;
instance.mappedRuntimeName = data.mappedRuntimeName;
+ instance.mappingId = data.mappingId;
instance.selectedMapping = data.selectedMapping;
+ instance.topicParameterType = data.topicParameterType;
return instance;
}
}
@@ -4668,27 +4080,15 @@ export type AdapterStreamDescriptionUnion = SpecificAdapterStreamDescription;
export type EdgeValidationStatusType = 'COMPLETE' | 'INCOMPLETE' | 'INVALID';
-export type EventPropertyQualityDefinitionUnion =
- | Accuracy
- | MeasurementRange
- | Precision
- | Resolution;
-
export type EventPropertyUnion =
| EventPropertyList
| EventPropertyNested
| EventPropertyPrimitive;
-export type EventStreamQualityDefinitionUnion = Frequency | Latency;
-
export type FieldStatus = 'GOOD' | 'BAD' | 'ATTENTION';
export type MappingPropertyUnion = MappingPropertyNary | MappingPropertyUnary;
-export type MeasurementPropertyUnion =
- | EventPropertyQualityDefinition
- | EventStreamQualityDefinition;
-
export type OneOfStaticPropertyUnion = RuntimeResolvableOneOfStaticProperty;
export type OutputStrategyUnion =
@@ -4773,7 +4173,8 @@ export type TransformationRuleDescriptionUnion =
| RenameRuleDescription
| MoveRuleDescription
| ChangeDatatypeTransformationRuleDescription
- | CorrectionValueTransformationRuleDescription;
+ | CorrectionValueTransformationRuleDescription
+ | DebugSinkRuleDescription;
export type TransportProtocolUnion =
| JmsTransportProtocol
diff --git a/ui/src/app/editor/editor.component.ts b/ui/src/app/editor/editor.component.ts
index d4cf227fc..ddebcef2d 100644
--- a/ui/src/app/editor/editor.component.ts
+++ b/ui/src/app/editor/editor.component.ts
@@ -18,11 +18,13 @@
import { Component, OnInit } from '@angular/core';
import { EditorService } from './services/editor.service';
-import { DataSourceDescription, PipelineElementService, SpDataStream } from '@streampipes/platform-services';
+import { PipelineElementService } from '@streampipes/platform-services';
import { PipelineElementConfig, PipelineElementUnion } from './model/editor.model';
import { DialogService, PanelType, SpBreadcrumbService } from '@streampipes/shared-ui';
import { WelcomeTourComponent } from './dialog/welcome-tour/welcome-tour.component';
-import { MissingElementsForTutorialComponent } from './dialog/missing-elements-for-tutorial/missing-elements-for-tutorial.component';
+import {
+ MissingElementsForTutorialComponent
+} from './dialog/missing-elements-for-tutorial/missing-elements-for-tutorial.component';
import { ShepherdService } from '../services/tour/shepherd.service';
import { ActivatedRoute } from '@angular/router';
import { AuthService } from '../services/auth.service';
@@ -100,20 +102,6 @@ export class EditorComponent implements OnInit {
}
}
- collectStreams(sources: DataSourceDescription[]): SpDataStream[] {
- const streams: SpDataStream[] = [];
- sources.forEach(source => {
- source.spDataStreams.forEach(stream => {
- streams.push(stream);
- });
- });
- return streams;
- }
-
- selectPipelineElements(index: number) {
- // this.shepherdService.trigger('select-' + this.activeShorthand);
- }
-
startCreatePipelineTour() {
if (this.requiredPipelineElementsForTourPresent()) {
this.shepherdService.startCreatePipelineTour();
[streampipes] 02/03: Remove obsolete event property quality classes (#1058)
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch SP-1058
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit d0d68b5502f1589dc5b6192858422f6c16ccd68d
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Sat Jan 7 23:48:55 2023 +0100
Remove obsolete event property quality classes (#1058)
---
.../apache/streampipes/model/ApplicationLink.java | 95 ----------------------
.../org/apache/streampipes/model/SpDataSet.java | 11 ++-
.../org/apache/streampipes/model/SpDataStream.java | 67 ---------------
.../model/base/NamedStreamPipesEntity.java | 17 ----
.../apache/streampipes/model/quality/Accuracy.java | 47 -----------
.../quality/EventPropertyQualityDefinition.java | 41 ----------
.../quality/EventPropertyQualityRequirement.java | 82 -------------------
.../quality/EventStreamQualityDefinition.java | 40 ---------
.../quality/EventStreamQualityRequirement.java | 64 ---------------
.../streampipes/model/quality/Frequency.java | 52 ------------
.../apache/streampipes/model/quality/Latency.java | 63 --------------
.../model/quality/MeasurementCapability.java | 54 ------------
.../model/quality/MeasurementObject.java | 54 ------------
.../model/quality/MeasurementProperty.java | 41 ----------
.../model/quality/MeasurementRange.java | 61 --------------
.../streampipes/model/quality/Precision.java | 48 -----------
.../streampipes/model/quality/Resolution.java | 48 -----------
.../streampipes/model/schema/EventProperty.java | 48 +----------
.../model/schema/EventPropertyPrimitive.java | 10 ---
.../org/apache/streampipes/model/util/Cloner.java | 46 -----------
.../manager/matching/v2/StreamMatch.java | 29 +------
.../manager/matching/v2/StreamQualityMatch.java | 45 ----------
.../sdk/builder/PrimitivePropertyBuilder.java | 21 -----
.../storage/couchdb/serializer/GsonSerializer.java | 8 --
24 files changed, 9 insertions(+), 1083 deletions(-)
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
deleted file mode 100644
index 08fec232f..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/ApplicationLink.java
+++ /dev/null
@@ -1,95 +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;
-
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
-public class ApplicationLink extends UnnamedStreamPipesEntity {
-
- private String applicationName;
-
- private String applicationDescription;
-
- private String applicationUrl;
-
- private String applicationIconUrl;
-
- private String applicationLinkType;
-
- public ApplicationLink() {
- super();
- }
-
- public ApplicationLink(String applicationName, String applicationDescription, String applicationUrl,
- String applicationIconUrl) {
- super();
- this.applicationName = applicationName;
- this.applicationDescription = applicationDescription;
- this.applicationUrl = applicationUrl;
- this.applicationIconUrl = applicationIconUrl;
- }
-
- public ApplicationLink(ApplicationLink other) {
- super(other);
- this.applicationName = other.getApplicationName();
- this.applicationDescription = other.getApplicationDescription();
- this.applicationUrl = other.getApplicationUrl();
- this.applicationIconUrl = other.getApplicationIconUrl();
- }
-
- public String getApplicationName() {
- return applicationName;
- }
-
- public void setApplicationName(String applicationName) {
- this.applicationName = applicationName;
- }
-
- public String getApplicationDescription() {
- return applicationDescription;
- }
-
- public void setApplicationDescription(String applicationDescription) {
- this.applicationDescription = applicationDescription;
- }
-
- public String getApplicationUrl() {
- return applicationUrl;
- }
-
- public void setApplicationUrl(String applicationUrl) {
- this.applicationUrl = applicationUrl;
- }
-
- public String getApplicationIconUrl() {
- return applicationIconUrl;
- }
-
- public void setApplicationIconUrl(String applicationIconUrl) {
- this.applicationIconUrl = applicationIconUrl;
- }
-
- public String getApplicationLinkType() {
- return applicationLinkType;
- }
-
- public void setApplicationLinkType(String applicationLinkType) {
- this.applicationLinkType = applicationLinkType;
- }
-}
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 c997d8219..b0a9dff08 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
@@ -18,11 +18,8 @@
package org.apache.streampipes.model;
import org.apache.streampipes.model.grounding.EventGrounding;
-import org.apache.streampipes.model.quality.EventStreamQualityDefinition;
import org.apache.streampipes.model.schema.EventSchema;
-import java.util.List;
-
public class SpDataSet extends SpDataStream {
private EventGrounding supportedGrounding;
@@ -32,11 +29,13 @@ public class SpDataSet extends SpDataStream {
private String correspondingPipeline;
private String selectedEndpointUrl;
- public SpDataSet(String uri, String name, String description, String iconUrl, List<EventStreamQualityDefinition>
- hasEventStreamQualities,
+ public SpDataSet(String uri,
+ String name,
+ String description,
+ String iconUrl,
EventGrounding eventGrounding,
EventSchema eventSchema) {
- super(uri, name, description, iconUrl, hasEventStreamQualities, eventGrounding, eventSchema);
+ super(uri, name, description, iconUrl, eventGrounding, eventSchema);
}
public SpDataSet(String uri, String name, String description, EventSchema eventSchema) {
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 5aed03ccf..87110bded 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
@@ -20,19 +20,12 @@ package org.apache.streampipes.model;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.grounding.EventGrounding;
-import org.apache.streampipes.model.quality.EventStreamQualityDefinition;
-import org.apache.streampipes.model.quality.EventStreamQualityRequirement;
-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 com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.commons.lang3.RandomStringUtils;
-import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
@JsonSubTypes({
@JsonSubTypes.Type(SpDataStream.class),
@@ -44,27 +37,18 @@ public class SpDataStream extends NamedStreamPipesEntity {
private static final String prefix = "urn:streampipes.apache.org:eventstream:";
- protected transient List<EventStreamQualityDefinition> hasEventStreamQualities;
-
- protected transient List<EventStreamQualityRequirement> requiresEventStreamQualities;
-
protected EventGrounding eventGrounding;
protected EventSchema eventSchema;
- protected List<MeasurementCapability> measurementCapability;
-
- protected List<MeasurementObject> measurementObject;
protected List<String> category;
private int index;
private String correspondingAdapterId;
public SpDataStream(String uri, String name, String description, String iconUrl,
- List<EventStreamQualityDefinition> hasEventStreamQualities,
EventGrounding eventGrounding,
EventSchema eventSchema) {
super(uri, name, description, iconUrl);
- this.hasEventStreamQualities = hasEventStreamQualities;
this.eventGrounding = eventGrounding;
this.eventSchema = eventSchema;
}
@@ -90,40 +74,6 @@ public class SpDataStream extends NamedStreamPipesEntity {
if (other.getEventSchema() != null) {
this.eventSchema = new EventSchema(other.getEventSchema());
}
- if (other.getHasEventStreamQualities() != null) {
- this.hasEventStreamQualities = other.getHasEventStreamQualities().stream().map(EventStreamQualityDefinition::new)
- .collect(Collectors.toCollection(ArrayList::new));
- }
- if (other.getRequiresEventStreamQualities() != null) {
- this.requiresEventStreamQualities =
- other.getRequiresEventStreamQualities().stream().map(EventStreamQualityRequirement::new)
- .collect(Collectors.toCollection(ArrayList::new));
- }
- if (other.getMeasurementCapability() != null) {
- this.measurementCapability = new Cloner().mc(other.getMeasurementCapability());
- }
- if (other.getMeasurementObject() != null) {
- this.measurementObject = new Cloner().mo(other.getMeasurementObject());
- }
- }
-
- public List<EventStreamQualityDefinition> getHasEventStreamQualities() {
- return hasEventStreamQualities;
- }
-
- public void setHasEventStreamQualities(
- List<EventStreamQualityDefinition> hasEventStreamQualities) {
- this.hasEventStreamQualities = hasEventStreamQualities;
- }
-
-
- public List<EventStreamQualityRequirement> getRequiresEventStreamQualities() {
- return requiresEventStreamQualities;
- }
-
- public void setRequiresEventStreamQualities(
- List<EventStreamQualityRequirement> requiresEventStreamQualities) {
- this.requiresEventStreamQualities = requiresEventStreamQualities;
}
public EventSchema getEventSchema() {
@@ -142,23 +92,6 @@ public class SpDataStream extends NamedStreamPipesEntity {
this.eventGrounding = eventGrounding;
}
- public List<MeasurementCapability> getMeasurementCapability() {
- return measurementCapability;
- }
-
- public void setMeasurementCapability(
- List<MeasurementCapability> measurementCapability) {
- this.measurementCapability = measurementCapability;
- }
-
- public List<MeasurementObject> getMeasurementObject() {
- return measurementObject;
- }
-
- public void setMeasurementObject(List<MeasurementObject> measurementObject) {
- this.measurementObject = measurementObject;
- }
-
public List<String> getCategory() {
return category;
}
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 7d6aedfd3..b1adb60f1 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
@@ -19,9 +19,6 @@
package org.apache.streampipes.model.base;
-import org.apache.streampipes.model.ApplicationLink;
-import org.apache.streampipes.model.util.Cloner;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
@@ -47,13 +44,11 @@ public abstract class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
private boolean includesLocales;
private List<String> includedAssets;
private List<String> includedLocales;
- private List<ApplicationLink> applicationLinks;
private boolean internallyManaged;
public NamedStreamPipesEntity() {
super();
- this.applicationLinks = new ArrayList<>();
this.includedAssets = new ArrayList<>();
this.includedLocales = new ArrayList<>();
}
@@ -73,7 +68,6 @@ public abstract class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
this.elementId = elementId;
this.name = name;
this.description = description;
- this.applicationLinks = new ArrayList<>();
this.includedAssets = new ArrayList<>();
this.includedLocales = new ArrayList<>();
}
@@ -88,9 +82,6 @@ public abstract class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
this.dom = other.getDom();
this.internallyManaged = other.isInternallyManaged();
this.connectedTo = other.getConnectedTo();
- if (other.getApplicationLinks() != null) {
- this.applicationLinks = new Cloner().al(other.getApplicationLinks());
- }
this.appId = other.getAppId();
this.includesAssets = other.isIncludesAssets();
this.includesLocales = other.isIncludesLocales();
@@ -152,14 +143,6 @@ public abstract class NamedStreamPipesEntity extends AbstractStreamPipesEntity {
this.connectedTo = connectedTo;
}
- public List<ApplicationLink> getApplicationLinks() {
- return applicationLinks;
- }
-
- public void setApplicationLinks(List<ApplicationLink> applicationLinks) {
- this.applicationLinks = applicationLinks;
- }
-
public String getAppId() {
return appId;
}
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
deleted file mode 100644
index 6ef5745b3..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Accuracy.java
+++ /dev/null
@@ -1,47 +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.quality;
-
-public class Accuracy extends EventPropertyQualityDefinition {
-
- private static final long serialVersionUID = -4368302218285302897L;
- private float quantityValue;
-
- public Accuracy() {
- super();
- }
-
- public Accuracy(float quantityValue) {
- this.quantityValue = quantityValue;
- }
-
- public Accuracy(Accuracy other) {
- super(other);
- this.quantityValue = other.getQuantityValue();
- }
-
- public float getQuantityValue() {
- return quantityValue;
- }
-
- public void setQuantityValue(float quantityValue) {
- this.quantityValue = quantityValue;
- }
-
-}
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
deleted file mode 100644
index 6a241f131..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventPropertyQualityDefinition.java
+++ /dev/null
@@ -1,41 +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.quality;
-
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-
-@JsonSubTypes({
- @JsonSubTypes.Type(Accuracy.class),
- @JsonSubTypes.Type(MeasurementRange.class),
- @JsonSubTypes.Type(Precision.class),
- @JsonSubTypes.Type(Resolution.class),
-})
-public abstract class EventPropertyQualityDefinition
- extends MeasurementProperty /*implements Comparable<EventPropertyQualityDefinition>*/ {
-
- private static final long serialVersionUID = -3849772043514528797L;
-
- public EventPropertyQualityDefinition() {
- super();
- }
-
- public EventPropertyQualityDefinition(EventPropertyQualityDefinition other) {
- super(other);
- }
-}
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
deleted file mode 100644
index b70e72197..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventPropertyQualityRequirement.java
+++ /dev/null
@@ -1,82 +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.quality;
-
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
-import java.util.Objects;
-
-public class EventPropertyQualityRequirement extends UnnamedStreamPipesEntity {
-
- private static final long serialVersionUID = -8173312776233284351L;
-
- private transient EventPropertyQualityDefinition minimumPropertyQuality;
-
- private transient EventPropertyQualityDefinition maximumPropertyQuality;
-
- public EventPropertyQualityRequirement() {
- super();
- }
-
- public EventPropertyQualityRequirement(
- EventPropertyQualityDefinition minimumPropertyQuality,
- EventPropertyQualityDefinition maximumPropertyQuality) {
-
- super();
- this.minimumPropertyQuality = minimumPropertyQuality;
- this.maximumPropertyQuality = maximumPropertyQuality;
- }
-
- public EventPropertyQualityRequirement(EventPropertyQualityRequirement other) {
- super(other);
- //this.minimumPropertyQuality = other.getMinimumPropertyQuality();
- //this.maximumPropertyQuality = other.getMaximumPropertyQuality();
- }
-
- public EventPropertyQualityDefinition getMinimumPropertyQuality() {
- return minimumPropertyQuality;
- }
-
- public void setMinimumPropertyQuality(
- EventPropertyQualityDefinition minimumPropertyQuality) {
- this.minimumPropertyQuality = minimumPropertyQuality;
- }
-
- public EventPropertyQualityDefinition getMaximumPropertyQuality() {
- return maximumPropertyQuality;
- }
-
- public void setMaximumPropertyQuality(
- EventPropertyQualityDefinition maximumPropertyQuality) {
- this.maximumPropertyQuality = maximumPropertyQuality;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- EventPropertyQualityRequirement that = (EventPropertyQualityRequirement) o;
- return Objects.equals(minimumPropertyQuality, that.minimumPropertyQuality)
- && Objects.equals(maximumPropertyQuality, that.maximumPropertyQuality);
- }
-}
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
deleted file mode 100644
index e09d9d506..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventStreamQualityDefinition.java
+++ /dev/null
@@ -1,40 +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.quality;
-
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-
-@JsonSubTypes({
- @JsonSubTypes.Type(Frequency.class),
- @JsonSubTypes.Type(Latency.class),
-})
-public class EventStreamQualityDefinition extends MeasurementProperty {
-
- private static final long serialVersionUID = 6310763356941481868L;
-
- public EventStreamQualityDefinition() {
- super();
- }
-
- public EventStreamQualityDefinition(EventStreamQualityDefinition o) {
- super(o);
- }
-
-
-}
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
deleted file mode 100644
index 429f43203..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/EventStreamQualityRequirement.java
+++ /dev/null
@@ -1,64 +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.quality;
-
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
-public class EventStreamQualityRequirement extends UnnamedStreamPipesEntity {
-
- private static final long serialVersionUID = 1484115035721357275L;
-
- private transient EventStreamQualityDefinition minimumStreamQuality;
-
- private transient EventStreamQualityDefinition maximumStreamQuality;
-
- public EventStreamQualityRequirement(EventStreamQualityDefinition minimumStreamQuality,
- EventStreamQualityDefinition maximumStreamQuality) {
- super();
- //TODO check that minimum and maximum have the same type
- this.minimumStreamQuality = minimumStreamQuality;
- this.maximumStreamQuality = maximumStreamQuality;
- }
-
- public EventStreamQualityRequirement(EventStreamQualityRequirement other) {
- super(other);
- //this.minimumStreamQuality = other.getMinimumStreamQuality();
- //this.maximumStreamQuality = other.getMaximumStreamQuality();
- }
-
- public EventStreamQualityRequirement() {
- super();
- }
-
- public EventStreamQualityDefinition getMinimumStreamQuality() {
- return minimumStreamQuality;
- }
-
- public void setMinimumStreamQuality(EventStreamQualityDefinition minimumStreamQuality) {
- this.minimumStreamQuality = minimumStreamQuality;
- }
-
- public EventStreamQualityDefinition getMaximumStreamQuality() {
- return maximumStreamQuality;
- }
-
- public void setMaximumStreamQuality(EventStreamQualityDefinition maximumStreamQuality) {
- this.maximumStreamQuality = maximumStreamQuality;
- }
-}
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
deleted file mode 100644
index c736971db..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Frequency.java
+++ /dev/null
@@ -1,52 +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.quality;
-
-public class Frequency extends EventStreamQualityDefinition {
-
- private static final long serialVersionUID = 8196363710990038633L;
- /**
- * The unit of qualityValue is Hertz [Hz]
- */
- float quantityValue;
-
- public Frequency() {
- super();
- }
-
- public Frequency(float quantityValue) {
- super();
- this.quantityValue = quantityValue;
- }
-
- public Frequency(Frequency other) {
- super(other);
- this.quantityValue = other.getQuantityValue();
- }
-
- public float getQuantityValue() {
- return quantityValue;
- }
-
- public void setQuantityValue(float quantityValue) {
- this.quantityValue = quantityValue;
- }
-
-
-}
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
deleted file mode 100644
index 731881096..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Latency.java
+++ /dev/null
@@ -1,63 +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.quality;
-
-public class Latency extends EventStreamQualityDefinition {
-
- private static final long serialVersionUID = -9211064635743833555L;
-
- private float quantityValue;
-
- public Latency() {
- super();
- }
-
- public Latency(Latency other) {
- super(other);
- this.quantityValue = other.getQuantityValue();
- }
-
- public Latency(float quantityValue) {
- this.quantityValue = quantityValue;
- }
-
- public float getQuantityValue() {
- return quantityValue;
- }
-
- public void setQuantityValue(float quantityValue) {
- this.quantityValue = quantityValue;
- }
-
-
- //@Override
- public int compareTo(EventStreamQualityDefinition o) {
- Latency other = (Latency) o;
- if (other.getQuantityValue() == this.getQuantityValue()) {
- return 0;
-
- } else if ((other).getQuantityValue() > this.getQuantityValue()) {
- return -1;
- } else {
- return 1;
- }
- }
-
-
-}
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
deleted file mode 100644
index 916151c83..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementCapability.java
+++ /dev/null
@@ -1,54 +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.quality;
-
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
-import java.net.URI;
-
-public class MeasurementCapability extends UnnamedStreamPipesEntity {
-
- private static final long serialVersionUID = -7561544835976781403L;
-
- private URI capability;
-
- public MeasurementCapability() {
- super();
- }
-
- public MeasurementCapability(MeasurementCapability other) {
- super(other);
- this.capability = other.getCapability();
- }
-
- public MeasurementCapability(URI capability) {
- super();
- this.capability = capability;
- }
-
- public URI getCapability() {
- return capability;
- }
-
- public void setCapability(URI capability) {
- this.capability = capability;
- }
-
-
-}
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
deleted file mode 100644
index b8c9cebb9..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementObject.java
+++ /dev/null
@@ -1,54 +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.quality;
-
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
-import java.net.URI;
-
-public class MeasurementObject extends UnnamedStreamPipesEntity {
-
- private static final long serialVersionUID = 4391097898611686930L;
-
- private URI measuresObject;
-
- public MeasurementObject() {
- super();
- }
-
- public MeasurementObject(MeasurementObject other) {
- super(other);
- this.measuresObject = other.getMeasuresObject();
- }
-
- public MeasurementObject(URI measurementObject) {
- super();
- this.measuresObject = measurementObject;
- }
-
- public URI getMeasuresObject() {
- return measuresObject;
- }
-
- public void setMeasuresObject(URI measurementObject) {
- this.measuresObject = 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
deleted file mode 100644
index 1823f0c92..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementProperty.java
+++ /dev/null
@@ -1,41 +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.quality;
-
-import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
-
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-
-@JsonSubTypes({
- @JsonSubTypes.Type(EventPropertyQualityDefinition.class),
- @JsonSubTypes.Type(EventStreamQualityDefinition.class)
-})
-public abstract class MeasurementProperty extends UnnamedStreamPipesEntity {
-
- private static final long serialVersionUID = 8527800469513813552L;
-
- public MeasurementProperty() {
- super();
- }
-
- public MeasurementProperty(MeasurementProperty other) {
- super(other);
- }
-
-}
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
deleted file mode 100644
index 83f1f3d14..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/MeasurementRange.java
+++ /dev/null
@@ -1,61 +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.quality;
-
-public class MeasurementRange extends EventPropertyQualityDefinition {
-
- private static final long serialVersionUID = 4853190183770515968L;
-
- private float minValue;
-
- private float maxValue;
-
- public MeasurementRange() {
- super();
- }
-
- public MeasurementRange(float minValue, float maxValue) {
- super();
- this.minValue = minValue;
- this.maxValue = maxValue;
- }
-
- public MeasurementRange(MeasurementRange other) {
- super(other);
- this.minValue = other.getMinValue();
- this.maxValue = other.getMaxValue();
- }
-
- public float getMinValue() {
- return minValue;
- }
-
- public void setMinValue(float minValue) {
- this.minValue = minValue;
- }
-
- public float getMaxValue() {
- return maxValue;
- }
-
- public void setMaxValue(float maxValue) {
- this.maxValue = maxValue;
- }
-
-}
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
deleted file mode 100644
index 8a5dda6ab..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Precision.java
+++ /dev/null
@@ -1,48 +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.quality;
-
-public class Precision extends EventPropertyQualityDefinition {
-
- private static final long serialVersionUID = -1090184880089982077L;
-
- private float quantityValue;
-
- public Precision() {
- super();
- }
-
- public Precision(float quantityValue) {
- this.quantityValue = quantityValue;
- }
-
- public Precision(Precision other) {
- super(other);
- this.quantityValue = other.getQuantityValue();
- }
-
- public float getQuantityValue() {
- return quantityValue;
- }
-
- public void setQuantityValue(float quantityValue) {
- this.quantityValue = quantityValue;
- }
-
-}
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
deleted file mode 100644
index 5c7b2bb48..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/quality/Resolution.java
+++ /dev/null
@@ -1,48 +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.quality;
-
-public class Resolution extends EventPropertyQualityDefinition {
-
- private static final long serialVersionUID = -8794648771727880619L;
-
- private float quantityValue;
-
- public Resolution() {
- super();
- }
-
- public Resolution(float quantityValue) {
- this.quantityValue = quantityValue;
- }
-
- public Resolution(Resolution other) {
- super(other);
- this.quantityValue = other.getQuantityValue();
- }
-
- public float getQuantityValue() {
- return quantityValue;
- }
-
- public void setQuantityValue(float quantityValue) {
- this.quantityValue = quantityValue;
- }
-
-}
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 325de2a61..d97e3cb05 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,9 +19,6 @@
package org.apache.streampipes.model.schema;
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 com.fasterxml.jackson.annotation.JsonSubTypes;
import org.apache.commons.collections.ListUtils;
@@ -51,10 +48,6 @@ public abstract class EventProperty extends UnnamedStreamPipesEntity {
private List<URI> domainProperties;
- private List<EventPropertyQualityDefinition> eventPropertyQualities;
-
- private List<EventPropertyQualityRequirement> requiresEventPropertyQualities;
-
private String propertyScope;
private int index = 0;
@@ -64,8 +57,6 @@ public abstract class EventProperty extends UnnamedStreamPipesEntity {
public EventProperty() {
super(PREFIX + UUID.randomUUID().toString());
- this.requiresEventPropertyQualities = new ArrayList<>();
- this.eventPropertyQualities = new ArrayList<>();
this.domainProperties = new ArrayList<>();
}
@@ -74,16 +65,7 @@ public abstract class EventProperty extends UnnamedStreamPipesEntity {
this.label = other.getLabel();
this.description = other.getDescription();
this.required = other.isRequired();
- if (other.getRequiresEventPropertyQualities() != null) {
- this.requiresEventPropertyQualities = new Cloner()
- .reqEpQualitities(other
- .getRequiresEventPropertyQualities());
- }
this.runtimeName = other.getRuntimeName();
- if (other.getEventPropertyQualities() != null) {
- this.eventPropertyQualities = new Cloner().provEpQualities(other
- .getEventPropertyQualities());
- }
this.domainProperties = other.getDomainProperties();
this.propertyScope = other.getPropertyScope();
this.runtimeId = other.getRuntimeId();
@@ -101,14 +83,6 @@ public abstract class EventProperty extends UnnamedStreamPipesEntity {
this.domainProperties = subClassOf;
}
- public EventProperty(String propertyName, List<URI> subClassOf,
- List<EventPropertyQualityDefinition> eventPropertyQualities) {
- this();
- this.runtimeName = propertyName;
- this.domainProperties = subClassOf;
- this.eventPropertyQualities = eventPropertyQualities;
- }
-
public EventProperty(String propertyName) {
this();
this.runtimeName = propertyName;
@@ -135,18 +109,7 @@ public abstract class EventProperty extends UnnamedStreamPipesEntity {
&& Objects.equals(runtimeName, that.runtimeName)
&& Objects.equals(propertyScope, that.propertyScope)
&& Objects.equals(runtimeId, that.runtimeId)
- && ListUtils.isEqualList(this.domainProperties, that.domainProperties)
- && ListUtils.isEqualList(this.eventPropertyQualities, that.eventPropertyQualities)
- && ListUtils.isEqualList(this.requiresEventPropertyQualities, that.requiresEventPropertyQualities);
- }
-
- public List<EventPropertyQualityRequirement> getRequiresEventPropertyQualities() {
- return requiresEventPropertyQualities;
- }
-
- public void setRequiresEventPropertyQualities(
- List<EventPropertyQualityRequirement> requiresEventPropertyQualities) {
- this.requiresEventPropertyQualities = requiresEventPropertyQualities;
+ && ListUtils.isEqualList(this.domainProperties, that.domainProperties);
}
public String getRuntimeName() {
@@ -189,15 +152,6 @@ public abstract class EventProperty extends UnnamedStreamPipesEntity {
this.description = humanReadableDescription;
}
- public List<EventPropertyQualityDefinition> getEventPropertyQualities() {
- return eventPropertyQualities;
- }
-
- public void setEventPropertyQualities(
- List<EventPropertyQualityDefinition> eventPropertyQualities) {
- this.eventPropertyQualities = eventPropertyQualities;
- }
-
public String getPropertyScope() {
return propertyScope;
}
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 3672c3635..ed76c66fe 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
@@ -17,8 +17,6 @@
*/
package org.apache.streampipes.model.schema;
-
-import org.apache.streampipes.model.quality.EventPropertyQualityDefinition;
import org.apache.streampipes.model.util.Cloner;
import java.net.URI;
@@ -59,14 +57,6 @@ public class EventPropertyPrimitive extends EventProperty {
//this.measurementUnit = measurementUnit;
}
- public EventPropertyPrimitive(String propertyType, String propertyName,
- String measurementUnit, List<URI> subClassOf,
- List<EventPropertyQualityDefinition> qualities) {
- super(propertyName, subClassOf, qualities);
- this.runtimeType = propertyType;
- //this.measurementUnit = measurementUnit;
- }
-
public String getRuntimeType() {
return runtimeType;
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/util/Cloner.java b/streampipes-model/src/main/java/org/apache/streampipes/model/util/Cloner.java
index 8078a7d93..5427cd88b 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/util/Cloner.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/util/Cloner.java
@@ -18,7 +18,6 @@
package org.apache.streampipes.model.util;
-import org.apache.streampipes.model.ApplicationLink;
import org.apache.streampipes.model.SpDataSet;
import org.apache.streampipes.model.SpDataStream;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
@@ -52,13 +51,6 @@ import org.apache.streampipes.model.output.PropertyRenameRule;
import org.apache.streampipes.model.output.TransformOperation;
import org.apache.streampipes.model.output.TransformOutputStrategy;
import org.apache.streampipes.model.output.UserDefinedOutputStrategy;
-import org.apache.streampipes.model.quality.Accuracy;
-import org.apache.streampipes.model.quality.EventPropertyQualityDefinition;
-import org.apache.streampipes.model.quality.EventPropertyQualityRequirement;
-import org.apache.streampipes.model.quality.MeasurementCapability;
-import org.apache.streampipes.model.quality.MeasurementObject;
-import org.apache.streampipes.model.quality.Precision;
-import org.apache.streampipes.model.quality.Resolution;
import org.apache.streampipes.model.schema.Enumeration;
import org.apache.streampipes.model.schema.EventProperty;
import org.apache.streampipes.model.schema.EventPropertyList;
@@ -212,21 +204,6 @@ public class Cloner {
}
}
- public EventPropertyQualityRequirement qualityreq(EventPropertyQualityRequirement o) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public EventPropertyQualityDefinition qualitydef(EventPropertyQualityDefinition o) {
- if (o instanceof Accuracy) {
- return new Accuracy((Accuracy) o);
- } else if (o instanceof Precision) {
- return new Precision((Precision) o);
- } else {
- return new Resolution((Resolution) o);
- }
- }
-
public List<SpDataStream> seq(List<SpDataStream> spDataStreams) {
return spDataStreams.stream().map(this::mapSequence).collect(Collectors.toList());
}
@@ -277,16 +254,6 @@ public class Cloner {
return transformOperations.stream().map(o -> new TransformOperation(o)).collect(Collectors.toList());
}
- public List<EventPropertyQualityRequirement> reqEpQualitities(
- List<EventPropertyQualityRequirement> requiresEventPropertyQualities) {
- return requiresEventPropertyQualities.stream().map(o -> new Cloner().qualityreq(o)).collect(Collectors.toList());
- }
-
- public List<EventPropertyQualityDefinition> provEpQualities(
- List<EventPropertyQualityDefinition> eventPropertyQualities) {
- return eventPropertyQualities.stream().map(o -> new Cloner().qualitydef(o)).collect(Collectors.toList());
- }
-
public List<Option> options(List<Option> options) {
return options.stream().map(o -> new Option(o)).collect(Collectors.toList());
}
@@ -304,19 +271,6 @@ public class Cloner {
return ecTypes;
}
- public List<MeasurementCapability> mc(
- List<MeasurementCapability> measurementCapability) {
- return measurementCapability.stream().map(m -> new MeasurementCapability(m)).collect(Collectors.toList());
- }
-
- public List<MeasurementObject> mo(List<MeasurementObject> measurementObject) {
- return measurementObject.stream().map(m -> new MeasurementObject(m)).collect(Collectors.toList());
- }
-
- public List<ApplicationLink> al(List<ApplicationLink> applicationLinks) {
- return applicationLinks.stream().map(m -> new ApplicationLink(m)).collect(Collectors.toList());
- }
-
public TopicDefinition topicDefinition(TopicDefinition topicDefinition) {
if (topicDefinition instanceof SimpleTopicDefinition) {
return new SimpleTopicDefinition((SimpleTopicDefinition) topicDefinition);
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/StreamMatch.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/StreamMatch.java
index 5205b0999..4680d7d7b 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/StreamMatch.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/StreamMatch.java
@@ -23,8 +23,6 @@ import org.apache.streampipes.model.SpDataStream;
import org.apache.streampipes.model.client.matching.MatchingResultMessage;
import org.apache.streampipes.model.client.matching.MatchingResultType;
import org.apache.streampipes.model.grounding.EventGrounding;
-import org.apache.streampipes.model.quality.EventStreamQualityDefinition;
-import org.apache.streampipes.model.quality.EventStreamQualityRequirement;
import org.apache.streampipes.model.schema.EventSchema;
import java.util.List;
@@ -39,18 +37,13 @@ public class StreamMatch extends AbstractMatcher<SpDataStream, SpDataStream> {
public boolean match(SpDataStream offer, SpDataStream requirement, List<MatchingResultMessage> errorLog) {
return MatchingUtils.nullCheck(offer, requirement)
|| (checkSchemaMatch(offer.getEventSchema(), requirement.getEventSchema(), errorLog)
- && checkGroundingMatch(offer.getEventGrounding(), requirement.getEventGrounding(), errorLog)
- && checkStreamQualityMatch(offer.getHasEventStreamQualities(), requirement.getRequiresEventStreamQualities(),
- errorLog));
+ && checkGroundingMatch(offer.getEventGrounding(), requirement.getEventGrounding(), errorLog));
}
public boolean matchIgnoreGrounding(SpDataStream offer, SpDataStream requirement,
List<MatchingResultMessage> errorLog) {
boolean match = /*MatchingUtils.nullCheckReqAllowed(offer, requirement) ||*/
- (checkSchemaMatch(offer.getEventSchema(), requirement.getEventSchema(), errorLog)
- &&
- checkStreamQualityMatch(offer.getHasEventStreamQualities(), requirement.getRequiresEventStreamQualities(),
- errorLog));
+ (checkSchemaMatch(offer.getEventSchema(), requirement.getEventSchema(), errorLog));
return match;
}
@@ -59,25 +52,9 @@ public class StreamMatch extends AbstractMatcher<SpDataStream, SpDataStream> {
return new GroundingMatch().match(offer, requirement, errorLog);
}
- private boolean checkStreamQualityMatch(
- List<EventStreamQualityDefinition> offer,
- List<EventStreamQualityRequirement> requirement, List<MatchingResultMessage> errorLog) {
- boolean match = MatchingUtils.nullCheck(offer, requirement) || requirement
- .stream()
- .allMatch(req -> offer
- .stream()
- .anyMatch(of -> new StreamQualityMatch().match(of, req, errorLog)));
-
- if (!match) {
- buildErrorMessage(errorLog, MatchingResultType.STREAM_QUALITY, "quality");
- }
- return match;
- }
-
private boolean checkSchemaMatch(EventSchema offer,
EventSchema requirement, List<MatchingResultMessage> errorLog) {
- boolean match = new SchemaMatch().match(offer, requirement, errorLog);
- return match;
+ return new SchemaMatch().match(offer, requirement, errorLog);
}
}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/StreamQualityMatch.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/StreamQualityMatch.java
deleted file mode 100644
index f32eb1100..000000000
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/StreamQualityMatch.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.streampipes.manager.matching.v2;
-
-import org.apache.streampipes.manager.matching.v2.utils.MatchingUtils;
-import org.apache.streampipes.model.client.matching.MatchingResultMessage;
-import org.apache.streampipes.model.client.matching.MatchingResultType;
-import org.apache.streampipes.model.quality.EventStreamQualityDefinition;
-import org.apache.streampipes.model.quality.EventStreamQualityRequirement;
-
-import java.util.List;
-
-public class StreamQualityMatch extends AbstractMatcher<EventStreamQualityDefinition, EventStreamQualityRequirement> {
-
- public StreamQualityMatch() {
- super(MatchingResultType.STREAM_QUALITY);
- }
-
- @Override
- public boolean match(EventStreamQualityDefinition offer,
- EventStreamQualityRequirement requirement, List<MatchingResultMessage> errorLog) {
-
- // TODO
- boolean match = MatchingUtils.nullCheck(offer, requirement);
- return true;
-
- }
-
-}
diff --git a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/PrimitivePropertyBuilder.java b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/PrimitivePropertyBuilder.java
index ea880e76b..cdfaea039 100644
--- a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/PrimitivePropertyBuilder.java
+++ b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/PrimitivePropertyBuilder.java
@@ -18,9 +18,6 @@
package org.apache.streampipes.sdk.builder;
-import org.apache.streampipes.model.quality.Accuracy;
-import org.apache.streampipes.model.quality.EventPropertyQualityDefinition;
-import org.apache.streampipes.model.quality.Resolution;
import org.apache.streampipes.model.schema.Enumeration;
import org.apache.streampipes.model.schema.EventPropertyPrimitive;
import org.apache.streampipes.model.schema.PropertyScope;
@@ -28,18 +25,15 @@ import org.apache.streampipes.model.schema.QuantitativeValue;
import org.apache.streampipes.sdk.utils.Datatypes;
import java.net.URI;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class PrimitivePropertyBuilder {
private EventPropertyPrimitive eventProperty;
- private List<EventPropertyQualityDefinition> qualityDefinitions;
private PrimitivePropertyBuilder(Datatypes datatype, String runtimeName) {
this.eventProperty = new EventPropertyPrimitive();
- this.qualityDefinitions = new ArrayList<>();
this.eventProperty.setRuntimeType(datatype.toString());
this.eventProperty.setRuntimeName(runtimeName);
}
@@ -130,18 +124,6 @@ public class PrimitivePropertyBuilder {
return this;
}
- public PrimitivePropertyBuilder accuracy(Float accuracy, URI measurementUnit) {
- // TODO extend event property
- this.qualityDefinitions.add(new Accuracy(accuracy));
- return this;
- }
-
- public PrimitivePropertyBuilder resolution(Float resolution, URI measurementUnit) {
- // TODO extend event property
- this.qualityDefinitions.add(new Resolution(resolution));
- return this;
- }
-
/**
* Assigns a property scope to the event property.
*
@@ -155,9 +137,6 @@ public class PrimitivePropertyBuilder {
public EventPropertyPrimitive build() {
- if (qualityDefinitions.size() > 0) {
- this.eventProperty.setEventPropertyQualities(qualityDefinitions);
- }
return this.eventProperty;
}
diff --git a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/GsonSerializer.java b/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/GsonSerializer.java
index 1b59cdba3..abf806b0c 100644
--- a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/GsonSerializer.java
+++ b/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/GsonSerializer.java
@@ -46,9 +46,6 @@ import org.apache.streampipes.model.grounding.TopicDefinition;
import org.apache.streampipes.model.grounding.TransportProtocol;
import org.apache.streampipes.model.message.Message;
import org.apache.streampipes.model.output.OutputStrategy;
-import org.apache.streampipes.model.quality.EventPropertyQualityDefinition;
-import org.apache.streampipes.model.quality.EventStreamQualityDefinition;
-import org.apache.streampipes.model.quality.Frequency;
import org.apache.streampipes.model.schema.EventProperty;
import org.apache.streampipes.model.schema.ValueSpecification;
import org.apache.streampipes.model.staticproperty.MappingProperty;
@@ -101,11 +98,6 @@ public class GsonSerializer {
builder.registerTypeAdapter(Message.class, new JsonLdSerializer<Message>());
builder.registerTypeAdapter(DataProcessorType.class, new EpaTypeAdapter());
builder.registerTypeAdapter(URI.class, new UriSerializer());
- builder.registerTypeAdapter(Frequency.class, new JsonLdSerializer<Frequency>());
- builder.registerTypeAdapter(EventPropertyQualityDefinition.class,
- new JsonLdSerializer<EventPropertyQualityDefinition>());
- builder.registerTypeAdapter(EventStreamQualityDefinition.class,
- new JsonLdSerializer<EventStreamQualityDefinition>());
builder.registerTypeAdapter(TopicDefinition.class, new JsonLdSerializer<TopicDefinition>());
builder.registerTypeAdapter(TransformationRuleDescription.class,
new JsonLdSerializer<TransformationRuleDescription>());
[streampipes] 01/03: Remove unused classes (#1058)
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch SP-1058
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit dbdac1ad24ef873531d8605b3896df0205463f82
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Sat Jan 7 23:18:41 2023 +0100
Remove unused classes (#1058)
---
.../api/declarer/EventStreamDeclarer.java | 25 ------
.../declarer/SemanticEventProducerDeclarer.java | 28 -------
.../apache/streampipes/model/base/Namespaces.java | 25 ------
.../model/graph/DataSourceDescription.java | 93 ----------------------
.../runtime/HeartbeatMessageGenerator.java | 38 ---------
.../runtime/RuntimeVerificationResult.java | 23 ------
.../verification/runtime/RuntimeVerifier.java | 23 ------
.../verification/runtime/SourceSchemaVerifier.java | 41 ----------
.../verification/structure/GeneralSecVerifier.java | 23 ------
.../verification/structure/GeneralSepVerifier.java | 23 ------
.../structure/GeneralSepaVerifier.java | 23 ------
.../structure/StreamRequirementVerifier.java | 23 ------
.../verification/structure/StreamVerifier.java | 41 ----------
.../streampipes/sdk/builder/DataSourceBuilder.java | 50 ------------
14 files changed, 479 deletions(-)
diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/EventStreamDeclarer.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/EventStreamDeclarer.java
deleted file mode 100644
index 4eb79f810..000000000
--- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/EventStreamDeclarer.java
+++ /dev/null
@@ -1,25 +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.extensions.api.declarer;
-
-@Deprecated
-public interface EventStreamDeclarer extends DataStreamDeclarer {
-
-
-}
diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventProducerDeclarer.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventProducerDeclarer.java
deleted file mode 100644
index c21db7506..000000000
--- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventProducerDeclarer.java
+++ /dev/null
@@ -1,28 +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.extensions.api.declarer;
-
-import org.apache.streampipes.model.graph.DataSourceDescription;
-
-import java.util.List;
-
-@Deprecated
-public interface SemanticEventProducerDeclarer extends Declarer<DataSourceDescription> {
- List<DataStreamDeclarer> getEventStreams();
-}
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
deleted file mode 100644
index 23c57a7ad..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/base/Namespaces.java
+++ /dev/null
@@ -1,25 +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;
-
-public class Namespaces {
-
- public static final String SO = org.apache.streampipes.vocabulary.SO.NS;
-
-}
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
deleted file mode 100644
index a22e5f9e5..000000000
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/graph/DataSourceDescription.java
+++ /dev/null
@@ -1,93 +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.graph;
-
-import org.apache.streampipes.model.SpDataStream;
-import org.apache.streampipes.model.base.NamedStreamPipesEntity;
-import org.apache.streampipes.model.shared.annotation.TsModel;
-import org.apache.streampipes.model.util.Cloner;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * class that represents Semantic Event Producers.
- */
-
-
-/**
- * @deprecated As of release 0.90.0, replaced by {@link DataSourceDescription}
- */
-@TsModel
-@Deprecated(since = "0.90.0", forRemoval = true)
-public class DataSourceDescription extends NamedStreamPipesEntity {
-
- private static final long serialVersionUID = 5607030219013954697L;
-
- private List<SpDataStream> spDataStreams;
-
- private String correspondingSourceId;
-
- public DataSourceDescription() {
- super();
- spDataStreams = new ArrayList<>();
- }
-
- public DataSourceDescription(DataSourceDescription other) {
- super(other);
- this.spDataStreams = new Cloner().seq(other.getSpDataStreams());
- this.spDataStreams.forEach(e -> e.setCategory(Arrays.asList(this.getElementId())));
- }
-
- public DataSourceDescription(String uri, String name, String description, String iconUrl,
- List<SpDataStream> spDataStreams) {
- super(uri, name, description, iconUrl);
- this.spDataStreams = spDataStreams;
- this.setAppId(uri);
- }
-
- public DataSourceDescription(String uri, String name2, String description2, String iconUrl) {
- this(uri, name2, description2, iconUrl, new ArrayList<>());
- }
-
- public DataSourceDescription(String uri, String name, String description) {
- this(uri, name, description, "", new ArrayList<>());
- }
-
- public List<SpDataStream> getSpDataStreams() {
- return spDataStreams;
- }
-
- public void setSpDataStreams(List<SpDataStream> spDataStreams) {
- this.spDataStreams = spDataStreams;
- }
-
- public void addEventStream(SpDataStream spDataStream) {
- spDataStreams.add(spDataStream);
- }
-
- public String getCorrespondingSourceId() {
- return correspondingSourceId;
- }
-
- public void setCorrespondingSourceId(String correspondingSourceId) {
- this.correspondingSourceId = correspondingSourceId;
- }
-}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/runtime/HeartbeatMessageGenerator.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/runtime/HeartbeatMessageGenerator.java
deleted file mode 100644
index 6e87231f9..000000000
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/runtime/HeartbeatMessageGenerator.java
+++ /dev/null
@@ -1,38 +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.manager.verification.runtime;
-
-import org.apache.streampipes.model.graph.DataProcessorDescription;
-
-public class HeartbeatMessageGenerator {
-
- private DataProcessorDescription description;
-
- public HeartbeatMessageGenerator(DataProcessorDescription description) {
- this.description = description;
- }
-
- public DataProcessorDescription getDescription() {
- return description;
- }
-
- public void setDescription(DataProcessorDescription description) {
- this.description = description;
- }
-}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/runtime/RuntimeVerificationResult.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/runtime/RuntimeVerificationResult.java
deleted file mode 100644
index d0edcae05..000000000
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/runtime/RuntimeVerificationResult.java
+++ /dev/null
@@ -1,23 +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.manager.verification.runtime;
-
-public class RuntimeVerificationResult {
-
-}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/runtime/RuntimeVerifier.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/runtime/RuntimeVerifier.java
deleted file mode 100644
index 164c196a7..000000000
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/runtime/RuntimeVerifier.java
+++ /dev/null
@@ -1,23 +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.manager.verification.runtime;
-
-public class RuntimeVerifier {
-
-}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/runtime/SourceSchemaVerifier.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/runtime/SourceSchemaVerifier.java
deleted file mode 100644
index faf01b4cf..000000000
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/runtime/SourceSchemaVerifier.java
+++ /dev/null
@@ -1,41 +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.manager.verification.runtime;
-
-import org.apache.streampipes.manager.verification.messages.VerificationResult;
-import org.apache.streampipes.manager.verification.structure.Verifier;
-import org.apache.streampipes.model.graph.DataSourceDescription;
-
-import java.util.List;
-
-public class SourceSchemaVerifier implements Verifier {
-
- private DataSourceDescription sep;
-
- public SourceSchemaVerifier(DataSourceDescription sep) {
- this.sep = sep;
- }
-
- @Override
- public List<VerificationResult> validate() {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/GeneralSecVerifier.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/GeneralSecVerifier.java
deleted file mode 100644
index 7373d0457..000000000
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/GeneralSecVerifier.java
+++ /dev/null
@@ -1,23 +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.manager.verification.structure;
-
-public class GeneralSecVerifier {
-
-}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/GeneralSepVerifier.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/GeneralSepVerifier.java
deleted file mode 100644
index 2bc6c2a12..000000000
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/GeneralSepVerifier.java
+++ /dev/null
@@ -1,23 +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.manager.verification.structure;
-
-public class GeneralSepVerifier {
-
-}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/GeneralSepaVerifier.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/GeneralSepaVerifier.java
deleted file mode 100644
index eb6ef2fdf..000000000
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/GeneralSepaVerifier.java
+++ /dev/null
@@ -1,23 +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.manager.verification.structure;
-
-public class GeneralSepaVerifier {
-
-}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/StreamRequirementVerifier.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/StreamRequirementVerifier.java
deleted file mode 100644
index f6c79f60e..000000000
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/StreamRequirementVerifier.java
+++ /dev/null
@@ -1,23 +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.manager.verification.structure;
-
-public class StreamRequirementVerifier {
-
-}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/StreamVerifier.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/StreamVerifier.java
deleted file mode 100644
index ef6ca89e6..000000000
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/verification/structure/StreamVerifier.java
+++ /dev/null
@@ -1,41 +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.manager.verification.structure;
-
-import org.apache.streampipes.manager.verification.messages.VerificationResult;
-import org.apache.streampipes.model.SpDataStream;
-
-import java.util.List;
-
-public class StreamVerifier extends AbstractVerifier {
-
- SpDataStream stream;
-
- public StreamVerifier(SpDataStream stream) {
- this.stream = stream;
- }
-
- @Override
- public List<VerificationResult> validate() {
-
-
- return validationResults;
- }
-
-}
diff --git a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/DataSourceBuilder.java b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/DataSourceBuilder.java
deleted file mode 100644
index 12537762b..000000000
--- a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/DataSourceBuilder.java
+++ /dev/null
@@ -1,50 +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.sdk.builder;
-
-import org.apache.streampipes.model.graph.DataSourceDescription;
-
-public class DataSourceBuilder extends AbstractPipelineElementBuilder<DataSourceBuilder, DataSourceDescription> {
-
- /**
- * Creates a new data source using the builder pattern.
- *
- * @param id A unique identifier of the new element, e.g., com.mycompany.source.mynewdatasource
- * @param label A human-readable name of the element.
- * Will later be shown as the element name in the StreamPipes UI.
- * @param description A human-readable description of the element.
- */
- protected DataSourceBuilder(String id, String label, String description) {
- super(id, label, description, new DataSourceDescription());
- }
-
- public static DataSourceBuilder create(String id, String label, String description) {
- return new DataSourceBuilder(id, label, description);
- }
-
- @Override
- protected DataSourceBuilder me() {
- return this;
- }
-
- @Override
- protected void prepareBuild() {
-
- }
-}