From 595be5f7af03a29d61f541c9944c160d152f1e8d Mon Sep 17 00:00:00 2001 From: lonord Date: Thu, 28 Dec 2017 15:07:05 +0800 Subject: [PATCH] =?UTF-8?q?classmate=E7=A7=BB=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fasterxml/classmate/package-info.java | 13 ------------- .../fasterxml/classmate/types/package-info.java | 5 ----- .../classmate/AnnotationConfiguration.java | 4 ++-- .../fasterxml/classmate/AnnotationInclusion.java | 2 +- .../fasterxml/classmate/AnnotationOverrides.java | 4 ++-- .../com}/fasterxml/classmate/Annotations.java | 2 +- .../third/com}/fasterxml/classmate/Filter.java | 2 +- .../com}/fasterxml/classmate/GenericType.java | 2 +- .../com}/fasterxml/classmate/MemberResolver.java | 9 ++++++--- .../com}/fasterxml/classmate/ResolvedType.java | 12 ++++++++---- .../classmate/ResolvedTypeWithMembers.java | 14 ++++++++++---- .../com}/fasterxml/classmate/TypeBindings.java | 2 +- .../com}/fasterxml/classmate/TypeResolver.java | 15 ++++++++++----- .../classmate/members/HierarchicType.java | 6 +++--- .../classmate/members/RawConstructor.java | 6 +++--- .../fasterxml/classmate/members/RawField.java | 4 ++-- .../fasterxml/classmate/members/RawMember.java | 6 +++--- .../fasterxml/classmate/members/RawMethod.java | 6 +++--- .../classmate/members/ResolvedConstructor.java | 6 +++--- .../classmate/members/ResolvedField.java | 8 ++++---- .../classmate/members/ResolvedMember.java | 6 +++--- .../classmate/members/ResolvedMethod.java | 8 ++++---- .../members/ResolvedParameterizedMember.java | 6 +++--- .../fasterxml/classmate/members/package-info.java | 2 +- .../com/fasterxml/classmate/package-info.java | 13 +++++++++++++ .../classmate/types/ResolvedArrayType.java | 6 +++--- .../classmate/types/ResolvedInterfaceType.java | 10 +++++----- .../classmate/types/ResolvedObjectType.java | 12 ++++++------ .../classmate/types/ResolvedPrimitiveType.java | 6 +++--- .../classmate/types/ResolvedRecursiveType.java | 12 ++++++------ .../classmate/types/TypePlaceHolder.java | 6 +++--- .../fasterxml/classmate/types/package-info.java | 5 +++++ .../com}/fasterxml/classmate/util/ClassKey.java | 2 +- .../com}/fasterxml/classmate/util/ClassStack.java | 6 +++--- .../com}/fasterxml/classmate/util/MethodKey.java | 2 +- .../classmate/util/ResolvedTypeCache.java | 4 ++-- .../fasterxml/classmate/util/package-info.java | 2 +- fine-hibernate/fine-hibernate.iml | 2 +- .../AttributeConverterDescriptorImpl.java | 10 +++++----- .../hibernate/boot/internal/ClassmateContext.java | 4 ++-- 40 files changed, 135 insertions(+), 117 deletions(-) delete mode 100644 fine-classmate/src/com/fasterxml/classmate/package-info.java delete mode 100644 fine-classmate/src/com/fasterxml/classmate/types/package-info.java rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/AnnotationConfiguration.java (97%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/AnnotationInclusion.java (96%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/AnnotationOverrides.java (96%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/Annotations.java (98%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/Filter.java (82%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/GenericType.java (94%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/MemberResolver.java (96%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/ResolvedType.java (97%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/ResolvedTypeWithMembers.java (97%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/TypeBindings.java (99%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/TypeResolver.java (97%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/members/HierarchicType.java (92%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/members/RawConstructor.java (90%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/members/RawField.java (92%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/members/RawMember.java (93%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/members/RawMethod.java (91%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/members/ResolvedConstructor.java (79%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/members/ResolvedField.java (77%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/members/ResolvedMember.java (95%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/members/ResolvedMethod.java (87%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/members/ResolvedParameterizedMember.java (93%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/members/package-info.java (66%) create mode 100644 fine-classmate/src/com/fr/third/com/fasterxml/classmate/package-info.java rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/types/ResolvedArrayType.java (94%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/types/ResolvedInterfaceType.java (93%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/types/ResolvedObjectType.java (96%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/types/ResolvedPrimitiveType.java (96%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/types/ResolvedRecursiveType.java (92%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/types/TypePlaceHolder.java (94%) create mode 100644 fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/package-info.java rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/util/ClassKey.java (97%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/util/ClassStack.java (90%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/util/MethodKey.java (97%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/util/ResolvedTypeCache.java (97%) rename fine-classmate/src/com/{ => fr/third/com}/fasterxml/classmate/util/package-info.java (51%) diff --git a/fine-classmate/src/com/fasterxml/classmate/package-info.java b/fine-classmate/src/com/fasterxml/classmate/package-info.java deleted file mode 100644 index 8afcbaddc..000000000 --- a/fine-classmate/src/com/fasterxml/classmate/package-info.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Package that contains main public interface of ClassMate - * package. - *

- * Most commonly resolution starts with {@link com.fasterxml.classmate.TypeResolver}, - * using its resolve() method, which returns a - * {@link com.fasterxml.classmate.ResolvedType} instance. - * These type objects contain all necessary information about type itself; - * but if type information on members (fields, methods, constructors, static - * members) is needed, {@link com.fasterxml.classmate.MemberResolver} can - * resolve types for members: it takes {@link com.fasterxml.classmate.ResolvedType}s. - */ -package com.fasterxml.classmate; diff --git a/fine-classmate/src/com/fasterxml/classmate/types/package-info.java b/fine-classmate/src/com/fasterxml/classmate/types/package-info.java deleted file mode 100644 index ff3f9e2fc..000000000 --- a/fine-classmate/src/com/fasterxml/classmate/types/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Package that contains {@link com.fasterxml.classmate.ResolvedType} - * implementation classes. - */ -package com.fasterxml.classmate.types; diff --git a/fine-classmate/src/com/fasterxml/classmate/AnnotationConfiguration.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/AnnotationConfiguration.java similarity index 97% rename from fine-classmate/src/com/fasterxml/classmate/AnnotationConfiguration.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/AnnotationConfiguration.java index 2d1c51965..bffd21384 100644 --- a/fine-classmate/src/com/fasterxml/classmate/AnnotationConfiguration.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/AnnotationConfiguration.java @@ -1,10 +1,10 @@ -package com.fasterxml.classmate; +package com.fr.third.com.fasterxml.classmate; import java.io.Serializable; import java.lang.annotation.Annotation; import java.util.*; -import com.fasterxml.classmate.util.ClassKey; +import com.fr.third.com.fasterxml.classmate.util.ClassKey; /** * Interface for object that determines handling of annotations in regards diff --git a/fine-classmate/src/com/fasterxml/classmate/AnnotationInclusion.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/AnnotationInclusion.java similarity index 96% rename from fine-classmate/src/com/fasterxml/classmate/AnnotationInclusion.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/AnnotationInclusion.java index 3587c2300..d8be03f3a 100644 --- a/fine-classmate/src/com/fasterxml/classmate/AnnotationInclusion.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/AnnotationInclusion.java @@ -1,4 +1,4 @@ -package com.fasterxml.classmate; +package com.fr.third.com.fasterxml.classmate; /** * Enumeration that defines different settings for handling behavior diff --git a/fine-classmate/src/com/fasterxml/classmate/AnnotationOverrides.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/AnnotationOverrides.java similarity index 96% rename from fine-classmate/src/com/fasterxml/classmate/AnnotationOverrides.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/AnnotationOverrides.java index 28abd4bc8..74a0f6c7c 100644 --- a/fine-classmate/src/com/fasterxml/classmate/AnnotationOverrides.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/AnnotationOverrides.java @@ -1,9 +1,9 @@ -package com.fasterxml.classmate; +package com.fr.third.com.fasterxml.classmate; import java.io.Serializable; import java.util.*; -import com.fasterxml.classmate.util.ClassKey; +import com.fr.third.com.fasterxml.classmate.util.ClassKey; /** * Interface for object that can provide mix-ins to override annotations. diff --git a/fine-classmate/src/com/fasterxml/classmate/Annotations.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/Annotations.java similarity index 98% rename from fine-classmate/src/com/fasterxml/classmate/Annotations.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/Annotations.java index db8020d47..3a5261ccf 100644 --- a/fine-classmate/src/com/fasterxml/classmate/Annotations.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/Annotations.java @@ -1,4 +1,4 @@ -package com.fasterxml.classmate; +package com.fr.third.com.fasterxml.classmate; import java.io.Serializable; import java.lang.annotation.Annotation; diff --git a/fine-classmate/src/com/fasterxml/classmate/Filter.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/Filter.java similarity index 82% rename from fine-classmate/src/com/fasterxml/classmate/Filter.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/Filter.java index 3617ba8d3..721cd26bb 100644 --- a/fine-classmate/src/com/fasterxml/classmate/Filter.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/Filter.java @@ -1,4 +1,4 @@ -package com.fasterxml.classmate; +package com.fr.third.com.fasterxml.classmate; /** * Interface that defines API for basic filtering objects, used to prune set diff --git a/fine-classmate/src/com/fasterxml/classmate/GenericType.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/GenericType.java similarity index 94% rename from fine-classmate/src/com/fasterxml/classmate/GenericType.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/GenericType.java index be7bad437..a2aae0db1 100644 --- a/fine-classmate/src/com/fasterxml/classmate/GenericType.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/GenericType.java @@ -1,4 +1,4 @@ -package com.fasterxml.classmate; +package com.fr.third.com.fasterxml.classmate; import java.io.Serializable; diff --git a/fine-classmate/src/com/fasterxml/classmate/MemberResolver.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/MemberResolver.java similarity index 96% rename from fine-classmate/src/com/fasterxml/classmate/MemberResolver.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/MemberResolver.java index 5579a87c2..9fedb3cc6 100644 --- a/fine-classmate/src/com/fasterxml/classmate/MemberResolver.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/MemberResolver.java @@ -1,10 +1,13 @@ -package com.fasterxml.classmate; +package com.fr.third.com.fasterxml.classmate; import java.io.Serializable; import java.util.*; -import com.fasterxml.classmate.members.*; -import com.fasterxml.classmate.util.ClassKey; +import com.fr.third.com.fasterxml.classmate.members.RawField; +import com.fr.third.com.fasterxml.classmate.util.ClassKey; +import com.fr.third.com.fasterxml.classmate.members.HierarchicType; +import com.fr.third.com.fasterxml.classmate.members.RawConstructor; +import com.fr.third.com.fasterxml.classmate.members.RawMethod; /** * Builder class used to completely resolve members (fields, methods, diff --git a/fine-classmate/src/com/fasterxml/classmate/ResolvedType.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/ResolvedType.java similarity index 97% rename from fine-classmate/src/com/fasterxml/classmate/ResolvedType.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/ResolvedType.java index 5ca02c94b..31196dbe1 100644 --- a/fine-classmate/src/com/fasterxml/classmate/ResolvedType.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/ResolvedType.java @@ -1,13 +1,17 @@ -package com.fasterxml.classmate; +package com.fr.third.com.fasterxml.classmate; + +import com.fr.third.com.fasterxml.classmate.members.RawConstructor; +import com.fr.third.com.fasterxml.classmate.members.RawField; +import com.fr.third.com.fasterxml.classmate.members.RawMethod; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.lang.reflect.Type; -import java.util.*; - -import com.fasterxml.classmate.members.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public abstract class ResolvedType implements Type diff --git a/fine-classmate/src/com/fasterxml/classmate/ResolvedTypeWithMembers.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/ResolvedTypeWithMembers.java similarity index 97% rename from fine-classmate/src/com/fasterxml/classmate/ResolvedTypeWithMembers.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/ResolvedTypeWithMembers.java index 15cb61f23..fbfac6cc1 100644 --- a/fine-classmate/src/com/fasterxml/classmate/ResolvedTypeWithMembers.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/ResolvedTypeWithMembers.java @@ -1,4 +1,4 @@ -package com.fasterxml.classmate; +package com.fr.third.com.fasterxml.classmate; import java.lang.annotation.Annotation; import java.lang.annotation.Inherited; @@ -8,15 +8,21 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.*; -import com.fasterxml.classmate.members.*; -import com.fasterxml.classmate.util.MethodKey; +import com.fr.third.com.fasterxml.classmate.members.HierarchicType; +import com.fr.third.com.fasterxml.classmate.members.RawConstructor; +import com.fr.third.com.fasterxml.classmate.members.RawField; +import com.fr.third.com.fasterxml.classmate.members.RawMethod; +import com.fr.third.com.fasterxml.classmate.members.ResolvedConstructor; +import com.fr.third.com.fasterxml.classmate.members.ResolvedField; +import com.fr.third.com.fasterxml.classmate.members.ResolvedMethod; +import com.fr.third.com.fasterxml.classmate.util.MethodKey; /** * Class that contains information about fully resolved members of a * type; resolution meaning that masking is handled for methods, and * all inheritable annotations are flattened using optional overrides * as well ("mix-in annotations"). - * Instances are created by {@link com.fasterxml.classmate.MemberResolver}. + * Instances are created by {@link MemberResolver}. *

* Note that instances are not thread-safe, as the expectation is that instances * will not be shared (unlike raw members or resolved types) diff --git a/fine-classmate/src/com/fasterxml/classmate/TypeBindings.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/TypeBindings.java similarity index 99% rename from fine-classmate/src/com/fasterxml/classmate/TypeBindings.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/TypeBindings.java index eda857928..700a70a42 100644 --- a/fine-classmate/src/com/fasterxml/classmate/TypeBindings.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/TypeBindings.java @@ -1,4 +1,4 @@ -package com.fasterxml.classmate; +package com.fr.third.com.fasterxml.classmate; import java.lang.reflect.TypeVariable; import java.util.*; diff --git a/fine-classmate/src/com/fasterxml/classmate/TypeResolver.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/TypeResolver.java similarity index 97% rename from fine-classmate/src/com/fasterxml/classmate/TypeResolver.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/TypeResolver.java index ef9da8b89..acaf9a9fd 100644 --- a/fine-classmate/src/com/fasterxml/classmate/TypeResolver.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/TypeResolver.java @@ -1,13 +1,18 @@ -package com.fasterxml.classmate; +package com.fr.third.com.fasterxml.classmate; import java.io.Serializable; import java.lang.reflect.*; import java.util.*; -import com.fasterxml.classmate.types.*; -import com.fasterxml.classmate.util.ClassKey; -import com.fasterxml.classmate.util.ClassStack; -import com.fasterxml.classmate.util.ResolvedTypeCache; +import com.fr.third.com.fasterxml.classmate.util.ClassKey; +import com.fr.third.com.fasterxml.classmate.util.ClassStack; +import com.fr.third.com.fasterxml.classmate.util.ResolvedTypeCache; +import com.fr.third.com.fasterxml.classmate.types.ResolvedArrayType; +import com.fr.third.com.fasterxml.classmate.types.ResolvedInterfaceType; +import com.fr.third.com.fasterxml.classmate.types.ResolvedObjectType; +import com.fr.third.com.fasterxml.classmate.types.ResolvedPrimitiveType; +import com.fr.third.com.fasterxml.classmate.types.ResolvedRecursiveType; +import com.fr.third.com.fasterxml.classmate.types.TypePlaceHolder; /** * Object that is used for resolving generic type information of a class diff --git a/fine-classmate/src/com/fasterxml/classmate/members/HierarchicType.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/HierarchicType.java similarity index 92% rename from fine-classmate/src/com/fasterxml/classmate/members/HierarchicType.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/HierarchicType.java index e4e5b2eba..defa550ed 100644 --- a/fine-classmate/src/com/fasterxml/classmate/members/HierarchicType.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/HierarchicType.java @@ -1,7 +1,7 @@ -package com.fasterxml.classmate.members; +package com.fr.third.com.fasterxml.classmate.members; -import com.fasterxml.classmate.ResolvedType; -import com.fasterxml.classmate.ResolvedTypeWithMembers; +import com.fr.third.com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.ResolvedTypeWithMembers; /** * Container class used to enclose information about a single {@link ResolvedType} diff --git a/fine-classmate/src/com/fasterxml/classmate/members/RawConstructor.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawConstructor.java similarity index 90% rename from fine-classmate/src/com/fasterxml/classmate/members/RawConstructor.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawConstructor.java index f90a53e3c..0cd8280c1 100644 --- a/fine-classmate/src/com/fasterxml/classmate/members/RawConstructor.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawConstructor.java @@ -1,9 +1,9 @@ -package com.fasterxml.classmate.members; +package com.fr.third.com.fasterxml.classmate.members; import java.lang.reflect.Constructor; -import com.fasterxml.classmate.ResolvedType; -import com.fasterxml.classmate.util.MethodKey; +import com.fr.third.com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.util.MethodKey; public final class RawConstructor extends RawMember { diff --git a/fine-classmate/src/com/fasterxml/classmate/members/RawField.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawField.java similarity index 92% rename from fine-classmate/src/com/fasterxml/classmate/members/RawField.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawField.java index 29caf0193..bef99fb93 100644 --- a/fine-classmate/src/com/fasterxml/classmate/members/RawField.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawField.java @@ -1,9 +1,9 @@ -package com.fasterxml.classmate.members; +package com.fr.third.com.fasterxml.classmate.members; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.ResolvedType; public final class RawField extends RawMember { diff --git a/fine-classmate/src/com/fasterxml/classmate/members/RawMember.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawMember.java similarity index 93% rename from fine-classmate/src/com/fasterxml/classmate/members/RawMember.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawMember.java index 2d71fec26..9862f5131 100644 --- a/fine-classmate/src/com/fasterxml/classmate/members/RawMember.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawMember.java @@ -1,17 +1,17 @@ -package com.fasterxml.classmate.members; +package com.fr.third.com.fasterxml.classmate.members; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Member; import java.lang.reflect.Modifier; -import com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.ResolvedType; /** * Base class for all "raw" member (field, method, constructor) types; raw means that * actual types are not yet resolved, but relationship to declaring type is * retained for eventual resolution. - * Instances are typically created by {@link com.fasterxml.classmate.ResolvedType} + * Instances are typically created by {@link ResolvedType} * when requested, and form the input to eventual full flattening of type members. */ public abstract class RawMember diff --git a/fine-classmate/src/com/fasterxml/classmate/members/RawMethod.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawMethod.java similarity index 91% rename from fine-classmate/src/com/fasterxml/classmate/members/RawMethod.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawMethod.java index b7fff744e..6fac0ab34 100644 --- a/fine-classmate/src/com/fasterxml/classmate/members/RawMethod.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/RawMethod.java @@ -1,10 +1,10 @@ -package com.fasterxml.classmate.members; +package com.fr.third.com.fasterxml.classmate.members; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import com.fasterxml.classmate.ResolvedType; -import com.fasterxml.classmate.util.MethodKey; +import com.fr.third.com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.util.MethodKey; public final class RawMethod extends RawMember { diff --git a/fine-classmate/src/com/fasterxml/classmate/members/ResolvedConstructor.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedConstructor.java similarity index 79% rename from fine-classmate/src/com/fasterxml/classmate/members/ResolvedConstructor.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedConstructor.java index d6e1fa2e0..63fb546b9 100644 --- a/fine-classmate/src/com/fasterxml/classmate/members/ResolvedConstructor.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedConstructor.java @@ -1,9 +1,9 @@ -package com.fasterxml.classmate.members; +package com.fr.third.com.fasterxml.classmate.members; import java.lang.reflect.Constructor; -import com.fasterxml.classmate.Annotations; -import com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.Annotations; +import com.fr.third.com.fasterxml.classmate.ResolvedType; /** * Class that represents a constructor that has fully resolved generic diff --git a/fine-classmate/src/com/fasterxml/classmate/members/ResolvedField.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedField.java similarity index 77% rename from fine-classmate/src/com/fasterxml/classmate/members/ResolvedField.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedField.java index 7fb409830..e930c0b2f 100644 --- a/fine-classmate/src/com/fasterxml/classmate/members/ResolvedField.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedField.java @@ -1,16 +1,16 @@ -package com.fasterxml.classmate.members; +package com.fr.third.com.fasterxml.classmate.members; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import com.fasterxml.classmate.Annotations; -import com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.Annotations; +import com.fr.third.com.fasterxml.classmate.ResolvedType; public final class ResolvedField extends ResolvedMember implements Comparable { public ResolvedField(ResolvedType context, Annotations ann, - Field field, ResolvedType type) + Field field, ResolvedType type) { super(context, ann, field, type); } diff --git a/fine-classmate/src/com/fasterxml/classmate/members/ResolvedMember.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedMember.java similarity index 95% rename from fine-classmate/src/com/fasterxml/classmate/members/ResolvedMember.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedMember.java index 848c2c858..01792c544 100644 --- a/fine-classmate/src/com/fasterxml/classmate/members/ResolvedMember.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedMember.java @@ -1,11 +1,11 @@ -package com.fasterxml.classmate.members; +package com.fr.third.com.fasterxml.classmate.members; import java.lang.annotation.Annotation; import java.lang.reflect.Member; import java.lang.reflect.Modifier; -import com.fasterxml.classmate.Annotations; -import com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.Annotations; +import com.fr.third.com.fasterxml.classmate.ResolvedType; /** * Fully type-resolved equivalent of {@link RawMember}. Only members "that matter" (ones not diff --git a/fine-classmate/src/com/fasterxml/classmate/members/ResolvedMethod.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedMethod.java similarity index 87% rename from fine-classmate/src/com/fasterxml/classmate/members/ResolvedMethod.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedMethod.java index 6b6d16da7..9f71cad1d 100644 --- a/fine-classmate/src/com/fasterxml/classmate/members/ResolvedMethod.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedMethod.java @@ -1,16 +1,16 @@ -package com.fasterxml.classmate.members; +package com.fr.third.com.fasterxml.classmate.members; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import com.fasterxml.classmate.Annotations; -import com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.Annotations; +import com.fr.third.com.fasterxml.classmate.ResolvedType; public final class ResolvedMethod extends ResolvedParameterizedMember implements Comparable { public ResolvedMethod(ResolvedType context, Annotations ann, Method method, - ResolvedType returnType, ResolvedType[] argumentTypes) + ResolvedType returnType, ResolvedType[] argumentTypes) { super(context, ann, method, returnType, argumentTypes); } diff --git a/fine-classmate/src/com/fasterxml/classmate/members/ResolvedParameterizedMember.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedParameterizedMember.java similarity index 93% rename from fine-classmate/src/com/fasterxml/classmate/members/ResolvedParameterizedMember.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedParameterizedMember.java index b0f117e24..80233cc00 100644 --- a/fine-classmate/src/com/fasterxml/classmate/members/ResolvedParameterizedMember.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/ResolvedParameterizedMember.java @@ -1,7 +1,7 @@ -package com.fasterxml.classmate.members; +package com.fr.third.com.fasterxml.classmate.members; -import com.fasterxml.classmate.Annotations; -import com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.Annotations; +import com.fr.third.com.fasterxml.classmate.ResolvedType; import java.lang.annotation.Annotation; import java.lang.reflect.Member; diff --git a/fine-classmate/src/com/fasterxml/classmate/members/package-info.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/package-info.java similarity index 66% rename from fine-classmate/src/com/fasterxml/classmate/members/package-info.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/package-info.java index a4407f39a..b854566b5 100644 --- a/fine-classmate/src/com/fasterxml/classmate/members/package-info.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/members/package-info.java @@ -2,4 +2,4 @@ * Package that contains implementations of various member types * (methods, fields, constructors) */ -package com.fasterxml.classmate.members; +package com.fr.third.com.fasterxml.classmate.members; diff --git a/fine-classmate/src/com/fr/third/com/fasterxml/classmate/package-info.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/package-info.java new file mode 100644 index 000000000..820128ab3 --- /dev/null +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/package-info.java @@ -0,0 +1,13 @@ +/** + * Package that contains main public interface of ClassMate + * package. + *

+ * Most commonly resolution starts with {@link com.fr.third.com.fasterxml.classmate.TypeResolver}, + * using its resolve() method, which returns a + * {@link com.fr.third.com.fasterxml.classmate.ResolvedType} instance. + * These type objects contain all necessary information about type itself; + * but if type information on members (fields, methods, constructors, static + * members) is needed, {@link com.fr.third.com.fasterxml.classmate.MemberResolver} can + * resolve types for members: it takes {@link com.fr.third.com.fasterxml.classmate.ResolvedType}s. + */ +package com.fr.third.com.fasterxml.classmate; diff --git a/fine-classmate/src/com/fasterxml/classmate/types/ResolvedArrayType.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedArrayType.java similarity index 94% rename from fine-classmate/src/com/fasterxml/classmate/types/ResolvedArrayType.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedArrayType.java index 4630f3a25..099f9d2c3 100644 --- a/fine-classmate/src/com/fasterxml/classmate/types/ResolvedArrayType.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedArrayType.java @@ -1,9 +1,9 @@ -package com.fasterxml.classmate.types; +package com.fr.third.com.fasterxml.classmate.types; import java.util.*; -import com.fasterxml.classmate.ResolvedType; -import com.fasterxml.classmate.TypeBindings; +import com.fr.third.com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.TypeBindings; public final class ResolvedArrayType extends ResolvedType { diff --git a/fine-classmate/src/com/fasterxml/classmate/types/ResolvedInterfaceType.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedInterfaceType.java similarity index 93% rename from fine-classmate/src/com/fasterxml/classmate/types/ResolvedInterfaceType.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedInterfaceType.java index 6a4d9eb33..e4c045bfc 100644 --- a/fine-classmate/src/com/fasterxml/classmate/types/ResolvedInterfaceType.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedInterfaceType.java @@ -1,11 +1,11 @@ -package com.fasterxml.classmate.types; +package com.fr.third.com.fasterxml.classmate.types; import java.util.*; -import com.fasterxml.classmate.ResolvedType; -import com.fasterxml.classmate.TypeBindings; -import com.fasterxml.classmate.members.RawField; -import com.fasterxml.classmate.members.RawMethod; +import com.fr.third.com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.TypeBindings; +import com.fr.third.com.fasterxml.classmate.members.RawField; +import com.fr.third.com.fasterxml.classmate.members.RawMethod; public class ResolvedInterfaceType extends ResolvedType { diff --git a/fine-classmate/src/com/fasterxml/classmate/types/ResolvedObjectType.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedObjectType.java similarity index 96% rename from fine-classmate/src/com/fasterxml/classmate/types/ResolvedObjectType.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedObjectType.java index 28f35e893..d23acee8b 100644 --- a/fine-classmate/src/com/fasterxml/classmate/types/ResolvedObjectType.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedObjectType.java @@ -1,15 +1,15 @@ -package com.fasterxml.classmate.types; +package com.fr.third.com.fasterxml.classmate.types; import java.lang.reflect.Modifier; import java.util.Arrays; import java.util.Collections; import java.util.List; -import com.fasterxml.classmate.ResolvedType; -import com.fasterxml.classmate.TypeBindings; -import com.fasterxml.classmate.members.RawConstructor; -import com.fasterxml.classmate.members.RawField; -import com.fasterxml.classmate.members.RawMethod; +import com.fr.third.com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.TypeBindings; +import com.fr.third.com.fasterxml.classmate.members.RawConstructor; +import com.fr.third.com.fasterxml.classmate.members.RawField; +import com.fr.third.com.fasterxml.classmate.members.RawMethod; /** * Type implementation for classes that do not represent interfaces, diff --git a/fine-classmate/src/com/fasterxml/classmate/types/ResolvedPrimitiveType.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedPrimitiveType.java similarity index 96% rename from fine-classmate/src/com/fasterxml/classmate/types/ResolvedPrimitiveType.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedPrimitiveType.java index 1c9be3624..34c9e9a91 100644 --- a/fine-classmate/src/com/fasterxml/classmate/types/ResolvedPrimitiveType.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedPrimitiveType.java @@ -1,9 +1,9 @@ -package com.fasterxml.classmate.types; +package com.fr.third.com.fasterxml.classmate.types; import java.util.*; -import com.fasterxml.classmate.ResolvedType; -import com.fasterxml.classmate.TypeBindings; +import com.fr.third.com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.TypeBindings; /** * Type used for Java primitive types (which does not include arrays here). diff --git a/fine-classmate/src/com/fasterxml/classmate/types/ResolvedRecursiveType.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedRecursiveType.java similarity index 92% rename from fine-classmate/src/com/fasterxml/classmate/types/ResolvedRecursiveType.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedRecursiveType.java index c8d7a1810..f1146ff05 100644 --- a/fine-classmate/src/com/fasterxml/classmate/types/ResolvedRecursiveType.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/ResolvedRecursiveType.java @@ -1,13 +1,13 @@ -package com.fasterxml.classmate.types; +package com.fr.third.com.fasterxml.classmate.types; import java.lang.reflect.Modifier; import java.util.*; -import com.fasterxml.classmate.ResolvedType; -import com.fasterxml.classmate.TypeBindings; -import com.fasterxml.classmate.members.RawConstructor; -import com.fasterxml.classmate.members.RawField; -import com.fasterxml.classmate.members.RawMethod; +import com.fr.third.com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.TypeBindings; +import com.fr.third.com.fasterxml.classmate.members.RawConstructor; +import com.fr.third.com.fasterxml.classmate.members.RawField; +import com.fr.third.com.fasterxml.classmate.members.RawMethod; /** * Specialized type placeholder used in cases where type definition is diff --git a/fine-classmate/src/com/fasterxml/classmate/types/TypePlaceHolder.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/TypePlaceHolder.java similarity index 94% rename from fine-classmate/src/com/fasterxml/classmate/types/TypePlaceHolder.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/TypePlaceHolder.java index c7f431a9c..47157ecb6 100644 --- a/fine-classmate/src/com/fasterxml/classmate/types/TypePlaceHolder.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/TypePlaceHolder.java @@ -1,9 +1,9 @@ -package com.fasterxml.classmate.types; +package com.fr.third.com.fasterxml.classmate.types; import java.util.*; -import com.fasterxml.classmate.ResolvedType; -import com.fasterxml.classmate.TypeBindings; +import com.fr.third.com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.TypeBindings; /** * Placeholder used for resolving type assignments to figure out diff --git a/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/package-info.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/package-info.java new file mode 100644 index 000000000..e8da046d9 --- /dev/null +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/types/package-info.java @@ -0,0 +1,5 @@ +/** + * Package that contains {@link com.fr.third.com.fasterxml.classmate.ResolvedType} + * implementation classes. + */ +package com.fr.third.com.fasterxml.classmate.types; diff --git a/fine-classmate/src/com/fasterxml/classmate/util/ClassKey.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/ClassKey.java similarity index 97% rename from fine-classmate/src/com/fasterxml/classmate/util/ClassKey.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/ClassKey.java index 261b86238..402c005e0 100644 --- a/fine-classmate/src/com/fasterxml/classmate/util/ClassKey.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/ClassKey.java @@ -1,4 +1,4 @@ -package com.fasterxml.classmate.util; +package com.fr.third.com.fasterxml.classmate.util; import java.io.Serializable; diff --git a/fine-classmate/src/com/fasterxml/classmate/util/ClassStack.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/ClassStack.java similarity index 90% rename from fine-classmate/src/com/fasterxml/classmate/util/ClassStack.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/ClassStack.java index 57bf73b59..4de5a5b09 100644 --- a/fine-classmate/src/com/fasterxml/classmate/util/ClassStack.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/ClassStack.java @@ -1,9 +1,9 @@ -package com.fasterxml.classmate.util; +package com.fr.third.com.fasterxml.classmate.util; import java.util.ArrayList; -import com.fasterxml.classmate.ResolvedType; -import com.fasterxml.classmate.types.ResolvedRecursiveType; +import com.fr.third.com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.types.ResolvedRecursiveType; /** * Simple helper class used to keep track of 'call stack' for classes being referenced diff --git a/fine-classmate/src/com/fasterxml/classmate/util/MethodKey.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/MethodKey.java similarity index 97% rename from fine-classmate/src/com/fasterxml/classmate/util/MethodKey.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/MethodKey.java index d8074f017..94b309018 100644 --- a/fine-classmate/src/com/fasterxml/classmate/util/MethodKey.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/MethodKey.java @@ -1,4 +1,4 @@ -package com.fasterxml.classmate.util; +package com.fr.third.com.fasterxml.classmate.util; import java.io.Serializable; diff --git a/fine-classmate/src/com/fasterxml/classmate/util/ResolvedTypeCache.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/ResolvedTypeCache.java similarity index 97% rename from fine-classmate/src/com/fasterxml/classmate/util/ResolvedTypeCache.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/ResolvedTypeCache.java index 8ce77328d..46847944b 100644 --- a/fine-classmate/src/com/fasterxml/classmate/util/ResolvedTypeCache.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/ResolvedTypeCache.java @@ -1,9 +1,9 @@ -package com.fasterxml.classmate.util; +package com.fr.third.com.fasterxml.classmate.util; import java.io.Serializable; import java.util.*; -import com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.ResolvedType; /** * Simple LRU cache used for storing up to specified number of most recently accessed diff --git a/fine-classmate/src/com/fasterxml/classmate/util/package-info.java b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/package-info.java similarity index 51% rename from fine-classmate/src/com/fasterxml/classmate/util/package-info.java rename to fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/package-info.java index 7dfc231f4..e82d06994 100644 --- a/fine-classmate/src/com/fasterxml/classmate/util/package-info.java +++ b/fine-classmate/src/com/fr/third/com/fasterxml/classmate/util/package-info.java @@ -1,4 +1,4 @@ /** * Various utility classes used by ClassMate. */ -package com.fasterxml.classmate.util; +package com.fr.third.com.fasterxml.classmate.util; diff --git a/fine-hibernate/fine-hibernate.iml b/fine-hibernate/fine-hibernate.iml index caf907737..a8a973893 100644 --- a/fine-hibernate/fine-hibernate.iml +++ b/fine-hibernate/fine-hibernate.iml @@ -8,9 +8,9 @@ - + \ No newline at end of file diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/boot/internal/AttributeConverterDescriptorImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/boot/internal/AttributeConverterDescriptorImpl.java index a4dbc3217..350b830e8 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/boot/internal/AttributeConverterDescriptorImpl.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/boot/internal/AttributeConverterDescriptorImpl.java @@ -23,11 +23,11 @@ import com.fr.third.org.hibernate.boot.spi.MetadataBuildingContext; import com.fr.third.org.hibernate.cfg.AttributeConverterDefinition; import com.fr.third.org.hibernate.cfg.annotations.HCANNHelper; -import com.fasterxml.classmate.ResolvedType; -import com.fasterxml.classmate.ResolvedTypeWithMembers; -import com.fasterxml.classmate.members.ResolvedField; -import com.fasterxml.classmate.members.ResolvedMember; -import com.fasterxml.classmate.members.ResolvedMethod; +import com.fr.third.com.fasterxml.classmate.ResolvedType; +import com.fr.third.com.fasterxml.classmate.ResolvedTypeWithMembers; +import com.fr.third.com.fasterxml.classmate.members.ResolvedField; +import com.fr.third.com.fasterxml.classmate.members.ResolvedMember; +import com.fr.third.com.fasterxml.classmate.members.ResolvedMethod; /** * The standard AttributeConverterDescriptor implementation diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/boot/internal/ClassmateContext.java b/fine-hibernate/src/com/fr/third/org/hibernate/boot/internal/ClassmateContext.java index 72b10b054..ef9f999ed 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/boot/internal/ClassmateContext.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/boot/internal/ClassmateContext.java @@ -6,8 +6,8 @@ */ package com.fr.third.org.hibernate.boot.internal; -import com.fasterxml.classmate.MemberResolver; -import com.fasterxml.classmate.TypeResolver; +import com.fr.third.com.fasterxml.classmate.MemberResolver; +import com.fr.third.com.fasterxml.classmate.TypeResolver; /** * @author Steve Ebersole