upgrade to spring boot 3

Author: slamdev

lib/src/main/resources/handlebars/springcodegen/libraries/producer/api.mustache

@@ -9,11 +9,11 @@ import org.springframework.kafka.support.KafkaHeaders;
 import org.springframework.kafka.support.SendResult;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.support.MessageBuilder;
-import org.springframework.util.concurrent.ListenableFuture;
 
 import java.time.Duration;
 import java.util.Collections;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -35,10 +35,10 @@ public class {{classname}} {
                 .withPayload(event)
                 .copyHeaders(headers)
                 .setHeaderIfAbsent(KafkaHeaders.TOPIC, topic)
-                .setHeaderIfAbsent(KafkaHeaders.MESSAGE_KEY, key)
+                .setHeaderIfAbsent(KafkaHeaders.KEY, key)
                 .build();
         log.debug("sending message to '{}' topic: '{}'", topic, message);
-        ListenableFuture<SendResult<String, Object>> future = kafkaOperations.send(message);
+        CompletableFuture<SendResult<String, Object>> future = kafkaOperations.send(message);
         try {
             SendResult<String, Object> result = future.get(timeout.getSeconds(), TimeUnit.SECONDS);
             log.trace("event is sent to {} topic with result: {}", topic, result);

plugin/src/main/java/com/github/slamdev/openapispringgenerator/plugin/OpenApiTask.java

@@ -15,11 +15,8 @@
 import org.openapitools.codegen.validation.Invalid;
 
 import javax.inject.Inject;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
@@ -162,7 +159,7 @@ public void run() throws IOException {
 
                 FileTree resourcesTree = (FileTree) getProject().fileTree(tempDir).exclude("**/*.java");
                 move(resourcesTree, "resources", (src, dest) -> {
-                    if (!"spring.factories".equals(src.getFileName().toString())) {
+                    if (!"org.springframework.boot.autoconfigure.AutoConfiguration.imports".equals(src.getFileName().toString())) {
                         throw new IllegalStateException("" + dest + " already exists");
                     }
                     mergeSpringFactories(src, dest);
@@ -202,25 +199,9 @@ private void clearDir(Path dir) throws IOException {
     }
 
     private void mergeSpringFactories(Path src, Path dest) {
-        try (BufferedReader srcReader = Files.newBufferedReader(src); BufferedReader destReader = Files.newBufferedReader(dest)) {
-            Properties srcProps = new Properties();
-            srcProps.load(srcReader);
-
-            Properties destProps = new Properties();
-            destProps.load(destReader);
-
-            for (String key : srcProps.stringPropertyNames()) {
-                if (destProps.containsKey(key)) {
-                    String merged = destProps.getProperty(key) + "," + srcProps.getProperty(key);
-                    destProps.put(key, merged);
-                } else {
-                    destProps.put(key, srcProps.getProperty(key));
-                }
-            }
-
-            try (BufferedWriter writer = Files.newBufferedWriter(dest, StandardCharsets.UTF_8, StandardOpenOption.TRUNCATE_EXISTING)) {
-                destProps.store(writer, null);
-            }
+        try {
+            byte[] srcContent = Files.readAllBytes(src);
+            Files.write(dest, srcContent, StandardOpenOption.APPEND);
             Files.delete(src);
         } catch (IOException e) {
             throw new IllegalStateException(e);

settings.gradle

@@ -1,3 +1,3 @@
 rootProject.name = 'openapi-spring-generator'
 
-include 'plugin', 'cli', 'lib'//, 'showcase:client', 'showcase:server'
+include 'plugin', 'cli', 'lib', 'showcase:client', 'showcase:server'

showcase/client/build.gradle

@@ -1,16 +1,16 @@
 buildscript {
     dependencies {
-        classpath project(':plugin')
+        classpath files('../../plugin/build/libs/plugin.jar')
     }
 }
 
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.3.5.RELEASE'
-    id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+    id 'org.springframework.boot' version '3.0.0'
+    id 'io.spring.dependency-management' version '1.1.0'
     id 'pmd'
     id 'checkstyle'
-    id 'com.github.spotbugs' version '4.6.0'
+    id 'com.github.spotbugs' version '5.0.13'
 }
 
 apply plugin: 'com.github.slamdev.openapi-spring-generator'

showcase/server/build.gradle

@@ -1,16 +1,16 @@
 buildscript {
     dependencies {
-        classpath project(':plugin')
+        classpath files('../../plugin/build/libs/plugin.jar')
     }
 }
 
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.3.5.RELEASE'
-    id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+    id 'org.springframework.boot' version '3.0.0'
+    id 'io.spring.dependency-management' version '1.1.0'
     id 'pmd'
     id 'checkstyle'
-    id 'com.github.spotbugs' version '4.6.0'
+    id 'com.github.spotbugs' version '5.0.13'
 }
 
 apply plugin: 'com.github.slamdev.openapi-spring-generator'