From dd9bfdb6a7f0b4f4c06eb8da1fc291a98179e709 Mon Sep 17 00:00:00 2001 From: manoj Date: Tue, 20 Jan 2015 07:46:13 +0530 Subject: [PATCH] Refactor Operations --- .../main/java/cdm/api/android/Operation.java | 116 ------------------ .../mobileservices/android/Operation.java | 116 ++++++++++++++++++ 2 files changed, 116 insertions(+), 116 deletions(-) delete mode 100644 product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Operation.java create mode 100644 product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Operation.java diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Operation.java b/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Operation.java deleted file mode 100644 index f6e580273..000000000 --- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Operation.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package cdm.api.android; - -import cdm.api.android.common.AndroidAgentException; -import cdm.api.android.util.AndroidAPIUtils; -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.device.mgt.common.*; -import org.wso2.carbon.device.mgt.core.service.DeviceManagementService; - -import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import java.util.List; - -/** - * Android Device Operation REST-API implementation. - */ -@Produces({ "application/json", "application/xml" }) -@Consumes({ "application/json", "application/xml" }) -public class Operation { - - private static Log log = LogFactory.getLog(Operation.class); - - @GET - @Path("{id}") - public List getAllOperations( - @PathParam("id") String id) throws - AndroidAgentException { - List operations; - String msg; - DeviceManagementService dmService; - - try { - dmService = AndroidAPIUtils.getDeviceManagementService(); - } catch (DeviceManagementServiceException deviceMgtServiceEx) { - msg = "Device management service error"; - log.error(msg, deviceMgtServiceEx); - throw new AndroidAgentException(msg, deviceMgtServiceEx); - } - - try { - DeviceIdentifier deviceIdentifier = AndroidAPIUtils.convertToDeviceIdentifierObject(id); - operations = dmService.getOperationManager( - DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID) - .getOperations(deviceIdentifier); - Response.status(HttpStatus.SC_OK); - return operations; - } catch (DeviceManagementException e) { - msg = "Error occurred while fetching the operation manager for the device type."; - log.error(msg, e); - Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR); - throw new AndroidAgentException(msg, e); - } catch (OperationManagementException e) { - msg = "Error occurred while fetching the operation list for the device."; - log.error(msg, e); - Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR); - throw new AndroidAgentException(msg, e); - } - } - - @PUT - public Message updateOperation() throws - AndroidAgentException { - String msg; - DeviceManagementService dmService; - Message responseMsg = new Message(); - - try { - dmService = AndroidAPIUtils.getDeviceManagementService(); - - } catch (DeviceManagementServiceException deviceMgtServiceEx) { - msg = "Device management service error"; - log.error(msg, deviceMgtServiceEx); - throw new AndroidAgentException(msg, deviceMgtServiceEx); - } - - try { - boolean result = dmService.getOperationManager("").addOperation(null, null); - if (result) { - Response.status(HttpStatus.SC_OK); - responseMsg.setResponseMessage("Device has already enrolled"); - } else { - Response.status(HttpStatus.SC_NOT_FOUND); - responseMsg.setResponseMessage("Operation not found"); - } - return responseMsg; - } catch (DeviceManagementException e) { - msg = "Error occurred while fetching the operation manager for the device type."; - log.error(msg, e); - Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR); - throw new AndroidAgentException(msg, e); - } catch (OperationManagementException e) { - msg = "Error occurred while updating the operation status for the device."; - log.error(msg, e); - Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR); - throw new AndroidAgentException(msg, e); - } - } -} \ No newline at end of file diff --git a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Operation.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Operation.java new file mode 100644 index 000000000..fdbef5eae --- /dev/null +++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Operation.java @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.wso2.cdmserver.mobileservices.android; + +import org.apache.commons.httpclient.HttpStatus; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.device.mgt.common.*; +import org.wso2.carbon.device.mgt.core.service.DeviceManagementService; +import org.wso2.cdmserver.mobileservices.android.common.AndroidAgentException; +import org.wso2.cdmserver.mobileservices.android.util.AndroidAPIUtils; +import org.wso2.cdmserver.mobileservices.android.util.Message; + +import javax.ws.rs.*; +import javax.ws.rs.core.Response; +import java.util.List; + +/** + * Android Device Operation REST-API implementation. + */ +@Produces({ "application/json", "application/xml" }) +@Consumes({ "application/json", "application/xml" }) +public class Operation { + + private static Log log = LogFactory.getLog(Operation.class); + + @GET + @Path("{id}") + public List getAllOperations(@PathParam("id") String id) + throws AndroidAgentException { + + List operations; + String msg; + DeviceManagementService dmService; + + try { + dmService = AndroidAPIUtils.getDeviceManagementService(); + } catch (DeviceManagementServiceException deviceMgtServiceEx) { + msg = "Device management service error"; + log.error(msg, deviceMgtServiceEx); + throw new AndroidAgentException(msg, deviceMgtServiceEx); + } + + try { + DeviceIdentifier deviceIdentifier = AndroidAPIUtils.convertToDeviceIdentifierObject(id); + operations = dmService.getOperationManager( + DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID) + .getOperations(deviceIdentifier); + Response.status(HttpStatus.SC_OK); + return operations; + } catch (DeviceManagementException e) { + msg = "Error occurred while fetching the operation manager for the device type."; + log.error(msg, e); + Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR); + throw new AndroidAgentException(msg, e); + } catch (OperationManagementException e) { + msg = "Error occurred while fetching the operation list for the device."; + log.error(msg, e); + Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR); + throw new AndroidAgentException(msg, e); + } + } + + @PUT + public Message updateOperation() throws AndroidAgentException { + + String msg; + DeviceManagementService dmService; + Message responseMsg = new Message(); + + try { + dmService = AndroidAPIUtils.getDeviceManagementService(); + + } catch (DeviceManagementServiceException deviceMgtServiceEx) { + msg = "Device management service error"; + log.error(msg, deviceMgtServiceEx); + throw new AndroidAgentException(msg, deviceMgtServiceEx); + } + + try { + boolean result = dmService.getOperationManager("").addOperation(null, null); + if (result) { + Response.status(HttpStatus.SC_OK); + responseMsg.setResponseMessage("Device has already enrolled"); + } else { + Response.status(HttpStatus.SC_NOT_FOUND); + responseMsg.setResponseMessage("Operation not found"); + } + return responseMsg; + } catch (DeviceManagementException e) { + msg = "Error occurred while fetching the operation manager for the device type."; + log.error(msg, e); + Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR); + throw new AndroidAgentException(msg, e); + } catch (OperationManagementException e) { + msg = "Error occurred while updating the operation status for the device."; + log.error(msg, e); + Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR); + throw new AndroidAgentException(msg, e); + } + } +} \ No newline at end of file