[iotawatt] check httpsStatus

Signed-off-by: Peter Rosenberg <prosenb.dev@gmail.com>
openhab · May 7, 2024 · b7a6564 · b7a6564
1 parent c81cf01
commit b7a6564
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/...g.iotawatt/src/main/java/org/openhab/binding/iotawatt/internal/client/IoTaWattClient.java b/...g.iotawatt/src/main/java/org/openhab/binding/iotawatt/internal/client/IoTaWattClient.java
@@ -26,6 +26,7 @@
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.http.HttpStatus;
 import org.openhab.binding.iotawatt.internal.exception.ThingStatusOfflineException;
 import org.openhab.binding.iotawatt.internal.model.StatusResponse;
 import org.openhab.core.thing.ThingStatusDetail;
@@ -80,6 +81,10 @@ public Optional<StatusResponse> fetchStatus() throws ThingStatusOfflineException
             final Request request = httpClient.newRequest(uri).method(HttpMethod.GET).timeout(requestTimeout,
                     TimeUnit.SECONDS);
             final ContentResponse response = request.send();
+            if (response.getStatus() != HttpStatus.OK_200) {
+                throw new ThingStatusOfflineException(ThingStatusDetail.COMMUNICATION_ERROR,
+                        "HttpStatus " + response.getStatus());
+            }
             final String content = response.getContentAsString();
             @Nullable
             final StatusResponse statusResponse = gson.fromJson(content, StatusResponse.class);

diff --git a/...tawatt/src/test/java/org/openhab/binding/iotawatt/internal/client/IoTaWattClientTest.java b/...tawatt/src/test/java/org/openhab/binding/iotawatt/internal/client/IoTaWattClientTest.java
@@ -35,6 +35,7 @@
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.http.HttpStatus;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -68,6 +69,7 @@ void fetchStatus_whenValidJson_returnObject() throws ThingStatusOfflineException
         when(request.timeout(anyLong(), any(TimeUnit.class))).thenReturn(request);
         ContentResponse contentResponse = mock(ContentResponse.class);
         when(request.send()).thenReturn(contentResponse);
+        when(contentResponse.getStatus()).thenReturn(HttpStatus.OK_200);
         when(contentResponse.getContentAsString()).thenReturn(readFile(DEVICE_STATUS_RESPONSE_FILE));
 
         // when
@@ -109,7 +111,7 @@ void fetchStatus_whenInputsAndOutputsEmpty_returnEmpty()
         ContentResponse contentResponse = mock(ContentResponse.class);
         when(request.send()).thenReturn(contentResponse);
         when(contentResponse.getContentAsString()).thenReturn("{}");
-        final StatusResponse statusResponse = new StatusResponse(null, null);
+        when(contentResponse.getStatus()).thenReturn(HttpStatus.OK_200);
 
         // when
         Optional<StatusResponse> resultOptional = client.fetchStatus();
@@ -121,6 +123,23 @@ void fetchStatus_whenInputsAndOutputsEmpty_returnEmpty()
         assertNull(result.outputs());
     }
 
+    @Test
+    void fetchStatus_whenNot200Response_throwsException()
+            throws ThingStatusOfflineException, ExecutionException, InterruptedException, TimeoutException {
+        // given
+        final IoTaWattClient client = new IoTaWattClient("hostname", 10, httpClient, gson);
+        Request request = mock(Request.class);
+        when(httpClient.newRequest(any(URI.class))).thenReturn(request);
+        when(request.method(any(HttpMethod.class))).thenReturn(request);
+        when(request.timeout(anyLong(), any(TimeUnit.class))).thenReturn(request);
+        ContentResponse contentResponse = mock(ContentResponse.class);
+        when(request.send()).thenReturn(contentResponse);
+        when(contentResponse.getStatus()).thenReturn(HttpStatus.BAD_REQUEST_400);
+
+        // when/then
+        assertThrows(ThingStatusOfflineException.class, client::fetchStatus);
+    }
+
     private String readFile(String filename) throws IOException {
         final Path workingDir = Path.of("", "src/test/resources");
         final Path file = workingDir.resolve(filename);