Changes to minor errors in the VirtualFireAlarmService

.gitignore

@@ -25,3 +25,6 @@ hs_err_pid*
 
 # Ignore generated capps
 carbonapps
+
+# Ignore generated device-type DBs
+*.h2.db

components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.controller.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/VirtualFireAlarmService.java

@@ -121,8 +121,8 @@ public class VirtualFireAlarmService {
             final VirtualFireAlarmXMPPConnector virtualFireAlarmXMPPConnector) {
         this.virtualFireAlarmXMPPConnector = virtualFireAlarmXMPPConnector;
 
-        if (MqttConfig.getInstance().isEnabled()) {
+        if (XmppConfig.getInstance().isEnabled()) {
-            Runnable mqttStarter = new Runnable() {
+            Runnable xmppStarter = new Runnable() {
                 @Override
                 public void run() {
                     virtualFireAlarmXMPPConnector.initConnector();
@@ -130,9 +130,9 @@ public class VirtualFireAlarmService {
                 }
             };
 
-            Thread mqttStarterThread = new Thread(mqttStarter);
+            Thread xmppStarterThread = new Thread(xmppStarter);
-            mqttStarterThread.setDaemon(true);
+            xmppStarterThread.setDaemon(true);
-            mqttStarterThread.start();
+            xmppStarterThread.start();
         } else {
             log.warn("MQTT disabled in 'devicemgt-config.xml'. Hence, VirtualFireAlarmMQTTConnector not started.");
         }
@@ -144,7 +144,7 @@ public class VirtualFireAlarmService {
     public void setVirtualFireAlarmMQTTConnector(
             final VirtualFireAlarmMQTTConnector virtualFireAlarmMQTTConnector) {
         this.virtualFireAlarmMQTTConnector = virtualFireAlarmMQTTConnector;
-        if (XmppConfig.getInstance().isEnabled()) {
+        if (MqttConfig.getInstance().isEnabled()) {
             virtualFireAlarmMQTTConnector.connect();
         } else {
             log.warn("XMPP disabled in 'devicemgt-config.xml'. Hence, VirtualFireAlarmXMPPConnector not started.");

components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.controller.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/transport/VirtualFireAlarmXMPPConnector.java

@@ -71,17 +71,12 @@ public class VirtualFireAlarmXMPPConnector extends XMPPTransportHandler {
     }
 
     public void createXMPPAccountForDeviceType() {
-        boolean accountExists = false;
+        boolean accountExists;
         XmppServerClient xmppServerClient = new XmppServerClient();
         xmppServerClient.initControlQueue();
 
         try {
             accountExists = xmppServerClient.doesXMPPUserAccountExist(xmppVFireAlarmAdminUsername);
-        } catch (DeviceControllerException e) {
-            String errorMsg = "An error was encountered whilst trying to check whether Server XMPP account exists " +
-                    "for device-type - " + VirtualFireAlarmConstants.DEVICE_TYPE;
-            log.error(errorMsg, e);
-        }
 
             if (!accountExists) {
                 XmppAccount xmppAccount = new XmppAccount();
@@ -108,6 +103,12 @@ public class VirtualFireAlarmXMPPConnector extends XMPPTransportHandler {
                     log.error(errorMsg, e);
                 }
             }
+
+        } catch (DeviceControllerException e) {
+            String errorMsg = "An error was encountered whilst trying to check whether Server XMPP account exists " +
+                    "for device-type - " + VirtualFireAlarmConstants.DEVICE_TYPE + ".\n Check [devicemgt-config.xml]";
+            log.error(errorMsg, e);
+        }
     }
 
 

components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.mgt.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/VirtualFireAlarmService.java

@@ -95,14 +95,9 @@ public class VirtualFireAlarmService {
     @Context  //injected response proxy supporting multiple thread
     private HttpServletResponse response;
 
-    public static final String XMPP_PROTOCOL = "XMPP";
-    public static final String HTTP_PROTOCOL = "HTTP";
-    public static final String MQTT_PROTOCOL = "MQTT";
-
     private VerificationManager verificationManager;
     private VirtualFireAlarmMQTTConnector virtualFireAlarmMQTTConnector;
     private VirtualFireAlarmXMPPConnector virtualFireAlarmXMPPConnector;
-    private ConcurrentHashMap<String, String> deviceToIpMap = new ConcurrentHashMap<>();
 
     /**
      * @param verificationManager