mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-18 08:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed success return validation on calls and implemented validation

Browse Source 
catching logic for URL issues.

Fixes #73
Fixes #75
This commit is contained in:
Admin
2016-03-29 16:24:12 -05:00
parent e62fcf7765
commit 3ac83912f3
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>com.bwssystems.HABridge</groupId> <groupId>com.bwssystems.HABridge</groupId>
<artifactId>ha-bridge</artifactId> <artifactId>ha-bridge</artifactId>
<version>1.4.2a</version> <version>1.4.3</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>HA Bridge</name> <name>HA Bridge</name>

39
src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
View File

@@ -14,7 +14,6 @@ import com.bwssystems.harmony.HarmonyHome;
import com.bwssystems.harmony.RunActivity; import com.bwssystems.harmony.RunActivity;
import com.bwssystems.nest.controller.Nest; import com.bwssystems.nest.controller.Nest;
import com.bwssystems.util.JsonTransformer; import com.bwssystems.util.JsonTransformer;
import com.bwssystems.util.TextStringFormatter;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson; import com.google.gson.Gson;
@@ -565,23 +564,27 @@ public class HueMulator {
// This function executes the url from the device repository against the vera // This function executes the url from the device repository against the vera
protected boolean doHttpRequest(String anUrl, String httpVerb, String contentType, String body) { protected boolean doHttpRequest(String url, String httpVerb, String contentType, String body) {
HttpUriRequest request = null; HttpUriRequest request = null;
String url = TextStringFormatter.forURL(anUrl); try {
if(HttpGet.METHOD_NAME.equalsIgnoreCase(httpVerb) || httpVerb == null) { if(HttpGet.METHOD_NAME.equalsIgnoreCase(httpVerb) || httpVerb == null) {
request = new HttpGet(url); request = new HttpGet(url);
}else if(HttpPost.METHOD_NAME.equalsIgnoreCase(httpVerb)){ }else if(HttpPost.METHOD_NAME.equalsIgnoreCase(httpVerb)){
HttpPost postRequest = new HttpPost(url); HttpPost postRequest = new HttpPost(url);
ContentType parsedContentType = ContentType.parse(contentType); ContentType parsedContentType = ContentType.parse(contentType);
StringEntity requestBody = new StringEntity(body, parsedContentType); StringEntity requestBody = new StringEntity(body, parsedContentType);
postRequest.setEntity(requestBody); postRequest.setEntity(requestBody);
request = postRequest; request = postRequest;
}else if(HttpPut.METHOD_NAME.equalsIgnoreCase(httpVerb)){ }else if(HttpPut.METHOD_NAME.equalsIgnoreCase(httpVerb)){
HttpPut putRequest = new HttpPut(url); HttpPut putRequest = new HttpPut(url);
ContentType parsedContentType = ContentType.parse(contentType); ContentType parsedContentType = ContentType.parse(contentType);
StringEntity requestBody = new StringEntity(body, parsedContentType); StringEntity requestBody = new StringEntity(body, parsedContentType);
putRequest.setEntity(requestBody); putRequest.setEntity(requestBody);
request = putRequest; request = putRequest;
}
} catch(IllegalArgumentException e) {
log.warn("Error calling out to HA gateway: IllegalArgumentException in log", e);
return false;
} }
log.debug("Making outbound call in doHttpRequest: " + request); log.debug("Making outbound call in doHttpRequest: " + request);
try { try {
@@ -592,7 +595,7 @@ public class HueMulator {
return true; return true;
} }
} catch (IOException e) { } catch (IOException e) {
log.warn("Error calling out to HA gateway", e); log.warn("Error calling out to HA gateway: IOException in log", e);
} }
return false; return false;
} }

3
src/main/java/com/bwssystems/util/TextStringFormatter.java
View File

@@ -218,6 +218,9 @@ public final class TextStringFormatter {
return aURL.replace("&", "&amp;"); return aURL.replace("&", "&amp;");
} }
public static String forQuerySpace(String aURL) {
return aURL.replace(" ", "\u0020");
}
/** /**
* Synonym for <tt>URLEncoder.encode(String, "UTF-8")</tt>. * Synonym for <tt>URLEncoder.encode(String, "UTF-8")</tt>.
* *