Skip to content

Rename usage welcome app in ApiHandler #11185 #11186

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename usage welcome app in ApiHandler #11185 #11186

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
4 changes: 2 additions & 2 deletions ...es/portal/portal-impl/src/main/java/com/enonic/xp/portal/impl/handler/api/ApiHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class ApiHandler
{
private static final Pattern URL_PATTERN = Pattern.compile( "^/api$" );

private static final ApplicationKey WELCOME_APP_KEY = ApplicationKey.from( "com.enonic.xp.app.welcome" );
private static final ApplicationKey SDK_APP_KEY = ApplicationKey.from( "com.enonic.xp.sdk" );
Copy link
Contributor

@rymsha rymsha Aug 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
private static final ApplicationKey SDK_APP_KEY = ApplicationKey.from( "com.enonic.xp.sdk" );
private static final ApplicationKey SDK_APP_KEY = ApplicationKey.from( "com.enonic.xp.app.sdk" );


private final ApplicationService applicationService;

Expand Down Expand Up @@ -70,7 +70,7 @@ public void activate( final ApiConfig config )
@Override
protected boolean canHandle( final WebRequest webRequest )
{
boolean isSDK = applicationService.get( WELCOME_APP_KEY ) != null;
boolean isSDK = applicationService.get( SDK_APP_KEY ) != null;
boolean isIndexEnabled = isSDK || RunMode.get() == RunMode.DEV
? apiIndexMode == ApiIndexMode.ON || apiIndexMode == ApiIndexMode.AUTO
: apiIndexMode == ApiIndexMode.ON;
Expand Down
2 changes: 1 addition & 1 deletion ...ortal/portal-impl/src/test/java/com/enonic/xp/portal/impl/handler/api/ApiHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public void testCanHandle()
assertFalse( this.handler.canHandle( webRequest ) );

Application welcomeApp = mock( Application.class );
when( applicationService.get( ApplicationKey.from( "com.enonic.xp.app.welcome" ) ) ).thenReturn( welcomeApp );
when( applicationService.get( ApplicationKey.from( "com.enonic.xp.sdk" ) ) ).thenReturn( welcomeApp );
when( apiConfig.api_index_enabled() ).thenReturn( "on" );
assertTrue( this.handler.canHandle( webRequest ) );
}
Expand Down