Spring boot 4 support (#377)

* add spring boot 4.x server support and tests

* use JDK 21 in CI because of sb4 support

* bump spring 6.x version from 6.2.8 to 6.2.14, spring boot 3.x version from 3.5.3 to 3.5.8

* bump slf4j from 2.0.7 to 2.0.17, junit from 5.13.4 to 5.14.1, jacoco from 0.8.13 to 0.8.14

* bump swagger-parser from 2.1.35 to 2.1.36, snakeyaml-engine from 2.10 to 3.0.1, commonmark from 0.21.0 to 0.27.0

Author: davidmoten

.github/workflows/ci.yml

@@ -6,4 +6,4 @@ jobs:
   build:
     uses: davidmoten/workflows/.github/workflows/ci.yml@master
     with:
-        jdk-matrix: '["17","21"]'
+        jdk-matrix: '["21"]'

openapi-codegen-generator/pom.xml

@@ -66,19 +66,19 @@
         <dependency>
             <groupId>io.swagger.parser.v3</groupId>
             <artifactId>swagger-parser</artifactId>
-            <version>2.1.35</version>
+            <version>2.1.36</version>
         </dependency>
 
         <dependency>
             <groupId>org.snakeyaml</groupId>
             <artifactId>snakeyaml-engine</artifactId>
-            <version>2.10</version>
+            <version>3.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.commonmark</groupId>
             <artifactId>commonmark</artifactId>
-            <version>0.21.0</version>
+            <version>0.27.0</version>
         </dependency>
 
         <dependency>

openapi-codegen-maven-plugin-sb4-test/pom.xml

@@ -0,0 +1,20 @@
+package org.davidmoten.oa3.codegen.test;
+
+import java.util.List;
+
+import org.davidmoten.oa3.codegen.http.service.ApacheHttpClientHttpService;
+import org.davidmoten.oa3.codegen.http.service.DefaultHttpService;
+import org.davidmoten.oa3.codegen.http.service.HttpService;
+
+import com.github.davidmoten.guavamini.Lists;
+
+public final class Helper {
+
+    private Helper() {
+        // prevent instantiation
+    }
+    
+    public static List<HttpService> httpServices() {
+        return Lists.of(DefaultHttpService.INSTANCE, ApacheHttpClientHttpService.INSTANCE);
+    }
+}

openapi-codegen-maven-plugin-sb4-test/src/test/java/org/davidmoten/oa3/codegen/test/Helper.java

@@ -0,0 +1,17 @@
+package org.davidmoten.oa3.codegen.test;
+
+public class Structure {
+    
+    Thing a;
+    
+    Thing.More b;
+    
+    public static class Thing {
+        
+        public static class More {
+            
+        }
+        
+    }
+
+}

openapi-codegen-maven-plugin-sb4-test/src/test/java/org/davidmoten/oa3/codegen/test/Structure.java

@@ -0,0 +1,5 @@
+package org.davidmoten.oa3.codegen.test;
+
+public class Thing {
+
+}

openapi-codegen-maven-plugin-sb4-test/src/test/java/org/davidmoten/oa3/codegen/test/Thing.java

@@ -0,0 +1,15 @@
+package org.davidmoten.oa3.codegen.test.library;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+
+@EnableConfigurationProperties
+@SpringBootApplication
+public class LibraryApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(LibraryApplication.class, args);
+    }
+
+}

openapi-codegen-maven-plugin-sb4-test/src/test/java/org/davidmoten/oa3/codegen/test/library/LibraryApplication.java

@@ -0,0 +1,56 @@
+package org.davidmoten.oa3.codegen.test.library;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.davidmoten.oa3.codegen.http.BearerAuthenticator;
+import org.davidmoten.oa3.codegen.http.service.HttpService;
+import org.davidmoten.oa3.codegen.test.Helper;
+import org.davidmoten.oa3.codegen.test.library.client.Client;
+import org.davidmoten.oa3.codegen.test.library.schema.UsersPage;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.server.LocalServerPort;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+
+@SpringBootTest(classes = { LibraryApplication.class }, webEnvironment = WebEnvironment.RANDOM_PORT)
+@AutoConfigureWebTestClient
+public class LibraryServerTest {
+
+    @LocalServerPort
+    int serverPort;
+
+
+    @ParameterizedTest
+    @MethodSource("httpServices")
+    public void testClientServerAllOf(HttpService httpService) {
+        BearerAuthenticator authenticator = () -> "tokenthingy";
+        Client client = Client //
+                .basePath("http://localhost:" + serverPort) //
+                .interceptor(authenticator) //
+                .httpService(httpService) //
+                .build();
+        UsersPage page = client.getUsers(Optional.empty(), Optional.empty()).get();
+        assertEquals(20, page.users().value().size());
+        assertEquals("User19", page.users().value().get(18).firstName());
+    }
+    
+    static List<HttpService> httpServices() {
+        return Helper.httpServices();
+    }
+    
+    public static final class Thing {
+        
+        @JsonAutoDetect(fieldVisibility = Visibility.ANY, creatorVisibility = Visibility.ANY, setterVisibility = Visibility.ANY)
+        public static final class Visibility2 {
+        }
+    }
+
+}

openapi-codegen-maven-plugin-sb4-test/src/test/java/org/davidmoten/oa3/codegen/test/library/LibraryServerTest.java

@@ -0,0 +1,61 @@
+package org.davidmoten.oa3.codegen.test.library;
+
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.davidmoten.oa3.codegen.spring.runtime.ServiceException;
+import org.davidmoten.oa3.codegen.test.library.schema.Item;
+import org.davidmoten.oa3.codegen.test.library.schema.User;
+import org.davidmoten.oa3.codegen.test.library.schema.UserId;
+import org.davidmoten.oa3.codegen.test.library.schema.UserIdWrapped;
+import org.davidmoten.oa3.codegen.test.library.schema.UserWithId;
+import org.davidmoten.oa3.codegen.test.library.schema.UsersPage;
+import org.davidmoten.oa3.codegen.test.library.schema.UsersPage.Users;
+import org.davidmoten.oa3.codegen.test.library.service.Service;
+import org.springframework.stereotype.Component;
+
+@Component
+public class LibraryService implements Service {
+
+    @Override
+    public UsersPage getUsers(Optional<String> search, Optional<String> continuationToken) throws ServiceException {
+        Users users = new Users(IntStream.range(1, 21).mapToObj(i -> createUser(i)).collect(Collectors.toList()));
+        return new UsersPage(users, Optional.empty());
+    }
+
+    private UserWithId createUser(int i) {
+        return new UserWithId(User.builder() //
+                .firstName("User" + i) //
+                .lastName("Gomez") //
+                .email("user" + i + ".gomez@gmail.com") //
+                .build(), //
+                UserIdWrapped.userId(UserId.of(i + "")));
+    }
+
+    @Override
+    public void createUser(User requestBody) throws ServiceException {
+        Service.super.createUser(requestBody);
+    }
+
+    @Override
+    public User getUser(String id) throws ServiceException {
+        return Service.super.getUser(id);
+    }
+
+    @Override
+    public void updateUser(String id, User requestBody) throws ServiceException {
+        Service.super.updateUser(id, requestBody);
+    }
+
+    @Override
+    public void deleteUser(String id) throws ServiceException {
+        Service.super.deleteUser(id);
+    }
+
+    @Override
+    public Item getItem(String itemId) throws ServiceException {
+        return Service.super.getItem(itemId);
+    }
+
+}