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

Avoid extra existence check in SimpleMetadataReaderFactory 

Issue: SPR-16281
This commit is contained in:
Juergen Hoeller 2018-01-07 23:18:52 +01:00
parent 1a154c3e4c
commit 7ad69bfc20
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,6 +16,7 @@
package org.springframework.core.type.classreading; package org.springframework.core.type.classreading;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.DefaultResourceLoader;
@ -73,10 +74,13 @@ public class SimpleMetadataReaderFactory implements MetadataReaderFactory {
@Override @Override
public MetadataReader getMetadataReader(String className) throws IOException { public MetadataReader getMetadataReader(String className) throws IOException {
try {
String resourcePath = ResourceLoader.CLASSPATH_URL_PREFIX + String resourcePath = ResourceLoader.CLASSPATH_URL_PREFIX +
ClassUtils.convertClassNameToResourcePath(className) + ClassUtils.CLASS_FILE_SUFFIX; ClassUtils.convertClassNameToResourcePath(className) + ClassUtils.CLASS_FILE_SUFFIX;
Resource resource = this.resourceLoader.getResource(resourcePath); Resource resource = this.resourceLoader.getResource(resourcePath);
if (!resource.exists()) { return getMetadataReader(resource);
}
catch (FileNotFoundException ex) {
// Maybe an inner class name using the dot name syntax? Need to use the dollar syntax here... // Maybe an inner class name using the dot name syntax? Need to use the dollar syntax here...
// ClassUtils.forName has an equivalent check for resolution into Class references later on. // ClassUtils.forName has an equivalent check for resolution into Class references later on.
int lastDotIndex = className.lastIndexOf('.'); int lastDotIndex = className.lastIndexOf('.');
@ -87,11 +91,11 @@ public class SimpleMetadataReaderFactory implements MetadataReaderFactory {
ClassUtils.convertClassNameToResourcePath(innerClassName) + ClassUtils.CLASS_FILE_SUFFIX; ClassUtils.convertClassNameToResourcePath(innerClassName) + ClassUtils.CLASS_FILE_SUFFIX;
Resource innerClassResource = this.resourceLoader.getResource(innerClassResourcePath); Resource innerClassResource = this.resourceLoader.getResource(innerClassResourcePath);
if (innerClassResource.exists()) { if (innerClassResource.exists()) {
resource = innerClassResource; return getMetadataReader(innerClassResource);
} }
} }
throw ex;
} }
return getMetadataReader(resource);
} }
@Override @Override