You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/01/31 08:44:12 UTC
isis git commit: ISIS-1019 Upgrade dependencies to javassist,
org.reflections
Repository: isis
Updated Branches:
refs/heads/master 11243a8a0 -> 254fee7ef
ISIS-1019 Upgrade dependencies to javassist, org.reflections
Upgrade Reflections to 0.9.9
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/254fee7e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/254fee7e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/254fee7e
Branch: refs/heads/master
Commit: 254fee7ef5f392750667c7090a9b7de8906d17d0
Parents: 11243a8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jan 30 16:50:14 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Jan 31 09:41:23 2015 +0200
----------------------------------------------------------------------
core/pom.xml | 2 +-
...ctionalRelationshipContractTestAbstract.java | 20 ++++++++++----------
...ceMethodMustBeFinalContractTestAbstract.java | 2 +-
.../SortedSetsContractTestAbstract.java | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/254fee7e/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8747fed..c7b925a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -105,7 +105,7 @@
<objenesis.version>1.4</objenesis.version>
<javassist.version>3.18.1-GA</javassist.version>
- <reflections.version>0.9.8</reflections.version>
+ <reflections.version>0.9.9</reflections.version>
<commons-logging.version>1.1.2</commons-logging.version>
<commons-cli.version>1.2</commons-cli.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/254fee7e/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
index 1078c15..e8a376e 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
@@ -54,7 +54,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
@Override
protected void applyContractTest(Class<?> entityType) {
- final Set<Field> mappedByFields = Reflections.getAllFields(entityType, ReflectUtils.persistentMappedBy);
+ final Set<Field> mappedByFields = ReflectionUtils.getAllFields(entityType, ReflectUtils.persistentMappedBy);
for (Field mappedByField : mappedByFields) {
final Parent p = new Parent();
p.entityType = entityType;
@@ -77,7 +77,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
// getMethod
final String getMethod = StringUtils.methodNamed("get", p.childField);
- final Set<Method> getMethods = Reflections.getAllMethods(p.entityType, withConcreteMethodNamed(getMethod));
+ final Set<Method> getMethods = ReflectionUtils.getAllMethods(p.entityType, withConcreteMethodNamed(getMethod));
assertThat(p.desc() + ": no unique getXxx() method:" + getMethods , getMethods.size(), is(1));
p.getMethod = CollectUtils.firstIn(getMethods);
@@ -87,7 +87,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
if(Collection.class.isAssignableFrom(returnType)) {
// addToMethod
final String addToMethod = StringUtils.methodNamed("addTo", p.childField);
- final Set<Method> addToMethods = Reflections.getAllMethods(p.entityType,
+ final Set<Method> addToMethods = ReflectionUtils.getAllMethods(p.entityType,
Predicates.and(withConcreteMethodNamed(addToMethod), ReflectionUtils.withParametersCount(1), ReflectUtils.withEntityParameter()));
if(addToMethods.size() != 1) {
// just skip
@@ -98,7 +98,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
// removeFromMethod
final String removeFromMethod = StringUtils.methodNamed("removeFrom", p.childField);
- final Set<Method> removeFromMethods = Reflections.getAllMethods(p.entityType,
+ final Set<Method> removeFromMethods = ReflectionUtils.getAllMethods(p.entityType,
Predicates.and(withConcreteMethodNamed(removeFromMethod), ReflectionUtils.withParametersCount(1), ReflectUtils.withEntityParameter()));
if(removeFromMethods.size() != 1) {
// just skip
@@ -119,7 +119,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
// modify
String modifyMethod = StringUtils.methodNamed("modify", p.childField);
- final Set<Method> modifyMethods = Reflections.getAllMethods(p.entityType,
+ final Set<Method> modifyMethods = ReflectionUtils.getAllMethods(p.entityType,
Predicates.and(withConcreteMethodNamed(modifyMethod), ReflectionUtils.withParametersCount(1), ReflectUtils.withEntityParameter()));
if(modifyMethods.size() != 1) {
// just skip
@@ -130,7 +130,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
// clear
String clearMethod = StringUtils.methodNamed("clear", p.childField);
- final Set<Method> clearMethods = Reflections.getAllMethods(p.entityType,
+ final Set<Method> clearMethods = ReflectionUtils.getAllMethods(p.entityType,
Predicates.and(withConcreteMethodNamed(clearMethod), ReflectionUtils.withParametersCount(0)));
if(clearMethods.size() != 1) {
// just skip
@@ -192,21 +192,21 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
private void process(Parent p, Child c) {
// mappedBy field
- final Set<Field> parentFields = Reflections.getAllFields(c.entityType, Predicates.and(ReflectionUtils.withName(p.mappedBy), ReflectUtils.withTypeAssignableFrom(p.entityType)));
+ final Set<Field> parentFields = ReflectionUtils.getAllFields(c.entityType, Predicates.and(ReflectionUtils.withName(p.mappedBy), ReflectUtils.withTypeAssignableFrom(p.entityType)));
assertThat(c.entityType.getName()+ ": could not locate '" + p.mappedBy + "' field, returning supertype of " + p.entityType.getSimpleName() +", (as per @Persistent(mappedBy=...) in parent "+ p.entityType.getSimpleName()+")", parentFields.size(), is(1));
c.parentField = CollectUtils.firstIn(parentFields);
// getter
String getterMethod = StringUtils.methodNamed("get", c.parentField);
- final Set<Method> getterMethods = Reflections.getAllMethods(c.entityType,
+ final Set<Method> getterMethods = ReflectionUtils.getAllMethods(c.entityType,
Predicates.and(withConcreteMethodNamed(getterMethod), ReflectionUtils.withParametersCount(0), ReflectUtils.withReturnTypeAssignableFrom(p.entityType)));
assertThat(p.descRel(c) +": could not locate getter " + getterMethod + "() returning supertype of " + p.entityType.getSimpleName(), getterMethods.size(), is(1));
c.getMethod = CollectUtils.firstIn(getterMethods);
// modify
String modifyMethod = StringUtils.methodNamed("modify", c.parentField);
- final Set<Method> modifyMethods = Reflections.getAllMethods(c.entityType,
+ final Set<Method> modifyMethods = ReflectionUtils.getAllMethods(c.entityType,
Predicates.and(withConcreteMethodNamed(modifyMethod), ReflectionUtils.withParametersCount(1), ReflectUtils.withParametersAssignableFrom(p.entityType)));
if(modifyMethods.size() != 1) {
// just skip
@@ -217,7 +217,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
// clear
String clearMethod = StringUtils.methodNamed("clear", c.parentField);
- final Set<Method> clearMethods = Reflections.getAllMethods(c.entityType,
+ final Set<Method> clearMethods = ReflectionUtils.getAllMethods(c.entityType,
Predicates.and(withConcreteMethodNamed(clearMethod), ReflectionUtils.withParametersCount(0)));
if(clearMethods.size() != 1) {
// just skip
http://git-wip-us.apache.org/repos/asf/isis/blob/254fee7e/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
index 82d04db..ecde21c 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
@@ -47,7 +47,7 @@ public abstract class InjectServiceMethodMustBeFinalContractTestAbstract extends
@Override
protected void applyContractTest(Class<?> entityType) {
- final Set<Method> injectMethods = Reflections.getAllMethods(entityType, ReflectionUtils.withPrefix("inject"));
+ final Set<Method> injectMethods = ReflectionUtils.getAllMethods(entityType, ReflectionUtils.withPrefix("inject"));
for (Method injectMethod : injectMethods) {
try {
final String desc = desc(entityType, injectMethod);
http://git-wip-us.apache.org/repos/asf/isis/blob/254fee7e/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
index 676e416..f7f00c5 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
@@ -38,7 +38,7 @@ public abstract class SortedSetsContractTestAbstract extends AbstractApplyToAllC
@Override
protected void applyContractTest(Class<?> entityType) {
- final Set<Field> collectionFields = Reflections.getAllFields(entityType, ReflectionUtils.withTypeAssignableTo(Collection.class));
+ final Set<Field> collectionFields = ReflectionUtils.getAllFields(entityType, ReflectionUtils.withTypeAssignableTo(Collection.class));
for (Field collectionField : collectionFields) {
try {
final String desc = desc(entityType, collectionField);