Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

components/analytics/iot-analytics/org.wso2.carbon.device.mgt.cdmf.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/iot-analytics/org.wso2.carbon.iot.device.statistics.dashboard/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/iot-analytics/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>analytics</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/RegisterActivity.java

@@ -43,7 +43,6 @@ import org.wso2.carbon.iot.android.sense.util.dto.RegisterInfo;
 
 import agent.sense.android.iot.carbon.wso2.org.wso2_senseagent.R;
 
-
 /**
  * A login screen that offers to register the device.
  */
@@ -159,7 +158,6 @@ public class RegisterActivity extends Activity {
                                 startActivity(intent);
                             }
                         });
-
                     }
                     mUiHandler.post(new Runnable() {
                         @Override
@@ -167,11 +165,9 @@ public class RegisterActivity extends Activity {
                             showProgress(false);
                         }
                     });
-
                 }
             });
             myThread.start();
-
         }
     }
 
@@ -208,6 +204,4 @@ public class RegisterActivity extends Activity {
             deviceRegisterButton.setVisibility(show? View.VISIBLE : View.GONE);
         }
     }
-
 }
-

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/DataPublisherReceiver.java

@@ -34,5 +34,4 @@ public class DataPublisherReceiver extends BroadcastReceiver {
         PendingIntent pending = PendingIntent.getService(context, 0, i, 0);
         service.setRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(), ALARM_INTERVAL, pending);
     }
-
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/DataPublisherService.java

@@ -20,7 +20,6 @@ import android.hardware.Sensor;
 import android.os.IBinder;
 import android.support.annotation.Nullable;
 import android.util.Log;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -29,17 +28,17 @@ import org.wso2.carbon.iot.android.sense.constants.SenseConstants;
 import org.wso2.carbon.iot.android.sense.data.publisher.mqtt.AndroidSenseMQTTHandler;
 import org.wso2.carbon.iot.android.sense.data.publisher.mqtt.transport.MQTTTransportHandler;
 import org.wso2.carbon.iot.android.sense.data.publisher.mqtt.transport.TransportHandlerException;
-import org.wso2.carbon.iot.android.sense.event.streams.location.LocationData;
-import org.wso2.carbon.iot.android.sense.event.streams.sensor.SensorData;
-import org.wso2.carbon.iot.android.sense.event.streams.speed.SpeedData;
 import org.wso2.carbon.iot.android.sense.event.streams.activity.ActivityData;
 import org.wso2.carbon.iot.android.sense.event.streams.application.ApplicationData;
 import org.wso2.carbon.iot.android.sense.event.streams.audio.AudioData;
 import org.wso2.carbon.iot.android.sense.event.streams.battery.BatteryData;
 import org.wso2.carbon.iot.android.sense.event.streams.call.CallData;
 import org.wso2.carbon.iot.android.sense.event.streams.data.NetworkData;
+import org.wso2.carbon.iot.android.sense.event.streams.location.LocationData;
 import org.wso2.carbon.iot.android.sense.event.streams.screen.ScreenData;
+import org.wso2.carbon.iot.android.sense.event.streams.sensor.SensorData;
 import org.wso2.carbon.iot.android.sense.event.streams.sms.SmsData;
+import org.wso2.carbon.iot.android.sense.event.streams.speed.SpeedData;
 import org.wso2.carbon.iot.android.sense.speech.detector.util.ProcessWords;
 import org.wso2.carbon.iot.android.sense.speech.detector.util.WordData;
 import org.wso2.carbon.iot.android.sense.util.LocalRegistry;
