add Java 21 and Spring Boot 3.4.2 to Spring Generator

Author: frantuma

src/main/java/io/swagger/codegen/v3/generators/html/StaticHtmlCodegen.java

@@ -183,8 +183,10 @@ public String toModelName(final String name) {
     public void preprocessOpenAPI(OpenAPI openAPI) {
         super.preprocessOpenAPI(openAPI);
         Info info = openAPI.getInfo();
-        info.setDescription(toHtml(info.getDescription()));
-        info.setTitle(toHtml(info.getTitle()));
+        if (info != null) {
+            info.setDescription(toHtml(info.getDescription()));
+            info.setTitle(toHtml(info.getTitle()));
+        }
         if (openAPI.getComponents() == null || openAPI.getComponents().getSchemas() == null) {
             return;
         }

src/main/java/io/swagger/codegen/v3/generators/java/SpringCodegen.java

@@ -65,6 +65,8 @@ public class SpringCodegen extends AbstractJavaCodegen implements BeanValidation
     public static final String TARGET_OPENFEIGN = "generateForOpenFeign";
     public static final String DEFAULT_INTERFACES = "defaultInterfaces";
     public static final String SPRING_BOOT_VERSION = "springBootVersion";
+    public static final String SPRING_BOOT3_VERSION = "springBoot3Version";
+    public static final String SPRING_BOOT3_JAVA_VERSION = "springBoot3JavaVersion";
     public static final String SPRING_BOOT_VERSION_2 = "springBootV2";
     public static final String DATE_PATTERN = "datePattern";
     public static final String DATE_TIME_PATTERN = "dateTimePattern";
@@ -95,6 +97,8 @@ public class SpringCodegen extends AbstractJavaCodegen implements BeanValidation
     protected boolean openFeign = false;
     protected boolean defaultInterfaces = true;
     protected String springBootVersion = "2.1.16.RELEASE";
+    protected String springBoot3Version = "3.4.2";
+    protected String springBoot3JavaVersion = "21";
     protected boolean throwsException = false;
     private boolean notNullJacksonAnnotation = false;
     protected String validationMode = "strict";
@@ -152,6 +156,20 @@ public SpringCodegen() {
         springBootVersionOption.setEnum(springBootEnum);
         cliOptions.add(springBootVersionOption);
 
+        CliOption springBoot3VersionOption = new CliOption(SPRING_BOOT3_VERSION, "Spring boot 3 version");
+        Map<String, String> springBoot3Enum = new HashMap<>();
+        springBoot3Enum.put("3.3.4", "3.3.4");
+        springBoot3Enum.put("3.4.2", "3.4.2");
+        springBoot3VersionOption.setEnum(springBoot3Enum);
+        cliOptions.add(springBoot3VersionOption);
+
+        CliOption springBoot3JavaVersionOption = new CliOption(SPRING_BOOT3_JAVA_VERSION, "Spring boot 3 Java version");
+        Map<String, String> springBoot3JavaEnum = new HashMap<>();
+        springBoot3JavaEnum.put("17", "17");
+        springBoot3JavaEnum.put("21", "21");
+        springBoot3JavaVersionOption.setEnum(springBoot3JavaEnum);
+        cliOptions.add(springBoot3JavaVersionOption);
+
         CliOption validationMode = new CliOption(VALIDATION_MODE_OPTION, "Validation mode to apply");
         validationMode.setDefault(VALIDATION_MODE_STRICT);
         Map<String, String> validationModeOptions = new HashMap<String, String>();
@@ -318,6 +336,16 @@ public void processOpts() {
             this.setOpenFeign(true);
         }
 
+        if (additionalProperties.containsKey(SPRING_BOOT3_VERSION)) {
+            this.springBoot3Version = additionalProperties.get(SPRING_BOOT3_VERSION).toString();
+        }
+        additionalProperties.put(SPRING_BOOT3_VERSION, this.springBoot3Version);
+
+        if (additionalProperties.containsKey(SPRING_BOOT3_JAVA_VERSION)) {
+            this.springBoot3JavaVersion = additionalProperties.get(SPRING_BOOT3_JAVA_VERSION).toString();
+        }
+        additionalProperties.put(SPRING_BOOT3_JAVA_VERSION, this.springBoot3JavaVersion);
+
         if (useBeanValidation) {
             writePropertyBack(USE_BEANVALIDATION, useBeanValidation);
             if (VALIDATION_MODE_LOOSE.equals(validationMode) || VALIDATION_MODE_STRICT.equals(validationMode)) {

src/main/resources/handlebars/JavaSpring/libraries/spring-boot3/openAPISpringBoot.mustache

@@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.format.FormatterRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 {{#useBeanValidation}}
 {{#isStrictValidation}}
 import org.openapitools.jackson.nullable.JsonNullableModule;
@@ -55,7 +55,7 @@ public class OpenAPISpringBoot implements CommandLineRunner {
 {{/useBeanValidation}}
 
     @Configuration
-    static class CustomDateConfig extends WebMvcConfigurationSupport {
+    static class CustomDateConfig implements WebMvcConfigurer {
         @Override
         public void addFormatters(FormatterRegistry registry) {
             registry.addConverter(new LocalDateConverter("{{#datePattern}}{{datePattern}}{{/datePattern}}{{^datePattern}}yyyy-MM-dd{{/datePattern}}"));

src/main/resources/handlebars/JavaSpring/libraries/spring-boot3/pom.mustache

@@ -7,15 +7,15 @@
     <version>{{artifactVersion}}</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.release>17</maven.compiler.release>
-        <springboot-version>3.3.4</springboot-version>
+        <maven.compiler.release>{{springBoot3JavaVersion}}</maven.compiler.release>
+        <springboot-version>{{springBoot3Version}}</springboot-version>
         <swagger-annotations-version>2.2.25</swagger-annotations-version>
-        <springdoc-version>1.7.0</springdoc-version>
+        <springdoc-version>2.8.3</springdoc-version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.4</version>
+        <version>{{springBoot3Version}}</version>
     </parent>
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
@@ -96,7 +96,7 @@
         <!-- SpringDoc dependencies -->
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>${springdoc-version}</version>
         </dependency>