fix typos. add support for custom min/max values for threshold temperatures

Signed-off-by: Eugen Freiter <[email protected]>

Author: Eugen Freiter

src/main/java/io/github/hapjava/accessories/optionalcharacteristic/AccessoryWithCoolingThresholdTemperature.java

@@ -21,6 +21,36 @@ public interface AccessoryWithCoolingThresholdTemperature {
    */
   void setCoolingThresholdTemperature(Double value) throws Exception;
 
+  /**
+   * return the min value for cooling threshold temperature. overwrite if you want to change the
+   * default value.
+   *
+   * @return min threshold temperature
+   */
+  default double getMinCoolingThresholdTemperature() {
+    return 10;
+  }
+
+  /**
+   * return the max value for cooling threshold temperature. overwrite if you want to change the
+   * default value.
+   *
+   * @return max threshold temperature
+   */
+  default double getMaxCoolingThresholdTemperature() {
+    return 35;
+  }
+
+  /**
+   * return the min step value for cooling threshold temperature. overwrite if you want to change
+   * the default value.
+   *
+   * @return step for threshold temperature
+   */
+  default double getStepCoolingThresholdTemperature() {
+    return 0.1;
+  }
+
   /**
    * Subscribes to changes in the cooling threshold.
    *

src/main/java/io/github/hapjava/accessories/optionalcharacteristic/AccessoryWithHeatingThresholdTemprature.java renamed to src/main/java/io/github/hapjava/accessories/optionalcharacteristic/AccessoryWithHeatingThresholdTemperature.java

@@ -3,7 +3,7 @@
 import io.github.hapjava.characteristics.HomekitCharacteristicChangeCallback;
 import java.util.concurrent.CompletableFuture;
 
-public interface AccessoryWithHeatingThresholdTemprature {
+public interface AccessoryWithHeatingThresholdTemperature {
 
   /**
    * Retrieves the temperature below which the thermostat should begin heating.
@@ -20,6 +20,36 @@ public interface AccessoryWithHeatingThresholdTemprature {
    */
   void setHeatingThresholdTemperature(Double value) throws Exception;
 
+  /**
+   * return the min value for heating threshold temperature. overwrite if you want to change the
+   * default value.
+   *
+   * @return min threshold temperature
+   */
+  default double getMinHeatingThresholdTemperature() {
+    return 0;
+  }
+
+  /**
+   * return the max value for heating threshold temperature. overwrite if you want to change the
+   * default value.
+   *
+   * @return max threshold temperature
+   */
+  default double getMaxHeatingThresholdTemperature() {
+    return 25;
+  }
+
+  /**
+   * return the min step value for heating threshold temperature. overwrite if you want to change
+   * the default value.
+   *
+   * @return step for threshold temperature
+   */
+  default double getStepHeatingThresholdTemperature() {
+    return 0.1;
+  }
+
   /**
    * Subscribes to changes in the heating threshold.
    *

src/main/java/io/github/hapjava/characteristics/impl/thermostat/CoolingThresholdTemperatureCharacteristic.java

@@ -14,20 +14,31 @@
 public class CoolingThresholdTemperatureCharacteristic extends FloatCharacteristic {
 
   public CoolingThresholdTemperatureCharacteristic(
+      double minValue,
+      double maxValue,
+      double step,
       Supplier<CompletableFuture<Double>> getter,
       ExceptionalConsumer<Double> setter,
       Consumer<HomekitCharacteristicChangeCallback> subscriber,
       Runnable unsubscriber) {
     super(
         "0000000D-0000-1000-8000-0026BB765291",
         "cooling threshold",
-        10,
-        35,
-        0.1,
+        minValue,
+        maxValue,
+        step,
         "C",
         Optional.of(getter),
         Optional.of(setter),
         Optional.of(subscriber),
         Optional.of(unsubscriber));
   }
+
+  public CoolingThresholdTemperatureCharacteristic(
+      Supplier<CompletableFuture<Double>> getter,
+      ExceptionalConsumer<Double> setter,
+      Consumer<HomekitCharacteristicChangeCallback> subscriber,
+      Runnable unsubscriber) {
+    this(10, 35, 0.1, getter, setter, subscriber, unsubscriber);
+  }
 }

src/main/java/io/github/hapjava/characteristics/impl/thermostat/HeatingThresholdTemperatureCharacteristic.java

@@ -12,20 +12,31 @@
 public class HeatingThresholdTemperatureCharacteristic extends FloatCharacteristic {
 
   public HeatingThresholdTemperatureCharacteristic(
+      double minValue,
+      double maxValue,
+      double step,
       Supplier<CompletableFuture<Double>> getter,
       ExceptionalConsumer<Double> setter,
       Consumer<HomekitCharacteristicChangeCallback> subscriber,
       Runnable unsubscriber) {
     super(
         "00000012-0000-1000-8000-0026BB765291",
         "heating threshold",
-        0,
-        25,
-        0.1,
+        minValue,
+        maxValue,
+        step,
         "C",
         Optional.of(getter),
         Optional.of(setter),
         Optional.of(subscriber),
         Optional.of(unsubscriber));
   }
+
+  public HeatingThresholdTemperatureCharacteristic(
+      Supplier<CompletableFuture<Double>> getter,
+      ExceptionalConsumer<Double> setter,
+      Consumer<HomekitCharacteristicChangeCallback> subscriber,
+      Runnable unsubscriber) {
+    this(0, 25, 0.1, getter, setter, subscriber, unsubscriber);
+  }
 }

src/main/java/io/github/hapjava/server/impl/connections/HttpSession.java

@@ -126,7 +126,7 @@ private HttpResponse handlePairVerify(HttpRequest request) {
     try {
       return pairVerificationManager.handle(request);
     } catch (Exception e) {
-      logger.warn("Excepton encountered while verifying pairing", e);
+      logger.warn("Exception encountered while verifying pairing", e);
       return new InternalServerErrorResponse(e);
     }
   }

src/main/java/io/github/hapjava/services/impl/HeaterCoolerService.java

@@ -2,7 +2,7 @@
 
 import io.github.hapjava.accessories.HeaterCoolerAccessory;
 import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithCoolingThresholdTemperature;
-import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithHeatingThresholdTemprature;
+import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithHeatingThresholdTemperature;
 import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithName;
 import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithPhysicalControlsLock;
 import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithRotationSpeed;
@@ -85,20 +85,32 @@ public HeaterCoolerService(HeaterCoolerAccessory accessory) {
     }
     if (accessory instanceof AccessoryWithCoolingThresholdTemperature) {
       new CoolingThresholdTemperatureCharacteristic(
+          ((AccessoryWithCoolingThresholdTemperature) accessory)
+              .getMinCoolingThresholdTemperature(),
+          ((AccessoryWithCoolingThresholdTemperature) accessory)
+              .getMaxCoolingThresholdTemperature(),
+          ((AccessoryWithCoolingThresholdTemperature) accessory)
+              .getStepCoolingThresholdTemperature(),
           ((AccessoryWithCoolingThresholdTemperature) accessory)::getCoolingThresholdTemperature,
           ((AccessoryWithCoolingThresholdTemperature) accessory)::setCoolingThresholdTemperature,
           ((AccessoryWithCoolingThresholdTemperature) accessory)
               ::subscribeCoolingThresholdTemperature,
           ((AccessoryWithCoolingThresholdTemperature) accessory)
               ::unsubscribeCoolingThresholdTemperature);
     }
-    if (accessory instanceof AccessoryWithHeatingThresholdTemprature) {
+    if (accessory instanceof AccessoryWithHeatingThresholdTemperature) {
       new HeatingThresholdTemperatureCharacteristic(
-          ((AccessoryWithHeatingThresholdTemprature) accessory)::getHeatingThresholdTemperature,
-          ((AccessoryWithHeatingThresholdTemprature) accessory)::setHeatingThresholdTemperature,
-          ((AccessoryWithHeatingThresholdTemprature) accessory)
+          ((AccessoryWithHeatingThresholdTemperature) accessory)
+              .getMinHeatingThresholdTemperature(),
+          ((AccessoryWithHeatingThresholdTemperature) accessory)
+              .getMaxHeatingThresholdTemperature(),
+          ((AccessoryWithHeatingThresholdTemperature) accessory)
+              .getStepHeatingThresholdTemperature(),
+          ((AccessoryWithHeatingThresholdTemperature) accessory)::getHeatingThresholdTemperature,
+          ((AccessoryWithHeatingThresholdTemperature) accessory)::setHeatingThresholdTemperature,
+          ((AccessoryWithHeatingThresholdTemperature) accessory)
               ::subscribeHeatingThresholdTemperature,
-          ((AccessoryWithHeatingThresholdTemprature) accessory)
+          ((AccessoryWithHeatingThresholdTemperature) accessory)
               ::unsubscribeHeatingThresholdTemperature);
     }
     if (accessory instanceof AccessoryWithTemperatureDisplayUnits) {

src/main/java/io/github/hapjava/services/impl/ThermostatService.java

@@ -3,7 +3,7 @@
 import io.github.hapjava.accessories.ThermostatAccessory;
 import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithCoolingThresholdTemperature;
 import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithCurrentRelativeHumidity;
-import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithHeatingThresholdTemprature;
+import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithHeatingThresholdTemperature;
 import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithName;
 import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithTargetRelativeHumidity;
 import io.github.hapjava.characteristics.impl.common.NameCharacteristic;
@@ -77,13 +77,13 @@ public ThermostatService(ThermostatAccessory accessory) {
           ((AccessoryWithCoolingThresholdTemperature) accessory)
               ::unsubscribeCoolingThresholdTemperature);
     }
-    if (accessory instanceof AccessoryWithHeatingThresholdTemprature) {
+    if (accessory instanceof AccessoryWithHeatingThresholdTemperature) {
       new HeatingThresholdTemperatureCharacteristic(
-          ((AccessoryWithHeatingThresholdTemprature) accessory)::getHeatingThresholdTemperature,
-          ((AccessoryWithHeatingThresholdTemprature) accessory)::setHeatingThresholdTemperature,
-          ((AccessoryWithHeatingThresholdTemprature) accessory)
+          ((AccessoryWithHeatingThresholdTemperature) accessory)::getHeatingThresholdTemperature,
+          ((AccessoryWithHeatingThresholdTemperature) accessory)::setHeatingThresholdTemperature,
+          ((AccessoryWithHeatingThresholdTemperature) accessory)
               ::subscribeHeatingThresholdTemperature,
-          ((AccessoryWithHeatingThresholdTemprature) accessory)
+          ((AccessoryWithHeatingThresholdTemperature) accessory)
               ::unsubscribeHeatingThresholdTemperature);
     }
     if (accessory instanceof AccessoryWithCurrentRelativeHumidity) {