@@ -65,257 +64,250 @@ public class DataPublisherService extends Service {
     public int onStartCommand(Intent intent, int flags, int startId) {
         context = this;
         Log.d(TAG, "service started");
-//        Runnable runnable = new Runnable() {
+        try {
-//            @Override
+            List<Event> events = new ArrayList<>();
-//            public void run() {
+            //retrieve sensor data.
-                try {
+            List<SensorData> sensorDataMap = SenseDataHolder.getSensorDataHolder();
-                    List<Event> events = new ArrayList<>();
+            if (!sensorDataMap.isEmpty()) {
-                    //retrieve sensor data.
+                for (SensorData sensorData : sensorDataMap) {
-                    List<SensorData> sensorDataMap = SenseDataHolder.getSensorDataHolder();
+                    Event event = new Event();
-                    if (!sensorDataMap.isEmpty()) {
+                    event.setTimestamp(sensorData.getTimestamp());
-                        for (SensorData sensorData : sensorDataMap) {
+                    switch (sensorData.getSensorType()) {
-                            Event event = new Event();
+                        case Sensor.TYPE_ACCELEROMETER:
-                            event.setTimestamp(sensorData.getTimestamp());
+                            event.setAccelerometer(sensorData.getSensorValues());
-                            switch (sensorData.getSensorType()) {
+                            events.add(event);
-                                case Sensor.TYPE_ACCELEROMETER:
+                            break;
-                                    event.setAccelerometer(sensorData.getSensorValues());
+                        case Sensor.TYPE_MAGNETIC_FIELD:
-                                    events.add(event);
+                            event.setMagnetic(sensorData.getSensorValues());
-                                    break;
+                            events.add(event);
-                                case Sensor.TYPE_MAGNETIC_FIELD:
+                            break;
-                                    event.setMagnetic(sensorData.getSensorValues());
+                        case Sensor.TYPE_GYROSCOPE:
-                                    events.add(event);
+                            event.setGyroscope(sensorData.getSensorValues());
-                                    break;
+                            events.add(event);
-                                case Sensor.TYPE_GYROSCOPE:
+                            break;
-                                    event.setGyroscope(sensorData.getSensorValues());
+                        case Sensor.TYPE_LIGHT:
-                                    events.add(event);
+                            event.setLight(sensorData.getSensorValues()[0]);
-                                    break;
+                            break;
-                                case Sensor.TYPE_LIGHT:
+                        case Sensor.TYPE_PRESSURE:
-                                    event.setLight(sensorData.getSensorValues()[0]);
+                            event.setPressure(sensorData.getSensorValues()[0]);
-                                    break;
+                            events.add(event);
-                                case Sensor.TYPE_PRESSURE:
+                            break;
-                                    event.setPressure(sensorData.getSensorValues()[0]);
+                        case Sensor.TYPE_PROXIMITY:
-                                    events.add(event);
+                            event.setProximity(sensorData.getSensorValues()[0]);
-                                    break;
+                            events.add(event);
-                                case Sensor.TYPE_PROXIMITY:
+                            break;
-                                    event.setProximity(sensorData.getSensorValues()[0]);
+                        case Sensor.TYPE_GRAVITY:
-                                    events.add(event);
+                            event.setGravity(sensorData.getSensorValues());
-                                    break;
-                                case Sensor.TYPE_GRAVITY:
-                                    event.setGravity(sensorData.getSensorValues());
-                                    events.add(event);
-                                    break;
-                                case Sensor.TYPE_GAME_ROTATION_VECTOR:
-                                    event.setRotation(sensorData.getSensorValues());
-                                    events.add(event);
-                                    break;
-                            }
-                        }
-                    }
-                    SenseDataHolder.resetSensorDataHolder();
-
-                    //retrieve battery data.
-                    List<BatteryData> batteryDataMap = SenseDataHolder.getBatteryDataHolder();
-                    if (!batteryDataMap.isEmpty()) {
-                        for (BatteryData batteryData : batteryDataMap) {
-                            Event event = new Event();
-                            event.setTimestamp(batteryData.getTimestamp());
-                            event.setBattery(batteryData.getLevel());
-                            event.setBatteryTemperature(batteryData.getTemperature());
-                            event.setBatteryStatus(batteryData.getStatus());
-                            event.setBatteryState(batteryData.getState().toString());
                             events.add(event);
-                        }
+                            break;
+                        case Sensor.TYPE_GAME_ROTATION_VECTOR:
+                            event.setRotation(sensorData.getSensorValues());
+                            events.add(event);
+                            break;
                     }
-                    SenseDataHolder.resetBatteryDataHolder();
+                }
+            }
+            SenseDataHolder.resetSensorDataHolder();
 
-                    //retrieve location data.
+            //retrieve battery data.
-                    List<LocationData> locationDataMap = SenseDataHolder.getLocationDataHolder();
+            List<BatteryData> batteryDataMap = SenseDataHolder.getBatteryDataHolder();
+            if (!batteryDataMap.isEmpty()) {
+                for (BatteryData batteryData : batteryDataMap) {
+                    Event event = new Event();
+                    event.setTimestamp(batteryData.getTimestamp());
+                    event.setBattery(batteryData.getLevel());
+                    event.setBatteryTemperature(batteryData.getTemperature());
+                    event.setBatteryStatus(batteryData.getStatus());
+                    event.setBatteryState(batteryData.getState().toString());
+                    events.add(event);
+                }
+            }
+            SenseDataHolder.resetBatteryDataHolder();
 
-                    if (!locationDataMap.isEmpty()) {
+            //retrieve location data.
-                        for (LocationData locationData : locationDataMap) {
+            List<LocationData> locationDataMap = SenseDataHolder.getLocationDataHolder();
-                            Event event = new Event();
-                            event.setTimestamp(locationData.getTimeStamp());
-                            event.setGps(new double[]{locationData.getLatitude(), locationData.getLongitude()});
-                            events.add(event);
-                        }
-                    }
-                    SenseDataHolder.resetLocationDataHolder();
 
-                    //retrieve speed data.
+            if (!locationDataMap.isEmpty()) {
-                    List<SpeedData> speedDataMap = SenseDataHolder.getSpeedDataHolder();
+                for (LocationData locationData : locationDataMap) {
-                    if (!speedDataMap.isEmpty()) {
+                    Event event = new Event();
-                        for (SpeedData speedData : speedDataMap) {
+                    event.setTimestamp(locationData.getTimeStamp());
-                            Event event = new Event();
+                    event.setGps(new double[]{locationData.getLatitude(), locationData.getLongitude()});
-                            event.setTimestamp(speedData.getTimeStamp());
+                    events.add(event);
-                            event.setTurns(speedData.getTurns());
+                }
-                            event.setSpeed(speedData.getSpeed());
+            }
+            SenseDataHolder.resetLocationDataHolder();
 
-                            events.add(event);
+            //retrieve speed data.
-                        }
+            List<SpeedData> speedDataMap = SenseDataHolder.getSpeedDataHolder();
-                    }
+            if (!speedDataMap.isEmpty()) {
-                    SenseDataHolder.resetSpeedDataHolder();
+                for (SpeedData speedData : speedDataMap) {
+                    Event event = new Event();
+                    event.setTimestamp(speedData.getTimeStamp());
+                    event.setTurns(speedData.getTurns());
+                    event.setSpeed(speedData.getSpeed());
 
-                    //retrieve speed data.
+                    events.add(event);
-                    List<BeaconScanedData> beaconDataMap = SenseDataHolder.getBeaconScanedDataHolder();
+                }
-                    if (!speedDataMap.isEmpty()) {
+            }
-                        for (BeaconScanedData beaconData : beaconDataMap) {
+            SenseDataHolder.resetSpeedDataHolder();
-                            Event event = new Event();
-                            event.setBeaconMajor(beaconData.getBeaconMajor());
-                            event.setBeaconMinor(beaconData.getBeaconMinor());
-                            event.setBeaconProximity(beaconData.getBeaconProximity());
-                            event.setBeaconUuid(beaconData.getBeaconUuid());
 
-                            events.add(event);
+            //retrieve speed data.
-                        }
+            List<BeaconScanedData> beaconDataMap = SenseDataHolder.getBeaconScanedDataHolder();
-                    }
+            if (!speedDataMap.isEmpty()) {
-                    SenseDataHolder.resetSpeedDataHolder();
+                for (BeaconScanedData beaconData : beaconDataMap) {
+                    Event event = new Event();
+                    event.setBeaconMajor(beaconData.getBeaconMajor());
+                    event.setBeaconMinor(beaconData.getBeaconMinor());
+                    event.setBeaconProximity(beaconData.getBeaconProximity());
+                    event.setBeaconUuid(beaconData.getBeaconUuid());
 
-                    //retrieve words
+                    events.add(event);
-                    ProcessWords.cleanAndPushToWordMap();
+                }
-                    List<WordData> wordDatMap = SenseDataHolder.getWordDataHolder();
+            }
-                    for (WordData wordData : wordDatMap) {
+            SenseDataHolder.resetSpeedDataHolder();
-                        if (wordData.getOccurences() == 0) {
+
-                            continue;
+            //retrieve words
-                        }
+            ProcessWords.cleanAndPushToWordMap();
-                        for (int i = 0; i < wordData.getOccurences(); i++) {
+            List<WordData> wordDatMap = SenseDataHolder.getWordDataHolder();
-                            Event event = new Event();
+            for (WordData wordData : wordDatMap) {
-                            event.setTimestamp(wordData.getTimestamp());
+                if (wordData.getOccurences() == 0) {
-                            event.setWord(wordData.getWord());
+                    continue;
-                            String word = wordData.getWord();
+                }
-                            String status = word;
+                for (int i = 0; i < wordData.getOccurences(); i++) {
-                            if ((!word.equals(SenseConstants.EVENT_LISTENER_STARTED)) && (!word.equals(SenseConstants
+                    Event event = new Event();
-                                    .EVENT_LISTENER_FINISHED))) {
+                    event.setTimestamp(wordData.getTimestamp());
-                                status = SenseConstants.EVENT_LISTENER_ONGOING;
+                    event.setWord(wordData.getWord());
-                            }
+                    String word = wordData.getWord();
-                            event.setWordStatus(status);
+                    String status = word;
-                            events.add(event);
+                    if ((!word.equals(SenseConstants.EVENT_LISTENER_STARTED)) && (!word.equals(SenseConstants
-                        }
+                            .EVENT_LISTENER_FINISHED))) {
+                        status = SenseConstants.EVENT_LISTENER_ONGOING;
                     }
-                    SenseDataHolder.resetWordDataHolder();
+                    event.setWordStatus(status);
+                    events.add(event);
+                }
+            }
+            SenseDataHolder.resetWordDataHolder();
 
-                    // retrieve call data.
+            // retrieve call data.
-                    List<CallData> callDataList = SenseDataHolder.getCallDataHolder();
+            List<CallData> callDataList = SenseDataHolder.getCallDataHolder();
-                    if (!callDataList.isEmpty()) {
+            if (!callDataList.isEmpty()) {
-                        for (CallData callData : callDataList) {
+                for (CallData callData : callDataList) {
-                            Event event = new Event();
+                    Event event = new Event();
-                            event.setCallNumber(callData.getPhoneNumber());
+                    event.setCallNumber(callData.getPhoneNumber());
-                            event.setCallType(callData.getType().toString().toLowerCase());
+                    event.setCallType(callData.getType().toString().toLowerCase());
-                            event.setCallStartTime(callData.getStartTime());
+                    event.setCallStartTime(callData.getStartTime());
-                            event.setCallEndTime(callData.getEndTime());
+                    event.setCallEndTime(callData.getEndTime());
-                            event.setTimestamp(callData.getStartTime());
+                    event.setTimestamp(callData.getStartTime());
 
-                            events.add(event);
+                    events.add(event);
-                        }
+                }
-                    }
+            }
-                    SenseDataHolder.resetCallDataHolder();
+            SenseDataHolder.resetCallDataHolder();
 
-                    // retrieve screen data.
+            // retrieve screen data.
-                    List<ScreenData> screenDataList = SenseDataHolder.getScreenDataHolder();
+            List<ScreenData> screenDataList = SenseDataHolder.getScreenDataHolder();
-                    if (!screenDataList.isEmpty()) {
+            if (!screenDataList.isEmpty()) {
-                        for (ScreenData screenData : screenDataList) {
+                for (ScreenData screenData : screenDataList) {
-                            Event event = new Event();
+                    Event event = new Event();
-                            event.setScreenState(screenData.getAction());
+                    event.setScreenState(screenData.getAction());
-                            event.setTimestamp(screenData.getTimestamp());
+                    event.setTimestamp(screenData.getTimestamp());
 
-                            events.add(event);
+                    events.add(event);
-                        }
+                }
-                    }
+            }
-                    SenseDataHolder.resetScreenDataHolder();
+            SenseDataHolder.resetScreenDataHolder();
 
-                    // retrieve audio data.
+            // retrieve audio data.
-                    List<AudioData> audioDataList = SenseDataHolder.getAudioDataHolder();
+            List<AudioData> audioDataList = SenseDataHolder.getAudioDataHolder();
-                    if (!audioDataList.isEmpty()) {
+            if (!audioDataList.isEmpty()) {
-                        for (AudioData audioData : audioDataList) {
+                for (AudioData audioData : audioDataList) {
-                            Event event = new Event();
+                    Event event = new Event();
-                            event.setTimestamp(audioData.getTimestamp());
+                    event.setTimestamp(audioData.getTimestamp());
-                            event.setAudioPlaying(audioData.isPlaying());
+                    event.setAudioPlaying(audioData.isPlaying());
-                            event.setHeadsetOn(audioData.isHeadsetOn());
+                    event.setHeadsetOn(audioData.isHeadsetOn());
-                            event.setMusicVolume(audioData.getMusicVolume());
+                    event.setMusicVolume(audioData.getMusicVolume());
-                            events.add(event);
+                    events.add(event);
-                        }
+                }
-                    }
+            }
-                    SenseDataHolder.resetAudioDataHolder();
+            SenseDataHolder.resetAudioDataHolder();
 
-                    // retrieve activity data.
+            // retrieve activity data.
-                    List<ActivityData> activityDataList = SenseDataHolder.getActivityDataHolder();
+            List<ActivityData> activityDataList = SenseDataHolder.getActivityDataHolder();
-                    if (!activityDataList.isEmpty()) {
+            if (!activityDataList.isEmpty()) {
-                        for (ActivityData activityData : activityDataList) {
+                for (ActivityData activityData : activityDataList) {
-                            Event event = new Event();
+                    Event event = new Event();
-                            event.setTimestamp(activityData.getTimestamp());
+                    event.setTimestamp(activityData.getTimestamp());
-                            event.setActivityType(activityData.getActivity());
+                    event.setActivityType(activityData.getActivity());
-                            event.setConfidence(activityData.getConfidence());
+                    event.setConfidence(activityData.getConfidence());
-                            events.add(event);
+                    events.add(event);
-                        }
+                }
-                    }
+            }
-                    SenseDataHolder.resetActivityDataHolder();
+            SenseDataHolder.resetActivityDataHolder();
 
-                    // retrieve sms data.
+            // retrieve sms data.
-                    List<SmsData> smsDataList = SenseDataHolder.getSmsDataHolder();
+            List<SmsData> smsDataList = SenseDataHolder.getSmsDataHolder();
-                    if (!smsDataList.isEmpty()) {
+            if (!smsDataList.isEmpty()) {
-                        for (SmsData smsData : smsDataList) {
+                for (SmsData smsData : smsDataList) {
-                            Event event = new Event();
+                    Event event = new Event();
-                            event.setTimestamp(smsData.getTimestamp());
+                    event.setTimestamp(smsData.getTimestamp());
-                            event.setSmsNumber(smsData.getPhoneNumber());
+                    event.setSmsNumber(smsData.getPhoneNumber());
-                            events.add(event);
+                    events.add(event);
-                        }
+                }
-                    }
+            }
-                    SenseDataHolder.resetSmsDataHolder();
+            SenseDataHolder.resetSmsDataHolder();
 
 
-                    // retrieve application data.
+            // retrieve application data.
-                    List<ApplicationData> appDataList = SenseDataHolder.getApplicationDataHolder();
+            List<ApplicationData> appDataList = SenseDataHolder.getApplicationDataHolder();
-                    if (!appDataList.isEmpty()) {
+            if (!appDataList.isEmpty()) {
-                        for (ApplicationData appData : appDataList) {
+                for (ApplicationData appData : appDataList) {
-                            Event event = new Event();
+                    Event event = new Event();
-                            event.setTimestamp(appData.getTimestamp());
+                    event.setTimestamp(appData.getTimestamp());
-                            event.setPackageName(appData.getPackageName());
+                    event.setPackageName(appData.getPackageName());
-                            event.setAction(appData.getAction().toString());
+                    event.setAction(appData.getAction().toString());
-                            events.add(event);
+                    events.add(event);
-                        }
+                }
-                    }
+            }
-                    SenseDataHolder.resetApplicationDataHolder();
+            SenseDataHolder.resetApplicationDataHolder();
 
-                    //Retrieve network data
+            //Retrieve network data
-                    List<NetworkData> networkDataList = SenseDataHolder.getNetworkDataHolder();
+            List<NetworkData> networkDataList = SenseDataHolder.getNetworkDataHolder();
-                    if (!networkDataList.isEmpty()) {
+            if (!networkDataList.isEmpty()) {
-                        for (NetworkData networkData : networkDataList) {
+                for (NetworkData networkData : networkDataList) {
-                            Event event = new Event();
+                    Event event = new Event();
-                            event.setTimestamp(networkData.getTimeStamp());
+                    event.setTimestamp(networkData.getTimeStamp());
-                            event.setDataType(networkData.getDataType());
+                    event.setDataType(networkData.getDataType());
-                            event.setDataReceived(networkData.getDataReceived());
+                    event.setDataReceived(networkData.getDataReceived());
-                            event.setDataSent(networkData.getDataSent());
+                    event.setDataSent(networkData.getDataSent());
-                            events.add(event);
+                    events.add(event);
-                        }
+                }
-                    }
+            }
-                    SenseDataHolder.resetNetworkDataHolder();
+            SenseDataHolder.resetNetworkDataHolder();
 
-                    //publish the data
+            //publish the data
-                    if (events.size() > 0 && LocalRegistry.isEnrolled(context)) {
+            if (events.size() > 0 && LocalRegistry.isEnrolled(context)) {
-                        String user = LocalRegistry.getUsername(context);
+                String user = LocalRegistry.getUsername(context);
-                        String deviceId = LocalRegistry.getDeviceId(context);
+                String deviceId = LocalRegistry.getDeviceId(context);
-                        JSONArray jsonArray = new JSONArray();
+                JSONArray jsonArray = new JSONArray();
-                        for (Event event : events) {
+                for (Event event : events) {
-                            event.setOwner(user);
+                    event.setOwner(user);
-                            event.setDeviceId(deviceId);
+                    event.setDeviceId(deviceId);
-                            jsonArray.put(new JSONObject().put("event", event.getEvent()));
+                    jsonArray.put(new JSONObject().put("event", event.getEvent()));
-                        }
+                }
 
-                        MQTTTransportHandler mqttTransportHandler = AndroidSenseMQTTHandler.getInstance(context);
+                MQTTTransportHandler mqttTransportHandler = AndroidSenseMQTTHandler.getInstance(context);
-                        if (!mqttTransportHandler.isConnected()) {
+                if (!mqttTransportHandler.isConnected()) {
-                            mqttTransportHandler.connect();
+                    mqttTransportHandler.connect();
-                        }
-                        String topic = LocalRegistry.getTenantDomain(context) + "/" + SenseConstants.DEVICE_TYPE + "/" + deviceId + "/data";
-                        mqttTransportHandler.publishDeviceData(user, deviceId, jsonArray.toString(), topic);
-                    }
-                } catch (JSONException e) {
-                    Log.e(TAG, "Json Data Parsing Exception", e);
-                } catch (TransportHandlerException e) {
-                    Log.e(TAG, "Data Publish Failed", e);
                 }
-//            }
+                String topic = LocalRegistry.getTenantDomain(context) + "/" + SenseConstants.DEVICE_TYPE + "/" + deviceId + "/data";
-//        };
+                mqttTransportHandler.publishDeviceData(user, deviceId, jsonArray.toString(), topic);
-//        Thread dataUploaderThread = new Thread(runnable);
+            }
-//        dataUploaderThread.start();
+        } catch (JSONException e) {
+            Log.e(TAG, "Json Data Parsing Exception", e);
+        } catch (TransportHandlerException e) {
+            Log.e(TAG, "Data Publish Failed", e);
+        }
         return Service.START_NOT_STICKY;
     }
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/Event.java

@@ -552,5 +552,4 @@ public class Event {
 
         return jsonEvent;
     }
-
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/mqtt/AndroidSenseMQTTHandler.java

@@ -236,6 +236,5 @@ public class AndroidSenseMQTTHandler extends MQTTTransportHandler {
     public void processIncomingMessage(MqttMessage message) throws TransportHandlerException {
 
     }
-
 }
 

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/SenseScheduleReceiver.java

@@ -38,5 +38,4 @@ public class SenseScheduleReceiver extends BroadcastReceiver {
         cal.add(Calendar.SECOND, 10);
         service.setRepeating(AlarmManager.RTC_WAKEUP, cal.getTimeInMillis(), ALARM_INTERVAL, pending);
     }
-
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/SenseService.java

@@ -59,7 +59,6 @@ public class SenseService extends Service {
         SenseDataReceiverManager.registerNetworkDataReader(this);
         //service will not be stopped until we manually stop the service
         return Service.START_NOT_STICKY;
-
     }
 
     @Override
@@ -75,4 +74,4 @@ public class SenseService extends Service {
         SenseWakeLock.releaseCPUWakeLock();
         super.onDestroy();
     }
-}
+}

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/data/NetworkDataReader.java

@@ -25,7 +25,6 @@ import android.net.TrafficStats;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.util.Log;
-
 import org.wso2.carbon.iot.android.sense.util.SenseDataHolder;
 
 import java.util.Date;

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/sensor/SensorDataReader.java

@@ -56,7 +56,6 @@ public class SensorDataReader extends DataReader implements SensorEventListener
         for (Sensor sensor : sensorList) {
             mSensorManager.registerListener(this, sensor, SensorManager.SENSOR_DELAY_NORMAL);
         }
-
     }
 
     private void collectSensorData() {
@@ -112,5 +111,4 @@ public class SensorDataReader extends DataReader implements SensorEventListener
             }
         }
     }
