refactor packaging of mobile puglins

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml

@@ -53,7 +53,7 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <configuration>
-                    <destFile>../org.wso2.carbon.device.mgt.mobile.android.api/target/coverage-reports/jacoco-unit.exec</destFile>
+                    <destFile>../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec</destFile>
                 </configuration>
                 <executions>
                     <execution>
@@ -69,8 +69,8 @@
                             <goal>report</goal>
                         </goals>
                         <configuration>
-                            <dataFile>../org.wso2.carbon.device.mgt.mobile.android.api/target/coverage-reports/jacoco-unit.exec</dataFile>
+                            <dataFile>../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec</dataFile>
-                            <outputDirectory>../org.wso2.carbon.device.mgt.mobile.android.api/target/coverage-reports/site</outputDirectory>
+                            <outputDirectory>../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/site</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -122,7 +122,7 @@
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
                         <configuration>
-                            <destFile>../org.wso2.carbon.device.mgt.mobile.android.api/target/coverage-reports/jacoco-unit.exec</destFile>
+                            <destFile>../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec</destFile>
                         </configuration>
                         <executions>
                             <execution>
@@ -138,8 +138,8 @@
                                     <goal>report</goal>
                                 </goals>
                                 <configuration>
-                                    <dataFile>../org.wso2.carbon.device.mgt.mobile.android.api/target/coverage-reports/jacoco-unit.exec</dataFile>
+                                    <dataFile>../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec</dataFile>
-                                    <outputDirectory>../org.wso2.carbon.device.mgt.mobile.android.api/target/coverage-reports/site</outputDirectory>
+                                    <outputDirectory>../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/site</outputDirectory>
                                 </configuration>
                             </execution>
                         </executions>

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/AndroidOperation.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import com.google.gson.Gson;
 /*

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/AndroidPlatformConfiguration.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/AppRestriction.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ApplicationInstallation.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ApplicationUninstallation.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ApplicationUpdate.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/BlacklistApplications.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Camera.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/DeviceEncryption.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/DeviceLock.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/DeviceState.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Disenrollment.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ErrorListItem.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/ErrorResponse.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/FileTransfer.java

@@ -15,11 +15,10 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.AndroidOperation;
 
 import java.io.Serializable;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/LockCode.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Notification.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/NotifierFrequency.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/PasscodePolicy.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/UpgradeFirmware.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Vpn.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/WebClip.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/Wifi.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/WipeData.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidApplication.java

@@ -1,4 +1,4 @@
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidDevice.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.wso2.carbon.device.mgt.common.Device;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AndroidDeviceInfo.java

@@ -1,4 +1,4 @@
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 
 import io.swagger.annotations.ApiModel;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/AppRestrictionBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.AppRestriction;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.AppRestriction;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/ApplicationInstallationBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.ApplicationInstallation;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationInstallation;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/ApplicationUninstallationBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.ApplicationUninstallation;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationUninstallation;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/ApplicationUpdateBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.ApplicationUpdate;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationUpdate;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/BlacklistApplicationsBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.BlacklistApplications;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.BlacklistApplications;
 
 import javax.validation.Valid;
 import java.util.List;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/CameraBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.Camera;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.Camera;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/DeviceEnrollmentInfo.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/DeviceLockBeanWrapper.java

@@ -16,11 +16,11 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.DeviceLock;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.DeviceLock;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/DisenrollmentBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.Disenrollment;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.Disenrollment;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/EncryptionBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.DeviceEncryption;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.DeviceEncryption;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/EventBeanWrapper.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/FileTransferBeanWrapper.java

@@ -15,11 +15,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.FileTransfer;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.FileTransfer;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/LockCodeBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.LockCode;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.LockCode;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/NotificationBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.Notification;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.Notification;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/PasswordPolicyBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.PasscodePolicy;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.PasscodePolicy;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/UpgradeFirmwareBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.UpgradeFirmware;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.UpgradeFirmware;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/VpnBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.Vpn;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.Vpn;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/WebClipBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.WebClip;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.WebClip;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/WifiBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.Wifi;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.Wifi;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/bean/wrapper/WipeDataBeanWrapper.java

@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.bean.wrapper;
+package io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.WipeData;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.mdm.services.android.bean.WipeData;
 
 import java.util.List;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/ErrorHandler.java

@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.common;
+package io.entgra.device.mgt.plugins.mobile.android.api.common;
 
-import org.wso2.carbon.mdm.services.android.exception.AndroidAgentException;
+import io.entgra.device.mgt.plugins.mobile.android.api.exception.AndroidAgentException;
 
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/ErrorMessage.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.common;
+package io.entgra.device.mgt.plugins.mobile.android.api.common;
 
 
 public class ErrorMessage {

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/GsonMessageBodyHandler.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.common;
+package io.entgra.device.mgt.plugins.mobile.android.api.common;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/common/ValidationInterceptor.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.common;
+package io.entgra.device.mgt.plugins.mobile.android.api.common;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/AndroidAgentException.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.exception;
+package io.entgra.device.mgt.plugins.mobile.android.api.exception;
 
 /**
  *

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/AndroidOperationException.java

@@ -16,9 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.exception;
+package io.entgra.device.mgt.plugins.mobile.android.api.exception;
 
-import org.wso2.carbon.mdm.services.android.util.Message;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.Message;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/BadRequestException.java

@@ -16,9 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.exception;
+package io.entgra.device.mgt.plugins.mobile.android.api.exception;
 
-import org.wso2.carbon.mdm.services.android.bean.ErrorResponse;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/ErrorDTO.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.exception;
+package io.entgra.device.mgt.plugins.mobile.android.api.exception;
 
 import java.util.ArrayList;
 import java.util.List;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/ForbiddenException.java

@@ -16,9 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.exception;
+package io.entgra.device.mgt.plugins.mobile.android.api.exception;
 
-import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/GlobalThrowableMapper.java

@@ -16,12 +16,12 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.exception;
+package io.entgra.device.mgt.plugins.mobile.android.api.exception;
 
 import com.google.gson.JsonParseException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.mdm.services.android.util.AndroidDeviceUtils;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidDeviceUtils;
 
 import javax.naming.AuthenticationException;
 import javax.validation.ConstraintViolationException;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/NotFoundException.java

@@ -16,10 +16,10 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.mdm.services.android.exception;
+package io.entgra.device.mgt.plugins.mobile.android.api.exception;
 
-import org.wso2.carbon.mdm.services.android.bean.ErrorResponse;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse;
-import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/OperationConfigurationException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.exception;
+package io.entgra.device.mgt.plugins.mobile.android.api.exception;
 
 /**
  *

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/ParameterValidationException.java

@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.exception;
+package io.entgra.device.mgt.plugins.mobile.android.api.exception;
 
-import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
-import org.wso2.carbon.mdm.services.android.util.AndroidDeviceUtils;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidDeviceUtils;
 
 import javax.validation.ConstraintViolation;
 import javax.ws.rs.WebApplicationException;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/exception/UnexpectedServerErrorException.java

@@ -16,10 +16,10 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.mdm.services.android.exception;
+package io.entgra.device.mgt.plugins.mobile.android.api.exception;
 
-import org.wso2.carbon.mdm.services.android.bean.ErrorResponse;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse;
-import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementAdminService.java

@@ -16,8 +16,11 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.mdm.services.android.services;
+package io.entgra.device.mgt.plugins.mobile.android.api.services;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.*;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.*;
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.annotations.Info;
 import io.swagger.annotations.ExtensionProperty;
@@ -32,8 +35,6 @@ import io.swagger.annotations.ResponseHeader;
 import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.*;
-import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
 
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
@@ -866,7 +867,7 @@ public interface DeviceManagementAdminService {
                     value = "Provide the the passcode, which is the passcode that the Android agent prompts the device owner to set at the time of device enrollment, " +
                             "to enable the factory reset operation, and the ID of the Android device. Multiple device IDs can be added by using comma separated values. ",
                     required = true)
-                    WipeDataBeanWrapper wipeDataBeanWrapper);
+            WipeDataBeanWrapper wipeDataBeanWrapper);
 
     @POST
     @Path("/applications")
@@ -1301,7 +1302,7 @@ public interface DeviceManagementAdminService {
                             "URL and name of the application, the date and time for the scheduled installation, and the ID of the" +
                             "Android device. Multiple device IDs can be added by using comma separated values.",
                     required = true)
-                    ApplicationUninstallationBeanWrapper applicationUninstallationBeanWrapper);
+            ApplicationUninstallationBeanWrapper applicationUninstallationBeanWrapper);
 
     @POST
     @Path("/blacklist-applications")
@@ -1491,7 +1492,7 @@ public interface DeviceManagementAdminService {
                     name = "vpnBean",
                     value = "VPN configuration and DeviceIds",
                     required = true)
-                    VpnBeanWrapper vpnBeanWrapper);
+            VpnBeanWrapper vpnBeanWrapper);
 
     @POST
     @Path("/send-notification")
@@ -1614,7 +1615,7 @@ public interface DeviceManagementAdminService {
                             "the ssid or the name of the Wi-Fi network that you wish to configure and the ID of the Android device." +
                             " Multiple device IDs can be added by using comma separated values.",
                     required = true)
-                    WifiBeanWrapper wifiBeanWrapper);
+            WifiBeanWrapper wifiBeanWrapper);
 
     @POST
     @Path("/encrypt-storage")
@@ -1676,7 +1677,7 @@ public interface DeviceManagementAdminService {
                             "true as the value or do not encrypt the storage on the device by assigning false as the value and " +
                             "provide the ID of the Android device. Multiple device IDs can be added by using comma separated values.",
                     required = true)
-                    EncryptionBeanWrapper encryptionBeanWrapper);
+            EncryptionBeanWrapper encryptionBeanWrapper);
 
     @POST
     @Path("/change-lock-code")

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementService.java

@@ -16,16 +16,16 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.mdm.services.android.services;
+package io.entgra.device.mgt.plugins.mobile.android.api.services;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
 import io.swagger.annotations.*;
 
 import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidApplication;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidApplication;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidDevice;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidDevice;
-import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java

@@ -16,8 +16,10 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.mdm.services.android.services;
+package io.entgra.device.mgt.plugins.mobile.android.api.services;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.exception.AndroidAgentException;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.annotations.Info;
 import io.swagger.annotations.ExtensionProperty;
@@ -32,9 +34,7 @@ import io.swagger.annotations.ResponseHeader;
 import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
-import org.wso2.carbon.mdm.services.android.bean.AndroidPlatformConfiguration;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.AndroidPlatformConfiguration;
-import org.wso2.carbon.mdm.services.android.exception.AndroidAgentException;
-import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java

@@ -16,8 +16,9 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.mdm.services.android.services;
+package io.entgra.device.mgt.plugins.mobile.android.api.services;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.annotations.Info;
 import io.swagger.annotations.ExtensionProperty;
@@ -31,9 +32,8 @@ import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
 import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
-import org.wso2.carbon.mdm.services.android.bean.DeviceState;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.DeviceState;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.EventBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.EventBeanWrapper;
-import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Size;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceManagementAdminServiceImpl.java

@@ -16,8 +16,13 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.mdm.services.android.services.impl;
+package io.entgra.device.mgt.plugins.mobile.android.api.services.impl;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.exception.BadRequestException;
+import io.entgra.device.mgt.plugins.mobile.android.api.exception.UnexpectedServerErrorException;
+import io.entgra.device.mgt.plugins.mobile.android.api.services.DeviceManagementAdminService;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidDeviceUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONException;
@@ -28,44 +33,39 @@ import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
 import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
 import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
-import org.wso2.carbon.mdm.services.android.bean.ApplicationInstallation;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationInstallation;
-import org.wso2.carbon.mdm.services.android.bean.ApplicationUninstallation;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationUninstallation;
-import org.wso2.carbon.mdm.services.android.bean.ApplicationUpdate;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ApplicationUpdate;
-import org.wso2.carbon.mdm.services.android.bean.BlacklistApplications;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.BlacklistApplications;
-import org.wso2.carbon.mdm.services.android.bean.Camera;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.Camera;
-import org.wso2.carbon.mdm.services.android.bean.DeviceEncryption;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.DeviceEncryption;
-import org.wso2.carbon.mdm.services.android.bean.DeviceLock;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.DeviceLock;
-import org.wso2.carbon.mdm.services.android.bean.ErrorResponse;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse;
-import org.wso2.carbon.mdm.services.android.bean.FileTransfer;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.FileTransfer;
-import org.wso2.carbon.mdm.services.android.bean.LockCode;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.LockCode;
-import org.wso2.carbon.mdm.services.android.bean.Notification;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.Notification;
-import org.wso2.carbon.mdm.services.android.bean.PasscodePolicy;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.PasscodePolicy;
-import org.wso2.carbon.mdm.services.android.bean.UpgradeFirmware;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.UpgradeFirmware;
-import org.wso2.carbon.mdm.services.android.bean.Vpn;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.Vpn;
-import org.wso2.carbon.mdm.services.android.bean.WebClip;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.WebClip;
-import org.wso2.carbon.mdm.services.android.bean.Wifi;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.Wifi;
-import org.wso2.carbon.mdm.services.android.bean.WipeData;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.WipeData;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.ApplicationInstallationBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.ApplicationInstallationBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.ApplicationUninstallationBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.ApplicationUninstallationBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.ApplicationUpdateBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.ApplicationUpdateBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.BlacklistApplicationsBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.BlacklistApplicationsBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.CameraBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.CameraBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.DeviceLockBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.DeviceLockBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.EncryptionBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.EncryptionBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.FileTransferBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.FileTransferBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.LockCodeBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.LockCodeBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.NotificationBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.NotificationBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.PasswordPolicyBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.PasswordPolicyBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.UpgradeFirmwareBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.UpgradeFirmwareBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.VpnBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.VpnBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.WebClipBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.WebClipBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.WifiBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.WifiBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.WipeDataBeanWrapper;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.WipeDataBeanWrapper;
-import org.wso2.carbon.mdm.services.android.exception.BadRequestException;
-import org.wso2.carbon.mdm.services.android.exception.UnexpectedServerErrorException;
-import org.wso2.carbon.mdm.services.android.services.DeviceManagementAdminService;
-import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
-import org.wso2.carbon.mdm.services.android.util.AndroidDeviceUtils;
 
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceManagementServiceImpl.java

@@ -16,8 +16,16 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.mdm.services.android.services.impl;
+package io.entgra.device.mgt.plugins.mobile.android.api.services.impl;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.exception.BadRequestException;
+import io.entgra.device.mgt.plugins.mobile.android.api.exception.NotFoundException;
+import io.entgra.device.mgt.plugins.mobile.android.api.exception.UnexpectedServerErrorException;
+import io.entgra.device.mgt.plugins.mobile.android.api.services.DeviceManagementService;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidAPIUtils;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidDeviceUtils;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.Message;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
@@ -35,15 +43,9 @@ import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceExce
 import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
 import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager;
 import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
-import org.wso2.carbon.mdm.services.android.bean.ErrorResponse;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidApplication;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidApplication;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidDevice;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidDevice;
-import org.wso2.carbon.mdm.services.android.exception.UnexpectedServerErrorException;
-import org.wso2.carbon.mdm.services.android.services.DeviceManagementService;
-import org.wso2.carbon.mdm.services.android.util.AndroidAPIUtils;
-import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
-import org.wso2.carbon.mdm.services.android.util.AndroidDeviceUtils;
-import org.wso2.carbon.mdm.services.android.util.Message;
 import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
 import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
 
@@ -249,7 +251,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         if (androidDevice == null) {
             String errorMessage = "The payload of the android device enrollment is incorrect.";
             log.error(errorMessage);
-            throw new org.wso2.carbon.mdm.services.android.exception.BadRequestException(
+            throw new BadRequestException(
                     new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
         }
         try {
@@ -398,13 +400,13 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         if (androidDevice == null) {
             String errorMessage = "The payload of the android device enrollment is incorrect.";
             log.error(errorMessage);
-            throw new org.wso2.carbon.mdm.services.android.exception.BadRequestException(
+            throw new BadRequestException(
                     new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
         }
         if (device == null) {
             String errorMessage = "The device to be modified doesn't exist.";
             log.error(errorMessage);
-            throw new org.wso2.carbon.mdm.services.android.exception.NotFoundException(
+            throw new NotFoundException(
                     new ErrorResponse.ErrorResponseBuilder().setCode(404l).setMessage(errorMessage).build());
         }
         if(androidDevice.getEnrolmentInfo() != null){

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/DeviceTypeConfigurationServiceImpl.java

@@ -16,8 +16,13 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.mdm.services.android.services.impl;
+package io.entgra.device.mgt.plugins.mobile.android.api.services.impl;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.exception.BadRequestException;
+import io.entgra.device.mgt.plugins.mobile.android.api.exception.UnexpectedServerErrorException;
+import io.entgra.device.mgt.plugins.mobile.android.api.services.DeviceTypeConfigurationService;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidAPIUtils;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
@@ -31,13 +36,9 @@ import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.license.mgt.License;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
 import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
-import org.wso2.carbon.mdm.services.android.bean.AndroidPlatformConfiguration;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.AndroidPlatformConfiguration;
-import org.wso2.carbon.mdm.services.android.bean.ErrorResponse;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse;
-import org.wso2.carbon.mdm.services.android.bean.NotifierFrequency;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.NotifierFrequency;
-import org.wso2.carbon.mdm.services.android.exception.UnexpectedServerErrorException;
-import org.wso2.carbon.mdm.services.android.services.DeviceTypeConfigurationService;
-import org.wso2.carbon.mdm.services.android.util.AndroidAPIUtils;
-import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
 
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
@@ -104,7 +105,7 @@ public class DeviceTypeConfigurationServiceImpl implements DeviceTypeConfigurati
         if (androidPlatformConfiguration == null) {
             String errorMessage = "The payload of the android platform configuration is incorrect.";
             log.error(errorMessage);
-            throw new org.wso2.carbon.mdm.services.android.exception.BadRequestException(
+            throw new BadRequestException(
                     new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
         }
         configuration.setConfiguration(androidPlatformConfiguration.getConfiguration());

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/impl/EventReceiverServiceImpl.java

@@ -16,10 +16,13 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.mdm.services.android.services.impl;
+package io.entgra.device.mgt.plugins.mobile.android.api.services.impl;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import io.entgra.device.mgt.plugins.mobile.android.api.exception.BadRequestException;
+import io.entgra.device.mgt.plugins.mobile.android.api.exception.UnexpectedServerErrorException;
+import io.entgra.device.mgt.plugins.mobile.android.api.services.EventReceiverService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
@@ -27,17 +30,8 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
-import org.wso2.carbon.mdm.services.android.bean.DeviceState;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse;
-import org.wso2.carbon.mdm.services.android.bean.ErrorResponse;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.EventBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.EventBeanWrapper;
-import org.wso2.carbon.mdm.services.android.exception.BadRequestException;
-import org.wso2.carbon.mdm.services.android.exception.NotFoundException;
-import org.wso2.carbon.mdm.services.android.exception.UnexpectedServerErrorException;
-import org.wso2.carbon.mdm.services.android.services.EventReceiverService;
-import org.wso2.carbon.mdm.services.android.util.AndroidAPIUtils;
-import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
-import org.wso2.carbon.mdm.services.android.util.AndroidDeviceUtils;
-import org.wso2.carbon.mdm.services.android.util.Message;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Size;
@@ -47,7 +41,6 @@ import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
-import java.util.List;
 
 @Path("/events")
 public class EventReceiverServiceImpl implements EventReceiverService {

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidAPIUtils.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.util;
+package io.entgra.device.mgt.plugins.mobile.android.api.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidConstants.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.util;
+package io.entgra.device.mgt.plugins.mobile.android.api.util;
 
 /**
  * Defines constants used in Android-REST API bundle.

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/AndroidDeviceUtils.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.util;
+package io.entgra.device.mgt.plugins.mobile.android.api.util;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -45,16 +45,14 @@ import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceExce
 import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
 import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager;
 import org.wso2.carbon.device.mgt.core.search.mgt.impl.Utils;
-import org.wso2.carbon.mdm.services.android.bean.DeviceState;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorListItem;
-import org.wso2.carbon.mdm.services.android.bean.ErrorListItem;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.ErrorResponse;
-import org.wso2.carbon.mdm.services.android.bean.ErrorResponse;
+import io.entgra.device.mgt.plugins.mobile.android.api.exception.BadRequestException;
-import org.wso2.carbon.mdm.services.android.exception.BadRequestException;
 
 import javax.validation.ConstraintViolation;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/ApiOriginFilter.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.mdm.services.android.util;
+package io.entgra.device.mgt.plugins.mobile.android.api.util;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/DeviceIDHolder.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.util;
+package io.entgra.device.mgt.plugins.mobile.android.api.util;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/util/Message.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.util;
+package io.entgra.device.mgt.plugins.mobile.android.api.util;
 
 import javax.ws.rs.core.MediaType;
 import javax.xml.bind.annotation.XmlElement;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/webapp/WEB-INF/cxf-servlet.xml

@@ -43,8 +43,8 @@
 
     <bean id="swaggerWriter" class="io.swagger.jaxrs.listing.SwaggerSerializers" />
     <bean id="swaggerResource" class="io.swagger.jaxrs.listing.ApiListingResource" />
-    <bean id="GlobalExceptionMapper" class="org.wso2.carbon.mdm.services.android.exception.GlobalThrowableMapper"/>
+    <bean id="GlobalExceptionMapper" class="io.entgra.device.mgt.plugins.mobile.android.api.exception.GlobalThrowableMapper"/>
-    <bean id="ValidationInterceptor" class="org.wso2.carbon.mdm.services.android.common.ValidationInterceptor"/>
+    <bean id="ValidationInterceptor" class="io.entgra.device.mgt.plugins.mobile.android.api.common.ValidationInterceptor"/>
 
     <bean id="swaggerConfig" class="io.swagger.jaxrs.config.BeanConfig">
         <property name="resourcePackage" value="org.wso2.carbon.mdm.services.android.services"/>
@@ -59,12 +59,12 @@
         <property name="scan" value="true"/>
     </bean>
 
-    <bean id="deviceManagementService" class="org.wso2.carbon.mdm.services.android.services.impl.DeviceManagementServiceImpl"/>
+    <bean id="deviceManagementService" class="io.entgra.device.mgt.plugins.mobile.android.api.services.impl.DeviceManagementServiceImpl"/>
-    <bean id="deviceManagementAdminService" class="org.wso2.carbon.mdm.services.android.services.impl.DeviceManagementAdminServiceImpl"/>
+    <bean id="deviceManagementAdminService" class="io.entgra.device.mgt.plugins.mobile.android.api.services.impl.DeviceManagementAdminServiceImpl"/>
-    <bean id="eventReceiverService" class="org.wso2.carbon.mdm.services.android.services.impl.EventReceiverServiceImpl"/>
+    <bean id="eventReceiverService" class="io.entgra.device.mgt.plugins.mobile.android.api.services.impl.EventReceiverServiceImpl"/>
-    <bean id="deviceTypeConfigurationService" class="org.wso2.carbon.mdm.services.android.services.impl.DeviceTypeConfigurationServiceImpl"/>
+    <bean id="deviceTypeConfigurationService" class="io.entgra.device.mgt.plugins.mobile.android.api.services.impl.DeviceTypeConfigurationServiceImpl"/>
-    <bean id="jsonProvider" class="org.wso2.carbon.mdm.services.android.common.GsonMessageBodyHandler"/>
+    <bean id="jsonProvider" class="io.entgra.device.mgt.plugins.mobile.android.api.common.GsonMessageBodyHandler"/>
-    <bean id="errorHandler" class="org.wso2.carbon.mdm.services.android.common.ErrorHandler"/>
+    <bean id="errorHandler" class="io.entgra.device.mgt.plugins.mobile.android.api.common.ErrorHandler"/>
     <cxf:bus>
         <cxf:inInterceptors>
             <ref bean="ValidationInterceptor"/>

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/webapp/WEB-INF/web.xml

@@ -76,7 +76,7 @@
 
     <filter>
         <filter-name>ApiOriginFilter</filter-name>
-        <filter-class>org.wso2.carbon.mdm.services.android.util.ApiOriginFilter</filter-class>
+        <filter-class>io.entgra.device.mgt.plugins.mobile.android.api.util.ApiOriginFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>ApiOriginFilter</filter-name>

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementAdminServiceTests.java

@@ -16,8 +16,10 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android;
+package io.entgra.device.mgt.plugins.mobile.android.api;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.services.impl.DeviceManagementAdminServiceImpl;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidAPIUtils;
 import org.mockito.MockitoAnnotations;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -31,10 +33,8 @@ import org.testng.annotations.Test;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.mdm.services.android.mocks.DeviceManagementProviderServiceMock;
+import io.entgra.device.mgt.plugins.mobile.android.api.mocks.DeviceManagementProviderServiceMock;
-import org.wso2.carbon.mdm.services.android.services.impl.DeviceManagementAdminServiceImpl;
+import io.entgra.device.mgt.plugins.mobile.android.api.utils.TestUtils;
-import org.wso2.carbon.mdm.services.android.util.AndroidAPIUtils;
-import org.wso2.carbon.mdm.services.android.utils.TestUtils;
 
 import javax.ws.rs.core.Response;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementServiceTests.java

@@ -16,8 +16,11 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android;
+package io.entgra.device.mgt.plugins.mobile.android.api;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.AndroidDevice;
+import io.entgra.device.mgt.plugins.mobile.android.api.services.impl.DeviceManagementServiceImpl;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidAPIUtils;
 import org.mockito.MockitoAnnotations;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -32,15 +35,12 @@ import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidDevice;
+import io.entgra.device.mgt.plugins.mobile.android.api.mocks.ApplicationManagementProviderServiceMock;
-import org.wso2.carbon.mdm.services.android.mocks.ApplicationManagementProviderServiceMock;
+import io.entgra.device.mgt.plugins.mobile.android.api.mocks.DeviceInformationManagerServiceMock;
-import org.wso2.carbon.mdm.services.android.mocks.DeviceInformationManagerServiceMock;
+import io.entgra.device.mgt.plugins.mobile.android.api.mocks.DeviceManagementProviderServiceMock;
-import org.wso2.carbon.mdm.services.android.mocks.DeviceManagementProviderServiceMock;
+import io.entgra.device.mgt.plugins.mobile.android.api.mocks.NotificationManagementServiceMock;
-import org.wso2.carbon.mdm.services.android.mocks.NotificationManagementServiceMock;
+import io.entgra.device.mgt.plugins.mobile.android.api.mocks.PolicyManagerServiceMock;
-import org.wso2.carbon.mdm.services.android.mocks.PolicyManagerServiceMock;
+import io.entgra.device.mgt.plugins.mobile.android.api.utils.TestUtils;
-import org.wso2.carbon.mdm.services.android.services.impl.DeviceManagementServiceImpl;
-import org.wso2.carbon.mdm.services.android.util.AndroidAPIUtils;
-import org.wso2.carbon.mdm.services.android.utils.TestUtils;
 
 import javax.ws.rs.core.Response;
 import java.util.ArrayList;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/ApplicationManagementProviderServiceMock.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.mocks;
+package io.entgra.device.mgt.plugins.mobile.android.api.mocks;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceInformationManagerServiceMock.java

@@ -1,4 +1,4 @@
-package org.wso2.carbon.mdm.services.android.mocks;
+package io.entgra.device.mgt.plugins.mobile.android.api.mocks;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java

@@ -33,7 +33,7 @@
  *  under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.mocks;
+package io.entgra.device.mgt.plugins.mobile.android.api.mocks;
 
 import org.wso2.carbon.device.mgt.common.ActivityPaginationRequest;
 import org.wso2.carbon.device.mgt.common.Device;
@@ -77,7 +77,7 @@ import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.dto.DeviceTypeVersion;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.service.EmailMetaInfo;
-import org.wso2.carbon.mdm.services.android.utils.TestUtils;
+import io.entgra.device.mgt.plugins.mobile.android.api.utils.TestUtils;
 
 import org.apache.commons.collections.map.SingletonMap;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/NotificationManagementServiceMock.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.mocks;
+package io.entgra.device.mgt.plugins.mobile.android.api.mocks;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/PolicyManagerServiceMock.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.mdm.services.android.mocks;
+package io.entgra.device.mgt.plugins.mobile.android.api.mocks;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/utils/TestUtils.java

@@ -16,8 +16,12 @@
  * under the License.
  */
 
