Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix generation Widget URL #10727 #10728

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Fix generation Widget URL #10727 #10728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...pl/src/main/java/com/enonic/xp/admin/impl/portal/widget/GetListAllowedWidgetsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) ) );
}
Expand Down
4 changes: 2 additions & 2 deletions ...rc/test/java/com/enonic/xp/admin/impl/portal/widget/GetListAllowedWidgetsHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -66,7 +66,7 @@ void testHandle()
final Multimap<String, String> 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 );
Expand Down
2 changes: 1 addition & 1 deletion ...ortal/portal-impl/src/main/java/com/enonic/xp/portal/impl/url/UniversalApiUrlBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() );
Expand Down