From 1ea4eb147ad835769597309962dcceb72732b8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 3 Jul 2024 10:04:51 +0200 Subject: [PATCH] Polish --- .../aot/generate/GeneratedFiles.java | 8 ++++---- .../aot/generate/GeneratedFilesTests.java | 16 ++++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedFiles.java b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedFiles.java index d042567a45..f5e584dbf8 100644 --- a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedFiles.java +++ b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedFiles.java @@ -27,10 +27,10 @@ import org.springframework.util.StringUtils; import org.springframework.util.function.ThrowingConsumer; /** - * Interface that can be used to add {@link Kind#SOURCE source}, + * Repository of generated files. Can be used to add {@link Kind#SOURCE source}, * {@link Kind#RESOURCE resource}, or {@link Kind#CLASS class} files generated * during ahead-of-time processing. Source and resource files are written using - * UTF-8 encoding. + * {@code UTF-8} encoding. * * @author Phillip Webb * @author Brian Clozel @@ -236,8 +236,8 @@ public interface GeneratedFiles { } /** - * Provide access to a particular file and offer convenient method to save - * or override its content. + * Provide access to a particular file and offer convenient methods to retrieve, + * save, or override its content. * * @since 6.2 */ diff --git a/spring-core/src/test/java/org/springframework/aot/generate/GeneratedFilesTests.java b/spring-core/src/test/java/org/springframework/aot/generate/GeneratedFilesTests.java index 3546897350..5c45bca599 100644 --- a/spring-core/src/test/java/org/springframework/aot/generate/GeneratedFilesTests.java +++ b/spring-core/src/test/java/org/springframework/aot/generate/GeneratedFilesTests.java @@ -190,6 +190,7 @@ class GeneratedFilesTests { AtomicBoolean called = new AtomicBoolean(false); this.generatedFiles.handleFile(Kind.RESOURCE, "META-INF/test", handler -> { called.set(true); + assertThat(handler.getContent()).isNotNull(); String existing = readSource(handler.getContent()); handler.override(createSource(existing+"-override")); }); @@ -225,8 +226,10 @@ class GeneratedFilesTests { static class TestGeneratedFiles implements GeneratedFiles { + @Nullable private Kind kind; + @Nullable private String path; private TestFileHandler fileHandler = new TestFileHandler(); @@ -247,21 +250,22 @@ class GeneratedFilesTests { assertThat(this.kind).as("kind").isEqualTo(kind); assertThat(this.path).as("path").isEqualTo(path); assertThat(this.fileHandler.content).as("content").isNotNull(); - return new GeneratedFileAssert(this.fileHandler); + return new GeneratedFileAssert(this.fileHandler.content, this.fileHandler.override); } } private static class GeneratedFileAssert extends AbstractStringAssert { - private final TestFileHandler fileHandler; + @Nullable + private final Boolean override; - GeneratedFileAssert(TestFileHandler fileHandler) throws IOException { - super(readSource(fileHandler.content), GeneratedFileAssert.class); - this.fileHandler = fileHandler; + GeneratedFileAssert(InputStreamSource content, @Nullable Boolean override) throws IOException { + super(readSource(content), GeneratedFileAssert.class); + this.override = override; } public GeneratedFileAssert hasOverride(boolean expected) { - assertThat(this.fileHandler.override).isEqualTo(expected); + assertThat(this.override).isEqualTo(expected); return this.myself; } }