Added SEND_ERROR_WITH_CAUSE to DeviceCallErrorCodes

Signed-off-by: Alberto Codutti <alberto.codutti@eurotech.com>
eclipse · Aug 2, 2023 · bae954f · bae954f
1 parent 4f489c6
commit bae954f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/...i/src/main/java/org/eclipse/kapua/service/device/call/exception/DeviceCallErrorCodes.java b/...i/src/main/java/org/eclipse/kapua/service/device/call/exception/DeviceCallErrorCodes.java
@@ -25,6 +25,12 @@ public enum DeviceCallErrorCodes implements KapuaErrorCode {
      */
     SEND_ERROR,
 
+    /**
+     * @see DeviceCallSendException
+     * @since 2.0.0
+     */
+    SEND_ERROR_WITH_CAUSE,
+
     /**
      * @see DeviceCallTimeoutException
      * @since 1.1.0

diff --git a/...rc/main/java/org/eclipse/kapua/service/device/call/exception/DeviceCallSendException.java b/...rc/main/java/org/eclipse/kapua/service/device/call/exception/DeviceCallSendException.java
@@ -23,17 +23,20 @@
  */
 public class DeviceCallSendException extends DeviceCallException {
 
-    private final DeviceMessage requestMessage;
+    private final DeviceMessage<?, ?> requestMessage;
+    private final String causeMessage;
 
     /**
      * Constructor.
      *
      * @param requestMessage The {@link DeviceMessage} that we tried to send.
      * @since 1.1.0
      */
-    public DeviceCallSendException(@NotNull DeviceMessage requestMessage) {
+    public DeviceCallSendException(@NotNull DeviceMessage<?, ?> requestMessage) {
         super(DeviceCallErrorCodes.SEND_ERROR, requestMessage);
+
         this.requestMessage = requestMessage;
+        this.causeMessage = null;
     }
 
     /**
@@ -43,9 +46,11 @@ public DeviceCallSendException(@NotNull DeviceMessage requestMessage) {
      * @param requestMessage The {@link DeviceMessage} that we tried to send.
      * @since 1.1.0
      */
-    public DeviceCallSendException(@NotNull Throwable cause, @NotNull DeviceMessage requestMessage) {
-        super(DeviceCallErrorCodes.SEND_ERROR, cause, requestMessage);
+    public DeviceCallSendException(@NotNull Throwable cause, @NotNull DeviceMessage<?, ?> requestMessage) {
+        super(DeviceCallErrorCodes.SEND_ERROR_WITH_CAUSE, cause, requestMessage, cause.getMessage());
+
         this.requestMessage = requestMessage;
+        this.causeMessage = cause.getMessage();
     }
 
     /**
@@ -54,7 +59,7 @@ public DeviceCallSendException(@NotNull Throwable cause, @NotNull DeviceMessage
      * @return The {@link DeviceMessage} that we tried to send.
      * @since 1.1.0
      */
-    public DeviceMessage getRequestMessage() {
+    public DeviceMessage<?, ?> getRequestMessage() {
         return requestMessage;
     }
 }
diff --git a/service/device/call/api/src/main/resources/device-call-error-messages.properties b/service/device/call/api/src/main/resources/device-call-error-messages.properties
@@ -12,4 +12,5 @@
 #
 ###############################################################################
 SEND_ERROR=An error occurred when sending the message: {0}
+SEND_ERROR_WITH_CAUSE=An error occurred when sending the message: {0}. Caused by: {1}
 TIMEOUT=The request has not received a response within the timeout of: {0}ms