From 472d34dc09d2b3b014d241278cce05ae4e66667c Mon Sep 17 00:00:00 2001 From: navodzoysa Date: Fri, 16 Dec 2022 08:31:22 +0530 Subject: [PATCH] Fix incorrect query param when directly publishing an app --- .../ApplicationManagementPublisherAPI.java | 16 ++++++++-------- .../api/services/SPApplicationService.java | 8 ++++---- .../ApplicationManagementPublisherAPIImpl.java | 8 ++++---- .../services/impl/SPApplicationServiceImpl.java | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java index 93918ae1e92..bfc2c7ed61e 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java +++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java @@ -322,7 +322,7 @@ public interface ApplicationManagementPublisherAPI { name = "isPublished", value = "Published state of the application" ) - @QueryParam("isPublished") boolean isPublished); + @QueryParam("is-published") boolean isPublished); @POST @Path("/web-app") @@ -366,7 +366,7 @@ public interface ApplicationManagementPublisherAPI { name = "isPublished", value = "Published state of the application" ) - @QueryParam("isPublished") boolean isPublished + @QueryParam("is-published") boolean isPublished ); @POST @@ -411,7 +411,7 @@ public interface ApplicationManagementPublisherAPI { name = "isPublished", value = "Published state of the application" ) - @QueryParam("isPublished") boolean isPublished + @QueryParam("is-published") boolean isPublished ); @POST @@ -457,7 +457,7 @@ public interface ApplicationManagementPublisherAPI { name = "isPublished", value = "Published state of the application" ) - @QueryParam("isPublished") boolean isPublished + @QueryParam("is-published") boolean isPublished ); @POST @@ -512,7 +512,7 @@ public interface ApplicationManagementPublisherAPI { name = "isPublished", value = "Published state of the application" ) - @QueryParam("isPublished") boolean isPublished + @QueryParam("is-published") boolean isPublished ); @POST @@ -567,7 +567,7 @@ public interface ApplicationManagementPublisherAPI { name = "isPublished", value = "Published state of the application" ) - @QueryParam("isPublished") boolean isPublished + @QueryParam("is-published") boolean isPublished ); @POST @@ -617,7 +617,7 @@ public interface ApplicationManagementPublisherAPI { name = "isPublished", value = "Published state of the application" ) - @QueryParam("isPublished") boolean isPublished + @QueryParam("is-published") boolean isPublished ); @POST @@ -672,7 +672,7 @@ public interface ApplicationManagementPublisherAPI { name = "isPublished", value = "Published state of the application" ) - @QueryParam("isPublished") boolean isPublished + @QueryParam("is-published") boolean isPublished ); @PUT diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/SPApplicationService.java b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/SPApplicationService.java index 5d4797db385..3b53852aba5 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/SPApplicationService.java +++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/SPApplicationService.java @@ -318,7 +318,7 @@ public interface SPApplicationService { name = "isPublished", value = "Published state of the application" ) - @QueryParam("isPublished") boolean isPublished); + @QueryParam("is-published") boolean isPublished); /** * This method is used to register an APIM application for tenant domain. @@ -345,7 +345,7 @@ public interface SPApplicationService { name = "isPublished", value = "Published state of the application" ) - @QueryParam("isPublished") boolean isPublished); + @QueryParam("is-published") boolean isPublished); @Path("/{identity-server-id}/service-provider/{service-provider-id}/create/web-app") @POST @@ -369,7 +369,7 @@ public interface SPApplicationService { name = "isPublished", value = "Published state of the application" ) - @QueryParam("isPublished") boolean isPublished); + @QueryParam("is-published") boolean isPublished); @Path("/{identity-server-id}/service-provider/{service-provider-id}/create/custom-app") @POST @@ -392,5 +392,5 @@ public interface SPApplicationService { name = "isPublished", value = "Published state of the application" ) - @QueryParam("isPublished") boolean isPublished); + @QueryParam("is-published") boolean isPublished); } diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java index 078af292d99..8df89f208af 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java @@ -260,7 +260,7 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem @PathParam("deviceType") String deviceTypeName, @PathParam("appId") int appId, EntAppReleaseWrapper entAppReleaseWrapper, - @QueryParam("isPublished") boolean isPublished) { + @QueryParam("is-published") boolean isPublished) { try { ApplicationManager applicationManager = APIUtil.getApplicationManager(); applicationManager.validateEntAppReleaseCreatingRequest(entAppReleaseWrapper, deviceTypeName); @@ -284,7 +284,7 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem public Response createPubAppRelease( @PathParam("deviceType") String deviceTypeName, @PathParam("appId") int appId, - PublicAppReleaseWrapper publicAppReleaseWrapper, @QueryParam("isPublished") boolean isPublished) { + PublicAppReleaseWrapper publicAppReleaseWrapper, @QueryParam("is-published") boolean isPublished) { try { ApplicationManager applicationManager = APIUtil.getApplicationManager(); @@ -312,7 +312,7 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem @Override public Response createWebAppRelease( @PathParam("appId") int appId, - WebAppReleaseWrapper webAppReleaseWrapper, @QueryParam("isPublished") boolean isPublished) { + WebAppReleaseWrapper webAppReleaseWrapper, @QueryParam("is-published") boolean isPublished) { try { ApplicationManager applicationManager = APIUtil.getApplicationManager(); applicationManager.validateWebAppReleaseCreatingRequest(webAppReleaseWrapper); @@ -340,7 +340,7 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem public Response createCustomAppRelease( @PathParam("deviceType") String deviceTypeName, @PathParam("appId") int appId, - CustomAppReleaseWrapper customAppReleaseWrapper, @QueryParam("isPublished") boolean isPublished) { + CustomAppReleaseWrapper customAppReleaseWrapper, @QueryParam("is-published") boolean isPublished) { try { ApplicationManager applicationManager = APIUtil.getApplicationManager(); applicationManager.validateCustomAppReleaseCreatingRequest(customAppReleaseWrapper, deviceTypeName); diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/SPApplicationServiceImpl.java b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/SPApplicationServiceImpl.java index ec197dd47f8..4abe861ce81 100644 --- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/SPApplicationServiceImpl.java +++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/SPApplicationServiceImpl.java @@ -295,7 +295,7 @@ public class SPApplicationServiceImpl implements SPApplicationService { @Override public Response createEntApp(@PathParam("identity-server-id") int identityServerId, @PathParam("service-provider-id") String serviceProviderId, ApplicationWrapper app, - @QueryParam("isPublished") boolean isPublished) { + @QueryParam("is-published") boolean isPublished) { return createSPApplication(identityServerId, serviceProviderId, app, isPublished); } @@ -304,7 +304,7 @@ public class SPApplicationServiceImpl implements SPApplicationService { @Override public Response createPubApp(@PathParam("identity-server-id") int identityServerId, @PathParam("service-provider-id") String serviceProviderId, PublicAppWrapper app, - @QueryParam("isPublished") boolean isPublished) { + @QueryParam("is-published") boolean isPublished) { return createSPApplication(identityServerId, serviceProviderId, app, isPublished); } @@ -313,7 +313,7 @@ public class SPApplicationServiceImpl implements SPApplicationService { @Override public Response createWebApp(@PathParam("identity-server-id") int identityServerId, @PathParam("service-provider-id") String serviceProviderId, WebAppWrapper app, - @QueryParam("isPublished") boolean isPublished) { + @QueryParam("is-published") boolean isPublished) { return createSPApplication(identityServerId, serviceProviderId, app, isPublished); } @@ -322,7 +322,7 @@ public class SPApplicationServiceImpl implements SPApplicationService { @Override public Response createCustomApp(@PathParam("identity-server-id") int identityServerId, @PathParam("service-provider-id") String serviceProviderId, CustomAppWrapper app, - @QueryParam("isPublished") boolean isPublished) { + @QueryParam("is-published") boolean isPublished) { return createSPApplication(identityServerId, serviceProviderId, app, isPublished); }