Regenerate

Author: jpfinne

bin/configs/spring-boot-4-jspecify.yaml

@@ -1,11 +1,13 @@
 generatorName: spring
+library: spring-boot
 outputDir: samples/openapi3/server/petstore/springboot-4-jspecify
 inputSpec: modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 validateSpec: false
 additionalProperties:
   groupId: org.openapitools.openapi3
   documentationProvider: springdoc
+  interfaceOnly: true
   artifactId: springboot
   snapshotVersion: "true"
   useSpringBoot4: true

docs/generators/java-inflector.md

@@ -99,7 +99,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useGzipFeature|Send gzip-encoded requests| |false|
 |useJackson3|Use Jackson 3 instead of Jackson 2. Supported for 'native' library (requires Java 17+) and for Spring 'resttemplate', 'webclient', and 'restclient' libraries (require useSpringBoot4=true). Incompatible with 'openApiNullable'.| |false|
 |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
-|useJspecify|Use Jspecify for null checks. Ony supported for [native, webclient, restclient, resttemplate]| |false|
+|useJspecify|Use Jspecify for null checks. Ony supported for [native, restclient, resttemplate, webclient]| |false|
 |useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped. Only jersey2, jersey3, native, okhttp-gson support this option.| |false|
 |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|
 |usePlayWS|Use Play! Async HTTP client (Play WS API)| |false|

docs/generators/java-microprofile.md

@@ -99,7 +99,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useGzipFeature|Send gzip-encoded requests| |false|
 |useJackson3|Use Jackson 3 instead of Jackson 2. Supported for 'native' library (requires Java 17+) and for Spring 'resttemplate', 'webclient', and 'restclient' libraries (require useSpringBoot4=true). Incompatible with 'openApiNullable'.| |false|
 |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
-|useJspecify|Use Jspecify for null checks. Ony supported for [native, webclient, restclient, resttemplate]| |false|
+|useJspecify|Use Jspecify for null checks. Ony supported for [native, restclient, resttemplate, webclient]| |false|
 |useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped. Only jersey2, jersey3, native, okhttp-gson support this option.| |false|
 |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|
 |usePlayWS|Use Play! Async HTTP client (Play WS API)| |false|

docs/generators/java.md

@@ -176,7 +176,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
 
     @Setter protected int maxAttemptsForRetry = 1;
     @Setter protected long waitTimeMillis = 10l;
-    private final Set<String> JSPECIFY_SUPPORTED_LIBRARIES = Set.of(RESTCLIENT, WEBCLIENT, NATIVE, RESTTEMPLATE);
+    private final Set<String> JSPECIFY_SUPPORTED_LIBRARIES = new TreeSet<>(Arrays.asList(RESTCLIENT, WEBCLIENT, NATIVE, RESTTEMPLATE));
 
     private static class MpRestClientVersion {
         public final String rootPackage;

docs/generators/jaxrs-cxf-client.md

@@ -1,17 +1,8 @@
 README.md
 pom.xml
-src/main/java/org/openapitools/OpenApiGeneratorApplication.java
-src/main/java/org/openapitools/RFC3339DateFormat.java
 src/main/java/org/openapitools/api/ApiUtil.java
 src/main/java/org/openapitools/api/FooApi.java
-src/main/java/org/openapitools/api/FooApiController.java
 src/main/java/org/openapitools/api/UploadApi.java
-src/main/java/org/openapitools/api/UploadApiController.java
 src/main/java/org/openapitools/api/package-info.java
-src/main/java/org/openapitools/configuration/HomeController.java
-src/main/java/org/openapitools/configuration/SpringDocConfiguration.java
 src/main/java/org/openapitools/model/Foo.java
 src/main/java/org/openapitools/model/package-info.java
-src/main/resources/application.properties
-src/main/resources/openapi.yaml
-src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java

@@ -1,21 +1,27 @@
-# OpenAPI generated server
 
-Spring Boot Server
+# OpenAPI generated API stub
 
-## Overview
-This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.
-By using the [OpenAPI-Spec](https://openapis.org), you can easily generate a server stub.
-This is an example of building a OpenAPI-enabled server in Java using the SpringBoot framework.
+Spring Framework stub
 
 
-The underlying library integrating OpenAPI to Spring Boot is [springdoc](https://springdoc.org).
-Springdoc will generate an OpenAPI v3 specification based on the generated Controller and Model classes.
-The specification is available to download using the following url:
-http://localhost:8080/v3/api-docs/
+## Overview
+This code was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.
+By using the [OpenAPI-Spec](https://openapis.org), you can easily generate an API stub.
+This is an example of building API stub interfaces in Java using the Spring framework.
 
-Start your server as a simple java application
+The stubs generated can be used in your existing Spring-MVC or Spring-Boot application to create controller endpoints
+by adding ```@Controller``` classes that implement the interface. Eg:
+```java
+@Controller
+public class PetController implements PetApi {
+// implement all PetApi methods
+}
+```
 
-You can view the api documentation in swagger-ui by pointing to
-http://localhost:8080/swagger-ui.html
+You can also use the interface to create [Spring-Cloud Feign clients](http://projects.spring.io/spring-cloud/spring-cloud.html#spring-cloud-feign-inheritance).Eg:
+```java
+@FeignClient(name="pet", url="http://petstore.swagger.io/v2")
+public interface PetClient extends PetApi {
 
-Change default port value in application.properties
+}
+```

samples/openapi3/server/petstore/springboot-4-jspecify/.openapi-generator/FILES

@@ -23,10 +23,16 @@
         <sourceDirectory>src/main/java</sourceDirectory>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>