-package org.wso2.carbon.mdm.services.android.utils;
+package io.entgra.device.mgt.plugins.mobile.android.api.utils;
 
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.*;
+import io.entgra.device.mgt.plugins.mobile.android.api.bean.wrapper.*;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidConstants;
+import io.entgra.device.mgt.plugins.mobile.android.api.util.AndroidDeviceUtils;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
@@ -26,40 +30,7 @@ import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
 import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.mdm.services.android.bean.ApplicationInstallation;
+
-import org.wso2.carbon.mdm.services.android.bean.ApplicationUninstallation;
-import org.wso2.carbon.mdm.services.android.bean.ApplicationUpdate;
-import org.wso2.carbon.mdm.services.android.bean.BlacklistApplications;
-import org.wso2.carbon.mdm.services.android.bean.Camera;
-import org.wso2.carbon.mdm.services.android.bean.DeviceEncryption;
-import org.wso2.carbon.mdm.services.android.bean.DeviceLock;
-import org.wso2.carbon.mdm.services.android.bean.LockCode;
-import org.wso2.carbon.mdm.services.android.bean.Notification;
-import org.wso2.carbon.mdm.services.android.bean.PasscodePolicy;
-import org.wso2.carbon.mdm.services.android.bean.UpgradeFirmware;
-import org.wso2.carbon.mdm.services.android.bean.Vpn;
-import org.wso2.carbon.mdm.services.android.bean.WebClip;
-import org.wso2.carbon.mdm.services.android.bean.Wifi;
-import org.wso2.carbon.mdm.services.android.bean.WipeData;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidApplication;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidDevice;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.ApplicationInstallationBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.ApplicationUninstallationBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.ApplicationUpdateBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.BlacklistApplicationsBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.CameraBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.DeviceLockBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.EncryptionBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.LockCodeBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.NotificationBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.PasswordPolicyBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.UpgradeFirmwareBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.VpnBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.WebClipBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.WifiBeanWrapper;
-import org.wso2.carbon.mdm.services.android.bean.wrapper.WipeDataBeanWrapper;
-import org.wso2.carbon.mdm.services.android.util.AndroidConstants;
-import org.wso2.carbon.mdm.services.android.util.AndroidDeviceUtils;
 
 import java.util.ArrayList;
 import java.util.List;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/resources/testng.xml

