Commit 7c29c96d authored by Phillip Webb's avatar Phillip Webb

Change additional metadata file lookup logic

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
parent 44d81d43
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment