Make IDataProvider#detach() a default method and remove all empty implementations
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e93eb0ae Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e93eb0ae Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e93eb0ae Branch: refs/heads/master Commit: e93eb0ae99c0c0257a1511739512326ecf00cc73 Parents: ced9695 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Mar 16 21:08:06 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Mar 16 21:08:06 2016 +0100 ---------------------------------------------------------------------- .../markup/repeater/data/EmptyDataProvider.java | 17 ----------------- .../wicket/markup/repeater/data/IDataProvider.java | 3 +++ .../markup/repeater/data/ListDataProvider.java | 17 +---------------- .../examples/repeater/ContactDataProvider.java | 9 --------- .../html/repeater/util/SortableDataProvider.java | 16 ---------------- .../html/repeater/data/table/DataTableTest.java | 5 ----- 6 files changed, 4 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/e93eb0ae/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java index eac95b2..b8a21a4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java @@ -45,9 +45,6 @@ public class EmptyDataProvider<T> implements IDataProvider<T> return (EmptyDataProvider<T>)INSTANCE; } - /** - * @see IDataProvider#iterator(long, long) - */ @Override public Iterator<T> iterator(long first, long count) { @@ -55,29 +52,15 @@ public class EmptyDataProvider<T> implements IDataProvider<T> return list.iterator(); } - /** - * @see IDataProvider#size() - */ @Override public long size() { return 0; } - /** - * @see IDataProvider#model(Object) - */ @Override public IModel<T> model(Object object) { return null; } - - /** - * @see org.apache.wicket.model.IDetachable#detach() - */ - @Override - public void detach() - { - } } http://git-wip-us.apache.org/repos/asf/wicket/blob/e93eb0ae/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java index dd5c639..805cdd0 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java @@ -93,4 +93,7 @@ public interface IDataProvider<T> extends IDetachable */ IModel<T> model(T object); + @Override + default void detach() + {} } http://git-wip-us.apache.org/repos/asf/wicket/blob/e93eb0ae/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java index c3af567..2e6e778 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java @@ -87,30 +87,15 @@ public class ListDataProvider<T extends Serializable> implements IDataProvider<T return list.subList((int)first, (int)toIndex).listIterator(); } - /** - * @see IDataProvider#size() - */ @Override public long size() { return getData().size(); } - /** - * @see IDataProvider#model(Object) - */ @Override public IModel<T> model(T object) { - return new Model<T>(object); + return new Model<>(object); } - - /** - * @see org.apache.wicket.model.IDetachable#detach() - */ - @Override - public void detach() - { - } - } http://git-wip-us.apache.org/repos/asf/wicket/blob/e93eb0ae/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java index 8f1aecb..30d0714 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java @@ -70,13 +70,4 @@ public class ContactDataProvider implements IDataProvider<Contact> { return new DetachableContactModel(object); } - - /** - * @see org.apache.wicket.model.IDetachable#detach() - */ - @Override - public void detach() - { - } - } http://git-wip-us.apache.org/repos/asf/wicket/blob/e93eb0ae/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java index aba3b00..7e85bbd 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java @@ -35,16 +35,10 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDat */ public abstract class SortableDataProvider<T, S> implements ISortableDataProvider<T, S> { - /** - * - */ private static final long serialVersionUID = 1L; private final SingleSortState<S> state = new SingleSortState<>(); - /** - * @see ISortableDataProvider#getSortState() - */ @Override public final ISortState<S> getSortState() { @@ -84,14 +78,4 @@ public abstract class SortableDataProvider<T, S> implements ISortableDataProvide { state.setPropertySortOrder(property, order); } - - /** - * @see ISortableDataProvider#detach() - */ - @Override - public void detach() - { - } - - } http://git-wip-us.apache.org/repos/asf/wicket/blob/e93eb0ae/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java index 9b365f6..74d6e1d 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java @@ -145,11 +145,6 @@ public class DataTableTest extends WicketTestCase private List<Integer> items = Arrays.asList(1, 3, 5); @Override - public void detach() - { - } - - @Override public Iterator<Integer> iterator(long first, long count) { StringValue emptyValue = getPageParameters().get("empty");
