TAP5-2449: sort the class's own property descriptors last so that they ultimately control the property order
diff --git a/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java b/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
index 21fcfc3..0c7b942 100644
--- a/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
+++ b/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
@@ -100,7 +100,6 @@
List<PropertyDescriptor> descriptors = CollectionFactory.newList();
- addAll(descriptors, info.getPropertyDescriptors());
// Introspector misses:
// - interface methods not implemented in an abstract class (TAP5-921)
// - default methods (TAP5-2449)
@@ -108,6 +107,8 @@
addPropertiesFromScala(forClass, descriptors);
+ addAll(descriptors, info.getPropertyDescriptors());
+
return new ClassPropertyAdapterImpl(forClass, descriptors);
}
catch (Throwable ex)
