Deprecate AnnotationContainer#add

Author: YangSiJun528

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfiguration.java

@@ -39,13 +39,13 @@ public class SourceCodeProjectGenerationConfiguration {
 	@Bean
 	public MainApplicationTypeCustomizer<TypeDeclaration> springBootApplicationAnnotator() {
 		return (typeDeclaration) -> typeDeclaration.annotations()
-			.add(ClassName.of("org.springframework.boot.autoconfigure.SpringBootApplication"));
+			.addSingle(ClassName.of("org.springframework.boot.autoconfigure.SpringBootApplication"));
 	}
 
 	@Bean
 	public TestApplicationTypeCustomizer<TypeDeclaration> junitJupiterSpringBootTestTypeCustomizer() {
 		return (typeDeclaration) -> typeDeclaration.annotations()
-			.add(ClassName.of("org.springframework.boot.test.context.SpringBootTest"));
+			.addSingle(ClassName.of("org.springframework.boot.test.context.SpringBootTest"));
 	}
 
 	/**

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationDefaultContributorsConfiguration.java

@@ -66,7 +66,7 @@ TestApplicationTypeCustomizer<GroovyTypeDeclaration> junitJupiterTestMethodContr
 			GroovyMethodDeclaration method = GroovyMethodDeclaration.method("contextLoads")
 				.returning("void")
 				.body(CodeBlock.of(""));
-			method.annotations().add(ClassName.of("org.junit.jupiter.api.Test"));
+			method.annotations().addSingle(ClassName.of("org.junit.jupiter.api.Test"));
 			typeDeclaration.addMethodDeclaration(method);
 		};
 	}
@@ -93,7 +93,7 @@ ServletInitializerCustomizer<GroovyTypeDeclaration> javaServletInitializerCustom
 					.parameters(
 							Parameter.of("application", "org.springframework.boot.builder.SpringApplicationBuilder"))
 					.body(CodeBlock.ofStatement("application.sources($L)", description.getApplicationName()));
-				configure.annotations().add(ClassName.of(Override.class));
+				configure.annotations().addSingle(ClassName.of(Override.class));
 				typeDeclaration.addMethodDeclaration(configure);
 			};
 		}

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationDefaultContributorsConfiguration.java

@@ -61,7 +61,7 @@ TestApplicationTypeCustomizer<JavaTypeDeclaration> junitJupiterTestMethodContrib
 			JavaMethodDeclaration method = JavaMethodDeclaration.method("contextLoads")
 				.returning("void")
 				.body(CodeBlock.of(""));
-			method.annotations().add(ClassName.of("org.junit.jupiter.api.Test"));
+			method.annotations().addSingle(ClassName.of("org.junit.jupiter.api.Test"));
 			typeDeclaration.addMethodDeclaration(method);
 		};
 	}
@@ -85,7 +85,7 @@ ServletInitializerCustomizer<JavaTypeDeclaration> javaServletInitializerCustomiz
 							Parameter.of("application", "org.springframework.boot.builder.SpringApplicationBuilder"))
 					.body(CodeBlock.ofStatement("return application.sources($L.class)",
 							description.getApplicationName()));
-				configure.annotations().add(ClassName.of(Override.class));
+				configure.annotations().addSingle(ClassName.of(Override.class));
 				typeDeclaration.addMethodDeclaration(configure);
 			};
 		}

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java

@@ -57,7 +57,7 @@ TestApplicationTypeCustomizer<KotlinTypeDeclaration> junitJupiterTestMethodContr
 		return (typeDeclaration) -> {
 			KotlinFunctionDeclaration function = KotlinFunctionDeclaration.function("contextLoads")
 				.body(CodeBlock.of(""));
-			function.annotations().add(ClassName.of("org.junit.jupiter.api.Test"));
+			function.annotations().addSingle(ClassName.of("org.junit.jupiter.api.Test"));
 			typeDeclaration.addFunctionDeclaration(function);
 		};
 	}

initializr-generator/src/main/java/io/spring/initializr/generator/language/Parameter.java

@@ -145,7 +145,10 @@ public Builder type(String type) {
 		 * Annotate the parameter with the specified annotation.
 		 * @param className the class of the annotation
 		 * @return this for method chaining
+		 * @deprecated in favor of {@link #singleAnnotate(ClassName)} and
+		 * {@link #repeatableAnnotate(ClassName)}
 		 */
+		@Deprecated(forRemoval = true)
 		public Builder annotate(ClassName className) {
 			return annotate(className, null);
 		}
@@ -156,12 +159,58 @@ public Builder annotate(ClassName className) {
 		 * @param className the class of the annotation
 		 * @param annotation a consumer of the builder
 		 * @return this for method chaining
+		 * @deprecated in favor of {@link #singleAnnotate(ClassName, Consumer)} and
+		 * {@link #singleAnnotate(ClassName)}
 		 */
+		@Deprecated(forRemoval = true)
+		@SuppressWarnings("removal")
 		public Builder annotate(ClassName className, Consumer<Annotation.Builder> annotation) {
 			this.annotations.add(className, annotation);
 			return this;
 		}
 
+		/**
+		 * Annotate the parameter with the specified single annotation.
+		 * @param className the class of the annotation
+		 * @return this for method chaining
+		 */
+		public Builder singleAnnotate(ClassName className) {
+			return singleAnnotate(className, null);
+		}
+
+		/**
+		 * Annotate the parameter with the specified single annotation, customized by the
+		 * specified consumer.
+		 * @param className the class of the annotation
+		 * @param annotation a consumer of the builder
+		 * @return this for method chaining
+		 */
+		public Builder singleAnnotate(ClassName className, Consumer<Annotation.Builder> annotation) {
+			this.annotations.addSingle(className, annotation);
+			return this;
+		}
+
+		/**
+		 * Annotate the parameter with the specified repeatable annotation.
+		 * @param className the class of the annotation
+		 * @return this for method chaining
+		 */
+		public Builder repeatableAnnotate(ClassName className) {
+			return repeatableAnnotate(className, null);
+		}
+
+		/**
+		 * Annotate the parameter with the specified repeatable annotation, customized by
+		 * the specified consumer.
+		 * @param className the class of the annotation
+		 * @param annotation a consumer of the builder
+		 * @return this for method chaining
+		 */
+		public Builder repeatableAnnotate(ClassName className, Consumer<Annotation.Builder> annotation) {
+			this.annotations.addRepeatable(className, annotation);
+			return this;
+		}
+
 		public Parameter build() {
 			return new Parameter(this);
 		}

initializr-generator/src/main/java/io/spring/initializr/generator/language/kotlin/KotlinPropertyDeclaration.java

@@ -281,7 +281,7 @@ public AccessorBuilder<?> withAnnotation(ClassName className) {
 		 * @return this for method chaining
 		 */
 		public AccessorBuilder<?> withAnnotation(ClassName className, Consumer<Annotation.Builder> annotation) {
-			this.annotations.add(className, annotation);
+			this.annotations.addSingle(className, annotation);
 			return this;
 		}