@@ -23,8 +23,8 @@
 
     <test name="API Tests" preserve-order="true">
         <classes>
-            <class name="org.wso2.carbon.mdm.services.android.DeviceManagementAdminServiceTests" />
+            <class name="io.entgra.device.mgt.plugins.mobile.android.api.DeviceManagementAdminServiceTests" />
-            <class name="org.wso2.carbon.mdm.services.android.DeviceManagementServiceTests" />
+            <class name="io.entgra.device.mgt.plugins.mobile.android.api.DeviceManagementServiceTests" />
         </classes>
     </test>
 </suite>

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml

@@ -42,7 +42,7 @@
                         <manifest>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>org.carbon.android.emulator.TryIt</mainClass>
+                            <mainClass>io.entgra.device.mgt.plugins.mobile.android.emulator.TryIt</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/io/entgra/device/mgt/plugins/mobile/android/emulator/Constants.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.carbon.android.emulator;
+package io.entgra.device.mgt.plugins.mobile.android.emulator;
 
 import java.io.File;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/io/entgra/device/mgt/plugins/mobile/android/emulator/TryIt.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.carbon.android.emulator;
+package io.entgra.device.mgt.plugins.mobile.android.emulator;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/src/main/java/io/entgra/device/mgt/plugins/mobile/android/emulator/TryItEmulator.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.carbon.android.emulator;
+package io.entgra.device.mgt.plugins.mobile.android.emulator;
 
 import java.io.BufferedReader;
 import java.io.File;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidDeviceManagementService.java

