root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unused MethodMetadata#getMethodReturnType 

Introduced to support checking return types on @Bean methods but never
actually used.  May be reintroduced as necessary in the future.
This commit is contained in:
Chris Beams 2011-05-06 18:59:26 +00:00
parent 4b5208faad
commit 6d84f06d8c
4 changed files with 3 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.core/src/main/java/org/springframework/core/type/MethodMetadata.java
View File

@ -36,11 +36,6 @@ public interface MethodMetadata {
*/ */
String getMethodName(); String getMethodName();
/**
* Return the fully-qualified name of the return type of the method.
*/
String getMethodReturnType();
/** /**
* Return the fully-qualified name of the class that declares this method. * Return the fully-qualified name of the class that declares this method.
*/ */

6
org.springframework.core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java
View File

@ -58,11 +58,7 @@ public class StandardMethodMetadata implements MethodMetadata {
public String getMethodName() { public String getMethodName() {
return this.introspectedMethod.getName(); return this.introspectedMethod.getName();
} }
public String getMethodReturnType() {
return this.introspectedMethod.getReturnType().getName();
}
public String getDeclaringClassName() { public String getDeclaringClassName() {
return this.introspectedMethod.getDeclaringClass().getName(); return this.introspectedMethod.getDeclaringClass().getName();
} }

45
org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
View File

@ -62,7 +62,7 @@ final class AnnotationMetadataReadingVisitor extends ClassMetadataReadingVisitor
@Override @Override
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
return new MethodMetadataReadingVisitor(name, getReturnTypeFromAsmMethodDescriptor(desc), access, this.getClassName(), this.classLoader, this.methodMetadataMap); return new MethodMetadataReadingVisitor(name, access, this.getClassName(), this.classLoader, this.methodMetadataMap);
} }
@Override @Override
@ -160,47 +160,4 @@ final class AnnotationMetadataReadingVisitor extends ClassMetadataReadingVisitor
annotatedMethods.addAll(list); annotatedMethods.addAll(list);
return annotatedMethods; return annotatedMethods;
} }
/**
* Convert a type descriptor to a classname suitable for classloading with
* Class.forName().
*
* @param typeDescriptor see ASM guide section 2.1.3
*/
private static String convertAsmTypeDescriptorToClassName(String typeDescriptor) {
final String internalName; // See ASM guide section 2.1.2
if ("V".equals(typeDescriptor))
return Void.class.getName();
if ("I".equals(typeDescriptor))
return Integer.class.getName();
if ("Z".equals(typeDescriptor))
return Boolean.class.getName();
// strip the leading array/object/primitive identifier
if (typeDescriptor.startsWith("[["))
internalName = typeDescriptor.substring(3);
else if (typeDescriptor.startsWith("["))
internalName = typeDescriptor.substring(2);
else
internalName = typeDescriptor.substring(1);
// convert slashes to dots
String className = internalName.replace('/', '.');
// and strip trailing semicolon (if present)
if (className.endsWith(";"))
className = className.substring(0, internalName.length() - 1);
return className;
}
/**
* @param methodDescriptor see ASM guide section 2.1.4
*/
private static String getReturnTypeFromAsmMethodDescriptor(String methodDescriptor) {
String returnTypeDescriptor = methodDescriptor.substring(methodDescriptor.indexOf(')') + 1);
return convertAsmTypeDescriptorToClassName(returnTypeDescriptor);
}
} }

9
org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
View File

@ -43,8 +43,6 @@ final class MethodMetadataReadingVisitor extends MethodAdapter implements Method
private final int access; private final int access;
private String returnType;
private String declaringClassName; private String declaringClassName;
private final ClassLoader classLoader; private final ClassLoader classLoader;
@ -53,11 +51,10 @@ final class MethodMetadataReadingVisitor extends MethodAdapter implements Method
private final Map<String, Map<String, Object>> attributeMap = new LinkedHashMap<String, Map<String, Object>>(2); private final Map<String, Map<String, Object>> attributeMap = new LinkedHashMap<String, Map<String, Object>>(2);
public MethodMetadataReadingVisitor(String name, String returnType, int access, String declaringClassName, ClassLoader classLoader, public MethodMetadataReadingVisitor(String name, int access, String declaringClassName, ClassLoader classLoader,
MultiValueMap<String, MethodMetadata> methodMetadataMap) { MultiValueMap<String, MethodMetadata> methodMetadataMap) {
super(new EmptyVisitor()); super(new EmptyVisitor());
this.name = name; this.name = name;
this.returnType = returnType;
this.access = access; this.access = access;
this.declaringClassName = declaringClassName; this.declaringClassName = declaringClassName;
this.classLoader = classLoader; this.classLoader = classLoader;
@ -75,10 +72,6 @@ final class MethodMetadataReadingVisitor extends MethodAdapter implements Method
return this.name; return this.name;
} }
public String getMethodReturnType() {
return this.returnType;
}
public boolean isStatic() { public boolean isStatic() {
return ((this.access & Opcodes.ACC_STATIC) != 0); return ((this.access & Opcodes.ACC_STATIC) != 0);
} }