Merge pull request openhab#3908 from watou/koubachi-v3-api

[koubachi] Added v3 API Device members; changed default URLs to v3.
ehmke · Jan 28, 2016 · 2f23e94 · 2f23e94
2 parents e1360ab + acefcb6
commit 2f23e94
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 8 deletions.
diff --git a/...binding.koubachi/src/main/java/org/openhab/binding/koubachi/internal/KoubachiBinding.java b/...binding.koubachi/src/main/java/org/openhab/binding/koubachi/internal/KoubachiBinding.java
@@ -77,15 +77,15 @@ public class KoubachiBinding extends AbstractActiveBinding<KoubachiBindingProvid
 
     /**
      * the URL of the Device list (optional, defaults to
-     * 'https://api.koubachi.com/v2/user/smart_devices?user_credentials=%1$s&app_key=%2$s')
+     * 'https://api.koubachi.com/v3/user/smart_devices?user_credentials=%1$s&app_key=%2$s')
      */
-    private static String apiDeviceListUrl = "https://api.koubachi.com/v2/user/smart_devices?user_credentials=%1$s&app_key=%2$s";
+    private static String apiDeviceListUrl = "https://api.koubachi.com/v3/user/smart_devices?user_credentials=%1$s&app_key=%2$s";
 
     /**
      * the URL of the Plant list (optional, defaults to
-     * 'https://api.koubachi.com/v2/user/smart_devices?user_credentials=%1$s&app_key=%2$s')
+     * 'https://api.koubachi.com/v3/user/smart_devices?user_credentials=%1$s&app_key=%2$s')
      */
-    private static String apiPlantListUrl = "https://api.koubachi.com/v2/plants?user_credentials=%1$s&app_key=%2$s";
+    private static String apiPlantListUrl = "https://api.koubachi.com/v3/plants?user_credentials=%1$s&app_key=%2$s";
 
     /**
      * The URL of the "plants/tasks" API method, to publish an action back to
@@ -102,7 +102,7 @@ public class KoubachiBinding extends AbstractActiveBinding<KoubachiBindingProvid
      * @see #updated(Dictionary)
      * @see https://labs.koubachi.com/documentations/9
      */
-    private static String apiTasksUrl = "https://api.koubachi.com/v2/plants/%3$s/tasks?user_credentials=%1$s&app_key=%2$s";
+    private static String apiTasksUrl = "https://api.koubachi.com/v3/plants/%3$s/tasks?user_credentials=%1$s&app_key=%2$s";
 
     /** The single access token configured at http://labs.kpubachi.com */
     private static String credentials;

