[incubator-streampipes] branch dev updated: [STREAMPIPES-302] Modify adapter resource paths for data set invocation

[riemer]

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/incubator-streampipes.git


The following commit(s) were added to refs/heads/dev by this push:
     new 559cae4  [STREAMPIPES-302] Modify adapter resource paths for data set 
invocation
559cae4 is described below

commit 559cae459b7a7c483a01d8e6f166eeb5c9ebd12b
Author: Dominik Riemer <rie...@fzi.de>
AuthorDate: Tue Feb 23 21:15:09 2021 +0100

    [STREAMPIPES-302] Modify adapter resource paths for data set invocation
---
 streampipes-backend/src/main/resources/shiro.ini                      | 4 +---
 .../streampipes/connect/container/master/rest/SourcesResource.java    | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/streampipes-backend/src/main/resources/shiro.ini 
b/streampipes-backend/src/main/resources/shiro.ini
index 92b9c79..3d348a1 100644
--- a/streampipes-backend/src/main/resources/shiro.ini
+++ b/streampipes-backend/src/main/resources/shiro.ini
@@ -68,9 +68,7 @@ securityManager.rememberMeManager.cookie.maxAge = 1000000000
 /api/v2/users/*/labeling/* = anon
 /api/v2/users/*/labeling = anon
 /api/v2/connect/*/master/administration = anon
-/api/v2/connect/*/master/sources/* = anon
-/api/v2/connect/*/master/sources/*/streams = anon
-/api/v2/connect/*/master/sources/*/streams/* = anon
+/api/v2/connect/*/master/sources/** = anon
 /api/v2/connect/*/master/resolvable/*/configurations = anon
 /api/openapi.json = anon
 /api/** = authcBearer, customFilter
diff --git 
a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/SourcesResource.java
 
b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/SourcesResource.java
index 672d7c2..bd3d02a 100644
--- 
a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/SourcesResource.java
+++ 
b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/SourcesResource.java
@@ -75,7 +75,7 @@ public class SourcesResource extends 
AbstractContainerResource {
 
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
-    @Path("/{streamId}/streams")
+    @Path("/{streamId}")
     @Produces(MediaType.APPLICATION_JSON)
     public Response addAdapter(@PathParam("streamId") String elementId,
                                @PathParam("username") String username,
@@ -94,7 +94,7 @@ public class SourcesResource extends 
AbstractContainerResource {
     }
 
     @DELETE
-    @Path("/{streamId}/streams/{runningInstanceId}")
+    @Path("/{streamId}/{runningInstanceId}")
     @Produces(MediaType.APPLICATION_JSON)
     public Response detach(@PathParam("streamId") String elementId, 
@PathParam("runningInstanceId") String runningInstanceId, 
@PathParam("username") String username) {
         String responseMessage = "Instance of set id: " + elementId  + " with 
instance id: "+ runningInstanceId + " successfully started";