JAX-RS refractor

product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Device.java

@@ -16,18 +16,17 @@
 
 package cdm.api.android;
 
+import cdm.api.android.common.AndroidAgentException;
 import cdm.api.android.util.AndroidAPIUtils;
-import cdm.api.android.util.AndroidConstants;
 import cdm.api.android.util.Message;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.DeviceManagementServiceException;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
-
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import java.util.List;
@@ -42,138 +41,101 @@ public class Device {
     private static Log log = LogFactory.getLog(Device.class);
 
     @GET
-	public List<org.wso2.carbon.device.mgt.common.Device> getAllDevices() {
+    public List<org.wso2.carbon.device.mgt.common.Device> getAllDevices() throws AndroidAgentException {
-		List<org.wso2.carbon.device.mgt.common.Device> devices = null;
+
-		String msg = "";
+        List<org.wso2.carbon.device.mgt.common.Device> devices;
+        String msg;
         DeviceManagementService dmService;
 
         try {
             dmService = AndroidAPIUtils.getDeviceManagementService();
-		} finally {
+
-			PrivilegedCarbonContext.endTenantFlow();
+        } catch (DeviceManagementServiceException deviceMgtServiceEx) {
+            String errorMsg = "Device management service error";
+            log.error(errorMsg, deviceMgtServiceEx);
+            throw new AndroidAgentException();
         }
+
         try {
-			if (dmService != null) {
+
-				devices = dmService.getAllDevices(
+            devices = dmService.getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
-						DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
             Response.status(HttpStatus.SC_OK);
-			} else {
+
-				Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-			}
         } catch (DeviceManagementException e) {
             msg = "Error occurred while fetching the device list.";
             log.error(msg, e);
             Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
+            throw new AndroidAgentException(msg, e);
+
         }
         return devices;
     }
 
     @GET
     @Path("{id}")
-	public org.wso2.carbon.device.mgt.common.Device getDevice(@PathParam("id") String id) {
+    public org.wso2.carbon.device.mgt.common.Device getDevice(@PathParam("id") String id) throws AndroidAgentException {
-		String msg = "";
+        String msg;
         DeviceManagementService dmService;
-		org.wso2.carbon.device.mgt.common.Device device =
+        org.wso2.carbon.device.mgt.common.Device device;
-				new org.wso2.carbon.device.mgt.common.Device();
 
         try {
             dmService = AndroidAPIUtils.getDeviceManagementService();
-		} finally {
+
-			PrivilegedCarbonContext.endTenantFlow();
+        } catch (DeviceManagementServiceException deviceMgtServiceEx) {
+            String errorMsg = "Device management service error";
+            log.error(errorMsg, deviceMgtServiceEx);
+            throw new AndroidAgentException(errorMsg, deviceMgtServiceEx);
         }
         DeviceIdentifier deviceIdentifier = AndroidAPIUtils.convertToDeviceIdentifierObject(id);
         try {
-			if (dmService != null) {
             device = dmService.getDevice(deviceIdentifier);
             if (device == null) {
                 Response.status(HttpStatus.SC_NOT_FOUND);
             }
-
+        } catch (DeviceManagementException deviceMgtEx) {
-			} else {
-				Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-			}
-
-		} catch (DeviceManagementException e) {
             msg = "Error occurred while fetching the device information.";
-			log.error(msg, e);
+            log.error(msg, deviceMgtEx);
-			Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
+            throw new AndroidAgentException(msg, deviceMgtEx);
         }
         return device;
     }
 
     @PUT
     @Path("{id}")
-	public Message updateDevice(@PathParam("id") String id,
+    public Message updateDevice(@PathParam("id") String id, org.wso2.carbon.device.mgt.common.Device device) throws
-	                            org.wso2.carbon.device.mgt.common.Device device) {
+            AndroidAgentException {
-		boolean result = false;
+
-		String msg = "";
+        DeviceManagementService dmService = null;
-		DeviceManagementService dmService;
         Message responseMessage = new Message();
 
+        boolean result;
+
         try {
             dmService = AndroidAPIUtils.getDeviceManagementService();
-		} finally {
+
-			PrivilegedCarbonContext.endTenantFlow();
+        } catch (DeviceManagementServiceException deviceManagementServiceException) {
+            String errorMsg = "Device management service error";
+            log.error(errorMsg, deviceManagementServiceException);
         }
+
         try {
-			if (dmService != null) {
+            device.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
-				device.setType(
-						DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
             result = dmService.updateDeviceInfo(device);
+
             if (result) {
                 Response.status(HttpStatus.SC_OK);
                 responseMessage.setResponseMessage("Device information has modified successfully.");
             } else {
                 Response.status(HttpStatus.SC_NOT_MODIFIED);
-					responseMessage.setResponseMessage("Update device has failed.");
+                responseMessage.setResponseMessage("Device not found for the update.");
-				}
-			} else {
-				Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-				msg = AndroidConstants.Messages.DEVICE_MANAGER_SERVICE_NOT_AVAILABLE;
-				responseMessage.setResponseMessage(msg);
-			}
-
-		} catch (DeviceManagementException e) {
-			msg = "Error occurred while modifying the device information.";
-			log.error(msg, e);
-			Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-			responseMessage.setResponseMessage(msg);
-
             }
             return responseMessage;
-	}
-
-	@GET
-	@Path("/operations/{id}")
-	public org.wso2.carbon.device.mgt.common.Device getOperations(@PathParam("id") String id) {
-		String msg = "";
-		DeviceManagementService dmService;
-		org.wso2.carbon.device.mgt.common.Device device =
-				new org.wso2.carbon.device.mgt.common.Device();
-
-		try {
-			dmService = AndroidAPIUtils.getDeviceManagementService();
-		} finally {
-			PrivilegedCarbonContext.endTenantFlow();
-		}
-		DeviceIdentifier deviceIdentifier = AndroidAPIUtils.convertToDeviceIdentifierObject(id);
-		try {
-			if (dmService != null) {
-				device = dmService.getDevice(deviceIdentifier);
-				if (device == null) {
-					Response.status(HttpStatus.SC_NOT_FOUND);
-				}
 
-			} else {
+        } catch (DeviceManagementException deviceMgtEx) {
-				Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
+            String msg = "Error occurred while modifying the device information.";
+            log.error(msg, deviceMgtEx);
+            throw new AndroidAgentException(msg, deviceMgtEx);
         }
 
-		} catch (DeviceManagementException e) {
-			msg = "Error occurred while fetching the device information.";
-			log.error(msg, e);
-			Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
     }
-		return device;
-	}
-
 }

product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Enrollment.java

@@ -16,17 +16,16 @@
 
 package cdm.api.android;
 
+import cdm.api.android.common.AndroidAgentException;
 import cdm.api.android.util.AndroidAPIUtils;
-import cdm.api.android.util.AndroidConstants;
 import cdm.api.android.util.Message;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.DeviceManagementServiceException;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
 
 import javax.ws.rs.*;
@@ -50,82 +49,70 @@ public class Enrollment {
     *
     **/
     @POST
-	public Message enrollDevice(Device device) {
+    public Message enrollDevice(org.wso2.carbon.device.mgt.common.Device device) throws AndroidAgentException {
 
-		boolean result = false;
-		int status = 0;
-		String msg = "";
         DeviceManagementService dmService;
         Message responseMsg = new Message();
 
         try {
             dmService = AndroidAPIUtils.getDeviceManagementService();
-		} finally {
+
-			PrivilegedCarbonContext.endTenantFlow();
+        } catch (DeviceManagementServiceException deviceServiceMgtEx) {
+            String errorMsg = "Device management service error";
+            log.error(errorMsg, deviceServiceMgtEx);
+            throw new AndroidAgentException(errorMsg, deviceServiceMgtEx);
         }
 
         try {
-			if (dmService != null) {
+            device.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
-				device.setType(
+            dmService.enrollDevice(device);
-						DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
-				result = dmService.enrollDevice(device);
             Response.status(HttpStatus.SC_CREATED);
-				responseMsg.setResponseMessage("Device enrollment has succeeded");
+            responseMsg.setResponseMessage("Device enrollment succeeded");
             return responseMsg;
 
-			} else {
+        } catch (DeviceManagementException deviceMgtEx) {
-				responseMsg.setResponseMessage(
+            String errorMsg = "Error occurred while enrolling the device";
-						AndroidConstants.Messages.DEVICE_MANAGER_SERVICE_NOT_AVAILABLE);
+            log.error(errorMsg, deviceMgtEx);
-				Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
+            throw new AndroidAgentException(errorMsg, deviceMgtEx);
-				return responseMsg;
-			}
-		} catch (DeviceManagementException e) {
-			log.error(msg, e);
-			responseMsg.setResponseMessage("Error occurred while enrolling the device");
-			Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-			return responseMsg;
         }
 
     }
 
     @GET
     @Path("{id}")
-	public Message isEnrolled(@PathParam("id") String id) {
+    public Message isEnrolled(@PathParam("id") String id) throws AndroidAgentException {
 
-		boolean result = false;
+        boolean result;
-		String msg = "";
         DeviceManagementService dmService;
         Message responseMsg = new Message();
 
         try {
             dmService = AndroidAPIUtils.getDeviceManagementService();
-		} finally {
+
-			PrivilegedCarbonContext.endTenantFlow();
+        } catch (DeviceManagementServiceException deviceServiceMgtEx) {
+            String errorMsg = "Device management service error";
+            log.error(errorMsg, deviceServiceMgtEx);
+            throw new AndroidAgentException(errorMsg, deviceServiceMgtEx);
         }
+
         DeviceIdentifier deviceIdentifier = AndroidAPIUtils.convertToDeviceIdentifierObject(id);
+
         try {
-			if (dmService != null) {
             result = dmService.isEnrolled(deviceIdentifier);
             if (result) {
                 Response.status(HttpStatus.SC_OK);
                 responseMsg.setResponseMessage("Device has already enrolled");
             } else {
                 Response.status(HttpStatus.SC_NOT_FOUND);
-					responseMsg.setResponseMessage("Device has not enrolled");
+                responseMsg.setResponseMessage("Device not found");
-				}
-				return responseMsg;
-			} else {
-				Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-				responseMsg.setResponseMessage(
-						AndroidConstants.Messages.DEVICE_MANAGER_SERVICE_NOT_AVAILABLE);
-				return responseMsg;
             }
-		} catch (DeviceManagementException e) {
+
-			msg = "Error occurred while checking the enrollment of the device.";
-			log.error(msg, e);
-			responseMsg.setResponseMessage(msg);
-			Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
             return responseMsg;
+
+        } catch (DeviceManagementException deviceMgtEx) {
+            String errormsg = "Error occurred while enrollment of the device.";
+            log.error(errormsg, deviceMgtEx);
+            throw new AndroidAgentException(errormsg, deviceMgtEx);
         }
 
     }
@@ -140,42 +127,41 @@ public class Enrollment {
     **/
     @PUT
     @Path("{id}")
-	public Message modifyEnrollment(@PathParam("id") String id, Device device) {
+    public Message modifyEnrollment(@PathParam("id") String id, org.wso2.carbon.device.mgt.common.Device device)
-		boolean result = false;
+            throws AndroidAgentException {
-		String msg = "";
+
+        boolean result;
         DeviceManagementService dmService;
         Message responseMsg = new Message();
 
         try {
             dmService = AndroidAPIUtils.getDeviceManagementService();
-		} finally {
+
-			PrivilegedCarbonContext.endTenantFlow();
+        } catch (DeviceManagementServiceException deviceServiceMgtEx) {
+            String errorMsg = "Device management service error";
+            log.error(errorMsg, deviceServiceMgtEx);
+            throw new AndroidAgentException(errorMsg, deviceServiceMgtEx);
         }
 
         try {
-			if (dmService != null) {
+            device.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
-				device.setType(
-						DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
             result = dmService.modifyEnrollment(device);
 
             if (result) {
                 responseMsg.setResponseMessage("Device enrollment has updated successfully");
                 Response.status(HttpStatus.SC_OK);
             } else {
-					responseMsg.setResponseMessage("Update enrollment has failed");
+                responseMsg.setResponseMessage("device not found for enrollment");
                 Response.status(HttpStatus.SC_NOT_MODIFIED);
             }
-			} else {
+
-				msg = AndroidConstants.Messages.DEVICE_MANAGER_SERVICE_NOT_AVAILABLE;
-				responseMsg.setResponseMessage(msg);
-				Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-			}
             return responseMsg;
+
         } catch (DeviceManagementException e) {
-			msg = "Error occurred while modifying enrollment of the device";
+            String errorMsg = "Error occurred while modifying enrollment of the device";
-			log.error(msg, e);
+            log.error(errorMsg, e);
             Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-			responseMsg.setResponseMessage(msg);
+            responseMsg.setResponseMessage(errorMsg);
             return responseMsg;
         }
 
@@ -183,21 +169,24 @@ public class Enrollment {
 
     @DELETE
     @Path("{id}")
-	public Message disenrollDevice(@PathParam("id") String id) {
+    public Message disenrollDevice(@PathParam("id") String id) throws AndroidAgentException {
 
-		boolean result = false;
-		String msg = "";
         DeviceManagementService dmService;
         Message responseMsg = new Message();
 
+        boolean result;
+
         try {
             dmService = AndroidAPIUtils.getDeviceManagementService();
-		} finally {
+
-			PrivilegedCarbonContext.endTenantFlow();
+        } catch (DeviceManagementServiceException deviceServiceMgtEx) {
+            String errorMsg = "Device management service error";
+            log.error(errorMsg, deviceServiceMgtEx);
+            throw new AndroidAgentException(errorMsg, deviceServiceMgtEx);
         }
         DeviceIdentifier deviceIdentifier = AndroidAPIUtils.convertToDeviceIdentifierObject(id);
+
         try {
-			if (dmService != null) {
             result = dmService.disenrollDevice(deviceIdentifier);
             if (result) {
                 responseMsg.setResponseMessage("Device has disenrolled successfully");
@@ -206,18 +195,13 @@ public class Enrollment {
                 responseMsg.setResponseMessage("Device not found");
                 Response.status(HttpStatus.SC_NOT_FOUND);
             }
-			} else {
-				Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-				msg = AndroidConstants.Messages.DEVICE_MANAGER_SERVICE_NOT_AVAILABLE;
-				responseMsg.setResponseMessage(msg);
-			}
 
             return responseMsg;
-		} catch (DeviceManagementException e) {
+        } catch (DeviceManagementException deviceMgtEx) {
-			msg = "Error occurred while disenrolling the device";
+            String errorMsg = "Error occurred while dis enrolling the device";
-			log.error(msg, e);
+            log.error(errorMsg, deviceMgtEx);
             Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR);
-			responseMsg.setResponseMessage(msg);
+            responseMsg.setResponseMessage(errorMsg);
             return responseMsg;
         }
     }

product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/common/ErrorHandler.java

@@ -18,15 +18,19 @@
 
 package cdm.api.android.common;
 
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 
-public class ErrorHandler implements ExceptionMapper {
 
-    public Response toResponse(Throwable throwable) {
+@Produces({ "application/json", "application/xml" })
-        Response.Status status;
+public class ErrorHandler implements ExceptionMapper<AndroidAgentException> {
-        status = Response.Status.INTERNAL_SERVER_ERROR;
+
-      //  return Response.status(status).header("exception", exception.getMessage()).build();
+    public Response toResponse(AndroidAgentException exception) {
-        return null;
+        ErrorMessage errorMessage = new ErrorMessage();
+        errorMessage.setErrorMessage(exception.getErrorMessage());
+        return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errorMessage).build();
     }
 }

product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtils.java

@@ -16,18 +16,20 @@
 
 package cdm.api.android.util;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.*;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 
-import java.util.*;
-
 /**
  * AndroidAPIUtil class provides utility function used by Android REST-API classes.
  */
 public class AndroidAPIUtils {
 
+    private static Log log = LogFactory.getLog(AndroidAPIUtils.class);
+
 	public static DeviceIdentifier convertToDeviceIdentifierObject(String deviceId) {
 		DeviceIdentifier identifier = new DeviceIdentifier();
 		identifier.setId(deviceId);
@@ -36,14 +38,22 @@ public class AndroidAPIUtils {
 	}
 
 
-	public static DeviceManagementService getDeviceManagementService() {
+	public static DeviceManagementService getDeviceManagementService() throws DeviceManagementServiceException{
+
+        // until complete login this is use to load super tenant context
+
 		DeviceManagementService dmService;
 		PrivilegedCarbonContext.startTenantFlow();
 		PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
 		ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
 		ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
-		dmService = (DeviceManagementService) ctx
+		dmService = (DeviceManagementService) ctx.getOSGiService(DeviceManagementService.class, null);
-				.getOSGiService(DeviceManagementService.class, null);
+
+        if (dmService == null){
+            log.error("device management service not initialized");
+            throw new DeviceManagementServiceException("device management service not initialized");
+        }
+        PrivilegedCarbonContext.endTenantFlow();
 		return dmService;
 	}
 }

product/modules/agents/android/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml

@@ -29,6 +29,7 @@
         </jaxrs:serviceBeans>
         <jaxrs:providers>
             <ref bean="jsonProvider"/>
+            <ref bean="errorHandler"/>
         </jaxrs:providers>
     </jaxrs:server>
     <jaxrs:server id="deviceManagementService" address="/devices">
@@ -37,6 +38,7 @@
         </jaxrs:serviceBeans>
         <jaxrs:providers>
             <ref bean="jsonProvider"/>
+            <ref bean="errorHandler"/>
         </jaxrs:providers>
     </jaxrs:server>
     <jaxrs:server id="enrollmentService" address="/enrollment">
@@ -45,6 +47,17 @@
         </jaxrs:serviceBeans>
         <jaxrs:providers>
             <ref bean="jsonProvider"/>
+            <ref bean="errorHandler"/>
+        </jaxrs:providers>
+    </jaxrs:server>
+
+    <jaxrs:server id="testService" address="/test">
+        <jaxrs:serviceBeans>
+            <ref bean="testServiceBean"/>
+        </jaxrs:serviceBeans>
+        <jaxrs:providers>
+            <ref bean="jsonProvider"/>
+            <ref bean="errorHandler"/>
         </jaxrs:providers>
     </jaxrs:server>
 
@@ -52,5 +65,6 @@
     <bean id="deviceMgtServiceBean" class="cdm.api.android.Device"/>
     <bean id="enrollmentServiceBean" class="cdm.api.android.Enrollment"/>
     <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/>
+    <bean id="errorHandler" class="cdm.api.android.common.ErrorHandler"/>
 </beans>