From 0f4591529a0a57635ba1319ddbd0edd5c5abe720 Mon Sep 17 00:00:00 2001 From: Oleksandra Matviienko Date: Tue, 26 Mar 2024 12:08:42 +0100 Subject: [PATCH] Changes according to comments (without GetOtaPackageCallback test) Signed-off-by: Oleksandra Matviienko --- .../transport/http/DeviceApiController.java | 14 +++--- .../http/DeviceApiControllerTest.java | 46 +++++++++++++++++-- .../http/src/test/resources/logback-test.xml | 4 +- 3 files changed, 53 insertions(+), 11 deletions(-) diff --git a/common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java b/common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java index 835d3af030..fd20b030df 100644 --- a/common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java +++ b/common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java @@ -461,15 +461,15 @@ public class DeviceApiController implements TbTransportService { String body = null; if (e instanceof HttpMessageNotReadableException || e instanceof JsonParseException) { body = e.getMessage(); - log.debug("Failed to process request: {}", body); + log.debug("Failed to process request in DeviceAuthCallback: {}", body); } else { - log.warn("Failed to process request", e); + log.warn("Failed to process request in DeviceAuthCallback", e); } responseWriter.setResult(new ResponseEntity<>(body, HttpStatus.INTERNAL_SERVER_ERROR)); } } - private static class DeviceProvisionCallback implements TransportServiceCallback { + static class DeviceProvisionCallback implements TransportServiceCallback { private final DeferredResult responseWriter; DeviceProvisionCallback(DeferredResult responseWriter) { @@ -486,9 +486,9 @@ public class DeviceApiController implements TbTransportService { String body = null; if (e instanceof HttpMessageNotReadableException || e instanceof JsonParseException) { body = e.getMessage(); - log.debug("Failed to process request: {}", body); + log.debug("Failed to process request in DeviceProvisionCallback: {}", body); } else { - log.warn("Failed to process request", e); + log.warn("Failed to process request in DeviceProvisionCallback", e); } responseWriter.setResult(new ResponseEntity<>(body, HttpStatus.INTERNAL_SERVER_ERROR)); } @@ -533,9 +533,9 @@ public class DeviceApiController implements TbTransportService { String body = null; if (e instanceof HttpMessageNotReadableException || e instanceof JsonParseException) { body = e.getMessage(); - log.debug("Failed to process request: {}", body); + log.debug("Failed to process request in GetOtaPackageCallback: {}", body); } else { - log.warn("Failed to process request", e); + log.warn("Failed to process request in GetOtaPackageCallback", e); } responseWriter.setResult(new ResponseEntity<>(body, HttpStatus.INTERNAL_SERVER_ERROR)); } diff --git a/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java b/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java index be60bd0b92..47efa5b25a 100644 --- a/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java +++ b/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.thingsboard.server.transport.http; import com.google.gson.JsonParseException; @@ -18,13 +33,13 @@ import static org.junit.jupiter.api.Assertions.*; class DeviceApiControllerTest { @Test - void callbackOnErrorTest() { + void DeviceAuthCallbackTest() { TransportContext transportContext = Mockito.mock(TransportContext.class); DeferredResult responseWriter = Mockito.mock(DeferredResult.class); Consumer onSuccess = x -> {}; var callback = new DeviceApiController.DeviceAuthCallback(transportContext, responseWriter, onSuccess); - callback.onError(new HttpMessageNotReadableException("JSON incorect syntax")); + callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax")); callback.onError(new JsonParseException("Json ; expected")); @@ -32,4 +47,29 @@ class DeviceApiControllerTest { callback.onError(new RuntimeException("oops it is run time error")); } -} \ No newline at end of file + + @Test + void DeviceProvisionCallbackTest() { + DeferredResult responseWriter = Mockito.mock(DeferredResult.class); + var callback = new DeviceApiController.DeviceProvisionCallback(responseWriter); + + callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax")); + + callback.onError(new JsonParseException("Json ; expected")); + + callback.onError(new IOException("not found")); + + callback.onError(new RuntimeException("oops it is run time error")); + } + +//@Test +// void GetOtaPackageCallback() { +// DeferredResult responseWriter = Mockito.mock(DeferredResult.class); +// String title = "Title"; +// String version = "version"; +// int chuckSize = 11; +// int chuck = 3; +// +// var callback = new DeviceApiController.GetOtaPackageCallback(responseWriter, title, version, chuckSize, chuck); +// } +} diff --git a/common/transport/http/src/test/resources/logback-test.xml b/common/transport/http/src/test/resources/logback-test.xml index 4bb2dbef40..359007da5a 100644 --- a/common/transport/http/src/test/resources/logback-test.xml +++ b/common/transport/http/src/test/resources/logback-test.xml @@ -7,7 +7,9 @@ - + logger name="org.thingsboard.server.transport.http.DeviceApiController" level="DEBUG" /> + +