Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new

4.x.x
Jayasanka 6 years ago
commit c64cb80507

@ -95,6 +95,7 @@ public class HandlerUtil {
} }
} }
proxyResponse.setCode(statusCode); proxyResponse.setCode(statusCode);
proxyResponse.setData(jsonString);
proxyResponse proxyResponse
.setExecutorResponse(HandlerConstants.EXECUTOR_EXCEPTION_PREFIX + getStatusKey(statusCode)); .setExecutorResponse(HandlerConstants.EXECUTOR_EXCEPTION_PREFIX + getStatusKey(statusCode));
return proxyResponse; return proxyResponse;

@ -82,7 +82,7 @@ public class ApplicationManagementAPIImpl implements ApplicationManagementAPI {
try { try {
ApplicationList applications = applicationManager.getApplications(filter); ApplicationList applications = applicationManager.getApplications(filter);
if (applications.getApplications().isEmpty()) { if (applications.getApplications().isEmpty()) {
return Response.status(Response.Status.NOT_FOUND) return Response.status(Response.Status.OK)
.entity("Couldn't find any application for the requested query.").build(); .entity("Couldn't find any application for the requested query.").build();
} }
return Response.status(Response.Status.OK).entity(applications).build(); return Response.status(Response.Status.OK).entity(applications).build();

Loading…
Cancel
Save