fix various small bugs where a BaseCharacteristic was given null for a callback

Author: ccutrer

CHANGES.md

@@ -1,3 +1,6 @@
+# HAP-Java 2.0.2
+ * Various minor stability issues for after an accessory has been removed.
+
 # HAP-Java 2.0.1
 ## Fixes
 * Log accessory names instead of futures. [#150](https://github.com/hap-java/HAP-Java/issues/150)

src/main/java/io/github/hapjava/characteristics/impl/base/BaseCharacteristic.java

@@ -125,15 +125,26 @@ public final void setValue(JsonValue jsonValue) {
     try {
       setValue(convert(jsonValue));
     } catch (Exception e) {
-      logger.warn("Error while setting JSON value", e);
+      logger.warn(
+          "Error while setting JSON value {} for characteristic {}",
+          jsonValue,
+          getClass().getName(),
+          e);
     }
   }
 
   /** {@inheritDoc} */
   @Override
   public void supplyValue(JsonObjectBuilder builder) {
+    CompletableFuture<T> futureValue = getValue();
+
+    if (futureValue == null) {
+      setJsonValue(builder, getDefault());
+      return;
+    }
+
     try {
-      setJsonValue(builder, getValue().get());
+      setJsonValue(builder, futureValue.get());
     } catch (InterruptedException | ExecutionException e) {
       logger.warn("Error retrieving value", e);
       setJsonValue(builder, getDefault());
@@ -143,13 +154,13 @@ public void supplyValue(JsonObjectBuilder builder) {
   /** {@inheritDoc} */
   @Override
   public void subscribe(HomekitCharacteristicChangeCallback callback) {
-    subscriber.get().accept(callback);
+    subscriber.ifPresent(s -> s.accept(callback));
   }
 
   /** {@inheritDoc} */
   @Override
   public void unsubscribe() {
-    unsubscriber.get().run();
+    unsubscriber.ifPresent(u -> u.run());
   }
 
   /**

src/main/java/io/github/hapjava/characteristics/impl/base/FloatCharacteristic.java

@@ -130,7 +130,7 @@ protected final CompletableFuture<Double> getValue() {
 
   @Override
   protected void setValue(Double value) throws Exception {
-    setter.get().accept(value);
+    if (setter.isPresent()) setter.get().accept(value);
   }
 
   /** {@inheritDoc} */

src/main/java/io/github/hapjava/characteristics/impl/base/IntegerCharacteristic.java

@@ -77,7 +77,7 @@ protected CompletableFuture<Integer> getValue() {
 
   @Override
   protected void setValue(Integer value) throws Exception {
-    setter.get().accept(value);
+    if (setter.isPresent()) setter.get().accept(value);
   }
 
   /** {@inheritDoc} */

src/main/java/io/github/hapjava/characteristics/impl/base/StaticStringCharacteristic.java

@@ -60,7 +60,7 @@ public void setValue(String value) throws Exception {
   /** {@inheritDoc} */
   @Override
   protected CompletableFuture<String> getValue() {
-    return getter.map(stringGetter -> stringGetter.get()).get();
+    return getter.map(stringGetter -> stringGetter.get()).orElse(null);
   }
 
   /** {@inheritDoc} */

src/main/java/io/github/hapjava/characteristics/impl/base/StringCharacteristic.java

@@ -63,13 +63,13 @@ public String convert(JsonValue jsonValue) {
   /** {@inheritDoc} */
   @Override
   public void setValue(String value) throws Exception {
-    setter.get().accept(value);
+    if (setter.isPresent()) setter.get().accept(value);
   }
 
   /** {@inheritDoc} */
   @Override
   protected CompletableFuture<String> getValue() {
-    return getter.map(stringGetter -> stringGetter.get()).get();
+    return getter.map(stringGetter -> stringGetter.get()).orElse(null);
   }
 
   /** {@inheritDoc} */