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
The following commit(s) were added to refs/heads/dev by this push:
new 6fb1fe1f7f chore(#2962): Remove deprecated static properties (#2963)
6fb1fe1f7f is described below
commit 6fb1fe1f7f523da4c553e77e562044878f19394a
Author: Dominik Riemer <[email protected]>
AuthorDate: Thu Jun 27 14:59:35 2024 +0200
chore(#2962): Remove deprecated static properties (#2963)
* chore(#2962): Remove deprecated static properties
* chore(#2962): Fix linting
* Update typescript model
---------
Co-authored-by: Philipp Zehnder <[email protected]>
---
.../api/extractor/IParameterExtractor.java | 3 -
.../siddhi/trend/TrendConfigurationVisitor.java | 12 --
.../model/staticproperty/DomainStaticProperty.java | 76 -------------
.../staticproperty/RemoteOneOfStaticProperty.java | 123 ---------------------
.../model/staticproperty/StaticProperty.java | 1 -
.../staticproperty/StaticPropertyVisitor.java | 4 -
.../org/apache/streampipes/model/util/Cloner.java | 6 -
.../v2/pipeline/CheckCompletedVisitor.java | 12 --
.../v2/pipeline/UpdateStaticPropertiesVisitor.java | 12 --
.../template/PipelineElementTemplateVisitor.java | 12 --
.../resource/management/secret/SecretVisitor.java | 12 --
...AbstractConfigurablePipelineElementBuilder.java | 39 -------
.../sdk/extractor/AbstractParameterExtractor.java | 18 ---
.../apache/streampipes/sdk/helpers/Groundings.java | 43 -------
.../sdk/helpers/OntologyProperties.java | 36 ------
.../org/apache/streampipes/sdk/helpers/Tuple3.java | 55 ---------
.../src/lib/model/gen/streampipes-model.ts | 48 +-------
17 files changed, 1 insertion(+), 511 deletions(-)
diff --git
a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/extractor/IParameterExtractor.java
b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/extractor/IParameterExtractor.java
index 447aad86fe..dbcdb4eba4 100644
---
a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/extractor/IParameterExtractor.java
+++
b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/extractor/IParameterExtractor.java
@@ -77,9 +77,6 @@ public interface IParameterExtractor {
String propertyDatatype(String runtimeName);
- <V> V supportedOntologyPropertyValue(String domainPropertyInternalId, String
- propertyId, Class<V> targetClass);
-
List<EventProperty> getEventPropertiesBySelector(List<String> selectors)
throws
SpRuntimeException;
diff --git
a/streampipes-extensions/streampipes-processors-filters-siddhi/src/test/java/org/apache/streampipes/processors/siddhi/trend/TrendConfigurationVisitor.java
b/streampipes-extensions/streampipes-processors-filters-siddhi/src/test/java/org/apache/streampipes/processors/siddhi/trend/TrendConfigurationVisitor.java
index 4499d397c0..7f4187f6dc 100644
---
a/streampipes-extensions/streampipes-processors-filters-siddhi/src/test/java/org/apache/streampipes/processors/siddhi/trend/TrendConfigurationVisitor.java
+++
b/streampipes-extensions/streampipes-processors-filters-siddhi/src/test/java/org/apache/streampipes/processors/siddhi/trend/TrendConfigurationVisitor.java
@@ -22,14 +22,12 @@ import
org.apache.streampipes.model.staticproperty.AnyStaticProperty;
import org.apache.streampipes.model.staticproperty.CodeInputStaticProperty;
import org.apache.streampipes.model.staticproperty.CollectionStaticProperty;
import org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty;
-import org.apache.streampipes.model.staticproperty.DomainStaticProperty;
import org.apache.streampipes.model.staticproperty.FileStaticProperty;
import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
import org.apache.streampipes.model.staticproperty.MappingPropertyNary;
import org.apache.streampipes.model.staticproperty.MappingPropertyUnary;
import org.apache.streampipes.model.staticproperty.MatchingStaticProperty;
import org.apache.streampipes.model.staticproperty.OneOfStaticProperty;
-import org.apache.streampipes.model.staticproperty.RemoteOneOfStaticProperty;
import
org.apache.streampipes.model.staticproperty.RuntimeResolvableGroupStaticProperty;
import
org.apache.streampipes.model.staticproperty.RuntimeResolvableTreeInputStaticProperty;
import org.apache.streampipes.model.staticproperty.SecretStaticProperty;
@@ -76,11 +74,6 @@ public class TrendConfigurationVisitor implements
StaticPropertyVisitor {
}
- @Override
- public void visit(DomainStaticProperty domainStaticProperty) {
-
- }
-
@Override
public void visit(FileStaticProperty fileStaticProperty) {
@@ -140,11 +133,6 @@ public class TrendConfigurationVisitor implements
StaticPropertyVisitor {
}
- @Override
- public void visit(RemoteOneOfStaticProperty remoteOneOfStaticProperty) {
-
- }
-
@Override
public void visit(SlideToggleStaticProperty slideToggleStaticProperty) {
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/DomainStaticProperty.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/DomainStaticProperty.java
deleted file mode 100644
index 4c975b5a9f..0000000000
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/DomainStaticProperty.java
+++ /dev/null
@@ -1,76 +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.staticproperty;
-
-import org.apache.streampipes.model.util.Cloner;
-
-import java.util.List;
-
-public class DomainStaticProperty extends StaticProperty {
-
- private static final long serialVersionUID = 1L;
-
- private String requiredClass;
-
- private List<SupportedProperty> supportedProperties;
-
- public DomainStaticProperty() {
- super(StaticPropertyType.DomainStaticProperty);
- }
-
- public DomainStaticProperty(String internalName, String label, String
description,
- List<SupportedProperty> supportedProperties) {
- super(StaticPropertyType.DomainStaticProperty, internalName, label,
description);
- this.supportedProperties = supportedProperties;
- }
-
- public DomainStaticProperty(String internalName, String label, String
description, String requiredClass,
- List<SupportedProperty> supportedProperties) {
- this(internalName, label, description, supportedProperties);
- this.requiredClass = requiredClass;
- }
-
- public DomainStaticProperty(DomainStaticProperty other) {
- super(other);
- this.requiredClass = other.getRequiredClass();
- this.supportedProperties = new
Cloner().supportedProperties(other.getSupportedProperties());
- }
-
- public String getRequiredClass() {
- return requiredClass;
- }
-
- public void setRequiredClass(String requiredClass) {
- this.requiredClass = requiredClass;
- }
-
- public List<SupportedProperty> getSupportedProperties() {
- return supportedProperties;
- }
-
- public void setSupportedProperties(List<SupportedProperty>
supportedProperties) {
- this.supportedProperties = supportedProperties;
- }
-
- @Override
- public void accept(StaticPropertyVisitor visitor) {
- visitor.visit(this);
- }
-
-}
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RemoteOneOfStaticProperty.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RemoteOneOfStaticProperty.java
deleted file mode 100644
index b058d44c0b..0000000000
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/RemoteOneOfStaticProperty.java
+++ /dev/null
@@ -1,123 +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.staticproperty;
-
-
-import org.apache.streampipes.model.util.Cloner;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Deprecated
-public class RemoteOneOfStaticProperty extends StaticProperty {
-
- private static final long serialVersionUID = 3483290363677184344L;
-
- private List<Option> options;
-
- private String remoteUrl;
-
- private String valueFieldName;
-
- private String labelFieldName;
-
- private String descriptionFieldName;
-
- public RemoteOneOfStaticProperty() {
- super(StaticPropertyType.OneOfStaticProperty);
- this.options = new ArrayList<>();
- }
-
- public RemoteOneOfStaticProperty(String internalName, String label, String
description, String remoteUrl,
- String valueFieldName, String
labelFieldName, String descriptionFieldName,
- boolean valueRequired) {
- super(StaticPropertyType.OneOfStaticProperty, internalName, label,
description);
- this.remoteUrl = remoteUrl;
- this.valueFieldName = valueFieldName;
- this.labelFieldName = labelFieldName;
- this.descriptionFieldName = descriptionFieldName;
- this.optional = valueRequired;
- this.options = new ArrayList<>();
- }
-
-
- public RemoteOneOfStaticProperty(String internalName, String label, String
description, String remoteUrl,
- String valueFieldName, String
labelFieldName, String descriptionFieldName) {
- super(StaticPropertyType.OneOfStaticProperty, internalName, label,
description);
- this.remoteUrl = remoteUrl;
- this.valueFieldName = valueFieldName;
- this.labelFieldName = labelFieldName;
- this.descriptionFieldName = descriptionFieldName;
- this.options = new ArrayList<>();
- }
-
- public RemoteOneOfStaticProperty(RemoteOneOfStaticProperty other) {
- super(other);
- this.remoteUrl = other.getRemoteUrl();
- this.valueFieldName = other.getValueFieldName();
- this.labelFieldName = other.getLabelFieldName();
- this.descriptionFieldName = other.getDescriptionFieldName();
- this.options = new Cloner().options(other.getOptions());
- }
-
- public String getRemoteUrl() {
- return remoteUrl;
- }
-
- public void setRemoteUrl(String remoteUrl) {
- this.remoteUrl = remoteUrl;
- }
-
- public String getValueFieldName() {
- return valueFieldName;
- }
-
- public void setValueFieldName(String valueFieldName) {
- this.valueFieldName = valueFieldName;
- }
-
- public String getLabelFieldName() {
- return labelFieldName;
- }
-
- public void setLabelFieldName(String labelFieldName) {
- this.labelFieldName = labelFieldName;
- }
-
- public String getDescriptionFieldName() {
- return descriptionFieldName;
- }
-
- public void setDescriptionFieldName(String descriptionFieldName) {
- this.descriptionFieldName = descriptionFieldName;
- }
-
- public List<Option> getOptions() {
- return options;
- }
-
- public void setOptions(List<Option> options) {
- this.options = options;
- }
-
- @Override
- public void accept(StaticPropertyVisitor visitor) {
- visitor.visit(this);
- }
-}
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 8832b21764..0640d73c90 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
@@ -30,7 +30,6 @@ import java.util.Objects;
@JsonSubTypes.Type(CodeInputStaticProperty.class),
@JsonSubTypes.Type(CollectionStaticProperty.class),
@JsonSubTypes.Type(ColorPickerStaticProperty.class),
- @JsonSubTypes.Type(DomainStaticProperty.class),
@JsonSubTypes.Type(FileStaticProperty.class),
@JsonSubTypes.Type(FreeTextStaticProperty.class),
@JsonSubTypes.Type(MappingPropertyUnary.class),
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyVisitor.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyVisitor.java
index c8c91a375e..a7f1bb1b22 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyVisitor.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/staticproperty/StaticPropertyVisitor.java
@@ -27,8 +27,6 @@ public interface StaticPropertyVisitor {
void visit(ColorPickerStaticProperty colorPickerStaticProperty);
- void visit(DomainStaticProperty domainStaticProperty);
-
void visit(FileStaticProperty fileStaticProperty);
void visit(FreeTextStaticProperty freeTextStaticProperty);
@@ -49,8 +47,6 @@ public interface StaticPropertyVisitor {
void visit(StaticPropertyGroup staticPropertyGroup);
- void visit(RemoteOneOfStaticProperty remoteOneOfStaticProperty);
-
void visit(SlideToggleStaticProperty slideToggleStaticProperty);
void visit(RuntimeResolvableTreeInputStaticProperty treeInputStaticProperty);
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 8f52440870..ebdf536ce2 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
@@ -56,7 +56,6 @@ import
org.apache.streampipes.model.staticproperty.AnyStaticProperty;
import org.apache.streampipes.model.staticproperty.CodeInputStaticProperty;
import org.apache.streampipes.model.staticproperty.CollectionStaticProperty;
import org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty;
-import org.apache.streampipes.model.staticproperty.DomainStaticProperty;
import org.apache.streampipes.model.staticproperty.FileStaticProperty;
import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
import org.apache.streampipes.model.staticproperty.MappingPropertyNary;
@@ -64,7 +63,6 @@ import
org.apache.streampipes.model.staticproperty.MappingPropertyUnary;
import org.apache.streampipes.model.staticproperty.MatchingStaticProperty;
import org.apache.streampipes.model.staticproperty.OneOfStaticProperty;
import org.apache.streampipes.model.staticproperty.Option;
-import org.apache.streampipes.model.staticproperty.RemoteOneOfStaticProperty;
import
org.apache.streampipes.model.staticproperty.RuntimeResolvableAnyStaticProperty;
import
org.apache.streampipes.model.staticproperty.RuntimeResolvableGroupStaticProperty;
import
org.apache.streampipes.model.staticproperty.RuntimeResolvableOneOfStaticProperty;
@@ -120,12 +118,8 @@ public class Cloner {
return new
RuntimeResolvableAnyStaticProperty((RuntimeResolvableAnyStaticProperty) o);
} else if (o instanceof OneOfStaticProperty) {
return new OneOfStaticProperty((OneOfStaticProperty) o);
- } else if (o instanceof RemoteOneOfStaticProperty) {
- return new RemoteOneOfStaticProperty((RemoteOneOfStaticProperty) o);
} else if (o instanceof MappingPropertyNary) {
return new MappingPropertyNary((MappingPropertyNary) o);
- } else if (o instanceof DomainStaticProperty) {
- return new DomainStaticProperty((DomainStaticProperty) o);
} else if (o instanceof AnyStaticProperty) {
return new AnyStaticProperty((AnyStaticProperty) o);
} else if (o instanceof CollectionStaticProperty) {
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/CheckCompletedVisitor.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/CheckCompletedVisitor.java
index 11fe5f9b54..1083396fcb 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/CheckCompletedVisitor.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/CheckCompletedVisitor.java
@@ -23,14 +23,12 @@ import
org.apache.streampipes.model.staticproperty.AnyStaticProperty;
import org.apache.streampipes.model.staticproperty.CodeInputStaticProperty;
import org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty;
import
org.apache.streampipes.model.staticproperty.DefaultStaticPropertyVisitor;
-import org.apache.streampipes.model.staticproperty.DomainStaticProperty;
import org.apache.streampipes.model.staticproperty.FileStaticProperty;
import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
import org.apache.streampipes.model.staticproperty.MappingPropertyNary;
import org.apache.streampipes.model.staticproperty.MappingPropertyUnary;
import org.apache.streampipes.model.staticproperty.MatchingStaticProperty;
import org.apache.streampipes.model.staticproperty.OneOfStaticProperty;
-import org.apache.streampipes.model.staticproperty.RemoteOneOfStaticProperty;
import
org.apache.streampipes.model.staticproperty.RuntimeResolvableGroupStaticProperty;
import
org.apache.streampipes.model.staticproperty.RuntimeResolvableTreeInputStaticProperty;
import org.apache.streampipes.model.staticproperty.SecretStaticProperty;
@@ -62,11 +60,6 @@ public class CheckCompletedVisitor extends
DefaultStaticPropertyVisitor {
}
- @Override
- public void visit(DomainStaticProperty domainStaticProperty) {
-
- }
-
@Override
public void visit(FileStaticProperty fileStaticProperty) {
@@ -139,11 +132,6 @@ public class CheckCompletedVisitor extends
DefaultStaticPropertyVisitor {
}
- @Override
- public void visit(RemoteOneOfStaticProperty remoteOneOfStaticProperty) {
-
- }
-
@Override
public void visit(SlideToggleStaticProperty slideToggleStaticProperty) {
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/UpdateStaticPropertiesVisitor.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/UpdateStaticPropertiesVisitor.java
index 83daa06aad..cdceb9afb0 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/UpdateStaticPropertiesVisitor.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/v2/pipeline/UpdateStaticPropertiesVisitor.java
@@ -26,7 +26,6 @@ import
org.apache.streampipes.model.staticproperty.AnyStaticProperty;
import org.apache.streampipes.model.staticproperty.CodeInputStaticProperty;
import org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty;
import
org.apache.streampipes.model.staticproperty.DefaultStaticPropertyVisitor;
-import org.apache.streampipes.model.staticproperty.DomainStaticProperty;
import org.apache.streampipes.model.staticproperty.FileStaticProperty;
import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
import org.apache.streampipes.model.staticproperty.MappingProperty;
@@ -34,7 +33,6 @@ import
org.apache.streampipes.model.staticproperty.MappingPropertyNary;
import org.apache.streampipes.model.staticproperty.MappingPropertyUnary;
import org.apache.streampipes.model.staticproperty.MatchingStaticProperty;
import org.apache.streampipes.model.staticproperty.OneOfStaticProperty;
-import org.apache.streampipes.model.staticproperty.RemoteOneOfStaticProperty;
import
org.apache.streampipes.model.staticproperty.RuntimeResolvableGroupStaticProperty;
import
org.apache.streampipes.model.staticproperty.RuntimeResolvableTreeInputStaticProperty;
import org.apache.streampipes.model.staticproperty.SecretStaticProperty;
@@ -67,11 +65,6 @@ public class UpdateStaticPropertiesVisitor extends
DefaultStaticPropertyVisitor
// Do nothing
}
- @Override
- public void visit(DomainStaticProperty domainStaticProperty) {
- // Do nothing
- }
-
@Override
public void visit(FileStaticProperty fileStaticProperty) {
// Do nothing
@@ -107,11 +100,6 @@ public class UpdateStaticPropertiesVisitor extends
DefaultStaticPropertyVisitor
// do nothing
}
- @Override
- public void visit(RemoteOneOfStaticProperty remoteOneOfStaticProperty) {
-
- }
-
@Override
public void visit(SlideToggleStaticProperty slideToggleStaticProperty) {
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/template/PipelineElementTemplateVisitor.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/template/PipelineElementTemplateVisitor.java
index b34df894e6..62e037c146 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/template/PipelineElementTemplateVisitor.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/template/PipelineElementTemplateVisitor.java
@@ -21,14 +21,12 @@ import
org.apache.streampipes.model.staticproperty.AnyStaticProperty;
import org.apache.streampipes.model.staticproperty.CodeInputStaticProperty;
import org.apache.streampipes.model.staticproperty.CollectionStaticProperty;
import org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty;
-import org.apache.streampipes.model.staticproperty.DomainStaticProperty;
import org.apache.streampipes.model.staticproperty.FileStaticProperty;
import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
import org.apache.streampipes.model.staticproperty.MappingPropertyNary;
import org.apache.streampipes.model.staticproperty.MappingPropertyUnary;
import org.apache.streampipes.model.staticproperty.MatchingStaticProperty;
import org.apache.streampipes.model.staticproperty.OneOfStaticProperty;
-import org.apache.streampipes.model.staticproperty.RemoteOneOfStaticProperty;
import
org.apache.streampipes.model.staticproperty.RuntimeResolvableGroupStaticProperty;
import
org.apache.streampipes.model.staticproperty.RuntimeResolvableTreeInputStaticProperty;
import org.apache.streampipes.model.staticproperty.SecretStaticProperty;
@@ -91,11 +89,6 @@ public class PipelineElementTemplateVisitor implements
StaticPropertyVisitor {
}
}
- @Override
- public void visit(DomainStaticProperty domainStaticProperty) {
- // TODO - not used anywhere anymore
- }
-
@Override
public void visit(FileStaticProperty fileStaticProperty) {
if (hasKey(fileStaticProperty)) {
@@ -189,11 +182,6 @@ public class PipelineElementTemplateVisitor implements
StaticPropertyVisitor {
}
}
- @Override
- public void visit(RemoteOneOfStaticProperty remoteOneOfStaticProperty) {
-
- }
-
@Override
public void visit(SlideToggleStaticProperty slideToggleStaticProperty) {
if (hasKey(slideToggleStaticProperty)) {
diff --git
a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/secret/SecretVisitor.java
b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/secret/SecretVisitor.java
index 0c108316e2..12f744f9d2 100644
---
a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/secret/SecretVisitor.java
+++
b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/secret/SecretVisitor.java
@@ -21,14 +21,12 @@ import
org.apache.streampipes.model.staticproperty.AnyStaticProperty;
import org.apache.streampipes.model.staticproperty.CodeInputStaticProperty;
import org.apache.streampipes.model.staticproperty.CollectionStaticProperty;
import org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty;
-import org.apache.streampipes.model.staticproperty.DomainStaticProperty;
import org.apache.streampipes.model.staticproperty.FileStaticProperty;
import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
import org.apache.streampipes.model.staticproperty.MappingPropertyNary;
import org.apache.streampipes.model.staticproperty.MappingPropertyUnary;
import org.apache.streampipes.model.staticproperty.MatchingStaticProperty;
import org.apache.streampipes.model.staticproperty.OneOfStaticProperty;
-import org.apache.streampipes.model.staticproperty.RemoteOneOfStaticProperty;
import
org.apache.streampipes.model.staticproperty.RuntimeResolvableGroupStaticProperty;
import
org.apache.streampipes.model.staticproperty.RuntimeResolvableTreeInputStaticProperty;
import org.apache.streampipes.model.staticproperty.SecretStaticProperty;
@@ -66,11 +64,6 @@ public class SecretVisitor implements StaticPropertyVisitor {
}
- @Override
- public void visit(DomainStaticProperty domainStaticProperty) {
-
- }
-
@Override
public void visit(FileStaticProperty fileStaticProperty) {
@@ -127,11 +120,6 @@ public class SecretVisitor implements
StaticPropertyVisitor {
staticPropertyGroup.getStaticProperties().forEach(sp -> sp.accept(this));
}
- @Override
- public void visit(RemoteOneOfStaticProperty remoteOneOfStaticProperty) {
-
- }
-
@Override
public void visit(SlideToggleStaticProperty slideToggleStaticProperty) {
// Do nothing
diff --git
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/AbstractConfigurablePipelineElementBuilder.java
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/AbstractConfigurablePipelineElementBuilder.java
index 251237b822..2a700eb780 100644
---
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/AbstractConfigurablePipelineElementBuilder.java
+++
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/AbstractConfigurablePipelineElementBuilder.java
@@ -22,7 +22,6 @@ import
org.apache.streampipes.model.staticproperty.AnyStaticProperty;
import org.apache.streampipes.model.staticproperty.CodeInputStaticProperty;
import org.apache.streampipes.model.staticproperty.CollectionStaticProperty;
import org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty;
-import org.apache.streampipes.model.staticproperty.DomainStaticProperty;
import org.apache.streampipes.model.staticproperty.FileStaticProperty;
import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
import org.apache.streampipes.model.staticproperty.OneOfStaticProperty;
@@ -33,7 +32,6 @@ import
org.apache.streampipes.model.staticproperty.SlideToggleStaticProperty;
import org.apache.streampipes.model.staticproperty.StaticProperty;
import org.apache.streampipes.model.staticproperty.StaticPropertyAlternative;
import org.apache.streampipes.model.staticproperty.StaticPropertyAlternatives;
-import org.apache.streampipes.model.staticproperty.SupportedProperty;
import org.apache.streampipes.sdk.StaticProperties;
import org.apache.streampipes.sdk.helpers.CodeLanguage;
import org.apache.streampipes.sdk.helpers.Filetypes;
@@ -72,43 +70,6 @@ public abstract class
AbstractConfigurablePipelineElementBuilder<K extends
return me();
}
- /**
- * Defines the requirement for an instance that is defined in the knowledge
base.
- *
- * @param label A human-readable label that describes
the required static property.
- * @param supportedOntologyProperties All RDF properties any instance in the
knowledge base must provide. Use
- * {@link
org.apache.streampipes.sdk.helpers.OntologyProperties}
- * to assign supported properties.
- *
- */
- public K requiredOntologyConcept(Label label, SupportedProperty...
- supportedOntologyProperties) {
- DomainStaticProperty dsp = prepareStaticProperty(label, new
DomainStaticProperty());
- dsp.setSupportedProperties(Arrays.asList(supportedOntologyProperties));
- this.staticProperties.add(dsp);
-
- return me();
- }
-
- /**
- * @param label A human-readable label that describes
the required static property.
- * @param requiredConceptUri Limits the search for matching
instance
- * in the knowledge base to an instance
of this concept.
- * @param supportedOntologyProperties All RDF properties any instance of
the provided concept must provide. Use
- * {@link
org.apache.streampipes.sdk.helpers.OntologyProperties}
- * to assign supported properties.
- *
- */
- public K requiredOntologyConcept(Label label, String requiredConceptUri,
SupportedProperty...
- supportedOntologyProperties) {
- DomainStaticProperty dsp = prepareStaticProperty(label, new
DomainStaticProperty());
- dsp.setSupportedProperties(Arrays.asList(supportedOntologyProperties));
- dsp.setRequiredClass(requiredConceptUri);
- this.staticProperties.add(dsp);
-
- return me();
- }
-
/**
* @param label A human-readable label that describes the required
static property.
* @param staticProperty
diff --git
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/AbstractParameterExtractor.java
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/AbstractParameterExtractor.java
index bfefe341ba..2bec1f786f 100644
---
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/AbstractParameterExtractor.java
+++
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/AbstractParameterExtractor.java
@@ -32,7 +32,6 @@ import
org.apache.streampipes.model.staticproperty.AnyStaticProperty;
import org.apache.streampipes.model.staticproperty.CodeInputStaticProperty;
import org.apache.streampipes.model.staticproperty.CollectionStaticProperty;
import org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty;
-import org.apache.streampipes.model.staticproperty.DomainStaticProperty;
import org.apache.streampipes.model.staticproperty.FileStaticProperty;
import org.apache.streampipes.model.staticproperty.FreeTextStaticProperty;
import org.apache.streampipes.model.staticproperty.MappingPropertyNary;
@@ -48,7 +47,6 @@ import
org.apache.streampipes.model.staticproperty.StaticPropertyAlternative;
import org.apache.streampipes.model.staticproperty.StaticPropertyAlternatives;
import org.apache.streampipes.model.staticproperty.StaticPropertyGroup;
import org.apache.streampipes.model.staticproperty.StaticPropertyType;
-import org.apache.streampipes.model.staticproperty.SupportedProperty;
import org.apache.streampipes.model.staticproperty.TreeInputNode;
import org.apache.streampipes.sdk.utils.Datatypes;
@@ -368,22 +366,6 @@ public abstract class AbstractParameterExtractor<T extends
InvocableStreamPipesE
return null;
}
- @Override
- public <V> V supportedOntologyPropertyValue(String domainPropertyInternalId,
String
- propertyId, Class<V> targetClass) {
- DomainStaticProperty dsp =
getStaticPropertyByName(domainPropertyInternalId,
- DomainStaticProperty.class);
-
- return typeParser.parse(dsp
- .getSupportedProperties()
- .stream()
- .filter(sp -> sp.getPropertyId().equals(propertyId))
- .findFirst()
- .map(SupportedProperty::getValue)
- .get(), targetClass);
-
- }
-
@Override
public List<EventProperty> getEventPropertiesBySelector(List<String>
selectors) throws
SpRuntimeException {
diff --git
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/Groundings.java
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/Groundings.java
deleted file mode 100644
index 5f54c207f1..0000000000
---
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/Groundings.java
+++ /dev/null
@@ -1,43 +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.helpers;
-
-import org.apache.streampipes.model.grounding.JmsTransportProtocol;
-import org.apache.streampipes.model.grounding.KafkaTransportProtocol;
-import org.apache.streampipes.model.grounding.TransportFormat;
-
-@Deprecated
-public class Groundings {
-
- public static KafkaTransportProtocol kafkaGrounding(String kafkaHost,
Integer kafkaPort, String topic) {
- return Protocols.kafka(kafkaHost, kafkaPort, topic);
- }
-
- public static JmsTransportProtocol jmsGrounding(String jmsHost, Integer
jmsPort, String topic) {
- return Protocols.jms(jmsHost, jmsPort, topic);
- }
-
- public static TransportFormat jsonFormat() {
- return Formats.jsonFormat();
- }
-
- public static TransportFormat thriftFormat() {
- return Formats.thriftFormat();
- }
-}
diff --git
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/OntologyProperties.java
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/OntologyProperties.java
deleted file mode 100644
index 9b6e8ddc24..0000000000
---
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/OntologyProperties.java
+++ /dev/null
@@ -1,36 +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.helpers;
-
-import org.apache.streampipes.model.staticproperty.SupportedProperty;
-
-public class OntologyProperties {
-
- public static SupportedProperty mandatory(String uri) {
- return from(uri, true);
- }
-
- public static SupportedProperty optional(String uri) {
- return from(uri, false);
- }
-
- public static SupportedProperty from(String uri, boolean valueRequired) {
- return new SupportedProperty(uri, valueRequired);
- }
-}
diff --git
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/Tuple3.java
b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/Tuple3.java
deleted file mode 100644
index edb58aa817..0000000000
---
a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/Tuple3.java
+++ /dev/null
@@ -1,55 +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.helpers;
-
-public class Tuple3<V, W, X> extends Tuple2<V, W> {
-
- public final X x;
-
- public Tuple3(V v, W w, X x) {
- super(v, w);
- this.x = x;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- Tuple3<?, ?, ?> tuple = (Tuple3<?, ?, ?>) o;
- if (!k.equals(tuple.k)) {
- return false;
- }
- if (!v.equals(tuple.v)) {
- return false;
- }
- return x.equals(tuple.x);
- }
-
- @Override
- public int hashCode() {
- int result = k != null ? k.hashCode() : 0;
- result = 31 * result + (v != null ? v.hashCode() : 0);
- result = 31 * result + (x != null ? x.hashCode() : 0);
- return result;
- }
-}
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 b859b31db2..b17762f145 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
@@ -20,7 +20,7 @@
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
-// Generated using typescript-generator version 3.2.1263 on 2024-06-26
16:51:04.
+// Generated using typescript-generator version 3.2.1263 on 2024-06-27
13:13:44.
export class NamedStreamPipesEntity implements Storable {
'@class':
@@ -378,7 +378,6 @@ export class 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'
@@ -437,8 +436,6 @@ export class StaticProperty {
return CollectionStaticProperty.fromData(data);
case
'org.apache.streampipes.model.staticproperty.ColorPickerStaticProperty':
return ColorPickerStaticProperty.fromData(data);
- case
'org.apache.streampipes.model.staticproperty.DomainStaticProperty':
- return DomainStaticProperty.fromData(data);
case
'org.apache.streampipes.model.staticproperty.FileStaticProperty':
return FileStaticProperty.fromData(data);
case
'org.apache.streampipes.model.staticproperty.FreeTextStaticProperty':
@@ -1342,28 +1339,6 @@ export class DeleteRuleDescription extends
SchemaTransformationRuleDescription {
}
}
-export class DomainStaticProperty extends StaticProperty {
- '@class':
'org.apache.streampipes.model.staticproperty.DomainStaticProperty';
- 'requiredClass': string;
- 'supportedProperties': SupportedProperty[];
-
- static 'fromData'(
- data: DomainStaticProperty,
- target?: DomainStaticProperty,
- ): DomainStaticProperty {
- if (!data) {
- return data;
- }
- const instance = target || new DomainStaticProperty();
- super.fromData(data, instance);
- instance.requiredClass = data.requiredClass;
- instance.supportedProperties = __getCopyArrayFn(
- SupportedProperty.fromData,
- )(data.supportedProperties);
- return instance;
- }
-}
-
export class EdgeValidationStatus {
notifications: Notification[];
validationStatusType: EdgeValidationStatusType;
@@ -3817,26 +3792,6 @@ export class SuccessMessage extends Message {
}
}
-export class SupportedProperty {
- propertyId: string;
- value: string;
- valueRequired: boolean;
-
- static fromData(
- data: SupportedProperty,
- target?: SupportedProperty,
- ): SupportedProperty {
- if (!data) {
- return data;
- }
- const instance = target || new SupportedProperty();
- instance.propertyId = data.propertyId;
- instance.value = data.value;
- instance.valueRequired = data.valueRequired;
- return instance;
- }
-}
-
export class TimestampTranfsformationRuleDescription extends
ValueTransformationRuleDescription {
'@class':
'org.apache.streampipes.model.connect.rules.value.TimestampTranfsformationRuleDescription';
'formatString': string;
@@ -4174,7 +4129,6 @@ export type StaticPropertyUnion =
| CodeInputStaticProperty
| CollectionStaticProperty
| ColorPickerStaticProperty
- | DomainStaticProperty
| FileStaticProperty
| FreeTextStaticProperty
| MappingPropertyUnary
