WICKET-5991 Introduce models which use Java 8 supplier/consumer Minor improvements
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a63005d5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a63005d5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a63005d5 Branch: refs/heads/lambdas Commit: a63005d560063955030b4106f8bcfd221edc6738 Parents: 0c636cf Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Mar 8 21:03:04 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Mar 8 23:28:39 2016 +0100 ---------------------------------------------------------------------- .../org/apache/wicket/model/lambda/SupplierCachingModel.java | 4 ++-- .../main/java/org/apache/wicket/model/lambda/SupplierModel.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a63005d5/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierCachingModel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierCachingModel.java b/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierCachingModel.java index 910eaad..70f8090 100644 --- a/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierCachingModel.java +++ b/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierCachingModel.java @@ -22,7 +22,7 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.util.lang.Args; /** - * A caching model that gets its value from a {@link WicketSupplier}. + * A {@link LoadableDetachableModel caching} model that gets its value from a {@link java.util.function.Supplier}. * * @param <T> * - type of the model object @@ -32,7 +32,7 @@ public class SupplierCachingModel<T> extends LoadableDetachableModel<T> /** * Supplies the model object. */ - private WicketSupplier<T> getter; + private final WicketSupplier<T> getter; /** * Constructor. http://git-wip-us.apache.org/repos/asf/wicket/blob/a63005d5/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierModel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierModel.java b/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierModel.java index 3f167be..9b4d0bd 100644 --- a/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierModel.java +++ b/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierModel.java @@ -19,11 +19,10 @@ package org.apache.wicket.model.lambda; import java.util.Objects; import org.apache.wicket.model.AbstractReadOnlyModel; -import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.util.lang.Args; /** - * A caching model that gets its value from a {@link WicketSupplier}. + * A model that gets its value from a {@link java.util.function.Supplier}. * * @param <T> * - type of the model object @@ -33,7 +32,7 @@ public class SupplierModel<T> extends AbstractReadOnlyModel<T> /** * Supplies the model object. */ - private WicketSupplier<T> getter; + private final WicketSupplier<T> getter; /** * Constructor.
