refactor packaging of siddhi extensions

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;

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;

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;

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;

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;

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;

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;

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;

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.

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;

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;

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 {
 

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;
 

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.

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.

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.

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.

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;

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;

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;

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;

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
+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

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;

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;

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;

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;
 

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 {
 

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;

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;

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 {
 

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/testng.xml

@@ -24,8 +24,8 @@
 
     <test name="Extension Unit Tests" preserve-order="true">
         <classes>
-            <class name="org.wso2.extension.siddhi.device.BaseDeviceManagementTest"/>
-            <class name="org.wso2.extension.siddhi.device.ExtensionTestCase"/>
+            <class name="io.entgra.device.mgt.plugins.extension.siddhi.device.BaseDeviceManagementTest"/>
+            <class name="io.entgra.device.mgt.plugins.extension.siddhi.device.ExtensionTestCase"/>
         </classes>
     </test>
 </suite>

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;

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;

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
+getProperty=io.entgra.device.mgt.plugins.extension.siddhi.execution.json.GetPropertyFunctionExtension
+getArray=io.entgra.device.mgt.plugins.extension.siddhi.execution.json.GetArrayFunctionExtension

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;
 

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;
 

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/src/test/resources/testng.xml

@@ -24,7 +24,7 @@
 
     <test name="Extension Unit Tests" preserve-order="true">
         <classes>
-            <class name="org.wso2.extension.siddhi.execution.json.ExtensionTestCase"/>
+            <class name="io.entgra.device.mgt.plugins.extension.siddhi.execution.json.ExtensionTestCase"/>
         </classes>
     </test>
 </suite>