From 353666627fdd91f2820a8d54144b6f5e02ca3d53 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 13 Jul 2022 12:18:29 +0200 Subject: [PATCH] Polishing --- .../aot/generate/GeneratedClass.java | 3 +-- .../aot/generate/GeneratedClasses.java | 3 +-- .../aot/generate/GeneratedFiles.java | 6 +++--- .../aot/generate/GeneratedMethod.java | 8 ++++---- .../aot/generate/InMemoryGeneratedFiles.java | 9 +++------ .../aot/generate/MethodNameGenerator.java | 3 +-- .../aot/generate/MethodReference.java | 15 +++++++-------- .../aot/generate/GeneratedMethodTests.java | 6 +++--- 8 files changed, 23 insertions(+), 30 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedClass.java b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedClass.java index 12c34c76c9..2776dfc9fe 100644 --- a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedClass.java +++ b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedClass.java @@ -73,8 +73,7 @@ public final class GeneratedClass { TypeSpec.Builder typeSpecBuilder = TypeSpec.classBuilder(this.name); this.typeSpecCustomizer.accept(typeSpecBuilder); this.methods.doWithMethodSpecs(typeSpecBuilder::addMethod); - return JavaFile.builder(this.name.packageName(), typeSpecBuilder.build()) - .build(); + return JavaFile.builder(this.name.packageName(), typeSpecBuilder.build()).build(); } } diff --git a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedClasses.java b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedClasses.java index 7d86b7faf0..0b2b622b98 100644 --- a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedClasses.java +++ b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedClasses.java @@ -142,8 +142,7 @@ public class GeneratedClasses { * @param typeSpecCustomizer a customizer for the {@link TypeSpec.Builder} * @return a {@link GeneratedClass} instance */ - public GeneratedClass getOrGenerate(String id, - Consumer typeSpecCustomizer) { + public GeneratedClass getOrGenerate(String id, Consumer typeSpecCustomizer) { Assert.hasLength(id, "'id' must not be empty"); Assert.notNull(typeSpecCustomizer, "'typeSpecCustomizer' must not be null"); Owner owner = new Owner(id, GeneratedClasses.this.classNameGenerator 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 6065d5b991..c80171e035 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 @@ -24,7 +24,7 @@ import org.springframework.util.function.ThrowingConsumer; /** * Interface that can be used to add {@link Kind#SOURCE source}, - * {@link Kind#RESOURCE resource} or {@link Kind#CLASS class} files generated + * {@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. * @@ -191,14 +191,14 @@ public interface GeneratedFiles { SOURCE, /** - * A resource file that should be directly added to final application. + * A resource file that should be directly added to the final application. * For example, a {@code .properties} file. */ RESOURCE, /** * A class file containing bytecode. For example, the result of a proxy - * generated using cglib. + * generated using CGLIB. */ CLASS diff --git a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedMethod.java b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedMethod.java index 678280e72b..51e1e035a1 100644 --- a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedMethod.java +++ b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedMethod.java @@ -41,7 +41,7 @@ public final class GeneratedMethod { /** * Create a new {@link GeneratedMethod} instance with the given name. This - * constructor is package-private since names should only be generated via a + * constructor is package-private since names should only be generated via * {@link GeneratedMethods}. * @param name the generated name */ @@ -66,7 +66,7 @@ public final class GeneratedMethod { */ public MethodSpec getSpec() { Assert.state(this.spec != null, - () -> String.format("Method '%s' has no method spec defined", this.name)); + () -> "Method '%s' has no method spec defined".formatted(this.name)); return this.spec; } @@ -86,8 +86,8 @@ public final class GeneratedMethod { } private void assertNameHasNotBeenChanged(MethodSpec spec) { - Assert.isTrue(this.name.equals(spec.name), () -> String - .format("'spec' must use the generated name \"%s\"", this.name)); + Assert.isTrue(this.name.equals(spec.name), + () -> "'spec' must use the generated name '%s'".formatted(this.name)); } @Override diff --git a/spring-core/src/main/java/org/springframework/aot/generate/InMemoryGeneratedFiles.java b/spring-core/src/main/java/org/springframework/aot/generate/InMemoryGeneratedFiles.java index 8bca51ca3f..00f1fe2d7b 100644 --- a/spring-core/src/main/java/org/springframework/aot/generate/InMemoryGeneratedFiles.java +++ b/spring-core/src/main/java/org/springframework/aot/generate/InMemoryGeneratedFiles.java @@ -45,8 +45,7 @@ public class InMemoryGeneratedFiles implements GeneratedFiles { Assert.notNull(content, "'content' must not be null"); Map paths = this.files.computeIfAbsent(kind, key -> new LinkedHashMap<>()); - Assert.state(!paths.containsKey(path), - () -> "Path '" + path + "' already in use"); + Assert.state(!paths.containsKey(path), () -> "Path '" + path + "' already in use"); paths.put(path, content); } @@ -57,8 +56,7 @@ public class InMemoryGeneratedFiles implements GeneratedFiles { */ public Map getGeneratedFiles(Kind kind) { Assert.notNull(kind, "'kind' must not be null"); - return Collections - .unmodifiableMap(this.files.getOrDefault(kind, Collections.emptyMap())); + return Collections.unmodifiableMap(this.files.getOrDefault(kind, Collections.emptyMap())); } /** @@ -72,8 +70,7 @@ public class InMemoryGeneratedFiles implements GeneratedFiles { public String getGeneratedFileContent(Kind kind, String path) throws IOException { InputStreamSource source = getGeneratedFile(kind, path); if (source != null) { - return new String(source.getInputStream().readAllBytes(), - StandardCharsets.UTF_8); + return new String(source.getInputStream().readAllBytes(), StandardCharsets.UTF_8); } return null; } diff --git a/spring-core/src/main/java/org/springframework/aot/generate/MethodNameGenerator.java b/spring-core/src/main/java/org/springframework/aot/generate/MethodNameGenerator.java index 533813e260..a8b30724a0 100644 --- a/spring-core/src/main/java/org/springframework/aot/generate/MethodNameGenerator.java +++ b/spring-core/src/main/java/org/springframework/aot/generate/MethodNameGenerator.java @@ -95,8 +95,7 @@ public class MethodNameGenerator { public static String join(Object... parts) { Stream capitalizedPartNames = Arrays.stream(parts) .map(MethodNameGenerator::getPartName).map(StringUtils::capitalize); - return StringUtils - .uncapitalize(capitalizedPartNames.collect(Collectors.joining())); + return StringUtils.uncapitalize(capitalizedPartNames.collect(Collectors.joining())); } private static String getPartName(@Nullable Object part) { diff --git a/spring-core/src/main/java/org/springframework/aot/generate/MethodReference.java b/spring-core/src/main/java/org/springframework/aot/generate/MethodReference.java index 627ba67eec..a8ab373b16 100644 --- a/spring-core/src/main/java/org/springframework/aot/generate/MethodReference.java +++ b/spring-core/src/main/java/org/springframework/aot/generate/MethodReference.java @@ -144,15 +144,14 @@ public final class MethodReference { */ public CodeBlock toCodeBlock(@Nullable String instanceVariable) { return switch (this.kind) { - case INSTANCE -> toCodeBlockForInstance(instanceVariable); - case STATIC -> toCodeBlockForStatic(instanceVariable); + case INSTANCE -> toCodeBlockForInstance(instanceVariable); + case STATIC -> toCodeBlockForStatic(instanceVariable); }; } private CodeBlock toCodeBlockForInstance(@Nullable String instanceVariable) { instanceVariable = (instanceVariable != null) ? instanceVariable : "this"; return CodeBlock.of("$L::$L", instanceVariable, this.methodName); - } private CodeBlock toCodeBlockForStatic(@Nullable String instanceVariable) { @@ -180,8 +179,8 @@ public final class MethodReference { CodeBlock... arguments) { return switch (this.kind) { - case INSTANCE -> toInvokeCodeBlockForInstance(instanceVariable, arguments); - case STATIC -> toInvokeCodeBlockForStatic(instanceVariable, arguments); + case INSTANCE -> toInvokeCodeBlockForInstance(instanceVariable, arguments); + case STATIC -> toInvokeCodeBlockForStatic(instanceVariable, arguments); }; } @@ -225,9 +224,9 @@ public final class MethodReference { @Override public String toString() { return switch (this.kind) { - case INSTANCE -> ((this.declaringClass != null) ? "<" + this.declaringClass + ">" - : "") + "::" + this.methodName; - case STATIC -> this.declaringClass + "::" + this.methodName; + case INSTANCE -> ((this.declaringClass != null) ? "<" + this.declaringClass + ">" + : "") + "::" + this.methodName; + case STATIC -> this.declaringClass + "::" + this.methodName; }; } diff --git a/spring-core/src/test/java/org/springframework/aot/generate/GeneratedMethodTests.java b/spring-core/src/test/java/org/springframework/aot/generate/GeneratedMethodTests.java index 4d7c8f9eb1..44a1578aed 100644 --- a/spring-core/src/test/java/org/springframework/aot/generate/GeneratedMethodTests.java +++ b/spring-core/src/test/java/org/springframework/aot/generate/GeneratedMethodTests.java @@ -43,7 +43,7 @@ class GeneratedMethodTests { void getSpecReturnsSpec() { GeneratedMethod method = new GeneratedMethod(NAME); method.using(builder -> builder.addJavadoc("Test")); - assertThat(method.getSpec().javadoc.toString()).contains("Test"); + assertThat(method.getSpec().javadoc).asString().contains("Test"); } @Test @@ -57,7 +57,7 @@ class GeneratedMethodTests { void usingAddsSpec() { GeneratedMethod method = new GeneratedMethod(NAME); method.using(builder -> builder.addModifiers(Modifier.PUBLIC)); - assertThat(method.getSpec().toString()) + assertThat(method.getSpec()).asString() .isEqualToIgnoringNewLines("public void spring() {}"); } @@ -66,7 +66,7 @@ class GeneratedMethodTests { GeneratedMethod method = new GeneratedMethod(NAME); assertThatIllegalArgumentException() .isThrownBy(() -> method.using(builder -> builder.setName("badname"))) - .withMessage("'spec' must use the generated name \"spring\""); + .withMessage("'spec' must use the generated name 'spring'"); } }