-
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/realtimeviewer/ActivitySelectSensor.java

@@ -73,7 +73,6 @@ public class ActivitySelectSensor extends AppCompatActivity
     private ListView listView;
     private SensorManager sensorManager;
     private ArrayList<Sensor> sensors = new ArrayList<>();
-//    private EditText sessionIdText;
     private RealTimeSensorReader sensorReader = null;
     private RealTimeSensorChangeReceiver realTimeSensorChangeReceiver = new RealTimeSensorChangeReceiver();
     private SupportedSensors supportedSensors = SupportedSensors.getInstance();
@@ -87,22 +86,10 @@ public class ActivitySelectSensor extends AppCompatActivity
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         sensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
-        //sessionIdText = (EditText) findViewById(R.id.sessionId);
-//        sessionIdText.setCursorVisible(false);
-
         listView = (ListView) findViewById(R.id.senseListContainer);
-        //verifyBluetooth();
 
         registerReceiver(realTimeSensorChangeReceiver, new IntentFilter("sensorDataMap"));
 
-//        sessionIdText.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                sessionIdText.setCursorVisible(true);
-//
-//            }
-//        });
-
         //Publish data
         FloatingActionButton fbtnPublishData = (FloatingActionButton) findViewById(R.id.publish);
 
@@ -126,35 +113,6 @@ public class ActivitySelectSensor extends AppCompatActivity
             }
         });
 
