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/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 0497444a2 refactor(#2092): Use HttpStatus in stead of plain strings
(#2099)
0497444a2 is described below
commit 0497444a2b9a84ca44ec737dc6dc1374ee9f1926
Author: bagechengzi <[email protected]>
AuthorDate: Tue Oct 31 04:16:06 2023 +0800
refactor(#2092): Use HttpStatus in stead of plain strings (#2099)
* remove occurrences of hard-coded HTTP results and replace them with the
corresponding values of code.HttpStatus
* resolve checkstyle violation
* resolve checkstyle violation2
* After testing,resolve checkstyle violation
* modify
* modify
---
.../apache/streampipes/client/api/AbstractClientApi.java | 5 ++++-
.../streampipes/client/api/AbstractTypedClientApi.java | 4 +++-
.../org/apache/streampipes/client/http/HttpRequest.java | 5 +++--
.../connect/management/management/WorkerRestClient.java | 6 ++++--
.../connect/adapters/netio/NetioRestAdapter.java | 5 ++++-
.../streampipes/connect/adapters/PullAdapterTest.java | 4 ++--
.../adapters/generic/protocol/stream/HttpProtocolTest.java | 4 ++--
streampipes-integration-tests/pom.xml | 4 ++++
.../integration/containers/PulsarContainer.java | 3 ++-
.../streampipes/manager/health/ServiceHealthCheck.java | 4 +++-
.../rest/extensions/AbstractExtensionsResource.java | 6 ++++--
.../rest/extensions/AbstractPipelineElementResource.java | 5 +++--
.../rest/extensions/connect/HttpServerAdapterResource.java | 4 +++-
.../rest/extensions/connect/RuntimeResolvableResource.java | 4 +++-
.../extensions/pe/DataStreamPipelineElementResource.java | 4 +++-
.../extensions/pe/InvocablePipelineElementResource.java | 5 +++--
streampipes-rest-shared/pom.xml | 9 +++++++++
.../rest/shared/impl/AbstractSharedRestInterface.java | 14 ++++++++------
.../org/apache/streampipes/rest/impl/UserResource.java | 3 ++-
.../service/base/rest/ServiceHealthResource.java | 5 ++++-
.../storage/couchdb/utils/CouchDbViewGenerator.java | 7 ++++---
21 files changed, 77 insertions(+), 33 deletions(-)
diff --git
a/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractClientApi.java
b/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractClientApi.java
index c4df217fe..fdf3c1a86 100644
---
a/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractClientApi.java
+++
b/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractClientApi.java
@@ -17,6 +17,7 @@
*/
package org.apache.streampipes.client.api;
+
import org.apache.streampipes.client.http.DeleteRequest;
import org.apache.streampipes.client.http.GetRequest;
import org.apache.streampipes.client.http.PostRequestWithPayloadResponse;
@@ -30,6 +31,8 @@ import org.apache.streampipes.client.util.StreamPipesApiPath;
import org.apache.streampipes.commons.exceptions.SpHttpErrorStatusCode;
import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.http.HttpStatus;
+
import java.util.Optional;
public class AbstractClientApi {
@@ -89,7 +92,7 @@ public class AbstractClientApi {
ObjectSerializer<Void, T> serializer = new ObjectSerializer<>();
return Optional.of(new GetRequest<>(clientConfig, apiPath, targetClass,
serializer).executeRequest());
} catch (SpHttpErrorStatusCode e) {
- if (e.getHttpStatusCode() == 404) {
+ if (e.getHttpStatusCode() == HttpStatus.SC_NOT_FOUND) {
return Optional.empty();
} else {
throw e;
diff --git
a/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractTypedClientApi.java
b/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractTypedClientApi.java
index ff3964bd8..a905893ca 100644
---
a/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractTypedClientApi.java
+++
b/streampipes-client/src/main/java/org/apache/streampipes/client/api/AbstractTypedClientApi.java
@@ -25,6 +25,8 @@ import org.apache.streampipes.client.util.StreamPipesApiPath;
import org.apache.streampipes.commons.exceptions.SpHttpErrorStatusCode;
import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.http.HttpStatus;
+
import java.util.List;
import java.util.Optional;
@@ -47,7 +49,7 @@ public abstract class AbstractTypedClientApi<T> extends
AbstractClientApi {
try {
return Optional.of(new GetRequest<>(clientConfig, apiPath, targetClass,
serializer).executeRequest());
} catch (SpHttpErrorStatusCode e) {
- if (e.getHttpStatusCode() == 404) {
+ if (e.getHttpStatusCode() == HttpStatus.SC_NOT_FOUND) {
return Optional.empty();
} else {
throw e;
diff --git
a/streampipes-client/src/main/java/org/apache/streampipes/client/http/HttpRequest.java
b/streampipes-client/src/main/java/org/apache/streampipes/client/http/HttpRequest.java
index c11275c28..52399ef96 100644
---
a/streampipes-client/src/main/java/org/apache/streampipes/client/http/HttpRequest.java
+++
b/streampipes-client/src/main/java/org/apache/streampipes/client/http/HttpRequest.java
@@ -104,9 +104,10 @@ public abstract class HttpRequest<K, V, T> {
switch (status.getStatusCode()) {
case HttpStatus.SC_UNAUTHORIZED -> throw new SpHttpErrorStatusCode(
" 401 - Access to this resource is forbidden - did you provide a
poper API key or client secret?",
- 401);
+ HttpStatus.SC_UNAUTHORIZED);
case HttpStatus.SC_NOT_FOUND ->
- throw new SpHttpErrorStatusCode(" 404 - The requested resource
could not be found.", 404);
+ throw new SpHttpErrorStatusCode(" 404 - The requested resource
could not be found.",
+ HttpStatus.SC_NOT_FOUND);
default -> throw new SpHttpErrorStatusCode(status.getStatusCode() +
" - " + status.getReasonPhrase(),
status.getStatusCode());
}
diff --git
a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/WorkerRestClient.java
b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/WorkerRestClient.java
index c45506d0f..a551201e2 100644
---
a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/WorkerRestClient.java
+++
b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/WorkerRestClient.java
@@ -18,6 +18,7 @@
package org.apache.streampipes.connect.management.management;
+
import org.apache.streampipes.commons.exceptions.SpConfigurationException;
import org.apache.streampipes.commons.exceptions.connect.AdapterException;
import org.apache.streampipes.connect.management.util.WorkerPaths;
@@ -35,6 +36,7 @@ import
org.apache.streampipes.storage.management.StorageDispatcher;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
import org.apache.http.client.fluent.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -106,7 +108,7 @@ public class WorkerRestClient {
var response = triggerPost(url,
ad.getCorrespondingDataStreamElementId(), adapterDescription);
var responseString = getResponseBody(response);
- if (response.getStatusLine().getStatusCode() != 200) {
+ if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
var exception = getSerializer().readValue(responseString,
AdapterException.class);
throw new AdapterException(exception.getMessage(),
exception.getCause());
}
@@ -144,7 +146,7 @@ public class WorkerRestClient {
String responseString =
IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
- if (response.getStatusLine().getStatusCode() == 200) {
+ if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
return getSerializer().readValue(responseString,
RuntimeOptionsResponse.class);
} else {
var exception = getSerializer().readValue(responseString,
SpConfigurationException.class);
diff --git
a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioRestAdapter.java
b/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioRestAdapter.java
index 02b7ee85c..998115bc5 100644
---
a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioRestAdapter.java
+++
b/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/netio/NetioRestAdapter.java
@@ -18,6 +18,7 @@
package org.apache.streampipes.connect.adapters.netio;
+
import org.apache.streampipes.commons.exceptions.connect.AdapterException;
import
org.apache.streampipes.connect.adapters.netio.model.NetioAllPowerOutputs;
import org.apache.streampipes.connect.adapters.netio.model.NetioPowerOutput;
@@ -41,6 +42,7 @@ import org.apache.streampipes.sdk.utils.Assets;
import com.google.gson.Gson;
import org.apache.http.HttpHost;
+import org.apache.http.HttpStatus;
import org.apache.http.client.HttpResponseException;
import org.apache.http.client.fluent.Executor;
import org.apache.http.client.fluent.Request;
@@ -159,7 +161,8 @@ public class NetioRestAdapter implements
StreamPipesAdapter, IPullAdapter {
requestData();
return NetioUtils.getNetioSchema();
} catch (IOException e) {
- if (e instanceof HttpResponseException && ((HttpResponseException)
e).getStatusCode() == 401) {
+ if (e instanceof HttpResponseException && ((HttpResponseException)
e).getStatusCode()
+ == HttpStatus.SC_UNAUTHORIZED) {
throw new AdapterException(
"Unauthorized! Could not connect to NETIO sensor: " + this.ip + "
with username " + this.username);
} else {
diff --git
a/streampipes-extensions/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/PullAdapterTest.java
b/streampipes-extensions/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/PullAdapterTest.java
index a0fd6860e..dba72aa85 100644
---
a/streampipes-extensions/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/PullAdapterTest.java
+++
b/streampipes-extensions/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/PullAdapterTest.java
@@ -31,7 +31,7 @@ package org.apache.streampipes.connect.adapters;
//
// stubFor(get(urlEqualTo("/"))
// .willReturn(aResponse()
-// .withStatus(200)
+// .withStatus(HttpStatus.SC_OK)
// .withBody(expected)));
//
// String result =
PullRestAdapter.getDataFromEndpointString("http://localhost:"; + port + "/");
@@ -44,7 +44,7 @@ package org.apache.streampipes.connect.adapters;
// public void getDataFromEndpointStringFail() throws AdapterException {
// stubFor(get(urlEqualTo("/"))
// .willReturn(aResponse()
-// .withStatus(404)
+// .withStatus(HttpStatus.SC_NOT_FOUND)
// .withBody("")));
//
// PullRestAdapter.getDataFromEndpointString("http://localhost:"; + port
+ "/");
diff --git
a/streampipes-extensions/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/protocol/stream/HttpProtocolTest.java
b/streampipes-extensions/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/protocol/stream/HttpProtocolTest.java
index aca6ca288..8ec18728e 100644
---
a/streampipes-extensions/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/protocol/stream/HttpProtocolTest.java
+++
b/streampipes-extensions/streampipes-connect-adapters/src/test/java/org/apache/streampipes/connect/adapters/generic/protocol/stream/HttpProtocolTest.java
@@ -30,7 +30,7 @@ package
org.apache.streampipes.connect.adapters.generic.protocol.stream;
//
// stubFor(get(urlEqualTo("/"))
// .willReturn(aResponse()
-// .withStatus(200)
+// .withStatus(HttpStatus.SC_OK)
// .withBody(expected)));
//
//
@@ -77,7 +77,7 @@ package
org.apache.streampipes.connect.adapters.generic.protocol.stream;
//
// stubFor(get(urlEqualTo("/"))
// .willReturn(aResponse()
-// .withStatus(200)
+// .withStatus(HttpStatus.SC_OK)
// .withBody("Example response")));
//
//
diff --git a/streampipes-integration-tests/pom.xml
b/streampipes-integration-tests/pom.xml
index 4cb2c9876..024207d21 100644
--- a/streampipes-integration-tests/pom.xml
+++ b/streampipes-integration-tests/pom.xml
@@ -111,6 +111,10 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/containers/PulsarContainer.java
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/containers/PulsarContainer.java
index a21089d10..cb47a856e 100644
---
a/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/containers/PulsarContainer.java
+++
b/streampipes-integration-tests/src/test/java/org/apache/streampipes/integration/containers/PulsarContainer.java
@@ -17,6 +17,7 @@
*/
package org.apache.streampipes.integration.containers;
+import org.apache.http.HttpStatus;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
@@ -35,7 +36,7 @@ public class PulsarContainer extends
GenericContainer<PulsarContainer> {
public void start() {
this.waitStrategy = new HttpWaitStrategy()
.forPort(BROKER_HTTP_PORT)
- .forStatusCode(200)
+ .forStatusCode(HttpStatus.SC_OK)
.forPath("/admin/v2/namespaces/public/default")
.withStartupTimeout(Duration.of(300, SECONDS));
this.withExposedPorts(BROKER_SERVICE_PORT, BROKER_HTTP_PORT);
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/health/ServiceHealthCheck.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/health/ServiceHealthCheck.java
index fda4741a3..71842d592 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/health/ServiceHealthCheck.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/health/ServiceHealthCheck.java
@@ -18,11 +18,13 @@
package org.apache.streampipes.manager.health;
+
import org.apache.streampipes.manager.execution.ExtensionServiceExecutions;
import
org.apache.streampipes.model.extensions.svcdiscovery.SpServiceRegistration;
import org.apache.streampipes.storage.api.CRUDStorage;
import org.apache.streampipes.storage.management.StorageDispatcher;
+import org.apache.http.HttpStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,7 +55,7 @@ public class ServiceHealthCheck implements Runnable {
try {
var request =
ExtensionServiceExecutions.extServiceGetRequest(healthCheckUrl);
var response = request.execute();
- if (response.returnResponse().getStatusLine().getStatusCode() != 200) {
+ if (response.returnResponse().getStatusLine().getStatusCode() !=
HttpStatus.SC_OK) {
processUnhealthyService(service);
} else {
if (!service.isHealthy()) {
diff --git
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/AbstractExtensionsResource.java
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/AbstractExtensionsResource.java
index 375b75dba..9854c2042 100644
---
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/AbstractExtensionsResource.java
+++
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/AbstractExtensionsResource.java
@@ -18,6 +18,8 @@
package org.apache.streampipes.rest.extensions;
+import org.apache.http.HttpStatus;
+
import jakarta.ws.rs.core.Response;
public class AbstractExtensionsResource {
@@ -31,13 +33,13 @@ public class AbstractExtensionsResource {
protected Response clientError() {
return Response
- .status(400)
+ .status(HttpStatus.SC_BAD_REQUEST)
.build();
}
protected Response serverError() {
return Response
- .status(500)
+ .status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
.build();
}
diff --git
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/AbstractPipelineElementResource.java
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/AbstractPipelineElementResource.java
index eb0eeb47d..4ff9621ab 100644
---
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/AbstractPipelineElementResource.java
+++
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/AbstractPipelineElementResource.java
@@ -33,6 +33,7 @@ import org.apache.streampipes.rest.shared.util.SpMediaType;
import com.google.common.base.Charsets;
import com.google.common.io.Resources;
+import org.apache.http.HttpStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -88,7 +89,7 @@ public abstract class AbstractPipelineElementResource<
return ok(Resources.toByteArray(iconUrl));
} catch (IllegalArgumentException e) {
LOG.warn("No icon resource found for pipeline element {}", appId);
- return Response.status(400).build();
+ return Response.status(HttpStatus.SC_BAD_REQUEST).build();
}
}
@@ -101,7 +102,7 @@ public abstract class AbstractPipelineElementResource<
return ok(Resources.toString(documentationUrl, Charsets.UTF_8));
} catch (IllegalArgumentException e) {
LOG.warn("No documentation resource found for pipeline element {}",
elementId);
- return Response.status(400).build();
+ return Response.status(HttpStatus.SC_BAD_REQUEST).build();
}
}
diff --git
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/HttpServerAdapterResource.java
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/HttpServerAdapterResource.java
index 382295aa0..70fea2aa4 100644
---
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/HttpServerAdapterResource.java
+++
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/HttpServerAdapterResource.java
@@ -19,6 +19,8 @@ package org.apache.streampipes.rest.extensions.connect;
import
org.apache.streampipes.extensions.management.connect.HttpServerAdapterManagement;
+import org.apache.http.HttpStatus;
+
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
@@ -36,7 +38,7 @@ public class HttpServerAdapterResource {
HttpServerAdapterManagement.INSTANCE.notify(endpointId, body);
return Response.ok().build();
} catch (Exception e) {
- return Response.status(400).entity(e.getMessage()).build();
+ return
Response.status(HttpStatus.SC_BAD_REQUEST).entity(e.getMessage()).build();
}
}
diff --git
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/RuntimeResolvableResource.java
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/RuntimeResolvableResource.java
index 8f465f444..a49616c66 100644
---
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/RuntimeResolvableResource.java
+++
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/connect/RuntimeResolvableResource.java
@@ -29,6 +29,8 @@ import
org.apache.streampipes.model.runtime.RuntimeOptionsResponse;
import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
import org.apache.streampipes.rest.shared.impl.AbstractSharedRestInterface;
+import org.apache.http.HttpStatus;
+
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
@@ -65,7 +67,7 @@ public class RuntimeResolvableResource extends
AbstractSharedRestInterface {
}
} catch (SpConfigurationException e) {
return jakarta.ws.rs.core.Response
- .status(400)
+ .status(HttpStatus.SC_BAD_REQUEST)
.entity(e)
.build();
}
diff --git
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataStreamPipelineElementResource.java
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataStreamPipelineElementResource.java
index 5993ee715..01a62f1a9 100644
---
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataStreamPipelineElementResource.java
+++
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataStreamPipelineElementResource.java
@@ -24,6 +24,8 @@ import
org.apache.streampipes.extensions.management.init.DeclarersSingleton;
import org.apache.streampipes.rest.extensions.AbstractPipelineElementResource;
import org.apache.streampipes.svcdiscovery.api.model.SpServicePathPrefix;
+import org.apache.http.HttpStatus;
+
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
@@ -50,7 +52,7 @@ public class DataStreamPipelineElementResource extends
AbstractPipelineElementRe
.getIncludedAssets()).makeZip());
} catch (IOException e) {
e.printStackTrace();
- return jakarta.ws.rs.core.Response.status(500).build();
+ return
jakarta.ws.rs.core.Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).build();
}
}
diff --git
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/InvocablePipelineElementResource.java
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/InvocablePipelineElementResource.java
index 48005633f..61e866db9 100644
---
a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/InvocablePipelineElementResource.java
+++
b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/InvocablePipelineElementResource.java
@@ -38,6 +38,7 @@ import
org.apache.streampipes.rest.extensions.AbstractPipelineElementResource;
import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
import org.apache.streampipes.sdk.extractor.AbstractParameterExtractor;
+import org.apache.http.HttpStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -130,11 +131,11 @@ public abstract class InvocablePipelineElementResource<
new
RuntimeResolvableRequestHandler().handleRuntimeResponse((SupportsRuntimeConfig)
declarer, req);
return ok(responseOptions);
} else {
- return jakarta.ws.rs.core.Response.status(500).build();
+ return
jakarta.ws.rs.core.Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).build();
}
} catch (SpConfigurationException e) {
return jakarta.ws.rs.core.Response
- .status(400)
+ .status(HttpStatus.SC_BAD_REQUEST)
.entity(e)
.build();
}
diff --git a/streampipes-rest-shared/pom.xml b/streampipes-rest-shared/pom.xml
index 98a36fd34..b29cbed3f 100644
--- a/streampipes-rest-shared/pom.xml
+++ b/streampipes-rest-shared/pom.xml
@@ -63,6 +63,10 @@
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
<!-- Test dependencies -->
<dependency>
@@ -95,6 +99,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <propertyExpansion>
+
checkstyle.config.base.path=${project.parent.basedir}/tools/maven
+ </propertyExpansion>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git
a/streampipes-rest-shared/src/main/java/org/apache/streampipes/rest/shared/impl/AbstractSharedRestInterface.java
b/streampipes-rest-shared/src/main/java/org/apache/streampipes/rest/shared/impl/AbstractSharedRestInterface.java
index 2f7211807..17410a154 100644
---
a/streampipes-rest-shared/src/main/java/org/apache/streampipes/rest/shared/impl/AbstractSharedRestInterface.java
+++
b/streampipes-rest-shared/src/main/java/org/apache/streampipes/rest/shared/impl/AbstractSharedRestInterface.java
@@ -17,6 +17,8 @@
*/
package org.apache.streampipes.rest.shared.impl;
+import org.apache.http.HttpStatus;
+
import jakarta.ws.rs.core.Response;
public abstract class AbstractSharedRestInterface {
@@ -28,19 +30,19 @@ public abstract class AbstractSharedRestInterface {
}
protected <T> Response badRequest(T entity) {
- return error(entity, 400);
+ return error(entity, HttpStatus.SC_BAD_REQUEST);
}
protected <T> Response notFound(T entity) {
- return error(entity, 404);
+ return error(entity, HttpStatus.SC_NOT_FOUND);
}
protected <T> Response notFound() {
- return Response.status(404).build();
+ return Response.status(HttpStatus.SC_NOT_FOUND).build();
}
protected <T> Response serverError(T entity) {
- return error(entity, 500);
+ return error(entity, HttpStatus.SC_INTERNAL_SERVER_ERROR);
}
protected <T> Response error(T entity, Integer statusCode) {
@@ -51,7 +53,7 @@ public abstract class AbstractSharedRestInterface {
}
protected Response badRequest() {
- return Response.status(400).build();
+ return Response.status(HttpStatus.SC_BAD_REQUEST).build();
}
protected Response ok() {
@@ -59,7 +61,7 @@ public abstract class AbstractSharedRestInterface {
}
protected Response created() {
- return Response.status(201).build();
+ return Response.status(HttpStatus.SC_CREATED).build();
}
protected Response fail() {
diff --git
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/UserResource.java
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/UserResource.java
index 0b577cf7c..096a01012 100644
---
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/UserResource.java
+++
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/UserResource.java
@@ -34,6 +34,7 @@ import
org.apache.streampipes.user.management.encryption.SecretEncryptionManager
import org.apache.streampipes.user.management.service.TokenService;
import org.apache.streampipes.user.management.util.PasswordUtil;
+import org.apache.http.HttpStatus;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
@@ -241,7 +242,7 @@ public class UserResource extends
AbstractAuthGuardedRestResource {
}
}
- return Response.status(401).build();
+ return Response.status(HttpStatus.SC_UNAUTHORIZED).build();
}
@PUT
diff --git
a/streampipes-service-base/src/main/java/org/apache/streampipes/service/base/rest/ServiceHealthResource.java
b/streampipes-service-base/src/main/java/org/apache/streampipes/service/base/rest/ServiceHealthResource.java
index 8fec1b135..066493376 100644
---
a/streampipes-service-base/src/main/java/org/apache/streampipes/service/base/rest/ServiceHealthResource.java
+++
b/streampipes-service-base/src/main/java/org/apache/streampipes/service/base/rest/ServiceHealthResource.java
@@ -20,11 +20,14 @@ package org.apache.streampipes.service.base.rest;
import org.apache.streampipes.service.base.StreamPipesServiceBase;
+import org.apache.http.HttpStatus;
+
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.core.Response;
+
@Path("")
public class ServiceHealthResource {
@@ -34,7 +37,7 @@ public class ServiceHealthResource {
if (serviceId.equals(StreamPipesServiceBase.AUTO_GENERATED_SERVICE_ID)) {
return Response.ok().build();
} else {
- return Response.status(404).build();
+ return Response.status(HttpStatus.SC_NOT_FOUND).build();
}
}
}
diff --git
a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/utils/CouchDbViewGenerator.java
b/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/utils/CouchDbViewGenerator.java
index 802cbbef1..29266b619 100644
---
a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/utils/CouchDbViewGenerator.java
+++
b/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/utils/CouchDbViewGenerator.java
@@ -18,6 +18,7 @@
package org.apache.streampipes.storage.couchdb.utils;
+import org.apache.http.HttpStatus;
import org.apache.http.client.fluent.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,10 +45,10 @@ public class CouchDbViewGenerator {
.getStatusLine()
.getStatusCode();
- if (status == 201) {
+ if (status == HttpStatus.SC_CREATED) {
LOG.info("Database {} successfully created", DB_NAME);
createViews();
- } else if (status == 412) {
+ } else if (status == HttpStatus.SC_PRECONDITION_FAILED) {
LOG.info("Database {} already present", DB_NAME);
} else {
LOG.warn("Status code {} from CouchDB - something went wrong during
install!", status);
@@ -75,7 +76,7 @@ public class CouchDbViewGenerator {
.getStatusLine()
.getStatusCode();
- if (status == 201) {
+ if (status == HttpStatus.SC_CREATED) {
LOG.info("View {} successfully created", VIEW_NAME);
} else {
LOG.warn("Status code {} from CouchDB - something went wrong during view
generation!", status);
