From 8e35a5e2fb8d8d92c382209777c09b148cbf91d8 Mon Sep 17 00:00:00 2001 From: Anatol Sialitski Date: Mon, 14 Oct 2024 13:47:33 +0200 Subject: [PATCH] Fix generation Widget URL #10727 --- .../impl/portal/widget/GetListAllowedWidgetsHandler.java | 2 +- .../impl/portal/widget/GetListAllowedWidgetsHandlerTest.java | 4 ++-- .../com/enonic/xp/portal/impl/url/UniversalApiUrlBuilder.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/admin/admin-impl/src/main/java/com/enonic/xp/admin/impl/portal/widget/GetListAllowedWidgetsHandler.java b/modules/admin/admin-impl/src/main/java/com/enonic/xp/admin/impl/portal/widget/GetListAllowedWidgetsHandler.java index 9a3cd049d8d..f56d59a1906 100644 --- a/modules/admin/admin-impl/src/main/java/com/enonic/xp/admin/impl/portal/widget/GetListAllowedWidgetsHandler.java +++ b/modules/admin/admin-impl/src/main/java/com/enonic/xp/admin/impl/portal/widget/GetListAllowedWidgetsHandler.java @@ -75,7 +75,7 @@ public WebResponse handle( final WebRequest webRequest ) if ( widgetDescriptors.isNotEmpty() ) { final String widgetApiBaseUrl = portalUrlService.apiUrl( - new ApiUrlParams().portalRequest( new PortalRequest( webRequest ) ).application( "admin" ).api( "widget" ) ); + new ApiUrlParams().portalRequest( (PortalRequest) webRequest ).application( "admin" ).api( "widget" ) ); widgetDescriptors.forEach( widgetDescriptor -> result.add( convertToJson( widgetDescriptor, widgetApiBaseUrl ) ) ); } diff --git a/modules/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/portal/widget/GetListAllowedWidgetsHandlerTest.java b/modules/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/portal/widget/GetListAllowedWidgetsHandlerTest.java index 2a2c1306db3..b5af1c8934a 100644 --- a/modules/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/portal/widget/GetListAllowedWidgetsHandlerTest.java +++ b/modules/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/portal/widget/GetListAllowedWidgetsHandlerTest.java @@ -21,9 +21,9 @@ import com.enonic.xp.i18n.MessageBundle; import com.enonic.xp.icon.Icon; import com.enonic.xp.page.DescriptorKey; +import com.enonic.xp.portal.PortalRequest; import com.enonic.xp.portal.url.ApiUrlParams; import com.enonic.xp.portal.url.PortalUrlService; -import com.enonic.xp.web.WebRequest; import com.enonic.xp.web.WebResponse; import com.enonic.xp.web.servlet.ServletRequestHolder; @@ -66,7 +66,7 @@ void testHandle() final Multimap params = HashMultimap.create(); params.put( "widgetInterface", "myInterface" ); - final WebRequest webRequest = mock( WebRequest.class ); + final PortalRequest webRequest = mock( PortalRequest.class ); when( webRequest.getParams() ).thenReturn( params ); final Icon icon = mock( Icon.class ); diff --git a/modules/portal/portal-impl/src/main/java/com/enonic/xp/portal/impl/url/UniversalApiUrlBuilder.java b/modules/portal/portal-impl/src/main/java/com/enonic/xp/portal/impl/url/UniversalApiUrlBuilder.java index 6d60d994394..fd7361923c3 100644 --- a/modules/portal/portal-impl/src/main/java/com/enonic/xp/portal/impl/url/UniversalApiUrlBuilder.java +++ b/modules/portal/portal-impl/src/main/java/com/enonic/xp/portal/impl/url/UniversalApiUrlBuilder.java @@ -76,7 +76,7 @@ else if ( requestURI.startsWith( WEBAPP_PREFIX ) ) } final String applicationKey = - Objects.requireNonNullElse( this.params.getApplication(), portalRequest.getApplicationKey().toString() ); + Objects.requireNonNullElseGet( this.params.getApplication(), () -> portalRequest.getApplicationKey().toString() ); appendPart( url, applicationKey + ":" + this.params.getApi() ); appendSubPath( url, this.params.getPath() );