This is an automated email from the ASF dual-hosted git repository.
Lukas-Finster pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 53c29243eb Improved: Removed codeDuplication in rest-api-component
(OFBIZ-12579)
53c29243eb is described below
commit 53c29243ebddf871ee19b6e8fd7a7acf954b2a4f
Author: Lukas Finster <[email protected]>
AuthorDate: Mon Aug 3 17:42:58 2026 +0200
Improved: Removed codeDuplication in rest-api-component (OFBIZ-12579)
* Error#code and Error#statusCode are duplicate methods. removed code
and replaced all references with the more descriptive statusCode.
---
.../src/main/java/org/apache/ofbiz/ws/rs/response/Error.java | 11 -----------
.../ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java | 8 ++++----
.../main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java | 2 +-
3 files changed, 5 insertions(+), 16 deletions(-)
diff --git
a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java
b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java
index 0f363d81fd..7ea073e4a2 100644
---
a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java
+++
b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java
@@ -72,17 +72,6 @@ public class Error {
this.additionalErrors = additionalErrors;
}
- /**
- * Fluent builder methods for constructing an {@code Error} response.
- *
- * <p>These methods allow chaining to populate error metadata in a concise
way.
- * Each method sets a field and returns the same {@code Error}
instance.</p>
- */
- public Error code(int statusCode) {
- this.statusCode = statusCode;
- return this;
- }
-
/**
* Fluent builder methods for constructing an {@code Error} response.
*
diff --git
a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java
b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java
index 5c2bfe154c..78988ad546 100644
---
a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java
+++
b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java
@@ -87,7 +87,7 @@ public class GenericServiceExceptionMapper implements
jakarta.ws.rs.ext.Exceptio
if (actualCause instanceof ServiceValidationException) {
ServiceValidationException validationException =
(ServiceValidationException) actualCause;
Error error = new
Error().type(actualCause.getClass().getSimpleName())
- .code(Response.Status.BAD_REQUEST.getStatusCode())
+ .statusCode(Response.Status.BAD_REQUEST.getStatusCode())
.description(Response.Status.BAD_REQUEST.getReasonPhrase())
.message(RestApiUtil.getErrorMessage(service,
"GenericServiceValidationErrorMessage", request.getLocale()))
.errorDesc((validationException.getMessage()))
@@ -96,7 +96,7 @@ public class GenericServiceExceptionMapper implements
jakarta.ws.rs.ext.Exceptio
} else if (actualCause instanceof GenericNoSuchEntityException
|| actualCause instanceof GenericEntityNotFoundException) {
Error error = new
Error().type(actualCause.getClass().getSimpleName())
-
.code(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode())
+
.statusCode(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode())
.description(Response.Status.INTERNAL_SERVER_ERROR.getReasonPhrase())
.message(RestApiUtil.getErrorMessage(service,
"NoSuchEntityDefaultMessage", request.getLocale()))
.errorDesc(ExceptionUtils.getRootCauseMessage(gse));
@@ -104,7 +104,7 @@ public class GenericServiceExceptionMapper implements
jakarta.ws.rs.ext.Exceptio
.entity(error);
} else if (actualCause instanceof GenericEntityException) {
Error error = new
Error().type(actualCause.getClass().getSimpleName())
-
.code(ResponseStatus.Custom.UNPROCESSABLE_ENTITY.getStatusCode())
+
.statusCode(ResponseStatus.Custom.UNPROCESSABLE_ENTITY.getStatusCode())
.description(ResponseStatus.Custom.UNPROCESSABLE_ENTITY.getReasonPhrase())
.message(RestApiUtil.getErrorMessage(service,
"GenericServiceExecutionGenericEntityOperationErrorMessage",
request.getLocale()))
@@ -113,7 +113,7 @@ public class GenericServiceExceptionMapper implements
jakarta.ws.rs.ext.Exceptio
.entity(error);
} else {
Error error = new
Error().type(actualCause.getClass().getSimpleName())
-
.code(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode())
+
.statusCode(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode())
.description(Response.Status.INTERNAL_SERVER_ERROR.getReasonPhrase())
.message(RestApiUtil.getErrorMessage(service,
"GenericServiceExecutionGenericExceptionErrorMessage",
request.getLocale()))
diff --git
a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java
b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java
index 2bb33871cd..b8d3a9b7f3 100644
---
a/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java
+++
b/framework/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java
@@ -168,7 +168,7 @@ public final class RestApiUtil {
additionalErrorMessages.add(errorMessageList.get(i));
}
}
- Error error = new
Error().type("ServiceError").code(ResponseStatus.Custom.UNPROCESSABLE_ENTITY.getStatusCode())
+ Error error = new
Error().type("ServiceError").statusCode(ResponseStatus.Custom.UNPROCESSABLE_ENTITY.getStatusCode())
.description(ResponseStatus.Custom.UNPROCESSABLE_ENTITY.getReasonPhrase())
.message(getErrorMessage(service,
"GenericServiceErrorMessage", locale)).errorDesc(errorMessage);
if (!additionalErrorMessages.isEmpty()) {
