From 13f6fc27c04ee35696eaaac8d28e1a64ca6e16e8 Mon Sep 17 00:00:00 2001 From: Philipp Zehnder Date: Mon, 3 Feb 2025 20:51:35 +0100 Subject: [PATCH] refactor(#3139): Remove deprecated IParameterExtractor.selectedTreeNodesInternalNames --- .../api/extractor/IParameterExtractor.java | 8 --- .../extractor/AbstractParameterExtractor.java | 55 ------------------- 2 files changed, 63 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 2fd8e40f76..e315dba534 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 @@ -65,14 +65,6 @@ public interface IParameterExtractor { List selectedTreeNodesInternalNames(String internalName, Class targetClass); - /** - * @deprecated use {@link #selectedTreeNodesInternalNames(String, Class)} instead - */ - @Deprecated(since = "0.97.0", forRemoval = true) - List selectedTreeNodesInternalNames(String internalName, - Class targetClass, - boolean onlyDataNodes); - W getStaticPropertyByName(String internalName, Class spType); 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 844f26af2c..599a13c39d 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 @@ -47,7 +47,6 @@ 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.TreeInputNode; import org.apache.streampipes.sdk.utils.Datatypes; import com.github.drapostolos.typeparser.TypeParser; @@ -279,60 +278,6 @@ public List selectedTreeNodesInternalNames( .toList(); } - @Override - @Deprecated(since = "0.97.0", forRemoval = true) - /** - * This method returns a list of all nodes. - * Therefore, it requires both the property selectedNodesInternalNames and the nodes property to be set. - * The nodes are used to check for the data type. The problem with this implementation is, is that the client (e.g. - * UI) must get the nodes from the OPC UA server. - * - * @deprecated use {@link #selectedTreeNodesInternalNames(String, Class)} instead - */ - public List selectedTreeNodesInternalNames( - String internalName, - Class targetClass, - boolean onlyDataNodes - ) { - List allNodes = new ArrayList<>(); - RuntimeResolvableTreeInputStaticProperty sp = - getStaticPropertyByName(internalName, RuntimeResolvableTreeInputStaticProperty.class); - if (!sp.getNodes() - .isEmpty()) { - sp.getNodes() - .forEach(node -> buildFlatTree(node, allNodes)); - } - - if (!allNodes.isEmpty()) { - return sp.getSelectedNodesInternalNames() - .stream() - .filter(node -> { - if (!onlyDataNodes) { - return true; - } else { - var existingNode = allNodes.stream() - .filter(n -> n.getInternalNodeName() - .equals(node)) - .findFirst(); - return existingNode.map(TreeInputNode::isDataNode) - .orElse(false); - } - }) - .map(node -> typeParser.parse(node, targetClass)) - .collect(Collectors.toList()); - } else { - return new ArrayList<>(); - } - } - - private void buildFlatTree(TreeInputNode parent, List collector) { - collector.add(parent); - if (parent.hasChildren()) { - parent.getChildren() - .forEach(child -> buildFlatTree(child, collector)); - } - } - @Override public W getStaticPropertyByName( String internalName, Class