@@ -16,8 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.mobile.android.impl;
+package io.entgra.device.mgt.plugins.mobile.android.impl;
 
+import io.entgra.device.mgt.plugins.mobile.android.impl.util.AndroidPluginConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManager;
@@ -38,8 +39,7 @@ import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubsc
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 import org.wso2.carbon.device.mgt.common.type.mgt.DeviceTypePlatformDetails;
-import org.wso2.carbon.device.mgt.mobile.android.impl.util.AndroidPluginConstants;
+import io.entgra.device.mgt.plugins.mobile.android.internal.AndroidDeviceManagementDataHolder;
-import org.wso2.carbon.device.mgt.mobile.android.internal.AndroidDeviceManagementDataHolder;
 
 import java.util.HashMap;
 import java.util.List;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidDeviceManager.java

@@ -16,8 +16,14 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.mobile.android.impl;
+package io.entgra.device.mgt.plugins.mobile.android.impl;
 
+import io.entgra.device.mgt.plugins.mobile.android.impl.dao.AbstractMobileDeviceManagementDAOFactory;
+import io.entgra.device.mgt.plugins.mobile.android.impl.dao.AndroidDAOFactory;
+import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileDeviceManagementDAOException;
+import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileDevice;
+import io.entgra.device.mgt.plugins.mobile.android.impl.util.AndroidPluginConstants;
+import io.entgra.device.mgt.plugins.mobile.android.impl.util.AndroidPluginUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
@@ -32,14 +38,8 @@ import org.wso2.carbon.device.mgt.common.license.mgt.License;
 import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManager;
 import org.wso2.carbon.device.mgt.extensions.license.mgt.registry.RegistryBasedLicenseManager;
