From 6bfca3c3aa2fac91a35c98ff6b203b4dee0aa5fc Mon Sep 17 00:00:00 2001 From: Gathika94 Date: Wed, 11 Oct 2017 16:39:37 +0530 Subject: [PATCH 1/2] fixed some version issues in pom files --- .../pom.xml | 22 ++++++++++++++++++- .../IsDeviceInGroupFunctionExecutor.java | 5 +++-- .../pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/pom.xml b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/pom.xml index 4e664f830c..31044dcdd6 100644 --- a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/pom.xml +++ b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.devicemgt-plugins siddhi-extensions - 4.0.86-SNAPSHOT + 4.0.88-SNAPSHOT ../pom.xml @@ -86,6 +86,26 @@ javax.cache.wso2 test + + commons-logging + commons-logging-api + RELEASE + + + org.wso2.carbon.devicemgt-plugins + org.wso2.carbon.appmgt.mdm.restconnector + 4.0.88-SNAPSHOT + + + asm + asm + RELEASE + + + asm + asm + RELEASE + diff --git a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/src/main/java/org/wso2/extension/siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/src/main/java/org/wso2/extension/siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java index 93a7ad1c06..efb6dc6ce4 100644 --- a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/src/main/java/org/wso2/extension/siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java +++ b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/src/main/java/org/wso2/extension/siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java @@ -31,6 +31,7 @@ import org.wso2.siddhi.core.executor.function.FunctionExecutor; import org.wso2.siddhi.query.api.definition.Attribute; import org.wso2.siddhi.query.api.exception.ExecutionPlanValidationException; + /** * isDeviceInGroup(deviceId , groupId) * Returns true if device belongs to group, otherwise false. @@ -50,10 +51,10 @@ public class IsDeviceInGroupFunctionExecutor extends FunctionExecutor { "Invalid no of arguments passed to group:isDeviceInGroup() function, required 3, but found " + attributeExpressionExecutors.length); } - if (attributeExpressionExecutors[0].getReturnType() != Attribute.Type.INT) { + if (attributeExpressionExecutors[0].getReturnType()!= Attribute.Type.INT) { throw new ExecutionPlanValidationException( "Invalid parameter type found for the first argument (group id) of group:isDeviceInGroup() " + - "function, required " + Attribute.Type.INT + ", but found " + + "function, required " + org.wso2.siddhi.query.api.definition.Attribute.Type.INT + ", but found " + attributeExpressionExecutors[0].getReturnType().toString()); } if (attributeExpressionExecutors[1].getReturnType() != Attribute.Type.STRING) { diff --git a/features/extensions-feature/org.wso2.extension.siddhi.devicegroup.feature/pom.xml b/features/extensions-feature/org.wso2.extension.siddhi.devicegroup.feature/pom.xml index 7263fcfd1b..340dd59c77 100644 --- a/features/extensions-feature/org.wso2.extension.siddhi.devicegroup.feature/pom.xml +++ b/features/extensions-feature/org.wso2.extension.siddhi.devicegroup.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.devicemgt-plugins extensions-feature - 4.0.86-SNAPSHOT + 4.0.88-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index a75dde1783..1db0d2d723 100644 --- a/pom.xml +++ b/pom.xml @@ -1179,7 +1179,7 @@ 1.1.1 - 3.0.135 + 3.0.136-SNAPSHOT [3.0.0, 4.0.0) From 83faa0461c28936bb2d7a2653a9e9f968d4c91b3 Mon Sep 17 00:00:00 2001 From: Gathika94 Date: Wed, 11 Oct 2017 16:55:56 +0530 Subject: [PATCH 2/2] minor changes --- .../siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/src/main/java/org/wso2/extension/siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/src/main/java/org/wso2/extension/siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java index efb6dc6ce4..5072b6385c 100644 --- a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/src/main/java/org/wso2/extension/siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java +++ b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/src/main/java/org/wso2/extension/siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java @@ -54,7 +54,7 @@ public class IsDeviceInGroupFunctionExecutor extends FunctionExecutor { if (attributeExpressionExecutors[0].getReturnType()!= Attribute.Type.INT) { throw new ExecutionPlanValidationException( "Invalid parameter type found for the first argument (group id) of group:isDeviceInGroup() " + - "function, required " + org.wso2.siddhi.query.api.definition.Attribute.Type.INT + ", but found " + + "function, required " + Attribute.Type.INT + ", but found " + attributeExpressionExecutors[0].getReturnType().toString()); } if (attributeExpressionExecutors[1].getReturnType() != Attribute.Type.STRING) {