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 2014/03/05 14:09:19 UTC
git commit: WICKET-5506 DefaultPropertyResolver should resolve the
Property according to the getter first
Repository: wicket
Updated Branches:
refs/heads/master 3c01c731d -> 5fdc484c3
WICKET-5506 DefaultPropertyResolver should resolve the Property according to the getter first
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5fdc484c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5fdc484c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5fdc484c
Branch: refs/heads/master
Commit: 5fdc484c358ae70b01d4bc445fd1d6ce41513718
Parents: 3c01c73
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 5 15:08:53 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 5 15:08:53 2014 +0200
----------------------------------------------------------------------
.../validation/DefaultPropertyResolver.java | 12 +++++-----
.../validation/DefaultPropertyResolverTest.java | 23 ++++++++++++++++++++
2 files changed, 29 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5fdc484c/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/DefaultPropertyResolver.java
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/DefaultPropertyResolver.java b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/DefaultPropertyResolver.java
index 442bca2..08311ac 100644
--- a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/DefaultPropertyResolver.java
+++ b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/DefaultPropertyResolver.java
@@ -45,12 +45,6 @@ public class DefaultPropertyResolver implements IPropertyResolver
IPropertyReflectionAwareModel<?> delegate = (IPropertyReflectionAwareModel<?>)model;
- Field field = delegate.getPropertyField();
- if (field != null)
- {
- return new Property(field.getDeclaringClass(), field.getName());
- }
-
String name;
Method getter = delegate.getPropertyGetter();
if (getter != null)
@@ -74,6 +68,12 @@ public class DefaultPropertyResolver implements IPropertyResolver
return new Property(getter.getDeclaringClass(), name);
}
+ Field field = delegate.getPropertyField();
+ if (field != null)
+ {
+ return new Property(field.getDeclaringClass(), field.getName());
+ }
+
return null;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/5fdc484c/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java
index 07bbe65..2ef498f 100644
--- a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java
+++ b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java
@@ -100,6 +100,22 @@ public class DefaultPropertyResolverTest
assertThat(property.getOwner().getName(), is(Bean3.class.getName()));
}
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-5506
+ */
+ @Test
+ public void getterHasPriorityOverField()
+ {
+ DefaultPropertyResolver resolver = new DefaultPropertyResolver();
+
+ TextField<?> component = new TextField<>("id", new PropertyModel<Bean4>(new Bean4(),
+ "foo"));
+ Property property = resolver.resolveProperty(component);
+ assertThat(property, not(nullValue()));
+ assertThat(property.getName(), is("foo"));
+ assertThat(property.getOwner().getName(), is(Bean4.class.getName()));
+ }
+
public static class Bean3
{
@@ -120,4 +136,11 @@ public class DefaultPropertyResolverTest
}
}
+ public static class Bean4 extends Bean2
+ {
+ public String getFoo()
+ {
+ return "foo4";
+ }
+ }
}