-import org.wso2.carbon.device.mgt.mobile.android.impl.dao.AbstractMobileDeviceManagementDAOFactory;
+import io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl.AndroidDeviceMgtPluginException;
-import org.wso2.carbon.device.mgt.mobile.android.impl.dao.AndroidDAOFactory;
+import io.entgra.device.mgt.plugins.mobile.android.impl.util.MobileDeviceManagementUtil;
-import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileDeviceManagementDAOException;
-import org.wso2.carbon.device.mgt.mobile.android.impl.dao.impl.AndroidDeviceMgtPluginException;
-import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileDevice;
-import org.wso2.carbon.device.mgt.mobile.android.impl.util.AndroidPluginConstants;
-import org.wso2.carbon.device.mgt.mobile.android.impl.util.AndroidPluginUtils;
-import org.wso2.carbon.device.mgt.mobile.android.impl.util.MobileDeviceManagementUtil;
 import org.wso2.carbon.registry.api.RegistryException;
 import org.wso2.carbon.registry.api.Resource;
 

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidFeatureManager.java

@@ -16,19 +16,19 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.mobile.android.impl;
+package io.entgra.device.mgt.plugins.mobile.android.impl;
 
+import io.entgra.device.mgt.plugins.mobile.android.impl.dao.AndroidDAOFactory;
+import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileDeviceManagementDAOException;
+import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileDeviceManagementDAOFactory;
+import io.entgra.device.mgt.plugins.mobile.android.impl.dao.MobileFeatureDAO;
+import io.entgra.device.mgt.plugins.mobile.android.impl.dto.MobileFeature;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.device.mgt.common.FeatureManager;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.mobile.android.impl.dao.AndroidDAOFactory;
+import io.entgra.device.mgt.plugins.mobile.android.impl.util.MobileDeviceManagementUtil;
-import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileDeviceManagementDAOException;
-import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileDeviceManagementDAOFactory;
-import org.wso2.carbon.device.mgt.mobile.android.impl.dao.MobileFeatureDAO;
-import org.wso2.carbon.device.mgt.mobile.android.impl.dto.MobileFeature;
-import org.wso2.carbon.device.mgt.mobile.android.impl.util.MobileDeviceManagementUtil;
 
 import java.util.ArrayList;
 import java.util.List;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/AndroidPolicyMonitoringManager.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.device.mgt.mobile.android.impl;
