Merge pull request #1203 from lasanthaDLPDS/master

Adding debug logs and formatting the source

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementPluginRepository.java

@@ -71,6 +71,9 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
         String deviceType = provider.getType();
         ProvisioningConfig provisioningConfig = provider.getProvisioningConfig();
         String tenantDomain = provisioningConfig.getProviderTenantDomain();
+        if (log.isDebugEnabled()) {
+            log.debug(deviceType + " device type is added for tenant : " + tenantDomain);
+        }
         DeviceManagementConfig deviceManagementConfig = DeviceConfigurationManager.getInstance().getDeviceManagementConfig();
         boolean isSharedWithAllTenants = provisioningConfig.isSharedWithAllTenants();
         int tenantId = DeviceManagerUtil.getTenantId(tenantDomain);
@@ -125,6 +128,9 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
     public void removeDeviceManagementProvider(DeviceManagementService provider)
             throws DeviceManagementException {
         String deviceTypeName = provider.getType();
+        if (log.isDebugEnabled()) {
+            log.debug(deviceTypeName + " device type is removed.");
+        }
         DeviceManagementConfig deviceManagementConfig = DeviceConfigurationManager.getInstance()
                 .getDeviceManagementConfig();
         DeviceTypeServiceIdentifier deviceTypeIdentifier;
@@ -152,6 +158,14 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
     private void unregisterPushNotificationStrategy(DeviceTypeServiceIdentifier deviceTypeIdentifier) {
         OperationManager operationManager = operationManagerRepository.getOperationManager(
                 deviceTypeIdentifier);
+        if (log.isDebugEnabled()) {
+            log.debug(deviceTypeIdentifier.getDeviceType() + " device type management service is " +
+                              "retrieved for tenant id: " + deviceTypeIdentifier.getTenantId());
+            for (Map.Entry<DeviceTypeServiceIdentifier, DeviceManagementServiceHolder> entry : providers.entrySet()) {
+                log.debug("Device Type : " + entry.getKey().getDeviceType() + " Tenant Id : " +
+                                  entry.getKey().getTenantId());
+            }
+        }
         if (operationManager != null) {
             NotificationStrategy notificationStrategy = operationManager.getNotificationStrategy();
             if (notificationStrategy != null) {
@@ -165,6 +179,13 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
         //Priority need to be given to the tenant before public.
         DeviceTypeServiceIdentifier deviceTypeIdentifier = new DeviceTypeServiceIdentifier(type, tenantId);
         DeviceManagementServiceHolder provider = providers.get(deviceTypeIdentifier);
+        if (log.isDebugEnabled()) {
+            log.debug(type + " device type management service is retrieved for tenant id: " + tenantId);
+            for (Map.Entry<DeviceTypeServiceIdentifier, DeviceManagementServiceHolder> entry : providers.entrySet()) {
+                log.debug("Device Type : " + entry.getKey().getDeviceType() + " Tenant Id : " +
+                                  entry.getKey().getTenantId());
+            }
+        }
         if (provider == null) {
             deviceTypeIdentifier = new DeviceTypeServiceIdentifier(type);
             provider = providers.get(deviceTypeIdentifier);
@@ -310,6 +331,9 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
         DeviceTaskManagerService deviceTaskManagerService = DeviceManagementDataHolder.getInstance().
                 getDeviceTaskManagerService();
         DeviceStatusTaskPluginConfig deviceStatusTaskPluginConfig = deviceManagementService.getDeviceStatusTaskPluginConfig();
+        if (log.isDebugEnabled()) {
+            log.debug(deviceType + " device type status monitoring task is registered.");
+        }
         if (deviceStatusTaskPluginConfig != null && deviceStatusTaskPluginConfig.isRequireStatusMonitoring()) {
             if (deviceTaskManagerService == null) {
                 DeviceManagementDataHolder.getInstance().addDeviceStatusTaskPluginConfig(deviceType,
@@ -330,6 +354,9 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
         DeviceStatusTaskManagerService deviceStatusTaskManagerService = DeviceManagementDataHolder.getInstance().
                 getDeviceStatusTaskManagerService();
         DeviceStatusTaskPluginConfig deviceStatusTaskPluginConfig = deviceManagementService.getDeviceStatusTaskPluginConfig();
+        if (log.isDebugEnabled()) {
+            log.debug(deviceType + " device type status monitoring task is unregistered.");
+        }
         if (deviceStatusTaskPluginConfig != null && deviceStatusTaskPluginConfig.isRequireStatusMonitoring()) {
             try {
                 DeviceManagementDataHolder.getInstance().removeDeviceStatusTaskPluginConfig(deviceType);
@@ -346,6 +373,9 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
     public OperationManager getOperationManager(String deviceType, int tenantId) {
         //Priority need to be given to the tenant before public.
         DeviceTypeServiceIdentifier deviceTypeIdentifier = new DeviceTypeServiceIdentifier(deviceType, tenantId);
+        if (log.isDebugEnabled()) {
+            log.debug(deviceType + " device type operation manager is retrieved for tenant: ." + tenantId);
+        }
         if (getDeviceManagementService(deviceType, tenantId) == null) {
             return null;
         }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/device-api.jag

@@ -74,13 +74,13 @@ if (!user) {
         } else {
             result = 400;
         }
-    }else if (uriMatcher.match("/{context}/api/devices/sketch/generate_link")) {
+    } else if (uriMatcher.match("/{context}/api/devices/sketch/generate_link")) {
 
         if (!request.getContent()){
             log.error("Request Payload Is Empty");
             // HTTP status code 400 refers to - Bad request.
             result = 400;
-        }else{
+        } else{
             deviceType = request.getContent()["deviceType"];
             queryString = "?deviceName=" + request.getContent()["deviceName"] +"&deviceType="+
                 request.getContent()["deviceType"]+"&sketchType="+request.getContent()["sketchType"];

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/public/js/operation-bar.js

@@ -52,22 +52,21 @@ function submitForm(formId) {
             uriencodedQueryStr += prefix + input.attr("id") + "=" + input.val();
         } else if (input.data("param-type") == "form") {
             var prefix = (uriencodedFormStr == "") ? "" : "&";
-            if (input.attr("type") == "checkbox" || input.attr("type") == "radio"){
+            if (input.attr("type") == "checkbox" || input.attr("type") == "radio") {
-
+                if (isItemSelected == undefined) {
-                if (isItemSelected == undefined){
                     isItemSelected = false;
                 }
-                if (input.is(':checked')){
+                if (input.is(':checked')) {
                     isItemSelected = true;
                     uriencodedFormStr += prefix + input.attr("name") + "=" + input.val();
                 }
-            }else{
+            } else {
                 uriencodedFormStr += prefix + input.attr("id") + "=" + input.val();
             }
         }
     });
 
-    if (isItemSelected === false){
+    if (isItemSelected === false) {
         title.html("Please Select One Option");
         statusIcon.attr("class", defaultStatusClasses + " fw-error");
         $(modalPopupContent).html(content.html());