-        //FloatingActionButton fbtnSpeechRecongnizer = (FloatingActionButton) findViewById(R.id.speech);
-//        fbtnSpeechRecongnizer.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                String sessionId = sessionIdText.getText().toString();
-//                if (!sessionId.isEmpty()) {
-//                    Intent intent = new Intent(getApplicationContext(), WordRecognitionActivity.class);
-//                    intent.putExtra("sessionId", sessionId);
-//                    startActivity(intent);
-//                } else {
-//                    Toast.makeText(ActivitySelectSensor.this, "Please type a session id value", Toast.LENGTH_SHORT)
-//                            .show();
-//                }
-//
-//            }
-//        });
-
-//        FloatingActionButton fbtnBeaconMonitor = (FloatingActionButton) findViewById(R.id.beacon);
-//        fbtnBeaconMonitor.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                    Intent intent = new Intent(getApplicationContext(), BeaconMonitoringActivity.class);
-//                    startActivity(intent);
-//
-//
-//            }
-//        });
-
-
         sharedPreferences = getSharedPreferences(SupportedSensors.SELECTED_SENSORS, 0);
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -223,7 +181,6 @@ public class ActivitySelectSensor extends AppCompatActivity
             finish();
             return true;
         }
-
         return super.onOptionsItemSelected(item);
     }
 
