This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 8a116183999ceef3e8209341a23d7d256b088274 Author: Dominik Riemer <[email protected]> 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>());
