Making the windows rest api to be aligned with android

revert-dabc3590
Megala 8 years ago
parent 723e1dead2
commit 5e3bead760

@ -35,6 +35,7 @@ import org.wso2.carbon.device.mgt.mobile.windows.api.services.ConfigurationMgtSe
import javax.jws.WebService; import javax.jws.WebService;
import javax.ws.rs.*; import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -135,8 +136,8 @@ public class ConfigurationMgtServiceImpl implements ConfigurationMgtService {
@GET @GET
@Path("/license") @Path("/license")
public Response getLicense( @Produces(MediaType.TEXT_PLAIN)
@HeaderParam("If-Modified-Since") String ifModifiedSince) { public Response getLicense(@HeaderParam("If-Modified-Since") String ifModifiedSince) {
License license; License license;
try { try {
license = license =
@ -149,7 +150,7 @@ public class ConfigurationMgtServiceImpl implements ConfigurationMgtService {
throw new UnexpectedServerErrorException( throw new UnexpectedServerErrorException(
new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build()); new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build());
} }
return Response.status(Response.Status.OK).entity(license).build(); return Response.status(Response.Status.OK).entity((license == null) ? null : license.getText()).build();
} }
} }

Loading…
Cancel
Save