Merge branch 'backport-4050' into release-1.6.x

eclipse-kapua · Jun 4, 2024 · e3f697d · e3f697d
2 parents 089105e + 224ae5f
commit e3f697d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...va/org/eclipse/kapua/app/api/core/exception/mapper/DeviceNotConnectedExceptionMapper.java b/...va/org/eclipse/kapua/app/api/core/exception/mapper/DeviceNotConnectedExceptionMapper.java
@@ -31,7 +31,7 @@ public class DeviceNotConnectedExceptionMapper implements ExceptionMapper<Device
     public Response toResponse(DeviceNotConnectedException managementRequestContentException) {
         LOG.error("Device Not Connected", managementRequestContentException);
         return Response
-                .status(Status.BAD_REQUEST)
+                .status(Status.CONFLICT)
                 .entity(new DeviceNotConnectedExceptionInfo(managementRequestContentException))
                 .build();
     }

diff --git a/.../java/org/eclipse/kapua/app/api/core/exception/model/DeviceNotConnectedExceptionInfo.java b/.../java/org/eclipse/kapua/app/api/core/exception/model/DeviceNotConnectedExceptionInfo.java
@@ -40,7 +40,7 @@ protected DeviceNotConnectedExceptionInfo() {
     }
 
     public DeviceNotConnectedExceptionInfo(DeviceNotConnectedException deviceNotConnectedException) {
-        super(Response.Status.BAD_REQUEST, deviceNotConnectedException.getCode(), deviceNotConnectedException);
+        super(Response.Status.CONFLICT, deviceNotConnectedException.getCode(), deviceNotConnectedException);
 
         this.deviceId = deviceNotConnectedException.getDeviceId();
         this.connectionStatus = deviceNotConnectedException.getCurrentConnectionStatus();