switch to spring boot 3

Author: slamdev

build.gradle

@@ -27,7 +27,7 @@ subprojects {
 
     plugins.withId('pmd') {
         pmd {
-            toolVersion = '6.29.0'
+            toolVersion = '6.50.0'
             ignoreFailures = false
             consoleOutput = false
         }
@@ -47,7 +47,7 @@ subprojects {
 
     plugins.withId('checkstyle') {
         checkstyle {
-            toolVersion = '8.37'
+            toolVersion = '10.3.4'
             ignoreFailures = false
             showViolations = false
         }
@@ -62,14 +62,14 @@ subprojects {
             exclude '**/stream/**'
         }
         dependencies {
-            checkstyle 'com.thomasjensen.checkstyle.addons:checkstyle-addons:6.0.1'
-            checkstyle 'com.github.sevntu-checkstyle:sevntu-checks:1.38.0'
+            checkstyle 'com.thomasjensen.checkstyle.addons:checkstyle-addons:7.0.1'
+            checkstyle 'com.github.sevntu-checkstyle:sevntu-checks:1.43.0'
         }
     }
 
     plugins.withId('com.github.spotbugs') {
         spotbugs {
-            toolVersion = '4.1.4'
+            toolVersion = '4.7.2'
             ignoreFailures = false
             effort = 'max'
             reportLevel = 'low'

cli/build.gradle

@@ -3,13 +3,13 @@ plugins {
     id 'maven-publish'
     id 'pmd'
     id 'checkstyle'
-    id 'com.github.spotbugs' version '4.6.0'
-    id 'com.github.johnrengelman.shadow' version '7.1.0'
+    id 'com.github.spotbugs' version '5.0.13'
+    id 'com.github.johnrengelman.shadow' version '7.1.2'
 }
 
 dependencies {
-    implementation 'org.slf4j:slf4j-simple:1.7.32'
-    implementation 'info.picocli:picocli:4.6.1'
+    implementation 'org.slf4j:slf4j-simple:1.7.36'
+    implementation 'info.picocli:picocli:4.7.0'
     implementation project(':lib')
 }
 

gradle/lint/pmd/ruleSetMain.xml

@@ -49,6 +49,7 @@
         <exclude name="UseObjectForClearerAPI"/>
         <exclude name="NPathComplexity"/>
         <exclude name="GodClass"/>
+        <exclude name="CognitiveComplexity"/>
     </rule>
     <rule ref="category/java/documentation.xml">
         <exclude name="CommentRequired"/>

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

lib/build.gradle

@@ -2,21 +2,18 @@ plugins {
     id 'java-library'
     id 'pmd'
     id 'checkstyle'
-    id 'com.github.spotbugs' version '4.6.0'
+    id 'com.github.spotbugs' version '5.0.13'
 }
 
 dependencies {
     implementation 'com.google.guava:guava:31.0.1-jre'
-    // override to support https://github.com/jknack/handlebars.java/pull/893/files
-    runtimeOnly 'com.github.jknack:handlebars:4.3.0'
-    // TODO upgrade to support inheritance
-    api('io.swagger.codegen.v3:swagger-codegen-generators:1.0.30') {
+    api('io.swagger.codegen.v3:swagger-codegen-generators:1.0.36') {
         exclude group: 'io.swagger', module: 'swagger-codegen'
         exclude module: 'guava'
         exclude module: 'logback-classic'
         exclude module: 'logback-core'
     }
-    api('org.openapitools:openapi-generator:5.3.0') {
+    api('org.openapitools:openapi-generator:6.2.1') {
         exclude module: 'guava'
         exclude module: 'slf4j-simple'
     }
@@ -25,5 +22,5 @@ dependencies {
         exclude module: 'guava'
     }
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.slf4j:slf4j-simple:1.7.32'
+    testImplementation 'org.slf4j:slf4j-simple:1.7.36'
 }

lib/src/main/java/com/github/slamdev/openapispringgenerator/lib/generator/FormattedTemplateEngine.java

@@ -19,7 +19,7 @@ public FormattedTemplateEngine(CodegenConfig config) {
     @Override
     public String getRendered(String templateFile, Map<String, Object> templateData) throws IOException {
         String content = super.getRendered(templateFile, templateData);
-        if (templateFile.endsWith("spring.factories.mustache")) {
+        if (templateFile.endsWith("AutoConfiguration.imports.mustache")) {
             return content;
         }
         try {

lib/src/main/java/com/github/slamdev/openapispringgenerator/lib/generator/SpringCodegen.java

@@ -45,7 +45,7 @@ public void processOpts() {
         super.processOpts();
         apiTemplateFiles.put("api.mustache", ".java");
         if (Arrays.asList("client", "producer").contains(getLibrary())) {
-            supportingFiles.add(new SupportingFile("spring.factories.mustache", "META-INF", "spring.factories"));
+            supportingFiles.add(new SupportingFile("org.springframework.boot.autoconfigure.AutoConfiguration.imports.mustache", "META-INF/spring", "org.springframework.boot.autoconfigure.AutoConfiguration.imports"));
         }
         modelTemplateFiles.put("model.mustache", ".java");
         modelDocTemplateFiles.remove("model_doc.mustache");
@@ -151,6 +151,9 @@ protected void postProcessAllCodegenModels(Map<String, CodegenModel> allModels)
     @Override
     public void preprocessOpenAPI(OpenAPI openAPI) {
         super.preprocessOpenAPI(openAPI);
+        if (openAPI.getPaths().isEmpty()) {
+            supportingFiles.removeIf(f -> "org.springframework.boot.autoconfigure.AutoConfiguration.imports.mustache".equals(f.templateFile));
+        }
         if (!isStream()) {
             return;
         }

lib/src/main/resources/handlebars/springcodegen/libraries/client/org.springframework.boot.autoconfigure.AutoConfiguration.imports.mustache

@@ -0,0 +1 @@
+{{#apiInfo.apis.0}}{{#apiInfo.apis}}{{package}}.{{classname}}{{#hasMore}}\n{{/hasMore}}{{/apiInfo.apis}}{{/apiInfo.apis.0}}

lib/src/main/resources/handlebars/springcodegen/libraries/client/spring.factories.mustache

@@ -0,0 +1 @@
+{{#apiInfo.apis.0}}{{#apiInfo.apis}}{{package}}.{{classname}}{{#hasMore}}\n{{/hasMore}}{{/apiInfo.apis}}{{/apiInfo.apis.0}}