You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2016/04/25 09:57:10 UTC
[1/4] wicket git commit: moved factory method for supplier into
LoadableDetachableModel
Repository: wicket
Updated Branches:
refs/heads/master e8e479396 -> 533431d7e
moved factory method for supplier into LoadableDetachableModel
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fab13be6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fab13be6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fab13be6
Branch: refs/heads/master
Commit: fab13be658a9859ea1c29f28a365a1dacd3e87b3
Parents: e8e4793
Author: Sven Meier <sv...@apache.org>
Authored: Mon Apr 25 08:57:03 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 09:38:20 2016 +0200
----------------------------------------------------------------------
.../wicket/model/LoadableDetachableModel.java | 24 +++++++++++++++++++-
.../java/org/apache/wicket/model/Model.java | 22 ------------------
2 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/fab13be6/wicket-core/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java b/wicket-core/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
index 8836cfc..032da9f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.model;
+import org.apache.wicket.lambda.WicketSupplier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -192,4 +193,25 @@ public abstract class LoadableDetachableModel<T> implements IModel<T>
state = InternalState.ATTACHED;
transientModelObject = object;
}
-}
+
+ /**
+ * Create a {@link LoadableDetachableModel} for the given supplier.
+ *
+ * @param <T>
+ * @param getter Used for the getObject() method.
+ * @return Model
+ */
+ public static <T> IModel<T> of(WicketSupplier<T> getter)
+ {
+ return new LoadableDetachableModel<T>()
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected T load()
+ {
+ return getter.get();
+ }
+ };
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/fab13be6/wicket-core/src/main/java/org/apache/wicket/model/Model.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/Model.java b/wicket-core/src/main/java/org/apache/wicket/model/Model.java
index 3894faf..02744a0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/Model.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/Model.java
@@ -184,28 +184,6 @@ public class Model<T extends Serializable> implements IObjectClassAwareModel<T>
return new LambdaModel<>(getter, setter);
}
- /**
- * Factory methods for Model which uses type inference to make code shorter. Equivalent to
- * <code>new LoadableDetachableModel<TypeOfObject>(getter)</code>.
- *
- * @param <T>
- * @param getter Used for the getObject() method.
- * @return Model that contains <code>object</code>
- */
- public static <T> IModel<T> loadableDetachable(WicketSupplier<T> getter)
- {
- return new LoadableDetachableModel<T>()
- {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected T load()
- {
- return getter.get();
- }
- };
- }
-
@Override
public T getObject()
{
[4/4] wicket git commit: We already have Model.of()
Posted by sv...@apache.org.
We already have Model.of()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4f07ee16
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4f07ee16
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4f07ee16
Branch: refs/heads/master
Commit: 4f07ee164627e5d95516e42712b30cb6b72250e3
Parents: 140e530
Author: Sven Meier <sv...@apache.org>
Authored: Mon Apr 25 09:24:05 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 09:38:37 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/model/IModel.java | 15 ---------
.../org/apache/wicket/model/IModelTest.java | 34 ++++++++++----------
2 files changed, 17 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4f07ee16/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 68c259c..a4522bd 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
@@ -282,19 +282,4 @@ public interface IModel<T> extends IDetachable
}
};
}
-
- /**
- * Returns a IModel lifting the given object into the Model.
- *
- * @param <T>
- * the type of the given object
- * @param object
- * an object to be lifted into a IModel
- * @return a new IModel
- */
- static <T> IModel<T> of(T object)
- {
- return () -> object;
- }
-
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/4f07ee16/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 45dc752..acf10bd 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
@@ -51,7 +51,7 @@ public class IModelTest extends Assert
@Test
public void filterMatch()
{
- IModel<Person> johnModel = IModel.of(person)
+ IModel<Person> johnModel = Model.of(person)
.filter((p) -> p.getName().equals(name));
assertThat(johnModel.getObject(), is(person));
@@ -60,7 +60,7 @@ public class IModelTest extends Assert
@Test
public void filterNoMatch()
{
- IModel<Person> johnModel = IModel.of(person)
+ IModel<Person> johnModel = Model.of(person)
.filter((p) -> p.getName().equals("Jane"));
assertThat(johnModel.getObject(), is(nullValue()));
@@ -69,48 +69,48 @@ public class IModelTest extends Assert
@Test(expected = IllegalArgumentException.class)
public void nullFilter()
{
- IModel.of(person).filter(null);
+ Model.of(person).filter(null);
}
@Test
public void map()
{
- IModel<String> personNameModel = IModel.of(person).map(Person::getName);
+ IModel<String> personNameModel = Model.of(person).map(Person::getName);
assertThat(personNameModel.getObject(), is(equalTo(name)));
}
@Test
public void map2()
{
- IModel<String> streetModel = IModel.of(person).map(Person::getAddress).map(Address::getStreet);
+ IModel<String> streetModel = Model.of(person).map(Person::getAddress).map(Address::getStreet);
assertThat(streetModel.getObject(), is(equalTo(street)));
}
@Test(expected = IllegalArgumentException.class)
public void nullMapper()
{
- IModel.of(person).map(null);
+ Model.of(person).map(null);
}
@Test
public void withMap()
{
- IModel<String> janeModel = IModel.of("Jane");
+ IModel<String> janeModel = Model.of("Jane");
WicketBiFunction<Person, String, String> function =
(WicketBiFunction<Person, String, String>) (person1, other) ->
person1.getName() + " is in relationship with " + other;
- IModel<String> relationShipModel = IModel.of(person).mapWith(function, janeModel);
+ IModel<String> relationShipModel = Model.of(person).mapWith(function, janeModel);
assertThat(relationShipModel.getObject(), is(equalTo("John is in relationship with Jane")));
}
@Test
public void withMapWithNullObject()
{
- IModel<String> janeModel = IModel.of(null);
+ IModel<String> janeModel = Model.of((String)null);
WicketBiFunction<Person, String, String> function =
(WicketBiFunction<Person, String, String>) (person1, other) ->
person1.getName() + " is in relationship with " + other;
- IModel<String> relationShipModel = IModel.of(person).mapWith(function, janeModel);
+ IModel<String> relationShipModel = Model.of(person).mapWith(function, janeModel);
assertThat(relationShipModel.getObject(), is(nullValue()));
}
@@ -121,19 +121,19 @@ public class IModelTest extends Assert
WicketBiFunction<Person, String, String> function =
(WicketBiFunction<Person, String, String>) (person1, other) ->
person1.getName() + " is in relationship with " + other;
- IModel.of(person).mapWith(function, janeModel);
+ Model.of(person).mapWith(function, janeModel);
}
@Test(expected = IllegalArgumentException.class)
public void withMapWithNullCombiner()
{
- IModel.of(person).mapWith(null, Model.of("Jane"));
+ Model.of(person).mapWith(null, Model.of("Jane"));
}
@Test
public void flatMap()
{
- IModel<String> heirModel = IModel.of(person)
+ IModel<String> heirModel = Model.of(person)
.flatMap(john ->
LambdaModel.of(
() -> john.getName() + " is my parent",
@@ -150,7 +150,7 @@ public class IModelTest extends Assert
@Test(expected = IllegalArgumentException.class)
public void nullFlatMapper()
{
- IModel.of(person).flatMap(null);
+ Model.of(person).flatMap(null);
}
@Test
@@ -158,7 +158,7 @@ public class IModelTest extends Assert
{
person.setName(null);
String defaultName = "Default name";
- IModel<String> defaultNameModel = IModel.of(person).map(Person::getName).orElse(defaultName);
+ IModel<String> defaultNameModel = Model.of(person).map(Person::getName).orElse(defaultName);
assertThat(defaultNameModel.getObject(), is(equalTo(defaultName)));
}
@@ -168,7 +168,7 @@ public class IModelTest extends Assert
{
person.setName(null);
String defaultName = "Default name";
- IModel<String> defaultNameModel = IModel.of(person).map(Person::getName).orElseGet(() -> defaultName);
+ IModel<String> defaultNameModel = Model.of(person).map(Person::getName).orElseGet(() -> defaultName);
assertThat(defaultNameModel.getObject(), is(equalTo(defaultName)));
}
@@ -176,6 +176,6 @@ public class IModelTest extends Assert
@Test(expected = IllegalArgumentException.class)
public void orElseGetNullOther()
{
- IModel.of(person).map(Person::getName).orElseGet(null);
+ Model.of(person).map(Person::getName).orElseGet(null);
}
}
[3/4] wicket git commit: moved casting of() method to IModel
Posted by sv...@apache.org.
moved casting of() method to IModel
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/533431d7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/533431d7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/533431d7
Branch: refs/heads/master
Commit: 533431d7ebda97f5c77a3d8bc1b2445fa5caebfb
Parents: 4f07ee1
Author: Sven Meier <sv...@apache.org>
Authored: Mon Apr 25 09:32:31 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 09:38:37 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/model/IModel.java | 15 ++++++++++++++-
.../src/main/java/org/apache/wicket/model/Model.java | 15 ---------------
2 files changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/533431d7/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 a4522bd..9fdac84 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
@@ -282,4 +282,17 @@ public interface IModel<T> extends IDetachable
}
};
}
-}
+
+ /**
+ * Supresses generics warning when casting model types.
+ *
+ * @param <T>
+ * @param model
+ * @return cast <code>model</code>
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> IModel<T> of(IModel<?> model)
+ {
+ return (IModel<T>)model;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/533431d7/wicket-core/src/main/java/org/apache/wicket/model/Model.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/Model.java b/wicket-core/src/main/java/org/apache/wicket/model/Model.java
index ded41cd..3c7b3a9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/Model.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/Model.java
@@ -23,8 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.wicket.lambda.WicketConsumer;
-import org.apache.wicket.lambda.WicketSupplier;
import org.apache.wicket.model.util.CollectionModel;
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.model.util.MapModel;
@@ -146,19 +144,6 @@ public class Model<T extends Serializable> implements IObjectClassAwareModel<T>
}
/**
- * Supresses generics warning when converting model types
- *
- * @param <T>
- * @param model
- * @return <code>model</code>
- */
- @SuppressWarnings("unchecked")
- public static <T> IModel<T> of(IModel<?> model)
- {
- return (IModel<T>)model;
- }
-
- /**
* Factory methods for Model which uses type inference to make code shorter. Equivalent to
* <code>new Model<TypeOfObject>()</code>.
*
[2/4] wicket git commit: LambdaModel already has a factory method for
supplier and consumer
Posted by sv...@apache.org.
LambdaModel already has a factory method for supplier and consumer
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/140e530c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/140e530c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/140e530c
Branch: refs/heads/master
Commit: 140e530c251ce5eaa7652b2239433880d8812016
Parents: fab13be
Author: Sven Meier <sv...@apache.org>
Authored: Mon Apr 25 08:57:58 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 09:38:37 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/model/Model.java | 14 --------------
1 file changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/140e530c/wicket-core/src/main/java/org/apache/wicket/model/Model.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/Model.java b/wicket-core/src/main/java/org/apache/wicket/model/Model.java
index 02744a0..ded41cd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/Model.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/Model.java
@@ -170,20 +170,6 @@ public class Model<T extends Serializable> implements IObjectClassAwareModel<T>
return new Model<>();
}
- /**
- * Factory methods for Model which uses type inference to make code shorter. Equivalent to
- * <code>new LambdaModel<TypeOfObject>(getter, setter)</code>.
- *
- * @param <T>
- * @param getter Used for the getObject() method.
- * @param setter Used for the setObject(T object) method.
- * @return Model that contains <code>object</code>
- */
- public static <T> IModel<T> of(WicketSupplier<T> getter, WicketConsumer<T> setter)
- {
- return new LambdaModel<>(getter, setter);
- }
-
@Override
public T getObject()
{