This is an automated email from the ASF dual-hosted git repository.
svenmeier pushed a commit to branch WICKET-6563
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/WICKET-6563 by this push:
new b91a4a1 WICKET-6563 applied review comments
b91a4a1 is described below
commit b91a4a16ecbbf06479b00b27164c6dc92c0f0061
Author: Sven Meier <svenme...@apache.org>
AuthorDate: Fri Jan 11 18:31:55 2019 +0100
WICKET-6563 applied review comments
---
.../org/apache/wicket/pageStore/InMemoryPageStore.java | 11 +++++++++--
.../org/apache/wicket/pageStore/SerializedPage.java | 18 ++++++++++++++++++
.../apache/wicket/pageStore/disk/NestedFolders.java | 7 ++++++-
.../wicket/core/request/mapper/TestMapperContext.java | 5 ++---
.../{PageIdPoliticTest.java => PageIdPolicyTest.java} | 2 +-
.../java/org/apache/wicket/devutils/DevUtilsPage.java | 9 ++++-----
.../diskstore/browser/PersistedPagesProvider.java | 2 +-
7 files changed, 41 insertions(+), 13 deletions(-)
diff --git
a/wicket-core/src/main/java/org/apache/wicket/pageStore/InMemoryPageStore.java
b/wicket-core/src/main/java/org/apache/wicket/pageStore/InMemoryPageStore.java
index 5c6dafb..b5a17e7 100644
---
a/wicket-core/src/main/java/org/apache/wicket/pageStore/InMemoryPageStore.java
+++
b/wicket-core/src/main/java/org/apache/wicket/pageStore/InMemoryPageStore.java
@@ -29,7 +29,9 @@ import java.util.stream.StreamSupport;
import org.apache.wicket.Application;
import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.page.IManageablePage;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Bytes;
+import org.apache.wicket.util.lang.Classes;
/**
* A storage of pages in memory.
@@ -50,7 +52,8 @@ public class InMemoryPageStore extends
AbstractPersistentPageStore
public InMemoryPageStore(String applicationName, int maxPages)
{
super(applicationName);
- this.maxPages = maxPages;
+
+ this.maxPages = Args.withinRange(1, Integer.MAX_VALUE,
maxPages, "maxPages");
}
/**
@@ -143,7 +146,11 @@ public class InMemoryPageStore extends
AbstractPersistentPageStore
synchronized (data)
{
return StreamSupport.stream(data.spliterator(), false)
- .map(page -> new
PersistedPage(page.getPageId(), page instanceof SerializedPage ?
((SerializedPage)page).getPageType() : page.getClass().getName(),
getSize(page)))
+ .map(page -> {
+ String pageType = page instanceof
SerializedPage ? ((SerializedPage)page).getPageType() :
Classes.name(page.getClass());
+
+ return new
PersistedPage(page.getPageId(), pageType, getSize(page));
+ })
.collect(Collectors.toList());
}
}
diff --git
a/wicket-core/src/main/java/org/apache/wicket/pageStore/SerializedPage.java
b/wicket-core/src/main/java/org/apache/wicket/pageStore/SerializedPage.java
index 40ad202..f9a08f9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/pageStore/SerializedPage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/SerializedPage.java
@@ -40,6 +40,24 @@ public class SerializedPage implements IManageablePage
private final byte[] data;
+ /**
+ * Create a serialized page.
+ *
+ * @param pageId id of page
+ * @param data
+ */
+ public SerializedPage(int pageId, byte[] data)
+ {
+ this(pageId, null, data);
+ }
+
+ /**
+ * Create a serialized page.
+ *
+ * @param pageId id of page
+ * @param pageType type of page, might be {@code null}
+ * @param data
+ */
public SerializedPage(int pageId, String pageType, byte[] data)
{
this.pageId = pageId;
diff --git
a/wicket-core/src/main/java/org/apache/wicket/pageStore/disk/NestedFolders.java
b/wicket-core/src/main/java/org/apache/wicket/pageStore/disk/NestedFolders.java
index 0f2077c..a47b414 100644
---
a/wicket-core/src/main/java/org/apache/wicket/pageStore/disk/NestedFolders.java
+++
b/wicket-core/src/main/java/org/apache/wicket/pageStore/disk/NestedFolders.java
@@ -24,7 +24,7 @@ import org.apache.wicket.util.file.Files;
import org.apache.wicket.util.lang.Args;
/**
- * Helps creating nested folders.
+ * Keep files in a nested filed structure to minimize amount of directory
entries (inodes) in a single directory.
*
* @author svenmeier
*/
@@ -104,6 +104,11 @@ public class NestedFolders
}
}
+ /**
+ * Get all files inside.
+ *
+ * @return files
+ */
public Set<File> getAll()
{
Set<File> files = new HashSet<>();
diff --git
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
index 9f1c44d..247004c 100644
---
a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
+++
b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
@@ -20,14 +20,13 @@ import org.apache.wicket.MockPage;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.markup.MarkupParser;
-import org.apache.wicket.mock.MockPageStore;
import org.apache.wicket.page.IPageManager;
import org.apache.wicket.page.PageManager;
import org.apache.wicket.pageStore.DummyPageContext;
import org.apache.wicket.pageStore.IPageContext;
import org.apache.wicket.pageStore.InMemoryPageStore;
-import org.apache.wicket.pageStore.RequestPageStore;
import org.apache.wicket.pageStore.InSessionPageStore;
+import org.apache.wicket.pageStore.RequestPageStore;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReference;
@@ -193,7 +192,7 @@ public class TestMapperContext implements IMapperContext
try
{
MockPage page;
- page = (MockPage)pageClass.newInstance();
+ page =
(MockPage)pageClass.getDeclaredConstructor().newInstance();
page.setPageId(++idCounter);
page.setBookmarkable(true);
page.setCreatedBookmarkable(true);
diff --git
a/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
b/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPolicyTest.java
similarity index 96%
rename from
wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
rename to
wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPolicyTest.java
index 190abf8..b0895ed 100644
---
a/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
+++
b/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPolicyTest.java
@@ -46,7 +46,7 @@ import org.junit.jupiter.api.Test;
/**
* @author Pedro Santos
*/
-public class PageIdPoliticTest
+public class PageIdPolicyTest
{
private WicketTester tester;
private InMemoryPageStore pageStore;
diff --git
a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
index a8cb863..16e5954 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
@@ -37,7 +37,6 @@ public class DevUtilsPage extends WebPage
public DevUtilsPage()
{
super();
- init();
}
/**
@@ -48,7 +47,6 @@ public class DevUtilsPage extends WebPage
public DevUtilsPage(final IModel<?> model)
{
super(model);
- init();
}
/**
@@ -59,11 +57,12 @@ public class DevUtilsPage extends WebPage
public DevUtilsPage(final PageParameters parameters)
{
super(parameters);
- init();
}
- private void init()
- {
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
add(new DebugBar("debug"));
}
diff --git
a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PersistedPagesProvider.java
b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PersistedPagesProvider.java
index 62abfaf..5262bf3 100644
---
a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PersistedPagesProvider.java
+++
b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PersistedPagesProvider.java
@@ -60,7 +60,7 @@ class PersistedPagesProvider extends
SortableDataProvider<IPersistedPage, String
Collections.sort(pages, new SortComparator());
}
- return pages.iterator();
+ return pages.subList((int)first, (int)(first +
count)).iterator();
}
private List<IPersistedPage> getPages()
