This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-426
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/STREAMPIPES-426 by this push:
new f36e902 [STREAMPIPES-426] Rename pipeline element resources
f36e902 is described below
commit f36e902517536bd1c863c0cc19e357e8824c3783
Author: Dominik Riemer <[email protected]>
AuthorDate: Mon Oct 25 14:01:04 2021 +0200
[STREAMPIPES-426] Rename pipeline element resources
---
.../apache/streampipes/backend/StreamPipesResourceConfig.java | 6 +++---
...anticEventProcessingAgent.java => DataProcessorResource.java} | 9 ++++-----
.../impl/{SemanticEventConsumer.java => DataSinkResource.java} | 2 +-
.../impl/{SemanticEventProducer.java => DataStreamResource.java} | 2 +-
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git
a/streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java
b/streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java
index de5ab6f..117aef4 100644
---
a/streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java
+++
b/streampipes-backend/src/main/java/org/apache/streampipes/backend/StreamPipesResourceConfig.java
@@ -90,9 +90,9 @@ public class StreamPipesResourceConfig extends ResourceConfig
{
register(PipelineMonitoring.class);
register(PipelineTemplate.class);
register(PipelineResource.class);
- register(SemanticEventConsumer.class);
- register(SemanticEventProcessingAgent.class);
- register(SemanticEventProducer.class);
+ register(DataSinkResource.class);
+ register(DataProcessorResource.class);
+ register(DataStreamResource.class);
register(Setup.class);
register(ResetResource.class);
register(UserProfile.class);
diff --git
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/SemanticEventProcessingAgent.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/DataProcessorResource.java
similarity index 93%
rename from
streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/SemanticEventProcessingAgent.java
rename to
streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/DataProcessorResource.java
index 8248ee9..caad594 100644
---
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/SemanticEventProcessingAgent.java
+++
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/DataProcessorResource.java
@@ -23,7 +23,6 @@ import
org.apache.streampipes.model.graph.DataProcessorInvocation;
import org.apache.streampipes.model.message.NotificationType;
import org.apache.streampipes.rest.api.IPipelineElement;
import
org.apache.streampipes.rest.core.base.impl.AbstractAuthGuardedRestResource;
-import org.apache.streampipes.rest.shared.annotation.GsonWithIds;
import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
import org.apache.streampipes.rest.shared.util.SpMediaType;
import org.apache.streampipes.storage.couchdb.utils.Filter;
@@ -35,12 +34,12 @@ import java.util.List;
import java.util.stream.Collectors;
@Path("/v2/sepas")
-public class SemanticEventProcessingAgent extends
AbstractAuthGuardedRestResource implements IPipelineElement {
+public class DataProcessorResource extends AbstractAuthGuardedRestResource
implements IPipelineElement {
@GET
@Path("/available")
@Produces(MediaType.APPLICATION_JSON)
- @GsonWithIds
+ @JacksonSerialized
@Override
public Response getAvailable() {
List<DataProcessorDescription> sepas =
Filter.byUri(getPipelineElementRdfStorage().getAllDataProcessors(),
@@ -67,7 +66,7 @@ public class SemanticEventProcessingAgent extends
AbstractAuthGuardedRestResourc
@DELETE
@Path("/own/{elementId}")
@Produces(MediaType.APPLICATION_JSON)
- @GsonWithIds
+ @JacksonSerialized
@Override
public Response removeOwn(@PathParam("elementId") String elementId) {
getUserService().deleteOwnSepa(getAuthenticatedUsername(),
elementId);
@@ -78,7 +77,7 @@ public class SemanticEventProcessingAgent extends
AbstractAuthGuardedRestResourc
@Path("/{elementUri}")
@GET
@Produces(MediaType.APPLICATION_JSON)
- @GsonWithIds
+ @JacksonSerialized
@Override
public Response getElement(@PathParam("elementUri") String elementUri) {
// TODO Access rights
diff --git
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/SemanticEventConsumer.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/DataSinkResource.java
similarity index 96%
rename from
streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/SemanticEventConsumer.java
rename to
streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/DataSinkResource.java
index 60b15a7..c74e774 100644
---
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/SemanticEventConsumer.java
+++
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/DataSinkResource.java
@@ -36,7 +36,7 @@ import java.util.List;
import java.util.stream.Collectors;
@Path("/v2/actions")
-public class SemanticEventConsumer extends AbstractAuthGuardedRestResource
implements IPipelineElement {
+public class DataSinkResource extends AbstractAuthGuardedRestResource
implements IPipelineElement {
@GET
@Path("/available")
diff --git
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/SemanticEventProducer.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/DataStreamResource.java
similarity index 96%
rename from
streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/SemanticEventProducer.java
rename to
streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/DataStreamResource.java
index 4a4d3c2..200f3c6 100644
---
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/SemanticEventProducer.java
+++
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/DataStreamResource.java
@@ -37,7 +37,7 @@ import java.util.stream.Collectors;
@Component
@Path("/v2/streams")
-public class SemanticEventProducer extends AbstractAuthGuardedRestResource
implements IPipelineElement {
+public class DataStreamResource extends AbstractAuthGuardedRestResource
implements IPipelineElement {
@GET
@Path("/available")
