Updated debug logging for Home and Thermostat.

Author: bwssytems

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bwssystems</groupId>
 	<artifactId>nest-controller</artifactId>
-	<version>1.0.6</version>
+	<version>1.0.7</version>
 	<packaging>jar</packaging>
 
 	<name>Nest Controller</name>

src/main/java/com/bwssystems/nest/controller/Home.java

@@ -29,8 +29,9 @@ public void reinitialize(StructureDetail aDetail) {
 	public void setAway(Boolean isAway) {
 		String theUrl = theSession.getTransport_url() + "/v2/put/structure." + theName;
 		HttpPost postRequest = new HttpPost(theUrl);
-		StringEntity requestBody = new StringEntity("{\"away_timestamp\":" + Long.toString(new Date().getTime()) + ",\"away\":" + isAway.toString() + ",\"away_setter\":0}", NestSession.parsedContentType);
-		log.debug("setAway for home: " + theUrl + " with body: " + requestBody);
+        String requestString = "{\"away_timestamp\":" + Long.toString(new Date().getTime()) + ",\"away\":" + isAway.toString() + ",\"away_setter\":0}";
+		StringEntity requestBody = new StringEntity(requestString, NestSession.parsedContentType);
+		log.debug("setAway for home: " + theUrl + " with body: " + requestString);
         postRequest.setEntity(requestBody);
 
         String theResponse = theSession.execute(postRequest);

src/main/java/com/bwssystems/nest/controller/Thermostat.java

@@ -1,8 +1,5 @@
 package com.bwssystems.nest.controller;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.slf4j.Logger;
@@ -36,22 +33,20 @@ public void setTargetTemperature(Float theTemp) {
     		String theUrl = theSession.getTransport_url() + "/v2/put/shared." + deviceName;
 			HttpPost postRequest = new HttpPost(theUrl);
 	        String target = null;
+	        log.debug("current thermostat target type is: " + deviceDetail.getCurrentScheduleMode());
 	        if(deviceDetail.getCurrentScheduleMode().toLowerCase() == "range") {
+	        	log.debug("current thermostat temperature is: " + Float.toString(sharedDetail.getTargetTemperature()));
 	        	if(theTemp < sharedDetail.getTargetTemperature())
 	        		target = "target_temperature_low";
 	        	else
 	        		target = "target_temperature_high";
 	        }
 	        else
 	        	target = "target_temperature";
-	        StringEntity requestBody = new StringEntity("{\"target_change_pending\":true,\"" + target + "\":" + String.format("%3.1f", theTemp)+ "}", NestSession.parsedContentType);
-	        try {
-		        BufferedReader theLine = new BufferedReader(new InputStreamReader(requestBody.getContent()));
-		        log.debug("setTargetTemperature for thermostat: " + theUrl + " with body: " + theLine.readLine());
-	        }
-	        catch(Exception e) {
-	        	log.debug("setTargetTemperature for thermostat: " + theUrl + " with body: error parsing body");
-	        }
+	        
+	        String requestString = "{\"target_change_pending\":true,\"" + target + "\":" + String.format("%3.1f", theTemp)+ "}";
+	        StringEntity requestBody = new StringEntity(requestString, NestSession.parsedContentType);
+        	log.debug("setTargetTemperature for thermostat: " + theUrl + " with body: " + requestString);
 	        postRequest.setEntity(requestBody);
 	        String theResponse = theSession.execute(postRequest);
 	        log.debug("setTargetTemperature response: " + theResponse);
@@ -61,11 +56,13 @@ public void setTargetTemperature(Float theTemp) {
 	}
 
 	public void setTargetType(String theType) {
+        log.debug("current thermostat target type is: " + deviceDetail.getCurrentScheduleMode());
         if(theType.equals("cool") || theType.equals("heat") || theType.equals("range") || theType.equals("off")) {
     		String theUrl = theSession.getTransport_url() + "/v2/put/shared." + deviceName;
 			HttpPost postRequest = new HttpPost(theUrl);
-	        StringEntity requestBody = new StringEntity("{\"target_temperature_type\":\"" + theType + "\"}", NestSession.parsedContentType);
-	        log.debug("setTargetType for thermostat: " + theUrl + " with body: " + requestBody);
+			String requestString = "{\"target_temperature_type\":\"" + theType + "\"}";
+	        StringEntity requestBody = new StringEntity(requestString, NestSession.parsedContentType);
+	        log.debug("setTargetType for thermostat: " + theUrl + " with body: " + requestString);
 	        postRequest.setEntity(requestBody);
 	        String theResponse = theSession.execute(postRequest);
 	        log.debug("setTargetType response: " + theResponse);
@@ -75,11 +72,13 @@ public void setTargetType(String theType) {
 	}
 
 	public void setFanMode(String theMode) {
+        log.debug("current thermostat fan mode is: " + deviceDetail.getFanMode());
         if(theMode.equals("on") || theMode.equals("auto")) {
     		String theUrl = theSession.getTransport_url() + "/v2/put/device." + deviceName;
         	HttpPost postRequest = new HttpPost(theUrl);
-	        StringEntity requestBody = new StringEntity("{\"fan_mode\":\"" + theMode + "\"}", NestSession.parsedContentType);
-	        log.debug("setFanMode for thermostat: " + theUrl + " with body: " + requestBody);
+			String requestString = "{\"fan_mode\":\"" + theMode + "\"}";
+	        StringEntity requestBody = new StringEntity(requestString, NestSession.parsedContentType);
+	        log.debug("setFanMode for thermostat: " + theUrl + " with body: " + requestString);
 	        postRequest.setEntity(requestBody);
 	        String theResponse = theSession.execute(postRequest);
 	        log.debug("setFanMode response: " + theResponse);