@@ -272,7 +229,6 @@ public class ActivitySelectSensor extends AppCompatActivity
 
         realTimeSensorChangeReceiver.updateOnChange(adaptor1);
         listView.setAdapter(adaptor1);
-
     }
 
     public void update() {
@@ -305,51 +261,10 @@ public class ActivitySelectSensor extends AppCompatActivity
         }
     }
 
-
     /**
      * This method unregisters the real-time broadcast receiver.
      */
     public void unregisterReceivers() {
         unregisterReceiver(realTimeSensorChangeReceiver);
     }
-
-//    private void verifyBluetooth() {
-//
-//        try {
-//            if (!BeaconManager.getInstanceForApplication(this).checkAvailability()) {
-//                final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-//                builder.setTitle("Bluetooth not enabled");
-//                builder.setMessage("Please enable bluetooth in settings and restart this application.");
-//                builder.setPositiveButton(android.R.string.ok, null);
-//                builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
-//
-//                    @Override
-//                    public void onDismiss(DialogInterface dialog) {
-//                        finish();
-//                        System.exit(0);
-//                    }
-//
-//                });
-//                builder.show();
-//
-//            }
-//        } catch (RuntimeException e) {
-//            final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-//            builder.setTitle("Bluetooth LE not available");
-//            builder.setMessage("Sorry, this device does not support Bluetooth LE.");
-//            builder.setPositiveButton(android.R.string.ok, null);
-//            builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
-//
-//                @Override
-//                public void onDismiss(DialogInterface dialog) {
-//                    finish();
-//                    System.exit(0);
-//                }
-//
-//            });
-//            builder.show();
-//
-//        }
-//
-//    }
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/realtimeviewer/datastore/TempStore.java

@@ -33,5 +33,4 @@ public class TempStore {
      * Array List which is used to populate the List view.
      */
     public static ArrayList<RealTimeSensor> sensorArrayList = new ArrayList<>();
-
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/realtimeviewer/event/RealTimeSensorChangeReceiver.java

@@ -37,5 +37,4 @@ public class RealTimeSensorChangeReceiver extends BroadcastReceiver {
         TempStore.sensorArrayList.clear();
         TempStore.sensorArrayList.addAll(TempStore.sensorDataMap.values());
     }
-
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/realtimeviewer/event/realtimesensor/RealTimeSensorReader.java

@@ -58,5 +58,4 @@ public class RealTimeSensorReader implements SensorEventListener {
     @Override
     public void onAccuracyChanged(Sensor sensor, int accuracy) {
     }
-
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/realtimeviewer/sensorlisting/AvailableSensorsInDevice.java

@@ -60,6 +60,4 @@ public class AvailableSensorsInDevice {
         editor.putStringSet(SupportedSensors.GET_AVAILABLE_SENSORS, sensorSet);
         editor.apply();
     }
-
-
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/realtimeviewer/sensorlisting/SupportedSensors.java

@@ -119,5 +119,4 @@ public class SupportedSensors {
     public String getType(int type) {
         return typeSensorMap.get(type);
     }
-
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/realtimeviewer/view/adaptor/SensorViewAdaptor.java

@@ -83,7 +83,6 @@ public class SensorViewAdaptor extends BaseAdapter {
         holder.valuesZ.setText(data.getValueZ());
 
         return view;
-
     }
 
     private class ViewHolder {

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/realtimeviewer/view/sensor/selector/SelectSensorDialog.java

@@ -36,7 +36,6 @@ import java.util.Set;
  * Get the user selections
  * Put them in to shared preferences
  */
-
 public class SelectSensorDialog extends DialogFragment {
 
     protected boolean[] selections = new boolean[SupportedSensors.SUPPORTED_SENSOR_COUNT];
@@ -79,7 +78,6 @@ public class SelectSensorDialog extends DialogFragment {
                 Log.d("Click", "Ok");
                 //call sensorDataMap reading class
                 sensorListListener.onDialogPositiveClick(SelectSensorDialog.this);
-
             }
         });
 
@@ -96,7 +94,6 @@ public class SelectSensorDialog extends DialogFragment {
                 }
             }
         });
-
         return builder.create();
     }
 