+package io.entgra.device.mgt.plugins.mobile.android.impl;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceConfigurationManager.java

@@ -16,11 +16,11 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.mobile.android.impl.config;
+package io.entgra.device.mgt.plugins.mobile.android.impl.config;
 
 import org.w3c.dom.Document;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.mobile.android.impl.util.MobileDeviceManagementUtil;
+import io.entgra.device.mgt.plugins.mobile.android.impl.util.MobileDeviceManagementUtil;
 import org.wso2.carbon.utils.CarbonUtils;
 
 import javax.xml.bind.JAXBContext;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceManagementConfig.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.mobile.android.impl.config;
+package io.entgra.device.mgt.plugins.mobile.android.impl.config;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/MobileDeviceManagementRepository.java

@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.mobile.android.impl.config;
+package io.entgra.device.mgt.plugins.mobile.android.impl.config;
 
-import org.wso2.carbon.device.mgt.mobile.android.impl.config.datasource.DataSourceConfigAdapter;
+import io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource.DataSourceConfigAdapter;
-import org.wso2.carbon.device.mgt.mobile.android.impl.config.datasource.MobileDataSourceConfig;
+import io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource.MobileDataSourceConfig;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/DataSourceConfigAdapter.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.mobile.android.impl.config.datasource;
+package io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import java.util.HashMap;

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/impl/config/datasource/JNDILookupDefinition.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.mobile.android.impl.config.datasource;
+package io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource;
 
 import javax.xml.bind.annotation.*;
 import java.util.List;