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

Fixing issues in data types

Browse Source
revert-70aa11f8
prabathabey 10 years ago
parent ab6c2717c9
commit 458171952e
2 changed files with 69 additions and 56 deletions
Show Stats Download Patch File Download Diff File

9
product/modules/agents/android/jax-rs/pom.xml
Unescape View File

@ -155,6 +155,15 @@
<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
</dependencies>
<properties>
<cxf.version>2.6.1</cxf.version>

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

@ -21,8 +21,8 @@ import com.google.gson.JsonObject;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.context.CarbonContext;
import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.common.DeviceManagementException;
import org.wso2.carbon.device.mgt.core.dto.Device;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
import javax.ws.rs.*;
@ -34,17 +34,19 @@ import javax.ws.rs.core.Response;
@Path("/enrollment")
public class Enrollment {
private static Log log = LogFactory.getLog(Enrollment.class);
private static final Log log = LogFactory.getLog(Enrollment.class);
@POST
@Consumes("application/json")
public Response enrollDevice() {
JsonObject result = new JsonObject();
result.addProperty("senderId","jwwfowrjwqporqwrpqworpq");
result.addProperty("senderId", "jwwfowrjwqporqwrpqworpq");
CarbonContext context = CarbonContext.getThreadLocalCarbonContext();
DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class,null);
DeviceManagementService dmService =
(DeviceManagementService) context.getOSGiService(DeviceManagementService.class, null);
Device device = AndroidAPIUtil.convertToDeviceDTO(result);
try {
dmService.enrollDevice(null);
dmService.enrollDevice(device);
} catch (DeviceManagementException e) {
String msg = "Error occurred while enrolling the device";
log.error(msg, e);
@ -56,7 +58,7 @@ public class Enrollment {
@Path("{id}")
public String isEnrolled(@PathParam("id") String id) {
CarbonContext context = CarbonContext.getThreadLocalCarbonContext();
DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class,null);
DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class, null);
try {
Device device = AndroidAPIUtil.convertToDeviceDTO(id);
dmService.isRegistered(null);
@ -71,7 +73,8 @@ public class Enrollment {
@Path("{id}")
public Response modifyEnrollment(@PathParam("id") String id) {
CarbonContext context = CarbonContext.getThreadLocalCarbonContext();
DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class,null);
DeviceManagementService dmService =
(DeviceManagementService) context.getOSGiService(DeviceManagementService.class, null);
try {
dmService.isRegistered(null);
} catch (DeviceManagementException e) {
@ -84,7 +87,8 @@ public class Enrollment {
@Path("{id}")
public Response disenrollDevice(@PathParam("id") String id) {
CarbonContext context = CarbonContext.getThreadLocalCarbonContext();
DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class,null);
DeviceManagementService dmService =
(DeviceManagementService) context.getOSGiService(DeviceManagementService.class, null);
try {
dmService.isRegistered(null);
} catch (DeviceManagementException e) {

Write Preview
Loading…
Cancel
Save