@@ -143,5 +140,4 @@ public class SelectSensorDialog extends DialogFragment {
     public interface SensorListListener {
         void onDialogPositiveClick(SelectSensorDialog dialog);
     }
-
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>androidsense-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_stats_event_sink/iot_per_device_stream_android_accelerometer_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_script/AndroidActivityScript.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <Analytics>
     <Editable>true</Editable>
     <Name>AndroidActivityScript</Name>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_stats_event_sink/iot_per_device_stream_android_activity_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_audio_script/AndroidAudioScript.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <Analytics>
     <Editable>true</Editable>
     <Name>AndroidAudioScript</Name>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_script/AndroidBatteryScript.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <Analytics>
     <Editable>true</Editable>
     <Name>AndroidBatteryScript</Name>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_stats_event_sink/iot_per_device_stream_android_battery_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_script/AndroidCallScript.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <Analytics>
     <Editable>true</Editable>
     <Name>AndroidCallScript</Name>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_event_sink/iot_per_device_stream_android_call_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_script/AndroidDataScript.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <Analytics>
     <Editable>true</Editable>
     <Name>AndroidDataScript</Name>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_stats_event_sink/iot_per_device_stream_android_data_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_event_sink/iot_per_device_stream_android_device_details.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequentcontacts_script/AndroidFrequentContactsScript.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <Analytics>
     <Editable>true</Editable>
     <Name>AndroidFrequentContactsScript</Name>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gravity_stats_event_sink/iot_per_device_stream_android_gravity_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_gyroscope_stats_event_sink/iot_per_device_stream_android_gyroscope_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_script/HeadsetScript.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <Analytics>
     <Editable>true</Editable>
     <Name>HeadsetScript</Name>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_stats_event_sink/iot_per_device_stream_android_headset_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_light_stats_event_sink/iot_per_device_stream_android_light_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_event_sink/iot_per_device_stream_android_location.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_stats_event_sink/iot_per_device_stream_android_location_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_magnetic_stats_event_sink/iot_per_device_stream_android_magnetic_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_pressure_stats_event_sink/iot_per_device_stream_android_pressure_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_proximity_stats_event_sink/iot_per_device_stream_android_proximity_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_rotation_stats_event_sink/iot_per_device_stream_android_rotation_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_stats_event_sink/iot_per_device_stream_android_screen_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_stats_event_sink/iot_per_device_stream_android_sms_stats.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <EventStoreConfiguration>
     <TableSchema>
         <ColumnDefinition>

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>androidsense-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/listener/AndroidSensePermissionUpdateListener.java

@@ -32,10 +32,13 @@ import javax.servlet.ServletContextListener;
 public class AndroidSensePermissionUpdateListener implements ServletContextListener {
 
     private static Log log = LogFactory.getLog(AndroidSensePermissionUpdateListener.class);
+    private static PrivilegedCarbonContext threadLocalCarbonContext;
+    private static RealmService realmService;
 
     @Override
     public void contextInitialized(ServletContextEvent servletContextEvent) {
-
+        threadLocalCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        realmService = (RealmService) threadLocalCarbonContext.getOSGiService(RealmService.class, null);
         UserStoreManager userStoreManager = getUserStoreManager();
         try {
             if (userStoreManager != null) {
@@ -47,7 +50,8 @@ public class AndroidSensePermissionUpdateListener implements ServletContextListe
                     getAuthorizationManager().authorizeRole(AndroidSenseConstants.ROLE_NAME,
                             AndroidSenseConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants.UI_PERMISSION_ACTION);
                 }
-            } } catch (UserStoreException e) {
+            }
+        } catch (UserStoreException e) {
             log.error("Error while creating a role and adding a user for Android Sense.", e);
         }
     }
@@ -57,57 +61,44 @@ public class AndroidSensePermissionUpdateListener implements ServletContextListe
 
     }
 
