kavishka
/
device-mgt-core
forked from community/device-mgt-core
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored Android-REST API code

Browse Source
revert-70aa11f8
harshanL 10 years ago
parent 7282465b12
commit d352daf626
5 changed files with 93 additions and 103 deletions
Show Stats Download Patch File Download Diff File

10
product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Authentication.java
Unescape View File

@ -16,7 +16,6 @@
package cdm.api.android; package cdm.api.android;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import javax.ws.rs.POST; import javax.ws.rs.POST;
@ -31,7 +30,8 @@ public class Authentication {
@POST @POST
@Path("/device/") @Path("/device/")
@Produces("application/json") @Produces("application/json")
public String authenticateDevice(@FormParam("username") String username, @FormParam("password") String password) { public String authenticateDevice(@FormParam("username") String username,
@FormParam("password") String password) {
JsonObject result = new JsonObject(); JsonObject result = new JsonObject();
result.addProperty("senderId", "jwwfowrjwqporqwrpqworpq"); result.addProperty("senderId", "jwwfowrjwqporqwrpqworpq");
return result.toString(); return result.toString();
@ -42,10 +42,4 @@ public class Authentication {
public String getLicense() { public String getLicense() {
return "License Agreement"; return "License Agreement";
} }
@POST
@Path("/device/enroll")
public Response enrollDevice() {
return Response.status(201).entity("Registration Successful").build();
}
} }

63
product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Device.java
Unescape View File

@ -17,8 +17,9 @@
package cdm.api.android; package cdm.api.android;
import cdm.api.android.util.AndroidAPIUtils; import cdm.api.android.util.AndroidAPIUtils;
import cdm.api.android.util.AndroidConstants;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonObject; import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext;
@ -26,7 +27,6 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.DeviceManagementException;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementService; import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
import javax.ws.rs.*; import javax.ws.rs.*;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
@ -46,22 +46,18 @@ public class Device {
String msg = ""; String msg = "";
DeviceManagementService dmService; DeviceManagementService dmService;
try { try {
PrivilegedCarbonContext.startTenantFlow(); dmService = AndroidAPIUtils.getDeviceManagementService();
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
dmService = (DeviceManagementService) ctx
.getOSGiService(DeviceManagementService.class, null);
} finally { } finally {
PrivilegedCarbonContext.endTenantFlow(); PrivilegedCarbonContext.endTenantFlow();
} }
try { try {
if (dmService != null) { if (dmService != null) {
result = dmService.getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID); result = dmService.getAllDevices(
DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
status = 1; status = 1;
} else { } else {
status = -1; status = -1;
msg = "Device Manager service not available"; msg = AndroidConstants.Messages.DEVICE_MANAGER_SERVICE_NOT_AVAILABLE;
} }
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
@ -71,12 +67,14 @@ public class Device {
} }
switch (status) { switch (status) {
case 1: case 1:
if(result!=null){
String response = new Gson().toJson(result); String response = new Gson().toJson(result);
return Response.status(200).entity(response).build(); return Response.status(HttpStatus.SC_OK).entity(response).build();
}
case -1: case -1:
return Response.status(500).entity(msg).build(); return Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).entity(msg).build();
} }
return Response.status(400).entity("Unable to fetch device list").build(); return Response.status(HttpStatus.SC_NOT_FOUND).entity("Unable to fetch device list").build();
} }
@GET @GET
@ -85,14 +83,10 @@ public class Device {
int status = 0; int status = 0;
String msg = ""; String msg = "";
DeviceManagementService dmService; DeviceManagementService dmService;
org.wso2.carbon.device.mgt.common.Device device = new org.wso2.carbon.device.mgt.common.Device(); org.wso2.carbon.device.mgt.common.Device device =
new org.wso2.carbon.device.mgt.common.Device();
try { try {
PrivilegedCarbonContext.startTenantFlow(); dmService = AndroidAPIUtils.getDeviceManagementService();
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
dmService = (DeviceManagementService) ctx
.getOSGiService(DeviceManagementService.class, null);
} finally { } finally {
PrivilegedCarbonContext.endTenantFlow(); PrivilegedCarbonContext.endTenantFlow();
} }
@ -103,7 +97,7 @@ public class Device {
status = 1; status = 1;
} else { } else {
status = -1; status = -1;
msg = "Device Manager service not available"; msg = AndroidConstants.Messages.DEVICE_MANAGER_SERVICE_NOT_AVAILABLE;
} }
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
@ -113,12 +107,15 @@ public class Device {
} }
switch (status) { switch (status) {
case 1: case 1:
if(device!=null) {
String response = new Gson().toJson(device); String response = new Gson().toJson(device);
return Response.status(200).entity(response).build(); return Response.status(HttpStatus.SC_OK).entity(response).build();
}
break;
case -1: case -1:
return Response.status(500).entity(msg).build(); return Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).entity(msg).build();
} }
return Response.status(400).entity("Unable to fetch device information").build(); return Response.status(HttpStatus.SC_NOT_FOUND).entity("Unable to fetch device information").build();
} }
@PUT @PUT
@ -129,23 +126,19 @@ public class Device {
String msg = ""; String msg = "";
DeviceManagementService dmService; DeviceManagementService dmService;
try { try {
PrivilegedCarbonContext.startTenantFlow(); dmService = AndroidAPIUtils.getDeviceManagementService();
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
dmService = (DeviceManagementService) ctx
.getOSGiService(DeviceManagementService.class, null);
} finally { } finally {
PrivilegedCarbonContext.endTenantFlow(); PrivilegedCarbonContext.endTenantFlow();
} }
org.wso2.carbon.device.mgt.common.Device device = AndroidAPIUtils.convertToDeviceObject(jsonPayload); org.wso2.carbon.device.mgt.common.Device device =
AndroidAPIUtils.convertToDeviceObject(jsonPayload);
try { try {
if (dmService != null) { if (dmService != null) {
result = dmService.updateDeviceInfo(device); result = dmService.updateDeviceInfo(device);
status = 1; status = 1;
} else { } else {
status = -1; status = -1;
msg = "Device Manager service not available"; msg = AndroidConstants.Messages.DEVICE_MANAGER_SERVICE_NOT_AVAILABLE;
} }
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
msg = "Error occurred while modifying the device information"; msg = "Error occurred while modifying the device information";
@ -155,12 +148,12 @@ public class Device {
switch (status) { switch (status) {
case 1: case 1:
if (result) { if (result) {
return Response.status(200).entity("Device has modified").build(); return Response.status(HttpStatus.SC_OK).entity("Device has modified").build();
} }
break; break;
case -1: case -1:
return Response.status(500).entity(msg).build(); return Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).entity(msg).build();
} }
return Response.status(400).entity("Update device has failed").build(); return Response.status(HttpStatus.SC_NOT_MODIFIED).entity("Update device has failed").build();
} }
} }

