Error streamlining

hivemq · Dec 11, 2024 · 4d2aea1 · 4d2aea1
1 parent 96e533c
commit 4d2aea1
Show file tree

Hide file tree

Showing 49 changed files with 358 additions and 426 deletions.
diff --git a/ext/hivemq-edge-openapi-2024.8-SNAPSHOT.yaml b/ext/hivemq-edge-openapi-2024.8-SNAPSHOT.yaml
diff --git a/hivemq-edge/src/main/java/com/hivemq/api/error/CustomJsonMappingExceptionMapper.java b/hivemq-edge/src/main/java/com/hivemq/api/error/CustomJsonMappingExceptionMapper.java
@@ -34,7 +34,7 @@ public class CustomJsonMappingExceptionMapper implements ExceptionMapper<JsonMap
     public @NotNull Response toResponse(final @NotNull JsonMappingException exception) {
         final String originalMessage = exception.getOriginalMessage();
         if (originalMessage != null) {
-            return ErrorResponseUtil.errorResponse(new ValidationError(List.of(new Error(originalMessage, null, null, null))));
+            return ErrorResponseUtil.errorResponse(new ValidationError(List.of(new Error(originalMessage, null))));
         } else {
             return ErrorResponseUtil.errorResponse(new InvalidInputError("Unable to parse JSON body, please check the input format."));
         }

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/error/CustomJsonParseExceptionMapper.java b/hivemq-edge/src/main/java/com/hivemq/api/error/CustomJsonParseExceptionMapper.java
@@ -32,7 +32,7 @@ public class CustomJsonParseExceptionMapper implements ExceptionMapper<JsonParse
     public @NotNull Response toResponse(final JsonParseException exception) {
         final String originalMessage = exception.getOriginalMessage();
         if (originalMessage != null) {
-            return ErrorResponseUtil.errorResponse(new ValidationError(List.of(new Error(originalMessage, null, null, null))));
+            return ErrorResponseUtil.errorResponse(new ValidationError(List.of(new Error(originalMessage, null))));
         } else {
             return ErrorResponseUtil.errorResponse(new InvalidInputError("Unable to parse JSON body, please check the input format."));
         }

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/AlreadyExistsError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/AlreadyExistsError.java
@@ -2,12 +2,12 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
-public class AlreadyExistsError extends Errors {
+public class AlreadyExistsError extends ProblemDetails {
     public AlreadyExistsError(
             final @Nullable String error) {
         super(

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/BadRequestError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/BadRequestError.java
@@ -2,12 +2,12 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
-public class BadRequestError extends Errors {
+public class BadRequestError extends ProblemDetails {
     public BadRequestError(
             final @Nullable String error) {
         super(

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/BodyParameterMissingError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/BodyParameterMissingError.java
@@ -2,18 +2,17 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class BodyParameterMissingError extends Errors {
+public class BodyParameterMissingError extends ProblemDetails {
     public BodyParameterMissingError(String parameterName) {
         super(
                 "BodyParameterMissing",
                 "Required request body parameter missing",
                 "Required request body parameter missing",
                 HttpStatus.BAD_REQUEST_400,
-                List.of(new Error("Request body parameter missing: " + parameterName, parameterName, null, null)));
+                List.of(new Error("Request body parameter missing: " + parameterName, parameterName)));
     }
 }
diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/InsufficientStorageError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/InsufficientStorageError.java
@@ -2,13 +2,12 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
-public class InsufficientStorageError extends Errors {
+public class InsufficientStorageError extends ProblemDetails {
     public InsufficientStorageError(
             final @NotNull String cause) {
         super(

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/InternalServerError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/InternalServerError.java
@@ -2,12 +2,12 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
-public class InternalServerError extends Errors {
+public class InternalServerError extends ProblemDetails {
     public InternalServerError(
             final @Nullable String error) {
         super(

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/InvalidInputError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/InvalidInputError.java
@@ -2,19 +2,19 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
-public class InvalidInputError extends Errors {
+public class InvalidInputError extends ProblemDetails {
     public InvalidInputError(
             final @Nullable String error) {
         super(
                 "InvalidInputError",
                 "Invalid input",
                 "JSON failed validation.",
                 HttpStatus.BAD_REQUEST_400,
-                List.of(new Error("Unparseable JSON: " + error, null, null, null)));
+                List.of(new Error("Unparseable JSON: " + error, null)));
     }
 }
diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/InvalidQueryParameterError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/InvalidQueryParameterError.java
@@ -2,17 +2,17 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class InvalidQueryParameterError extends Errors {
+public class InvalidQueryParameterError extends ProblemDetails {
     public InvalidQueryParameterError(String parameterName, String reason) {
         super(
                 "InvalidQueryParameter",
                 "Query parameter is invalid",
                 "Query parameter is invalid",
                 HttpStatus.BAD_REQUEST_400,
-                List.of(new Error(String.format("Query parameter %s is invalid: %s",  parameterName, reason), parameterName, null, null)));
+                List.of(new Error(String.format("Query parameter %s is invalid: %s",  parameterName, reason), parameterName)));
     }
 }
diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/InvalidQueryParameterErrors.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/InvalidQueryParameterErrors.java
@@ -2,11 +2,11 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class InvalidQueryParameterErrors extends Errors {
+public class InvalidQueryParameterErrors extends ProblemDetails {
     public InvalidQueryParameterErrors(List<Error> errors) {
         super(
                 "InvalidQueryParameter",

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/MethodNotAllowedError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/MethodNotAllowedError.java
@@ -1,11 +1,11 @@
 package com.hivemq.api.errors;
 
 import com.hivemq.http.HttpStatus;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class MethodNotAllowedError extends Errors {
+public class MethodNotAllowedError extends ProblemDetails {
     public MethodNotAllowedError() {
         super(
                 "MethodNotAllowedError",

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/NotFoundError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/NotFoundError.java
@@ -1,13 +1,11 @@
 package com.hivemq.api.errors;
 
 import com.hivemq.http.HttpStatus;
-import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
-import org.jetbrains.annotations.Nullable;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class NotFoundError extends Errors {
+public class NotFoundError extends ProblemDetails {
     public NotFoundError() {
         super(
                 "NotFoundError",

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/PreconditionFailedError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/PreconditionFailedError.java
@@ -2,12 +2,12 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-public class PreconditionFailedError extends Errors {
+public class PreconditionFailedError extends ProblemDetails {
     public PreconditionFailedError(
             final @NotNull String cause) {
         super(

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/TemporaryNotAvailableError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/TemporaryNotAvailableError.java
@@ -1,12 +1,11 @@
 package com.hivemq.api.errors;
 
 import com.hivemq.http.HttpStatus;
-import com.hivemq.http.error.Errors;
-import org.jetbrains.annotations.Nullable;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class TemporaryNotAvailableError extends Errors {
+public class TemporaryNotAvailableError extends ProblemDetails {
     public TemporaryNotAvailableError() {
         super(
                 "TemporaryUnavailable",

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/UnsupportedMediaTypeError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/UnsupportedMediaTypeError.java
@@ -1,11 +1,11 @@
 package com.hivemq.api.errors;
 
 import com.hivemq.http.HttpStatus;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class UnsupportedMediaTypeError extends Errors {
+public class UnsupportedMediaTypeError extends ProblemDetails {
     public UnsupportedMediaTypeError() {
         super(
                 "UnsupportedMediaTypeError",

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/UrlParameterMissingError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/UrlParameterMissingError.java
@@ -2,17 +2,17 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class UrlParameterMissingError extends Errors {
+public class UrlParameterMissingError extends ProblemDetails {
     public UrlParameterMissingError(String parameterName) {
         super(
                 "UrlParameterMissing",
                 "Required url parameter missing",
                 "Required url parameter missing",
                 HttpStatus.BAD_REQUEST_400,
-                List.of(new Error("URL parameter missing: " + parameterName, parameterName, null, null)));
+                List.of(new Error("URL parameter missing: " + parameterName, parameterName)));
     }
 }
diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/ValidationError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/ValidationError.java
@@ -2,14 +2,12 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
-public class ValidationError extends Errors {
+public class ValidationError extends ProblemDetails {
     public ValidationError(
             final @Nullable List<Error> errors) {
         super(

diff --git a/...edge/src/main/java/com/hivemq/api/errors/adapters/AdapterFailedSchemaValidationError.java b/...edge/src/main/java/com/hivemq/api/errors/adapters/AdapterFailedSchemaValidationError.java
@@ -2,13 +2,11 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class AdapterFailedSchemaValidationError extends Errors {
+public class AdapterFailedSchemaValidationError extends ProblemDetails {
     public AdapterFailedSchemaValidationError(List<Error> errors) {
         super(
                 "AdapterFailedValidation",

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/adapters/AdapterFailedValidationError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/adapters/AdapterFailedValidationError.java
@@ -2,11 +2,11 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class AdapterFailedValidationError extends Errors {
+public class AdapterFailedValidationError extends ProblemDetails {
     public AdapterFailedValidationError(String error) {
         super(
                 "AdapterFailedValidation",

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/adapters/AdapterNotFound403Error.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/adapters/AdapterNotFound403Error.java
@@ -2,11 +2,11 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class AdapterNotFound403Error extends Errors {
+public class AdapterNotFound403Error extends ProblemDetails {
     public AdapterNotFound403Error(String error) {
         super(
                 "AdapterNotFound",

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/adapters/AdapterNotFoundError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/adapters/AdapterNotFoundError.java
@@ -2,11 +2,11 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class AdapterNotFoundError extends Errors {
+public class AdapterNotFoundError extends ProblemDetails {
     public AdapterNotFoundError(String error) {
         super(
                 "AdapterNotFound",

diff --git a/...-edge/src/main/java/com/hivemq/api/errors/adapters/AdapterOperationNotSupportedError.java b/...-edge/src/main/java/com/hivemq/api/errors/adapters/AdapterOperationNotSupportedError.java
@@ -2,11 +2,11 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class AdapterOperationNotSupportedError extends Errors {
+public class AdapterOperationNotSupportedError extends ProblemDetails {
     public AdapterOperationNotSupportedError(String error) {
         super(
                 "AdapterTypeOperationNotSupported",

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/adapters/AdapterTypeNotFoundError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/adapters/AdapterTypeNotFoundError.java
@@ -2,11 +2,11 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class AdapterTypeNotFoundError extends Errors {
+public class AdapterTypeNotFoundError extends ProblemDetails {
     public AdapterTypeNotFoundError(String error) {
         super(
                 "AdapterTypeNotFound",

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/adapters/AdapterTypeReadOnlyError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/adapters/AdapterTypeReadOnlyError.java
@@ -2,11 +2,11 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class AdapterTypeReadOnlyError extends Errors {
+public class AdapterTypeReadOnlyError extends ProblemDetails {
     public AdapterTypeReadOnlyError(String error) {
         super(
                 "AdapterTypeReadOnly",

diff --git a/hivemq-edge/src/main/java/com/hivemq/api/errors/adapters/DomainTagNotFoundError.java b/hivemq-edge/src/main/java/com/hivemq/api/errors/adapters/DomainTagNotFoundError.java
@@ -2,11 +2,11 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class DomainTagNotFoundError extends Errors {
+public class DomainTagNotFoundError extends ProblemDetails {
     public DomainTagNotFoundError(String error) {
         super(
                 "TagNotFound",

diff --git a/...dge/src/main/java/com/hivemq/api/errors/authentication/AuthenticationValidationError.java b/...dge/src/main/java/com/hivemq/api/errors/authentication/AuthenticationValidationError.java
@@ -2,11 +2,11 @@
 
 import com.hivemq.http.HttpStatus;
 import com.hivemq.http.error.Error;
-import com.hivemq.http.error.Errors;
+import com.hivemq.http.error.ProblemDetails;
 
 import java.util.List;
 
-public class AuthenticationValidationError extends Errors {
+public class AuthenticationValidationError extends ProblemDetails {
     public AuthenticationValidationError(List<Error> errors) {
         super(
                 "AuthenticationValidationError",