Add support for controlling output of OpenAPI Generator version in generated files (#17952)

* add initial openapi config and java generated files * add java implementation for adding generator version * regenerate sample client files * remove tabs * only show generated version if build info exists * set build info for batch generation * update generator doc for new global flag * use existing property for generator version * update templates to include generator version * update templates for better generator version syntax * revert undesired changes * regenerate samples for openapi client * update templates to correct formatting/newlines * correct description text and add to usage doc * add generator cli option for all codegen types * use more concise version info; update existing codegens to support new prop * correct wrong prop reference * add initial test coverage for new prop * update last (scala) templates with new prop * update samples after upstream merge * use consistent version output * use better sample project id/name * revert using option for generator version in templates
2024-03-09 01:52:08 -06:00
parent c87ad561f1
commit cf2435f335
5612 changed files with 34853 additions and 5131 deletions
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Category.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Category.java
@@ -7,7 +7,7 @@ import java.util.Objects;
 /**
 * A category for a pet
 */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen", comments = "Generator version: 7.4.0-SNAPSHOT")
@SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
  @JsonProperty("id")
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/ModelApiResponse.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/ModelApiResponse.java
@@ -8,7 +8,7 @@ import java.util.Objects;
 /**
 * Describes the result of uploading an image resource
 */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen", comments = "Generator version: 7.4.0-SNAPSHOT")
@SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
  @JsonProperty("code")
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Order.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Order.java
@@ -8,7 +8,7 @@ import java.util.Objects;
 /**
 * An order for a pets from the pet store
 */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen", comments = "Generator version: 7.4.0-SNAPSHOT")
@SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
  @JsonProperty("id")
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Pet.java
@@ -12,7 +12,7 @@ import java.util.Objects;
 /**
 * A pet for sale in the pet store
 */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen", comments = "Generator version: 7.4.0-SNAPSHOT")
@SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
  @JsonProperty("id")
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Tag.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/Tag.java
@@ -7,7 +7,7 @@ import java.util.Objects;
 /**
 * A tag for a pet
 */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen", comments = "Generator version: 7.4.0-SNAPSHOT")
@SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
  @JsonProperty("id")
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/User.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/apimodels/User.java
@@ -7,7 +7,7 @@ import java.util.Objects;
 /**
 * A User who is purchasing from the pet store
 */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen", comments = "Generator version: 7.4.0-SNAPSHOT")
@SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class User   {
  @JsonProperty("id")
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.core.type.TypeReference;

 import openapitools.OpenAPIUtils.ApiAction;

-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen", comments = "Generator version: 7.4.0-SNAPSHOT")
 public class PetApiController extends Controller {
    private final PetApiControllerImpInterface imp;
    private final ObjectMapper mapper;
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java
@@ -11,7 +11,7 @@ import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import play.libs.Files.TemporaryFile;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen", comments = "Generator version: 7.4.0-SNAPSHOT")
 public class PetApiControllerImp extends PetApiControllerImpInterface {
    @Override
    public void addPet(Http.Request request, Pet body) throws Exception {
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java
@@ -22,7 +22,7 @@ import com.fasterxml.jackson.core.type.TypeReference;

 import openapitools.OpenAPIUtils.ApiAction;

-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen", comments = "Generator version: 7.4.0-SNAPSHOT")
 public class StoreApiController extends Controller {
    private final StoreApiControllerImpInterface imp;
    private final ObjectMapper mapper;
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java
@@ -10,7 +10,7 @@ import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import play.libs.Files.TemporaryFile;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen", comments = "Generator version: 7.4.0-SNAPSHOT")
 public class StoreApiControllerImp extends StoreApiControllerImpInterface {
    @Override
    public void deleteOrder(Http.Request request, String orderId) throws Exception {
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java
@@ -22,7 +22,7 @@ import com.fasterxml.jackson.core.type.TypeReference;

 import openapitools.OpenAPIUtils.ApiAction;

-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen", comments = "Generator version: 7.4.0-SNAPSHOT")
 public class UserApiController extends Controller {
    private final UserApiControllerImpInterface imp;
    private final ObjectMapper mapper;
--- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java
@@ -10,7 +10,7 @@ import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.io.FileInputStream;
 import play.libs.Files.TemporaryFile;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaPlayFrameworkCodegen", comments = "Generator version: 7.4.0-SNAPSHOT")
 public class UserApiControllerImp extends UserApiControllerImpInterface {
    @Override
    public void createUser(Http.Request request, User body) throws Exception {