Merged with master, missing serialVersionUID are added, minor compiler warnings are fixed
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3e65110d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3e65110d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3e65110d Branch: refs/heads/WICKET-6498_deferred_javascript_2 Commit: 3e65110d3f01ea22e359bd75164a7843181af702 Parents: 17b1b73 Author: Maxim Solodovnik <[email protected]> Authored: Sun Jan 28 12:10:24 2018 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sun Jan 28 12:10:24 2018 +0700 ---------------------------------------------------------------------- .../markup/head/filter/FilteredHeaderItem.java | 2 ++ .../filter/JavaScriptDeferHeaderResponse.java | 5 +++- .../wicket/markup/head/filter/DeferredPage.java | 4 ++- .../filter/FilteringHeaderResponseTest.java | 30 ++++++++------------ .../examples/ajax/builtin/AjaxApplication.java | 6 ++-- 5 files changed, 23 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3e65110d/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java index 18745a2..e1728ec 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java @@ -35,6 +35,8 @@ import org.apache.wicket.request.Response; */ public class FilteredHeaderItem extends HeaderItem implements IWrappedHeaderItem { + private static final long serialVersionUID = 1L; + private HeaderItem wrapped; private String filterName; http://git-wip-us.apache.org/repos/asf/wicket/blob/3e65110d/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptDeferHeaderResponse.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptDeferHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptDeferHeaderResponse.java index 39c20d1..b3d48a8 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptDeferHeaderResponse.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptDeferHeaderResponse.java @@ -70,6 +70,8 @@ public class JavaScriptDeferHeaderResponse extends DecoratingHeaderResponse */ private class NativeOnDomContentLoadedHeaderItem extends OnDomReadyHeaderItem { + private static final long serialVersionUID = 1L; + /** * Construct. * @@ -96,6 +98,7 @@ public class JavaScriptDeferHeaderResponse extends DecoratingHeaderResponse */ private class NativeOnLoadHeaderItem extends OnLoadHeaderItem { + private static final long serialVersionUID = 1L; /** * Construct. @@ -117,4 +120,4 @@ public class JavaScriptDeferHeaderResponse extends DecoratingHeaderResponse } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/3e65110d/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/DeferredPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/DeferredPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/DeferredPage.java index 355328b..b5e3850 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/DeferredPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/DeferredPage.java @@ -35,10 +35,12 @@ public class DeferredPage extends WebPage public DeferredPage() { add(new AjaxEventBehavior("click") { + private static final long serialVersionUID = 1L; + @Override protected void onEvent(AjaxRequestTarget target) { } }); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/3e65110d/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java index 99665a7..88e9c64 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java @@ -59,21 +59,22 @@ public class FilteringHeaderResponseTest extends WicketTestCase @Test public void createBucketOnTheFlyForFilteredHeaderItem() throws Exception { - FilteringHeaderResponse headerResponse = new FilteringHeaderResponse(new HeaderResponse() + try (FilteringHeaderResponse headerResponse = new FilteringHeaderResponse(new HeaderResponse() { @Override protected Response getRealResponse() { return new StringResponse(); } - }, "headerBucketName", Collections.EMPTY_LIST); - - String filterName = "filterName"; - String headerContent = "content"; - FilteredHeaderItem item = new FilteredHeaderItem(StringHeaderItem.forString(headerContent), filterName); - headerResponse.render(item); - CharSequence realContent = headerResponse.getContent(filterName); - assertEquals(headerContent, realContent.toString()); + }, "headerBucketName", Collections.emptyList())) + { + String filterName = "filterName"; + String headerContent = "content"; + FilteredHeaderItem item = new FilteredHeaderItem(StringHeaderItem.forString(headerContent), filterName); + headerResponse.render(item); + CharSequence realContent = headerResponse.getContent(filterName); + assertEquals(headerContent, realContent.toString()); + } } /** @@ -83,14 +84,7 @@ public class FilteringHeaderResponseTest extends WicketTestCase @Test public void deferred() throws Exception { - tester.getApplication().setHeaderResponseDecorator(new IHeaderResponseDecorator() - { - @Override - public IHeaderResponse decorate(IHeaderResponse response) - { - return new ResourceAggregator(new JavaScriptDeferHeaderResponse(response)); - } - }); + tester.getApplication().setHeaderResponseDecorator(response -> new ResourceAggregator(new JavaScriptDeferHeaderResponse(response))); executeTest(DeferredPage.class, "DeferredPageExpected.html"); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/3e65110d/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java index c38265a..9f8327e 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java @@ -46,10 +46,8 @@ public class AjaxApplication extends WicketExampleApplication getDebugSettings().setAjaxDebugModeEnabled(true); - setHeaderResponseDecorator(response -> { - // use this header resource decorator to defer all JavaScript resources - return new ResourceAggregator(new JavaScriptDeferHeaderResponse(response)); - }); + // use this header resource decorator to defer all JavaScript resources + setHeaderResponseDecorator(response -> new ResourceAggregator(new JavaScriptDeferHeaderResponse(response))); getComponentInitializationListeners().add(new IComponentInitializationListener() {
