From 7c38a7280bad53050e75c49276f881045b33f99a Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Wed, 3 May 2023 14:59:05 +0530 Subject: [PATCH] refactor packaging of siddhi extensions --- .../device/AddNotificationFunctionProcessor.java | 4 ++-- .../device/AddOperationFunctionProcessor.java | 12 ++++++------ .../GetDevicesOfStatusFunctionExecutor.java | 4 ++-- .../device/GetDevicesOfUserFunctionExecutor.java | 4 ++-- .../HasDevicesOfStatusFunctionExecutor.java | 4 ++-- .../device/HasDevicesOfUserFunctionExecutor.java | 4 ++-- .../device/IsEnrolledFunctionExecutor.java | 4 ++-- .../siddhi/device/IsInGroupFunctionExecutor.java | 4 ++-- .../device/client/OAuthRequestInterceptor.java | 16 ++++++++-------- .../client/configs/SiddhiExtensionConfig.java | 2 +- .../configs/SiddhiExtensionConfigReader.java | 6 +++--- .../device/client/dto/OAuthApplication.java | 2 +- .../device/client/dto/OperationRequest.java | 2 +- .../device/client/dto/RegistrationProfile.java | 2 +- .../client/exception/APIMClientException.java | 2 +- .../exception/APIMClientOAuthException.java | 2 +- .../InvalidConfigurationStateException.java | 2 +- .../device/client/services/DCRService.java | 6 +++--- .../device/client/services/OperationService.java | 4 ++-- .../siddhi/device/utils/ClientUtils.java | 2 +- .../siddhi/device/utils/DeviceUtils.java | 2 +- .../src/main/resources/device.siddhiext | 16 ++++++++-------- .../siddhi/device/BaseDeviceManagementTest.java | 6 +++--- .../siddhi/device/ExtensionTestCase.java | 10 +++++----- .../siddhi/device}/util/DataSourceConfig.java | 2 +- .../siddhi/device}/util/SiddhiTestHelper.java | 2 +- .../siddhi/device}/util/TestDataHolder.java | 3 +-- .../util/TestDeviceManagementService.java | 2 +- .../siddhi/device}/util/TestDeviceManager.java | 2 +- .../extension/siddhi/device}/util/TestUtils.java | 4 +--- .../src/test/resources/testng.xml | 4 ++-- .../json/GetArrayFunctionExtension.java | 2 +- .../json/GetPropertyFunctionExtension.java | 2 +- .../src/main/resources/json.siddhiext | 4 ++-- .../siddhi/execution/json/ExtensionTestCase.java | 4 ++-- .../execution/json}/util/SiddhiTestHelper.java | 2 +- .../src/test/resources/testng.xml | 2 +- 37 files changed, 77 insertions(+), 80 deletions(-) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/AddNotificationFunctionProcessor.java (98%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/AddOperationFunctionProcessor.java (95%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/GetDevicesOfStatusFunctionExecutor.java (97%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/GetDevicesOfUserFunctionExecutor.java (97%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/HasDevicesOfStatusFunctionExecutor.java (97%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/HasDevicesOfUserFunctionExecutor.java (97%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/IsEnrolledFunctionExecutor.java (97%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/IsInGroupFunctionExecutor.java (97%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/client/OAuthRequestInterceptor.java (86%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/client/configs/SiddhiExtensionConfig.java (96%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/client/configs/SiddhiExtensionConfigReader.java (92%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/client/dto/OAuthApplication.java (94%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/client/dto/OperationRequest.java (94%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/client/dto/RegistrationProfile.java (95%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/client/exception/APIMClientException.java (95%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/client/exception/APIMClientOAuthException.java (95%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/client/exception/InvalidConfigurationStateException.java (96%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/client/services/DCRService.java (80%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/client/services/OperationService.java (88%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/utils/ClientUtils.java (99%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/utils/DeviceUtils.java (98%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/BaseDeviceManagementTest.java (95%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/device/ExtensionTestCase.java (97%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/{org/wso2/extension/siddhi/device/test => io/entgra/device/mgt/plugins/extension/siddhi/device}/util/DataSourceConfig.java (96%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/{org/wso2/extension/siddhi/device/test => io/entgra/device/mgt/plugins/extension/siddhi/device}/util/SiddhiTestHelper.java (94%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/{org/wso2/extension/siddhi/device/test => io/entgra/device/mgt/plugins/extension/siddhi/device}/util/TestDataHolder.java (97%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/{org/wso2/extension/siddhi/device/test => io/entgra/device/mgt/plugins/extension/siddhi/device}/util/TestDeviceManagementService.java (98%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/{org/wso2/extension/siddhi/device/test => io/entgra/device/mgt/plugins/extension/siddhi/device}/util/TestDeviceManager.java (98%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/{org/wso2/extension/siddhi/device/test => io/entgra/device/mgt/plugins/extension/siddhi/device}/util/TestUtils.java (94%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/execution/json/GetArrayFunctionExtension.java (97%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/execution/json/GetPropertyFunctionExtension.java (98%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/{org/wso2 => io/entgra/device/mgt/plugins}/extension/siddhi/execution/json/ExtensionTestCase.java (97%) rename components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/{org/wso2/extension/siddhi/execution/json/test => io/entgra/device/mgt/plugins/extension/siddhi/execution/json}/util/SiddhiTestHelper.java (94%) diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/AddNotificationFunctionProcessor.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/AddNotificationFunctionProcessor.java similarity index 98% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/AddNotificationFunctionProcessor.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/AddNotificationFunctionProcessor.java index ec9cfd347..c3ef314ba 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/AddNotificationFunctionProcessor.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/AddNotificationFunctionProcessor.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device; +package io.entgra.device.mgt.plugins.extension.siddhi.device; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,7 +24,7 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.notification.mgt.Notification; import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementException; import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementService; -import org.wso2.extension.siddhi.device.utils.DeviceUtils; +import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils; import org.wso2.siddhi.core.config.ExecutionPlanContext; import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException; import org.wso2.siddhi.core.executor.ExpressionExecutor; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/AddOperationFunctionProcessor.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/AddOperationFunctionProcessor.java similarity index 95% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/AddOperationFunctionProcessor.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/AddOperationFunctionProcessor.java index f3abc1a99..533b7b5e4 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/AddOperationFunctionProcessor.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/AddOperationFunctionProcessor.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device; +package io.entgra.device.mgt.plugins.extension.siddhi.device; import feign.Feign; import feign.Logger; @@ -30,11 +30,11 @@ import org.apache.commons.logging.LogFactory; import org.json.JSONArray; import org.wso2.carbon.device.mgt.common.operation.mgt.Activity; import org.wso2.carbon.device.mgt.common.operation.mgt.Operation; -import org.wso2.extension.siddhi.device.client.OAuthRequestInterceptor; -import org.wso2.extension.siddhi.device.client.configs.SiddhiExtensionConfigReader; -import org.wso2.extension.siddhi.device.client.dto.OperationRequest; -import org.wso2.extension.siddhi.device.client.services.OperationService; -import org.wso2.extension.siddhi.device.utils.ClientUtils; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.OAuthRequestInterceptor; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.configs.SiddhiExtensionConfigReader; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto.OperationRequest; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.services.OperationService; +import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.ClientUtils; import org.wso2.siddhi.core.config.ExecutionPlanContext; import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException; import org.wso2.siddhi.core.executor.ExpressionExecutor; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/GetDevicesOfStatusFunctionExecutor.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/GetDevicesOfStatusFunctionExecutor.java similarity index 97% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/GetDevicesOfStatusFunctionExecutor.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/GetDevicesOfStatusFunctionExecutor.java index 9407c37ce..3131258a3 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/GetDevicesOfStatusFunctionExecutor.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/GetDevicesOfStatusFunctionExecutor.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device; +package io.entgra.device.mgt.plugins.extension.siddhi.device; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,7 +25,7 @@ import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; -import org.wso2.extension.siddhi.device.utils.DeviceUtils; +import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils; import org.wso2.siddhi.core.config.ExecutionPlanContext; import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException; import org.wso2.siddhi.core.executor.ExpressionExecutor; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/GetDevicesOfUserFunctionExecutor.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/GetDevicesOfUserFunctionExecutor.java similarity index 97% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/GetDevicesOfUserFunctionExecutor.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/GetDevicesOfUserFunctionExecutor.java index 82c278b25..930113de3 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/GetDevicesOfUserFunctionExecutor.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/GetDevicesOfUserFunctionExecutor.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device; +package io.entgra.device.mgt.plugins.extension.siddhi.device; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,7 +24,7 @@ import org.json.JSONArray; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; -import org.wso2.extension.siddhi.device.utils.DeviceUtils; +import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils; import org.wso2.siddhi.core.config.ExecutionPlanContext; import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException; import org.wso2.siddhi.core.executor.ExpressionExecutor; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/HasDevicesOfStatusFunctionExecutor.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/HasDevicesOfStatusFunctionExecutor.java similarity index 97% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/HasDevicesOfStatusFunctionExecutor.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/HasDevicesOfStatusFunctionExecutor.java index 5f62c99a4..55131dab8 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/HasDevicesOfStatusFunctionExecutor.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/HasDevicesOfStatusFunctionExecutor.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device; +package io.entgra.device.mgt.plugins.extension.siddhi.device; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,7 +24,7 @@ import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; -import org.wso2.extension.siddhi.device.utils.DeviceUtils; +import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils; import org.wso2.siddhi.core.config.ExecutionPlanContext; import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException; import org.wso2.siddhi.core.executor.ExpressionExecutor; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/HasDevicesOfUserFunctionExecutor.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/HasDevicesOfUserFunctionExecutor.java similarity index 97% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/HasDevicesOfUserFunctionExecutor.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/HasDevicesOfUserFunctionExecutor.java index 1f5d6f664..5b3ffe0f9 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/HasDevicesOfUserFunctionExecutor.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/HasDevicesOfUserFunctionExecutor.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device; +package io.entgra.device.mgt.plugins.extension.siddhi.device; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,7 +24,7 @@ import org.json.JSONArray; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; -import org.wso2.extension.siddhi.device.utils.DeviceUtils; +import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils; import org.wso2.siddhi.core.config.ExecutionPlanContext; import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException; import org.wso2.siddhi.core.executor.ExpressionExecutor; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/IsEnrolledFunctionExecutor.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/IsEnrolledFunctionExecutor.java similarity index 97% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/IsEnrolledFunctionExecutor.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/IsEnrolledFunctionExecutor.java index f57db2435..845a3e039 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/IsEnrolledFunctionExecutor.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/IsEnrolledFunctionExecutor.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device; +package io.entgra.device.mgt.plugins.extension.siddhi.device; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,7 +25,7 @@ import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService; -import org.wso2.extension.siddhi.device.utils.DeviceUtils; +import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils; import org.wso2.siddhi.core.config.ExecutionPlanContext; import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException; import org.wso2.siddhi.core.executor.ExpressionExecutor; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/IsInGroupFunctionExecutor.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/IsInGroupFunctionExecutor.java similarity index 97% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/IsInGroupFunctionExecutor.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/IsInGroupFunctionExecutor.java index 56b52ef95..a43d1bf41 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/IsInGroupFunctionExecutor.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/IsInGroupFunctionExecutor.java @@ -16,14 +16,14 @@ * under the License. */ -package org.wso2.extension.siddhi.device; +package io.entgra.device.mgt.plugins.extension.siddhi.device; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException; import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService; -import org.wso2.extension.siddhi.device.utils.DeviceUtils; +import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils; import org.wso2.siddhi.core.config.ExecutionPlanContext; import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException; import org.wso2.siddhi.core.executor.ExpressionExecutor; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/OAuthRequestInterceptor.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/OAuthRequestInterceptor.java similarity index 86% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/OAuthRequestInterceptor.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/OAuthRequestInterceptor.java index 7ef87863d..a7df140f7 100755 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/OAuthRequestInterceptor.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/OAuthRequestInterceptor.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device.client; +package io.entgra.device.mgt.plugins.extension.siddhi.device.client; import feign.Feign; import feign.Logger; @@ -36,13 +36,13 @@ import org.wso2.carbon.identity.jwt.client.extension.JWTClient; import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; import org.wso2.carbon.user.api.UserStoreException; -import org.wso2.extension.siddhi.device.client.configs.SiddhiExtensionConfigReader; -import org.wso2.extension.siddhi.device.client.dto.OAuthApplication; -import org.wso2.extension.siddhi.device.client.dto.RegistrationProfile; -import org.wso2.extension.siddhi.device.client.exception.APIMClientOAuthException; -import org.wso2.extension.siddhi.device.client.services.DCRService; -import org.wso2.extension.siddhi.device.utils.ClientUtils; -import org.wso2.extension.siddhi.device.utils.DeviceUtils; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.configs.SiddhiExtensionConfigReader; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto.OAuthApplication; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto.RegistrationProfile; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.exception.APIMClientOAuthException; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.services.DCRService; +import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.ClientUtils; +import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils; /** * This is a request interceptor to add oauth token header. diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/configs/SiddhiExtensionConfig.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/configs/SiddhiExtensionConfig.java similarity index 96% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/configs/SiddhiExtensionConfig.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/configs/SiddhiExtensionConfig.java index 0021ca690..cfc6c25f8 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/configs/SiddhiExtensionConfig.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/configs/SiddhiExtensionConfig.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device.client.configs; +package io.entgra.device.mgt.plugins.extension.siddhi.device.client.configs; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/configs/SiddhiExtensionConfigReader.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/configs/SiddhiExtensionConfigReader.java similarity index 92% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/configs/SiddhiExtensionConfigReader.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/configs/SiddhiExtensionConfigReader.java index 5a2211463..cb002cafa 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/configs/SiddhiExtensionConfigReader.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/configs/SiddhiExtensionConfigReader.java @@ -16,12 +16,12 @@ * under the License. */ -package org.wso2.extension.siddhi.device.client.configs; +package io.entgra.device.mgt.plugins.extension.siddhi.device.client.configs; import org.w3c.dom.Document; import org.wso2.carbon.utils.CarbonUtils; -import org.wso2.extension.siddhi.device.client.exception.APIMClientException; -import org.wso2.extension.siddhi.device.client.exception.InvalidConfigurationStateException; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.exception.APIMClientException; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.exception.InvalidConfigurationStateException; import javax.xml.XMLConstants; import javax.xml.bind.JAXBContext; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/dto/OAuthApplication.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/dto/OAuthApplication.java similarity index 94% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/dto/OAuthApplication.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/dto/OAuthApplication.java index 46c72e9e3..7fd8ddffc 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/dto/OAuthApplication.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/dto/OAuthApplication.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device.client.dto; +package io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto; public class OAuthApplication { diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/dto/OperationRequest.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/dto/OperationRequest.java similarity index 94% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/dto/OperationRequest.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/dto/OperationRequest.java index bd3d919e3..6b81f5a25 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/dto/OperationRequest.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/dto/OperationRequest.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device.client.dto; +package io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto; import org.wso2.carbon.device.mgt.common.operation.mgt.Operation; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/dto/RegistrationProfile.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/dto/RegistrationProfile.java similarity index 95% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/dto/RegistrationProfile.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/dto/RegistrationProfile.java index ecb0086de..f953de1d8 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/dto/RegistrationProfile.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/dto/RegistrationProfile.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device.client.dto; +package io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto; /** * DTO class to be used when registering an ApiM application. diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/exception/APIMClientException.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/exception/APIMClientException.java similarity index 95% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/exception/APIMClientException.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/exception/APIMClientException.java index 98f3c460b..4fdb3e498 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/exception/APIMClientException.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/exception/APIMClientException.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device.client.exception; +package io.entgra.device.mgt.plugins.extension.siddhi.device.client.exception; /** * This holds api client exception. diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/exception/APIMClientOAuthException.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/exception/APIMClientOAuthException.java similarity index 95% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/exception/APIMClientOAuthException.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/exception/APIMClientOAuthException.java index 731fa3c25..5674832e6 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/exception/APIMClientOAuthException.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/exception/APIMClientOAuthException.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device.client.exception; +package io.entgra.device.mgt.plugins.extension.siddhi.device.client.exception; /** * This holds api client exception. diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/exception/InvalidConfigurationStateException.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/exception/InvalidConfigurationStateException.java similarity index 96% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/exception/InvalidConfigurationStateException.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/exception/InvalidConfigurationStateException.java index 2656fd74b..dca358b09 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/exception/InvalidConfigurationStateException.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/exception/InvalidConfigurationStateException.java @@ -17,7 +17,7 @@ * */ -package org.wso2.extension.siddhi.device.client.exception; +package io.entgra.device.mgt.plugins.extension.siddhi.device.client.exception; /** * This error is thrown when there is an issue with the client. diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/services/DCRService.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/services/DCRService.java similarity index 80% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/services/DCRService.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/services/DCRService.java index c170f9c5b..734de260e 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/services/DCRService.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/services/DCRService.java @@ -16,10 +16,10 @@ * under the License. */ -package org.wso2.extension.siddhi.device.client.services; +package io.entgra.device.mgt.plugins.extension.siddhi.device.client.services; -import org.wso2.extension.siddhi.device.client.dto.OAuthApplication; -import org.wso2.extension.siddhi.device.client.dto.RegistrationProfile; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto.OAuthApplication; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto.RegistrationProfile; import javax.ws.rs.Consumes; import javax.ws.rs.POST; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/services/OperationService.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/services/OperationService.java similarity index 88% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/services/OperationService.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/services/OperationService.java index 9df62e75a..179bf39d6 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/client/services/OperationService.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/services/OperationService.java @@ -16,10 +16,10 @@ * under the License. */ -package org.wso2.extension.siddhi.device.client.services; +package io.entgra.device.mgt.plugins.extension.siddhi.device.client.services; import org.wso2.carbon.device.mgt.common.operation.mgt.Activity; -import org.wso2.extension.siddhi.device.client.dto.OperationRequest; +import io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto.OperationRequest; import javax.ws.rs.Consumes; import javax.ws.rs.POST; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/utils/ClientUtils.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/utils/ClientUtils.java similarity index 99% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/utils/ClientUtils.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/utils/ClientUtils.java index f51d9619a..eb1660d4b 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/utils/ClientUtils.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/utils/ClientUtils.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device.utils; +package io.entgra.device.mgt.plugins.extension.siddhi.device.utils; import okhttp3.OkHttpClient; import org.apache.commons.lang.StringUtils; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/utils/DeviceUtils.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/utils/DeviceUtils.java similarity index 98% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/utils/DeviceUtils.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/utils/DeviceUtils.java index b7109c8b1..1dc859c6a 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/org/wso2/extension/siddhi/device/utils/DeviceUtils.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/utils/DeviceUtils.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.extension.siddhi.device.utils; +package io.entgra.device.mgt.plugins.extension.siddhi.device.utils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/resources/device.siddhiext b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/resources/device.siddhiext index 8b9d47d9f..f7d125c85 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/resources/device.siddhiext +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/resources/device.siddhiext @@ -16,11 +16,11 @@ # under the License. # -isInGroup=org.wso2.extension.siddhi.device.IsInGroupFunctionExecutor -getDevicesOfUser=org.wso2.extension.siddhi.device.GetDevicesOfUserFunctionExecutor -hasDevicesOfUser=org.wso2.extension.siddhi.device.HasDevicesOfUserFunctionExecutor -getDevicesOfStatus=org.wso2.extension.siddhi.device.GetDevicesOfStatusFunctionExecutor -hasDevicesOfStatus=org.wso2.extension.siddhi.device.HasDevicesOfStatusFunctionExecutor -isEnrolled=org.wso2.extension.siddhi.device.IsEnrolledFunctionExecutor -addNotification=org.wso2.extension.siddhi.device.AddNotificationFunctionProcessor -addOperation=org.wso2.extension.siddhi.device.AddOperationFunctionProcessor \ No newline at end of file +isInGroup=io.entgra.device.mgt.plugins.extension.siddhi.device.IsInGroupFunctionExecutor +getDevicesOfUser=io.entgra.device.mgt.plugins.extension.siddhi.device.GetDevicesOfUserFunctionExecutor +hasDevicesOfUser=io.entgra.device.mgt.plugins.extension.siddhi.device.HasDevicesOfUserFunctionExecutor +getDevicesOfStatus=io.entgra.device.mgt.plugins.extension.siddhi.device.GetDevicesOfStatusFunctionExecutor +hasDevicesOfStatus=io.entgra.device.mgt.plugins.extension.siddhi.device.HasDevicesOfStatusFunctionExecutor +isEnrolled=io.entgra.device.mgt.plugins.extension.siddhi.device.IsEnrolledFunctionExecutor +addNotification=io.entgra.device.mgt.plugins.extension.siddhi.device.AddNotificationFunctionProcessor +addOperation=io.entgra.device.mgt.plugins.extension.siddhi.device.AddOperationFunctionProcessor \ No newline at end of file diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/BaseDeviceManagementTest.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/BaseDeviceManagementTest.java similarity index 95% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/BaseDeviceManagementTest.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/BaseDeviceManagementTest.java index 8adabf3fb..860114ea6 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/BaseDeviceManagementTest.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/BaseDeviceManagementTest.java @@ -16,7 +16,7 @@ * under the License. * */ -package org.wso2.extension.siddhi.device; +package io.entgra.device.mgt.plugins.extension.siddhi.device; import org.apache.tomcat.jdbc.pool.PoolProperties; import org.testng.annotations.BeforeClass; @@ -31,8 +31,8 @@ import org.wso2.carbon.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFac import org.wso2.carbon.device.mgt.core.notification.mgt.dao.NotificationManagementDAOFactory; import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; -import org.wso2.extension.siddhi.device.test.util.DataSourceConfig; -import org.wso2.extension.siddhi.device.test.util.TestUtils; +import io.entgra.device.mgt.plugins.extension.siddhi.device.util.DataSourceConfig; +import io.entgra.device.mgt.plugins.extension.siddhi.device.util.TestUtils; import javax.sql.DataSource; import javax.xml.bind.JAXBContext; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/ExtensionTestCase.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/ExtensionTestCase.java similarity index 97% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/ExtensionTestCase.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/ExtensionTestCase.java index 403d0f436..cc7b77ca8 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/ExtensionTestCase.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/ExtensionTestCase.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device; +package io.entgra.device.mgt.plugins.extension.siddhi.device; import org.apache.log4j.Logger; import org.testng.Assert; @@ -46,10 +46,10 @@ import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.user.core.UserStoreException; import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.utils.multitenancy.MultitenantConstants; -import org.wso2.extension.siddhi.device.test.util.SiddhiTestHelper; -import org.wso2.extension.siddhi.device.test.util.TestDataHolder; -import org.wso2.extension.siddhi.device.test.util.TestDeviceManagementService; -import org.wso2.extension.siddhi.device.utils.DeviceUtils; +import io.entgra.device.mgt.plugins.extension.siddhi.device.util.SiddhiTestHelper; +import io.entgra.device.mgt.plugins.extension.siddhi.device.util.TestDataHolder; +import io.entgra.device.mgt.plugins.extension.siddhi.device.util.TestDeviceManagementService; +import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils; import org.wso2.siddhi.core.ExecutionPlanRuntime; import org.wso2.siddhi.core.SiddhiManager; import org.wso2.siddhi.core.event.Event; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/DataSourceConfig.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/DataSourceConfig.java similarity index 96% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/DataSourceConfig.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/DataSourceConfig.java index f787d9b22..4c26ea0cd 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/DataSourceConfig.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/DataSourceConfig.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.extension.siddhi.device.test.util; +package io.entgra.device.mgt.plugins.extension.siddhi.device.util; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/SiddhiTestHelper.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/SiddhiTestHelper.java similarity index 94% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/SiddhiTestHelper.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/SiddhiTestHelper.java index 820cbf154..7a4e961fa 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/SiddhiTestHelper.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/SiddhiTestHelper.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.device.test.util; +package io.entgra.device.mgt.plugins.extension.siddhi.device.util; import java.util.concurrent.atomic.AtomicInteger; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestDataHolder.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestDataHolder.java similarity index 97% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestDataHolder.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestDataHolder.java index 6b482abcb..b1bf12e98 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestDataHolder.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestDataHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wso2.extension.siddhi.device.test.util; +package io.entgra.device.mgt.plugins.extension.siddhi.device.util; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; @@ -26,7 +26,6 @@ import org.wso2.carbon.device.mgt.core.dto.DeviceType; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Properties; public class TestDataHolder { diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestDeviceManagementService.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestDeviceManagementService.java similarity index 98% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestDeviceManagementService.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestDeviceManagementService.java index f90075775..396c50e7a 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestDeviceManagementService.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestDeviceManagementService.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.extension.siddhi.device.test.util; +package io.entgra.device.mgt.plugins.extension.siddhi.device.util; import org.wso2.carbon.device.mgt.common.*; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestDeviceManager.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestDeviceManager.java similarity index 98% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestDeviceManager.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestDeviceManager.java index fdf4c9e1b..d2248d54e 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestDeviceManager.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestDeviceManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wso2.extension.siddhi.device.test.util; +package io.entgra.device.mgt.plugins.extension.siddhi.device.util; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestUtils.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestUtils.java similarity index 94% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestUtils.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestUtils.java index 673b2b521..95ca58da0 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestUtils.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/device/util/TestUtils.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.extension.siddhi.device.test.util; +package io.entgra.device.mgt.plugins.extension.siddhi.device.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -28,8 +28,6 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.util.ArrayList; -import java.util.List; public class TestUtils { diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/testng.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/testng.xml index 2f25f2a58..d42c2290a 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/testng.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/testng.xml @@ -24,8 +24,8 @@ - - + + diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/org/wso2/extension/siddhi/execution/json/GetArrayFunctionExtension.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/execution/json/GetArrayFunctionExtension.java similarity index 97% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/org/wso2/extension/siddhi/execution/json/GetArrayFunctionExtension.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/execution/json/GetArrayFunctionExtension.java index 08712416e..e02347ece 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/org/wso2/extension/siddhi/execution/json/GetArrayFunctionExtension.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/execution/json/GetArrayFunctionExtension.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.execution.json; +package io.entgra.device.mgt.plugins.extension.siddhi.execution.json; import org.json.JSONArray; import org.wso2.siddhi.core.config.ExecutionPlanContext; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/org/wso2/extension/siddhi/execution/json/GetPropertyFunctionExtension.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/execution/json/GetPropertyFunctionExtension.java similarity index 98% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/org/wso2/extension/siddhi/execution/json/GetPropertyFunctionExtension.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/execution/json/GetPropertyFunctionExtension.java index 6bb8ddd72..42898feee 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/org/wso2/extension/siddhi/execution/json/GetPropertyFunctionExtension.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/execution/json/GetPropertyFunctionExtension.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.execution.json; +package io.entgra.device.mgt.plugins.extension.siddhi.execution.json; import org.json.JSONException; import org.json.JSONObject; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/resources/json.siddhiext b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/resources/json.siddhiext index fa4336f4a..85ec79b66 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/resources/json.siddhiext +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/main/resources/json.siddhiext @@ -16,5 +16,5 @@ # under the License. # -getProperty=org.wso2.extension.siddhi.execution.json.GetPropertyFunctionExtension -getArray=org.wso2.extension.siddhi.execution.json.GetArrayFunctionExtension \ No newline at end of file +getProperty=io.entgra.device.mgt.plugins.extension.siddhi.execution.json.GetPropertyFunctionExtension +getArray=io.entgra.device.mgt.plugins.extension.siddhi.execution.json.GetArrayFunctionExtension \ No newline at end of file diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/org/wso2/extension/siddhi/execution/json/ExtensionTestCase.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/execution/json/ExtensionTestCase.java similarity index 97% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/org/wso2/extension/siddhi/execution/json/ExtensionTestCase.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/execution/json/ExtensionTestCase.java index 761336a2d..23ed78e72 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/org/wso2/extension/siddhi/execution/json/ExtensionTestCase.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/execution/json/ExtensionTestCase.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.execution.json; +package io.entgra.device.mgt.plugins.extension.siddhi.execution.json; import org.apache.log4j.Logger; import org.testng.Assert; @@ -28,7 +28,7 @@ import org.wso2.siddhi.core.event.Event; import org.wso2.siddhi.core.query.output.callback.QueryCallback; import org.wso2.siddhi.core.stream.input.InputHandler; import org.wso2.siddhi.core.util.EventPrinter; -import org.wso2.extension.siddhi.execution.json.test.util.SiddhiTestHelper; +import io.entgra.device.mgt.plugins.extension.siddhi.execution.json.util.SiddhiTestHelper; import java.util.concurrent.atomic.AtomicInteger; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/org/wso2/extension/siddhi/execution/json/test/util/SiddhiTestHelper.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/execution/json/util/SiddhiTestHelper.java similarity index 94% rename from components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/org/wso2/extension/siddhi/execution/json/test/util/SiddhiTestHelper.java rename to components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/execution/json/util/SiddhiTestHelper.java index 9cfd6c307..33211ec7a 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/org/wso2/extension/siddhi/execution/json/test/util/SiddhiTestHelper.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/java/io/entgra/device/mgt/plugins/extension/siddhi/execution/json/util/SiddhiTestHelper.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.extension.siddhi.execution.json.test.util; +package io.entgra.device.mgt.plugins.extension.siddhi.execution.json.util; import java.util.concurrent.atomic.AtomicInteger; diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/resources/testng.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/resources/testng.xml index 80918d253..a37dd615f 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/resources/testng.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/resources/testng.xml @@ -24,7 +24,7 @@ - +