Some feedback resolved

lsiepel · Dec 21, 2020 · 0752435 · 0752435
1 parent 8f7b5c3
commit 0752435
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.../org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHABadRequestException.java b/.../org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHABadRequestException.java
@@ -12,12 +12,14 @@
  */
 package org.openhab.binding.plugwiseha.internal.api.exception;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link PlugwiseHABadRequestException} represents a binding specific {@link Exception}.
  *
  * @author Bas van Wetten - Initial contribution
  */
-
+@NonNullByDefault
 public class PlugwiseHABadRequestException extends PlugwiseHAException {
 
     private static final long serialVersionUID = 1L;

diff --git a/.../main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHAException.java b/.../main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHAException.java
@@ -12,12 +12,14 @@
  */
 package org.openhab.binding.plugwiseha.internal.api.exception;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link PlugwiseHAException} represents a binding specific {@link Exception}.
  *
  * @author Bas van Wetten - Initial contribution
  */
-
+@NonNullByDefault
 public class PlugwiseHAException extends Exception {
 
     private static final long serialVersionUID = 1L;

diff --git a/...g/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHANotAuthorizedException.java b/...g/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHANotAuthorizedException.java
@@ -12,12 +12,14 @@
  */
 package org.openhab.binding.plugwiseha.internal.api.exception;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link PlugwiseHANotAuthorizedException} signals the controller denied a request due to invalid credentials.
  *
  * @author Bas van Wetten - Initial contribution
  */
-
+@NonNullByDefault
 public class PlugwiseHANotAuthorizedException extends PlugwiseHAException {
 
     private static final long serialVersionUID = 1L;

diff --git a/...n/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java b/...n/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java
@@ -239,6 +239,9 @@ private ContentResponse getContentResponse() throws PlugwiseHAException {
             } else if (cause instanceof ConnectException) {
                 // Cannot connect
                 throw new PlugwiseHAException(cause);
+            } else if (cause == null) {
+                // Unable to unwrap
+                throw new PlugwiseHAException(e);
             } else {
                 // Catch all
                 throw new PlugwiseHAException(cause);