From bfba00821819b3af5b4b43e92f6ab9fd985abd9a Mon Sep 17 00:00:00 2001
From: charitha <charitha.ws@gmail.com>
Date: Thu, 8 Sep 2016 10:17:13 +0530
Subject: [PATCH] Removed url from application uninstall (cherry picked from
 commit 45a582e)

---
 .../bean/ApplicationUninstallation.java       | 11 ------
 .../DeviceManagementAdminServiceImpl.java     | 39 +++++++++++--------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationUninstallation.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationUninstallation.java
index 45b98b47d..5c078f87d 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationUninstallation.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationUninstallation.java
@@ -43,9 +43,6 @@ public class ApplicationUninstallation extends AndroidOperation implements Seria
     @Pattern(regexp = "^[A-Za-z]*$")
     private String type;
 
-    @ApiModelProperty(name = "url", value = "The URL of the application.", required = true)
-    private String url;
-
     @ApiModelProperty(name = "name", value = "The name of the application.", required = true)
     @Size(min = 2, max = 45)
     private String name;
@@ -66,14 +63,6 @@ public class ApplicationUninstallation extends AndroidOperation implements Seria
         this.type = type;
     }
 
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
     public String getName() {
         return name;
     }
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java
index 8442d44c7..11840a669 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java
@@ -558,22 +558,7 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
                     throw new BadRequestException(
                             new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
                 }
-                if (payload.has("type")) {
-                    String type = payload.getString("type");
-                    if (!"enterprise".equalsIgnoreCase(type)
-                        && !"public".equalsIgnoreCase(type)
-                        && !"webapp".equalsIgnoreCase(type)) {
-                        String errorMessage = "Invalid application type.";
-                        log.error(errorMessage);
-                        throw new BadRequestException(
-                                new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
-                    }
-                } else {
-                    String errorMessage = "Application type is missing.";
-                    log.error(errorMessage);
-                    throw new BadRequestException(
-                            new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
-                }
+                validateType(payload);
             } catch (MalformedURLException e) {
                 String errorMessage = "Malformed application url.";
                 log.error(errorMessage);
@@ -673,6 +658,9 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
                         new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
             }
             ApplicationUninstallation applicationUninstallation = applicationUninstallationBeanWrapper.getOperation();
+            JSONObject payload = new JSONObject(applicationUninstallation.toJSON());
+            validateType(payload);
+
             ProfileOperation operation = new ProfileOperation();
             operation.setCode(AndroidConstants.OperationCodes.UNINSTALL_APPLICATION);
             operation.setType(Operation.Type.PROFILE);
@@ -698,6 +686,25 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
         }
     }
 
+    private void validateType(JSONObject payload) {
+        if (payload.has("type")) {
+            String type = payload.getString("type");
+            if (!"enterprise".equalsIgnoreCase(type)
+                && !"public".equalsIgnoreCase(type)
+                && !"webapp".equalsIgnoreCase(type)) {
+                String errorMessage = "Invalid application type.";
+                log.error(errorMessage);
+                throw new BadRequestException(
+                        new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
+            }
+        } else {
+            String errorMessage = "Application type is missing.";
+            log.error(errorMessage);
+            throw new BadRequestException(
+                    new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage).build());
+        }
+    }
+
     @POST
     @Path("/blacklist-applications")
     @Override