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

Update MQTT reconnect, and import statements and color convert test

Browse Source 
case.
This commit is contained in:
Admin
2017-10-19 15:56:15 -05:00
parent 5231eac4b0
commit b147f6606e
5 changed files with 20 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>5.0.0rc1</version> <version>5.0.0rc2</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>HA Bridge</name> <name>HA Bridge</name>

4
src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
View File

@@ -12,8 +12,6 @@ import org.apache.http.HttpException;
import org.apache.http.HttpHost; import org.apache.http.HttpHost;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException; import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.config.CookieSpecs;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut; import org.apache.http.client.methods.HttpPut;
@@ -25,8 +23,6 @@ import org.apache.http.conn.HttpClientConnectionManager;
import org.apache.http.conn.routing.HttpRoute; import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.entity.ContentType; import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity; import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.conn.BasicHttpClientConnectionManager; import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
import org.apache.http.protocol.HttpRequestExecutor; import org.apache.http.protocol.HttpRequestExecutor;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;

7
src/main/java/com/bwssystems/HABridge/plugins/hue/HueInfo.java
View File

@@ -1,15 +1,8 @@
package com.bwssystems.HABridge.plugins.hue; package com.bwssystems.HABridge.plugins.hue;
import java.io.IOException;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut; import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.util.EntityUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

12
src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHandler.java
View File

@@ -5,6 +5,7 @@ import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttException;
import org.eclipse.paho.client.mqttv3.MqttMessage; import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.eclipse.paho.client.mqttv3.MqttSecurityException;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -51,6 +52,17 @@ public class MQTTHandler {
message.setRetained(Optional.ofNullable(retain).orElse(false)); message.setRetained(Optional.ofNullable(retain).orElse(false));
try { try {
if(!myClient.isConnected()) {
try {
myClient.connect();
} catch (MqttSecurityException e1) {
log.error("Could not retry connect to MQTT client for name: " + myConfig.getName() + " and ip: " + myConfig.getIp() + " with message: " + e1.getMessage());
return;
} catch (MqttException e1) {
log.error("Could not retry connect to MQTT client for name: " + myConfig.getName() + " and ip: " + myConfig.getIp() + " with message: " + e1.getMessage());
return;
}
}
myClient.publish(topic, message); myClient.publish(topic, message);
} catch (MqttException e) { } catch (MqttException e) {
log.error("Could not publish to MQTT client for name: " + myConfig.getName() + " and ip: " + myConfig.getIp() + " with message: " + e.getMessage()); log.error("Could not publish to MQTT client for name: " + myConfig.getName() + " and ip: " + myConfig.getIp() + " with message: " + e.getMessage());

14
src/test/java/com/bwssystems/color/test/ConvertCIEColorTestCase.java
View File

@@ -13,14 +13,14 @@ public class ConvertCIEColorTestCase {
@Test @Test
public void testColorConversion() { public void testColorConversion() {
//ArrayList<Double> xy = new ArrayList<Double>(Arrays.asList(new Double(0.671254), new Double(0.303273))); ArrayList<Double> xy = new ArrayList<Double>(Arrays.asList(new Double(0.671254), new Double(0.303273)));
//List<Double> colorDecode = ColorDecode.convertCIEtoRGB(xy, 254); List<Integer> colorDecode = ColorDecode.convertCIEtoRGB(xy, 254);
//List<Double> assertDecode = new ArrayList<Double>(); List<Integer> assertDecode = new ArrayList<Integer>();
//assertDecode.add(0, 255.0); assertDecode.add(0, 255);
//assertDecode.add(1, 47.0); assertDecode.add(1, 47);
//assertDecode.add(2, 43.0); assertDecode.add(2, 43);
//Assert.assertEquals(colorDecode, assertDecode); Assert.assertEquals(colorDecode, assertDecode);
} }
} }