-    public static UserStoreManager getUserStoreManager() {
+    private UserStoreManager getUserStoreManager() {
-        RealmService realmService;
         UserStoreManager userStoreManager;
         try {
-            PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
-            realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
             if (realmService == null) {
                 String msg = "Realm service has not initialized.";
-                log.error(msg);
                 throw new IllegalStateException(msg);
             }
-            int tenantId = ctx.getTenantId();
+            int tenantId = threadLocalCarbonContext.getTenantId();
             userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager();
             realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
         } catch (UserStoreException e) {
             String msg = "Error occurred while retrieving current user store manager";
-            log.error(msg, e);
             throw new IllegalStateException(msg);
         }
         return userStoreManager;
     }
 
-    public static AuthorizationManager getAuthorizationManager() {
+    private AuthorizationManager getAuthorizationManager() {
-        RealmService realmService;
         AuthorizationManager authorizationManager;
         try {
-            PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
-            realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
             if (realmService == null) {
                 String msg = "Realm service has not initialized.";
-                log.error(msg);
                 throw new IllegalStateException(msg);
             }
-            int tenantId = ctx.getTenantId();
+            int tenantId = threadLocalCarbonContext.getTenantId();
             authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
         } catch (UserStoreException e) {
             String msg = "Error occurred while retrieving current user store manager";
-            log.error(msg, e);
             throw new IllegalStateException(msg);
         }
         return authorizationManager;
     }
 
     private Permission[] getPermissions() {
-
+        Permission androidSense = new Permission(AndroidSenseConstants.PERM_ENROLL_ANDROID_SENSE,
-            Permission androidSense = new Permission(AndroidSenseConstants.PERM_ENROLL_ANDROID_SENSE,
+                CarbonConstants.UI_PERMISSION_ACTION);
-                    CarbonConstants.UI_PERMISSION_ACTION);
+        Permission view = new Permission(AndroidSenseConstants.PERM_OWNING_DEVICE_VIEW,
-            Permission view = new Permission(AndroidSenseConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants
+                CarbonConstants.UI_PERMISSION_ACTION);
-                    .UI_PERMISSION_ACTION);
+        return new Permission[]{androidSense, view};
-
-            return new Permission[]{androidSense, view};
     }
-
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>androidsense-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/androidsense-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>arduino-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>arduino-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/impl/listener/ArduinoPermissionUpdateListener.java

@@ -32,10 +32,13 @@ import javax.servlet.ServletContextListener;
 public class ArduinoPermissionUpdateListener implements ServletContextListener {
 
     private static Log log = LogFactory.getLog(ArduinoPermissionUpdateListener.class);
+    private static PrivilegedCarbonContext threadLocalCarbonContext;
+    private static RealmService realmService;
 
     @Override
     public void contextInitialized(ServletContextEvent servletContextEvent) {
-
+        threadLocalCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        realmService = (RealmService) threadLocalCarbonContext.getOSGiService(RealmService.class, null);
         UserStoreManager userStoreManager = getUserStoreManager();
         try {
             if (userStoreManager != null) {
@@ -47,7 +50,8 @@ public class ArduinoPermissionUpdateListener implements ServletContextListener {
                     getAuthorizationManager().authorizeRole(ArduinoConstants.ROLE_NAME,
                             ArduinoConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants.UI_PERMISSION_ACTION);
                 }
-            } } catch (UserStoreException e) {
+            }
+        } catch (UserStoreException e) {
             log.error("Error while creating a role and adding a user for Arduino.", e);
         }
     }
@@ -57,57 +61,44 @@ public class ArduinoPermissionUpdateListener implements ServletContextListener {
 
     }
 
-    public static UserStoreManager getUserStoreManager() {
+    private UserStoreManager getUserStoreManager() {
-        RealmService realmService;
         UserStoreManager userStoreManager;
         try {
-            PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
-            realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
             if (realmService == null) {
                 String msg = "Realm service has not initialized.";
-                log.error(msg);
                 throw new IllegalStateException(msg);
             }
-            int tenantId = ctx.getTenantId();
+            int tenantId = threadLocalCarbonContext.getTenantId();
             userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager();
             realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
         } catch (UserStoreException e) {
             String msg = "Error occurred while retrieving current user store manager";
-            log.error(msg, e);
             throw new IllegalStateException(msg);
         }
         return userStoreManager;
     }
 
-    public static AuthorizationManager getAuthorizationManager() {
+    private AuthorizationManager getAuthorizationManager() {
-        RealmService realmService;
         AuthorizationManager authorizationManager;
         try {
-            PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
-            realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
             if (realmService == null) {
                 String msg = "Realm service has not initialized.";
-                log.error(msg);
                 throw new IllegalStateException(msg);
             }
-            int tenantId = ctx.getTenantId();
+            int tenantId = threadLocalCarbonContext.getTenantId();
             authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
         } catch (UserStoreException e) {
             String msg = "Error occurred while retrieving current user store manager";
-            log.error(msg, e);
             throw new IllegalStateException(msg);
         }
         return authorizationManager;
     }
 
     private Permission[] getPermissions() {
-
+        Permission androidSense = new Permission(ArduinoConstants.PERM_ENROLL_ARDUINO,
-            Permission androidSense = new Permission(ArduinoConstants.PERM_ENROLL_ARDUINO,
+                CarbonConstants.UI_PERMISSION_ACTION);
-                    CarbonConstants.UI_PERMISSION_ACTION);
+        Permission view = new Permission(ArduinoConstants.PERM_OWNING_DEVICE_VIEW,
-            Permission view = new Permission(ArduinoConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants
+                CarbonConstants.UI_PERMISSION_ACTION);
-                    .UI_PERMISSION_ACTION);
+        return new Permission[]{androidSense, view};
-
-            return new Permission[]{androidSense, view};
     }
-
 }

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>arduino-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/arduino-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>raspberrypi-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>raspberrypi-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>4.0.94-SNAPSHOT</version>
+		<version>4.0.96-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/listener/RaspberryPIPermissionUpdateListener.java

@@ -32,10 +32,13 @@ import javax.servlet.ServletContextListener;
 public class RaspberryPIPermissionUpdateListener implements ServletContextListener {
 
     private static Log log = LogFactory.getLog(RaspberryPIPermissionUpdateListener.class);
+    private static PrivilegedCarbonContext threadLocalCarbonContext;
+    private static RealmService realmService;
 
     @Override
     public void contextInitialized(ServletContextEvent servletContextEvent) {
-
+        threadLocalCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        realmService = (RealmService) threadLocalCarbonContext.getOSGiService(RealmService.class, null);
         UserStoreManager userStoreManager = getUserStoreManager();
         try {
             if (userStoreManager != null) {
@@ -47,7 +50,8 @@ public class RaspberryPIPermissionUpdateListener implements ServletContextListen
                     getAuthorizationManager().authorizeRole(RaspberrypiConstants.ROLE_NAME,
                             RaspberrypiConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants.UI_PERMISSION_ACTION);
                 }
-            } } catch (UserStoreException e) {
+            }
+        } catch (UserStoreException e) {
             log.error("Error while creating a role and adding a user for Raspberry PI.", e);
         }
     }
@@ -57,57 +61,44 @@ public class RaspberryPIPermissionUpdateListener implements ServletContextListen
 
     }
 
-    public static UserStoreManager getUserStoreManager() {
+    private UserStoreManager getUserStoreManager() {
-        RealmService realmService;
         UserStoreManager userStoreManager;
         try {
-            PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
-            realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
             if (realmService == null) {
                 String msg = "Realm service has not initialized.";
-                log.error(msg);
                 throw new IllegalStateException(msg);
             }
-            int tenantId = ctx.getTenantId();
+            int tenantId = threadLocalCarbonContext.getTenantId();
             userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager();
             realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
         } catch (UserStoreException e) {
             String msg = "Error occurred while retrieving current user store manager";
-            log.error(msg, e);
             throw new IllegalStateException(msg);
         }
         return userStoreManager;
     }
 
-    public static AuthorizationManager getAuthorizationManager() {
+    private AuthorizationManager getAuthorizationManager() {
-        RealmService realmService;
         AuthorizationManager authorizationManager;
         try {
-            PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
-            realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
             if (realmService == null) {
                 String msg = "Realm service has not initialized.";
-                log.error(msg);
                 throw new IllegalStateException(msg);
             }
-            int tenantId = ctx.getTenantId();
+            int tenantId = threadLocalCarbonContext.getTenantId();
             authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
         } catch (UserStoreException e) {
             String msg = "Error occurred while retrieving current user store manager";
-            log.error(msg, e);
             throw new IllegalStateException(msg);
         }
         return authorizationManager;
     }
 
     private Permission[] getPermissions() {
-
+        Permission androidSense = new Permission(RaspberrypiConstants.PERM_ENROLL_RASPBERRYPI,
-            Permission androidSense = new Permission(RaspberrypiConstants.PERM_ENROLL_RASPBERRYPI,
+                CarbonConstants.UI_PERMISSION_ACTION);
-                    CarbonConstants.UI_PERMISSION_ACTION);
+        Permission view = new Permission(RaspberrypiConstants.PERM_OWNING_DEVICE_VIEW,
-            Permission view = new Permission(RaspberrypiConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants
+                CarbonConstants.UI_PERMISSION_ACTION);
-                    .UI_PERMISSION_ACTION);
+        return new Permission[]{androidSense, view};
-
-            return new Permission[]{androidSense, view};
     }
-
 }

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>raspberrypi-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/raspberrypi-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>4.0.94-SNAPSHOT</version>
+		<version>4.0.96-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>virtual-fire-alarm-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>4.0.94-SNAPSHOT</version>
+		<version>4.0.96-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java

@@ -32,10 +32,13 @@ import javax.servlet.ServletContextListener;
 public class VirtualFireAlarmPermissionUpdateListener implements ServletContextListener {
 
     private static Log log = LogFactory.getLog(VirtualFireAlarmPermissionUpdateListener.class);
+    private static PrivilegedCarbonContext threadLocalCarbonContext;
+    private static RealmService realmService;
 
     @Override
     public void contextInitialized(ServletContextEvent servletContextEvent) {
-
+        threadLocalCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        realmService = (RealmService) threadLocalCarbonContext.getOSGiService(RealmService.class, null);
         UserStoreManager userStoreManager = getUserStoreManager();
         try {
             if (userStoreManager != null) {
@@ -47,7 +50,8 @@ public class VirtualFireAlarmPermissionUpdateListener implements ServletContextL
                     getAuthorizationManager().authorizeRole(VirtualFireAlarmConstants.ROLE_NAME,
                             VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants.UI_PERMISSION_ACTION);
                 }
-            } } catch (UserStoreException e) {
+            }
+        } catch (UserStoreException e) {
             log.error("Error while creating a role and adding a user for Raspberry PI.", e);
         }
     }
@@ -57,57 +61,44 @@ public class VirtualFireAlarmPermissionUpdateListener implements ServletContextL
 
     }
 