diff --git a/...nhab.binding.koubachi/src/main/java/org/openhab/binding/koubachi/internal/api/Device.java b/...nhab.binding.koubachi/src/main/java/org/openhab/binding/koubachi/internal/api/Device.java
@@ -16,8 +16,9 @@
 
 /**
  * Represents a device (plant sensor) in the Koubachi domain.
- * 
+ *
  * @author Thomas.Eichstaedt-Engelen
+ * @author John Cocula -- updated to Koubachi v3 API
  * @since 1.2.0
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -33,10 +34,23 @@ public class Device extends KoubachiResource {
 
     String recentSoilmoistureReadingValue;
     Date recentSoilmoistureReadingTime;
+    BigDecimal recentSoilmoistureReadingSiValue; // added in v3 API
     String recentTemperatureReadingValue;
     Date recentTemperatureReadingTime;
+    BigDecimal recentTemperatureReadingSiValue; // added in v3 API
     String recentLightReadingValue;
     Date recentLightReadingTime;
+    BigDecimal recentLightReadingSiValue; // added in v3 API
+    // below added in Koubachi v3 API:
+    String recentSoiltemperatureReadingValue;
+    Date recentSoiltemperatureReadingTime;
+    BigDecimal recentSoiltemperatureReadingSiValue;
+    BigDecimal soiltemperaturePollingInterval;
+    String recentIrlightReadingValue;
+    Date recentIrlightReadingTime;
+    BigDecimal recentIrlightReadingSiValue;
+    String hardwareProductGeneration;
+    String hardwareProductName;
 
     @JsonProperty("mac_address")
     public void setId(String id) {
@@ -83,6 +97,11 @@ public Date getRecentSoilmoistureReadingTime() {
         return recentSoilmoistureReadingTime;
     }
 
+    @JsonProperty("recent_soilmoisture_reading_si_value")
+    public BigDecimal getRecentSoilmoistureReadingSiValue() {
+        return recentSoilmoistureReadingSiValue;
+    }
+
     @JsonProperty("recent_temperature_reading_value")
     public String getRecentTemperatureReadingValue() {
         return recentTemperatureReadingValue;
@@ -93,6 +112,11 @@ public Date getRecentTemperatureReadingTime() {
         return recentTemperatureReadingTime;
     }
 
+    @JsonProperty("recent_temperature_reading_si_value")
+    public BigDecimal getRecentTemperatureReadingSiValue() {
+        return recentTemperatureReadingSiValue;
+    }
+
     @JsonProperty("recent_light_reading_value")
     public String getRecentLightReadingValue() {
         return recentLightReadingValue;
@@ -103,15 +127,74 @@ public Date getRecentLightReadingTime() {
         return recentLightReadingTime;
     }
 
+    @JsonProperty("recent_light_reading_si_value")
+    public BigDecimal getRecentLightReadingSiValue() {
+        return recentLightReadingSiValue;
+    }
+
+    @JsonProperty("recent_soiltemperature_reading_value")
+    public String getRecentSoiltemperatureReadingValue() {
+        return recentSoiltemperatureReadingValue;
+    }
+
+    @JsonProperty("recent_soiltemperature_reading_time")
+    public Date getRecentSoiltemperatureReadingTime() {
+        return recentSoiltemperatureReadingTime;
+    }
+
+    @JsonProperty("recent_soiltemperature_reading_si_value")
+    public BigDecimal getRecentSoiltemperatureReadingSiValue() {
+        return recentSoiltemperatureReadingSiValue;
+    }
+
+    @JsonProperty("soiltemperature_polling_interval")
+    public BigDecimal getSoiltemperaturePollingInterval() {
+        return soiltemperaturePollingInterval;
+    }
+
+    @JsonProperty("recent_irlight_reading_value")
+    public String getRecentIrlightReadingValue() {
+        return recentIrlightReadingValue;
+    }
+
+    @JsonProperty("recent_irlight_reading_time")
+    public Date getRecentIrlightReadingTime() {
+        return recentIrlightReadingTime;
+    }
+
+    @JsonProperty("recent_irlight_reading_si_value")
+    public BigDecimal getRecentIrlightReadingSiValue() {
+        return recentIrlightReadingSiValue;
+    }
+
+    @JsonProperty("hardware_product_generation")
+    public String getHardwareProductGeneration() {
+        return hardwareProductGeneration;
+    }
+
+    @JsonProperty("hardware_product_name")
+    public String getHardwareProductName() {
+        return hardwareProductName;
+    }
+
     @Override
     public String toString() {
         return "Device [virtualBatteryLevel=" + virtualBatteryLevel + ", ssid=" + ssid + ", hardwareProductType="
                 + hardwareProductType + ", lastTransmission=" + lastTransmission + ", nextTransmission="
                 + nextTransmission + ", associatedSince=" + associatedSince + ", recentSoilmoistureReadingValue="
                 + recentSoilmoistureReadingValue + ", recentSoilmoistureReadingTime=" + recentSoilmoistureReadingTime
+                + ", recentSoilmoistureReadingSiValue=" + recentSoilmoistureReadingSiValue
                 + ", recentTemperatureReadingValue=" + recentTemperatureReadingValue + ", recentTemperatureReadingTime="
-                + recentTemperatureReadingTime + ", recentLightReadingValue=" + recentLightReadingValue
-                + ", recentLightReadingTime=" + recentLightReadingTime + "]";
+                + recentTemperatureReadingTime + ", recentTemperatureReadingSiValue=" + recentTemperatureReadingSiValue
+                + ", recentLightReadingValue=" + recentLightReadingValue + ", recentLightReadingTime="
+                + recentLightReadingTime + ", recentLightReadingSiValue=" + recentLightReadingSiValue
+                + ", recentSoiltemperatureReadingValue=" + recentSoiltemperatureReadingValue
+                + ", recentSoiltemperatureReadingTime=" + recentSoiltemperatureReadingTime
+                + ", recentSoiltemperatureReadingSiValue=" + recentSoiltemperatureReadingSiValue
+                + ", soiltemperaturePollingInterval=" + soiltemperaturePollingInterval + ", recentIrlightReadingValue="
+                + recentIrlightReadingValue + ", recentIrlightReadingTime=" + recentIrlightReadingTime
+                + ", recentIrlightReadingSiValue=" + recentIrlightReadingSiValue + ", hardwareProductGeneration="
+                + hardwareProductGeneration + ", hardwareProductName=" + hardwareProductName + "]";
     }
 
 }