This is an automated email from the ASF dual-hosted git repository. bossenti pushed a commit to branch refactor-named-streampipes-entity in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit a1378dc5562a48dbb496b733c3e7f35acec77157 Author: bossenti <[email protected]> AuthorDate: Sun Nov 19 13:16:17 2023 +0100 refactor: remove deprecated elements from `NamedStreamPipesEntity` --- .../streampipes/model/base/NamedStreamPipesEntity.java | 10 ---------- .../rest/extensions/connect/AdapterWorkerResource.java | 6 ++++-- .../org/apache/streampipes/sdk/stream/StreamBuilder.java | 16 ++++++++-------- .../apache/streampipes/storage/couchdb/utils/Filter.java | 2 +- 4 files changed, 13 insertions(+), 21 deletions(-) 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 1e7e1a8bb..30981732f 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 @@ -128,16 +128,6 @@ public abstract class NamedStreamPipesEntity implements Serializable { this.iconUrl = iconUrl; } - @Deprecated - public String getUri() { - return elementId; - } - - @Deprecated - public void setUri(String uri) { - this.elementId = uri; - } - public String getDom() { return dom; } diff --git a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/AdapterWorkerResource.java b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/AdapterWorkerResource.java index 2877fc456..56475c355 100644 --- a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/AdapterWorkerResource.java +++ b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/AdapterWorkerResource.java @@ -76,11 +76,13 @@ public class AdapterWorkerResource extends AbstractSharedRestInterface { try { adapterManagement.invokeAdapter(adapterStreamDescription); - String responseMessage = "Stream adapter with id " + adapterStreamDescription.getUri() + " successfully started"; + String responseMessage = "Stream adapter with id " + + adapterStreamDescription.getElementId() + + " successfully started"; logger.info(responseMessage); return ok(Notifications.success(responseMessage)); } catch (AdapterException e) { - logger.error("Error while starting adapter with id " + adapterStreamDescription.getUri(), e); + logger.error("Error while starting adapter with id " + adapterStreamDescription.getElementId(), e); return serverError(SpLogMessage.from(e)); } } diff --git a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/stream/StreamBuilder.java b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/stream/StreamBuilder.java index 9462a0daa..f213f02a2 100644 --- a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/stream/StreamBuilder.java +++ b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/stream/StreamBuilder.java @@ -32,25 +32,25 @@ public class StreamBuilder { private SpDataStream stream; private EventSchema schema; - private StreamBuilder(String name, String description, String uri) { + private StreamBuilder(String name, String description, String elementId) { stream = new SpDataStream(); stream.setName(name); stream.setDescription(description); - stream.setUri(uri); + stream.setElementId(elementId); } - private StreamBuilder(String uri) { + private StreamBuilder(String elementId) { stream = new SpDataStream(); - stream.setUri(uri); + stream.setElementId(elementId); schema = new EventSchema(); } - public static StreamBuilder createStream(String name, String description, String uri) { - return new StreamBuilder(name, description, uri); + public static StreamBuilder createStream(String name, String description, String elementId) { + return new StreamBuilder(name, description, elementId); } - public static StreamBuilder createStreamRestriction(String uri) { - return new StreamBuilder(uri); + public static StreamBuilder createStreamRestriction(String elementId) { + return new StreamBuilder(elementId); } public StreamBuilder property(String propertyName, URI propertyType, URI subclassOf) { diff --git a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/utils/Filter.java b/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/utils/Filter.java index 64356a145..57ff1595c 100644 --- a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/utils/Filter.java +++ b/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/utils/Filter.java @@ -29,7 +29,7 @@ public class Filter { return allElements .stream() .filter(e -> userElements.stream() - .anyMatch(u -> u.equals(e.getUri()))).collect(Collectors.toList()); + .anyMatch(u -> u.equals(e.getElementId()))).collect(Collectors.toList()); } }
