From 7bae02be2d20a9a702087c4011626ac487e88e98 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 18 Oct 2022 17:42:00 +0100 Subject: [PATCH] Adapt to breaking changes to AotProcessor settings See gh-32696 --- .../boot/test/context/SpringBootTestAotProcessor.java | 4 ++-- .../springframework/boot/SpringApplicationAotProcessor.java | 4 ++-- .../boot/SpringApplicationAotProcessorTests.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestAotProcessor.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestAotProcessor.java index a1b3b86d2f..b7815cf680 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestAotProcessor.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestAotProcessor.java @@ -52,8 +52,8 @@ public class SpringBootTestAotProcessor extends TestAotProcessor { .formatted(TestAotProcessor.class.getName())); Set classpathRoots = Arrays.stream(args[0].split(File.pathSeparator)).map(Paths::get) .collect(Collectors.toSet()); - Settings settings = new Settings().setSourceOutput(Paths.get(args[1])).setResourceOutput(Paths.get(args[2])) - .setClassOutput(Paths.get(args[3])).setGroupId(args[4]).setArtifactId(args[5]); + Settings settings = Settings.builder().sourceOutput(Paths.get(args[1])).resourceOutput(Paths.get(args[2])) + .classOutput(Paths.get(args[3])).groupId(args[4]).artifactId(args[5]).build(); new SpringBootTestAotProcessor(classpathRoots, settings).process(); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationAotProcessor.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationAotProcessor.java index 3dfd574bd5..acbfb9f21e 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationAotProcessor.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationAotProcessor.java @@ -67,8 +67,8 @@ public class SpringApplicationAotProcessor extends ContextAotProcessor { Assert.isTrue(args.length >= requiredArgs, () -> "Usage: " + SpringApplicationAotProcessor.class.getName() + " "); Class application = Class.forName(args[0]); - Settings settings = new Settings().setSourceOutput(Paths.get(args[1])).setResourceOutput(Paths.get(args[2])) - .setClassOutput(Paths.get(args[3])).setGroupId(args[4]).setArtifactId(args[5]); + Settings settings = Settings.builder().sourceOutput(Paths.get(args[1])).resourceOutput(Paths.get(args[2])) + .classOutput(Paths.get(args[3])).groupId(args[4]).artifactId(args[5]).build(); String[] applicationArgs = (args.length > requiredArgs) ? Arrays.copyOfRange(args, requiredArgs, args.length) : new String[0]; new SpringApplicationAotProcessor(application, settings, applicationArgs).process(); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationAotProcessorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationAotProcessorTests.java index e98cc0b291..fecf53c637 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationAotProcessorTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationAotProcessorTests.java @@ -80,9 +80,9 @@ class SpringApplicationAotProcessorTests { } private Settings settings(Path directory) { - return new Settings().setSourceOutput(directory.resolve("source")) - .setResourceOutput(directory.resolve("resource")).setClassOutput(directory.resolve("class")) - .setGroupId("com.example").setArtifactId("example"); + return Settings.builder().sourceOutput(directory.resolve("source")) + .resourceOutput(directory.resolve("resource")).classOutput(directory.resolve("class")) + .groupId("com.example").artifactId("example").build(); }