From c20efba45c731a90d6bf203f554fb919147b61d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Tue, 7 Mar 2023 11:20:37 +0100 Subject: [PATCH] End javadoc generated AOT with a period consistently Closes gh-29357 --- .../beans/factory/aot/BeanDefinitionMethodGenerator.java | 6 +++--- .../context/annotation/ConfigurationClassPostProcessor.java | 2 +- .../jpa/support/PersistenceAnnotationBeanPostProcessor.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGenerator.java index 89245691cd..8cc4a430b2 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGenerator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGenerator.java @@ -138,7 +138,7 @@ class BeanDefinitionMethodGenerator { ClassName topLevelClassName = target.topLevelClassName(); GeneratedClass generatedClass = generationContext.getGeneratedClasses() .getOrAddForFeatureComponent("BeanDefinitions", topLevelClassName, type -> { - type.addJavadoc("Bean definitions for {@link $T}", topLevelClassName); + type.addJavadoc("Bean definitions for {@link $T}.", topLevelClassName); type.addModifiers(Modifier.PUBLIC); }); @@ -159,7 +159,7 @@ class BeanDefinitionMethodGenerator { private static GeneratedClass createInnerClass(GeneratedClass generatedClass, String name, ClassName target) { return generatedClass.getOrAdd(name, type -> { - type.addJavadoc("Bean definitions for {@link $T}", target); + type.addJavadoc("Bean definitions for {@link $T}.", target); type.addModifiers(Modifier.PUBLIC, Modifier.STATIC); }); } @@ -186,7 +186,7 @@ class BeanDefinitionMethodGenerator { this.aotContributions.forEach(aotContribution -> aotContribution.applyTo(generationContext, codeGenerator)); return generatedMethods.add("getBeanDefinition", method -> { - method.addJavadoc("Get the $L definition for '$L'", + method.addJavadoc("Get the $L definition for '$L'.", (!this.registeredBean.isInnerBean()) ? "bean" : "inner-bean", getName()); method.addModifiers(modifier, Modifier.STATIC); diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java index 0a1f3667b0..3974df9681 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java @@ -594,7 +594,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo } private void generateAddPostProcessorMethod(MethodSpec.Builder method, Map mappings) { - method.addJavadoc("Add ImportAwareBeanPostProcessor to support ImportAware beans"); + method.addJavadoc("Add ImportAwareBeanPostProcessor to support ImportAware beans."); method.addModifiers(Modifier.PRIVATE); method.addParameter(DefaultListableBeanFactory.class, BEAN_FACTORY_VARIABLE); method.addCode(generateAddPostProcessorCode(mappings)); diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java index c0058ff74d..1c74800e9b 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java @@ -830,7 +830,7 @@ public class PersistenceAnnotationBeanPostProcessor implements InstantiationAwar private void generateGetEntityManagerMethod(MethodSpec.Builder method, PersistenceElement injectedElement) { String unitName = injectedElement.unitName; Properties properties = injectedElement.properties; - method.addJavadoc("Get the '$L' {@link $T}", + method.addJavadoc("Get the '$L' {@link $T}.", (StringUtils.hasLength(unitName)) ? unitName : "default", EntityManager.class); method.addModifiers(javax.lang.model.element.Modifier.PUBLIC,