You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/09/05 21:50:32 UTC
[incubator-streampipes] 01/03: [hotfix] Remove warnings from
Connect rest endpoints
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
commit 2dcc9c217de6d821fae1369115436c8484f60dc3
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sat Sep 5 23:31:24 2020 +0200
[hotfix] Remove warnings from Connect rest endpoints
---
.../connect/container/master/management/WorkerRestClient.java | 2 +-
.../streampipes/connect/container/master/rest/AdapterResource.java | 4 +---
.../connect/container/master/rest/AdapterTemplateResource.java | 4 +---
.../streampipes/connect/container/master/rest/SourcesResource.java | 1 -
.../connect/container/master/rest/WorkerAdministrationResource.java | 1 -
5 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/WorkerRestClient.java b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/WorkerRestClient.java
index 8c87a67..747fdbb 100644
--- a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/WorkerRestClient.java
+++ b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/WorkerRestClient.java
@@ -263,7 +263,7 @@ public class WorkerRestClient {
private static byte[] getIconAsset(String baseUrl, String appId) throws AdapterException {
String url = baseUrl + "/" + appId + "/assets/icon";
- logger.info("Trying to Icon from endpoint: " + url);
+ logger.info("Trying to get icon from endpoint: " + url);
try {
byte[] responseString = Request.Get(url)
diff --git a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/AdapterResource.java b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/AdapterResource.java
index bbf18e4..a0b03ef 100644
--- a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/AdapterResource.java
+++ b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/AdapterResource.java
@@ -48,7 +48,6 @@ public class AdapterResource extends AbstractContainerResource {
}
@POST
- @Path("/")
@JacksonSerialized
@Produces(MediaType.APPLICATION_JSON)
public Response addAdapter(AdapterDescription adapterDescription, @PathParam("username") String userName) {
@@ -112,9 +111,8 @@ public class AdapterResource extends AbstractContainerResource {
@GET
@JacksonSerialized
- @Path("/")
@Produces(MediaType.APPLICATION_JSON)
- public Response getAllAdapters(String id, @PathParam("username") String userName) {
+ public Response getAllAdapters(@PathParam("username") String userName) {
try {
List<AdapterDescription> allAdapterDescription = adapterMasterManagement.getAllAdapters(new AdapterStorageImpl());
AdapterDescriptionList result = new AdapterDescriptionList();
diff --git a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/AdapterTemplateResource.java b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/AdapterTemplateResource.java
index 57fb640..0e1b510 100644
--- a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/AdapterTemplateResource.java
+++ b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/AdapterTemplateResource.java
@@ -46,7 +46,6 @@ public class AdapterTemplateResource extends AbstractContainerResource {
}
@POST
- @Path("/")
@JacksonSerialized
@Produces(MediaType.APPLICATION_JSON)
public Response addAdapterTemplate(AdapterDescription adapterDescription, @PathParam("username") String userName) {
@@ -65,7 +64,7 @@ public class AdapterTemplateResource extends AbstractContainerResource {
@JacksonSerialized
@Path("/all")
@Produces(MediaType.APPLICATION_JSON)
- public Response getAllAdapterTemplates(String id, @PathParam("username") String userName) {
+ public Response getAllAdapterTemplates(@PathParam("username") String userName) {
try {
AdapterDescriptionList result = adapterTemplateMasterManagement.getAllAdapterTemplates();
@@ -77,7 +76,6 @@ public class AdapterTemplateResource extends AbstractContainerResource {
}
-
@DELETE
@JacksonSerialized
@Path("/{id}")
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 20bce3c..f78d76e 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
@@ -65,7 +65,6 @@ public class SourcesResource extends AbstractContainerResource {
@GET
@Produces(MediaType.APPLICATION_JSON)
@GsonWithIds
- @Path("/")
public Response getAllAdaptersInstallDescription(@PathParam("username") String username) {
try {
diff --git a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/WorkerAdministrationResource.java b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/WorkerAdministrationResource.java
index 8655e0e..a747504 100644
--- a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/WorkerAdministrationResource.java
+++ b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/WorkerAdministrationResource.java
@@ -45,7 +45,6 @@ public class WorkerAdministrationResource extends AbstractContainerResource {
@POST
@JacksonSerialized
- @Path("/")
@Produces(MediaType.APPLICATION_JSON)
public Response addWorkerContainer(ConnectWorkerContainer connectWorkerContainer) {
LOG.info("Worker container: " + connectWorkerContainer.getEndpointUrl() + " was detected");