Revert direct app publishing merge conflict

traccar-synced^2
navodzoysa 2 years ago
parent 1b2bddb167
commit b25fb4e6ad

@ -169,7 +169,7 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Path("/ent-app") @Path("/ent-app")
public Response createEntApp( public Response createEntApp(
ApplicationWrapper applicationWrapper, @QueryParam("isPublished") boolean isPublished) { ApplicationWrapper applicationWrapper, @QueryParam("is-published") boolean isPublished) {
try { try {
return createApplication(applicationWrapper, isPublished); return createApplication(applicationWrapper, isPublished);
} catch (BadRequestException e) { } catch (BadRequestException e) {
@ -191,7 +191,7 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Path("/web-app") @Path("/web-app")
public Response createWebApp( public Response createWebApp(
WebAppWrapper webAppWrapper, @QueryParam("isPublished") boolean isPublished) { WebAppWrapper webAppWrapper, @QueryParam("is-published") boolean isPublished) {
try { try {
return createApplication(webAppWrapper, isPublished); return createApplication(webAppWrapper, isPublished);
} catch (BadRequestException e) { } catch (BadRequestException e) {
@ -213,7 +213,7 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Path("/public-app") @Path("/public-app")
public Response createPubApp( public Response createPubApp(
PublicAppWrapper publicAppWrapper, @QueryParam("isPublished") boolean isPublished) { PublicAppWrapper publicAppWrapper, @QueryParam("is-published") boolean isPublished) {
try { try {
return createApplication(publicAppWrapper, isPublished); return createApplication(publicAppWrapper, isPublished);
} catch (BadRequestException e) { } catch (BadRequestException e) {
@ -235,7 +235,7 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Path("/custom-app") @Path("/custom-app")
public Response createCustomApp( public Response createCustomApp(
CustomAppWrapper customAppWrapper, @QueryParam("isPublished") boolean isPublished) { CustomAppWrapper customAppWrapper, @QueryParam("is-published") boolean isPublished) {
try { try {
return createApplication(customAppWrapper, isPublished); return createApplication(customAppWrapper, isPublished);
} catch (BadRequestException e) { } catch (BadRequestException e) {

Loading…
Cancel
Save