64
product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Enrollment.java
Unescape View File

@ -17,14 +17,15 @@
package cdm.api.android; package cdm.api.android;
import cdm.api.android.util.AndroidAPIUtils; import cdm.api.android.util.AndroidAPIUtils;
import cdm.api.android.util.AndroidConstants;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.commons.httpclient.HttpStatus;
import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.DeviceManagementException;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementService; import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
import javax.ws.rs.*; import javax.ws.rs.*;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
@ -43,12 +44,7 @@ public class Enrollment {
String msg = ""; String msg = "";
DeviceManagementService dmService; DeviceManagementService dmService;
try { try {
PrivilegedCarbonContext.startTenantFlow(); dmService = AndroidAPIUtils.getDeviceManagementService();
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
dmService = (DeviceManagementService) ctx
.getOSGiService(DeviceManagementService.class, null);
} finally { } finally {
PrivilegedCarbonContext.endTenantFlow(); PrivilegedCarbonContext.endTenantFlow();
} }
@ -59,9 +55,8 @@ public class Enrollment {
status = 1; status = 1;
} else { } else {
status = -1; status = -1;
msg = "Device Manager service not available"; msg = AndroidConstants.Messages.DEVICE_MANAGER_SERVICE_NOT_AVAILABLE;
} }
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
msg = "Error occurred while enrolling the device"; msg = "Error occurred while enrolling the device";
log.error(msg, e); log.error(msg, e);
@ -70,13 +65,13 @@ public class Enrollment {
switch (status) { switch (status) {
case 1: case 1:
if (result) { if (result) {
return Response.status(201).entity("Registration Successful").build(); return Response.status(HttpStatus.SC_CREATED).entity("Device enrollment has succeeded").build();
} }
break; break;
case -1: case -1:
return Response.status(500).entity(msg).build(); return Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).entity(msg).build();
} }
return Response.status(400).entity("Registration Failed").build(); return Response.status(HttpStatus.SC_BAD_REQUEST).entity("Device enrollment has Failed").build();
} }
@GET @GET
@ -87,12 +82,7 @@ public class Enrollment {
String msg = ""; String msg = "";
DeviceManagementService dmService; DeviceManagementService dmService;
try { try {
PrivilegedCarbonContext.startTenantFlow(); dmService = AndroidAPIUtils.getDeviceManagementService();
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
dmService = (DeviceManagementService) ctx
.getOSGiService(DeviceManagementService.class, null);
} finally { } finally {
PrivilegedCarbonContext.endTenantFlow(); PrivilegedCarbonContext.endTenantFlow();
} }
@ -103,7 +93,7 @@ public class Enrollment {
status = 1; status = 1;
} else { } else {
status = -1; status = -1;
msg = "Device Manager service not available"; msg = AndroidConstants.Messages.DEVICE_MANAGER_SERVICE_NOT_AVAILABLE;
} }
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
msg = "Error occurred while checking enrollment of the device"; msg = "Error occurred while checking enrollment of the device";
@ -113,13 +103,13 @@ public class Enrollment {
switch (status) { switch (status) {
case 1: case 1:
if (result) { if (result) {
return Response.status(200).entity(result).build(); return Response.status(HttpStatus.SC_OK).entity(result).build();
} }
break; break;
case -1: case -1:
return Response.status(500).entity(msg).build(); return Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).entity(msg).build();
} }
return Response.status(404).entity(result).build(); return Response.status(HttpStatus.SC_NOT_FOUND).entity(result).build();
} }
@PUT @PUT
@ -130,12 +120,7 @@ public class Enrollment {
String msg = ""; String msg = "";
DeviceManagementService dmService; DeviceManagementService dmService;
try { try {
PrivilegedCarbonContext.startTenantFlow(); dmService = AndroidAPIUtils.getDeviceManagementService();
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
dmService = (DeviceManagementService) ctx
.getOSGiService(DeviceManagementService.class, null);
} finally { } finally {
PrivilegedCarbonContext.endTenantFlow(); PrivilegedCarbonContext.endTenantFlow();
} }
@ -146,7 +131,7 @@ public class Enrollment {
status = 1; status = 1;
} else { } else {
status = -1; status = -1;
msg = "Device Manager service not available"; msg = AndroidConstants.Messages.DEVICE_MANAGER_SERVICE_NOT_AVAILABLE;
} }
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
msg = "Error occurred while modifying enrollment of the device"; msg = "Error occurred while modifying enrollment of the device";
@ -156,13 +141,13 @@ public class Enrollment {
switch (status) { switch (status) {
case 1: case 1:
if (result) { if (result) {
return Response.status(200).entity("Device information modified").build(); return Response.status(HttpStatus.SC_OK).entity("Enrollment information has modified").build();
} }
break; break;
case -1: case -1:
return Response.status(500).entity(msg).build(); return Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).entity(msg).build();
} }
return Response.status(400).entity("Update enrollment failed").build(); return Response.status(HttpStatus.SC_NOT_MODIFIED).entity("Update enrollment has failed").build();
} }
@DELETE @DELETE
@ -173,12 +158,7 @@ public class Enrollment {
String msg = ""; String msg = "";
DeviceManagementService dmService; DeviceManagementService dmService;
try { try {
PrivilegedCarbonContext.startTenantFlow(); dmService = AndroidAPIUtils.getDeviceManagementService();
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
dmService = (DeviceManagementService) ctx
.getOSGiService(DeviceManagementService.class, null);
} finally { } finally {
PrivilegedCarbonContext.endTenantFlow(); PrivilegedCarbonContext.endTenantFlow();
} }
@ -189,7 +169,7 @@ public class Enrollment {
status = 1; status = 1;
} else { } else {
status = -1; status = -1;
msg = "Device Manager service not available"; msg = AndroidConstants.Messages.DEVICE_MANAGER_SERVICE_NOT_AVAILABLE;
} }
} catch (DeviceManagementException e) { } catch (DeviceManagementException e) {
msg = "Error occurred while disenrolling the device"; msg = "Error occurred while disenrolling the device";
@ -199,12 +179,12 @@ public class Enrollment {
switch (status) { switch (status) {
case 1: case 1:
if (result) { if (result) {
return Response.status(200).entity(result).build(); return Response.status(HttpStatus.SC_OK).entity(result).build();
} }
break; break;
case -1: case -1:
return Response.status(500).entity(msg).build(); return Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).entity(msg).build();
} }
return Response.status(404).entity("Device not found").build(); return Response.status(HttpStatus.SC_NOT_FOUND).entity("Device not found").build();
} }
} }

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

@ -19,7 +19,10 @@ package cdm.api.android.util;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.device.mgt.common.*; 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.*; import java.util.*;
@ -112,4 +115,16 @@ public class AndroidAPIUtils {
identifier.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID); identifier.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
return identifier; return identifier;
} }
public static DeviceManagementService getDeviceManagementService() {
DeviceManagementService dmService;
PrivilegedCarbonContext.startTenantFlow();
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
dmService = (DeviceManagementService) ctx
.getOSGiService(DeviceManagementService.class, null);
return dmService;
}
} }

8
product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidConstants.java
Unescape View File

@ -45,4 +45,12 @@ public final class AndroidConstants {
public static final String DEVICE_PROPERTIES_KEY = "properties"; public static final String DEVICE_PROPERTIES_KEY = "properties";
public static final String DEVICE_FEATURES_KEY = "features"; public static final String DEVICE_FEATURES_KEY = "features";
} }
public final class Messages{
private Messages(){
throw new AssertionError();
}
public static final String DEVICE_MANAGER_SERVICE_NOT_AVAILABLE =
"Device Manager service not available";
}
} }

Write Preview
Loading…
Cancel
Save