You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2019/03/24 23:53:35 UTC
[juneau] 02/02: New org.apache.juneau.reflection package.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 7ce229fa5e956da5d1ab4103f112ec2520e66c41
Author: JamesBognar <ja...@apache.org>
AuthorDate: Sun Mar 24 19:20:01 2019 -0400
New org.apache.juneau.reflection package.
---
.../apache/juneau/reflection/ClassInfoTest.java | 16 ++---
.../main/java/org/apache/juneau/BeanContext.java | 4 +-
.../src/main/java/org/apache/juneau/BeanMeta.java | 10 +--
.../src/main/java/org/apache/juneau/ClassMeta.java | 24 +++----
.../annotation/InvalidAnnotationException.java | 2 +-
.../juneau/httppart/bean/RequestBeanMeta.java | 2 +-
.../juneau/httppart/bean/ResponseBeanMeta.java | 2 +-
.../org/apache/juneau/internal/ClassUtils.java | 8 +--
.../org/apache/juneau/internal/TransformCache.java | 10 +--
.../org/apache/juneau/reflection/ClassInfo.java | 79 +++++++++-------------
.../apache/juneau/reflection/ConstructorInfo.java | 2 +-
.../org/apache/juneau/reflection/FieldInfo.java | 2 +-
.../org/apache/juneau/reflection/MethodInfo.java | 2 +-
.../apache/juneau/remote/RemoteInterfaceMeta.java | 2 +-
.../org/apache/juneau/transform/BuilderSwap.java | 18 ++---
.../org/apache/juneau/transform/SurrogateSwap.java | 4 +-
.../org/apache/juneau/rest/client/RestCall.java | 2 +-
.../juneau/rest/client/RestCallException.java | 6 +-
.../rest/client/remote/RemoteResourceMeta.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 4 +-
.../org/apache/juneau/rest/RestContextBuilder.java | 2 +-
.../org/apache/juneau/rest/SwaggerGenerator.java | 4 +-
22 files changed, 97 insertions(+), 110 deletions(-)
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
index cb0652b..6724b08 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
@@ -188,15 +188,15 @@ public class ClassInfoTest {
public void getParentMethodsParentFirst() throws Exception {
Set<String> s = new TreeSet<>();
ClassInfo ci = ClassInfo.of(DD.class);
- for (MethodInfo m : ci.getAllMethods(true, true))
+ for (MethodInfo m : ci.getAllMethodInfos(true, true))
if (! m.getName().startsWith("$"))
- s.add(m.getDeclaringClass().getSimpleName() + '.' + m.getName());
+ s.add(m.getDeclaringClassInfo().getSimpleName() + '.' + m.getName());
assertObjectEquals("['DA1.da1','DA2.da2','DB.da1','DB.db','DC.da2','DC.dc','DD.da2','DD.dd']", s);
s = new TreeSet<>();
- for (MethodInfo m : ci.getAllMethods())
+ for (MethodInfo m : ci.getAllMethodInfos())
if (! m.getName().startsWith("$"))
- s.add(m.getDeclaringClass().getSimpleName() + '.' + m.getName());
+ s.add(m.getDeclaringClassInfo().getSimpleName() + '.' + m.getName());
assertObjectEquals("['DA1.da1','DA2.da2','DB.da1','DB.db','DC.da2','DC.dc','DD.da2','DD.dd']", s);
}
@@ -231,16 +231,16 @@ public class ClassInfoTest {
public void getParentFieldsParentFirst() throws Exception {
Set<String> s = new TreeSet<>();
ClassInfo ci = ClassInfo.of(EB.class);
- for (FieldInfo f : ci.getAllFieldsParentFirst()) {
+ for (FieldInfo f : ci.getAllFieldInfos(true,false)) {
if (! f.getName().startsWith("$"))
- s.add(f.getDeclaringClass().getSimpleName() + '.' + f.getName());
+ s.add(f.getDeclaringClassInfo().getSimpleName() + '.' + f.getName());
}
assertObjectEquals("['EA.a1','EB.a1','EB.b1']", s);
s = new TreeSet<>();
- for (FieldInfo f : ci.getAllFields()) {
+ for (FieldInfo f : ci.getAllFieldInfos()) {
if (! f.getName().startsWith("$"))
- s.add(f.getDeclaringClass().getSimpleName() + '.' + f.getName());
+ s.add(f.getDeclaringClassInfo().getSimpleName() + '.' + f.getName());
}
assertObjectEquals("['EA.a1','EB.a1','EB.b1']", s);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 5b0dffe..3e1f55e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -2656,11 +2656,11 @@ public class BeanContext extends Context {
while (cc != null) {
ClassInfo implClass = implClasses.get(cc.getName());
if (implClass != null)
- return implClass.getNoArgConstructor(v);
+ return implClass.getNoArgConstructorInfo(v);
for (Class ic : cc.getInterfaces()) {
implClass = implClasses.get(ic.getName());
if (implClass != null)
- return implClass.getNoArgConstructor(v);
+ return implClass.getNoArgConstructorInfo(v);
}
cc = cc.getSuperclass();
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index e0a9036..5b0e86e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -218,7 +218,7 @@ public class BeanMeta<T> {
return "Class is not serializable";
// Look for @BeanConstructor constructor.
- for (ConstructorInfo x : ci.getConstructors()) {
+ for (ConstructorInfo x : ci.getConstructorInfos()) {
if (x.isAnnotationPresent(BeanConstructor.class)) {
if (constructor != null)
throw new BeanRuntimeException(c, "Multiple instances of '@BeanConstructor' found.");
@@ -235,7 +235,7 @@ public class BeanMeta<T> {
constructor = ctx.getImplClassConstructor(c, conVis);
if (constructor == null)
- constructor = ci.getNoArgConstructor(conVis);
+ constructor = ci.getNoArgConstructorInfo(conVis);
if (constructor == null && beanFilter == null && ctx.isBeansRequireDefaultConstructor())
return "Class does not have the required no-arg constructor";
@@ -602,7 +602,7 @@ public class BeanMeta<T> {
List<BeanMethod> l = new LinkedList<>();
for (ClassInfo c2 : findClasses(c, stopClass)) {
- for (MethodInfo m : c2.getDeclaredMethods()) {
+ for (MethodInfo m : c2.getDeclaredMethodInfos()) {
if (m.isStatic())
continue;
if (m.isBridge()) // This eliminates methods with covariant return types from parent classes on child classes.
@@ -709,7 +709,7 @@ public class BeanMeta<T> {
static final Collection<Field> findBeanFields(Class<?> c, Class<?> stopClass, Visibility v, Set<String> filterProps) {
List<Field> l = new LinkedList<>();
for (ClassInfo c2 : findClasses(c, stopClass)) {
- for (FieldInfo f : c2.getDeclaredFields()) {
+ for (FieldInfo f : c2.getDeclaredFieldInfos()) {
if (f.isAny(STATIC, TRANSIENT))
continue;
if (f.isAnnotationPresent(BeanIgnore.class))
@@ -732,7 +732,7 @@ public class BeanMeta<T> {
static final Field findInnerBeanField(Class<?> c, Class<?> stopClass, String name) {
for (ClassInfo c2 : findClasses(c, stopClass)) {
- for (FieldInfo f : c2.getDeclaredFields()) {
+ for (FieldInfo f : c2.getDeclaredFieldInfos()) {
if (f.isAny(STATIC, TRANSIENT))
continue;
if (f.isAnnotationPresent(BeanIgnore.class))
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 926994d..63f83f0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -474,7 +474,7 @@ public final class ClassMeta<T> implements Type {
// forName() is used by Class and Charset
for (String methodName : new String[]{"fromString","fromValue","valueOf","parse","parseString","forName","forString"}) {
if (fromStringMethod == null) {
- for (MethodInfo m : ci.getPublicMethods()) {
+ for (MethodInfo m : ci.getPublicMethodInfos()) {
if (m.isAll(STATIC, PUBLIC, NOT_DEPRECATED) && m.hasName(methodName) && m.hasReturnType(c) && m.hasArgs(String.class)) {
fromStringMethod = m.inner();
break;
@@ -493,7 +493,7 @@ public final class ClassMeta<T> implements Type {
} catch (NoSuchMethodException e1) {}
// Find swap() method if present.
- for (MethodInfo m : ci.getPublicMethods()) {
+ for (MethodInfo m : ci.getPublicMethodInfos()) {
if (m.isAll(PUBLIC, NOT_DEPRECATED, NOT_STATIC) && m.hasName("swap") && m.hasFuzzyArgs(BeanSession.class)) {
swapMethod = m.inner();
swapMethodType = m.getReturnType().inner();
@@ -502,7 +502,7 @@ public final class ClassMeta<T> implements Type {
}
// Find unswap() method if present.
if (swapMethod != null) {
- for (MethodInfo m : ci.getPublicMethods()) {
+ for (MethodInfo m : ci.getPublicMethodInfos()) {
if (m.isAll(PUBLIC, NOT_DEPRECATED, STATIC) && m.hasName("unswap") && m.hasFuzzyArgs(BeanSession.class, swapMethodType)) {
unswapMethod = m.inner();
break;
@@ -511,14 +511,14 @@ public final class ClassMeta<T> implements Type {
}
// Find example() method if present.
- for (MethodInfo m : ci.getPublicMethods()) {
+ for (MethodInfo m : ci.getPublicMethodInfos()) {
if (m.isAll(PUBLIC, NOT_DEPRECATED, STATIC) && m.hasName("example") && m.hasFuzzyArgs(BeanSession.class)) {
exampleMethod = m.inner();
break;
}
}
- for (FieldInfo f : ci.getAllFieldsParentFirst()) {
+ for (FieldInfo f : ci.getAllFieldInfos(true, false)) {
if (f.isAnnotationPresent(ParentProperty.class)) {
if (f.isStatic())
throw new ClassMetaRuntimeException("@ParentProperty used on invalid field ''{0}''. Must be static.", f);
@@ -533,7 +533,7 @@ public final class ClassMeta<T> implements Type {
}
}
- for (FieldInfo f : ci.getDeclaredFields()) {
+ for (FieldInfo f : ci.getDeclaredFieldInfos()) {
if (f.isAnnotationPresent(Example.class)) {
if (! (f.isStatic() && ci.isParentOf(f.getType().inner())))
throw new ClassMetaRuntimeException("@Example used on invalid field ''{0}''. Must be static and an instance of the type.", f);
@@ -543,7 +543,7 @@ public final class ClassMeta<T> implements Type {
}
// Find @NameProperty and @ParentProperty methods if present.
- for (MethodInfo m : ci.getAllMethods(true, true)) {
+ for (MethodInfo m : ci.getAllMethodInfos(true, true)) {
if (m.hasAnnotation(ParentProperty.class)) {
if (m.isStatic() || ! m.hasNumArgs(1))
throw new ClassMetaRuntimeException("@ParentProperty used on invalid method ''{0}''. Must not be static and have one argument.", m);
@@ -558,7 +558,7 @@ public final class ClassMeta<T> implements Type {
}
}
- for (MethodInfo m : ci.getDeclaredMethods()) {
+ for (MethodInfo m : ci.getDeclaredMethodInfos()) {
if (m.hasAnnotation(Example.class)) {
if (! (m.isStatic() && m.hasFuzzyArgs(BeanSession.class) && ci.isParentOf(m.getReturnType().inner())))
throw new ClassMetaRuntimeException("@Example used on invalid method ''{0}''. Must be static and return an instance of the declaring class.", m);
@@ -571,7 +571,7 @@ public final class ClassMeta<T> implements Type {
isAbstract = ci.isAbstract() && ci.isNotPrimitive();
// Find constructor(String) method if present.
- for (ConstructorInfo cs : ci.getConstructors()) {
+ for (ConstructorInfo cs : ci.getConstructorInfos()) {
if (cs.isPublic() && cs.isNotDeprecated()) {
Class<?>[] pt = cs.getParameterTypes();
if (pt.length == (isMemberClass ? 1 : 0) && c != Object.class && ! isAbstract) {
@@ -592,13 +592,13 @@ public final class ClassMeta<T> implements Type {
primitiveDefault = ci.getPrimitiveDefault();
- for (MethodInfo m : ci.getPublicMethods())
+ for (MethodInfo m : ci.getPublicMethodInfos())
if (m.isAll(PUBLIC, NOT_DEPRECATED))
publicMethods.put(m.getSignature(), m.inner());
if (innerClass != Object.class) {
ClassInfo x = implClass == null ? ci : ici;
- noArgConstructor = x.getNoArgConstructor(Visibility.PUBLIC);
+ noArgConstructor = x.getNoArgConstructorInfo(Visibility.PUBLIC);
}
if (beanFilter == null)
@@ -994,7 +994,7 @@ public final class ClassMeta<T> implements Type {
if (ci.isAbstract())
return null;
boolean isMemberClass = ci.isMemberClass() && ci.isNotStatic();
- for (ConstructorInfo cc : ci.getConstructors()) {
+ for (ConstructorInfo cc : ci.getConstructorInfos()) {
if (cc.hasNumArgs(isMemberClass ? 1 : 0) && cc.isVisible(v) && cc.isNotDeprecated())
return (Constructor<? extends T>) v.transform(cc.inner());
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/InvalidAnnotationException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/InvalidAnnotationException.java
index db43b6b..b5249bb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/InvalidAnnotationException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/InvalidAnnotationException.java
@@ -46,6 +46,6 @@ public class InvalidAnnotationException extends FormattedRuntimeException {
public static void assertNoInvalidAnnotations(MethodInfo m, Class<? extends Annotation>...a) throws InvalidAnnotationException {
Annotation aa = m.getAnnotation(a);
if (aa != null)
- throw new InvalidAnnotationException("@{0} annotation cannot be used in a @{1} bean. Method=''{2}''", aa.getClass().getSimpleName(), m.getDeclaringClass().getSimpleName(), m);
+ throw new InvalidAnnotationException("@{0} annotation cannot be used in a @{1} bean. Method=''{2}''", aa.getClass().getSimpleName(), m.getDeclaringClassInfo().getSimpleName(), m);
}
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java
index 56b8c5b..0a685d1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java
@@ -98,7 +98,7 @@ public class RequestBeanMeta {
ClassInfo ci = getClassInfo(c);
apply(ci.getAnnotation(Request.class));
this.cm = BeanContext.DEFAULT.getClassMeta(c);
- for (MethodInfo m : cm.getInfo().getAllMethods()) {
+ for (MethodInfo m : cm.getInfo().getAllMethodInfos()) {
if (m.isPublic()) {
assertNoInvalidAnnotations(m, ResponseHeader.class, ResponseBody.class, ResponseStatus.class);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
index d699b89..a13c53d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
@@ -156,7 +156,7 @@ public class ResponseBeanMeta {
Class<?> c = ClassUtils.toClass(t);
this.cm = BeanContext.DEFAULT.getClassMeta(c);
ClassInfo ci = cm.getInfo();
- for (MethodInfo m : ci.getAllMethods()) {
+ for (MethodInfo m : ci.getAllMethodInfos()) {
if (m.isPublic()) {
assertNoInvalidAnnotations(m, Header.class, Query.class, FormData.class, Path.class);
if (m.hasAnnotation(ResponseHeader.class)) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
index cb1cd82..b3f276f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
@@ -283,21 +283,21 @@ public final class ClassUtils {
return null;
// First look for an exact match.
- Constructor<?> con = c3.findPublicConstructor(false, args);
+ Constructor<?> con = c3.getPublicConstructor(false, args);
if (con != null)
return (T)con.newInstance(args);
// Next look for an exact match including the outer.
if (outer != null) {
args = new AList<>().append(outer).appendAll(args).toArray();
- con = c3.findPublicConstructor(false, args);
+ con = c3.getPublicConstructor(false, args);
if (con != null)
return (T)con.newInstance(args);
}
// Finally use fuzzy matching.
if (fuzzyArgs) {
- con = c3.findPublicConstructor(true, args);
+ con = c3.getPublicConstructor(true, args);
if (con != null)
return (T)con.newInstance(getMatchingArgs(con.getParameterTypes(), args));
}
@@ -380,7 +380,7 @@ public final class ClassUtils {
* <ul>
* <li>Have a public constructor that takes in a single <code>String</code> argument.
* <li>Have a static <code>fromString(String)</code> (or related) method.
- * <br>See {@link ClassInfo#getFromStringMethod()} for the list of possible static method names.
+ * <br>See {@link ClassInfo#getFromStringMethodInfo()} for the list of possible static method names.
* <li>Be an <code>enum</code>.
* </ul>
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TransformCache.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TransformCache.java
index c24e49d..63328cb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TransformCache.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TransformCache.java
@@ -147,7 +147,7 @@ public class TransformCache {
}
};
} else {
- final MethodInfo fromStringMethod = oc2i.getFromStringMethod();
+ final MethodInfo fromStringMethod = oc2i.getFromStringMethodInfo();
if (fromStringMethod != null) {
t = new Transform<String,O>() {
@Override
@@ -164,9 +164,9 @@ public class TransformCache {
}
if (t == null) {
- MethodInfo createMethod = oci.getStaticCreateMethod(ic, "create");
+ MethodInfo createMethod = oci.getStaticCreateMethodInfo(ic, "create");
if (createMethod == null)
- createMethod = oci.getStaticCreateMethod(ic, "from" + ic.getSimpleName());
+ createMethod = oci.getStaticCreateMethodInfo(ic, "from" + ic.getSimpleName());
if (createMethod != null) {
final Method cm = createMethod.inner();
t = new Transform<I,O>() {
@@ -180,7 +180,7 @@ public class TransformCache {
}
};
} else {
- final Constructor<?> c = oci.findPublicConstructor(ic);
+ final Constructor<?> c = oci.getPublicConstructor(ic);
final boolean isMemberClass = oci.isMemberClass() && ! oci.isStatic();
if (c != null && ! c.isAnnotationPresent(Deprecated.class)) {
t = new Transform<I,O>() {
@@ -201,7 +201,7 @@ public class TransformCache {
}
if (t == null) {
- for (MethodInfo m2 : ici.getAllMethods()) {
+ for (MethodInfo m2 : ici.getAllMethodInfos()) {
if (m2.isAll(PUBLIC, NOT_STATIC, HAS_NO_ARGS, NOT_DEPRECATED) && m2.getName().startsWith("to") && m2.hasReturnType(oc)) {
final Method m3 = m2.inner();
t = new Transform<I,O>() {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ClassInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ClassInfo.java
index b2adefc..231db6f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ClassInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ClassInfo.java
@@ -296,8 +296,8 @@ public final class ClassInfo {
*
* @return All declared methods on this class and all parent classes in child-to-parent order.
*/
- public Iterable<MethodInfo> getAllMethods() {
- return getAllMethods(false, false);
+ public Iterable<MethodInfo> getAllMethodInfos() {
+ return getAllMethodInfos(false, false);
}
/**
@@ -309,7 +309,7 @@ public final class ClassInfo {
* Otherwise, uses the order of the methods in the underlying JVM.
* @return All declared methods on this class and all parent classes.
*/
- public Iterable<MethodInfo> getAllMethods(boolean parentFirst, boolean sort) {
+ public Iterable<MethodInfo> getAllMethodInfos(boolean parentFirst, boolean sort) {
return findAllMethods(parentFirst, sort);
}
@@ -322,8 +322,8 @@ public final class ClassInfo {
*
* @return All methods declared on this class.
*/
- public Iterable<MethodInfo> getDeclaredMethods() {
- return getDeclaredMethods(false);
+ public Iterable<MethodInfo> getDeclaredMethodInfos() {
+ return getDeclaredMethodInfos(false);
}
/**
@@ -334,7 +334,7 @@ public final class ClassInfo {
* Otherwise, uses the order of the methods in the underlying JVM.
* @return All methods declared on this class.
*/
- public Iterable<MethodInfo> getDeclaredMethods(boolean sort) {
+ public Iterable<MethodInfo> getDeclaredMethodInfos(boolean sort) {
return findDeclaredMethods(null, sort);
}
@@ -346,8 +346,8 @@ public final class ClassInfo {
*
* @return All public methods on this class.
*/
- public Iterable<MethodInfo> getPublicMethods() {
- return getPublicMethods(false);
+ public Iterable<MethodInfo> getPublicMethodInfos() {
+ return getPublicMethodInfos(false);
}
/**
@@ -358,7 +358,7 @@ public final class ClassInfo {
* Otherwise, uses the order of the methods in the underlying JVM.
* @return All public methods on this class.
*/
- public Iterable<MethodInfo> getPublicMethods(boolean sort) {
+ public Iterable<MethodInfo> getPublicMethodInfos(boolean sort) {
return findPublicMethods(sort);
}
@@ -432,9 +432,9 @@ public final class ClassInfo {
*
* @return The static method, or <jk>null</jk> if it couldn't be found.
*/
- public MethodInfo getFromStringMethod() {
+ public MethodInfo getFromStringMethodInfo() {
for (String methodName : new String[]{"create","fromString","fromValue","valueOf","parse","parseString","forName","forString"})
- for (MethodInfo m : getPublicMethods())
+ for (MethodInfo m : getPublicMethodInfos())
if (m.isAll(STATIC, PUBLIC, NOT_DEPRECATED) && m.hasName(methodName) && m.hasReturnType(c) && m.hasArgs(String.class))
return m;
return null;
@@ -447,8 +447,8 @@ public final class ClassInfo {
* @param name The method name.
* @return The static method, or <jk>null</jk> if it couldn't be found.
*/
- public MethodInfo getStaticCreateMethod(Class<?> ic, String name) {
- for (MethodInfo m : getPublicMethods())
+ public MethodInfo getStaticCreateMethodInfo(Class<?> ic, String name) {
+ for (MethodInfo m : getPublicMethodInfos())
if (m.isAll(STATIC, PUBLIC, NOT_DEPRECATED) && m.hasName(name) && m.hasReturnType(c) && m.hasArgs(ic))
return m;
return null;
@@ -459,8 +459,8 @@ public final class ClassInfo {
*
* @return The <code>public static Builder create()</code> method on this class, or <jk>null</jk> if it doesn't exist.
*/
- public MethodInfo getBuilderCreateMethod() {
- for (MethodInfo m : getDeclaredMethods())
+ public MethodInfo getBuilderCreateMethodInfo() {
+ for (MethodInfo m : getDeclaredMethodInfos())
if (m.isAll(PUBLIC, STATIC) && m.hasName("create") && ! m.hasReturnType(Void.class))
return m;
return null;
@@ -471,8 +471,8 @@ public final class ClassInfo {
*
* @return The <code>T build()</code> method on this class, or <jk>null</jk> if it doesn't exist.
*/
- public MethodInfo getBuilderBuildMethod() {
- for (MethodInfo m : getDeclaredMethods())
+ public MethodInfo getBuilderBuildMethodInfo() {
+ for (MethodInfo m : getDeclaredMethodInfos())
if (m.isAll(NOT_STATIC) && m.hasName("build") && ! m.hasReturnType(Void.class))
return m;
return null;
@@ -487,7 +487,7 @@ public final class ClassInfo {
*
* @return All public constructors defined on this class.
*/
- public Iterable<ConstructorInfo> getConstructors() {
+ public Iterable<ConstructorInfo> getConstructorInfos() {
return findConstructors();
}
@@ -512,8 +512,8 @@ public final class ClassInfo {
*
* @return All declared methods on this class and all parent classes in child-to-parent order.
*/
- public Iterable<FieldInfo> getAllFields() {
- return getAllFields(false, false);
+ public Iterable<FieldInfo> getAllFieldInfos() {
+ return getAllFieldInfos(false, false);
}
/**
@@ -525,24 +525,11 @@ public final class ClassInfo {
* Otherwise, uses the order of the fields in the underlying JVM.
* @return All declared methods on this class and all parent classes.
*/
- public Iterable<FieldInfo> getAllFields(boolean parentFirst, boolean sort) {
+ public Iterable<FieldInfo> getAllFieldInfos(boolean parentFirst, boolean sort) {
return findAllFields(null, parentFirst, sort);
}
/**
- * Returns all field on this class and all parent classes in parent-to-child order.
- *
- * <p>
- * Fields are ordered per the natural ordering of the underlying JVM.
- * <br>Some JVMs (IBM) preserve the declaration order of fields. Other JVMs (Oracle) do not and return them in random order.
- *
- * @return All declared methods on this class and all parent classes in parent-to-child order.
- */
- public Iterable<FieldInfo> getAllFieldsParentFirst() {
- return getAllFields(true, false);
- }
-
- /**
* Returns all fields declared on this class.
*
* <p>
@@ -551,8 +538,8 @@ public final class ClassInfo {
*
* @return All fields declared on this class.
*/
- public Iterable<FieldInfo> getDeclaredFields() {
- return getDeclaredFields(false);
+ public Iterable<FieldInfo> getDeclaredFieldInfos() {
+ return getDeclaredFieldInfos(false);
}
/**
@@ -563,7 +550,7 @@ public final class ClassInfo {
* Otherwise, uses the order of the fields in the underlying JVM.
* @return All fields declared on this class.
*/
- public Iterable<FieldInfo> getDeclaredFields(boolean sort) {
+ public Iterable<FieldInfo> getDeclaredFieldInfos(boolean sort) {
return findDeclaredFields(null, sort);
}
@@ -613,11 +600,11 @@ public final class ClassInfo {
* @param v The minimum visibility.
* @return The constructor, or <jk>null</jk> if no no-arg constructor exists with the required visibility.
*/
- public ConstructorInfo getNoArgConstructor(Visibility v) {
+ public ConstructorInfo getNoArgConstructorInfo(Visibility v) {
if (isAbstract())
return null;
boolean isMemberClass = isMemberClass() && ! isStatic();
- for (ConstructorInfo cc : getConstructors())
+ for (ConstructorInfo cc : getConstructorInfos())
if (cc.hasNumArgs(isMemberClass ? 1 : 0) && cc.isVisible(v) && cc.isNotDeprecated())
return cc.transform(v);
return null;
@@ -1154,8 +1141,8 @@ public final class ClassInfo {
* The constructor, or <jk>null</jk> if a public constructor could not be found that takes in the specified
* arguments.
*/
- public <T> Constructor<T> findPublicConstructor(Class<?>...args) {
- return findPublicConstructor(false, args);
+ public <T> Constructor<T> getPublicConstructor(Class<?>...args) {
+ return getPublicConstructor(false, args);
}
/**
@@ -1169,8 +1156,8 @@ public final class ClassInfo {
* Can be subtypes of the actual constructor argument types.
* @return The matching constructor, or <jk>null</jk> if constructor could not be found.
*/
- public <T> Constructor<T> findPublicConstructor(boolean fuzzyArgs, Class<?>...argTypes) {
- return findConstructor(Visibility.PUBLIC, fuzzyArgs, argTypes);
+ public <T> Constructor<T> getPublicConstructor(boolean fuzzyArgs, Class<?>...argTypes) {
+ return getConstructor(Visibility.PUBLIC, fuzzyArgs, argTypes);
}
/**
@@ -1186,7 +1173,7 @@ public final class ClassInfo {
* @return The matching constructor, or <jk>null</jk> if constructor could not be found.
*/
@SuppressWarnings("unchecked")
- public <T> Constructor<T> findConstructor(Visibility vis, boolean fuzzyArgs, Class<?>...argTypes) {
+ public <T> Constructor<T> getConstructor(Visibility vis, boolean fuzzyArgs, Class<?>...argTypes) {
ConstructorCacheEntry cce = CONSTRUCTOR_CACHE.get(c);
if (cce != null && ClassUtils.argsMatch(cce.paramTypes, argTypes) && cce.isVisible(vis))
return (Constructor<T>)cce.constructor;
@@ -1251,8 +1238,8 @@ public final class ClassInfo {
* The constructor, or <jk>null</jk> if a public constructor could not be found that takes in the specified
* arguments.
*/
- public <T> Constructor<T> findPublicConstructor(boolean fuzzyArgs, Object...args) {
- return findPublicConstructor(fuzzyArgs, ClassUtils.getClasses(args));
+ public <T> Constructor<T> getPublicConstructor(boolean fuzzyArgs, Object...args) {
+ return getPublicConstructor(fuzzyArgs, ClassUtils.getClasses(args));
}
//-----------------------------------------------------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ConstructorInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ConstructorInfo.java
index d6b3e2e..3039f0e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ConstructorInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/ConstructorInfo.java
@@ -88,7 +88,7 @@ public final class ConstructorInfo {
*
* @return Metadata about the declaring class.
*/
- public ClassInfo getDeclaringClass() {
+ public ClassInfo getDeclaringClassInfo() {
return declaringClass;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/FieldInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/FieldInfo.java
index 63564dc..ac8a54a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/FieldInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/FieldInfo.java
@@ -78,7 +78,7 @@ public final class FieldInfo {
*
* @return Metadata about the declaring class.
*/
- public ClassInfo getDeclaringClass() {
+ public ClassInfo getDeclaringClassInfo() {
if (declaringClass == null)
declaringClass = ClassInfo.of(f.getDeclaringClass());
return declaringClass;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/MethodInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/MethodInfo.java
index 0303617..48e9729 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/MethodInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflection/MethodInfo.java
@@ -97,7 +97,7 @@ public final class MethodInfo {
*
* @return Metadata about the declaring class.
*/
- public ClassInfo getDeclaringClass() {
+ public ClassInfo getDeclaringClassInfo() {
if (declaringClass == null)
declaringClass = ClassInfo.of(m.getDeclaringClass());
return declaringClass;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterfaceMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterfaceMeta.java
index 245fa9d..06f6e00 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterfaceMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterfaceMeta.java
@@ -59,7 +59,7 @@ public class RemoteInterfaceMeta {
path = trimSlashes(r.path());
Map<Method,RemoteInterfaceMethod> methods = new LinkedHashMap<>();
- for (MethodInfo m : ci.getPublicMethods())
+ for (MethodInfo m : ci.getPublicMethodInfos())
if (m.isPublic())
methods.put(m.inner(), new RemoteInterfaceMethod(uri, m.inner()));
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BuilderSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BuilderSwap.java
index d5eeae1..570f73d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BuilderSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BuilderSwap.java
@@ -145,7 +145,7 @@ public class BuilderSwap<T,B> {
Constructor<?> pojoConstructor;
ConstructorInfo builderConstructor;
- createPojoMethod = bci.getBuilderBuildMethod();
+ createPojoMethod = bci.getBuilderBuildMethodInfo();
if (createPojoMethod != null)
pojoClass = createPojoMethod.getReturnType().inner();
@@ -154,12 +154,12 @@ public class BuilderSwap<T,B> {
ClassInfo pci = getClassInfo(pojoClass);
- pojoConstructor = pci.findConstructor(cVis, false, builderClass);
+ pojoConstructor = pci.getConstructor(cVis, false, builderClass);
if (pojoConstructor == null)
return null;
- builderConstructor = bci.getNoArgConstructor(cVis);
- createBuilderMethod = pci.getBuilderCreateMethod();
+ builderConstructor = bci.getNoArgConstructorInfo(cVis);
+ createBuilderMethod = pci.getBuilderCreateMethodInfo();
if (builderConstructor == null && createBuilderMethod == null)
return null;
@@ -189,13 +189,13 @@ public class BuilderSwap<T,B> {
ClassInfo pci = getClassInfo(pojoClass);
- builderCreateMethod = pci.getBuilderCreateMethod();
+ builderCreateMethod = pci.getBuilderCreateMethodInfo();
if (builderClass == null && builderCreateMethod != null)
builderClass = builderCreateMethod.getReturnType().inner();
if (builderClass == null) {
- for (ConstructorInfo cc : pci.getConstructors()) {
+ for (ConstructorInfo cc : pci.getConstructorInfos()) {
if (cc.isVisible(cVis) && cc.hasNumArgs(1)) {
Class<?>[] pt = cc.getParameterTypes();
if (getClassInfo(pt[0]).isChildOf(Builder.class)) {
@@ -210,13 +210,13 @@ public class BuilderSwap<T,B> {
return null;
ClassInfo bci = getClassInfo(builderClass);
- builderConstructor = bci.getNoArgConstructor(cVis);
+ builderConstructor = bci.getNoArgConstructorInfo(cVis);
if (builderConstructor == null && builderCreateMethod == null)
return null;
- pojoCreateMethod = bci.getBuilderBuildMethod();
+ pojoCreateMethod = bci.getBuilderBuildMethodInfo();
if (pojoConstructor == null)
- pojoConstructor = pci.findConstructor(cVis, false, builderClass);
+ pojoConstructor = pci.getConstructor(cVis, false, builderClass);
if (pojoConstructor == null && pojoCreateMethod == null)
return null;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/SurrogateSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/SurrogateSwap.java
index dbb266b..0f6ebe0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/SurrogateSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/SurrogateSwap.java
@@ -61,12 +61,12 @@ public class SurrogateSwap<T,F> extends PojoSwap<T,F> {
public static List<SurrogateSwap<?,?>> findPojoSwaps(Class<?> c) {
List<SurrogateSwap<?,?>> l = new LinkedList<>();
ClassInfo ci = getClassInfo(c);
- for (ConstructorInfo cc : ci.getConstructors()) {
+ for (ConstructorInfo cc : ci.getConstructorInfos()) {
Class<?>[] pt = cc.getParameterTypes();
if (cc.getAnnotation(BeanIgnore.class) == null && cc.hasNumArgs(1) && cc.isPublic() && pt[0] != c.getDeclaringClass()) {
// Find the unswap method if there is one.
Method unswapMethod = null;
- for (MethodInfo m : ci.getPublicMethods()) {
+ for (MethodInfo m : ci.getPublicMethodInfos()) {
if (m.getReturnType().is(pt[0]) && m.isPublic())
unswapMethod = m.inner();
}
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
index d432cb5..b551f4c 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
@@ -2287,7 +2287,7 @@ public final class RestCall extends BeanSession implements Closeable {
// So instantiate the object anyway if it has a no-arg constructor.
// This allows a remote resource method to return a NoContent object for example.
if (in == null && (sc < SC_OK || sc == SC_NO_CONTENT || sc == SC_NOT_MODIFIED || sc == SC_RESET_CONTENT)) {
- ConstructorInfo c = type.getInfo().getNoArgConstructor(Visibility.PUBLIC);
+ ConstructorInfo c = type.getInfo().getNoArgConstructorInfo(Visibility.PUBLIC);
if (c != null) {
try {
return (T)c.invoke();
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java
index a66ee34..a9a9ab1 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java
@@ -171,14 +171,14 @@ public final class RestCallException extends IOException {
Constructor<?> c = null;
ClassInfo ci = getClassInfo(t);
if (msg != null) {
- c = ci.findPublicConstructor(String.class);
+ c = ci.getPublicConstructor(String.class);
if (c != null)
throw (Throwable)c.newInstance(msg);
- c = ci.findPublicConstructor(Object.class);
+ c = ci.getPublicConstructor(Object.class);
if (c != null)
throw (Throwable)c.newInstance(msg);
}
- c = ci.findPublicConstructor();
+ c = ci.getPublicConstructor();
if (c != null)
throw (Throwable)c.newInstance();
}
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResourceMeta.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResourceMeta.java
index 883e8ba..8d096d7 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResourceMeta.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResourceMeta.java
@@ -52,7 +52,7 @@ public class RemoteResourceMeta {
path = trimSlashes(r.path());
Map<Method,RemoteMethodMeta> methods = new LinkedHashMap<>();
- for (MethodInfo m : ci.getPublicMethods())
+ for (MethodInfo m : ci.getPublicMethodInfos())
if (m.isPublic())
methods.put(m.inner(), new RemoteMethodMeta(path, m.inner(), false, "GET"));
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 63fa7d7..525b7ed 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -3230,7 +3230,7 @@ public final class RestContext extends BeanContext {
_postInitChildFirstMethodParams = new ArrayList<>(),
_destroyMethodParams = new ArrayList<>();
- for (MethodInfo mi : rci.getPublicMethods()) {
+ for (MethodInfo mi : rci.getPublicMethodInfos()) {
RestMethod a = mi.getAnnotation(RestMethod.class);
if (a != null) {
methodsFound.add(mi.getName() + "," + emptyIfNull(firstNonEmpty(a.name(), a.method())) + "," + fixMethodPath(a.path()));
@@ -3310,7 +3310,7 @@ public final class RestContext extends BeanContext {
}
}
- for (MethodInfo m : rci.getAllMethods(true, true)) {
+ for (MethodInfo m : rci.getAllMethodInfos(true, true)) {
if (m.isPublic() && m.hasAnnotation(RestHook.class)) {
HookEvent he = m.getAnnotation(RestHook.class).value();
String sig = m.getSignature();
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index 7703562..81306c6 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -295,7 +295,7 @@ public class RestContextBuilder extends BeanContextBuilder implements ServletCon
widgets(false, widgets);
Map<String,MethodInfo> map = new LinkedHashMap<>();
- for (MethodInfo m : rci.getAllMethods(true, true)) {
+ for (MethodInfo m : rci.getAllMethodInfos(true, true)) {
if (m.hasAnnotation(RestHook.class) && m.getAnnotation(RestHook.class).value() == HookEvent.INIT) {
m.setAccessible();
String sig = m.getSignature();
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
index b8b9c33..7499a16 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
@@ -395,7 +395,7 @@ final class SwaggerGenerator {
om.appendSkipEmpty("schema", getSchema(om.getObjectMap("schema"), eci.inner()));
}
}
- for (MethodInfo ecmi : eci.getAllMethods(true, true)) {
+ for (MethodInfo ecmi : eci.getAllMethodInfos(true, true)) {
if (ecmi.hasAnnotation(ResponseHeader.class)) {
ResponseHeader a = ecmi.getAnnotation(ResponseHeader.class);
String ha = a.name();
@@ -422,7 +422,7 @@ final class SwaggerGenerator {
}
}
if (mi.getReturnType().hasAnnotation(Response.class)) {
- for (MethodInfo ecmi : mi.getReturnType().getAllMethods(true, true)) {
+ for (MethodInfo ecmi : mi.getReturnType().getAllMethodInfos(true, true)) {
if (ecmi.hasAnnotation(ResponseHeader.class)) {
ResponseHeader a = ecmi.getAnnotation(ResponseHeader.class);
String ha = a.name();