Merge branch 'change/api/isExistingApp' into 'master'

Change API that checks if an appName already exists, to accept the appName as query parameter

See merge request entgra/carbon-device-mgt!824
feature/traccar-sync
Pahansith Gunathilake 3 years ago
commit d2df228e8b

@ -683,7 +683,7 @@ public interface ApplicationManagementPublisherAPI {
); );
@GET @GET
@Path("/device-type/{deviceType}/app-name/{appName}") @Path("/device-type/{deviceType}/app-name")
@ApiOperation( @ApiOperation(
httpMethod = "GET", httpMethod = "GET",
value = "Check the application existence", value = "Check the application existence",
@ -723,7 +723,7 @@ public interface ApplicationManagementPublisherAPI {
name = "appName", name = "appName",
value = "Application name", value = "Application name",
required = true) required = true)
@PathParam("appName") String appName @QueryParam("appName") String appName
); );
@PUT @PUT

@ -390,11 +390,16 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem
@Override @Override
@GET @GET
@Path("/device-type/{deviceType}/app-name/{appName}") @Path("/device-type/{deviceType}/app-name")
public Response isExistingApplication( public Response isExistingApplication(
@PathParam("deviceType") String deviceType, @PathParam("deviceType") String deviceType,
@PathParam("appName") String appName ){ @QueryParam("appName") String appName){
try { try {
if (appName == null) {
String msg = "Invalid app name, appName query param cannot be empty/null.";
log.error(msg);
return Response.status(Response.Status.BAD_REQUEST).build();
}
ApplicationManager applicationManager = APIUtil.getApplicationManager(); ApplicationManager applicationManager = APIUtil.getApplicationManager();
if (applicationManager.isExistingAppName(appName, deviceType)) { if (applicationManager.isExistingAppName(appName, deviceType)) {
return Response.status(Response.Status.CONFLICT).build(); return Response.status(Response.Status.CONFLICT).build();

Loading…
Cancel
Save