You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/04/24 23:19:29 UTC
wicket git commit: Remove #apply()
Repository: wicket
Updated Branches:
refs/heads/master 445965f1f -> e8e479396
Remove #apply()
http://markmail.org/message/44tfilwff2xdzw2q
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e8e47939
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e8e47939
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e8e47939
Branch: refs/heads/master
Commit: e8e479396b9ccd1dff314bbf905f932eed821929
Parents: 445965f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Apr 24 23:18:26 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Apr 24 23:18:26 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/model/IModel.java | 27 --------------------
.../org/apache/wicket/model/IModelTest.java | 13 ----------
2 files changed, 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e8e47939/wicket-core/src/main/java/org/apache/wicket/model/IModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/IModel.java b/wicket-core/src/main/java/org/apache/wicket/model/IModel.java
index d50b843..68c259c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/IModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/IModel.java
@@ -237,33 +237,6 @@ public interface IModel<T> extends IDetachable
}
/**
- * Returns a IModel applying the {@link WicketFunction} contained inside the given model to the
- * object contained inside this model.
- *
- * @param <R>
- * the type of the new contained object
- * @param mapper
- * an {@link IModel} containing a function to be applied to the contained model
- * object.
- * @return a new IModel
- */
- default <R> IModel<R> apply(WicketFunction<? super T, R> mapper)
- {
- Args.notNull(mapper, "mapper");
- return (IModel<R>)() -> {
- T object = IModel.this.getObject();
- if (object == null)
- {
- return null;
- }
- else
- {
- return mapper.apply(object);
- }
- };
- }
-
- /**
* Returns a IModel, returning either the contained object or the given default value, depending
* on the {@code null}ness of the contained object.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/e8e47939/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java
index 7b27158..45dc752 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java
@@ -21,7 +21,6 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import org.apache.wicket.lambda.WicketBiFunction;
-import org.apache.wicket.lambda.WicketFunction;
import org.apache.wicket.model.lambda.Address;
import org.apache.wicket.model.lambda.Person;
import org.junit.Assert;
@@ -155,18 +154,6 @@ public class IModelTest extends Assert
}
@Test
- public void apply()
- {
- Address newAddress = new Address();
- IModel<Address> applyModel = IModel.of(person).apply((WicketFunction<Person, Address>) person1 -> {
- newAddress.setNumber(person1.getAddress().getNumber() * 2);
- return newAddress;
- });
-
- assertThat(applyModel.getObject().getNumber(), is(person.getAddress().getNumber() * 2));
- }
-
- @Test
public void orElse()
{
person.setName(null);