-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
1dc67bd
commit 8500e3a
Showing
12 changed files
with
607 additions
and
65 deletions.
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
modules/lib/lib-portal/src/main/java/com/enonic/xp/lib/portal/url/ApiUrlHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
package com.enonic.xp.lib.portal.url; | ||
|
||
import java.util.Set; | ||
|
||
import com.google.common.collect.Multimap; | ||
|
||
import com.enonic.xp.portal.url.ApiUrlParams; | ||
|
||
public final class ApiUrlHandler | ||
extends AbstractUrlHandler | ||
{ | ||
private static final Set<String> VALID_URL_PROPERTY_KEYS = Set.of( "application", "api", "type", "params" ); | ||
|
||
@Override | ||
protected String buildUrl( final Multimap<String, String> map ) | ||
{ | ||
final ApiUrlParams params = new ApiUrlParams().portalRequest( this.request ).setAsMap( map ); | ||
return this.urlService.apiUrl( params ); | ||
} | ||
|
||
@Override | ||
protected boolean isValidParam( final String param ) | ||
{ | ||
return VALID_URL_PROPERTY_KEYS.contains( param ); | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
modules/lib/lib-portal/src/main/resources/lib/xp/examples/portal/apiUrl.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
const portalLib = require('/lib/xp/portal'); | ||
const assert = require('/lib/xp/testing'); | ||
|
||
// BEGIN | ||
const url = portalLib.apiUrl({ | ||
application: 'com.enonic.app.myapp', | ||
api: 'myapi', | ||
params: { | ||
a: 1, | ||
b: 2 | ||
} | ||
}); | ||
|
||
const unnamedApiUrl = portalLib.apiUrl({ | ||
application: 'com.enonic.app.myapp', | ||
}); | ||
|
||
// END | ||
|
||
assert.assertEquals('ApiUrlParams{type=server, params={a=[1], b=[2]}, api=myapi, application=com.enonic.app.myapp}', url); | ||
assert.assertEquals('ApiUrlParams{type=server, params={}, application=com.enonic.app.myapp}', unnamedApiUrl); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
modules/portal/portal-api/src/main/java/com/enonic/xp/portal/url/ApiUrlParams.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
package com.enonic.xp.portal.url; | ||
|
||
import java.util.Objects; | ||
|
||
import com.google.common.base.MoreObjects; | ||
import com.google.common.base.Strings; | ||
import com.google.common.collect.Multimap; | ||
|
||
import com.enonic.xp.annotation.PublicApi; | ||
|
||
@PublicApi | ||
public final class ApiUrlParams | ||
extends AbstractUrlParams<ApiUrlParams> | ||
{ | ||
private String application; | ||
|
||
private String api; | ||
|
||
public String getApplication() | ||
{ | ||
return application; | ||
} | ||
|
||
public String getApi() | ||
{ | ||
return api; | ||
} | ||
|
||
public ApiUrlParams application( final String value ) | ||
{ | ||
this.application = Objects.requireNonNull( value ); | ||
return this; | ||
} | ||
|
||
public ApiUrlParams api( final String value ) | ||
{ | ||
this.api = Strings.emptyToNull( value ); | ||
return this; | ||
} | ||
|
||
@Override | ||
public ApiUrlParams setAsMap( final Multimap<String, String> map ) | ||
{ | ||
super.setAsMap( map ); | ||
api( singleValue( map, "_api" ) ); | ||
application( singleValue( map, "_application" ) ); | ||
getParams().putAll( map ); | ||
return this; | ||
} | ||
|
||
@Override | ||
protected void buildToString( final MoreObjects.ToStringHelper helper ) | ||
{ | ||
super.buildToString( helper ); | ||
helper.add( "api", this.api ); | ||
helper.add( "application", this.application ); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
...es/portal/portal-impl/src/main/java/com/enonic/xp/portal/impl/url/SlashApiUrlBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package com.enonic.xp.portal.impl.url; | ||
|
||
import com.enonic.xp.portal.url.ApiUrlParams; | ||
|
||
import static com.enonic.xp.portal.impl.url.UrlBuilderHelper.appendParams; | ||
import static com.enonic.xp.portal.impl.url.UrlBuilderHelper.appendPart; | ||
|
||
public class SlashApiUrlBuilder | ||
{ | ||
private final ApiUrlParams params; | ||
|
||
public SlashApiUrlBuilder( ApiUrlParams params ) | ||
{ | ||
this.params = params; | ||
} | ||
|
||
public String build() | ||
{ | ||
final StringBuilder url = new StringBuilder(); | ||
appendPart( url, "api" ); | ||
appendPart( url, params.getApplication() ); | ||
if ( params.getApi() != null ) | ||
{ | ||
appendPart( url, params.getApi() ); | ||
} | ||
appendParams( url, params.getParams().entries() ); | ||
return url.toString(); | ||
} | ||
} |
Oops, something went wrong.