-    public static UserStoreManager getUserStoreManager() {
+    private UserStoreManager getUserStoreManager() {
-        RealmService realmService;
         UserStoreManager userStoreManager;
         try {
-            PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
-            realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
             if (realmService == null) {
                 String msg = "Realm service has not initialized.";
-                log.error(msg);
                 throw new IllegalStateException(msg);
             }
-            int tenantId = ctx.getTenantId();
+            int tenantId = threadLocalCarbonContext.getTenantId();
             userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager();
             realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
         } catch (UserStoreException e) {
             String msg = "Error occurred while retrieving current user store manager";
-            log.error(msg, e);
             throw new IllegalStateException(msg);
         }
         return userStoreManager;
     }
 
-    public static AuthorizationManager getAuthorizationManager() {
+    private AuthorizationManager getAuthorizationManager() {
-        RealmService realmService;
         AuthorizationManager authorizationManager;
         try {
-            PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
-            realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
             if (realmService == null) {
                 String msg = "Realm service has not initialized.";
-                log.error(msg);
                 throw new IllegalStateException(msg);
             }
-            int tenantId = ctx.getTenantId();
+            int tenantId = threadLocalCarbonContext.getTenantId();
             authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager();
         } catch (UserStoreException e) {
             String msg = "Error occurred while retrieving current user store manager";
-            log.error(msg, e);
             throw new IllegalStateException(msg);
         }
         return authorizationManager;
     }
 
     private Permission[] getPermissions() {
-
+        Permission androidSense = new Permission(VirtualFireAlarmConstants.PERM_ENROLL_FIRE_ALARM,
-            Permission androidSense = new Permission(VirtualFireAlarmConstants.PERM_ENROLL_FIRE_ALARM,
+                CarbonConstants.UI_PERMISSION_ACTION);
-                    CarbonConstants.UI_PERMISSION_ACTION);
+        Permission view = new Permission(VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW,
-            Permission view = new Permission(VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants
+                CarbonConstants.UI_PERMISSION_ACTION);
-                    .UI_PERMISSION_ACTION);
+        return new Permission[]{androidSense, view};
-
-            return new Permission[]{androidSense, view};
     }
-
+}
-}

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>virtual-fire-alarm-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/virtual-fire-alarm-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/pom.xml

@@ -18,7 +18,7 @@
      <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>appm-connector</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>appm-connector</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/appm-connector/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.extension/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.thrift/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>cdmf-transport-adapters</artifactId>
-		<version>4.0.94-SNAPSHOT</version>
+		<version>4.0.96-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.xmpp/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.http/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.xmpp/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mb-extensions</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mb-extensions</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/mb-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>pull-notification-listeners</artifactId>
-		<version>4.0.94-SNAPSHOT</version>
+		<version>4.0.96-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

components/extensions/pull-notification-listeners/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>siddhi-extensions</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>siddhi-extensions</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/src/main/java/org/wso2/extension/siddhi/execution/json/GetPropertyFunctionExtension.java

@@ -33,9 +33,9 @@ import org.wso2.siddhi.query.api.exception.ExecutionPlanValidationException;
  * Accept Type(s): (STRING, STRING)
  * Return Type(s): (STRING|INT|DOUBLE|FLOAT|OBJECT)
  */
-public class getPropertyFunctionExtension extends FunctionExecutor {
+public class GetPropertyFunctionExtension extends FunctionExecutor {
 
-    Attribute.Type returnType = Attribute.Type.STRING;
+    private Attribute.Type returnType = Attribute.Type.STRING;
 
     @Override
     protected void init(ExpressionExecutor[] attributeExpressionExecutors,
@@ -47,32 +47,34 @@ public class getPropertyFunctionExtension extends FunctionExecutor {
         }
         if (attributeExpressionExecutors[0].getReturnType() != Attribute.Type.STRING) {
             throw new ExecutionPlanValidationException(
-                    "Invalid parameter type found for the first argument of json:getProperty() function, " + "required "
+                    "Invalid parameter type found for the first argument of json:getProperty() function, required "
                             + Attribute.Type.STRING + ", but found " + attributeExpressionExecutors[0].getReturnType()
                             .toString());
         }
         if (attributeExpressionExecutors[1].getReturnType() != Attribute.Type.STRING) {
             throw new ExecutionPlanValidationException(
-                    "Invalid parameter type found for the second argument of json:getProperty() function, " + "required "
+                    "Invalid parameter type found for the second argument of json:getProperty() function, required "
-                            + Attribute.Type.STRING + ", but found " + attributeExpressionExecutors[1].getReturnType()
+                            + Attribute.Type.STRING + ", but found "
-                            .toString());
+                            + attributeExpressionExecutors[1].getReturnType().toString());
         }
     }
 
     @Override
     protected Object execute(Object[] data) {
         if (data[0] == null) {
-            throw new ExecutionPlanRuntimeException("Invalid input given to json:getProperty() function. First argument cannot be null");
+            throw new ExecutionPlanRuntimeException("Invalid input given to json:getProperty() function." +
+                    " First argument cannot be null");
         }
         if (data[1] == null) {
-            throw new ExecutionPlanRuntimeException("Invalid input given to json:getProperty() function. Second argument cannot be null");
+            throw new ExecutionPlanRuntimeException("Invalid input given to json:getProperty() function. " +
+                    "Second argument cannot be null");
         }
         String jsonString = (String) data[0];
         String property = (String) data[1];
-        JSONObject jsonObject = null;
+        Object jsonObject;
         try {
-            jsonObject = new JSONObject(jsonString);
+            jsonObject = new JSONObject(jsonString).get(property);
-            return jsonObject.get(property).toString();
+            return jsonObject == null ? null : jsonObject.toString();
         } catch (JSONException e) {
             throw new ExecutionPlanRuntimeException("Cannot parse JSON String in json:getPeroperty() function. " + e);
         }
@@ -80,7 +82,8 @@ public class getPropertyFunctionExtension extends FunctionExecutor {
 
     @Override
     protected Object execute(Object data) {
-        return null;  //Since the getProperty function takes in 2 parameters, this method does not get called. Hence,not implemented.
+        return null;  //Since the getProperty function takes in 2 parameters, this method does not get called.
+                     // Hence,not implemented.
     }
 
     @Override

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/src/main/resources/json.siddhiext

@@ -16,4 +16,4 @@
 # under the License.
 #
 
-getProperty=org.wso2.extension.siddhi.execution.json.getPropertyFunctionExtension
+getProperty=org.wso2.extension.siddhi.execution.json.GetPropertyFunctionExtension

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/src/test/java/org/wso2/extension/siddhi/execution/json/getPropertyFunctionTestCase.java

@@ -45,7 +45,7 @@ public class getPropertyFunctionTestCase {
 
     @Test
     public void testGetPropertyFunctionExtension() throws InterruptedException {
-        log.info("getPropertyFunctionExtension TestCase");
+        log.info("GetPropertyFunctionExtension TestCase");
         SiddhiManager siddhiManager = new SiddhiManager();
 
         String inStreamDefinition = "define stream inputStream (payload string, id string, volume long);";

components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>siddhi-extensions</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/siddhi-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.94-SNAPSHOT</version>
+        <version>4.0.96-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.mobile.android.ui</artifactId>
-    <version>4.0.94-SNAPSHOT</version>
+    <version>4.0.96-SNAPSHOT</version>
     <name>WSO2 Carbon - Mobile Android UI</name>
     <packaging>pom</packaging>