Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change additional metadata file lookup logic

Browse Source 
Update ConfigurationMetadataAnnotationProcessor to find the additional
metadata json file using createResource rather than getResource. Prior
to this commit the file could be skipped when multiple files were
contained on the classpath.

Fixes gh-2271
This commit is contained in:
Phillip Webb
2015-01-06 14:50:56 -08:00
parent 44d81d43f6
commit 7c29c96da6
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
View File

@@ -343,14 +343,10 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
private ConfigurationMetadata mergeManualMetadata(ConfigurationMetadata metadata) {
try {
FileObject manualMetadata = this.processingEnv.getFiler().getResource(
StandardLocation.CLASS_PATH, "",
FileObject manualMetadata = this.processingEnv.getFiler().createResource(
StandardLocation.CLASS_OUTPUT, "",
"META-INF/additional-spring-configuration-metadata.json");
if (!"file".equals(manualMetadata.toUri().getScheme())) {
// We only want local files, not any classpath jars
return metadata;
}
InputStream inputStream = manualMetadata.openInputStream();
InputStream inputStream = manualMetadata.toUri().toURL().openStream();
try {
ConfigurationMetadata merged = new ConfigurationMetadata(metadata);
try {