community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #304 from ayyoob/transport

Browse Source 
few changes added to transport adapters after testing with the cluster
This commit is contained in:
Ruwan 2016-06-27 05:51:31 +05:30 committed by GitHub
commit 8b6fe27cab
5 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/iot/input/adapter/mqtt/MQTTEventAdapter.java
View File

@ -96,7 +96,10 @@ public class MQTTEventAdapter implements InputEventAdapter {
@Override
public void connect() {
mqttAdapterListener.createConnection();
if (!mqttAdapterListener.isConnectionInitialized()) {
mqttAdapterListener.createConnection();
}
}
@Override
@ -147,7 +150,7 @@ public class MQTTEventAdapter implements InputEventAdapter {
@Override
public boolean isPolling() {
return true;
return mqttAdapterListener.isConnectionInitialized();
}
}

6
components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/iot/input/adapter/mqtt/util/MQTTAdapterListener.java
View File

@ -58,6 +58,7 @@ public class MQTTAdapterListener implements MqttCallback, Runnable {
private MqttClient mqttClient;
private MqttConnectOptions connectionOptions;
private boolean cleanSession;
private boolean connectionInitialized;
private MQTTBrokerConnectionConfiguration mqttBrokerConnectionConfiguration;
private String topic;
@ -279,6 +280,11 @@ public class MQTTAdapterListener implements MqttCallback, Runnable {
}
public void createConnection() {
connectionInitialized = true;
new Thread(this).start();
}
public boolean isConnectionInitialized() {
return connectionInitialized;
}
}

6
components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.xmpp/src/main/java/org/wso2/carbon/device/mgt/iot/input/adapter/xmpp/XMPPEventAdapter.java
View File

@ -103,7 +103,9 @@ public class XMPPEventAdapter implements InputEventAdapter {
@Override
public void connect() {
xmppAdapterListener.createConnection();
if (xmppAdapterListener.isConnectionInitialized()) {
xmppAdapterListener.createConnection();
}
}
@Override
@ -142,7 +144,7 @@ public class XMPPEventAdapter implements InputEventAdapter {
@Override
public boolean isPolling() {
return true;
return xmppAdapterListener.isConnectionInitialized();
}
}

7
components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.xmpp/src/main/java/org/wso2/carbon/device/mgt/iot/input/adapter/xmpp/util/XMPPAdapterListener.java
View File

@ -21,6 +21,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jivesoftware.smack.ConnectionConfiguration;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.ReconnectionManager;
import org.jivesoftware.smack.SmackConfiguration;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
@ -53,6 +54,7 @@ public class XMPPAdapterListener implements Runnable {
private ContentValidator contentValidator;
private ContentTransformer contentTransformer;
private PacketListener packetListener;
private boolean connectionInitialized;
private InputEventAdapterListener eventAdapterListener = null;
@ -217,6 +219,11 @@ public class XMPPAdapterListener implements Runnable {
}
public void createConnection() {
connectionInitialized = true;
new Thread(this).start();
}
public boolean isConnectionInitialized() {
return connectionInitialized;
}
}

3
components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/plugin/impl/util/VirtualFirealarmStartupListener.java
View File

@ -21,6 +21,7 @@ package org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.impl.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.core.ServerStartupObserver;
import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.internal.VirtualFirealarmManagementDataHolder;
import java.io.IOException;
@ -36,7 +37,7 @@ public class VirtualFirealarmStartupListener implements ServerStartupObserver {
try {
VirtualFireAlarmUtils.setupMqttInputAdapter();
VirtualFireAlarmUtils.setupXmppInputAdapter();
VirtualFirealarmManagementDataHolder.getInstance().getInputEventAdapterService().start();
} catch (IOException e) {
log.error("Failed to intilaize the virtual firealarm input adapter", e);
}