diff --git a/buildSrc/src/main/java/org/springframework/boot/build/context/properties/CheckAdditionalSpringConfigurationMetadata.java b/buildSrc/src/main/java/org/springframework/boot/build/context/properties/CheckAdditionalSpringConfigurationMetadata.java index cc7bdfd87b2..aaccb7ff99d 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/context/properties/CheckAdditionalSpringConfigurationMetadata.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/context/properties/CheckAdditionalSpringConfigurationMetadata.java @@ -48,9 +48,12 @@ import org.gradle.api.tasks.TaskAction; */ public class CheckAdditionalSpringConfigurationMetadata extends SourceTask { + private final File projectDir; + private final RegularFileProperty reportLocation; public CheckAdditionalSpringConfigurationMetadata() { + this.projectDir = getProject().getProjectDir(); this.reportLocation = getProject().getObjects().fileProperty(); } @@ -82,7 +85,7 @@ public class CheckAdditionalSpringConfigurationMetadata extends SourceTask { ObjectMapper objectMapper = new ObjectMapper(); Report report = new Report(); for (File file : getSource().getFiles()) { - Analysis analysis = report.analysis(getProject().getProjectDir().toPath().relativize(file.toPath())); + Analysis analysis = report.analysis(this.projectDir.toPath().relativize(file.toPath())); Map json = objectMapper.readValue(file, Map.class); check("groups", json, analysis); check("properties", json, analysis); diff --git a/buildSrc/src/main/java/org/springframework/boot/build/context/properties/CheckSpringConfigurationMetadata.java b/buildSrc/src/main/java/org/springframework/boot/build/context/properties/CheckSpringConfigurationMetadata.java index 21d7dd5509b..c62d3418c12 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/context/properties/CheckSpringConfigurationMetadata.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/context/properties/CheckSpringConfigurationMetadata.java @@ -49,11 +49,14 @@ public class CheckSpringConfigurationMetadata extends DefaultTask { private List exclusions = new ArrayList<>(); + private final File projectDir; + private final RegularFileProperty reportLocation; private final RegularFileProperty metadataLocation; public CheckSpringConfigurationMetadata() { + this.projectDir = getProject().getProjectDir(); this.metadataLocation = getProject().getObjects().fileProperty(); this.reportLocation = getProject().getObjects().fileProperty(); } @@ -93,7 +96,7 @@ public class CheckSpringConfigurationMetadata extends DefaultTask { private Report createReport() throws IOException, JsonParseException, JsonMappingException { ObjectMapper objectMapper = new ObjectMapper(); File file = this.metadataLocation.get().getAsFile(); - Report report = new Report(getProject().getProjectDir().toPath().relativize(file.toPath())); + Report report = new Report(this.projectDir.toPath().relativize(file.toPath())); Map json = objectMapper.readValue(file, Map.class); List> properties = (List>) json.get("properties"); for (Map property : properties) {