From 9c82589af2a0d7c28a3e85aba7c7417747b370a7 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 28 Jul 2016 14:28:28 +0530 Subject: [PATCH 1/6] fixed formatting issues --- .../public/js/connectedcup.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/public/js/connectedcup.js b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/public/js/connectedcup.js index 489e63d8..f3bc3023 100644 --- a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/public/js/connectedcup.js +++ b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/public/js/connectedcup.js @@ -230,9 +230,7 @@ function drawGraph_connectedcup(from, to) { drawTemperatureLineGraph(JSON.parse(data)); } }; - invokerUtil.get(backendApiUrl, successCallback, function (message) { - console.log(message); - }); + invokerUtil.get(backendApiUrl, successCallback, function (message) {}); var coffeeLevelApiUrl = $("#connectedcup-div-chart").data("backend-api-url") + "/sensors/coffeelevel" + "?from=" + from + "&to=" + to; @@ -286,10 +284,10 @@ function drawGraph_connectedcup(from, to) { var chartData = []; for (var i = 0; i < data.length; i++) { chartData.push( - { - x: parseInt(data[i].values.time) - tzOffset, - y: parseInt(data[i].values.temperature) - } + { + x: parseInt(data[i].values.time) - tzOffset, + y: parseInt(data[i].values.temperature) + } ); } From 5991eeec58864d45b73e9e2174594885773fb50d Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 28 Jul 2016 14:32:30 +0530 Subject: [PATCH 2/6] added missing log --- .../main/java/org/coffeeking/api/ConnectedCupServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java b/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java index ca23eaf9..5e4247b3 100644 --- a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java +++ b/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java @@ -147,6 +147,7 @@ public class ConnectedCupServiceImpl implements ConnectedCupService { device.setEnrolmentInfo(enrolmentInfo); return APIUtil.getDeviceManagementService().enrollDevice(device); } catch (DeviceManagementException e) { + log.error("Failed to enroll device with device name :" + name, e); return false; } } From f072fb260aecab6482217f9086efac8b5d49aedb Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 28 Jul 2016 14:43:24 +0530 Subject: [PATCH 3/6] Changed to commons logging --- .../mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java b/modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java index 9fe24b2c..3e0adfaf 100644 --- a/modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java +++ b/modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java @@ -18,7 +18,8 @@ package org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization; -import org.apache.log4j.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.dna.mqtt.moquette.server.IAuthorizer; import org.wso2.andes.configuration.enums.MQTTAuthoriztionPermissionLevel; import org.wso2.andes.mqtt.MQTTAuthorizationSubject; @@ -36,7 +37,8 @@ import java.util.List; * This is just a simple authorization model. For dynamic topics use an implementation based on IAuthorizer */ public class DeviceAccessBasedMQTTAuthorizer implements IAuthorizer { - private static final Logger logger = Logger.getLogger(DeviceAccessBasedMQTTAuthorizer.class); + + private static Log logger = LogFactory.getLog(DeviceAccessBasedMQTTAuthorizer.class); private static final String CONNECTION_PERMISSION = "/permission/admin/device-mgt/user"; private static final String ADMIN_PERMISSION = "/permission/admin/device-mgt/admin"; private static final String SCOPE_IDENTIFIER = "scope"; From 1033dfd40efb8bf326f8f7796681b333041e9bb1 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 28 Jul 2016 15:22:07 +0530 Subject: [PATCH 4/6] added missng log trace --- .../main/java/org/coffeeking/api/ConnectedCupServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java b/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java index 5e4247b3..d88cad8d 100644 --- a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java +++ b/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java @@ -97,10 +97,10 @@ public class ConnectedCupServiceImpl implements ConnectedCupService { return Response.ok().entity(sensorDatas).build(); } catch (AnalyticsException e) { String errorMsg = "Error on retrieving stats on table " + sensorTableName + " with query " + query; - log.error(errorMsg); + log.error(errorMsg, e); return Response.status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()).entity(errorMsg).build(); } catch (DeviceAccessAuthorizationException e) { - log.error(e.getErrorMessage()); + log.error(e.getErrorMessage(), e); return Response.status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()).build(); } } From c9736707cad38c5cafe01c90c363e91f93e74a18 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 28 Jul 2016 15:37:16 +0530 Subject: [PATCH 5/6] fixed the formatting issues. --- .../src/repository/jaggeryapps/api-store/jagg.jag | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/distribution/src/repository/jaggeryapps/api-store/jagg.jag b/modules/distribution/src/repository/jaggeryapps/api-store/jagg.jag index 2ad77a05..c1068ed4 100644 --- a/modules/distribution/src/repository/jaggeryapps/api-store/jagg.jag +++ b/modules/distribution/src/repository/jaggeryapps/api-store/jagg.jag @@ -107,14 +107,14 @@ var jagg = jagg || (function () { var getThemeFile = function (path) { var p, index, theme = getUserTheme(); - if(theme.tenant_theme) { + if (theme.tenant_theme) { p = getTenantThemePath() + path; index = p.indexOf("?"); - if(new File(p.substring(0, index == -1 ? p.length : index)).isExists()) { + if (new File(p.substring(0, index == -1 ? p.length : index)).isExists()) { return p; } } - if(theme.subtheme) { + if (theme.subtheme) { p = getThemePath() + "subthemes/" + theme.subtheme + "/" + path; index = p.indexOf("?"); if(new File(p.substring(0, index == -1 ? p.length : index)).isExists()) { From dca55c73852e621175bcf44800ee9b19cd95178f Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 28 Jul 2016 15:40:55 +0530 Subject: [PATCH 6/6] fixed formatting issues and removed storing error message --- .../ConnectedCupDeviceMgtPluginException.java | 13 ------------- .../plugin/impl/dao/util/ConnectedCupUtils.java | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/exception/ConnectedCupDeviceMgtPluginException.java b/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/exception/ConnectedCupDeviceMgtPluginException.java index 8428559d..4c9b36ac 100644 --- a/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/exception/ConnectedCupDeviceMgtPluginException.java +++ b/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/exception/ConnectedCupDeviceMgtPluginException.java @@ -20,29 +20,16 @@ package org.coffeeking.connectedcup.plugin.exception; public class ConnectedCupDeviceMgtPluginException extends Exception{ - private String errorMessage; - - public String getErrorMessage() { - return errorMessage; - } - - public void setErrorMessage(String errorMessage) { - this.errorMessage = errorMessage; - } - public ConnectedCupDeviceMgtPluginException(String msg, Exception nestedEx) { super(msg, nestedEx); - setErrorMessage(msg); } public ConnectedCupDeviceMgtPluginException(String message, Throwable cause) { super(message, cause); - setErrorMessage(message); } public ConnectedCupDeviceMgtPluginException(String msg) { super(msg); - setErrorMessage(msg); } public ConnectedCupDeviceMgtPluginException() { diff --git a/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/util/ConnectedCupUtils.java b/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/util/ConnectedCupUtils.java index fce7c509..9c25f256 100644 --- a/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/util/ConnectedCupUtils.java +++ b/modules/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/util/ConnectedCupUtils.java @@ -38,8 +38,8 @@ public class ConnectedCupUtils { public static String getDeviceProperty(List deviceProperties, String propertyKey) { String deviceProperty = ""; - for(Device.Property property :deviceProperties){ - if(propertyKey.equals(property.getName())){ + for (Device.Property property : deviceProperties) { + if (propertyKey.equals(property.getName())) { deviceProperty = property.getValue(); } }