From 7ca49b466d4613a441d2cbf6d932987be69de019 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sat, 8 Mar 2025 20:03:42 +0100 Subject: [PATCH 01/47] Fix hashCode for additionalProperties --- .../Java/libraries/feign/pojo.mustache | 2 +- .../microprofile/pojoOverrides.mustache | 2 +- .../Java/libraries/resttemplate/pojo.mustache | 2 +- .../codegen/java/JavaClientCodegenTest.java | 30 +++++++++++++++++++ .../java/spring/SpringCodegenTest.java | 15 ++++++++++ .../resources/3_0/additionalProperties.yaml | 20 +++++++++++++ 6 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache index 76f119eb4ef7..a5bcc87bd928 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache @@ -280,7 +280,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache index f0fbb0b200e8..28fdf0da2f1b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache @@ -28,7 +28,7 @@ return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache index 192b7014c16a..79d8b0e63cd0 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache @@ -321,7 +321,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 254288edc2b8..cc02e356a12d 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -41,6 +41,7 @@ import org.openapitools.codegen.model.OperationsMap; import org.openapitools.codegen.testutils.ConfigAssert; import org.testng.annotations.DataProvider; +import org.testng.annotations.Parameters; import org.testng.annotations.Test; import java.io.File; @@ -3476,4 +3477,33 @@ public void testEnumWithImplements() { JavaFileAssert.assertThat(files.get("Type.java")).fileContains("Type implements java.io.Serializable {"); } + + @DataProvider(name = "javaClientLibrariesForHashCodeTest") + public Object[][] javaClientLibraries() { + return new Object[][] { + {JavaClientCodegen.RESTTEMPLATE, "Objects.hash(additionalProperties)" }, + {JavaClientCodegen.NATIVE, "Objects.hash(super.hashCode(), additionalProperties)"}, + {JavaClientCodegen.OKHTTP_GSON, "Objects.hash(additionalProperties)" }, + {JavaClientCodegen.MICROPROFILE, "Objects.hash(super.hashCode(), additionalProperties)" }, + {JavaClientCodegen.JERSEY2, "Objects.hash(additionalProperties)" }, + {JavaClientCodegen.JERSEY3, "Objects.hash(additionalProperties)" }, + {JavaClientCodegen.FEIGN, "Objects.hash(additionalProperties)" }, + }; + } + + @Test(dataProvider = "javaClientLibrariesForHashCodeTest") + public void testAdditionalPropertiesWithGnerateAliasAsModelGenerateCorrectHashCode(String library, String hashCode) { + final Path output = newTempFolder(); + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("java") + .setGenerateAliasAsModel(true) + .setLibrary(library) + .setInputSpec("src/test/resources/3_0/additionalProperties.yaml") + .setOutputDir(output.toString().replace("\\", "/")); + + Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() + .stream().collect(Collectors.toMap(File::getName, Function.identity())); + + JavaFileAssert.assertThat(files.get("SampleObject.java")).fileContains(hashCode); + } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index a7ccd9d369e3..8c5c19dc03d3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5383,4 +5383,19 @@ public void testEnumWithImplements() { JavaFileAssert.assertThat(files.get("Type.java")).fileContains("Type implements java.io.Serializable {"); } + + @Test + public void testAdditionalPropertiesWithGnerateAliasAsModelGenerateCorrectHashCode() { + final Path output = newTempFolder(); + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("spring") + .setGenerateAliasAsModel(true) + .setInputSpec("src/test/resources/3_0/additionalProperties.yaml") + .setOutputDir(output.toString().replace("\\", "/")); + + Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() + .stream().collect(Collectors.toMap(File::getName, Function.identity())); + + JavaFileAssert.assertThat(files.get("SampleObject.java")).fileContains(" return Objects.hash(additionalProperties)"); + } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml new file mode 100644 index 000000000000..dceeaf005169 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml @@ -0,0 +1,20 @@ +openapi: 3.0.0 +info: + title: "test for additionalProperties" + version: 1.0.0 +paths: + /test: + get: + responses: + "200": + description: test + content: + application/json: + schema: + $ref: '#/components/schemas/SampleObject' +components: + schemas: + SampleObject: + type: object + additionalProperties: + type: object \ No newline at end of file From 4ad76cc86cefcced7eaaf6f3896efb8e8cb7bab0 Mon Sep 17 00:00:00 2001 From: Jarangutan <53702919+jarangutan@users.noreply.github.com> Date: Sun, 9 Mar 2025 03:47:11 -0400 Subject: [PATCH 02/47] [go-server] Moved helper code from router and updated logger for chi (#20823) * [go-server] Moved helper code from router and updated logger * [go-server] fixed imports for mux and chi * [go-server] fix go-api-server sample test --- .../main/resources/go-server/helpers.mustache | 298 +++++++++++++++++ .../main/resources/go-server/logger.mustache | 18 +- .../main/resources/go-server/routers.mustache | 303 +----------------- .../petstore/go/go-petstore/go/helpers.go | 296 +++++++++++++++++ .../petstore/go/go-petstore/go/logger.go | 19 +- .../petstore/go/go-petstore/go/routers.go | 301 +---------------- .../no-body-path-params/go/helpers.go | 296 +++++++++++++++++ .../no-body-path-params/go/logger.go | 2 +- .../no-body-path-params/go/routers.go | 298 +---------------- samples/server/petstore/go-api-server/go.sum | 2 + .../petstore/go-api-server/go/helpers.go | 296 +++++++++++++++++ .../petstore/go-api-server/go/logger.go | 2 +- .../petstore/go-api-server/go/routers.go | 298 +---------------- .../samples_tests/routers_test.go | 4 +- .../petstore/go-chi-server/go/helpers.go | 296 +++++++++++++++++ .../petstore/go-chi-server/go/logger.go | 19 +- .../petstore/go-chi-server/go/routers.go | 301 +---------------- 17 files changed, 1519 insertions(+), 1530 deletions(-) create mode 100644 samples/server/petstore/go-api-server/go.sum diff --git a/modules/openapi-generator/src/main/resources/go-server/helpers.mustache b/modules/openapi-generator/src/main/resources/go-server/helpers.mustache index de8a203d84b9..9a47f81c7dae 100644 --- a/modules/openapi-generator/src/main/resources/go-server/helpers.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/helpers.mustache @@ -2,7 +2,17 @@ package {{packageName}} import ( + "encoding/json" + "errors" + "io" + "mime/multipart" + "net/http" + "net/url" + "os" "reflect" + "strconv" + "strings" + "time" ) // Response return a ImplResponse struct filled @@ -64,3 +74,291 @@ func AssertRecurseValueRequired[T any](value reflect.Value, callback func(T) err } return nil } + +// EncodeJSONResponse uses the json encoder to write an interface to the http response with an optional status code +func EncodeJSONResponse(i interface{}, status *int,{{#addResponseHeaders}} headers map[string][]string,{{/addResponseHeaders}} w http.ResponseWriter) error { + wHeader := w.Header() + {{#addResponseHeaders}} + for key, values := range headers { + for _, value := range values { + wHeader.Add(key, value) + } + } + {{/addResponseHeaders}} + + f, ok := i.(*os.File) + if ok { + data, err := io.ReadAll(f) + if err != nil { + return err + } + wHeader.Set("Content-Type", http.DetectContentType(data)) + wHeader.Set("Content-Disposition", "attachment; filename="+f.Name()) + if status != nil { + w.WriteHeader(*status) + } else { + w.WriteHeader(http.StatusOK) + } + _, err = w.Write(data) + return err + } + wHeader.Set("Content-Type", "application/json; charset=UTF-8") + + if status != nil { + w.WriteHeader(*status) + } else { + w.WriteHeader(http.StatusOK) + } + + if i != nil { + return json.NewEncoder(w).Encode(i) + } + + return nil +} + +// ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file +func ReadFormFileToTempFile(r *http.Request, key string) (*os.File, error) { + _, fileHeader, err := r.FormFile(key) + if err != nil { + return nil, err + } + + return readFileHeaderToTempFile(fileHeader) +} + +// ReadFormFilesToTempFiles reads files array data from a request form and writes it to a temporary files +func ReadFormFilesToTempFiles(r *http.Request, key string) ([]*os.File, error) { + if err := r.ParseMultipartForm(32 << 20); err != nil { + return nil, err + } + + files := make([]*os.File, 0, len(r.MultipartForm.File[key])) + + for _, fileHeader := range r.MultipartForm.File[key] { + file, err := readFileHeaderToTempFile(fileHeader) + if err != nil { + return nil, err + } + + files = append(files, file) + } + + return files, nil +} + +// readFileHeaderToTempFile reads multipart.FileHeader and writes it to a temporary file +func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error) { + formFile, err := fileHeader.Open() + if err != nil { + return nil, err + } + + defer formFile.Close() + + // Use .* as suffix, because the asterisk is a placeholder for the random value, + // and the period allows consumers of this file to remove the suffix to obtain the original file name + file, err := os.CreateTemp("", fileHeader.Filename+".*") + if err != nil { + return nil, err + } + + defer file.Close() + + _, err = io.Copy(file, formFile) + if err != nil { + return nil, err + } + + return file, nil +} + +func parseTimes(param string) ([]time.Time, error) { + splits := strings.Split(param, ",") + times := make([]time.Time, 0, len(splits)) + for _, v := range splits { + t, err := parseTime(v) + if err != nil { + return nil, err + } + times = append(times, t) + } + return times, nil +} + +// parseTime will parses a string parameter into a time.Time using the RFC3339 format +func parseTime(param string) (time.Time, error) { + if param == "" { + return time.Time{}, nil + } + return time.Parse(time.RFC3339, param) +} + +type Number interface { + ~int32 | ~int64 | ~float32 | ~float64 +} + +type ParseString[T Number | string | bool] func(v string) (T, error) + +// parseFloat64 parses a string parameter to an float64. +func parseFloat64(param string) (float64, error) { + if param == "" { + return 0, nil + } + + return strconv.ParseFloat(param, 64) +} + +// parseFloat32 parses a string parameter to an float32. +func parseFloat32(param string) (float32, error) { + if param == "" { + return 0, nil + } + + v, err := strconv.ParseFloat(param, 32) + return float32(v), err +} + +// parseInt64 parses a string parameter to an int64. +func parseInt64(param string) (int64, error) { + if param == "" { + return 0, nil + } + + return strconv.ParseInt(param, 10, 64) +} + +// parseInt32 parses a string parameter to an int32. +func parseInt32(param string) (int32, error) { + if param == "" { + return 0, nil + } + + val, err := strconv.ParseInt(param, 10, 32) + return int32(val), err +} + +// parseBool parses a string parameter to an bool. +func parseBool(param string) (bool, error) { + if param == "" { + return false, nil + } + + return strconv.ParseBool(param) +} + +type Operation[T Number | string | bool] func(actual string) (T, bool, error) + +func WithRequire[T Number | string | bool](parse ParseString[T]) Operation[T] { + var empty T + return func(actual string) (T, bool, error) { + if actual == "" { + return empty, false, errors.New(errMsgRequiredMissing) + } + + v, err := parse(actual) + return v, false, err + } +} + +func WithDefaultOrParse[T Number | string | bool](def T, parse ParseString[T]) Operation[T] { + return func(actual string) (T, bool, error) { + if actual == "" { + return def, true, nil + } + + v, err := parse(actual) + return v, false, err + } +} + +func WithParse[T Number | string | bool](parse ParseString[T]) Operation[T] { + return func(actual string) (T, bool, error) { + v, err := parse(actual) + return v, false, err + } +} + +type Constraint[T Number | string | bool] func(actual T) error + +func WithMinimum[T Number](expected T) Constraint[T] { + return func(actual T) error { + if actual < expected { + return errors.New(errMsgMinValueConstraint) + } + + return nil + } +} + +func WithMaximum[T Number](expected T) Constraint[T] { + return func(actual T) error { + if actual > expected { + return errors.New(errMsgMaxValueConstraint) + } + + return nil + } +} + +// parseNumericParameter parses a numeric parameter to its respective type. +func parseNumericParameter[T Number](param string, fn Operation[T], checks ...Constraint[T]) (T, error) { + v, ok, err := fn(param) + if err != nil { + return 0, err + } + + if !ok { + for _, check := range checks { + if err := check(v); err != nil { + return 0, err + } + } + } + + return v, nil +} + +// parseBoolParameter parses a string parameter to a bool +func parseBoolParameter(param string, fn Operation[bool]) (bool, error) { + v, _, err := fn(param) + return v, err +} + +// parseNumericArrayParameter parses a string parameter containing array of values to its respective type. +func parseNumericArrayParameter[T Number](param, delim string, required bool, fn Operation[T], checks ...Constraint[T]) ([]T, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + values := make([]T, len(str)) + + for i, s := range str { + v, ok, err := fn(s) + if err != nil { + return nil, err + } + + if !ok { + for _, check := range checks { + if err := check(v); err != nil { + return nil, err + } + } + } + + values[i] = v + } + + return values, nil +} + +// parseQuery parses query parameters and returns an error if any malformed value pairs are encountered. +func parseQuery(rawQuery string) (url.Values, error) { + return url.ParseQuery(rawQuery) +} diff --git a/modules/openapi-generator/src/main/resources/go-server/logger.mustache b/modules/openapi-generator/src/main/resources/go-server/logger.mustache index e8464d6ad5f5..dbc9faff4bcf 100644 --- a/modules/openapi-generator/src/main/resources/go-server/logger.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/logger.mustache @@ -2,11 +2,20 @@ package {{packageName}} import ( - "log" "net/http" +{{#routers}} + {{#mux}} + "log" "time" + {{/mux}} + {{#chi}} + "github.com/go-chi/chi/v5/middleware" + {{/chi}} +{{/routers}} ) +{{#routers}} +{{#mux}} func Logger(inner http.Handler, name string) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { start := time.Now() @@ -22,3 +31,10 @@ func Logger(inner http.Handler, name string) http.Handler { ) }) } +{{/mux}} +{{#chi}} +func Logger(inner http.Handler) http.Handler { + return middleware.Logger(inner) +} +{{/chi}} +{{/routers}} diff --git a/modules/openapi-generator/src/main/resources/go-server/routers.mustache b/modules/openapi-generator/src/main/resources/go-server/routers.mustache index 207df91d9aad..0e10f7b97ca9 100644 --- a/modules/openapi-generator/src/main/resources/go-server/routers.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/routers.mustache @@ -2,9 +2,7 @@ package {{packageName}} import ( - "encoding/json" - "errors" - "time" + "net/http" {{#routers}} {{#mux}} "github.com/gorilla/mux" @@ -14,19 +12,11 @@ import ( {{/mux}} {{#chi}} "github.com/go-chi/chi/v5" - "github.com/go-chi/chi/v5/middleware" {{#featureCORS}} "github.com/go-chi/cors" {{/featureCORS}} {{/chi}} {{/routers}} - "io" - "mime/multipart" - "net/http" - "net/url" - "os" - "strconv" - "strings" ) // A Route defines the parameters for an api endpoint @@ -56,7 +46,7 @@ func NewRouter(routers ...Router) {{#routers}}{{#mux}}*mux.Router{{/mux}}{{#chi} {{/mux}} {{#chi}} router := chi.NewRouter() - router.Use(middleware.Logger) + router.Use(Logger) {{#featureCORS}} router.Use(cors.Handler(cors.Options{})) {{/featureCORS}} @@ -87,292 +77,3 @@ func NewRouter(routers ...Router) {{#routers}}{{#mux}}*mux.Router{{/mux}}{{#chi} return router } - -// EncodeJSONResponse uses the json encoder to write an interface to the http response with an optional status code -func EncodeJSONResponse(i interface{}, status *int,{{#addResponseHeaders}} headers map[string][]string,{{/addResponseHeaders}} w http.ResponseWriter) error { - wHeader := w.Header() - {{#addResponseHeaders}} - for key, values := range headers { - for _, value := range values { - wHeader.Add(key, value) - } - } - {{/addResponseHeaders}} - - f, ok := i.(*os.File) - if ok { - data, err := io.ReadAll(f) - if err != nil { - return err - } - wHeader.Set("Content-Type", http.DetectContentType(data)) - wHeader.Set("Content-Disposition", "attachment; filename="+f.Name()) - if status != nil { - w.WriteHeader(*status) - } else { - w.WriteHeader(http.StatusOK) - } - _, err = w.Write(data) - return err - } - wHeader.Set("Content-Type", "application/json; charset=UTF-8") - - if status != nil { - w.WriteHeader(*status) - } else { - w.WriteHeader(http.StatusOK) - } - - if i != nil { - return json.NewEncoder(w).Encode(i) - } - - return nil -} - -// ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file -func ReadFormFileToTempFile(r *http.Request, key string) (*os.File, error) { - _, fileHeader, err := r.FormFile(key) - if err != nil { - return nil, err - } - - return readFileHeaderToTempFile(fileHeader) -} - -// ReadFormFilesToTempFiles reads files array data from a request form and writes it to a temporary files -func ReadFormFilesToTempFiles(r *http.Request, key string) ([]*os.File, error) { - if err := r.ParseMultipartForm(32 << 20); err != nil { - return nil, err - } - - files := make([]*os.File, 0, len(r.MultipartForm.File[key])) - - for _, fileHeader := range r.MultipartForm.File[key] { - file, err := readFileHeaderToTempFile(fileHeader) - if err != nil { - return nil, err - } - - files = append(files, file) - } - - return files, nil -} - -// readFileHeaderToTempFile reads multipart.FileHeader and writes it to a temporary file -func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error) { - formFile, err := fileHeader.Open() - if err != nil { - return nil, err - } - - defer formFile.Close() - - // Use .* as suffix, because the asterisk is a placeholder for the random value, - // and the period allows consumers of this file to remove the suffix to obtain the original file name - file, err := os.CreateTemp("", fileHeader.Filename+".*") - if err != nil { - return nil, err - } - - defer file.Close() - - _, err = io.Copy(file, formFile) - if err != nil { - return nil, err - } - - return file, nil -} - -func parseTimes(param string) ([]time.Time, error) { - splits := strings.Split(param, ",") - times := make([]time.Time, 0, len(splits)) - for _, v := range splits { - t, err := parseTime(v) - if err != nil { - return nil, err - } - times = append(times, t) - } - return times, nil -} - -// parseTime will parses a string parameter into a time.Time using the RFC3339 format -func parseTime(param string) (time.Time, error) { - if param == "" { - return time.Time{}, nil - } - return time.Parse(time.RFC3339, param) -} - -type Number interface { - ~int32 | ~int64 | ~float32 | ~float64 -} - -type ParseString[T Number | string | bool] func(v string) (T, error) - -// parseFloat64 parses a string parameter to an float64. -func parseFloat64(param string) (float64, error) { - if param == "" { - return 0, nil - } - - return strconv.ParseFloat(param, 64) -} - -// parseFloat32 parses a string parameter to an float32. -func parseFloat32(param string) (float32, error) { - if param == "" { - return 0, nil - } - - v, err := strconv.ParseFloat(param, 32) - return float32(v), err -} - -// parseInt64 parses a string parameter to an int64. -func parseInt64(param string) (int64, error) { - if param == "" { - return 0, nil - } - - return strconv.ParseInt(param, 10, 64) -} - -// parseInt32 parses a string parameter to an int32. -func parseInt32(param string) (int32, error) { - if param == "" { - return 0, nil - } - - val, err := strconv.ParseInt(param, 10, 32) - return int32(val), err -} - -// parseBool parses a string parameter to an bool. -func parseBool(param string) (bool, error) { - if param == "" { - return false, nil - } - - return strconv.ParseBool(param) -} - -type Operation[T Number | string | bool] func(actual string) (T, bool, error) - -func WithRequire[T Number | string | bool](parse ParseString[T]) Operation[T] { - var empty T - return func(actual string) (T, bool, error) { - if actual == "" { - return empty, false, errors.New(errMsgRequiredMissing) - } - - v, err := parse(actual) - return v, false, err - } -} - -func WithDefaultOrParse[T Number | string | bool](def T, parse ParseString[T]) Operation[T] { - return func(actual string) (T, bool, error) { - if actual == "" { - return def, true, nil - } - - v, err := parse(actual) - return v, false, err - } -} - -func WithParse[T Number | string | bool](parse ParseString[T]) Operation[T] { - return func(actual string) (T, bool, error) { - v, err := parse(actual) - return v, false, err - } -} - -type Constraint[T Number | string | bool] func(actual T) error - -func WithMinimum[T Number](expected T) Constraint[T] { - return func(actual T) error { - if actual < expected { - return errors.New(errMsgMinValueConstraint) - } - - return nil - } -} - -func WithMaximum[T Number](expected T) Constraint[T] { - return func(actual T) error { - if actual > expected { - return errors.New(errMsgMaxValueConstraint) - } - - return nil - } -} - -// parseNumericParameter parses a numeric parameter to its respective type. -func parseNumericParameter[T Number](param string, fn Operation[T], checks ...Constraint[T]) (T, error) { - v, ok, err := fn(param) - if err != nil { - return 0, err - } - - if !ok { - for _, check := range checks { - if err := check(v); err != nil { - return 0, err - } - } - } - - return v, nil -} - -// parseBoolParameter parses a string parameter to a bool -func parseBoolParameter(param string, fn Operation[bool]) (bool, error) { - v, _, err := fn(param) - return v, err -} - -// parseNumericArrayParameter parses a string parameter containing array of values to its respective type. -func parseNumericArrayParameter[T Number](param, delim string, required bool, fn Operation[T], checks ...Constraint[T]) ([]T, error) { - if param == "" { - if required { - return nil, errors.New(errMsgRequiredMissing) - } - - return nil, nil - } - - str := strings.Split(param, delim) - values := make([]T, len(str)) - - for i, s := range str { - v, ok, err := fn(s) - if err != nil { - return nil, err - } - - if !ok { - for _, check := range checks { - if err := check(v); err != nil { - return nil, err - } - } - } - - values[i] = v - } - - return values, nil -} - - -// parseQuery parses query parameters and returns an error if any malformed value pairs are encountered. -func parseQuery(rawQuery string) (url.Values, error) { - return url.ParseQuery(rawQuery) -} \ No newline at end of file diff --git a/samples/openapi3/server/petstore/go/go-petstore/go/helpers.go b/samples/openapi3/server/petstore/go/go-petstore/go/helpers.go index 027954b0c9b9..6f7103489034 100644 --- a/samples/openapi3/server/petstore/go/go-petstore/go/helpers.go +++ b/samples/openapi3/server/petstore/go/go-petstore/go/helpers.go @@ -11,7 +11,17 @@ package petstoreserver import ( + "encoding/json" + "errors" + "io" + "mime/multipart" + "net/http" + "net/url" + "os" "reflect" + "strconv" + "strings" + "time" ) // Response return a ImplResponse struct filled @@ -69,3 +79,289 @@ func AssertRecurseValueRequired[T any](value reflect.Value, callback func(T) err } return nil } + +// EncodeJSONResponse uses the json encoder to write an interface to the http response with an optional status code +func EncodeJSONResponse(i interface{}, status *int, headers map[string][]string, w http.ResponseWriter) error { + wHeader := w.Header() + for key, values := range headers { + for _, value := range values { + wHeader.Add(key, value) + } + } + + f, ok := i.(*os.File) + if ok { + data, err := io.ReadAll(f) + if err != nil { + return err + } + wHeader.Set("Content-Type", http.DetectContentType(data)) + wHeader.Set("Content-Disposition", "attachment; filename="+f.Name()) + if status != nil { + w.WriteHeader(*status) + } else { + w.WriteHeader(http.StatusOK) + } + _, err = w.Write(data) + return err + } + wHeader.Set("Content-Type", "application/json; charset=UTF-8") + + if status != nil { + w.WriteHeader(*status) + } else { + w.WriteHeader(http.StatusOK) + } + + if i != nil { + return json.NewEncoder(w).Encode(i) + } + + return nil +} + +// ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file +func ReadFormFileToTempFile(r *http.Request, key string) (*os.File, error) { + _, fileHeader, err := r.FormFile(key) + if err != nil { + return nil, err + } + + return readFileHeaderToTempFile(fileHeader) +} + +// ReadFormFilesToTempFiles reads files array data from a request form and writes it to a temporary files +func ReadFormFilesToTempFiles(r *http.Request, key string) ([]*os.File, error) { + if err := r.ParseMultipartForm(32 << 20); err != nil { + return nil, err + } + + files := make([]*os.File, 0, len(r.MultipartForm.File[key])) + + for _, fileHeader := range r.MultipartForm.File[key] { + file, err := readFileHeaderToTempFile(fileHeader) + if err != nil { + return nil, err + } + + files = append(files, file) + } + + return files, nil +} + +// readFileHeaderToTempFile reads multipart.FileHeader and writes it to a temporary file +func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error) { + formFile, err := fileHeader.Open() + if err != nil { + return nil, err + } + + defer formFile.Close() + + // Use .* as suffix, because the asterisk is a placeholder for the random value, + // and the period allows consumers of this file to remove the suffix to obtain the original file name + file, err := os.CreateTemp("", fileHeader.Filename+".*") + if err != nil { + return nil, err + } + + defer file.Close() + + _, err = io.Copy(file, formFile) + if err != nil { + return nil, err + } + + return file, nil +} + +func parseTimes(param string) ([]time.Time, error) { + splits := strings.Split(param, ",") + times := make([]time.Time, 0, len(splits)) + for _, v := range splits { + t, err := parseTime(v) + if err != nil { + return nil, err + } + times = append(times, t) + } + return times, nil +} + +// parseTime will parses a string parameter into a time.Time using the RFC3339 format +func parseTime(param string) (time.Time, error) { + if param == "" { + return time.Time{}, nil + } + return time.Parse(time.RFC3339, param) +} + +type Number interface { + ~int32 | ~int64 | ~float32 | ~float64 +} + +type ParseString[T Number | string | bool] func(v string) (T, error) + +// parseFloat64 parses a string parameter to an float64. +func parseFloat64(param string) (float64, error) { + if param == "" { + return 0, nil + } + + return strconv.ParseFloat(param, 64) +} + +// parseFloat32 parses a string parameter to an float32. +func parseFloat32(param string) (float32, error) { + if param == "" { + return 0, nil + } + + v, err := strconv.ParseFloat(param, 32) + return float32(v), err +} + +// parseInt64 parses a string parameter to an int64. +func parseInt64(param string) (int64, error) { + if param == "" { + return 0, nil + } + + return strconv.ParseInt(param, 10, 64) +} + +// parseInt32 parses a string parameter to an int32. +func parseInt32(param string) (int32, error) { + if param == "" { + return 0, nil + } + + val, err := strconv.ParseInt(param, 10, 32) + return int32(val), err +} + +// parseBool parses a string parameter to an bool. +func parseBool(param string) (bool, error) { + if param == "" { + return false, nil + } + + return strconv.ParseBool(param) +} + +type Operation[T Number | string | bool] func(actual string) (T, bool, error) + +func WithRequire[T Number | string | bool](parse ParseString[T]) Operation[T] { + var empty T + return func(actual string) (T, bool, error) { + if actual == "" { + return empty, false, errors.New(errMsgRequiredMissing) + } + + v, err := parse(actual) + return v, false, err + } +} + +func WithDefaultOrParse[T Number | string | bool](def T, parse ParseString[T]) Operation[T] { + return func(actual string) (T, bool, error) { + if actual == "" { + return def, true, nil + } + + v, err := parse(actual) + return v, false, err + } +} + +func WithParse[T Number | string | bool](parse ParseString[T]) Operation[T] { + return func(actual string) (T, bool, error) { + v, err := parse(actual) + return v, false, err + } +} + +type Constraint[T Number | string | bool] func(actual T) error + +func WithMinimum[T Number](expected T) Constraint[T] { + return func(actual T) error { + if actual < expected { + return errors.New(errMsgMinValueConstraint) + } + + return nil + } +} + +func WithMaximum[T Number](expected T) Constraint[T] { + return func(actual T) error { + if actual > expected { + return errors.New(errMsgMaxValueConstraint) + } + + return nil + } +} + +// parseNumericParameter parses a numeric parameter to its respective type. +func parseNumericParameter[T Number](param string, fn Operation[T], checks ...Constraint[T]) (T, error) { + v, ok, err := fn(param) + if err != nil { + return 0, err + } + + if !ok { + for _, check := range checks { + if err := check(v); err != nil { + return 0, err + } + } + } + + return v, nil +} + +// parseBoolParameter parses a string parameter to a bool +func parseBoolParameter(param string, fn Operation[bool]) (bool, error) { + v, _, err := fn(param) + return v, err +} + +// parseNumericArrayParameter parses a string parameter containing array of values to its respective type. +func parseNumericArrayParameter[T Number](param, delim string, required bool, fn Operation[T], checks ...Constraint[T]) ([]T, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + values := make([]T, len(str)) + + for i, s := range str { + v, ok, err := fn(s) + if err != nil { + return nil, err + } + + if !ok { + for _, check := range checks { + if err := check(v); err != nil { + return nil, err + } + } + } + + values[i] = v + } + + return values, nil +} + +// parseQuery parses query parameters and returns an error if any malformed value pairs are encountered. +func parseQuery(rawQuery string) (url.Values, error) { + return url.ParseQuery(rawQuery) +} diff --git a/samples/openapi3/server/petstore/go/go-petstore/go/logger.go b/samples/openapi3/server/petstore/go/go-petstore/go/logger.go index b01819630b20..6f3cf7355f88 100644 --- a/samples/openapi3/server/petstore/go/go-petstore/go/logger.go +++ b/samples/openapi3/server/petstore/go/go-petstore/go/logger.go @@ -11,23 +11,10 @@ package petstoreserver import ( - "log" "net/http" - "time" + "github.com/go-chi/chi/v5/middleware" ) -func Logger(inner http.Handler, name string) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - start := time.Now() - - inner.ServeHTTP(w, r) - - log.Printf( - "%s %s %s %s", - r.Method, - r.RequestURI, - name, - time.Since(start), - ) - }) +func Logger(inner http.Handler) http.Handler { + return middleware.Logger(inner) } diff --git a/samples/openapi3/server/petstore/go/go-petstore/go/routers.go b/samples/openapi3/server/petstore/go/go-petstore/go/routers.go index 4d662e273c58..438895d1afec 100644 --- a/samples/openapi3/server/petstore/go/go-petstore/go/routers.go +++ b/samples/openapi3/server/petstore/go/go-petstore/go/routers.go @@ -11,18 +11,8 @@ package petstoreserver import ( - "encoding/json" - "errors" - "time" - "github.com/go-chi/chi/v5" - "github.com/go-chi/chi/v5/middleware" - "io" - "mime/multipart" "net/http" - "net/url" - "os" - "strconv" - "strings" + "github.com/go-chi/chi/v5" ) // A Route defines the parameters for an api endpoint @@ -47,7 +37,7 @@ const errMsgMaxValueConstraint = "provided parameter is not respecting maximum v // NewRouter creates a new router for any number of api routers func NewRouter(routers ...Router) chi.Router { router := chi.NewRouter() - router.Use(middleware.Logger) + router.Use(Logger) for _, api := range routers { for _, route := range api.Routes() { var handler http.Handler = route.HandlerFunc @@ -57,290 +47,3 @@ func NewRouter(routers ...Router) chi.Router { return router } - -// EncodeJSONResponse uses the json encoder to write an interface to the http response with an optional status code -func EncodeJSONResponse(i interface{}, status *int, headers map[string][]string, w http.ResponseWriter) error { - wHeader := w.Header() - for key, values := range headers { - for _, value := range values { - wHeader.Add(key, value) - } - } - - f, ok := i.(*os.File) - if ok { - data, err := io.ReadAll(f) - if err != nil { - return err - } - wHeader.Set("Content-Type", http.DetectContentType(data)) - wHeader.Set("Content-Disposition", "attachment; filename="+f.Name()) - if status != nil { - w.WriteHeader(*status) - } else { - w.WriteHeader(http.StatusOK) - } - _, err = w.Write(data) - return err - } - wHeader.Set("Content-Type", "application/json; charset=UTF-8") - - if status != nil { - w.WriteHeader(*status) - } else { - w.WriteHeader(http.StatusOK) - } - - if i != nil { - return json.NewEncoder(w).Encode(i) - } - - return nil -} - -// ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file -func ReadFormFileToTempFile(r *http.Request, key string) (*os.File, error) { - _, fileHeader, err := r.FormFile(key) - if err != nil { - return nil, err - } - - return readFileHeaderToTempFile(fileHeader) -} - -// ReadFormFilesToTempFiles reads files array data from a request form and writes it to a temporary files -func ReadFormFilesToTempFiles(r *http.Request, key string) ([]*os.File, error) { - if err := r.ParseMultipartForm(32 << 20); err != nil { - return nil, err - } - - files := make([]*os.File, 0, len(r.MultipartForm.File[key])) - - for _, fileHeader := range r.MultipartForm.File[key] { - file, err := readFileHeaderToTempFile(fileHeader) - if err != nil { - return nil, err - } - - files = append(files, file) - } - - return files, nil -} - -// readFileHeaderToTempFile reads multipart.FileHeader and writes it to a temporary file -func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error) { - formFile, err := fileHeader.Open() - if err != nil { - return nil, err - } - - defer formFile.Close() - - // Use .* as suffix, because the asterisk is a placeholder for the random value, - // and the period allows consumers of this file to remove the suffix to obtain the original file name - file, err := os.CreateTemp("", fileHeader.Filename+".*") - if err != nil { - return nil, err - } - - defer file.Close() - - _, err = io.Copy(file, formFile) - if err != nil { - return nil, err - } - - return file, nil -} - -func parseTimes(param string) ([]time.Time, error) { - splits := strings.Split(param, ",") - times := make([]time.Time, 0, len(splits)) - for _, v := range splits { - t, err := parseTime(v) - if err != nil { - return nil, err - } - times = append(times, t) - } - return times, nil -} - -// parseTime will parses a string parameter into a time.Time using the RFC3339 format -func parseTime(param string) (time.Time, error) { - if param == "" { - return time.Time{}, nil - } - return time.Parse(time.RFC3339, param) -} - -type Number interface { - ~int32 | ~int64 | ~float32 | ~float64 -} - -type ParseString[T Number | string | bool] func(v string) (T, error) - -// parseFloat64 parses a string parameter to an float64. -func parseFloat64(param string) (float64, error) { - if param == "" { - return 0, nil - } - - return strconv.ParseFloat(param, 64) -} - -// parseFloat32 parses a string parameter to an float32. -func parseFloat32(param string) (float32, error) { - if param == "" { - return 0, nil - } - - v, err := strconv.ParseFloat(param, 32) - return float32(v), err -} - -// parseInt64 parses a string parameter to an int64. -func parseInt64(param string) (int64, error) { - if param == "" { - return 0, nil - } - - return strconv.ParseInt(param, 10, 64) -} - -// parseInt32 parses a string parameter to an int32. -func parseInt32(param string) (int32, error) { - if param == "" { - return 0, nil - } - - val, err := strconv.ParseInt(param, 10, 32) - return int32(val), err -} - -// parseBool parses a string parameter to an bool. -func parseBool(param string) (bool, error) { - if param == "" { - return false, nil - } - - return strconv.ParseBool(param) -} - -type Operation[T Number | string | bool] func(actual string) (T, bool, error) - -func WithRequire[T Number | string | bool](parse ParseString[T]) Operation[T] { - var empty T - return func(actual string) (T, bool, error) { - if actual == "" { - return empty, false, errors.New(errMsgRequiredMissing) - } - - v, err := parse(actual) - return v, false, err - } -} - -func WithDefaultOrParse[T Number | string | bool](def T, parse ParseString[T]) Operation[T] { - return func(actual string) (T, bool, error) { - if actual == "" { - return def, true, nil - } - - v, err := parse(actual) - return v, false, err - } -} - -func WithParse[T Number | string | bool](parse ParseString[T]) Operation[T] { - return func(actual string) (T, bool, error) { - v, err := parse(actual) - return v, false, err - } -} - -type Constraint[T Number | string | bool] func(actual T) error - -func WithMinimum[T Number](expected T) Constraint[T] { - return func(actual T) error { - if actual < expected { - return errors.New(errMsgMinValueConstraint) - } - - return nil - } -} - -func WithMaximum[T Number](expected T) Constraint[T] { - return func(actual T) error { - if actual > expected { - return errors.New(errMsgMaxValueConstraint) - } - - return nil - } -} - -// parseNumericParameter parses a numeric parameter to its respective type. -func parseNumericParameter[T Number](param string, fn Operation[T], checks ...Constraint[T]) (T, error) { - v, ok, err := fn(param) - if err != nil { - return 0, err - } - - if !ok { - for _, check := range checks { - if err := check(v); err != nil { - return 0, err - } - } - } - - return v, nil -} - -// parseBoolParameter parses a string parameter to a bool -func parseBoolParameter(param string, fn Operation[bool]) (bool, error) { - v, _, err := fn(param) - return v, err -} - -// parseNumericArrayParameter parses a string parameter containing array of values to its respective type. -func parseNumericArrayParameter[T Number](param, delim string, required bool, fn Operation[T], checks ...Constraint[T]) ([]T, error) { - if param == "" { - if required { - return nil, errors.New(errMsgRequiredMissing) - } - - return nil, nil - } - - str := strings.Split(param, delim) - values := make([]T, len(str)) - - for i, s := range str { - v, ok, err := fn(s) - if err != nil { - return nil, err - } - - if !ok { - for _, check := range checks { - if err := check(v); err != nil { - return nil, err - } - } - } - - values[i] = v - } - - return values, nil -} - - -// parseQuery parses query parameters and returns an error if any malformed value pairs are encountered. -func parseQuery(rawQuery string) (url.Values, error) { - return url.ParseQuery(rawQuery) -} \ No newline at end of file diff --git a/samples/server/others/go-server/no-body-path-params/go/helpers.go b/samples/server/others/go-server/no-body-path-params/go/helpers.go index 9c9664853e65..1306a51d3d66 100644 --- a/samples/server/others/go-server/no-body-path-params/go/helpers.go +++ b/samples/server/others/go-server/no-body-path-params/go/helpers.go @@ -11,7 +11,17 @@ package petstoreserver import ( + "encoding/json" + "errors" + "io" + "mime/multipart" + "net/http" + "net/url" + "os" "reflect" + "strconv" + "strings" + "time" ) // Response return a ImplResponse struct filled @@ -69,3 +79,289 @@ func AssertRecurseValueRequired[T any](value reflect.Value, callback func(T) err } return nil } + +// EncodeJSONResponse uses the json encoder to write an interface to the http response with an optional status code +func EncodeJSONResponse(i interface{}, status *int, headers map[string][]string, w http.ResponseWriter) error { + wHeader := w.Header() + for key, values := range headers { + for _, value := range values { + wHeader.Add(key, value) + } + } + + f, ok := i.(*os.File) + if ok { + data, err := io.ReadAll(f) + if err != nil { + return err + } + wHeader.Set("Content-Type", http.DetectContentType(data)) + wHeader.Set("Content-Disposition", "attachment; filename="+f.Name()) + if status != nil { + w.WriteHeader(*status) + } else { + w.WriteHeader(http.StatusOK) + } + _, err = w.Write(data) + return err + } + wHeader.Set("Content-Type", "application/json; charset=UTF-8") + + if status != nil { + w.WriteHeader(*status) + } else { + w.WriteHeader(http.StatusOK) + } + + if i != nil { + return json.NewEncoder(w).Encode(i) + } + + return nil +} + +// ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file +func ReadFormFileToTempFile(r *http.Request, key string) (*os.File, error) { + _, fileHeader, err := r.FormFile(key) + if err != nil { + return nil, err + } + + return readFileHeaderToTempFile(fileHeader) +} + +// ReadFormFilesToTempFiles reads files array data from a request form and writes it to a temporary files +func ReadFormFilesToTempFiles(r *http.Request, key string) ([]*os.File, error) { + if err := r.ParseMultipartForm(32 << 20); err != nil { + return nil, err + } + + files := make([]*os.File, 0, len(r.MultipartForm.File[key])) + + for _, fileHeader := range r.MultipartForm.File[key] { + file, err := readFileHeaderToTempFile(fileHeader) + if err != nil { + return nil, err + } + + files = append(files, file) + } + + return files, nil +} + +// readFileHeaderToTempFile reads multipart.FileHeader and writes it to a temporary file +func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error) { + formFile, err := fileHeader.Open() + if err != nil { + return nil, err + } + + defer formFile.Close() + + // Use .* as suffix, because the asterisk is a placeholder for the random value, + // and the period allows consumers of this file to remove the suffix to obtain the original file name + file, err := os.CreateTemp("", fileHeader.Filename+".*") + if err != nil { + return nil, err + } + + defer file.Close() + + _, err = io.Copy(file, formFile) + if err != nil { + return nil, err + } + + return file, nil +} + +func parseTimes(param string) ([]time.Time, error) { + splits := strings.Split(param, ",") + times := make([]time.Time, 0, len(splits)) + for _, v := range splits { + t, err := parseTime(v) + if err != nil { + return nil, err + } + times = append(times, t) + } + return times, nil +} + +// parseTime will parses a string parameter into a time.Time using the RFC3339 format +func parseTime(param string) (time.Time, error) { + if param == "" { + return time.Time{}, nil + } + return time.Parse(time.RFC3339, param) +} + +type Number interface { + ~int32 | ~int64 | ~float32 | ~float64 +} + +type ParseString[T Number | string | bool] func(v string) (T, error) + +// parseFloat64 parses a string parameter to an float64. +func parseFloat64(param string) (float64, error) { + if param == "" { + return 0, nil + } + + return strconv.ParseFloat(param, 64) +} + +// parseFloat32 parses a string parameter to an float32. +func parseFloat32(param string) (float32, error) { + if param == "" { + return 0, nil + } + + v, err := strconv.ParseFloat(param, 32) + return float32(v), err +} + +// parseInt64 parses a string parameter to an int64. +func parseInt64(param string) (int64, error) { + if param == "" { + return 0, nil + } + + return strconv.ParseInt(param, 10, 64) +} + +// parseInt32 parses a string parameter to an int32. +func parseInt32(param string) (int32, error) { + if param == "" { + return 0, nil + } + + val, err := strconv.ParseInt(param, 10, 32) + return int32(val), err +} + +// parseBool parses a string parameter to an bool. +func parseBool(param string) (bool, error) { + if param == "" { + return false, nil + } + + return strconv.ParseBool(param) +} + +type Operation[T Number | string | bool] func(actual string) (T, bool, error) + +func WithRequire[T Number | string | bool](parse ParseString[T]) Operation[T] { + var empty T + return func(actual string) (T, bool, error) { + if actual == "" { + return empty, false, errors.New(errMsgRequiredMissing) + } + + v, err := parse(actual) + return v, false, err + } +} + +func WithDefaultOrParse[T Number | string | bool](def T, parse ParseString[T]) Operation[T] { + return func(actual string) (T, bool, error) { + if actual == "" { + return def, true, nil + } + + v, err := parse(actual) + return v, false, err + } +} + +func WithParse[T Number | string | bool](parse ParseString[T]) Operation[T] { + return func(actual string) (T, bool, error) { + v, err := parse(actual) + return v, false, err + } +} + +type Constraint[T Number | string | bool] func(actual T) error + +func WithMinimum[T Number](expected T) Constraint[T] { + return func(actual T) error { + if actual < expected { + return errors.New(errMsgMinValueConstraint) + } + + return nil + } +} + +func WithMaximum[T Number](expected T) Constraint[T] { + return func(actual T) error { + if actual > expected { + return errors.New(errMsgMaxValueConstraint) + } + + return nil + } +} + +// parseNumericParameter parses a numeric parameter to its respective type. +func parseNumericParameter[T Number](param string, fn Operation[T], checks ...Constraint[T]) (T, error) { + v, ok, err := fn(param) + if err != nil { + return 0, err + } + + if !ok { + for _, check := range checks { + if err := check(v); err != nil { + return 0, err + } + } + } + + return v, nil +} + +// parseBoolParameter parses a string parameter to a bool +func parseBoolParameter(param string, fn Operation[bool]) (bool, error) { + v, _, err := fn(param) + return v, err +} + +// parseNumericArrayParameter parses a string parameter containing array of values to its respective type. +func parseNumericArrayParameter[T Number](param, delim string, required bool, fn Operation[T], checks ...Constraint[T]) ([]T, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + values := make([]T, len(str)) + + for i, s := range str { + v, ok, err := fn(s) + if err != nil { + return nil, err + } + + if !ok { + for _, check := range checks { + if err := check(v); err != nil { + return nil, err + } + } + } + + values[i] = v + } + + return values, nil +} + +// parseQuery parses query parameters and returns an error if any malformed value pairs are encountered. +func parseQuery(rawQuery string) (url.Values, error) { + return url.ParseQuery(rawQuery) +} diff --git a/samples/server/others/go-server/no-body-path-params/go/logger.go b/samples/server/others/go-server/no-body-path-params/go/logger.go index 09211a7dc10f..77dab1906cf6 100644 --- a/samples/server/others/go-server/no-body-path-params/go/logger.go +++ b/samples/server/others/go-server/no-body-path-params/go/logger.go @@ -11,8 +11,8 @@ package petstoreserver import ( - "log" "net/http" + "log" "time" ) diff --git a/samples/server/others/go-server/no-body-path-params/go/routers.go b/samples/server/others/go-server/no-body-path-params/go/routers.go index 249c28f9e3bb..d89a1de60ce2 100644 --- a/samples/server/others/go-server/no-body-path-params/go/routers.go +++ b/samples/server/others/go-server/no-body-path-params/go/routers.go @@ -11,17 +11,8 @@ package petstoreserver import ( - "encoding/json" - "errors" - "time" - "github.com/gorilla/mux" - "io" - "mime/multipart" "net/http" - "net/url" - "os" - "strconv" - "strings" + "github.com/gorilla/mux" ) // A Route defines the parameters for an api endpoint @@ -61,290 +52,3 @@ func NewRouter(routers ...Router) *mux.Router { return router } - -// EncodeJSONResponse uses the json encoder to write an interface to the http response with an optional status code -func EncodeJSONResponse(i interface{}, status *int, headers map[string][]string, w http.ResponseWriter) error { - wHeader := w.Header() - for key, values := range headers { - for _, value := range values { - wHeader.Add(key, value) - } - } - - f, ok := i.(*os.File) - if ok { - data, err := io.ReadAll(f) - if err != nil { - return err - } - wHeader.Set("Content-Type", http.DetectContentType(data)) - wHeader.Set("Content-Disposition", "attachment; filename="+f.Name()) - if status != nil { - w.WriteHeader(*status) - } else { - w.WriteHeader(http.StatusOK) - } - _, err = w.Write(data) - return err - } - wHeader.Set("Content-Type", "application/json; charset=UTF-8") - - if status != nil { - w.WriteHeader(*status) - } else { - w.WriteHeader(http.StatusOK) - } - - if i != nil { - return json.NewEncoder(w).Encode(i) - } - - return nil -} - -// ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file -func ReadFormFileToTempFile(r *http.Request, key string) (*os.File, error) { - _, fileHeader, err := r.FormFile(key) - if err != nil { - return nil, err - } - - return readFileHeaderToTempFile(fileHeader) -} - -// ReadFormFilesToTempFiles reads files array data from a request form and writes it to a temporary files -func ReadFormFilesToTempFiles(r *http.Request, key string) ([]*os.File, error) { - if err := r.ParseMultipartForm(32 << 20); err != nil { - return nil, err - } - - files := make([]*os.File, 0, len(r.MultipartForm.File[key])) - - for _, fileHeader := range r.MultipartForm.File[key] { - file, err := readFileHeaderToTempFile(fileHeader) - if err != nil { - return nil, err - } - - files = append(files, file) - } - - return files, nil -} - -// readFileHeaderToTempFile reads multipart.FileHeader and writes it to a temporary file -func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error) { - formFile, err := fileHeader.Open() - if err != nil { - return nil, err - } - - defer formFile.Close() - - // Use .* as suffix, because the asterisk is a placeholder for the random value, - // and the period allows consumers of this file to remove the suffix to obtain the original file name - file, err := os.CreateTemp("", fileHeader.Filename+".*") - if err != nil { - return nil, err - } - - defer file.Close() - - _, err = io.Copy(file, formFile) - if err != nil { - return nil, err - } - - return file, nil -} - -func parseTimes(param string) ([]time.Time, error) { - splits := strings.Split(param, ",") - times := make([]time.Time, 0, len(splits)) - for _, v := range splits { - t, err := parseTime(v) - if err != nil { - return nil, err - } - times = append(times, t) - } - return times, nil -} - -// parseTime will parses a string parameter into a time.Time using the RFC3339 format -func parseTime(param string) (time.Time, error) { - if param == "" { - return time.Time{}, nil - } - return time.Parse(time.RFC3339, param) -} - -type Number interface { - ~int32 | ~int64 | ~float32 | ~float64 -} - -type ParseString[T Number | string | bool] func(v string) (T, error) - -// parseFloat64 parses a string parameter to an float64. -func parseFloat64(param string) (float64, error) { - if param == "" { - return 0, nil - } - - return strconv.ParseFloat(param, 64) -} - -// parseFloat32 parses a string parameter to an float32. -func parseFloat32(param string) (float32, error) { - if param == "" { - return 0, nil - } - - v, err := strconv.ParseFloat(param, 32) - return float32(v), err -} - -// parseInt64 parses a string parameter to an int64. -func parseInt64(param string) (int64, error) { - if param == "" { - return 0, nil - } - - return strconv.ParseInt(param, 10, 64) -} - -// parseInt32 parses a string parameter to an int32. -func parseInt32(param string) (int32, error) { - if param == "" { - return 0, nil - } - - val, err := strconv.ParseInt(param, 10, 32) - return int32(val), err -} - -// parseBool parses a string parameter to an bool. -func parseBool(param string) (bool, error) { - if param == "" { - return false, nil - } - - return strconv.ParseBool(param) -} - -type Operation[T Number | string | bool] func(actual string) (T, bool, error) - -func WithRequire[T Number | string | bool](parse ParseString[T]) Operation[T] { - var empty T - return func(actual string) (T, bool, error) { - if actual == "" { - return empty, false, errors.New(errMsgRequiredMissing) - } - - v, err := parse(actual) - return v, false, err - } -} - -func WithDefaultOrParse[T Number | string | bool](def T, parse ParseString[T]) Operation[T] { - return func(actual string) (T, bool, error) { - if actual == "" { - return def, true, nil - } - - v, err := parse(actual) - return v, false, err - } -} - -func WithParse[T Number | string | bool](parse ParseString[T]) Operation[T] { - return func(actual string) (T, bool, error) { - v, err := parse(actual) - return v, false, err - } -} - -type Constraint[T Number | string | bool] func(actual T) error - -func WithMinimum[T Number](expected T) Constraint[T] { - return func(actual T) error { - if actual < expected { - return errors.New(errMsgMinValueConstraint) - } - - return nil - } -} - -func WithMaximum[T Number](expected T) Constraint[T] { - return func(actual T) error { - if actual > expected { - return errors.New(errMsgMaxValueConstraint) - } - - return nil - } -} - -// parseNumericParameter parses a numeric parameter to its respective type. -func parseNumericParameter[T Number](param string, fn Operation[T], checks ...Constraint[T]) (T, error) { - v, ok, err := fn(param) - if err != nil { - return 0, err - } - - if !ok { - for _, check := range checks { - if err := check(v); err != nil { - return 0, err - } - } - } - - return v, nil -} - -// parseBoolParameter parses a string parameter to a bool -func parseBoolParameter(param string, fn Operation[bool]) (bool, error) { - v, _, err := fn(param) - return v, err -} - -// parseNumericArrayParameter parses a string parameter containing array of values to its respective type. -func parseNumericArrayParameter[T Number](param, delim string, required bool, fn Operation[T], checks ...Constraint[T]) ([]T, error) { - if param == "" { - if required { - return nil, errors.New(errMsgRequiredMissing) - } - - return nil, nil - } - - str := strings.Split(param, delim) - values := make([]T, len(str)) - - for i, s := range str { - v, ok, err := fn(s) - if err != nil { - return nil, err - } - - if !ok { - for _, check := range checks { - if err := check(v); err != nil { - return nil, err - } - } - } - - values[i] = v - } - - return values, nil -} - - -// parseQuery parses query parameters and returns an error if any malformed value pairs are encountered. -func parseQuery(rawQuery string) (url.Values, error) { - return url.ParseQuery(rawQuery) -} \ No newline at end of file diff --git a/samples/server/petstore/go-api-server/go.sum b/samples/server/petstore/go-api-server/go.sum new file mode 100644 index 000000000000..535028803d22 --- /dev/null +++ b/samples/server/petstore/go-api-server/go.sum @@ -0,0 +1,2 @@ +github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= diff --git a/samples/server/petstore/go-api-server/go/helpers.go b/samples/server/petstore/go-api-server/go/helpers.go index 027954b0c9b9..6f7103489034 100644 --- a/samples/server/petstore/go-api-server/go/helpers.go +++ b/samples/server/petstore/go-api-server/go/helpers.go @@ -11,7 +11,17 @@ package petstoreserver import ( + "encoding/json" + "errors" + "io" + "mime/multipart" + "net/http" + "net/url" + "os" "reflect" + "strconv" + "strings" + "time" ) // Response return a ImplResponse struct filled @@ -69,3 +79,289 @@ func AssertRecurseValueRequired[T any](value reflect.Value, callback func(T) err } return nil } + +// EncodeJSONResponse uses the json encoder to write an interface to the http response with an optional status code +func EncodeJSONResponse(i interface{}, status *int, headers map[string][]string, w http.ResponseWriter) error { + wHeader := w.Header() + for key, values := range headers { + for _, value := range values { + wHeader.Add(key, value) + } + } + + f, ok := i.(*os.File) + if ok { + data, err := io.ReadAll(f) + if err != nil { + return err + } + wHeader.Set("Content-Type", http.DetectContentType(data)) + wHeader.Set("Content-Disposition", "attachment; filename="+f.Name()) + if status != nil { + w.WriteHeader(*status) + } else { + w.WriteHeader(http.StatusOK) + } + _, err = w.Write(data) + return err + } + wHeader.Set("Content-Type", "application/json; charset=UTF-8") + + if status != nil { + w.WriteHeader(*status) + } else { + w.WriteHeader(http.StatusOK) + } + + if i != nil { + return json.NewEncoder(w).Encode(i) + } + + return nil +} + +// ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file +func ReadFormFileToTempFile(r *http.Request, key string) (*os.File, error) { + _, fileHeader, err := r.FormFile(key) + if err != nil { + return nil, err + } + + return readFileHeaderToTempFile(fileHeader) +} + +// ReadFormFilesToTempFiles reads files array data from a request form and writes it to a temporary files +func ReadFormFilesToTempFiles(r *http.Request, key string) ([]*os.File, error) { + if err := r.ParseMultipartForm(32 << 20); err != nil { + return nil, err + } + + files := make([]*os.File, 0, len(r.MultipartForm.File[key])) + + for _, fileHeader := range r.MultipartForm.File[key] { + file, err := readFileHeaderToTempFile(fileHeader) + if err != nil { + return nil, err + } + + files = append(files, file) + } + + return files, nil +} + +// readFileHeaderToTempFile reads multipart.FileHeader and writes it to a temporary file +func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error) { + formFile, err := fileHeader.Open() + if err != nil { + return nil, err + } + + defer formFile.Close() + + // Use .* as suffix, because the asterisk is a placeholder for the random value, + // and the period allows consumers of this file to remove the suffix to obtain the original file name + file, err := os.CreateTemp("", fileHeader.Filename+".*") + if err != nil { + return nil, err + } + + defer file.Close() + + _, err = io.Copy(file, formFile) + if err != nil { + return nil, err + } + + return file, nil +} + +func parseTimes(param string) ([]time.Time, error) { + splits := strings.Split(param, ",") + times := make([]time.Time, 0, len(splits)) + for _, v := range splits { + t, err := parseTime(v) + if err != nil { + return nil, err + } + times = append(times, t) + } + return times, nil +} + +// parseTime will parses a string parameter into a time.Time using the RFC3339 format +func parseTime(param string) (time.Time, error) { + if param == "" { + return time.Time{}, nil + } + return time.Parse(time.RFC3339, param) +} + +type Number interface { + ~int32 | ~int64 | ~float32 | ~float64 +} + +type ParseString[T Number | string | bool] func(v string) (T, error) + +// parseFloat64 parses a string parameter to an float64. +func parseFloat64(param string) (float64, error) { + if param == "" { + return 0, nil + } + + return strconv.ParseFloat(param, 64) +} + +// parseFloat32 parses a string parameter to an float32. +func parseFloat32(param string) (float32, error) { + if param == "" { + return 0, nil + } + + v, err := strconv.ParseFloat(param, 32) + return float32(v), err +} + +// parseInt64 parses a string parameter to an int64. +func parseInt64(param string) (int64, error) { + if param == "" { + return 0, nil + } + + return strconv.ParseInt(param, 10, 64) +} + +// parseInt32 parses a string parameter to an int32. +func parseInt32(param string) (int32, error) { + if param == "" { + return 0, nil + } + + val, err := strconv.ParseInt(param, 10, 32) + return int32(val), err +} + +// parseBool parses a string parameter to an bool. +func parseBool(param string) (bool, error) { + if param == "" { + return false, nil + } + + return strconv.ParseBool(param) +} + +type Operation[T Number | string | bool] func(actual string) (T, bool, error) + +func WithRequire[T Number | string | bool](parse ParseString[T]) Operation[T] { + var empty T + return func(actual string) (T, bool, error) { + if actual == "" { + return empty, false, errors.New(errMsgRequiredMissing) + } + + v, err := parse(actual) + return v, false, err + } +} + +func WithDefaultOrParse[T Number | string | bool](def T, parse ParseString[T]) Operation[T] { + return func(actual string) (T, bool, error) { + if actual == "" { + return def, true, nil + } + + v, err := parse(actual) + return v, false, err + } +} + +func WithParse[T Number | string | bool](parse ParseString[T]) Operation[T] { + return func(actual string) (T, bool, error) { + v, err := parse(actual) + return v, false, err + } +} + +type Constraint[T Number | string | bool] func(actual T) error + +func WithMinimum[T Number](expected T) Constraint[T] { + return func(actual T) error { + if actual < expected { + return errors.New(errMsgMinValueConstraint) + } + + return nil + } +} + +func WithMaximum[T Number](expected T) Constraint[T] { + return func(actual T) error { + if actual > expected { + return errors.New(errMsgMaxValueConstraint) + } + + return nil + } +} + +// parseNumericParameter parses a numeric parameter to its respective type. +func parseNumericParameter[T Number](param string, fn Operation[T], checks ...Constraint[T]) (T, error) { + v, ok, err := fn(param) + if err != nil { + return 0, err + } + + if !ok { + for _, check := range checks { + if err := check(v); err != nil { + return 0, err + } + } + } + + return v, nil +} + +// parseBoolParameter parses a string parameter to a bool +func parseBoolParameter(param string, fn Operation[bool]) (bool, error) { + v, _, err := fn(param) + return v, err +} + +// parseNumericArrayParameter parses a string parameter containing array of values to its respective type. +func parseNumericArrayParameter[T Number](param, delim string, required bool, fn Operation[T], checks ...Constraint[T]) ([]T, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + values := make([]T, len(str)) + + for i, s := range str { + v, ok, err := fn(s) + if err != nil { + return nil, err + } + + if !ok { + for _, check := range checks { + if err := check(v); err != nil { + return nil, err + } + } + } + + values[i] = v + } + + return values, nil +} + +// parseQuery parses query parameters and returns an error if any malformed value pairs are encountered. +func parseQuery(rawQuery string) (url.Values, error) { + return url.ParseQuery(rawQuery) +} diff --git a/samples/server/petstore/go-api-server/go/logger.go b/samples/server/petstore/go-api-server/go/logger.go index b01819630b20..fc11db530493 100644 --- a/samples/server/petstore/go-api-server/go/logger.go +++ b/samples/server/petstore/go-api-server/go/logger.go @@ -11,8 +11,8 @@ package petstoreserver import ( - "log" "net/http" + "log" "time" ) diff --git a/samples/server/petstore/go-api-server/go/routers.go b/samples/server/petstore/go-api-server/go/routers.go index 183a2d8d10f7..cbb3a397f4a9 100644 --- a/samples/server/petstore/go-api-server/go/routers.go +++ b/samples/server/petstore/go-api-server/go/routers.go @@ -11,17 +11,8 @@ package petstoreserver import ( - "encoding/json" - "errors" - "time" - "github.com/gorilla/mux" - "io" - "mime/multipart" "net/http" - "net/url" - "os" - "strconv" - "strings" + "github.com/gorilla/mux" ) // A Route defines the parameters for an api endpoint @@ -61,290 +52,3 @@ func NewRouter(routers ...Router) *mux.Router { return router } - -// EncodeJSONResponse uses the json encoder to write an interface to the http response with an optional status code -func EncodeJSONResponse(i interface{}, status *int, headers map[string][]string, w http.ResponseWriter) error { - wHeader := w.Header() - for key, values := range headers { - for _, value := range values { - wHeader.Add(key, value) - } - } - - f, ok := i.(*os.File) - if ok { - data, err := io.ReadAll(f) - if err != nil { - return err - } - wHeader.Set("Content-Type", http.DetectContentType(data)) - wHeader.Set("Content-Disposition", "attachment; filename="+f.Name()) - if status != nil { - w.WriteHeader(*status) - } else { - w.WriteHeader(http.StatusOK) - } - _, err = w.Write(data) - return err - } - wHeader.Set("Content-Type", "application/json; charset=UTF-8") - - if status != nil { - w.WriteHeader(*status) - } else { - w.WriteHeader(http.StatusOK) - } - - if i != nil { - return json.NewEncoder(w).Encode(i) - } - - return nil -} - -// ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file -func ReadFormFileToTempFile(r *http.Request, key string) (*os.File, error) { - _, fileHeader, err := r.FormFile(key) - if err != nil { - return nil, err - } - - return readFileHeaderToTempFile(fileHeader) -} - -// ReadFormFilesToTempFiles reads files array data from a request form and writes it to a temporary files -func ReadFormFilesToTempFiles(r *http.Request, key string) ([]*os.File, error) { - if err := r.ParseMultipartForm(32 << 20); err != nil { - return nil, err - } - - files := make([]*os.File, 0, len(r.MultipartForm.File[key])) - - for _, fileHeader := range r.MultipartForm.File[key] { - file, err := readFileHeaderToTempFile(fileHeader) - if err != nil { - return nil, err - } - - files = append(files, file) - } - - return files, nil -} - -// readFileHeaderToTempFile reads multipart.FileHeader and writes it to a temporary file -func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error) { - formFile, err := fileHeader.Open() - if err != nil { - return nil, err - } - - defer formFile.Close() - - // Use .* as suffix, because the asterisk is a placeholder for the random value, - // and the period allows consumers of this file to remove the suffix to obtain the original file name - file, err := os.CreateTemp("", fileHeader.Filename+".*") - if err != nil { - return nil, err - } - - defer file.Close() - - _, err = io.Copy(file, formFile) - if err != nil { - return nil, err - } - - return file, nil -} - -func parseTimes(param string) ([]time.Time, error) { - splits := strings.Split(param, ",") - times := make([]time.Time, 0, len(splits)) - for _, v := range splits { - t, err := parseTime(v) - if err != nil { - return nil, err - } - times = append(times, t) - } - return times, nil -} - -// parseTime will parses a string parameter into a time.Time using the RFC3339 format -func parseTime(param string) (time.Time, error) { - if param == "" { - return time.Time{}, nil - } - return time.Parse(time.RFC3339, param) -} - -type Number interface { - ~int32 | ~int64 | ~float32 | ~float64 -} - -type ParseString[T Number | string | bool] func(v string) (T, error) - -// parseFloat64 parses a string parameter to an float64. -func parseFloat64(param string) (float64, error) { - if param == "" { - return 0, nil - } - - return strconv.ParseFloat(param, 64) -} - -// parseFloat32 parses a string parameter to an float32. -func parseFloat32(param string) (float32, error) { - if param == "" { - return 0, nil - } - - v, err := strconv.ParseFloat(param, 32) - return float32(v), err -} - -// parseInt64 parses a string parameter to an int64. -func parseInt64(param string) (int64, error) { - if param == "" { - return 0, nil - } - - return strconv.ParseInt(param, 10, 64) -} - -// parseInt32 parses a string parameter to an int32. -func parseInt32(param string) (int32, error) { - if param == "" { - return 0, nil - } - - val, err := strconv.ParseInt(param, 10, 32) - return int32(val), err -} - -// parseBool parses a string parameter to an bool. -func parseBool(param string) (bool, error) { - if param == "" { - return false, nil - } - - return strconv.ParseBool(param) -} - -type Operation[T Number | string | bool] func(actual string) (T, bool, error) - -func WithRequire[T Number | string | bool](parse ParseString[T]) Operation[T] { - var empty T - return func(actual string) (T, bool, error) { - if actual == "" { - return empty, false, errors.New(errMsgRequiredMissing) - } - - v, err := parse(actual) - return v, false, err - } -} - -func WithDefaultOrParse[T Number | string | bool](def T, parse ParseString[T]) Operation[T] { - return func(actual string) (T, bool, error) { - if actual == "" { - return def, true, nil - } - - v, err := parse(actual) - return v, false, err - } -} - -func WithParse[T Number | string | bool](parse ParseString[T]) Operation[T] { - return func(actual string) (T, bool, error) { - v, err := parse(actual) - return v, false, err - } -} - -type Constraint[T Number | string | bool] func(actual T) error - -func WithMinimum[T Number](expected T) Constraint[T] { - return func(actual T) error { - if actual < expected { - return errors.New(errMsgMinValueConstraint) - } - - return nil - } -} - -func WithMaximum[T Number](expected T) Constraint[T] { - return func(actual T) error { - if actual > expected { - return errors.New(errMsgMaxValueConstraint) - } - - return nil - } -} - -// parseNumericParameter parses a numeric parameter to its respective type. -func parseNumericParameter[T Number](param string, fn Operation[T], checks ...Constraint[T]) (T, error) { - v, ok, err := fn(param) - if err != nil { - return 0, err - } - - if !ok { - for _, check := range checks { - if err := check(v); err != nil { - return 0, err - } - } - } - - return v, nil -} - -// parseBoolParameter parses a string parameter to a bool -func parseBoolParameter(param string, fn Operation[bool]) (bool, error) { - v, _, err := fn(param) - return v, err -} - -// parseNumericArrayParameter parses a string parameter containing array of values to its respective type. -func parseNumericArrayParameter[T Number](param, delim string, required bool, fn Operation[T], checks ...Constraint[T]) ([]T, error) { - if param == "" { - if required { - return nil, errors.New(errMsgRequiredMissing) - } - - return nil, nil - } - - str := strings.Split(param, delim) - values := make([]T, len(str)) - - for i, s := range str { - v, ok, err := fn(s) - if err != nil { - return nil, err - } - - if !ok { - for _, check := range checks { - if err := check(v); err != nil { - return nil, err - } - } - } - - values[i] = v - } - - return values, nil -} - - -// parseQuery parses query parameters and returns an error if any malformed value pairs are encountered. -func parseQuery(rawQuery string) (url.Values, error) { - return url.ParseQuery(rawQuery) -} \ No newline at end of file diff --git a/samples/server/petstore/go-api-server/samples_tests/routers_test.go b/samples/server/petstore/go-api-server/samples_tests/routers_test.go index 6c2686fb86d9..dcc0e491c868 100644 --- a/samples/server/petstore/go-api-server/samples_tests/routers_test.go +++ b/samples/server/petstore/go-api-server/samples_tests/routers_test.go @@ -31,8 +31,8 @@ func Test_Routers(t *testing.T) { lines := utils.ReadLines(filepath) expected := "type Routes map[string]Route" - if lines[34] != expected { - t.Errorf("Expected '%s', but got '%s'", expected, lines[34]) + if lines[25] != expected { + t.Errorf("Expected '%s', but got '%s'", expected, lines[25]) } }) } diff --git a/samples/server/petstore/go-chi-server/go/helpers.go b/samples/server/petstore/go-chi-server/go/helpers.go index 027954b0c9b9..6f7103489034 100644 --- a/samples/server/petstore/go-chi-server/go/helpers.go +++ b/samples/server/petstore/go-chi-server/go/helpers.go @@ -11,7 +11,17 @@ package petstoreserver import ( + "encoding/json" + "errors" + "io" + "mime/multipart" + "net/http" + "net/url" + "os" "reflect" + "strconv" + "strings" + "time" ) // Response return a ImplResponse struct filled @@ -69,3 +79,289 @@ func AssertRecurseValueRequired[T any](value reflect.Value, callback func(T) err } return nil } + +// EncodeJSONResponse uses the json encoder to write an interface to the http response with an optional status code +func EncodeJSONResponse(i interface{}, status *int, headers map[string][]string, w http.ResponseWriter) error { + wHeader := w.Header() + for key, values := range headers { + for _, value := range values { + wHeader.Add(key, value) + } + } + + f, ok := i.(*os.File) + if ok { + data, err := io.ReadAll(f) + if err != nil { + return err + } + wHeader.Set("Content-Type", http.DetectContentType(data)) + wHeader.Set("Content-Disposition", "attachment; filename="+f.Name()) + if status != nil { + w.WriteHeader(*status) + } else { + w.WriteHeader(http.StatusOK) + } + _, err = w.Write(data) + return err + } + wHeader.Set("Content-Type", "application/json; charset=UTF-8") + + if status != nil { + w.WriteHeader(*status) + } else { + w.WriteHeader(http.StatusOK) + } + + if i != nil { + return json.NewEncoder(w).Encode(i) + } + + return nil +} + +// ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file +func ReadFormFileToTempFile(r *http.Request, key string) (*os.File, error) { + _, fileHeader, err := r.FormFile(key) + if err != nil { + return nil, err + } + + return readFileHeaderToTempFile(fileHeader) +} + +// ReadFormFilesToTempFiles reads files array data from a request form and writes it to a temporary files +func ReadFormFilesToTempFiles(r *http.Request, key string) ([]*os.File, error) { + if err := r.ParseMultipartForm(32 << 20); err != nil { + return nil, err + } + + files := make([]*os.File, 0, len(r.MultipartForm.File[key])) + + for _, fileHeader := range r.MultipartForm.File[key] { + file, err := readFileHeaderToTempFile(fileHeader) + if err != nil { + return nil, err + } + + files = append(files, file) + } + + return files, nil +} + +// readFileHeaderToTempFile reads multipart.FileHeader and writes it to a temporary file +func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error) { + formFile, err := fileHeader.Open() + if err != nil { + return nil, err + } + + defer formFile.Close() + + // Use .* as suffix, because the asterisk is a placeholder for the random value, + // and the period allows consumers of this file to remove the suffix to obtain the original file name + file, err := os.CreateTemp("", fileHeader.Filename+".*") + if err != nil { + return nil, err + } + + defer file.Close() + + _, err = io.Copy(file, formFile) + if err != nil { + return nil, err + } + + return file, nil +} + +func parseTimes(param string) ([]time.Time, error) { + splits := strings.Split(param, ",") + times := make([]time.Time, 0, len(splits)) + for _, v := range splits { + t, err := parseTime(v) + if err != nil { + return nil, err + } + times = append(times, t) + } + return times, nil +} + +// parseTime will parses a string parameter into a time.Time using the RFC3339 format +func parseTime(param string) (time.Time, error) { + if param == "" { + return time.Time{}, nil + } + return time.Parse(time.RFC3339, param) +} + +type Number interface { + ~int32 | ~int64 | ~float32 | ~float64 +} + +type ParseString[T Number | string | bool] func(v string) (T, error) + +// parseFloat64 parses a string parameter to an float64. +func parseFloat64(param string) (float64, error) { + if param == "" { + return 0, nil + } + + return strconv.ParseFloat(param, 64) +} + +// parseFloat32 parses a string parameter to an float32. +func parseFloat32(param string) (float32, error) { + if param == "" { + return 0, nil + } + + v, err := strconv.ParseFloat(param, 32) + return float32(v), err +} + +// parseInt64 parses a string parameter to an int64. +func parseInt64(param string) (int64, error) { + if param == "" { + return 0, nil + } + + return strconv.ParseInt(param, 10, 64) +} + +// parseInt32 parses a string parameter to an int32. +func parseInt32(param string) (int32, error) { + if param == "" { + return 0, nil + } + + val, err := strconv.ParseInt(param, 10, 32) + return int32(val), err +} + +// parseBool parses a string parameter to an bool. +func parseBool(param string) (bool, error) { + if param == "" { + return false, nil + } + + return strconv.ParseBool(param) +} + +type Operation[T Number | string | bool] func(actual string) (T, bool, error) + +func WithRequire[T Number | string | bool](parse ParseString[T]) Operation[T] { + var empty T + return func(actual string) (T, bool, error) { + if actual == "" { + return empty, false, errors.New(errMsgRequiredMissing) + } + + v, err := parse(actual) + return v, false, err + } +} + +func WithDefaultOrParse[T Number | string | bool](def T, parse ParseString[T]) Operation[T] { + return func(actual string) (T, bool, error) { + if actual == "" { + return def, true, nil + } + + v, err := parse(actual) + return v, false, err + } +} + +func WithParse[T Number | string | bool](parse ParseString[T]) Operation[T] { + return func(actual string) (T, bool, error) { + v, err := parse(actual) + return v, false, err + } +} + +type Constraint[T Number | string | bool] func(actual T) error + +func WithMinimum[T Number](expected T) Constraint[T] { + return func(actual T) error { + if actual < expected { + return errors.New(errMsgMinValueConstraint) + } + + return nil + } +} + +func WithMaximum[T Number](expected T) Constraint[T] { + return func(actual T) error { + if actual > expected { + return errors.New(errMsgMaxValueConstraint) + } + + return nil + } +} + +// parseNumericParameter parses a numeric parameter to its respective type. +func parseNumericParameter[T Number](param string, fn Operation[T], checks ...Constraint[T]) (T, error) { + v, ok, err := fn(param) + if err != nil { + return 0, err + } + + if !ok { + for _, check := range checks { + if err := check(v); err != nil { + return 0, err + } + } + } + + return v, nil +} + +// parseBoolParameter parses a string parameter to a bool +func parseBoolParameter(param string, fn Operation[bool]) (bool, error) { + v, _, err := fn(param) + return v, err +} + +// parseNumericArrayParameter parses a string parameter containing array of values to its respective type. +func parseNumericArrayParameter[T Number](param, delim string, required bool, fn Operation[T], checks ...Constraint[T]) ([]T, error) { + if param == "" { + if required { + return nil, errors.New(errMsgRequiredMissing) + } + + return nil, nil + } + + str := strings.Split(param, delim) + values := make([]T, len(str)) + + for i, s := range str { + v, ok, err := fn(s) + if err != nil { + return nil, err + } + + if !ok { + for _, check := range checks { + if err := check(v); err != nil { + return nil, err + } + } + } + + values[i] = v + } + + return values, nil +} + +// parseQuery parses query parameters and returns an error if any malformed value pairs are encountered. +func parseQuery(rawQuery string) (url.Values, error) { + return url.ParseQuery(rawQuery) +} diff --git a/samples/server/petstore/go-chi-server/go/logger.go b/samples/server/petstore/go-chi-server/go/logger.go index b01819630b20..6f3cf7355f88 100644 --- a/samples/server/petstore/go-chi-server/go/logger.go +++ b/samples/server/petstore/go-chi-server/go/logger.go @@ -11,23 +11,10 @@ package petstoreserver import ( - "log" "net/http" - "time" + "github.com/go-chi/chi/v5/middleware" ) -func Logger(inner http.Handler, name string) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - start := time.Now() - - inner.ServeHTTP(w, r) - - log.Printf( - "%s %s %s %s", - r.Method, - r.RequestURI, - name, - time.Since(start), - ) - }) +func Logger(inner http.Handler) http.Handler { + return middleware.Logger(inner) } diff --git a/samples/server/petstore/go-chi-server/go/routers.go b/samples/server/petstore/go-chi-server/go/routers.go index 4d662e273c58..438895d1afec 100644 --- a/samples/server/petstore/go-chi-server/go/routers.go +++ b/samples/server/petstore/go-chi-server/go/routers.go @@ -11,18 +11,8 @@ package petstoreserver import ( - "encoding/json" - "errors" - "time" - "github.com/go-chi/chi/v5" - "github.com/go-chi/chi/v5/middleware" - "io" - "mime/multipart" "net/http" - "net/url" - "os" - "strconv" - "strings" + "github.com/go-chi/chi/v5" ) // A Route defines the parameters for an api endpoint @@ -47,7 +37,7 @@ const errMsgMaxValueConstraint = "provided parameter is not respecting maximum v // NewRouter creates a new router for any number of api routers func NewRouter(routers ...Router) chi.Router { router := chi.NewRouter() - router.Use(middleware.Logger) + router.Use(Logger) for _, api := range routers { for _, route := range api.Routes() { var handler http.Handler = route.HandlerFunc @@ -57,290 +47,3 @@ func NewRouter(routers ...Router) chi.Router { return router } - -// EncodeJSONResponse uses the json encoder to write an interface to the http response with an optional status code -func EncodeJSONResponse(i interface{}, status *int, headers map[string][]string, w http.ResponseWriter) error { - wHeader := w.Header() - for key, values := range headers { - for _, value := range values { - wHeader.Add(key, value) - } - } - - f, ok := i.(*os.File) - if ok { - data, err := io.ReadAll(f) - if err != nil { - return err - } - wHeader.Set("Content-Type", http.DetectContentType(data)) - wHeader.Set("Content-Disposition", "attachment; filename="+f.Name()) - if status != nil { - w.WriteHeader(*status) - } else { - w.WriteHeader(http.StatusOK) - } - _, err = w.Write(data) - return err - } - wHeader.Set("Content-Type", "application/json; charset=UTF-8") - - if status != nil { - w.WriteHeader(*status) - } else { - w.WriteHeader(http.StatusOK) - } - - if i != nil { - return json.NewEncoder(w).Encode(i) - } - - return nil -} - -// ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file -func ReadFormFileToTempFile(r *http.Request, key string) (*os.File, error) { - _, fileHeader, err := r.FormFile(key) - if err != nil { - return nil, err - } - - return readFileHeaderToTempFile(fileHeader) -} - -// ReadFormFilesToTempFiles reads files array data from a request form and writes it to a temporary files -func ReadFormFilesToTempFiles(r *http.Request, key string) ([]*os.File, error) { - if err := r.ParseMultipartForm(32 << 20); err != nil { - return nil, err - } - - files := make([]*os.File, 0, len(r.MultipartForm.File[key])) - - for _, fileHeader := range r.MultipartForm.File[key] { - file, err := readFileHeaderToTempFile(fileHeader) - if err != nil { - return nil, err - } - - files = append(files, file) - } - - return files, nil -} - -// readFileHeaderToTempFile reads multipart.FileHeader and writes it to a temporary file -func readFileHeaderToTempFile(fileHeader *multipart.FileHeader) (*os.File, error) { - formFile, err := fileHeader.Open() - if err != nil { - return nil, err - } - - defer formFile.Close() - - // Use .* as suffix, because the asterisk is a placeholder for the random value, - // and the period allows consumers of this file to remove the suffix to obtain the original file name - file, err := os.CreateTemp("", fileHeader.Filename+".*") - if err != nil { - return nil, err - } - - defer file.Close() - - _, err = io.Copy(file, formFile) - if err != nil { - return nil, err - } - - return file, nil -} - -func parseTimes(param string) ([]time.Time, error) { - splits := strings.Split(param, ",") - times := make([]time.Time, 0, len(splits)) - for _, v := range splits { - t, err := parseTime(v) - if err != nil { - return nil, err - } - times = append(times, t) - } - return times, nil -} - -// parseTime will parses a string parameter into a time.Time using the RFC3339 format -func parseTime(param string) (time.Time, error) { - if param == "" { - return time.Time{}, nil - } - return time.Parse(time.RFC3339, param) -} - -type Number interface { - ~int32 | ~int64 | ~float32 | ~float64 -} - -type ParseString[T Number | string | bool] func(v string) (T, error) - -// parseFloat64 parses a string parameter to an float64. -func parseFloat64(param string) (float64, error) { - if param == "" { - return 0, nil - } - - return strconv.ParseFloat(param, 64) -} - -// parseFloat32 parses a string parameter to an float32. -func parseFloat32(param string) (float32, error) { - if param == "" { - return 0, nil - } - - v, err := strconv.ParseFloat(param, 32) - return float32(v), err -} - -// parseInt64 parses a string parameter to an int64. -func parseInt64(param string) (int64, error) { - if param == "" { - return 0, nil - } - - return strconv.ParseInt(param, 10, 64) -} - -// parseInt32 parses a string parameter to an int32. -func parseInt32(param string) (int32, error) { - if param == "" { - return 0, nil - } - - val, err := strconv.ParseInt(param, 10, 32) - return int32(val), err -} - -// parseBool parses a string parameter to an bool. -func parseBool(param string) (bool, error) { - if param == "" { - return false, nil - } - - return strconv.ParseBool(param) -} - -type Operation[T Number | string | bool] func(actual string) (T, bool, error) - -func WithRequire[T Number | string | bool](parse ParseString[T]) Operation[T] { - var empty T - return func(actual string) (T, bool, error) { - if actual == "" { - return empty, false, errors.New(errMsgRequiredMissing) - } - - v, err := parse(actual) - return v, false, err - } -} - -func WithDefaultOrParse[T Number | string | bool](def T, parse ParseString[T]) Operation[T] { - return func(actual string) (T, bool, error) { - if actual == "" { - return def, true, nil - } - - v, err := parse(actual) - return v, false, err - } -} - -func WithParse[T Number | string | bool](parse ParseString[T]) Operation[T] { - return func(actual string) (T, bool, error) { - v, err := parse(actual) - return v, false, err - } -} - -type Constraint[T Number | string | bool] func(actual T) error - -func WithMinimum[T Number](expected T) Constraint[T] { - return func(actual T) error { - if actual < expected { - return errors.New(errMsgMinValueConstraint) - } - - return nil - } -} - -func WithMaximum[T Number](expected T) Constraint[T] { - return func(actual T) error { - if actual > expected { - return errors.New(errMsgMaxValueConstraint) - } - - return nil - } -} - -// parseNumericParameter parses a numeric parameter to its respective type. -func parseNumericParameter[T Number](param string, fn Operation[T], checks ...Constraint[T]) (T, error) { - v, ok, err := fn(param) - if err != nil { - return 0, err - } - - if !ok { - for _, check := range checks { - if err := check(v); err != nil { - return 0, err - } - } - } - - return v, nil -} - -// parseBoolParameter parses a string parameter to a bool -func parseBoolParameter(param string, fn Operation[bool]) (bool, error) { - v, _, err := fn(param) - return v, err -} - -// parseNumericArrayParameter parses a string parameter containing array of values to its respective type. -func parseNumericArrayParameter[T Number](param, delim string, required bool, fn Operation[T], checks ...Constraint[T]) ([]T, error) { - if param == "" { - if required { - return nil, errors.New(errMsgRequiredMissing) - } - - return nil, nil - } - - str := strings.Split(param, delim) - values := make([]T, len(str)) - - for i, s := range str { - v, ok, err := fn(s) - if err != nil { - return nil, err - } - - if !ok { - for _, check := range checks { - if err := check(v); err != nil { - return nil, err - } - } - } - - values[i] = v - } - - return values, nil -} - - -// parseQuery parses query parameters and returns an error if any malformed value pairs are encountered. -func parseQuery(rawQuery string) (url.Values, error) { - return url.ParseQuery(rawQuery) -} \ No newline at end of file From b50b13bdc72612e60c9fe09cb16e7dba3bd54590 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 9 Mar 2025 15:32:35 +0100 Subject: [PATCH 03/47] Fix hashcode and equals --- .../main/resources/Java/libraries/webclient/pojo.mustache | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache index 2b9423b773f9..acdcfe8c0b27 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache @@ -306,8 +306,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}} && Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} @@ -321,7 +323,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} From f0e1a7475f576463add1a9da97b4e386585b2d33 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 9 Mar 2025 16:13:47 +0100 Subject: [PATCH 04/47] Revert Microfile (still using extends HashMap) --- .../Java/libraries/feign/pojo.mustache | 6 ++- .../Java/libraries/jersey2/pojo.mustache | 6 ++- .../Java/libraries/jersey3/pojo.mustache | 6 ++- .../microprofile/pojoOverrides.mustache | 2 +- .../Java/libraries/native/pojo.mustache | 6 ++- .../Java/libraries/okhttp-gson/pojo.mustache | 6 ++- .../Java/libraries/resttemplate/pojo.mustache | 6 ++- .../src/main/resources/Java/pojo.mustache | 6 ++- .../main/resources/JavaSpring/pojo.mustache | 6 ++- .../codegen/java/JavaClientCodegenTest.java | 27 +++++++---- .../java/spring/SpringCodegenTest.java | 14 +++++- .../resources/3_0/additionalProperties.yaml | 48 +++++++++++++++++-- .../openapitools/client/model/ParentPet.java | 3 +- 13 files changed, 110 insertions(+), 32 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache index a5bcc87bd928..e9ade1874c5a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache @@ -265,8 +265,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}} && Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache index 0d8bc23c6cc7..d3dae8723595 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache @@ -285,8 +285,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}}&& Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache index 0d8bc23c6cc7..d3dae8723595 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache @@ -285,8 +285,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}}&& Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache index 28fdf0da2f1b..f0fbb0b200e8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache @@ -28,7 +28,7 @@ return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}); {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache index 5413d1cdcd8e..daa3ee0df4d8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache @@ -289,8 +289,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}}&& Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache index 3d76d23b0c86..a26ad49fc5ad 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache @@ -203,8 +203,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{^-last}} && {{/-last}}{{/vars}}{{#isAdditionalPropertiesTrue}}&& Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/isAdditionalPropertiesTrue}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache index 79d8b0e63cd0..6c4100566def 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache @@ -306,8 +306,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}} && Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache index 09482dd66e66..22feb2655c3b 100644 --- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache @@ -304,8 +304,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{classname}} {{classVarName}} = ({{classname}}) o; return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index ac4d556fd22a..eadabd7f1c2a 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -318,8 +318,10 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}} return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}} && Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} private static boolean equalsNullable(JsonNullable a, JsonNullable b) { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index cc02e356a12d..e44390948058 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -3481,18 +3481,18 @@ public void testEnumWithImplements() { @DataProvider(name = "javaClientLibrariesForHashCodeTest") public Object[][] javaClientLibraries() { return new Object[][] { - {JavaClientCodegen.RESTTEMPLATE, "Objects.hash(additionalProperties)" }, - {JavaClientCodegen.NATIVE, "Objects.hash(super.hashCode(), additionalProperties)"}, - {JavaClientCodegen.OKHTTP_GSON, "Objects.hash(additionalProperties)" }, - {JavaClientCodegen.MICROPROFILE, "Objects.hash(super.hashCode(), additionalProperties)" }, - {JavaClientCodegen.JERSEY2, "Objects.hash(additionalProperties)" }, - {JavaClientCodegen.JERSEY3, "Objects.hash(additionalProperties)" }, - {JavaClientCodegen.FEIGN, "Objects.hash(additionalProperties)" }, + {JavaClientCodegen.RESTTEMPLATE, "Objects.hash(additionalProperties)", "Objects.hash(name, additionalProperties)" }, + {JavaClientCodegen.NATIVE, "Objects.hash(super.hashCode(), additionalProperties)", "Objects.hash(name, super.hashCode(), additionalProperties)" }, + {JavaClientCodegen.OKHTTP_GSON, "Objects.hash(additionalProperties)", "Objects.hash(name, additionalProperties)" }, + {JavaClientCodegen.JERSEY2, "Objects.hash(additionalProperties)", "Objects.hash(name, additionalProperties)" }, + {JavaClientCodegen.JERSEY3, "Objects.hash(additionalProperties)", "Objects.hash(name, additionalProperties)" }, + {JavaClientCodegen.FEIGN, "Objects.hash(additionalProperties)", "Objects.hash(name, additionalProperties)" }, + {JavaClientCodegen.WEBCLIENT, "Objects.hash(additionalProperties)", "Objects.hash(name, additionalProperties)" }, }; } @Test(dataProvider = "javaClientLibrariesForHashCodeTest") - public void testAdditionalPropertiesWithGnerateAliasAsModelGenerateCorrectHashCode(String library, String hashCode) { + public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHashCode(String library, String hashCode, String hashCodeWithName) { final Path output = newTempFolder(); final CodegenConfigurator configurator = new CodegenConfigurator() .setGeneratorName("java") @@ -3504,6 +3504,15 @@ public void testAdditionalPropertiesWithGnerateAliasAsModelGenerateCorrectHashCo Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() .stream().collect(Collectors.toMap(File::getName, Function.identity())); - JavaFileAssert.assertThat(files.get("SampleObject.java")).fileContains(hashCode); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeObject.java")).fileContains(hashCode); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains(hashCode); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTrue.java")).fileContains(hashCode); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeObject.java")).fileContains(hashCodeWithName); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeString.java")).fileContains(hashCodeWithName); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTrue.java")).fileContains(hashCodeWithName); + + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains( + "AdditionalPropertiesOnlyTypeString additionalPropertiesOnlyTypeString = (AdditionalPropertiesOnlyTypeString) o;", + "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties)"); } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 8c5c19dc03d3..74dd87a2e248 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5385,7 +5385,7 @@ public void testEnumWithImplements() { } @Test - public void testAdditionalPropertiesWithGnerateAliasAsModelGenerateCorrectHashCode() { + public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHashCodeAndEquals() { final Path output = newTempFolder(); final CodegenConfigurator configurator = new CodegenConfigurator() .setGeneratorName("spring") @@ -5396,6 +5396,16 @@ public void testAdditionalPropertiesWithGnerateAliasAsModelGenerateCorrectHashCo Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() .stream().collect(Collectors.toMap(File::getName, Function.identity())); - JavaFileAssert.assertThat(files.get("SampleObject.java")).fileContains(" return Objects.hash(additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains("return Objects.hash(additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeObject.java")).fileContains("return Objects.hash(additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains("return Objects.hash(additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTrue.java")).fileContains("return Objects.hash(additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeObject.java")).fileContains("return Objects.hash(name, additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeString.java")).fileContains("return Objects.hash(name, additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTrue.java")).fileContains("return Objects.hash(name, additionalProperties)"); + + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains( + "AdditionalPropertiesOnlyTypeString additionalPropertiesOnlyTypeString = (AdditionalPropertiesOnlyTypeString) o;", + "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties);"); } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml index dceeaf005169..6610ba0a1cd6 100644 --- a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml @@ -11,10 +11,52 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/SampleObject' + $ref: '#/components/schemas/Response' components: schemas: - SampleObject: + Response: type: object + properties: + additionalPropertiesOnlyTypeObject: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeObject' + additionalPropertiesOnlyTypeString: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeString' + additionalPropertiesTypeObject: + $ref: '#/components/schemas/AdditionalPropertiesTypeObject' + additionalPropertiesTypeString: + $ref: '#/components/schemas/AdditionalPropertiesTypeString' + additionalPropertiesTrue: + $ref: '#/components/schemas/AdditionalPropertiesTrue' + additionalPropertiesOnlyTrue: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTrue' + AdditionalPropertiesOnlyTypeObject: + type: object + additionalProperties: + type: object + AdditionalPropertiesOnlyTypeString: + type: object + additionalProperties: + type: string + AdditionalPropertiesTypeObject: + type: object + properties: + name: + type: string additionalProperties: - type: object \ No newline at end of file + type: object + AdditionalPropertiesTypeString: + type: object + properties: + name: + type: string + additionalProperties: + type: string + AdditionalPropertiesOnlyTrue: + type: object + additionalProperties: true + AdditionalPropertiesTrue: + type: object + properties: + name: + type: string + additionalProperties: true diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java index 94b5215c103d..293ac69e95fc 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java @@ -108,7 +108,8 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - return super.equals(o); + ParentPet parentPet = (ParentPet) o; + return Objects.equals(this.additionalProperties, parentPet.additionalProperties) && super.equals(o); } @Override From abf73198129d80399ba519bac183f129de1b4c2c Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 9 Mar 2025 18:00:26 +0100 Subject: [PATCH 05/47] Fix defaultValue for AdditionalProperties fields when using generateAliasAsModel --- .../languages/AbstractJavaCodegen.java | 6 +++ .../codegen/java/JavaClientCodegenTest.java | 42 +++++++++++++++++++ .../java/spring/SpringCodegenTest.java | 2 + 3 files changed, 50 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 66175b1b9543..d4028bd09810 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -68,6 +68,7 @@ import static org.openapitools.codegen.utils.CamelizeOption.*; import static org.openapitools.codegen.utils.ModelUtils.getSchemaItems; +import static org.openapitools.codegen.utils.ModelUtils.isGenerateAliasAsModel; import static org.openapitools.codegen.utils.OnceLogger.once; import static org.openapitools.codegen.utils.StringUtils.*; @@ -1329,6 +1330,11 @@ public String toDefaultValue(CodegenProperty cp, Schema schema) { return null; } + if (isGenerateAliasAsModel()) { + // additionalProperties generated + return null; + } + return String.format(Locale.ROOT, "new %s<>()", instantiationTypes().getOrDefault("map", "HashMap")); } else if (ModelUtils.isIntegerSchema(schema)) { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index e44390948058..ad9c4416a894 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -3514,5 +3514,47 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains( "AdditionalPropertiesOnlyTypeString additionalPropertiesOnlyTypeString = (AdditionalPropertiesOnlyTypeString) o;", "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties)"); + + JavaFileAssert.assertThat(files.get("Response.java")).fileContains("AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); + } + + @Test + public void testAdditionalPropertiesWithGenerateAliasForMicroProfile() { + final Path output = newTempFolder(); + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("java") + .setGenerateAliasAsModel(true) + .setLibrary(MICROPROFILE) + .setInputSpec("src/test/resources/3_0/additionalProperties.yaml") + .setOutputDir(output.toString().replace("\\", "/")); + + Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() + .stream().collect(Collectors.toMap(File::getName, Function.identity())); + + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeObject.java")).fileContains( + "extends HashMap", + "return Objects.hash(super.hashCode())", + "return super.equals(o)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains( + "extends HashMap", + "return Objects.hash(super.hashCode())", + "return super.equals(o)"); + + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTrue.java")).fileContains( + "extends HashMap", + "return Objects.hash(super.hashCode())", + "return super.equals(o)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeObject.java")).fileContains( + "HashMap", + "return Objects.hash(name, super.hashCode())"); + + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeString.java")).fileContains( + "HashMap", + "return Objects.hash(name, super.hashCode())"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTrue.java")).fileContains( + "HashMap", + "return Objects.hash(name, super.hashCode())"); + + JavaFileAssert.assertThat(files.get("Response.java")).fileContains("AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 74dd87a2e248..f863ef7179d3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5407,5 +5407,7 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains( "AdditionalPropertiesOnlyTypeString additionalPropertiesOnlyTypeString = (AdditionalPropertiesOnlyTypeString) o;", "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties);"); + + JavaFileAssert.assertThat(files.get("Response.java")).fileContains("AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); } } \ No newline at end of file From 349c8501ffa4764955b058e1a027275bc72afc0b Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 9 Mar 2025 18:42:33 +0100 Subject: [PATCH 06/47] Fix test for defaultValue for AdditionalProperties fields when using generateAliasAsModel --- .../org/openapitools/codegen/java/AbstractJavaCodegenTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java index b85b45544691..73bb96fe7eac 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java @@ -552,7 +552,7 @@ public void toDefaultValueTest() { ModelUtils.setGenerateAliasAsModel(true); defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), schema); - Assert.assertEquals(defaultValue, "new HashMap<>()"); + Assert.assertNull(defaultValue); // Test default value for date format DateSchema dateSchema = new DateSchema(); From 21be5f5abce437f491f88f742c51e86efe0a46d6 Mon Sep 17 00:00:00 2001 From: mahmoud_ zeyada Date: Mon, 10 Mar 2025 17:07:21 +0200 Subject: [PATCH 07/47] fix(typescript-nestjs): handle query params serialization properly (#20755) * fix(typescript-nestjs): handle query params serialization properly * fix(typescript-nestjs): updated the samples for param serialization fix --- .../src/main/resources/typescript-nestjs/api.service.mustache | 2 +- .../builds/default/api/pet.service.ts | 4 ++-- .../builds/default/api/pet.service.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-nestjs/api.service.mustache b/modules/openapi-generator/src/main/resources/typescript-nestjs/api.service.mustache index 87f73c75d521..88081decc4d5 100644 --- a/modules/openapi-generator/src/main/resources/typescript-nestjs/api.service.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-nestjs/api.service.mustache @@ -137,7 +137,7 @@ export class {{classname}} { }) {{/isCollectionFormatMulti}} {{^isCollectionFormatMulti}} - queryParameters['{{baseName}}'] = {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}']); + queryParameters.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])); {{/isCollectionFormatMulti}} } {{/isArray}} diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts index 81bbb54a9ca4..c0dadd250275 100644 --- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts @@ -176,7 +176,7 @@ export class PetService { let queryParameters = new URLSearchParams(); if (status) { - queryParameters['status'] = status.join(COLLECTION_FORMATS['csv']); + queryParameters.append('status', status.join(COLLECTION_FORMATS['csv'])); } let headers = {...this.defaultHeaders}; @@ -236,7 +236,7 @@ export class PetService { let queryParameters = new URLSearchParams(); if (tags) { - queryParameters['tags'] = tags.join(COLLECTION_FORMATS['csv']); + queryParameters.append('tags', tags.join(COLLECTION_FORMATS['csv'])); } let headers = {...this.defaultHeaders}; diff --git a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/pet.service.ts index 61cd6549aa03..7c87dbf7bc21 100644 --- a/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default/api/pet.service.ts @@ -177,7 +177,7 @@ export class PetService { let queryParameters = new URLSearchParams(); if (status) { - queryParameters['status'] = status.join(COLLECTION_FORMATS['csv']); + queryParameters.append('status', status.join(COLLECTION_FORMATS['csv'])); } let headers = {...this.defaultHeaders}; @@ -237,7 +237,7 @@ export class PetService { let queryParameters = new URLSearchParams(); if (tags) { - queryParameters['tags'] = tags.join(COLLECTION_FORMATS['csv']); + queryParameters.append('tags', tags.join(COLLECTION_FORMATS['csv'])); } let headers = {...this.defaultHeaders}; From 0e34d398337dbeea8136bbdf830cdecb3110f618 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 11 Mar 2025 00:02:30 +0800 Subject: [PATCH 08/47] add tests, option for useVirtualHooks (csharp) (#20837) --- .github/workflows/samples-dotnet8-client.yaml | 1 + .../csharp-restsharp-useVirtualForHooks.yaml | 10 + docs/generators/csharp.md | 1 + .../codegen/CodegenConstants.java | 2 +- .../languages/CSharpClientCodegen.java | 4 + .../net8/useVirtualForHooks/.gitignore | 362 ++++++++ .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 36 + .../.openapi-generator/VERSION | 1 + .../useVirtualForHooks/Org.OpenAPITools.sln | 27 + .../net8/useVirtualForHooks/README.md | 145 +++ .../net8/useVirtualForHooks/api/openapi.yaml | 152 ++++ .../net8/useVirtualForHooks/appveyor.yml | 9 + .../net8/useVirtualForHooks/docs/Category.md | 12 + .../net8/useVirtualForHooks/docs/Pet.md | 16 + .../net8/useVirtualForHooks/docs/PetApi.md | 101 +++ .../net8/useVirtualForHooks/docs/Tag.md | 12 + .../net8/useVirtualForHooks/git_push.sh | 57 ++ .../Org.OpenAPITools.Test/Api/PetApiTests.cs | 69 ++ .../Model/CategoryTests.cs | 75 ++ .../Org.OpenAPITools.Test/Model/PetTests.cs | 111 +++ .../Org.OpenAPITools.Test/Model/TagTests.cs | 75 ++ .../Org.OpenAPITools.Test.csproj | 20 + .../src/Org.OpenAPITools/Api/PetApi.cs | 388 ++++++++ .../src/Org.OpenAPITools/Client/ApiClient.cs | 838 ++++++++++++++++++ .../Org.OpenAPITools/Client/ApiException.cs | 68 ++ .../Org.OpenAPITools/Client/ApiResponse.cs | 166 ++++ .../Client/Auth/OAuthAuthenticator.cs | 144 +++ .../Org.OpenAPITools/Client/Auth/OAuthFlow.cs | 27 + .../Client/Auth/TokenResponse.cs | 32 + .../Org.OpenAPITools/Client/ClientUtils.cs | 253 ++++++ .../Org.OpenAPITools/Client/Configuration.cs | 648 ++++++++++++++ .../Client/ExceptionFactory.cs | 22 + .../Client/GlobalConfiguration.cs | 67 ++ .../src/Org.OpenAPITools/Client/HttpMethod.cs | 33 + .../Org.OpenAPITools/Client/IApiAccessor.cs | 37 + .../Client/IAsynchronousClient.cs | 100 +++ .../Client/IReadableConfiguration.cs | 172 ++++ .../Client/ISynchronousClient.cs | 93 ++ .../src/Org.OpenAPITools/Client/Multimap.cs | 295 ++++++ .../Client/OpenAPIDateConverter.cs | 29 + .../Org.OpenAPITools/Client/RequestOptions.cs | 89 ++ .../Client/RetryConfiguration.cs | 31 + .../Model/AbstractOpenAPISchema.cs | 76 ++ .../src/Org.OpenAPITools/Model/Category.cs | 100 +++ .../src/Org.OpenAPITools/Model/Pet.cs | 173 ++++ .../src/Org.OpenAPITools/Model/Tag.cs | 91 ++ .../Org.OpenAPITools/Org.OpenAPITools.csproj | 35 + 48 files changed, 5327 insertions(+), 1 deletion(-) create mode 100644 bin/configs/csharp-restsharp-useVirtualForHooks.yaml create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.gitignore create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.openapi-generator-ignore create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.openapi-generator/FILES create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.openapi-generator/VERSION create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/Org.OpenAPITools.sln create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/README.md create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/api/openapi.yaml create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/appveyor.yml create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/Category.md create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/Pet.md create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/PetApi.md create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/Tag.md create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/git_push.sh create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Api/PetApiTests.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Model/CategoryTests.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Model/PetTests.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Model/TagTests.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Api/PetApi.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiClient.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiException.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiResponse.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ClientUtils.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Configuration.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ExceptionFactory.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/GlobalConfiguration.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/HttpMethod.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/IApiAccessor.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/IAsynchronousClient.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/IReadableConfiguration.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ISynchronousClient.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Multimap.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/RequestOptions.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/RetryConfiguration.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/Category.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/Pet.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/Tag.cs create mode 100644 samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/.github/workflows/samples-dotnet8-client.yaml b/.github/workflows/samples-dotnet8-client.yaml index a5cec7eab108..4bb9e894bdd8 100644 --- a/.github/workflows/samples-dotnet8-client.yaml +++ b/.github/workflows/samples-dotnet8-client.yaml @@ -16,6 +16,7 @@ jobs: matrix: sample: - samples/client/petstore/csharp/restsharp/net8/ParameterMappings/ + - samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/ steps: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4.3.0 diff --git a/bin/configs/csharp-restsharp-useVirtualForHooks.yaml b/bin/configs/csharp-restsharp-useVirtualForHooks.yaml new file mode 100644 index 000000000000..cc1675f55189 --- /dev/null +++ b/bin/configs/csharp-restsharp-useVirtualForHooks.yaml @@ -0,0 +1,10 @@ +# for .net standard +generatorName: csharp +library: restsharp +outputDir: samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-addpet-only.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp +additionalProperties: + packageGuid: '{D0A67E81-4061-48EB-B4B8-C73BDF8B2D95}' + targetFramework: net8.0 + useVirtualForHooks: true diff --git a/docs/generators/csharp.md b/docs/generators/csharp.md index 5b131b6e67c1..8f9ed6663542 100644 --- a/docs/generators/csharp.md +++ b/docs/generators/csharp.md @@ -54,6 +54,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |useIntForTimeout|Use int for Timeout (fall back to v7.9.0 templates). This option (for restsharp only) will be deprecated so please migrated to TimeSpan instead.| |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.| |false| |useSourceGeneration|Use source generation where available (only `generichost` library supports this option).| |false| +|useVirtualForHooks|Generate code that exposes public virtual hooks on ApiClient to customize low-level HTTP requests (only `restsharp`. `httpclient` libraries support this option).| |false| |validatable|Generates self-validatable models.| |true| |zeroBasedEnums|Enumerations with string values will start from 0 when true, 1 when false. If not set, enumerations with string values will start from 0 if the first value is 'unknown', case insensitive.| |null| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java index 58a29c2d6729..ae52412b7d2d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java @@ -287,7 +287,7 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case, public static final String SUPPORTS_ASYNC_DESC = "Generate code that supports async operations."; public static final String USE_VIRTUAL_FOR_HOOKS = "useVirtualForHooks"; - public static final String USE_VIRTUAL_FOR_HOOKS_DESC = "Generate code that exposes public virtual hooks on ApiClient to customize low-level HTTP requests."; + public static final String USE_VIRTUAL_FOR_HOOKS_DESC = "Generate code that exposes public virtual hooks on ApiClient to customize low-level HTTP requests (only `restsharp`. `httpclient` libraries support this option)."; public static final String EXCLUDE_TESTS = "excludeTests"; public static final String EXCLUDE_TESTS_DESC = "Specifies that no tests are to be generated."; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java index 46f51531eb47..4eb82fe1c847 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java @@ -357,6 +357,10 @@ public CSharpClientCodegen() { "Use source generation where available (only `generichost` library supports this option).", this.getUseSourceGeneration()); + addSwitch(CodegenConstants.USE_VIRTUAL_FOR_HOOKS, + CodegenConstants.USE_VIRTUAL_FOR_HOOKS_DESC, + this.useVirtualForHooks); + supportedLibraries.put(GENERICHOST, "HttpClient, Generic Host integration, and System.Text.Json (https://docs.microsoft.com/en-us/dotnet/core/extensions/generic-host)"); supportedLibraries.put(HTTPCLIENT, "HttpClient and Newtonsoft (https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient) " + "(Experimental. Subject to breaking changes without notice.)"); diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.gitignore b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.gitignore new file mode 100644 index 000000000000..1ee53850b84c --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.gitignore @@ -0,0 +1,362 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.openapi-generator-ignore b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.openapi-generator/FILES new file mode 100644 index 000000000000..e80c6162ae18 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.openapi-generator/FILES @@ -0,0 +1,36 @@ +.gitignore +Org.OpenAPITools.sln +README.md +api/openapi.yaml +appveyor.yml +docs/Category.md +docs/Pet.md +docs/PetApi.md +docs/Tag.md +git_push.sh +src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +src/Org.OpenAPITools/Api/PetApi.cs +src/Org.OpenAPITools/Client/ApiClient.cs +src/Org.OpenAPITools/Client/ApiException.cs +src/Org.OpenAPITools/Client/ApiResponse.cs +src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs +src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs +src/Org.OpenAPITools/Client/Auth/TokenResponse.cs +src/Org.OpenAPITools/Client/ClientUtils.cs +src/Org.OpenAPITools/Client/Configuration.cs +src/Org.OpenAPITools/Client/ExceptionFactory.cs +src/Org.OpenAPITools/Client/GlobalConfiguration.cs +src/Org.OpenAPITools/Client/HttpMethod.cs +src/Org.OpenAPITools/Client/IApiAccessor.cs +src/Org.OpenAPITools/Client/IAsynchronousClient.cs +src/Org.OpenAPITools/Client/IReadableConfiguration.cs +src/Org.OpenAPITools/Client/ISynchronousClient.cs +src/Org.OpenAPITools/Client/Multimap.cs +src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs +src/Org.OpenAPITools/Client/RequestOptions.cs +src/Org.OpenAPITools/Client/RetryConfiguration.cs +src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs +src/Org.OpenAPITools/Model/Category.cs +src/Org.OpenAPITools/Model/Pet.cs +src/Org.OpenAPITools/Model/Tag.cs +src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.openapi-generator/VERSION b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.openapi-generator/VERSION new file mode 100644 index 000000000000..96cfbb19ae28 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.13.0-SNAPSHOT diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/Org.OpenAPITools.sln b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/Org.OpenAPITools.sln new file mode 100644 index 000000000000..ae868d9e2be0 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/Org.OpenAPITools.sln @@ -0,0 +1,27 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +VisualStudioVersion = 12.0.0.0 +MinimumVisualStudioVersion = 10.0.0.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Org.OpenAPITools", "src\Org.OpenAPITools\Org.OpenAPITools.csproj", "{D0A67E81-4061-48EB-B4B8-C73BDF8B2D95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Org.OpenAPITools.Test", "src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D0A67E81-4061-48EB-B4B8-C73BDF8B2D95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D0A67E81-4061-48EB-B4B8-C73BDF8B2D95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D0A67E81-4061-48EB-B4B8-C73BDF8B2D95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D0A67E81-4061-48EB-B4B8-C73BDF8B2D95}.Release|Any CPU.Build.0 = Release|Any CPU + {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU + {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU + {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal \ No newline at end of file diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/README.md b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/README.md new file mode 100644 index 000000000000..4712a5bd2120 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/README.md @@ -0,0 +1,145 @@ +# Org.OpenAPITools - the C# library for the OpenAPI Petstore + +This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + +This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: + +- API version: 1.0.0 +- SDK version: 1.0.0 +- Generator version: 7.13.0-SNAPSHOT +- Build package: org.openapitools.codegen.languages.CSharpClientCodegen + + +## Frameworks supported + + +## Dependencies + +- [RestSharp](https://www.nuget.org/packages/RestSharp) - 112.0.0 or later +- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 13.0.2 or later +- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.8.0 or later +- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 5.0.0 or later + +The DLLs included in the package may not be the latest version. We recommend using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages: +``` +Install-Package RestSharp +Install-Package Newtonsoft.Json +Install-Package JsonSubTypes +Install-Package System.ComponentModel.Annotations +``` + +NOTE: RestSharp versions greater than 105.1.0 have a bug which causes file uploads to fail. See [RestSharp#742](https://github.com/restsharp/RestSharp/issues/742). +NOTE: RestSharp for .Net Core creates a new socket for each api call, which can lead to a socket exhaustion problem. See [RestSharp#1406](https://github.com/restsharp/RestSharp/issues/1406). + + +## Installation +Run the following command to generate the DLL +- [Mac/Linux] `/bin/sh build.sh` +- [Windows] `build.bat` + +Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces: +```csharp +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; +``` + +## Packaging + +A `.nuspec` is included with the project. You can follow the Nuget quickstart to [create](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#create-the-package) and [publish](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#publish-the-package) packages. + +This `.nuspec` uses placeholders from the `.csproj`, so build the `.csproj` directly: + +``` +nuget pack -Build -OutputDirectory out Org.OpenAPITools.csproj +``` + +Then, publish to a [local feed](https://docs.microsoft.com/en-us/nuget/hosting-packages/local-feeds) or [other host](https://docs.microsoft.com/en-us/nuget/hosting-packages/overview) and consume the new package via Nuget as usual. + + +## Usage + +To use the API client with a HTTP proxy, setup a `System.Net.WebProxy` +```csharp +Configuration c = new Configuration(); +System.Net.WebProxy webProxy = new System.Net.WebProxy("http://myProxyUrl:80/"); +webProxy.Credentials = System.Net.CredentialCache.DefaultCredentials; +c.Proxy = webProxy; +``` + + +## Getting Started + +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class Example + { + public static void Main() + { + + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io/v2"; + // Configure OAuth2 access token for authorization: petstore_auth + config.AccessToken = "YOUR_ACCESS_TOKEN"; + + var apiInstance = new PetApi(config); + var pet = new Pet(); // Pet | Pet object that needs to be added to the store + + try + { + // Add a new pet to the store + Pet result = apiInstance.AddPet(pet); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling PetApi.AddPet: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); + } + + } + } +} +``` + + +## Documentation for API Endpoints + +All URIs are relative to *http://petstore.swagger.io/v2* + +Class | Method | HTTP request | Description +------------ | ------------- | ------------- | ------------- +*PetApi* | [**AddPet**](docs/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store + + + +## Documentation for Models + + - [Model.Category](docs/Category.md) + - [Model.Pet](docs/Pet.md) + - [Model.Tag](docs/Tag.md) + + + +## Documentation for Authorization + + +Authentication schemes defined for the API: + +### petstore_auth + +- **Type**: OAuth +- **Flow**: implicit +- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog +- **Scopes**: + - write:pets: modify pets in your account + - read:pets: read your pets + diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/api/openapi.yaml new file mode 100644 index 000000000000..8a5ffeb52cab --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/api/openapi.yaml @@ -0,0 +1,152 @@ +openapi: 3.0.0 +info: + description: "This is a sample server Petstore server. For this sample, you can\ + \ use the api key `special-key` to test the authorization filters." + license: + name: Apache-2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + title: OpenAPI Petstore + version: 1.0.0 +externalDocs: + description: Find out more about Swagger + url: http://swagger.io +servers: +- url: http://petstore.swagger.io/v2 +tags: +- description: Everything about your Pets + name: pet +paths: + /pet: + post: + description: "" + operationId: addPet + requestBody: + $ref: '#/components/requestBodies/Pet' + responses: + "200": + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + description: successful operation + "405": + description: Invalid input + security: + - petstore_auth: + - write:pets + - read:pets + summary: Add a new pet to the store + tags: + - pet +components: + requestBodies: + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + schemas: + Category: + description: A category for a pet + example: + name: name + id: 6 + properties: + id: + format: int64 + type: integer + name: + pattern: "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$" + type: string + title: Pet category + type: object + xml: + name: Category + Tag: + description: A tag for a pet + example: + name: name + id: 1 + properties: + id: + format: int64 + type: integer + name: + type: string + title: Pet Tag + type: object + xml: + name: Tag + Pet: + description: A pet for sale in the pet store + example: + photoUrls: + - photoUrls + - photoUrls + name: doggie + id: 0 + category: + name: name + id: 6 + tags: + - name: name + id: 1 + - name: name + id: 1 + status: available + properties: + id: + format: int64 + type: integer + category: + $ref: '#/components/schemas/Category' + name: + example: doggie + type: string + photoUrls: + items: + type: string + type: array + xml: + name: photoUrl + wrapped: true + tags: + items: + $ref: '#/components/schemas/Tag' + type: array + xml: + name: tag + wrapped: true + status: + deprecated: true + description: pet status in the store + enum: + - available + - pending + - sold + type: string + required: + - name + - photoUrls + title: a Pet + type: object + xml: + name: Pet + securitySchemes: + petstore_auth: + flows: + implicit: + authorizationUrl: http://petstore.swagger.io/api/oauth/dialog + scopes: + write:pets: modify pets in your account + read:pets: read your pets + type: oauth2 + diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/appveyor.yml b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/appveyor.yml new file mode 100644 index 000000000000..f76f63cee506 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/appveyor.yml @@ -0,0 +1,9 @@ +# auto-generated by OpenAPI Generator (https://github.com/OpenAPITools/openapi-generator) +# +image: Visual Studio 2019 +clone_depth: 1 +build_script: +- dotnet build -c Release +- dotnet test -c Release +after_build: +- dotnet pack .\src\Org.OpenAPITools\Org.OpenAPITools.csproj -o ../../output -c Release --no-build diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/Category.md b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/Category.md new file mode 100644 index 000000000000..64e7948bbc7c --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/Category.md @@ -0,0 +1,12 @@ +# Org.OpenAPITools.Model.Category +A category for a pet + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Id** | **long** | | [optional] +**Name** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/Pet.md b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/Pet.md new file mode 100644 index 000000000000..914a070b2200 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/Pet.md @@ -0,0 +1,16 @@ +# Org.OpenAPITools.Model.Pet +A pet for sale in the pet store + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Id** | **long** | | [optional] +**Category** | [**Category**](Category.md) | | [optional] +**Name** | **string** | | +**PhotoUrls** | **List<string>** | | +**Tags** | [**List<Tag>**](Tag.md) | | [optional] +**Status** | **string** | pet status in the store | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/PetApi.md b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/PetApi.md new file mode 100644 index 000000000000..150093927edf --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/PetApi.md @@ -0,0 +1,101 @@ +# Org.OpenAPITools.Api.PetApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +| Method | HTTP request | Description | +|--------|--------------|-------------| +| [**AddPet**](PetApi.md#addpet) | **POST** /pet | Add a new pet to the store | + + +# **AddPet** +> Pet AddPet (Pet pet) + +Add a new pet to the store + +### Example +```csharp +using System.Collections.Generic; +using System.Diagnostics; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Model; + +namespace Example +{ + public class AddPetExample + { + public static void Main() + { + Configuration config = new Configuration(); + config.BasePath = "http://petstore.swagger.io/v2"; + // Configure OAuth2 access token for authorization: petstore_auth + config.AccessToken = "YOUR_ACCESS_TOKEN"; + + var apiInstance = new PetApi(config); + var pet = new Pet(); // Pet | Pet object that needs to be added to the store + + try + { + // Add a new pet to the store + Pet result = apiInstance.AddPet(pet); + Debug.WriteLine(result); + } + catch (ApiException e) + { + Debug.Print("Exception when calling PetApi.AddPet: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); + } + } + } +} +``` + +#### Using the AddPetWithHttpInfo variant +This returns an ApiResponse object which contains the response data, status code and headers. + +```csharp +try +{ + // Add a new pet to the store + ApiResponse response = apiInstance.AddPetWithHttpInfo(pet); + Debug.Write("Status Code: " + response.StatusCode); + Debug.Write("Response Headers: " + response.Headers); + Debug.Write("Response Body: " + response.Data); +} +catch (ApiException e) +{ + Debug.Print("Exception when calling PetApi.AddPetWithHttpInfo: " + e.Message); + Debug.Print("Status Code: " + e.ErrorCode); + Debug.Print(e.StackTrace); +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| **pet** | [**Pet**](Pet.md) | Pet object that needs to be added to the store | | + +### Return type + +[**Pet**](Pet.md) + +### Authorization + +[petstore_auth](../README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: application/json, application/xml + - **Accept**: application/xml, application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | successful operation | - | +| **405** | Invalid input | - | + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/Tag.md b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/Tag.md new file mode 100644 index 000000000000..14e602a9c11b --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/docs/Tag.md @@ -0,0 +1,12 @@ +# Org.OpenAPITools.Model.Tag +A tag for a pet + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Id** | **long** | | [optional] +**Name** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/git_push.sh b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/git_push.sh new file mode 100644 index 000000000000..f53a75d4fabe --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/git_push.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ +# +# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com" + +git_user_id=$1 +git_repo_id=$2 +release_note=$3 +git_host=$4 + +if [ "$git_host" = "" ]; then + git_host="github.com" + echo "[INFO] No command line input provided. Set \$git_host to $git_host" +fi + +if [ "$git_user_id" = "" ]; then + git_user_id="GIT_USER_ID" + echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id" +fi + +if [ "$git_repo_id" = "" ]; then + git_repo_id="GIT_REPO_ID" + echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id" +fi + +if [ "$release_note" = "" ]; then + release_note="Minor update" + echo "[INFO] No command line input provided. Set \$release_note to $release_note" +fi + +# Initialize the local directory as a Git repository +git init + +# Adds the files in the local repository and stages them for commit. +git add . + +# Commits the tracked changes and prepares them to be pushed to a remote repository. +git commit -m "$release_note" + +# Sets the new remote +git_remote=$(git remote) +if [ "$git_remote" = "" ]; then # git remote not defined + + if [ "$GIT_TOKEN" = "" ]; then + echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." + git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git + else + git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git + fi + +fi + +git pull origin master + +# Pushes (Forces) the changes in the local repository up to the remote repository +echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git" +git push origin master 2>&1 | grep -v 'To https' diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Api/PetApiTests.cs new file mode 100644 index 000000000000..6ff7c900eacb --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Api/PetApiTests.cs @@ -0,0 +1,69 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.IO; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reflection; +using RestSharp; +using Xunit; + +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Api; +// uncomment below to import models +//using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Test.Api +{ + /// + /// Class for testing PetApi + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the API endpoint. + /// + public class PetApiTests : IDisposable + { + private PetApi instance; + + public PetApiTests() + { + instance = new PetApi(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of PetApi + /// + [Fact] + public void InstanceTest() + { + // TODO uncomment below to test 'IsType' PetApi + //Assert.IsType(instance); + } + + /// + /// Test AddPet + /// + [Fact] + public void AddPetTest() + { + // TODO uncomment below to test the method and replace null with proper value + //Pet pet = null; + //var response = instance.AddPet(pet); + //Assert.IsType(response); + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Model/CategoryTests.cs new file mode 100644 index 000000000000..8c6fc5d10db7 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Model/CategoryTests.cs @@ -0,0 +1,75 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Category + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class CategoryTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Category + //private Category instance; + + public CategoryTests() + { + // TODO uncomment below to create an instance of Category + //instance = new Category(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Category + /// + [Fact] + public void CategoryInstanceTest() + { + // TODO uncomment below to test "IsType" Category + //Assert.IsType(instance); + } + + /// + /// Test the property 'Id' + /// + [Fact] + public void IdTest() + { + // TODO unit test for the property 'Id' + } + + /// + /// Test the property 'Name' + /// + [Fact] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Model/PetTests.cs new file mode 100644 index 000000000000..1b7f6c023496 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Model/PetTests.cs @@ -0,0 +1,111 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Pet + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class PetTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Pet + //private Pet instance; + + public PetTests() + { + // TODO uncomment below to create an instance of Pet + //instance = new Pet(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Pet + /// + [Fact] + public void PetInstanceTest() + { + // TODO uncomment below to test "IsType" Pet + //Assert.IsType(instance); + } + + /// + /// Test the property 'Id' + /// + [Fact] + public void IdTest() + { + // TODO unit test for the property 'Id' + } + + /// + /// Test the property 'Category' + /// + [Fact] + public void CategoryTest() + { + // TODO unit test for the property 'Category' + } + + /// + /// Test the property 'Name' + /// + [Fact] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + + /// + /// Test the property 'PhotoUrls' + /// + [Fact] + public void PhotoUrlsTest() + { + // TODO unit test for the property 'PhotoUrls' + } + + /// + /// Test the property 'Tags' + /// + [Fact] + public void TagsTest() + { + // TODO unit test for the property 'Tags' + } + + /// + /// Test the property 'Status' + /// + [Fact] + public void StatusTest() + { + // TODO unit test for the property 'Status' + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Model/TagTests.cs new file mode 100644 index 000000000000..c994710b0e50 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Model/TagTests.cs @@ -0,0 +1,75 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test.Model +{ + /// + /// Class for testing Tag + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class TagTests : IDisposable + { + // TODO uncomment below to declare an instance variable for Tag + //private Tag instance; + + public TagTests() + { + // TODO uncomment below to create an instance of Tag + //instance = new Tag(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of Tag + /// + [Fact] + public void TagInstanceTest() + { + // TODO uncomment below to test "IsType" Tag + //Assert.IsType(instance); + } + + /// + /// Test the property 'Id' + /// + [Fact] + public void IdTest() + { + // TODO unit test for the property 'Id' + } + + /// + /// Test the property 'Name' + /// + [Fact] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj new file mode 100644 index 000000000000..64ebed26518e --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -0,0 +1,20 @@ + + + + Org.OpenAPITools.Test + Org.OpenAPITools.Test + net8.0 + false + annotations + + + + + + + + + + + + diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Api/PetApi.cs new file mode 100644 index 000000000000..dc8e64f72b9e --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Api/PetApi.cs @@ -0,0 +1,388 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Net; +using System.Net.Mime; +using Org.OpenAPITools.Client; +using Org.OpenAPITools.Client.Auth; +using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Api +{ + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IPetApiSync : IApiAccessor + { + #region Synchronous Operations + /// + /// Add a new pet to the store + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Index associated with the operation. + /// Pet + Pet AddPet(Pet pet, int operationIndex = 0); + + /// + /// Add a new pet to the store + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Index associated with the operation. + /// ApiResponse of Pet + ApiResponse AddPetWithHttpInfo(Pet pet, int operationIndex = 0); + #endregion Synchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IPetApiAsync : IApiAccessor + { + #region Asynchronous Operations + /// + /// Add a new pet to the store + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of Pet + System.Threading.Tasks.Task AddPetAsync(Pet pet, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)); + + /// + /// Add a new pet to the store + /// + /// + /// + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (Pet) + System.Threading.Tasks.Task> AddPetWithHttpInfoAsync(Pet pet, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)); + #endregion Asynchronous Operations + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public interface IPetApi : IPetApiSync, IPetApiAsync + { + + } + + /// + /// Represents a collection of functions to interact with the API endpoints + /// + public partial class PetApi : IPetApi + { + private Org.OpenAPITools.Client.ExceptionFactory _exceptionFactory = (name, response) => null; + + /// + /// Initializes a new instance of the class. + /// + /// + public PetApi() : this((string)null) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// + public PetApi(string basePath) + { + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + new Org.OpenAPITools.Client.Configuration { BasePath = basePath } + ); + this.Client = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.AsynchronousClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class + /// using Configuration object + /// + /// An instance of Configuration + /// + public PetApi(Org.OpenAPITools.Client.Configuration configuration) + { + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Configuration = Org.OpenAPITools.Client.Configuration.MergeConfigurations( + Org.OpenAPITools.Client.GlobalConfiguration.Instance, + configuration + ); + this.Client = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + this.AsynchronousClient = new Org.OpenAPITools.Client.ApiClient(this.Configuration.BasePath); + ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// Initializes a new instance of the class + /// using a Configuration object and client instance. + /// + /// The client interface for synchronous API access. + /// The client interface for asynchronous API access. + /// The configuration object. + public PetApi(Org.OpenAPITools.Client.ISynchronousClient client, Org.OpenAPITools.Client.IAsynchronousClient asyncClient, Org.OpenAPITools.Client.IReadableConfiguration configuration) + { + if (client == null) throw new ArgumentNullException("client"); + if (asyncClient == null) throw new ArgumentNullException("asyncClient"); + if (configuration == null) throw new ArgumentNullException("configuration"); + + this.Client = client; + this.AsynchronousClient = asyncClient; + this.Configuration = configuration; + this.ExceptionFactory = Org.OpenAPITools.Client.Configuration.DefaultExceptionFactory; + } + + /// + /// The client for accessing this underlying API asynchronously. + /// + public Org.OpenAPITools.Client.IAsynchronousClient AsynchronousClient { get; set; } + + /// + /// The client for accessing this underlying API synchronously. + /// + public Org.OpenAPITools.Client.ISynchronousClient Client { get; set; } + + /// + /// Gets the base path of the API client. + /// + /// The base path + public string GetBasePath() + { + return this.Configuration.BasePath; + } + + /// + /// Gets or sets the configuration object + /// + /// An instance of the Configuration + public Org.OpenAPITools.Client.IReadableConfiguration Configuration { get; set; } + + /// + /// Provides a factory method hook for the creation of exceptions. + /// + public Org.OpenAPITools.Client.ExceptionFactory ExceptionFactory + { + get + { + if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1) + { + throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported."); + } + return _exceptionFactory; + } + set { _exceptionFactory = value; } + } + + /// + /// Add a new pet to the store + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Index associated with the operation. + /// Pet + public Pet AddPet(Pet pet, int operationIndex = 0) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = AddPetWithHttpInfo(pet); + return localVarResponse.Data; + } + + /// + /// Add a new pet to the store + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Index associated with the operation. + /// ApiResponse of Pet + public Org.OpenAPITools.Client.ApiResponse AddPetWithHttpInfo(Pet pet, int operationIndex = 0) + { + // verify the required parameter 'pet' is set + if (pet == null) + { + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'pet' when calling PetApi->AddPet"); + } + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json", + "application/xml" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + var localVarMultipartFormData = localVarContentType == "multipart/form-data"; + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + localVarRequestOptions.Data = pet; + + localVarRequestOptions.Operation = "PetApi.AddPet"; + localVarRequestOptions.OperationIndex = operationIndex; + + // authentication (petstore_auth) required + // oauth required + if (!localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + if (!string.IsNullOrEmpty(this.Configuration.AccessToken)) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + else if (!string.IsNullOrEmpty(this.Configuration.OAuthTokenUrl) && + !string.IsNullOrEmpty(this.Configuration.OAuthClientId) && + !string.IsNullOrEmpty(this.Configuration.OAuthClientSecret) && + this.Configuration.OAuthFlow != null) + { + localVarRequestOptions.OAuth = true; + } + } + + // make the HTTP request + var localVarResponse = this.Client.Post("/pet", localVarRequestOptions, this.Configuration); + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("AddPet", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + + /// + /// Add a new pet to the store + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of Pet + public async System.Threading.Tasks.Task AddPetAsync(Pet pet, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) + { + Org.OpenAPITools.Client.ApiResponse localVarResponse = await AddPetWithHttpInfoAsync(pet, operationIndex, cancellationToken).ConfigureAwait(false); + return localVarResponse.Data; + } + + /// + /// Add a new pet to the store + /// + /// Thrown when fails to make API call + /// Pet object that needs to be added to the store + /// Index associated with the operation. + /// Cancellation Token to cancel the request. + /// Task of ApiResponse (Pet) + public async System.Threading.Tasks.Task> AddPetWithHttpInfoAsync(Pet pet, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) + { + // verify the required parameter 'pet' is set + if (pet == null) + { + throw new Org.OpenAPITools.Client.ApiException(400, "Missing required parameter 'pet' when calling PetApi->AddPet"); + } + + + Org.OpenAPITools.Client.RequestOptions localVarRequestOptions = new Org.OpenAPITools.Client.RequestOptions(); + + string[] _contentTypes = new string[] { + "application/json", + "application/xml" + }; + + // to determine the Accept header + string[] _accepts = new string[] { + "application/xml", + "application/json" + }; + + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(_contentTypes); + if (localVarContentType != null) + { + localVarRequestOptions.HeaderParameters.Add("Content-Type", localVarContentType); + } + + var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(_accepts); + if (localVarAccept != null) + { + localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept); + } + + localVarRequestOptions.Data = pet; + + localVarRequestOptions.Operation = "PetApi.AddPet"; + localVarRequestOptions.OperationIndex = operationIndex; + + // authentication (petstore_auth) required + // oauth required + if (!localVarRequestOptions.HeaderParameters.ContainsKey("Authorization")) + { + if (!string.IsNullOrEmpty(this.Configuration.AccessToken)) + { + localVarRequestOptions.HeaderParameters.Add("Authorization", "Bearer " + this.Configuration.AccessToken); + } + else if (!string.IsNullOrEmpty(this.Configuration.OAuthTokenUrl) && + !string.IsNullOrEmpty(this.Configuration.OAuthClientId) && + !string.IsNullOrEmpty(this.Configuration.OAuthClientSecret) && + this.Configuration.OAuthFlow != null) + { + localVarRequestOptions.OAuth = true; + } + } + + // make the HTTP request + var localVarResponse = await this.AsynchronousClient.PostAsync("/pet", localVarRequestOptions, this.Configuration, cancellationToken).ConfigureAwait(false); + + if (this.ExceptionFactory != null) + { + Exception _exception = this.ExceptionFactory("AddPet", localVarResponse); + if (_exception != null) + { + throw _exception; + } + } + + return localVarResponse; + } + + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiClient.cs new file mode 100644 index 000000000000..a2d3ebd524e8 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiClient.cs @@ -0,0 +1,838 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Net; +using System.Reflection; +using System.Runtime.Serialization; +using System.Runtime.Serialization.Formatters; +using System.Text; +using System.Threading; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; +using RestSharp; +using RestSharp.Serializers; +using RestSharpMethod = RestSharp.Method; +using FileIO = System.IO.File; +using Polly; +using Org.OpenAPITools.Client.Auth; +using Org.OpenAPITools.Model; + +namespace Org.OpenAPITools.Client +{ + /// + /// Allows RestSharp to Serialize/Deserialize JSON using our custom logic, but only when ContentType is JSON. + /// + internal class CustomJsonCodec : IRestSerializer, ISerializer, IDeserializer + { + private readonly IReadableConfiguration _configuration; + private readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings + { + // OpenAPI generated types generally hide default constructors. + ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor, + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new CamelCaseNamingStrategy + { + OverrideSpecifiedNames = false + } + } + }; + + public CustomJsonCodec(IReadableConfiguration configuration) + { + _configuration = configuration; + } + + public CustomJsonCodec(JsonSerializerSettings serializerSettings, IReadableConfiguration configuration) + { + _serializerSettings = serializerSettings; + _configuration = configuration; + } + + /// + /// Serialize the object into a JSON string. + /// + /// Object to be serialized. + /// A JSON string. + public string Serialize(object obj) + { + if (obj != null && obj is AbstractOpenAPISchema) + { + // the object to be serialized is an oneOf/anyOf schema + return ((AbstractOpenAPISchema)obj).ToJson(); + } + else + { + return JsonConvert.SerializeObject(obj, _serializerSettings); + } + } + + public string Serialize(Parameter bodyParameter) => Serialize(bodyParameter.Value); + + public T Deserialize(RestResponse response) + { + var result = (T)Deserialize(response, typeof(T)); + return result; + } + + /// + /// Deserialize the JSON string into a proper object. + /// + /// The HTTP response. + /// Object type. + /// Object representation of the JSON string. + internal object Deserialize(RestResponse response, Type type) + { + if (type == typeof(byte[])) // return byte array + { + return response.RawBytes; + } + + // TODO: ? if (type.IsAssignableFrom(typeof(Stream))) + if (type == typeof(Stream)) + { + var bytes = response.RawBytes; + if (response.Headers != null) + { + var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath) + ? global::System.IO.Path.GetTempPath() + : _configuration.TempFolderPath; + var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$"); + foreach (var header in response.Headers) + { + var match = regex.Match(header.ToString()); + if (match.Success) + { + string fileName = filePath + ClientUtils.SanitizeFilename(match.Groups[1].Value.Replace("\"", "").Replace("'", "")); + FileIO.WriteAllBytes(fileName, bytes); + return new FileStream(fileName, FileMode.Open); + } + } + } + var stream = new MemoryStream(bytes); + return stream; + } + + if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object + { + return DateTime.Parse(response.Content, null, DateTimeStyles.RoundtripKind); + } + + if (type == typeof(string) || type.Name.StartsWith("System.Nullable")) // return primitive type + { + return Convert.ChangeType(response.Content, type); + } + + // at this point, it must be a model (json) + try + { + return JsonConvert.DeserializeObject(response.Content, type, _serializerSettings); + } + catch (Exception e) + { + throw new ApiException(500, e.Message); + } + } + + public ISerializer Serializer => this; + public IDeserializer Deserializer => this; + + public string[] AcceptedContentTypes => ContentType.JsonAccept; + + public SupportsContentType SupportsContentType => contentType => + contentType.Value.EndsWith("json", StringComparison.InvariantCultureIgnoreCase) || + contentType.Value.EndsWith("javascript", StringComparison.InvariantCultureIgnoreCase); + + public ContentType ContentType { get; set; } = ContentType.Json; + + public DataFormat DataFormat => DataFormat.Json; + } + /// + /// Provides a default implementation of an Api client (both synchronous and asynchronous implementations), + /// encapsulating general REST accessor use cases. + /// + public partial class ApiClient : ISynchronousClient, IAsynchronousClient + { + private readonly string _baseUrl; + + /// + /// Specifies the settings on a object. + /// These settings can be adjusted to accommodate custom serialization rules. + /// + public JsonSerializerSettings SerializerSettings { get; set; } = new JsonSerializerSettings + { + // OpenAPI generated types generally hide default constructors. + ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor, + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new CamelCaseNamingStrategy + { + OverrideSpecifiedNames = false + } + } + }; + + /// + /// Allows for extending request processing for generated code. + /// + /// The RestSharp request object + public virtual void InterceptRequest(RestRequest request) { } + + /// + /// Allows for extending response processing for generated code. + /// + /// The RestSharp request object + /// The RestSharp response object + public virtual void InterceptResponse(RestRequest request, RestResponse response) { } + + /// + /// Initializes a new instance of the , defaulting to the global configurations' base url. + /// + public ApiClient() + { + _baseUrl = GlobalConfiguration.Instance.BasePath; + } + + /// + /// Initializes a new instance of the + /// + /// The target service's base path in URL format. + /// + public ApiClient(string basePath) + { + if (string.IsNullOrEmpty(basePath)) + throw new ArgumentException("basePath cannot be empty"); + + _baseUrl = basePath; + } + + /// + /// Constructs the RestSharp version of an http method + /// + /// Swagger Client Custom HttpMethod + /// RestSharp's HttpMethod instance. + /// + private RestSharpMethod Method(HttpMethod method) + { + RestSharpMethod other; + switch (method) + { + case HttpMethod.Get: + other = RestSharpMethod.Get; + break; + case HttpMethod.Post: + other = RestSharpMethod.Post; + break; + case HttpMethod.Put: + other = RestSharpMethod.Put; + break; + case HttpMethod.Delete: + other = RestSharpMethod.Delete; + break; + case HttpMethod.Head: + other = RestSharpMethod.Head; + break; + case HttpMethod.Options: + other = RestSharpMethod.Options; + break; + case HttpMethod.Patch: + other = RestSharpMethod.Patch; + break; + default: + throw new ArgumentOutOfRangeException("method", method, null); + } + + return other; + } + + /// + /// Provides all logic for constructing a new RestSharp . + /// At this point, all information for querying the service is known. + /// Here, it is simply mapped into the RestSharp request. + /// + /// The http verb. + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. + /// It is assumed that any merge with GlobalConfiguration has been done before calling this method. + /// [private] A new RestRequest instance. + /// + private RestRequest NewRequest( + HttpMethod method, + string path, + RequestOptions options, + IReadableConfiguration configuration) + { + if (path == null) throw new ArgumentNullException("path"); + if (options == null) throw new ArgumentNullException("options"); + if (configuration == null) throw new ArgumentNullException("configuration"); + + RestRequest request = new RestRequest(path, Method(method)); + + if (options.PathParameters != null) + { + foreach (var pathParam in options.PathParameters) + { + request.AddParameter(pathParam.Key, pathParam.Value, ParameterType.UrlSegment); + } + } + + if (options.QueryParameters != null) + { + foreach (var queryParam in options.QueryParameters) + { + foreach (var value in queryParam.Value) + { + request.AddQueryParameter(queryParam.Key, value); + } + } + } + + if (configuration.DefaultHeaders != null) + { + foreach (var headerParam in configuration.DefaultHeaders) + { + request.AddHeader(headerParam.Key, headerParam.Value); + } + } + + if (options.HeaderParameters != null) + { + foreach (var headerParam in options.HeaderParameters) + { + foreach (var value in headerParam.Value) + { + request.AddOrUpdateHeader(headerParam.Key, value); + } + } + } + + if (options.FormParameters != null) + { + foreach (var formParam in options.FormParameters) + { + request.AddParameter(formParam.Key, formParam.Value); + } + } + + if (options.Data != null) + { + if (options.Data is Stream stream) + { + var contentType = "application/octet-stream"; + if (options.HeaderParameters != null) + { + var contentTypes = options.HeaderParameters["Content-Type"]; + contentType = contentTypes[0]; + } + + var bytes = ClientUtils.ReadAsBytes(stream); + request.AddParameter(contentType, bytes, ParameterType.RequestBody); + } + else + { + if (options.HeaderParameters != null) + { + var contentTypes = options.HeaderParameters["Content-Type"]; + if (contentTypes == null || contentTypes.Any(header => header.Contains("application/json"))) + { + request.RequestFormat = DataFormat.Json; + } + else + { + // TODO: Generated client user should add additional handlers. RestSharp only supports XML and JSON, with XML as default. + } + } + else + { + // Here, we'll assume JSON APIs are more common. XML can be forced by adding produces/consumes to openapi spec explicitly. + request.RequestFormat = DataFormat.Json; + } + + request.AddJsonBody(options.Data); + } + } + + if (options.FileParameters != null) + { + foreach (var fileParam in options.FileParameters) + { + foreach (var file in fileParam.Value) + { + var bytes = ClientUtils.ReadAsBytes(file); + var fileStream = file as FileStream; + if (fileStream != null) + request.AddFile(fileParam.Key, bytes, global::System.IO.Path.GetFileName(fileStream.Name)); + else + request.AddFile(fileParam.Key, bytes, "no_file_name_provided"); + } + } + } + + if (options.HeaderParameters != null) + { + if (options.HeaderParameters.TryGetValue("Content-Type", out var contentTypes) && contentTypes.Any(header => header.Contains("multipart/form-data"))) + { + request.AlwaysMultipartFormData = true; + } + } + + return request; + } + + /// + /// Transforms a RestResponse instance into a new ApiResponse instance. + /// At this point, we have a concrete http response from the service. + /// Here, it is simply mapped into the [public] ApiResponse object. + /// + /// The RestSharp response object + /// A new ApiResponse instance. + private ApiResponse ToApiResponse(RestResponse response) + { + T result = response.Data; + string rawContent = response.Content; + + var transformed = new ApiResponse(response.StatusCode, new Multimap(), result, rawContent) + { + ErrorText = response.ErrorMessage, + Cookies = new List() + }; + + if (response.Headers != null) + { + foreach (var responseHeader in response.Headers) + { + transformed.Headers.Add(responseHeader.Name, ClientUtils.ParameterToString(responseHeader.Value)); + } + } + + if (response.ContentHeaders != null) + { + foreach (var responseHeader in response.ContentHeaders) + { + transformed.Headers.Add(responseHeader.Name, ClientUtils.ParameterToString(responseHeader.Value)); + } + } + + if (response.Cookies != null) + { + foreach (var responseCookies in response.Cookies.Cast()) + { + transformed.Cookies.Add( + new Cookie( + responseCookies.Name, + responseCookies.Value, + responseCookies.Path, + responseCookies.Domain) + ); + } + } + + return transformed; + } + + /// + /// Executes the HTTP request for the current service. + /// Based on functions received it can be async or sync. + /// + /// Local function that executes http request and returns http response. + /// Local function to specify options for the service. + /// The RestSharp request object + /// The RestSharp options object + /// A per-request configuration object. + /// It is assumed that any merge with GlobalConfiguration has been done before calling this method. + /// A new ApiResponse instance. + private async Task> ExecClientAsync(Func>> getResponse, Action setOptions, RestRequest request, RequestOptions options, IReadableConfiguration configuration) + { + var baseUrl = configuration.GetOperationServerUrl(options.Operation, options.OperationIndex) ?? _baseUrl; + var clientOptions = new RestClientOptions(baseUrl) + { + ClientCertificates = configuration.ClientCertificates, + Timeout = configuration.Timeout, + Proxy = configuration.Proxy, + UserAgent = configuration.UserAgent, + UseDefaultCredentials = configuration.UseDefaultCredentials, + RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback + }; + setOptions(clientOptions); + + if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && + !string.IsNullOrEmpty(configuration.OAuthClientId) && + !string.IsNullOrEmpty(configuration.OAuthClientSecret) && + configuration.OAuthFlow != null) + { + clientOptions.Authenticator = new OAuthAuthenticator( + configuration.OAuthTokenUrl, + configuration.OAuthClientId, + configuration.OAuthClientSecret, + configuration.OAuthScope, + configuration.OAuthFlow, + SerializerSettings, + configuration); + } + + using (RestClient client = new RestClient(clientOptions, + configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration)))) + { + InterceptRequest(request); + + RestResponse response = await getResponse(client); + + // if the response type is oneOf/anyOf, call FromJSON to deserialize the data + if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T))) + { + try + { + response.Data = (T)typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content }); + } + catch (Exception ex) + { + throw ex.InnerException != null ? ex.InnerException : ex; + } + } + else if (typeof(T).Name == "Stream") // for binary response + { + response.Data = (T)(object)new MemoryStream(response.RawBytes); + } + else if (typeof(T).Name == "Byte[]") // for byte response + { + response.Data = (T)(object)response.RawBytes; + } + else if (typeof(T).Name == "String") // for string response + { + response.Data = (T)(object)response.Content; + } + + InterceptResponse(request, response); + + var result = ToApiResponse(response); + if (response.ErrorMessage != null) + { + result.ErrorText = response.ErrorMessage; + } + + if (response.Cookies != null && response.Cookies.Count > 0) + { + if (result.Cookies == null) result.Cookies = new List(); + foreach (var restResponseCookie in response.Cookies.Cast()) + { + var cookie = new Cookie( + restResponseCookie.Name, + restResponseCookie.Value, + restResponseCookie.Path, + restResponseCookie.Domain + ) + { + Comment = restResponseCookie.Comment, + CommentUri = restResponseCookie.CommentUri, + Discard = restResponseCookie.Discard, + Expired = restResponseCookie.Expired, + Expires = restResponseCookie.Expires, + HttpOnly = restResponseCookie.HttpOnly, + Port = restResponseCookie.Port, + Secure = restResponseCookie.Secure, + Version = restResponseCookie.Version + }; + + result.Cookies.Add(cookie); + } + } + return result; + } + } + + private async Task> DeserializeRestResponseFromPolicyAsync(RestClient client, RestRequest request, PolicyResult policyResult, CancellationToken cancellationToken = default) + { + if (policyResult.Outcome == OutcomeType.Successful) + { + return await client.Deserialize(policyResult.Result, cancellationToken); + } + else + { + return new RestResponse(request) + { + ErrorException = policyResult.FinalException + }; + } + } + + private ApiResponse Exec(RestRequest request, RequestOptions options, IReadableConfiguration configuration) + { + Action setOptions = (clientOptions) => + { + var cookies = new CookieContainer(); + + if (options.Cookies != null && options.Cookies.Count > 0) + { + foreach (var cookie in options.Cookies) + { + cookies.Add(new Cookie(cookie.Name, cookie.Value)); + } + } + clientOptions.CookieContainer = cookies; + }; + + Func>> getResponse = (client) => + { + if (RetryConfiguration.RetryPolicy != null) + { + var policy = RetryConfiguration.RetryPolicy; + var policyResult = policy.ExecuteAndCapture(() => client.Execute(request)); + return DeserializeRestResponseFromPolicyAsync(client, request, policyResult); + } + else + { + return Task.FromResult(client.Execute(request)); + } + }; + + return ExecClientAsync(getResponse, setOptions, request, options, configuration).GetAwaiter().GetResult(); + } + + private Task> ExecAsync(RestRequest request, RequestOptions options, IReadableConfiguration configuration, CancellationToken cancellationToken = default(CancellationToken)) + { + Action setOptions = (clientOptions) => + { + //no extra options + }; + + Func>> getResponse = async (client) => + { + if (RetryConfiguration.AsyncRetryPolicy != null) + { + var policy = RetryConfiguration.AsyncRetryPolicy; + var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false); + return await DeserializeRestResponseFromPolicyAsync(client, request, policyResult, cancellationToken); + } + else + { + return await client.ExecuteAsync(request, cancellationToken).ConfigureAwait(false); + } + }; + + return ExecClientAsync(getResponse, setOptions, request, options, configuration); + } + + #region IAsynchronousClient + /// + /// Make a HTTP GET request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> GetAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, CancellationToken cancellationToken = default) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest(HttpMethod.Get, path, options, config), options, config, cancellationToken); + } + + /// + /// Make a HTTP POST request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> PostAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, CancellationToken cancellationToken = default) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest(HttpMethod.Post, path, options, config), options, config, cancellationToken); + } + + /// + /// Make a HTTP PUT request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> PutAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, CancellationToken cancellationToken = default) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest(HttpMethod.Put, path, options, config), options, config, cancellationToken); + } + + /// + /// Make a HTTP DELETE request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> DeleteAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, CancellationToken cancellationToken = default) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest(HttpMethod.Delete, path, options, config), options, config, cancellationToken); + } + + /// + /// Make a HTTP HEAD request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> HeadAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, CancellationToken cancellationToken = default) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest(HttpMethod.Head, path, options, config), options, config, cancellationToken); + } + + /// + /// Make a HTTP OPTION request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> OptionsAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, CancellationToken cancellationToken = default) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest(HttpMethod.Options, path, options, config), options, config, cancellationToken); + } + + /// + /// Make a HTTP PATCH request (async). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// Token that enables callers to cancel the request. + /// A Task containing ApiResponse + public Task> PatchAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, CancellationToken cancellationToken = default) + { + var config = configuration ?? GlobalConfiguration.Instance; + return ExecAsync(NewRequest(HttpMethod.Patch, path, options, config), options, config, cancellationToken); + } + #endregion IAsynchronousClient + + #region ISynchronousClient + /// + /// Make a HTTP GET request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Get(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + var config = configuration ?? GlobalConfiguration.Instance; + return Exec(NewRequest(HttpMethod.Get, path, options, config), options, config); + } + + /// + /// Make a HTTP POST request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Post(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + var config = configuration ?? GlobalConfiguration.Instance; + return Exec(NewRequest(HttpMethod.Post, path, options, config), options, config); + } + + /// + /// Make a HTTP PUT request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Put(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + var config = configuration ?? GlobalConfiguration.Instance; + return Exec(NewRequest(HttpMethod.Put, path, options, config), options, config); + } + + /// + /// Make a HTTP DELETE request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Delete(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + var config = configuration ?? GlobalConfiguration.Instance; + return Exec(NewRequest(HttpMethod.Delete, path, options, config), options, config); + } + + /// + /// Make a HTTP HEAD request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Head(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + var config = configuration ?? GlobalConfiguration.Instance; + return Exec(NewRequest(HttpMethod.Head, path, options, config), options, config); + } + + /// + /// Make a HTTP OPTION request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Options(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + var config = configuration ?? GlobalConfiguration.Instance; + return Exec(NewRequest(HttpMethod.Options, path, options, config), options, config); + } + + /// + /// Make a HTTP PATCH request (synchronous). + /// + /// The target path (or resource). + /// The additional request options. + /// A per-request configuration object. It is assumed that any merge with + /// GlobalConfiguration has been done before calling this method. + /// A Task containing ApiResponse + public ApiResponse Patch(string path, RequestOptions options, IReadableConfiguration configuration = null) + { + var config = configuration ?? GlobalConfiguration.Instance; + return Exec(NewRequest(HttpMethod.Patch, path, options, config), options, config); + } + #endregion ISynchronousClient + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiException.cs new file mode 100644 index 000000000000..dcc378ad208d --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiException.cs @@ -0,0 +1,68 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; + +namespace Org.OpenAPITools.Client +{ + /// + /// API Exception + /// + public class ApiException : Exception + { + /// + /// Gets or sets the error code (HTTP status code) + /// + /// The error code (HTTP status code). + public int ErrorCode { get; set; } + + /// + /// Gets or sets the error content (body json object) + /// + /// The error content (Http response body). + public object ErrorContent { get; private set; } + + /// + /// Gets or sets the HTTP headers + /// + /// HTTP headers + public Multimap Headers { get; private set; } + + /// + /// Initializes a new instance of the class. + /// + public ApiException() { } + + /// + /// Initializes a new instance of the class. + /// + /// HTTP status code. + /// Error message. + public ApiException(int errorCode, string message) : base(message) + { + this.ErrorCode = errorCode; + } + + /// + /// Initializes a new instance of the class. + /// + /// HTTP status code. + /// Error message. + /// Error content. + /// HTTP Headers. + public ApiException(int errorCode, string message, object errorContent = null, Multimap headers = null) : base(message) + { + this.ErrorCode = errorCode; + this.ErrorContent = errorContent; + this.Headers = headers; + } + } + +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiResponse.cs new file mode 100644 index 000000000000..6d91a6f7a47e --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiResponse.cs @@ -0,0 +1,166 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.Net; + +namespace Org.OpenAPITools.Client +{ + /// + /// Provides a non-generic contract for the ApiResponse wrapper. + /// + public interface IApiResponse + { + /// + /// The data type of + /// + Type ResponseType { get; } + + /// + /// The content of this response + /// + Object Content { get; } + + /// + /// Gets or sets the status code (HTTP status code) + /// + /// The status code. + HttpStatusCode StatusCode { get; } + + /// + /// Gets or sets the HTTP headers + /// + /// HTTP headers + Multimap Headers { get; } + + /// + /// Gets or sets any error text defined by the calling client. + /// + string ErrorText { get; set; } + + /// + /// Gets or sets any cookies passed along on the response. + /// + List Cookies { get; set; } + + /// + /// The raw content of this response + /// + string RawContent { get; } + } + + /// + /// API Response + /// + public class ApiResponse : IApiResponse + { + #region Properties + + /// + /// Gets or sets the status code (HTTP status code) + /// + /// The status code. + public HttpStatusCode StatusCode { get; } + + /// + /// Gets or sets the HTTP headers + /// + /// HTTP headers + public Multimap Headers { get; } + + /// + /// Gets or sets the data (parsed HTTP body) + /// + /// The data. + public T Data { get; } + + /// + /// Gets or sets any error text defined by the calling client. + /// + public string ErrorText { get; set; } + + /// + /// Gets or sets any cookies passed along on the response. + /// + public List Cookies { get; set; } + + /// + /// The content of this response + /// + public Type ResponseType + { + get { return typeof(T); } + } + + /// + /// The data type of + /// + public object Content + { + get { return Data; } + } + + /// + /// The raw content + /// + public string RawContent { get; } + + #endregion Properties + + #region Constructors + + /// + /// Initializes a new instance of the class. + /// + /// HTTP status code. + /// HTTP headers. + /// Data (parsed HTTP body) + /// Raw content. + public ApiResponse(HttpStatusCode statusCode, Multimap headers, T data, string rawContent) + { + StatusCode = statusCode; + Headers = headers; + Data = data; + RawContent = rawContent; + } + + /// + /// Initializes a new instance of the class. + /// + /// HTTP status code. + /// HTTP headers. + /// Data (parsed HTTP body) + public ApiResponse(HttpStatusCode statusCode, Multimap headers, T data) : this(statusCode, headers, data, null) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// HTTP status code. + /// Data (parsed HTTP body) + /// Raw content. + public ApiResponse(HttpStatusCode statusCode, T data, string rawContent) : this(statusCode, null, data, rawContent) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// HTTP status code. + /// Data (parsed HTTP body) + public ApiResponse(HttpStatusCode statusCode, T data) : this(statusCode, data, null) + { + } + + #endregion Constructors + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs new file mode 100644 index 000000000000..39498419f390 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs @@ -0,0 +1,144 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Threading.Tasks; +using Newtonsoft.Json; +using RestSharp; +using RestSharp.Authenticators; + +namespace Org.OpenAPITools.Client.Auth +{ + /// + /// An authenticator for OAuth2 authentication flows + /// + public class OAuthAuthenticator : IAuthenticator + { + private TokenResponse? _token; + + /// + /// Returns the current authentication token. Can return null if there is no authentication token, or it has expired. + /// + public string? Token + { + get + { + if (_token == null) return null; + if (_token.ExpiresIn == null) return _token.AccessToken; + if (_token.ExpiresAt < DateTime.Now) return null; + + return _token.AccessToken; + } + } + + readonly string _tokenUrl; + readonly string _clientId; + readonly string _clientSecret; + readonly string? _scope; + readonly string _grantType; + readonly JsonSerializerSettings _serializerSettings; + readonly IReadableConfiguration _configuration; + + /// + /// Initialize the OAuth2 Authenticator + /// + public OAuthAuthenticator( + string tokenUrl, + string clientId, + string clientSecret, + string? scope, + OAuthFlow? flow, + JsonSerializerSettings serializerSettings, + IReadableConfiguration configuration) + { + _tokenUrl = tokenUrl; + _clientId = clientId; + _clientSecret = clientSecret; + _scope = scope; + _serializerSettings = serializerSettings; + _configuration = configuration; + + switch (flow) + { + /*case OAuthFlow.ACCESS_CODE: + _grantType = "authorization_code"; + break; + case OAuthFlow.IMPLICIT: + _grantType = "implicit"; + break; + case OAuthFlow.PASSWORD: + _grantType = "password"; + break;*/ + case OAuthFlow.APPLICATION: + _grantType = "client_credentials"; + break; + default: + break; + } + } + + /// + /// Creates an authentication parameter from an access token. + /// + /// An authentication parameter. + protected async ValueTask GetAuthenticationParameter() + { + var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token; + return new HeaderParameter(KnownHeaders.Authorization, token); + } + + /// + /// Gets the token from the OAuth2 server. + /// + /// An authentication token. + async Task GetToken() + { + var client = new RestClient(_tokenUrl, configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(_serializerSettings, _configuration))); + + var request = new RestRequest(); + if (!string.IsNullOrWhiteSpace(_token?.RefreshToken)) + { + request.AddParameter("grant_type", "refresh_token") + .AddParameter("refresh_token", _token.RefreshToken); + } + else + { + request + .AddParameter("grant_type", _grantType) + .AddParameter("client_id", _clientId) + .AddParameter("client_secret", _clientSecret); + } + if (!string.IsNullOrEmpty(_scope)) + { + request.AddParameter("scope", _scope); + } + _token = await client.PostAsync(request).ConfigureAwait(false); + // RFC6749 - token_type is case insensitive. + // RFC6750 - In Authorization header Bearer should be capitalized. + // Fix the capitalization irrespective of token_type casing. + switch (_token?.TokenType?.ToLower()) + { + case "bearer": + return $"Bearer {_token.AccessToken}"; + default: + return $"{_token?.TokenType} {_token?.AccessToken}"; + } + } + + /// + /// Retrieves the authentication token (creating a new one if necessary) and adds it to the current request + /// + /// + /// + /// + public async ValueTask Authenticate(IRestClient client, RestRequest request) + => request.AddOrUpdateParameter(await GetAuthenticationParameter().ConfigureAwait(false)); + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs new file mode 100644 index 000000000000..2e1adf930029 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs @@ -0,0 +1,27 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +namespace Org.OpenAPITools.Client.Auth +{ + /// + /// Available flows for OAuth2 authentication + /// + public enum OAuthFlow + { + /// Authorization code flow + ACCESS_CODE, + /// Implicit flow + IMPLICIT, + /// Password flow + PASSWORD, + /// Client credentials flow + APPLICATION + } +} \ No newline at end of file diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs new file mode 100644 index 000000000000..da4342c30dd3 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs @@ -0,0 +1,32 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Client.Auth +{ + class TokenResponse + { + [JsonProperty("token_type")] + public string TokenType { get; set; } + [JsonProperty("access_token")] + public string AccessToken { get; set; } + [JsonProperty("expires_in")] + public int? ExpiresIn { get; set; } + [JsonProperty("created")] + public DateTime? Created { get; set; } + + [JsonProperty("refresh_token")] + public string? RefreshToken { get; set; } + + public DateTime? ExpiresAt => ExpiresIn == null ? null : Created?.AddSeconds(ExpiresIn.Value); + } +} \ No newline at end of file diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ClientUtils.cs new file mode 100644 index 000000000000..8ba2457f7bd4 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -0,0 +1,253 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; + +namespace Org.OpenAPITools.Client +{ + /// + /// Utility functions providing some benefit to API client consumers. + /// + public static class ClientUtils + { + /// + /// Sanitize filename by removing the path + /// + /// Filename + /// Filename + public static string SanitizeFilename(string filename) + { + Match match = Regex.Match(filename, @".*[/\\](.*)$"); + return match.Success ? match.Groups[1].Value : filename; + } + + /// + /// Convert params to key/value pairs. + /// Use collectionFormat to properly format lists and collections. + /// + /// The swagger-supported collection format, one of: csv, tsv, ssv, pipes, multi + /// Key name. + /// Value object. + /// A multimap of keys with 1..n associated values. + public static Multimap ParameterToMultiMap(string collectionFormat, string name, object value) + { + var parameters = new Multimap(); + + if (value is ICollection collection && collectionFormat == "multi") + { + foreach (var item in collection) + { + parameters.Add(name, ParameterToString(item)); + } + } + else if (value is IDictionary dictionary) + { + if(collectionFormat == "deepObject") { + foreach (DictionaryEntry entry in dictionary) + { + parameters.Add(name + "[" + entry.Key + "]", ParameterToString(entry.Value)); + } + } + else { + foreach (DictionaryEntry entry in dictionary) + { + parameters.Add(entry.Key.ToString(), ParameterToString(entry.Value)); + } + } + } + else + { + parameters.Add(name, ParameterToString(value)); + } + + return parameters; + } + + /// + /// If parameter is DateTime, output in a formatted string (default ISO 8601), customizable with Configuration.DateTime. + /// If parameter is a list, join the list with ",". + /// Otherwise just return the string. + /// + /// The parameter (header, path, query, form). + /// An optional configuration instance, providing formatting options used in processing. + /// Formatted string. + public static string ParameterToString(object obj, IReadableConfiguration configuration = null) + { + if (obj is DateTime dateTime) + // Return a formatted date string - Can be customized with Configuration.DateTimeFormat + // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o") + // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 + // For example: 2009-06-15T13:45:30.0000000 + return dateTime.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); + if (obj is DateTimeOffset dateTimeOffset) + // Return a formatted date string - Can be customized with Configuration.DateTimeFormat + // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o") + // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 + // For example: 2009-06-15T13:45:30.0000000 + return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); + if (obj is DateOnly dateOnly) + // Return a formatted date string - Can be customized with Configuration.DateTimeFormat + // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o") + // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 + // For example: 2009-06-15 + return dateOnly.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat); + if (obj is bool boolean) + return boolean ? "true" : "false"; + if (obj is ICollection collection) { + List entries = new List(); + foreach (var entry in collection) + entries.Add(ParameterToString(entry, configuration)); + return string.Join(",", entries); + } + if (obj is Enum && HasEnumMemberAttrValue(obj)) + return GetEnumMemberAttrValue(obj); + + return Convert.ToString(obj, CultureInfo.InvariantCulture); + } + + /// + /// Serializes the given object when not null. Otherwise return null. + /// + /// The object to serialize. + /// Serialized string. + public static string Serialize(object obj) + { + return obj != null ? Newtonsoft.Json.JsonConvert.SerializeObject(obj) : null; + } + + /// + /// Encode string in base64 format. + /// + /// string to be encoded. + /// Encoded string. + public static string Base64Encode(string text) + { + return Convert.ToBase64String(global::System.Text.Encoding.UTF8.GetBytes(text)); + } + + /// + /// Convert stream to byte array + /// + /// Input stream to be converted + /// Byte array + public static byte[] ReadAsBytes(Stream inputStream) + { + using (var ms = new MemoryStream()) + { + inputStream.CopyTo(ms); + return ms.ToArray(); + } + } + + /// + /// Select the Content-Type header's value from the given content-type array: + /// if JSON type exists in the given array, use it; + /// otherwise use the first one defined in 'consumes' + /// + /// The Content-Type array to select from. + /// The Content-Type header to use. + public static string SelectHeaderContentType(string[] contentTypes) + { + if (contentTypes.Length == 0) + return null; + + foreach (var contentType in contentTypes) + { + if (IsJsonMime(contentType)) + return contentType; + } + + return contentTypes[0]; // use the first content type specified in 'consumes' + } + + /// + /// Select the Accept header's value from the given accepts array: + /// if JSON exists in the given array, use it; + /// otherwise use all of them (joining into a string) + /// + /// The accepts array to select from. + /// The Accept header to use. + public static string SelectHeaderAccept(string[] accepts) + { + if (accepts.Length == 0) + return null; + + if (accepts.Contains("application/json", StringComparer.OrdinalIgnoreCase)) + return "application/json"; + + return string.Join(",", accepts); + } + + /// + /// Provides a case-insensitive check that a provided content type is a known JSON-like content type. + /// + public static readonly Regex JsonRegex = new Regex("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$"); + + /// + /// Check if the given MIME is a JSON MIME. + /// JSON MIME examples: + /// application/json + /// application/json; charset=UTF8 + /// APPLICATION/JSON + /// application/vnd.company+json + /// + /// MIME + /// Returns True if MIME type is json. + public static bool IsJsonMime(string mime) + { + if (string.IsNullOrWhiteSpace(mime)) return false; + + return JsonRegex.IsMatch(mime) || mime.Equals("application/json-patch+json"); + } + + /// + /// Is the Enum decorated with EnumMember Attribute + /// + /// + /// true if found + private static bool HasEnumMemberAttrValue(object enumVal) + { + if (enumVal == null) + throw new ArgumentNullException(nameof(enumVal)); + var enumType = enumVal.GetType(); + var memInfo = enumType.GetMember(enumVal.ToString() ?? throw new InvalidOperationException()); + var attr = memInfo.FirstOrDefault()?.GetCustomAttributes(false).OfType().FirstOrDefault(); + if (attr != null) return true; + return false; + } + + /// + /// Get the EnumMember value + /// + /// + /// EnumMember value as string otherwise null + private static string GetEnumMemberAttrValue(object enumVal) + { + if (enumVal == null) + throw new ArgumentNullException(nameof(enumVal)); + var enumType = enumVal.GetType(); + var memInfo = enumType.GetMember(enumVal.ToString() ?? throw new InvalidOperationException()); + var attr = memInfo.FirstOrDefault()?.GetCustomAttributes(false).OfType().FirstOrDefault(); + if (attr != null) + { + return attr.Value; + } + return null; + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Configuration.cs new file mode 100644 index 000000000000..35b89b430a80 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Configuration.cs @@ -0,0 +1,648 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net; +using System.Reflection; +using System.Security.Cryptography.X509Certificates; +using System.Text; +using System.Net.Http; +using System.Net.Security; +using Org.OpenAPITools.Client.Auth; + +namespace Org.OpenAPITools.Client +{ + /// + /// Represents a set of configuration settings + /// + public class Configuration : IReadableConfiguration + { + #region Constants + + /// + /// Version of the package. + /// + /// Version of the package. + public const string Version = "1.0.0"; + + /// + /// Identifier for ISO 8601 DateTime Format + /// + /// See https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8 for more information. + // ReSharper disable once InconsistentNaming + public const string ISO8601_DATETIME_FORMAT = "o"; + + #endregion Constants + + #region Static Members + + /// + /// Default creation of exceptions for a given method name and response object + /// + public static readonly ExceptionFactory DefaultExceptionFactory = (methodName, response) => + { + var status = (int)response.StatusCode; + if (status >= 400) + { + return new ApiException(status, + string.Format("Error calling {0}: {1}", methodName, response.RawContent), + response.RawContent, response.Headers); + } + if (status == 0) + { + return new ApiException(status, + string.Format("Error calling {0}: {1}", methodName, response.ErrorText), response.ErrorText); + } + return null; + }; + + #endregion Static Members + + #region Private Members + + /// + /// Defines the base path of the target API server. + /// Example: http://localhost:3000/v1/ + /// + private string _basePath; + + private bool _useDefaultCredentials = false; + + /// + /// Gets or sets the API key based on the authentication name. + /// This is the key and value comprising the "secret" for accessing an API. + /// + /// The API key. + private IDictionary _apiKey; + + /// + /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name. + /// + /// The prefix of the API key. + private IDictionary _apiKeyPrefix; + + private string _dateTimeFormat = ISO8601_DATETIME_FORMAT; + private string _tempFolderPath = Path.GetTempPath(); + + /// + /// Gets or sets the servers defined in the OpenAPI spec. + /// + /// The servers + private IList> _servers; + + /// + /// Gets or sets the operation servers defined in the OpenAPI spec. + /// + /// The operation servers + private IReadOnlyDictionary>> _operationServers; + + #endregion Private Members + + #region Constructors + + /// + /// Initializes a new instance of the class + /// + [global::System.Diagnostics.CodeAnalysis.SuppressMessage("ReSharper", "VirtualMemberCallInConstructor")] + public Configuration() + { + Proxy = null; + UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.0.0/csharp"); + BasePath = "http://petstore.swagger.io/v2"; + DefaultHeaders = new ConcurrentDictionary(); + ApiKey = new ConcurrentDictionary(); + ApiKeyPrefix = new ConcurrentDictionary(); + Servers = new List>() + { + { + new Dictionary { + {"url", "http://petstore.swagger.io/v2"}, + {"description", "No description provided"}, + } + } + }; + OperationServers = new Dictionary>>() + { + }; + + // Setting Timeout has side effects (forces ApiClient creation). + Timeout = TimeSpan.FromSeconds(100); + } + + /// + /// Initializes a new instance of the class + /// + [global::System.Diagnostics.CodeAnalysis.SuppressMessage("ReSharper", "VirtualMemberCallInConstructor")] + public Configuration( + IDictionary defaultHeaders, + IDictionary apiKey, + IDictionary apiKeyPrefix, + string basePath = "http://petstore.swagger.io/v2") : this() + { + if (string.IsNullOrWhiteSpace(basePath)) + throw new ArgumentException("The provided basePath is invalid.", "basePath"); + if (defaultHeaders == null) + throw new ArgumentNullException("defaultHeaders"); + if (apiKey == null) + throw new ArgumentNullException("apiKey"); + if (apiKeyPrefix == null) + throw new ArgumentNullException("apiKeyPrefix"); + + BasePath = basePath; + + foreach (var keyValuePair in defaultHeaders) + { + DefaultHeaders.Add(keyValuePair); + } + + foreach (var keyValuePair in apiKey) + { + ApiKey.Add(keyValuePair); + } + + foreach (var keyValuePair in apiKeyPrefix) + { + ApiKeyPrefix.Add(keyValuePair); + } + } + + #endregion Constructors + + #region Properties + + /// + /// Gets or sets the base path for API access. + /// + public virtual string BasePath + { + get { return _basePath; } + set { _basePath = value; } + } + + /// + /// Determine whether or not the "default credentials" (e.g. the user account under which the current process is running) will be sent along to the server. The default is false. + /// + public virtual bool UseDefaultCredentials + { + get { return _useDefaultCredentials; } + set { _useDefaultCredentials = value; } + } + + /// + /// Gets or sets the default header. + /// + [Obsolete("Use DefaultHeaders instead.")] + public virtual IDictionary DefaultHeader + { + get + { + return DefaultHeaders; + } + set + { + DefaultHeaders = value; + } + } + + /// + /// Gets or sets the default headers. + /// + public virtual IDictionary DefaultHeaders { get; set; } + + /// + /// Gets or sets the HTTP timeout of ApiClient. Defaults to 100 seconds. + /// + public virtual TimeSpan Timeout { get; set; } + + /// + /// Gets or sets the proxy + /// + /// Proxy. + public virtual WebProxy Proxy { get; set; } + + /// + /// Gets or sets the HTTP user agent. + /// + /// Http user agent. + public virtual string UserAgent { get; set; } + + /// + /// Gets or sets the username (HTTP basic authentication). + /// + /// The username. + public virtual string Username { get; set; } + + /// + /// Gets or sets the password (HTTP basic authentication). + /// + /// The password. + public virtual string Password { get; set; } + + /// + /// Gets the API key with prefix. + /// + /// API key identifier (authentication scheme). + /// API key with prefix. + public string GetApiKeyWithPrefix(string apiKeyIdentifier) + { + string apiKeyValue; + ApiKey.TryGetValue(apiKeyIdentifier, out apiKeyValue); + string apiKeyPrefix; + if (ApiKeyPrefix.TryGetValue(apiKeyIdentifier, out apiKeyPrefix)) + { + return apiKeyPrefix + " " + apiKeyValue; + } + + return apiKeyValue; + } + + /// + /// Gets or sets certificate collection to be sent with requests. + /// + /// X509 Certificate collection. + public X509CertificateCollection ClientCertificates { get; set; } + + /// + /// Gets or sets the access token for OAuth2 authentication. + /// + /// This helper property simplifies code generation. + /// + /// The access token. + public virtual string AccessToken { get; set; } + + /// + /// Gets or sets the token URL for OAuth2 authentication. + /// + /// The OAuth Token URL. + public virtual string OAuthTokenUrl { get; set; } + + /// + /// Gets or sets the client ID for OAuth2 authentication. + /// + /// The OAuth Client ID. + public virtual string OAuthClientId { get; set; } + + /// + /// Gets or sets the client secret for OAuth2 authentication. + /// + /// The OAuth Client Secret. + public virtual string OAuthClientSecret { get; set; } + + /// + /// Gets or sets the client scope for OAuth2 authentication. + /// + /// The OAuth Client Scope. + public virtual string? OAuthScope { get; set; } + + /// + /// Gets or sets the flow for OAuth2 authentication. + /// + /// The OAuth Flow. + public virtual OAuthFlow? OAuthFlow { get; set; } + + /// + /// Gets or sets the temporary folder path to store the files downloaded from the server. + /// + /// Folder path. + public virtual string TempFolderPath + { + get { return _tempFolderPath; } + + set + { + if (string.IsNullOrEmpty(value)) + { + _tempFolderPath = Path.GetTempPath(); + return; + } + + // create the directory if it does not exist + if (!Directory.Exists(value)) + { + Directory.CreateDirectory(value); + } + + // check if the path contains directory separator at the end + if (value[value.Length - 1] == Path.DirectorySeparatorChar) + { + _tempFolderPath = value; + } + else + { + _tempFolderPath = value + Path.DirectorySeparatorChar; + } + } + } + + /// + /// Gets or sets the date time format used when serializing in the ApiClient + /// By default, it's set to ISO 8601 - "o", for others see: + /// https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx + /// and https://msdn.microsoft.com/en-us/library/8kb3ddd4(v=vs.110).aspx + /// No validation is done to ensure that the string you're providing is valid + /// + /// The DateTimeFormat string + public virtual string DateTimeFormat + { + get { return _dateTimeFormat; } + set + { + if (string.IsNullOrEmpty(value)) + { + // Never allow a blank or null string, go back to the default + _dateTimeFormat = ISO8601_DATETIME_FORMAT; + return; + } + + // Caution, no validation when you choose date time format other than ISO 8601 + // Take a look at the above links + _dateTimeFormat = value; + } + } + + /// + /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name. + /// + /// Whatever you set here will be prepended to the value defined in AddApiKey. + /// + /// An example invocation here might be: + /// + /// ApiKeyPrefix["Authorization"] = "Bearer"; + /// + /// … where ApiKey["Authorization"] would then be used to set the value of your bearer token. + /// + /// + /// OAuth2 workflows should set tokens via AccessToken. + /// + /// + /// The prefix of the API key. + public virtual IDictionary ApiKeyPrefix + { + get { return _apiKeyPrefix; } + set + { + if (value == null) + { + throw new InvalidOperationException("ApiKeyPrefix collection may not be null."); + } + _apiKeyPrefix = value; + } + } + + /// + /// Gets or sets the API key based on the authentication name. + /// + /// The API key. + public virtual IDictionary ApiKey + { + get { return _apiKey; } + set + { + if (value == null) + { + throw new InvalidOperationException("ApiKey collection may not be null."); + } + _apiKey = value; + } + } + + /// + /// Gets or sets the servers. + /// + /// The servers. + public virtual IList> Servers + { + get { return _servers; } + set + { + if (value == null) + { + throw new InvalidOperationException("Servers may not be null."); + } + _servers = value; + } + } + + /// + /// Gets or sets the operation servers. + /// + /// The operation servers. + public virtual IReadOnlyDictionary>> OperationServers + { + get { return _operationServers; } + set + { + if (value == null) + { + throw new InvalidOperationException("Operation servers may not be null."); + } + _operationServers = value; + } + } + + /// + /// Returns URL based on server settings without providing values + /// for the variables + /// + /// Array index of the server settings. + /// The server URL. + public string GetServerUrl(int index) + { + return GetServerUrl(Servers, index, null); + } + + /// + /// Returns URL based on server settings. + /// + /// Array index of the server settings. + /// Dictionary of the variables and the corresponding values. + /// The server URL. + public string GetServerUrl(int index, Dictionary inputVariables) + { + return GetServerUrl(Servers, index, inputVariables); + } + + /// + /// Returns URL based on operation server settings. + /// + /// Operation associated with the request path. + /// Array index of the server settings. + /// The operation server URL. + public string GetOperationServerUrl(string operation, int index) + { + return GetOperationServerUrl(operation, index, null); + } + + /// + /// Returns URL based on operation server settings. + /// + /// Operation associated with the request path. + /// Array index of the server settings. + /// Dictionary of the variables and the corresponding values. + /// The operation server URL. + public string GetOperationServerUrl(string operation, int index, Dictionary inputVariables) + { + if (operation != null && OperationServers.TryGetValue(operation, out var operationServer)) + { + return GetServerUrl(operationServer, index, inputVariables); + } + + return null; + } + + /// + /// Returns URL based on server settings. + /// + /// Dictionary of server settings. + /// Array index of the server settings. + /// Dictionary of the variables and the corresponding values. + /// The server URL. + private string GetServerUrl(IList> servers, int index, Dictionary inputVariables) + { + if (index < 0 || index >= servers.Count) + { + throw new InvalidOperationException($"Invalid index {index} when selecting the server. Must be less than {servers.Count}."); + } + + if (inputVariables == null) + { + inputVariables = new Dictionary(); + } + + IReadOnlyDictionary server = servers[index]; + string url = (string)server["url"]; + + if (server.ContainsKey("variables")) + { + // go through each variable and assign a value + foreach (KeyValuePair variable in (IReadOnlyDictionary)server["variables"]) + { + + IReadOnlyDictionary serverVariables = (IReadOnlyDictionary)(variable.Value); + + if (inputVariables.ContainsKey(variable.Key)) + { + if (((List)serverVariables["enum_values"]).Contains(inputVariables[variable.Key])) + { + url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]); + } + else + { + throw new InvalidOperationException($"The variable `{variable.Key}` in the server URL has invalid value #{inputVariables[variable.Key]}. Must be {(List)serverVariables["enum_values"]}"); + } + } + else + { + // use default value + url = url.Replace("{" + variable.Key + "}", (string)serverVariables["default_value"]); + } + } + } + + return url; + } + + /// + /// Gets and Sets the RemoteCertificateValidationCallback + /// + public RemoteCertificateValidationCallback RemoteCertificateValidationCallback { get; set; } + + #endregion Properties + + #region Methods + + /// + /// Returns a string with essential information for debugging. + /// + public static string ToDebugReport() + { + string report = "C# SDK (Org.OpenAPITools) Debug Report:\n"; + report += " OS: " + System.Environment.OSVersion + "\n"; + report += " .NET Framework Version: " + System.Environment.Version + "\n"; + report += " Version of the API: 1.0.0\n"; + report += " SDK Package Version: 1.0.0\n"; + + return report; + } + + /// + /// Add Api Key Header. + /// + /// Api Key name. + /// Api Key value. + /// + public void AddApiKey(string key, string value) + { + ApiKey[key] = value; + } + + /// + /// Sets the API key prefix. + /// + /// Api Key name. + /// Api Key value. + public void AddApiKeyPrefix(string key, string value) + { + ApiKeyPrefix[key] = value; + } + + #endregion Methods + + #region Static Members + /// + /// Merge configurations. + /// + /// First configuration. + /// Second configuration. + /// Merged configuration. + public static IReadableConfiguration MergeConfigurations(IReadableConfiguration first, IReadableConfiguration second) + { + if (second == null) return first ?? GlobalConfiguration.Instance; + + Dictionary apiKey = first.ApiKey.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); + Dictionary apiKeyPrefix = first.ApiKeyPrefix.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); + Dictionary defaultHeaders = first.DefaultHeaders.ToDictionary(kvp => kvp.Key, kvp => kvp.Value); + + foreach (var kvp in second.ApiKey) apiKey[kvp.Key] = kvp.Value; + foreach (var kvp in second.ApiKeyPrefix) apiKeyPrefix[kvp.Key] = kvp.Value; + foreach (var kvp in second.DefaultHeaders) defaultHeaders[kvp.Key] = kvp.Value; + + var config = new Configuration + { + ApiKey = apiKey, + ApiKeyPrefix = apiKeyPrefix, + DefaultHeaders = defaultHeaders, + BasePath = second.BasePath ?? first.BasePath, + Timeout = second.Timeout, + Proxy = second.Proxy ?? first.Proxy, + UserAgent = second.UserAgent ?? first.UserAgent, + Username = second.Username ?? first.Username, + Password = second.Password ?? first.Password, + AccessToken = second.AccessToken ?? first.AccessToken, + OAuthTokenUrl = second.OAuthTokenUrl ?? first.OAuthTokenUrl, + OAuthClientId = second.OAuthClientId ?? first.OAuthClientId, + OAuthClientSecret = second.OAuthClientSecret ?? first.OAuthClientSecret, + OAuthScope = second.OAuthScope ?? first.OAuthScope, + OAuthFlow = second.OAuthFlow ?? first.OAuthFlow, + TempFolderPath = second.TempFolderPath ?? first.TempFolderPath, + DateTimeFormat = second.DateTimeFormat ?? first.DateTimeFormat, + ClientCertificates = second.ClientCertificates ?? first.ClientCertificates, + UseDefaultCredentials = second.UseDefaultCredentials, + RemoteCertificateValidationCallback = second.RemoteCertificateValidationCallback ?? first.RemoteCertificateValidationCallback, + }; + return config; + } + #endregion Static Members + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ExceptionFactory.cs new file mode 100644 index 000000000000..6ae2a10aae40 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ExceptionFactory.cs @@ -0,0 +1,22 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; + +namespace Org.OpenAPITools.Client +{ + /// + /// A delegate to ExceptionFactory method + /// + /// Method name + /// Response + /// Exceptions + public delegate Exception ExceptionFactory(string methodName, IApiResponse response); +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/GlobalConfiguration.cs new file mode 100644 index 000000000000..add21c02cd1b --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/GlobalConfiguration.cs @@ -0,0 +1,67 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System.Collections.Generic; + +namespace Org.OpenAPITools.Client +{ + /// + /// provides a compile-time extension point for globally configuring + /// API Clients. + /// + /// + /// A customized implementation via partial class may reside in another file and may + /// be excluded from automatic generation via a .openapi-generator-ignore file. + /// + public partial class GlobalConfiguration : Configuration + { + #region Private Members + + private static readonly object GlobalConfigSync = new { }; + private static IReadableConfiguration _globalConfiguration; + + #endregion Private Members + + #region Constructors + + /// + private GlobalConfiguration() + { + } + + /// + public GlobalConfiguration(IDictionary defaultHeader, IDictionary apiKey, IDictionary apiKeyPrefix, string basePath = "http://localhost:3000/api") : base(defaultHeader, apiKey, apiKeyPrefix, basePath) + { + } + + static GlobalConfiguration() + { + Instance = new GlobalConfiguration(); + } + + #endregion Constructors + + /// + /// Gets or sets the default Configuration. + /// + /// Configuration. + public static IReadableConfiguration Instance + { + get { return _globalConfiguration; } + set + { + lock (GlobalConfigSync) + { + _globalConfiguration = value; + } + } + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/HttpMethod.cs new file mode 100644 index 000000000000..1dd692d8cfb2 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/HttpMethod.cs @@ -0,0 +1,33 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +namespace Org.OpenAPITools.Client +{ + /// + /// Http methods supported by swagger + /// + public enum HttpMethod + { + /// HTTP GET request. + Get, + /// HTTP POST request. + Post, + /// HTTP PUT request. + Put, + /// HTTP DELETE request. + Delete, + /// HTTP HEAD request. + Head, + /// HTTP OPTIONS request. + Options, + /// HTTP PATCH request. + Patch + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/IApiAccessor.cs new file mode 100644 index 000000000000..c8a78e995ce9 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/IApiAccessor.cs @@ -0,0 +1,37 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; + +namespace Org.OpenAPITools.Client +{ + /// + /// Represents configuration aspects required to interact with the API endpoints. + /// + public interface IApiAccessor + { + /// + /// Gets or sets the configuration object + /// + /// An instance of the Configuration + IReadableConfiguration Configuration { get; set; } + + /// + /// Gets the base path of the API client. + /// + /// The base path + string GetBasePath(); + + /// + /// Provides a factory method hook for the creation of exceptions. + /// + ExceptionFactory ExceptionFactory { get; set; } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/IAsynchronousClient.cs new file mode 100644 index 000000000000..fcb4df9b4888 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/IAsynchronousClient.cs @@ -0,0 +1,100 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Threading.Tasks; + +namespace Org.OpenAPITools.Client +{ + /// + /// Contract for Asynchronous RESTful API interactions. + /// + /// This interface allows consumers to provide a custom API accessor client. + /// + public interface IAsynchronousClient + { + /// + /// Executes a non-blocking call to some using the GET http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> GetAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)); + + /// + /// Executes a non-blocking call to some using the POST http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> PostAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)); + + /// + /// Executes a non-blocking call to some using the PUT http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> PutAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)); + + /// + /// Executes a non-blocking call to some using the DELETE http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> DeleteAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)); + + /// + /// Executes a non-blocking call to some using the HEAD http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> HeadAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)); + + /// + /// Executes a non-blocking call to some using the OPTIONS http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> OptionsAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)); + + /// + /// Executes a non-blocking call to some using the PATCH http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// Cancellation Token to cancel the request. + /// The return type. + /// A task eventually representing the response data, decorated with + Task> PatchAsync(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)); + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/IReadableConfiguration.cs new file mode 100644 index 000000000000..1db047df0679 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/IReadableConfiguration.cs @@ -0,0 +1,172 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.Net; +using System.Net.Security; +using System.Security.Cryptography.X509Certificates; +using Org.OpenAPITools.Client.Auth; + +namespace Org.OpenAPITools.Client +{ + /// + /// Represents a readable-only configuration contract. + /// + public interface IReadableConfiguration + { + /// + /// Gets the access token. + /// + /// Access token. + string AccessToken { get; } + + /// + /// Gets the OAuth token URL. + /// + /// OAuth Token URL. + string OAuthTokenUrl { get; } + + /// + /// Gets the OAuth client ID. + /// + /// OAuth Client ID. + string OAuthClientId { get; } + + /// + /// Gets the OAuth client secret. + /// + /// OAuth Client Secret. + string OAuthClientSecret { get; } + + /// + /// Gets the OAuth token scope. + /// + /// OAuth Token scope. + string? OAuthScope { get; } + + /// + /// Gets the OAuth flow. + /// + /// OAuth Flow. + OAuthFlow? OAuthFlow { get; } + + /// + /// Gets the API key. + /// + /// API key. + IDictionary ApiKey { get; } + + /// + /// Gets the API key prefix. + /// + /// API key prefix. + IDictionary ApiKeyPrefix { get; } + + /// + /// Gets the base path. + /// + /// Base path. + string BasePath { get; } + + /// + /// Gets the date time format. + /// + /// Date time format. + string DateTimeFormat { get; } + + /// + /// Gets the default header. + /// + /// Default header. + [Obsolete("Use DefaultHeaders instead.")] + IDictionary DefaultHeader { get; } + + /// + /// Gets the default headers. + /// + /// Default headers. + IDictionary DefaultHeaders { get; } + + /// + /// Gets the temp folder path. + /// + /// Temp folder path. + string TempFolderPath { get; } + + /// + /// Gets the HTTP connection timeout. + /// + /// HTTP connection timeout. + TimeSpan Timeout { get; } + + /// + /// Gets the proxy. + /// + /// Proxy. + WebProxy Proxy { get; } + + /// + /// Gets the user agent. + /// + /// User agent. + string UserAgent { get; } + + /// + /// Gets the username. + /// + /// Username. + string Username { get; } + + /// + /// Gets the password. + /// + /// Password. + string Password { get; } + + /// + /// Determine whether or not the "default credentials" (e.g. the user account under which the current process is running) will be sent along to the server. The default is false. + /// + bool UseDefaultCredentials { get; } + + /// + /// Get the servers associated with the operation. + /// + /// Operation servers. + IReadOnlyDictionary>> OperationServers { get; } + + /// + /// Gets the API key with prefix. + /// + /// API key identifier (authentication scheme). + /// API key with prefix. + string GetApiKeyWithPrefix(string apiKeyIdentifier); + + /// + /// Gets the Operation server url at the provided index. + /// + /// Operation server name. + /// Index of the operation server settings. + /// + string GetOperationServerUrl(string operation, int index); + + /// + /// Gets certificate collection to be sent with requests. + /// + /// X509 Certificate collection. + X509CertificateCollection ClientCertificates { get; } + + /// + /// Callback function for handling the validation of remote certificates. Useful for certificate pinning and + /// overriding certificate errors in the scope of a request. + /// + RemoteCertificateValidationCallback RemoteCertificateValidationCallback { get; } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ISynchronousClient.cs new file mode 100644 index 000000000000..3910f6d68ce1 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ISynchronousClient.cs @@ -0,0 +1,93 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.IO; + +namespace Org.OpenAPITools.Client +{ + /// + /// Contract for Synchronous RESTful API interactions. + /// + /// This interface allows consumers to provide a custom API accessor client. + /// + public interface ISynchronousClient + { + /// + /// Executes a blocking call to some using the GET http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Get(string path, RequestOptions options, IReadableConfiguration configuration = null); + + /// + /// Executes a blocking call to some using the POST http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Post(string path, RequestOptions options, IReadableConfiguration configuration = null); + + /// + /// Executes a blocking call to some using the PUT http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Put(string path, RequestOptions options, IReadableConfiguration configuration = null); + + /// + /// Executes a blocking call to some using the DELETE http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Delete(string path, RequestOptions options, IReadableConfiguration configuration = null); + + /// + /// Executes a blocking call to some using the HEAD http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Head(string path, RequestOptions options, IReadableConfiguration configuration = null); + + /// + /// Executes a blocking call to some using the OPTIONS http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Options(string path, RequestOptions options, IReadableConfiguration configuration = null); + + /// + /// Executes a blocking call to some using the PATCH http verb. + /// + /// The relative path to invoke. + /// The request parameters to pass along to the client. + /// Per-request configurable settings. + /// The return type. + /// The response data, decorated with + ApiResponse Patch(string path, RequestOptions options, IReadableConfiguration configuration = null); + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Multimap.cs new file mode 100644 index 000000000000..966d634a50b8 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/Multimap.cs @@ -0,0 +1,295 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; + +namespace Org.OpenAPITools.Client +{ + /// + /// A dictionary in which one key has many associated values. + /// + /// The type of the key + /// The type of the value associated with the key. + public class Multimap : IDictionary> + { + #region Private Fields + + private readonly Dictionary> _dictionary; + + #endregion Private Fields + + #region Constructors + + /// + /// Empty Constructor. + /// + public Multimap() + { + _dictionary = new Dictionary>(); + } + + /// + /// Constructor with comparer. + /// + /// + public Multimap(IEqualityComparer comparer) + { + _dictionary = new Dictionary>(comparer); + } + + #endregion Constructors + + #region Enumerators + + /// + /// To get the enumerator. + /// + /// Enumerator + public IEnumerator>> GetEnumerator() + { + return _dictionary.GetEnumerator(); + } + + /// + /// To get the enumerator. + /// + /// Enumerator + IEnumerator IEnumerable.GetEnumerator() + { + return _dictionary.GetEnumerator(); + } + + #endregion Enumerators + + #region Public Members + /// + /// Add values to Multimap + /// + /// Key value pair + public void Add(KeyValuePair> item) + { + if (!TryAdd(item.Key, item.Value)) + throw new InvalidOperationException("Could not add values to Multimap."); + } + + /// + /// Add Multimap to Multimap + /// + /// Multimap + public void Add(Multimap multimap) + { + foreach (var item in multimap) + { + if (!TryAdd(item.Key, item.Value)) + throw new InvalidOperationException("Could not add values to Multimap."); + } + } + + /// + /// Clear Multimap + /// + public void Clear() + { + _dictionary.Clear(); + } + + /// + /// Determines whether Multimap contains the specified item. + /// + /// Key value pair + /// Method needs to be implemented + /// true if the Multimap contains the item; otherwise, false. + public bool Contains(KeyValuePair> item) + { + throw new NotImplementedException(); + } + + /// + /// Copy items of the Multimap to an array, + /// starting at a particular array index. + /// + /// The array that is the destination of the items copied + /// from Multimap. The array must have zero-based indexing. + /// The zero-based index in array at which copying begins. + /// Method needs to be implemented + public void CopyTo(KeyValuePair>[] array, int arrayIndex) + { + throw new NotImplementedException(); + } + + /// + /// Removes the specified item from the Multimap. + /// + /// Key value pair + /// true if the item is successfully removed; otherwise, false. + /// Method needs to be implemented + public bool Remove(KeyValuePair> item) + { + throw new NotImplementedException(); + } + + /// + /// Gets the number of items contained in the Multimap. + /// + public int Count => _dictionary.Count; + + /// + /// Gets a value indicating whether the Multimap is read-only. + /// + public bool IsReadOnly => false; + + /// + /// Adds an item with the provided key and value to the Multimap. + /// + /// The object to use as the key of the item to add. + /// The object to use as the value of the item to add. + /// Thrown when couldn't add the value to Multimap. + public void Add(TKey key, IList value) + { + if (value != null && value.Count > 0) + { + if (_dictionary.TryGetValue(key, out var list)) + { + foreach (var k in value) list.Add(k); + } + else + { + list = new List(value); + if (!TryAdd(key, list)) + throw new InvalidOperationException("Could not add values to Multimap."); + } + } + } + + /// + /// Determines whether the Multimap contains an item with the specified key. + /// + /// The key to locate in the Multimap. + /// true if the Multimap contains an item with + /// the key; otherwise, false. + public bool ContainsKey(TKey key) + { + return _dictionary.ContainsKey(key); + } + + /// + /// Removes item with the specified key from the Multimap. + /// + /// The key to locate in the Multimap. + /// true if the item is successfully removed; otherwise, false. + public bool Remove(TKey key) + { + return TryRemove(key, out var _); + } + + /// + /// Gets the value associated with the specified key. + /// + /// The key whose value to get. + /// When this method returns, the value associated with the specified key, if the + /// key is found; otherwise, the default value for the type of the value parameter. + /// This parameter is passed uninitialized. + /// true if the object that implements Multimap contains + /// an item with the specified key; otherwise, false. + public bool TryGetValue(TKey key, out IList value) + { + return _dictionary.TryGetValue(key, out value); + } + + /// + /// Gets or sets the item with the specified key. + /// + /// The key of the item to get or set. + /// The value of the specified key. + public IList this[TKey key] + { + get => _dictionary[key]; + set => _dictionary[key] = value; + } + + /// + /// Gets a System.Collections.Generic.ICollection containing the keys of the Multimap. + /// + public ICollection Keys => _dictionary.Keys; + + /// + /// Gets a System.Collections.Generic.ICollection containing the values of the Multimap. + /// + public ICollection> Values => _dictionary.Values; + + /// + /// Copy the items of the Multimap to an System.Array, + /// starting at a particular System.Array index. + /// + /// The one-dimensional System.Array that is the destination of the items copied + /// from Multimap. The System.Array must have zero-based indexing. + /// The zero-based index in array at which copying begins. + public void CopyTo(Array array, int index) + { + ((ICollection)_dictionary).CopyTo(array, index); + } + + /// + /// Adds an item with the provided key and value to the Multimap. + /// + /// The object to use as the key of the item to add. + /// The object to use as the value of the item to add. + /// Thrown when couldn't add value to Multimap. + public void Add(TKey key, TValue value) + { + if (value != null) + { + if (_dictionary.TryGetValue(key, out var list)) + { + list.Add(value); + } + else + { + list = new List { value }; + if (!TryAdd(key, list)) + throw new InvalidOperationException("Could not add value to Multimap."); + } + } + } + + #endregion Public Members + + #region Private Members + + /** + * Helper method to encapsulate generator differences between dictionary types. + */ + private bool TryRemove(TKey key, out IList value) + { + _dictionary.TryGetValue(key, out value); + return _dictionary.Remove(key); + } + + /** + * Helper method to encapsulate generator differences between dictionary types. + */ + private bool TryAdd(TKey key, IList value) + { + try + { + _dictionary.Add(key, value); + } + catch (ArgumentException) + { + return false; + } + + return true; + } + #endregion Private Members + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs new file mode 100644 index 000000000000..dcc79edd9446 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs @@ -0,0 +1,29 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using Newtonsoft.Json.Converters; + +namespace Org.OpenAPITools.Client +{ + /// + /// Formatter for 'date' openapi formats ss defined by full-date - RFC3339 + /// see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#data-types + /// + public class OpenAPIDateConverter : IsoDateTimeConverter + { + /// + /// Initializes a new instance of the class. + /// + public OpenAPIDateConverter() + { + // full-date = date-fullyear "-" date-month "-" date-mday + DateTimeFormat = "yyyy-MM-dd"; + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/RequestOptions.cs new file mode 100644 index 000000000000..20366c4e7cc4 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/RequestOptions.cs @@ -0,0 +1,89 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections.Generic; +using System.IO; +using System.Net; + +namespace Org.OpenAPITools.Client +{ + /// + /// A container for generalized request inputs. This type allows consumers to extend the request functionality + /// by abstracting away from the default (built-in) request framework (e.g. RestSharp). + /// + public class RequestOptions + { + /// + /// Parameters to be bound to path parts of the Request's URL + /// + public Dictionary PathParameters { get; set; } + + /// + /// Query parameters to be applied to the request. + /// Keys may have 1 or more values associated. + /// + public Multimap QueryParameters { get; set; } + + /// + /// Header parameters to be applied to the request. + /// Keys may have 1 or more values associated. + /// + public Multimap HeaderParameters { get; set; } + + /// + /// Form parameters to be sent along with the request. + /// + public Dictionary FormParameters { get; set; } + + /// + /// File parameters to be sent along with the request. + /// + public Multimap FileParameters { get; set; } + + /// + /// Cookies to be sent along with the request. + /// + public List Cookies { get; set; } + + /// + /// Operation associated with the request path. + /// + public string Operation { get; set; } + + /// + /// Index associated with the operation. + /// + public int OperationIndex { get; set; } + + /// + /// Any data associated with a request body. + /// + public Object Data { get; set; } + + /// + /// If request should be authenticated with OAuth. + /// + public bool OAuth { get; set; } + + /// + /// Constructs a new instance of + /// + public RequestOptions() + { + PathParameters = new Dictionary(); + QueryParameters = new Multimap(); + HeaderParameters = new Multimap(); + FormParameters = new Dictionary(); + FileParameters = new Multimap(); + Cookies = new List(); + } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/RetryConfiguration.cs new file mode 100644 index 000000000000..f9141a100059 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -0,0 +1,31 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Polly; +using RestSharp; + +namespace Org.OpenAPITools.Client +{ + /// + /// Configuration class to set the polly retry policies to be applied to the requests. + /// + public static class RetryConfiguration + { + /// + /// Retry policy + /// + public static Policy RetryPolicy { get; set; } + + /// + /// Async retry policy + /// + public static AsyncPolicy AsyncRetryPolicy { get; set; } + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs new file mode 100644 index 000000000000..675bb752f4b9 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs @@ -0,0 +1,76 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; + +namespace Org.OpenAPITools.Model +{ + /// + /// Abstract base class for oneOf, anyOf schemas in the OpenAPI specification + /// + public abstract partial class AbstractOpenAPISchema + { + /// + /// Custom JSON serializer + /// + static public readonly JsonSerializerSettings SerializerSettings = new JsonSerializerSettings + { + // OpenAPI generated types generally hide default constructors. + ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor, + MissingMemberHandling = MissingMemberHandling.Error, + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new CamelCaseNamingStrategy + { + OverrideSpecifiedNames = false + } + } + }; + + /// + /// Custom JSON serializer for objects with additional properties + /// + static public readonly JsonSerializerSettings AdditionalPropertiesSerializerSettings = new JsonSerializerSettings + { + // OpenAPI generated types generally hide default constructors. + ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor, + MissingMemberHandling = MissingMemberHandling.Ignore, + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new CamelCaseNamingStrategy + { + OverrideSpecifiedNames = false + } + } + }; + + /// + /// Gets or Sets the actual instance + /// + public abstract Object ActualInstance { get; set; } + + /// + /// Gets or Sets IsNullable to indicate whether the instance is nullable + /// + public bool IsNullable { get; protected set; } + + /// + /// Gets or Sets the schema type, which can be either `oneOf` or `anyOf` + /// + public string SchemaType { get; protected set; } + + /// + /// Converts the instance into JSON string. + /// + public abstract string ToJson(); + } +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/Category.cs new file mode 100644 index 000000000000..f2702140edab --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/Category.cs @@ -0,0 +1,100 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// A category for a pet + /// + [DataContract(Name = "Category")] + public partial class Category : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// id. + /// name. + public Category(long id = default(long), string name = default(string)) + { + this.Id = id; + this.Name = name; + } + + /// + /// Gets or Sets Id + /// + [DataMember(Name = "id", EmitDefaultValue = false)] + public long Id { get; set; } + + /// + /// Gets or Sets Name + /// + [DataMember(Name = "name", EmitDefaultValue = false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Category {\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + if (this.Name != null) { + // Name (string) pattern + Regex regexName = new Regex(@"^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$", RegexOptions.CultureInvariant); + if (!regexName.Match(this.Name).Success) + { + yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, must match a pattern of " + regexName, new [] { "Name" }); + } + } + + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/Pet.cs new file mode 100644 index 000000000000..4ef350025b52 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/Pet.cs @@ -0,0 +1,173 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// A pet for sale in the pet store + /// + [DataContract(Name = "Pet")] + public partial class Pet : IValidatableObject + { + /// + /// pet status in the store + /// + /// pet status in the store + [JsonConverter(typeof(StringEnumConverter))] + public enum StatusEnum + { + /// + /// Enum Available for value: available + /// + [EnumMember(Value = "available")] + Available = 1, + + /// + /// Enum Pending for value: pending + /// + [EnumMember(Value = "pending")] + Pending = 2, + + /// + /// Enum Sold for value: sold + /// + [EnumMember(Value = "sold")] + Sold = 3 + } + + + /// + /// pet status in the store + /// + /// pet status in the store + [DataMember(Name = "status", EmitDefaultValue = false)] + [Obsolete] + public StatusEnum? Status { get; set; } + /// + /// Initializes a new instance of the class. + /// + [JsonConstructorAttribute] + protected Pet() { } + /// + /// Initializes a new instance of the class. + /// + /// id. + /// category. + /// name (required). + /// photoUrls (required). + /// tags. + /// pet status in the store. + public Pet(long id = default(long), Category category = default(Category), string name = default(string), List photoUrls = default(List), List tags = default(List), StatusEnum? status = default(StatusEnum?)) + { + // to ensure "name" is required (not null) + if (name == null) + { + throw new ArgumentNullException("name is a required property for Pet and cannot be null"); + } + this.Name = name; + // to ensure "photoUrls" is required (not null) + if (photoUrls == null) + { + throw new ArgumentNullException("photoUrls is a required property for Pet and cannot be null"); + } + this.PhotoUrls = photoUrls; + this.Id = id; + this.Category = category; + this.Tags = tags; + this.Status = status; + } + + /// + /// Gets or Sets Id + /// + [DataMember(Name = "id", EmitDefaultValue = false)] + public long Id { get; set; } + + /// + /// Gets or Sets Category + /// + [DataMember(Name = "category", EmitDefaultValue = false)] + public Category Category { get; set; } + + /// + /// Gets or Sets Name + /// + /* + doggie + */ + [DataMember(Name = "name", IsRequired = true, EmitDefaultValue = true)] + public string Name { get; set; } + + /// + /// Gets or Sets PhotoUrls + /// + [DataMember(Name = "photoUrls", IsRequired = true, EmitDefaultValue = true)] + public List PhotoUrls { get; set; } + + /// + /// Gets or Sets Tags + /// + [DataMember(Name = "tags", EmitDefaultValue = false)] + public List Tags { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Pet {\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" Category: ").Append(Category).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append(" PhotoUrls: ").Append(PhotoUrls).Append("\n"); + sb.Append(" Tags: ").Append(Tags).Append("\n"); + sb.Append(" Status: ").Append(Status).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/Tag.cs new file mode 100644 index 000000000000..fa80ee84810b --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Model/Tag.cs @@ -0,0 +1,91 @@ +/* + * OpenAPI Petstore + * + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.IO; +using System.Runtime.Serialization; +using System.Text; +using System.Text.RegularExpressions; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// A tag for a pet + /// + [DataContract(Name = "Tag")] + public partial class Tag : IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// id. + /// name. + public Tag(long id = default(long), string name = default(string)) + { + this.Id = id; + this.Name = name; + } + + /// + /// Gets or Sets Id + /// + [DataMember(Name = "id", EmitDefaultValue = false)] + public long Id { get; set; } + + /// + /// Gets or Sets Name + /// + [DataMember(Name = "name", EmitDefaultValue = false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + StringBuilder sb = new StringBuilder(); + sb.Append("class Tag {\n"); + sb.Append(" Id: ").Append(Id).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Org.OpenAPITools.csproj new file mode 100644 index 000000000000..ccb09c252b62 --- /dev/null +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -0,0 +1,35 @@ + + + + false + net8.0 + Org.OpenAPITools + Org.OpenAPITools + Library + OpenAPI + OpenAPI + OpenAPI Library + A library generated from a OpenAPI doc + No Copyright + Org.OpenAPITools + 1.0.0 + bin\$(Configuration)\$(TargetFramework)\Org.OpenAPITools.xml + https://github.com/GIT_USER_ID/GIT_REPO_ID.git + git + Minor update + annotations + false + + + + + + + + + + + + + + From 3c25de021119c5388f30bdd351a2c401190147bf Mon Sep 17 00:00:00 2001 From: jpfinne Date: Mon, 10 Mar 2025 17:43:52 +0100 Subject: [PATCH 09/47] Fix test for defaultValue for AdditionalProperties fields when using generateAliasAsModel --- ...ava-resttemplate-generateAliasAsModel.yaml | 12 + .../spring-boot-generateAliasAsModel.yaml | 12 + .../languages/AbstractJavaCodegen.java | 4 +- .../codegen/java/JavaClientCodegenTest.java | 8 +- .../java/spring/SpringCodegenTest.java | 3 +- .../resources/3_0/additionalProperties.yaml | 4 + .../3_0/java/generateAliasAsModel.yaml | 230 +++++ .../.github/workflows/maven.yml | 30 + .../.gitignore | 21 + .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 72 ++ .../.openapi-generator/VERSION | 1 + .../.travis.yml | 22 + .../README.md | 158 ++++ .../api/openapi.yaml | 331 +++++++ .../build.gradle | 137 +++ .../build.sbt | 1 + .../docs/AdditionalProperties.md | 15 + .../docs/AdditionalPropertiesAnyType.md | 13 + .../docs/AdditionalPropertiesArray.md | 13 + .../docs/AdditionalPropertiesBoolean.md | 13 + .../docs/AdditionalPropertiesClass.md | 23 + .../docs/AdditionalPropertiesClassRef.md | 17 + .../docs/AdditionalPropertiesInteger.md | 13 + .../docs/AdditionalPropertiesNumber.md | 13 + .../docs/AdditionalPropertiesObject.md | 13 + .../docs/AdditionalPropertiesString.md | 13 + .../docs/AdditionalPropertyArrayAnyType.md | 12 + .../docs/AdditionalPropertyArrayInteger.md | 12 + .../docs/AdditionalPropertyBoolean.md | 12 + .../docs/AdditionalPropertyClassRef.md | 21 + .../docs/AdditionalPropertyInteger.md | 12 + .../docs/AdditionalPropertyMapAnyType.md | 12 + .../docs/AdditionalPropertyMapString.md | 12 + .../docs/AdditionalPropertyNumber.md | 12 + .../docs/AdditionalPropertyString.md | 12 + .../docs/Animal.md | 13 + .../docs/FakeApi.md | 74 ++ ...dPropertiesAndAdditionalPropertiesClass.md | 15 + .../git_push.sh | 57 ++ .../gradle.properties | 6 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../resttemplate-generateAliasAsModel/gradlew | 249 ++++++ .../gradlew.bat | 92 ++ .../resttemplate-generateAliasAsModel/pom.xml | 285 ++++++ .../settings.gradle | 1 + .../src/main/AndroidManifest.xml | 3 + .../org/openapitools/client/ApiClient.java | 814 ++++++++++++++++++ .../java/org/openapitools/client/BaseApi.java | 87 ++ .../client/JavaTimeFormatter.java | 64 ++ .../client/RFC3339DateFormat.java | 58 ++ .../client/RFC3339InstantDeserializer.java | 100 +++ .../client/RFC3339JavaTimeModule.java | 31 + .../client/ServerConfiguration.java | 72 ++ .../openapitools/client/ServerVariable.java | 37 + .../org/openapitools/client/api/FakeApi.java | 108 +++ .../openapitools/client/auth/ApiKeyAuth.java | 75 ++ .../client/auth/Authentication.java | 27 + .../client/auth/HttpBasicAuth.java | 51 ++ .../client/auth/HttpBearerAuth.java | 69 ++ .../client/model/AdditionalProperties.java | 181 ++++ .../model/AdditionalPropertiesAnyType.java | 161 ++++ .../model/AdditionalPropertiesArray.java | 162 ++++ .../model/AdditionalPropertiesBoolean.java | 161 ++++ .../model/AdditionalPropertiesClass.java | 533 ++++++++++++ .../model/AdditionalPropertiesClassRef.java | 248 ++++++ .../model/AdditionalPropertiesInteger.java | 161 ++++ .../model/AdditionalPropertiesNumber.java | 162 ++++ .../model/AdditionalPropertiesObject.java | 162 ++++ .../model/AdditionalPropertiesString.java | 161 ++++ .../model/AdditionalPropertyArrayAnyType.java | 118 +++ .../model/AdditionalPropertyArrayInteger.java | 118 +++ .../model/AdditionalPropertyBoolean.java | 117 +++ .../model/AdditionalPropertyClassRef.java | 384 +++++++++ .../model/AdditionalPropertyInteger.java | 117 +++ .../model/AdditionalPropertyMapAnyType.java | 118 +++ .../model/AdditionalPropertyMapString.java | 118 +++ .../model/AdditionalPropertyNumber.java | 118 +++ .../model/AdditionalPropertyString.java | 117 +++ .../org/openapitools/client/model/Animal.java | 112 +++ ...ropertiesAndAdditionalPropertiesClass.java | 191 ++++ .../openapitools/client/api/FakeApiTest.java | 54 ++ .../AdditionalPropertiesAnyTypeTest.java | 47 + .../model/AdditionalPropertiesArrayTest.java | 48 ++ .../AdditionalPropertiesBooleanTest.java | 47 + .../AdditionalPropertiesClassRefTest.java | 83 ++ .../model/AdditionalPropertiesClassTest.java | 135 +++ .../AdditionalPropertiesIntegerTest.java | 47 + .../model/AdditionalPropertiesNumberTest.java | 48 ++ .../model/AdditionalPropertiesObjectTest.java | 48 ++ .../model/AdditionalPropertiesStringTest.java | 47 + .../model/AdditionalPropertiesTest.java | 66 ++ .../AdditionalPropertyArrayAnyTypeTest.java | 35 + .../AdditionalPropertyArrayIntegerTest.java | 35 + .../model/AdditionalPropertyBooleanTest.java | 34 + .../model/AdditionalPropertyClassRefTest.java | 119 +++ .../model/AdditionalPropertyIntegerTest.java | 34 + .../AdditionalPropertyMapAnyTypeTest.java | 35 + .../AdditionalPropertyMapStringTest.java | 35 + .../model/AdditionalPropertyNumberTest.java | 35 + .../model/AdditionalPropertyStringTest.java | 34 + .../openapitools/client/model/AnimalTest.java | 47 + ...rtiesAndAdditionalPropertiesClassTest.java | 68 ++ .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 34 + .../.openapi-generator/VERSION | 1 + .../springboot-generateAliasAsModel/README.md | 23 + .../springboot-generateAliasAsModel/pom.xml | 81 ++ .../OpenApiGeneratorApplication.java | 30 + .../org/openapitools/RFC3339DateFormat.java | 38 + .../java/org/openapitools/api/ApiUtil.java | 19 + .../java/org/openapitools/api/FakeApi.java | 63 ++ .../openapitools/api/FakeApiController.java | 46 + .../configuration/HomeController.java | 13 + .../configuration/SpringFoxConfiguration.java | 71 ++ .../model/AdditionalProperties.java | 136 +++ .../model/AdditionalPropertiesAnyType.java | 129 +++ .../model/AdditionalPropertiesArray.java | 130 +++ .../model/AdditionalPropertiesBoolean.java | 129 +++ .../model/AdditionalPropertiesClass.java | 415 +++++++++ .../model/AdditionalPropertiesClassRef.java | 185 ++++ .../model/AdditionalPropertiesInteger.java | 129 +++ .../model/AdditionalPropertiesNumber.java | 130 +++ .../model/AdditionalPropertiesObject.java | 130 +++ .../model/AdditionalPropertiesString.java | 129 +++ .../model/AdditionalPropertyArrayAnyType.java | 101 +++ .../model/AdditionalPropertyArrayInteger.java | 101 +++ .../model/AdditionalPropertyBoolean.java | 100 +++ .../model/AdditionalPropertyClassRef.java | 285 ++++++ .../model/AdditionalPropertyInteger.java | 100 +++ .../model/AdditionalPropertyMapAnyType.java | 101 +++ .../model/AdditionalPropertyMapString.java | 101 +++ .../model/AdditionalPropertyNumber.java | 101 +++ .../model/AdditionalPropertyString.java | 100 +++ .../java/org/openapitools/model/Animal.java | 85 ++ ...ropertiesAndAdditionalPropertiesClass.java | 149 ++++ .../src/main/resources/application.properties | 3 + .../src/main/resources/openapi.yaml | 332 +++++++ .../OpenApiGeneratorApplicationTests.java | 13 + 140 files changed, 12379 insertions(+), 5 deletions(-) create mode 100644 bin/configs/java-resttemplate-generateAliasAsModel.yaml create mode 100644 bin/configs/spring-boot-generateAliasAsModel.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/.github/workflows/maven.yml create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/.gitignore create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator-ignore create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/FILES create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/VERSION create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/.travis.yml create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/README.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/api/openapi.yaml create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/build.gradle create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/build.sbt create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalProperties.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesAnyType.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesArray.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesBoolean.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClass.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClassRef.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesInteger.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesNumber.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesObject.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesString.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayAnyType.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayInteger.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyBoolean.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyClassRef.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyInteger.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapAnyType.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapString.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyNumber.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyString.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/Animal.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/FakeApi.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/git_push.sh create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle.properties create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle/wrapper/gradle-wrapper.jar create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle/wrapper/gradle-wrapper.properties create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/gradlew create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/gradlew.bat create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/pom.xml create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/settings.gradle create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/AndroidManifest.xml create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ApiClient.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/BaseApi.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/JavaTimeFormatter.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339DateFormat.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerConfiguration.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerVariable.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/api/FakeApi.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/Authentication.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalProperties.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClassRef.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayAnyType.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayInteger.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyBoolean.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyClassRef.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyInteger.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapAnyType.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapString.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyNumber.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyString.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/Animal.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/api/FakeApiTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassRefTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayAnyTypeTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayIntegerTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyBooleanTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyClassRefTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyIntegerTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapAnyTypeTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapStringTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyNumberTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyStringTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AnimalTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator-ignore create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/VERSION create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/README.md create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/pom.xml create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/OpenApiGeneratorApplication.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/RFC3339DateFormat.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/ApiUtil.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApi.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApiController.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/HomeController.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalProperties.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClassRef.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesString.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayAnyType.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayInteger.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyBoolean.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyClassRef.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyInteger.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapAnyType.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapString.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyNumber.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyString.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/Animal.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/application.properties create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/openapi.yaml create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java diff --git a/bin/configs/java-resttemplate-generateAliasAsModel.yaml b/bin/configs/java-resttemplate-generateAliasAsModel.yaml new file mode 100644 index 000000000000..d45737fa2fc1 --- /dev/null +++ b/bin/configs/java-resttemplate-generateAliasAsModel.yaml @@ -0,0 +1,12 @@ +generatorName: java +outputDir: samples/client/petstore/java/resttemplate-generateAliasAsModel +library: resttemplate +inputSpec: modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml +templateDir: modules/openapi-generator/src/main/resources/Java +generateAliasAsModel: true +additionalProperties: + java8: true + useJakartaEe: true + artifactId: petstore-resttemplate-generateAliasAsModel + hideGenerationTimestamp: "true" + generateConstructorWithAllArgs: true diff --git a/bin/configs/spring-boot-generateAliasAsModel.yaml b/bin/configs/spring-boot-generateAliasAsModel.yaml new file mode 100644 index 000000000000..5e6e81eae31c --- /dev/null +++ b/bin/configs/spring-boot-generateAliasAsModel.yaml @@ -0,0 +1,12 @@ +generatorName: spring +outputDir: samples/server/petstore/springboot-generateAliasAsModel +library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring +generateAliasAsModel: "true" +additionalProperties: + documentationProvider: springfox + useSwaggerUI: false + java8: true + artifactId: spring-boot-generateAliasAsModel + hideGenerationTimestamp: "true" diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index d4028bd09810..c550a72aeab1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -1330,8 +1330,8 @@ public String toDefaultValue(CodegenProperty cp, Schema schema) { return null; } - if (isGenerateAliasAsModel()) { - // additionalProperties generated + if (ModelUtils.isGenerateAliasAsModel() && !cp.dataType.contains("Map<")) { + // Aliased class used as the field name instead of Map<> return null; } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index ad9c4416a894..962f18b980e0 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -3515,7 +3515,9 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash "AdditionalPropertiesOnlyTypeString additionalPropertiesOnlyTypeString = (AdditionalPropertiesOnlyTypeString) o;", "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties)"); - JavaFileAssert.assertThat(files.get("Response.java")).fileContains("AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); + JavaFileAssert.assertThat(files.get("Response.java")).fileContains( + + "AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); } @Test @@ -3555,6 +3557,8 @@ public void testAdditionalPropertiesWithGenerateAliasForMicroProfile() { "HashMap", "return Objects.hash(name, super.hashCode())"); - JavaFileAssert.assertThat(files.get("Response.java")).fileContains("AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); + JavaFileAssert.assertThat(files.get("Response.java")).fileContains( + "Map inlineMap = new HashMap<>();", + "AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index f863ef7179d3..0939e43012f5 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5390,7 +5390,8 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash final CodegenConfigurator configurator = new CodegenConfigurator() .setGeneratorName("spring") .setGenerateAliasAsModel(true) - .setInputSpec("src/test/resources/3_0/additionalProperties.yaml") + //.setInputSpec("src/test/resources/3_0/additionalProperties.yaml") + .setInputSpec("C:\\dev\\openapi-generator\\modules\\openapi-generator\\src\\test\\resources\\3_0\\petstore-with-fake-endpoints-models-for-testing.yaml") .setOutputDir(output.toString().replace("\\", "/")); Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() diff --git a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml index 6610ba0a1cd6..d7e6cedb8f00 100644 --- a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml @@ -17,6 +17,10 @@ components: Response: type: object properties: + inlineMap: + type: object + additionalProperties: + type: string additionalPropertiesOnlyTypeObject: $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeObject' additionalPropertiesOnlyTypeString: diff --git a/modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml b/modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml new file mode 100644 index 000000000000..ba9852b6bbac --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml @@ -0,0 +1,230 @@ +openapi: 3.0.0 +info: + description: This spec is mainly for testing generateAliasAsModel and + version: 1.0.0 + title: generateAliasAsModel +paths: + /fake/additionalProperties-reference: + post: + tags: + - fake + summary: test referenced additionalProperties + description: '' + operationId: testAdditionalPropertiesReference + responses: + '200': + description: successful operation + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/AdditionalProperties' + description: request body + required: true +components: + schemas: + AdditionalProperties: + type: object + properties: + additionalPropertiesClassRef: + $ref: "#/components/schemas/AdditionalPropertiesClassRef" + additionalPropertiesClass: + $ref: "#/components/schemas/AdditionalPropertiesClass" + mixed: + $ref: "#/components/schemas/MixedPropertiesAndAdditionalPropertiesClass" + AdditionalPropertiesClassRef: + type: object + properties: + map_string: + $ref: "#/components/schemas/AdditionalPropertiesString" + map_number: + $ref: "#/components/schemas/AdditionalPropertiesNumber" + map_integer: + $ref: "#/components/schemas/AdditionalPropertiesInteger" + map_boolean: + $ref: "#/components/schemas/AdditionalPropertiesBoolean" + anytype_1: + $ref: "#/components/schemas/AnyType1" + AdditionalPropertyClassRef: + type: object + properties: + map_string: + $ref: "#/components/schemas/AdditionalPropertyString" + map_number: + $ref: "#/components/schemas/AdditionalPropertyNumber" + map_integer: + $ref: "#/components/schemas/AdditionalPropertyInteger" + map_boolean: + $ref: "#/components/schemas/AdditionalPropertyBoolean" + map_array_integer: + $ref: "#/components/schemas/AdditionalPropertyArrayInteger" + map_array_anytype: + $ref: "#/components/schemas/AdditionalPropertyArrayAnyType" + map_map_string: + $ref: "#/components/schemas/AdditionalPropertyMapString" + map_map_anytype: + $ref: "#/components/schemas/AdditionalPropertyMapAnyType" + anytype_1: + $ref: "#/components/schemas/AnyType1" + AdditionalPropertyString: + type: object + additionalProperties: + type: string + AdditionalPropertyNumber: + type: object + additionalProperties: + type: number + AdditionalPropertyInteger: + type: object + additionalProperties: + type: integer + AdditionalPropertyBoolean: + type: object + additionalProperties: + type: boolean + AdditionalPropertyArrayInteger: + type: object + additionalProperties: + type: array + items: + type: integer + AdditionalPropertyArrayAnyType: + type: object + additionalProperties: + type: array + items: + type: object + AdditionalPropertyMapString: + type: object + additionalProperties: + type: object + additionalProperties: + type: string + AdditionalPropertyMapAnyType: + type: object + additionalProperties: + type: object + additionalProperties: + type: object + AnyType1: + type: object + AdditionalPropertiesClass: + type: object + properties: + map_string: + type: object + additionalProperties: + type: string + map_number: + type: object + additionalProperties: + type: number + map_integer: + type: object + additionalProperties: + type: integer + map_boolean: + type: object + additionalProperties: + type: boolean + map_array_integer: + type: object + additionalProperties: + type: array + items: + type: integer + map_array_anytype: + type: object + additionalProperties: + type: array + items: + type: object + map_map_string: + type: object + additionalProperties: + type: object + additionalProperties: + type: string + map_map_anytype: + type: object + additionalProperties: + type: object + additionalProperties: + type: object + anytype_1: + type: object + anytype_2: {} + anytype_3: + type: object + properties: {} + AdditionalPropertiesString: + type: object + properties: + name: + type: string + additionalProperties: + type: string + AdditionalPropertiesInteger: + type: object + properties: + name: + type: string + additionalProperties: + type: integer + AdditionalPropertiesNumber: + type: object + properties: + name: + type: string + additionalProperties: + type: number + AdditionalPropertiesBoolean: + type: object + properties: + name: + type: string + additionalProperties: + type: boolean + AdditionalPropertiesArray: + type: object + properties: + name: + type: string + additionalProperties: + type: array + items: + type: object + AdditionalPropertiesObject: + type: object + properties: + name: + type: string + additionalProperties: + type: object + additionalProperties: + type: object + AdditionalPropertiesAnyType: + type: object + properties: + name: + type: string + additionalProperties: + type: object + MixedPropertiesAndAdditionalPropertiesClass: + type: object + properties: + uuid: + type: string + format: uuid + dateTime: + type: string + format: date-time + map: + type: object + additionalProperties: + $ref: "#/components/schemas/Animal" + Animal: + type: object + properties: + className: + type: string diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/.github/workflows/maven.yml b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.github/workflows/maven.yml new file mode 100644 index 000000000000..6cb712e63f5e --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.github/workflows/maven.yml @@ -0,0 +1,30 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven +# +# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech) + +name: Java CI with Maven + +on: + push: + branches: [ main, master ] + pull_request: + branches: [ main, master ] + +jobs: + build: + name: Build generateAliasAsModel + runs-on: ubuntu-latest + strategy: + matrix: + java: [ 17, 21 ] + steps: + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn -B package --no-transfer-progress --file pom.xml diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/.gitignore b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.gitignore new file mode 100644 index 000000000000..a530464afa1b --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.gitignore @@ -0,0 +1,21 @@ +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# exclude jar for gradle wrapper +!gradle/wrapper/*.jar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# build files +**/target +target +.gradle +build diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator-ignore b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/FILES b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/FILES new file mode 100644 index 000000000000..28e9a19600c1 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/FILES @@ -0,0 +1,72 @@ +.github/workflows/maven.yml +.gitignore +.travis.yml +README.md +api/openapi.yaml +build.gradle +build.sbt +docs/AdditionalProperties.md +docs/AdditionalPropertiesAnyType.md +docs/AdditionalPropertiesArray.md +docs/AdditionalPropertiesBoolean.md +docs/AdditionalPropertiesClass.md +docs/AdditionalPropertiesClassRef.md +docs/AdditionalPropertiesInteger.md +docs/AdditionalPropertiesNumber.md +docs/AdditionalPropertiesObject.md +docs/AdditionalPropertiesString.md +docs/AdditionalPropertyArrayAnyType.md +docs/AdditionalPropertyArrayInteger.md +docs/AdditionalPropertyBoolean.md +docs/AdditionalPropertyClassRef.md +docs/AdditionalPropertyInteger.md +docs/AdditionalPropertyMapAnyType.md +docs/AdditionalPropertyMapString.md +docs/AdditionalPropertyNumber.md +docs/AdditionalPropertyString.md +docs/Animal.md +docs/FakeApi.md +docs/MixedPropertiesAndAdditionalPropertiesClass.md +git_push.sh +gradle.properties +gradle/wrapper/gradle-wrapper.jar +gradle/wrapper/gradle-wrapper.properties +gradlew +gradlew.bat +pom.xml +settings.gradle +src/main/AndroidManifest.xml +src/main/java/org/openapitools/client/ApiClient.java +src/main/java/org/openapitools/client/BaseApi.java +src/main/java/org/openapitools/client/JavaTimeFormatter.java +src/main/java/org/openapitools/client/RFC3339DateFormat.java +src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java +src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java +src/main/java/org/openapitools/client/ServerConfiguration.java +src/main/java/org/openapitools/client/ServerVariable.java +src/main/java/org/openapitools/client/api/FakeApi.java +src/main/java/org/openapitools/client/auth/ApiKeyAuth.java +src/main/java/org/openapitools/client/auth/Authentication.java +src/main/java/org/openapitools/client/auth/HttpBasicAuth.java +src/main/java/org/openapitools/client/auth/HttpBearerAuth.java +src/main/java/org/openapitools/client/model/AdditionalProperties.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesClassRef.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +src/main/java/org/openapitools/client/model/AdditionalPropertyArrayAnyType.java +src/main/java/org/openapitools/client/model/AdditionalPropertyArrayInteger.java +src/main/java/org/openapitools/client/model/AdditionalPropertyBoolean.java +src/main/java/org/openapitools/client/model/AdditionalPropertyClassRef.java +src/main/java/org/openapitools/client/model/AdditionalPropertyInteger.java +src/main/java/org/openapitools/client/model/AdditionalPropertyMapAnyType.java +src/main/java/org/openapitools/client/model/AdditionalPropertyMapString.java +src/main/java/org/openapitools/client/model/AdditionalPropertyNumber.java +src/main/java/org/openapitools/client/model/AdditionalPropertyString.java +src/main/java/org/openapitools/client/model/Animal.java +src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/VERSION new file mode 100644 index 000000000000..96cfbb19ae28 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.13.0-SNAPSHOT diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/.travis.yml b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.travis.yml new file mode 100644 index 000000000000..1b6741c083c7 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.travis.yml @@ -0,0 +1,22 @@ +# +# Generated by OpenAPI Generator: https://openapi-generator.tech +# +# Ref: https://docs.travis-ci.com/user/languages/java/ +# +language: java +jdk: + - openjdk12 + - openjdk11 + - openjdk10 + - openjdk9 + - openjdk8 +before_install: + # ensure gradlew has proper permission + - chmod a+x ./gradlew +script: + # test using maven + #- mvn test + # test using gradle + - gradle test + # test using sbt + # - sbt test diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/README.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/README.md new file mode 100644 index 000000000000..b2fe735054e8 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/README.md @@ -0,0 +1,158 @@ +# petstore-resttemplate-generateAliasAsModel + +generateAliasAsModel + +- API version: 1.0.0 + +- Generator version: 7.13.0-SNAPSHOT + +This spec is mainly for testing generateAliasAsModel and + + +*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)* + +## Requirements + +Building the API client library requires: + +1. Java 1.8+ +2. Maven/Gradle + +## Installation + +To install the API client library to your local Maven repository, simply execute: + +```shell +mvn clean install +``` + +To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: + +```shell +mvn clean deploy +``` + +Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information. + +### Maven users + +Add this dependency to your project's POM: + +```xml + + org.openapitools + petstore-resttemplate-generateAliasAsModel + 1.0.0 + compile + +``` + +### Gradle users + +Add this dependency to your project's build file: + +```groovy + repositories { + mavenCentral() // Needed if the 'petstore-resttemplate-generateAliasAsModel' jar has been published to maven central. + mavenLocal() // Needed if the 'petstore-resttemplate-generateAliasAsModel' jar has been published to the local maven repo. + } + + dependencies { + implementation "org.openapitools:petstore-resttemplate-generateAliasAsModel:1.0.0" + } +``` + +### Others + +At first generate the JAR by executing: + +```shell +mvn clean package +``` + +Then manually install the following JARs: + +- `target/petstore-resttemplate-generateAliasAsModel-1.0.0.jar` +- `target/lib/*.jar` + +## Getting Started + +Please follow the [installation](#installation) instruction and execute the following Java code: + +```java + +import org.openapitools.client.*; +import org.openapitools.client.auth.*; +import org.openapitools.client.model.*; +import org.openapitools.client.api.FakeApi; + +public class FakeApiExample { + + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost"); + + FakeApi apiInstance = new FakeApi(defaultClient); + AdditionalProperties additionalProperties = new AdditionalProperties(); // AdditionalProperties | request body + try { + apiInstance.testAdditionalPropertiesReference(additionalProperties); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testAdditionalPropertiesReference"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} + +``` + +## Documentation for API Endpoints + +All URIs are relative to *http://localhost* + +Class | Method | HTTP request | Description +------------ | ------------- | ------------- | ------------- +*FakeApi* | [**testAdditionalPropertiesReference**](docs/FakeApi.md#testAdditionalPropertiesReference) | **POST** /fake/additionalProperties-reference | test referenced additionalProperties + + +## Documentation for Models + + - [AdditionalProperties](docs/AdditionalProperties.md) + - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md) + - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md) + - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md) + - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md) + - [AdditionalPropertiesClassRef](docs/AdditionalPropertiesClassRef.md) + - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md) + - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md) + - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md) + - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md) + - [AdditionalPropertyArrayAnyType](docs/AdditionalPropertyArrayAnyType.md) + - [AdditionalPropertyArrayInteger](docs/AdditionalPropertyArrayInteger.md) + - [AdditionalPropertyBoolean](docs/AdditionalPropertyBoolean.md) + - [AdditionalPropertyClassRef](docs/AdditionalPropertyClassRef.md) + - [AdditionalPropertyInteger](docs/AdditionalPropertyInteger.md) + - [AdditionalPropertyMapAnyType](docs/AdditionalPropertyMapAnyType.md) + - [AdditionalPropertyMapString](docs/AdditionalPropertyMapString.md) + - [AdditionalPropertyNumber](docs/AdditionalPropertyNumber.md) + - [AdditionalPropertyString](docs/AdditionalPropertyString.md) + - [Animal](docs/Animal.md) + - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md) + + + +## Documentation for Authorization + +Endpoints do not require authorization. + + +## Recommendation + +It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues. + +## Author + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/api/openapi.yaml b/samples/client/petstore/java/resttemplate-generateAliasAsModel/api/openapi.yaml new file mode 100644 index 000000000000..c47f2509d7fd --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/api/openapi.yaml @@ -0,0 +1,331 @@ +openapi: 3.0.0 +info: + description: This spec is mainly for testing generateAliasAsModel and + title: generateAliasAsModel + version: 1.0.0 +servers: +- url: / +paths: + /fake/additionalProperties-reference: + post: + description: "" + operationId: testAdditionalPropertiesReference + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/AdditionalProperties' + description: request body + required: true + responses: + "200": + description: successful operation + summary: test referenced additionalProperties + tags: + - fake + x-content-type: application/json + x-accepts: + - application/json +components: + schemas: + AdditionalProperties: + example: + additionalPropertiesClass: + map_map_string: + key: + key: map_map_string + map_integer: + key: 6 + map_number: + key: 0.8008281904610115 + map_array_anytype: + key: + - "{}" + - "{}" + map_string: + key: map_string + anytype_2: "" + anytype_1: "{}" + map_boolean: + key: true + map_array_integer: + key: + - 1 + - 1 + map_map_anytype: + key: + key: "{}" + anytype_3: "{}" + mixed: + dateTime: 2000-01-23T04:56:07.000+00:00 + uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + map: + key: + className: className + additionalPropertiesClassRef: + map_integer: + name: name + map_number: + name: name + map_string: + name: name + anytype_1: "{}" + map_boolean: + name: name + properties: + additionalPropertiesClassRef: + $ref: '#/components/schemas/AdditionalPropertiesClassRef' + additionalPropertiesClass: + $ref: '#/components/schemas/AdditionalPropertiesClass' + mixed: + $ref: '#/components/schemas/MixedPropertiesAndAdditionalPropertiesClass' + type: object + AdditionalPropertiesClassRef: + example: + map_integer: + name: name + map_number: + name: name + map_string: + name: name + anytype_1: "{}" + map_boolean: + name: name + properties: + map_string: + $ref: '#/components/schemas/AdditionalPropertiesString' + map_number: + $ref: '#/components/schemas/AdditionalPropertiesNumber' + map_integer: + $ref: '#/components/schemas/AdditionalPropertiesInteger' + map_boolean: + $ref: '#/components/schemas/AdditionalPropertiesBoolean' + anytype_1: + type: object + type: object + AdditionalPropertyClassRef: + properties: + map_string: + $ref: '#/components/schemas/AdditionalPropertyString' + map_number: + $ref: '#/components/schemas/AdditionalPropertyNumber' + map_integer: + $ref: '#/components/schemas/AdditionalPropertyInteger' + map_boolean: + $ref: '#/components/schemas/AdditionalPropertyBoolean' + map_array_integer: + $ref: '#/components/schemas/AdditionalPropertyArrayInteger' + map_array_anytype: + $ref: '#/components/schemas/AdditionalPropertyArrayAnyType' + map_map_string: + $ref: '#/components/schemas/AdditionalPropertyMapString' + map_map_anytype: + $ref: '#/components/schemas/AdditionalPropertyMapAnyType' + anytype_1: + type: object + type: object + AdditionalPropertyString: + additionalProperties: + type: string + type: object + AdditionalPropertyNumber: + additionalProperties: + type: number + type: object + AdditionalPropertyInteger: + additionalProperties: + type: integer + type: object + AdditionalPropertyBoolean: + additionalProperties: + type: boolean + type: object + AdditionalPropertyArrayInteger: + additionalProperties: + items: + type: integer + type: array + type: object + AdditionalPropertyArrayAnyType: + additionalProperties: + items: + type: object + type: array + type: object + AdditionalPropertyMapString: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + AdditionalPropertyMapAnyType: + additionalProperties: + additionalProperties: + type: object + type: object + type: object + AnyType1: + type: object + AdditionalPropertiesClass: + example: + map_map_string: + key: + key: map_map_string + map_integer: + key: 6 + map_number: + key: 0.8008281904610115 + map_array_anytype: + key: + - "{}" + - "{}" + map_string: + key: map_string + anytype_2: "" + anytype_1: "{}" + map_boolean: + key: true + map_array_integer: + key: + - 1 + - 1 + map_map_anytype: + key: + key: "{}" + anytype_3: "{}" + properties: + map_string: + additionalProperties: + type: string + type: object + map_number: + additionalProperties: + type: number + type: object + map_integer: + additionalProperties: + type: integer + type: object + map_boolean: + additionalProperties: + type: boolean + type: object + map_array_integer: + additionalProperties: + items: + type: integer + type: array + type: object + map_array_anytype: + additionalProperties: + items: + type: object + type: array + type: object + map_map_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_map_anytype: + additionalProperties: + additionalProperties: + type: object + type: object + type: object + anytype_1: + type: object + anytype_2: {} + anytype_3: + properties: {} + type: object + type: object + AdditionalPropertiesString: + additionalProperties: + type: string + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesInteger: + additionalProperties: + type: integer + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesNumber: + additionalProperties: + type: number + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesBoolean: + additionalProperties: + type: boolean + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesArray: + additionalProperties: + items: + type: object + type: array + properties: + name: + type: string + type: object + AdditionalPropertiesObject: + additionalProperties: + additionalProperties: + type: object + type: object + properties: + name: + type: string + type: object + AdditionalPropertiesAnyType: + additionalProperties: + type: object + properties: + name: + type: string + type: object + MixedPropertiesAndAdditionalPropertiesClass: + example: + dateTime: 2000-01-23T04:56:07.000+00:00 + uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + map: + key: + className: className + properties: + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + Animal: + example: + className: className + properties: + className: + type: string + type: object + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/build.gradle b/samples/client/petstore/java/resttemplate-generateAliasAsModel/build.gradle new file mode 100644 index 000000000000..89c4e831de56 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/build.gradle @@ -0,0 +1,137 @@ +apply plugin: 'idea' +apply plugin: 'eclipse' + +group = 'org.openapitools' +version = '1.0.0' + +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.5.+' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' + } +} + +repositories { + mavenCentral() +} + + +if(hasProperty('target') && target == 'android') { + + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 23 + buildToolsVersion '23.0.2' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 22 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + + dependencies { + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDirectory + task.destinationDirectory = project.file("${project.buildDir}/outputs/jar") + task.archiveFileName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + archiveClassifier = 'sources' + } + + artifacts { + archives sourcesJar + } + +} else { + + apply plugin: 'java' + apply plugin: 'maven-publish' + + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + + publishing { + publications { + maven(MavenPublication) { + artifactId = 'petstore-resttemplate-generateAliasAsModel' + from components.java + } + } + } + + task execute(type:JavaExec) { + mainClass = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } +} + +ext { + jackson_version = "2.17.1" + jackson_databind_version = "2.17.1" + jackson_databind_nullable_version = "0.2.6" + spring_web_version = "6.1.5" + jakarta_annotation_version = "2.1.1" + beanvalidation_version = "3.0.2" + jodatime_version = "2.9.9" + junit_version = "5.10.2" +} + +dependencies { + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "org.springframework:spring-web:$spring_web_version" + implementation "org.springframework:spring-context:$spring_web_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" + testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version" +} + +test { + // Enable JUnit 5 (Gradle 4.6+). + useJUnitPlatform() + + // Always run tests, even when nothing changed. + dependsOn 'cleanTest' + + // Show test results. + testLogging { + events "passed", "skipped", "failed" + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/build.sbt b/samples/client/petstore/java/resttemplate-generateAliasAsModel/build.sbt new file mode 100644 index 000000000000..464090415c47 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/build.sbt @@ -0,0 +1 @@ +# TODO diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalProperties.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalProperties.md new file mode 100644 index 000000000000..c9b86a3f67bf --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalProperties.md @@ -0,0 +1,15 @@ + + +# AdditionalProperties + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**additionalPropertiesClassRef** | [**AdditionalPropertiesClassRef**](AdditionalPropertiesClassRef.md) | | [optional] | +|**additionalPropertiesClass** | [**AdditionalPropertiesClass**](AdditionalPropertiesClass.md) | | [optional] | +|**mixed** | [**MixedPropertiesAndAdditionalPropertiesClass**](MixedPropertiesAndAdditionalPropertiesClass.md) | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesAnyType.md new file mode 100644 index 000000000000..5158bd815e67 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesAnyType.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesAnyType + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesArray.md new file mode 100644 index 000000000000..9edcf46b0e44 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesArray.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesArray + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesBoolean.md new file mode 100644 index 000000000000..1e1ed764a56e --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesBoolean.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesBoolean + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClass.md new file mode 100644 index 000000000000..79402f75c68c --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClass.md @@ -0,0 +1,23 @@ + + +# AdditionalPropertiesClass + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**mapString** | **Map<String, String>** | | [optional] | +|**mapNumber** | **Map<String, BigDecimal>** | | [optional] | +|**mapInteger** | **Map<String, Integer>** | | [optional] | +|**mapBoolean** | **Map<String, Boolean>** | | [optional] | +|**mapArrayInteger** | **Map<String, List<Integer>>** | | [optional] | +|**mapArrayAnytype** | **Map<String, List<Object>>** | | [optional] | +|**mapMapString** | **Map<String, Map<String, String>>** | | [optional] | +|**mapMapAnytype** | **Map<String, Map<String, Object>>** | | [optional] | +|**anytype1** | **Object** | | [optional] | +|**anytype2** | **Object** | | [optional] | +|**anytype3** | **Object** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClassRef.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClassRef.md new file mode 100644 index 000000000000..e9ce9d66cead --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClassRef.md @@ -0,0 +1,17 @@ + + +# AdditionalPropertiesClassRef + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**mapString** | **AdditionalPropertiesString** | | [optional] | +|**mapNumber** | **AdditionalPropertiesNumber** | | [optional] | +|**mapInteger** | **AdditionalPropertiesInteger** | | [optional] | +|**mapBoolean** | **AdditionalPropertiesBoolean** | | [optional] | +|**anytype1** | **Object** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesInteger.md new file mode 100644 index 000000000000..cbc1673c059b --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesInteger.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesInteger + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesNumber.md new file mode 100644 index 000000000000..0bd133ccf09a --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesNumber.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesNumber + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesObject.md new file mode 100644 index 000000000000..3f419f8551ff --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesObject.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesObject + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesString.md new file mode 100644 index 000000000000..269a1961cf88 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesString.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesString + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayAnyType.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayAnyType.md new file mode 100644 index 000000000000..4ae382b2b5e9 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayAnyType.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyArrayAnyType + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayInteger.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayInteger.md new file mode 100644 index 000000000000..ed185b2a6053 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayInteger.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyArrayInteger + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyBoolean.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyBoolean.md new file mode 100644 index 000000000000..b634164ebef5 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyBoolean.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyBoolean + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyClassRef.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyClassRef.md new file mode 100644 index 000000000000..9d4eccae8ddb --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyClassRef.md @@ -0,0 +1,21 @@ + + +# AdditionalPropertyClassRef + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**mapString** | **AdditionalPropertyString** | | [optional] | +|**mapNumber** | **AdditionalPropertyNumber** | | [optional] | +|**mapInteger** | **AdditionalPropertyInteger** | | [optional] | +|**mapBoolean** | **AdditionalPropertyBoolean** | | [optional] | +|**mapArrayInteger** | **AdditionalPropertyArrayInteger** | | [optional] | +|**mapArrayAnytype** | **AdditionalPropertyArrayAnyType** | | [optional] | +|**mapMapString** | **AdditionalPropertyMapString** | | [optional] | +|**mapMapAnytype** | **AdditionalPropertyMapAnyType** | | [optional] | +|**anytype1** | **Object** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyInteger.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyInteger.md new file mode 100644 index 000000000000..07cd0f92230c --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyInteger.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyInteger + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapAnyType.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapAnyType.md new file mode 100644 index 000000000000..cc720157c677 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapAnyType.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyMapAnyType + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapString.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapString.md new file mode 100644 index 000000000000..f5780fcd841c --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapString.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyMapString + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyNumber.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyNumber.md new file mode 100644 index 000000000000..dbbcd452a315 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyNumber.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyNumber + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyString.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyString.md new file mode 100644 index 000000000000..f6633e10bb2a --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyString.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyString + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/Animal.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/Animal.md new file mode 100644 index 000000000000..5214d5c8b586 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/Animal.md @@ -0,0 +1,13 @@ + + +# Animal + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**className** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/FakeApi.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/FakeApi.md new file mode 100644 index 000000000000..fc7494aedc84 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/FakeApi.md @@ -0,0 +1,74 @@ +# FakeApi + +All URIs are relative to *http://localhost* + +| Method | HTTP request | Description | +|------------- | ------------- | -------------| +| [**testAdditionalPropertiesReference**](FakeApi.md#testAdditionalPropertiesReference) | **POST** /fake/additionalProperties-reference | test referenced additionalProperties | + + + +## testAdditionalPropertiesReference + +> testAdditionalPropertiesReference(additionalProperties) + +test referenced additionalProperties + + + +### Example + +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost"); + + FakeApi apiInstance = new FakeApi(defaultClient); + AdditionalProperties additionalProperties = new AdditionalProperties(); // AdditionalProperties | request body + try { + apiInstance.testAdditionalPropertiesReference(additionalProperties); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testAdditionalPropertiesReference"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + + +| Name | Type | Description | Notes | +|------------- | ------------- | ------------- | -------------| +| **additionalProperties** | [**AdditionalProperties**](AdditionalProperties.md)| request body | | + +### Return type + +null (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: application/json +- **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | successful operation | - | + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md new file mode 100644 index 000000000000..a5ddf0faa6a9 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -0,0 +1,15 @@ + + +# MixedPropertiesAndAdditionalPropertiesClass + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**uuid** | **UUID** | | [optional] | +|**dateTime** | **OffsetDateTime** | | [optional] | +|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/git_push.sh b/samples/client/petstore/java/resttemplate-generateAliasAsModel/git_push.sh new file mode 100644 index 000000000000..f53a75d4fabe --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/git_push.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ +# +# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com" + +git_user_id=$1 +git_repo_id=$2 +release_note=$3 +git_host=$4 + +if [ "$git_host" = "" ]; then + git_host="github.com" + echo "[INFO] No command line input provided. Set \$git_host to $git_host" +fi + +if [ "$git_user_id" = "" ]; then + git_user_id="GIT_USER_ID" + echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id" +fi + +if [ "$git_repo_id" = "" ]; then + git_repo_id="GIT_REPO_ID" + echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id" +fi + +if [ "$release_note" = "" ]; then + release_note="Minor update" + echo "[INFO] No command line input provided. Set \$release_note to $release_note" +fi + +# Initialize the local directory as a Git repository +git init + +# Adds the files in the local repository and stages them for commit. +git add . + +# Commits the tracked changes and prepares them to be pushed to a remote repository. +git commit -m "$release_note" + +# Sets the new remote +git_remote=$(git remote) +if [ "$git_remote" = "" ]; then # git remote not defined + + if [ "$GIT_TOKEN" = "" ]; then + echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." + git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git + else + git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git + fi + +fi + +git pull origin master + +# Pushes (Forces) the changes in the local repository up to the remote repository +echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git" +git push origin master 2>&1 | grep -v 'To https' diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle.properties b/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle.properties new file mode 100644 index 000000000000..a3408578278a --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle.properties @@ -0,0 +1,6 @@ +# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator). +# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option. +# +# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties +# For example, uncomment below to build for Android +#target = android diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} +case $link in #( +/*) app_path=$link ;; #( +*) app_path=$APP_HOME$link ;; +esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { +echo "$*" +} >&2 + +die () { +echo +echo "$*" +echo +exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( +CYGWIN* ) cygwin=true ;; #( +Darwin* ) darwin=true ;; #( +MSYS* | MINGW* ) msys=true ;; #( +NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then +if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +# IBM's JDK on AIX uses strange locations for the executables +JAVACMD=$JAVA_HOME/jre/sh/java +else +JAVACMD=$JAVA_HOME/bin/java +fi +if [ ! -x "$JAVACMD" ] ; then +die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +else +JAVACMD=java +if ! command -v java >/dev/null 2>&1 +then +die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then +case $MAX_FD in #( +max*) +# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +MAX_FD=$( ulimit -H -n ) || +warn "Could not query maximum file descriptor limit" +esac +case $MAX_FD in #( +'' | soft) :;; #( +*) +# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +ulimit -n "$MAX_FD" || +warn "Could not set maximum file descriptor limit to $MAX_FD" +esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then +APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) +CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + +JAVACMD=$( cygpath --unix "$JAVACMD" ) + +# Now convert the arguments - kludge to limit ourselves to /bin/sh +for arg do +if +case $arg in #( +-*) false ;; # don't mess with options #( +/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath +[ -e "$t" ] ;; #( +*) false ;; +esac +then +arg=$( cygpath --path --ignore --mixed "$arg" ) +fi +# Roll the args list around exactly as many times as the number of +# args, so each arg winds up back in the position where it started, but +# possibly modified. +# +# NB: a `for` loop captures its iteration list before it begins, so +# changing the positional parameters here affects neither the number of +# iterations, nor the values presented in `arg`. +shift # remove old arg +set -- "$@" "$arg" # push replacement arg +done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ +"-Dorg.gradle.appname=$APP_BASE_NAME" \ +-classpath "$CLASSPATH" \ +org.gradle.wrapper.GradleWrapperMain \ +"$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then +die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( +printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | +xargs -n1 | +sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | +tr '\n' ' ' +)" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradlew.bat b/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradlew.bat new file mode 100644 index 000000000000..25da30dbdeee --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/pom.xml b/samples/client/petstore/java/resttemplate-generateAliasAsModel/pom.xml new file mode 100644 index 000000000000..7436680f44a0 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/pom.xml @@ -0,0 +1,285 @@ + + 4.0.0 + org.openapitools + petstore-resttemplate-generateAliasAsModel + jar + petstore-resttemplate-generateAliasAsModel + 1.0.0 + https://github.com/openapitools/openapi-generator + OpenAPI Java + + scm:git:git@github.com:openapitools/openapi-generator.git + scm:git:git@github.com:openapitools/openapi-generator.git + https://github.com/openapitools/openapi-generator + + + + + Unlicense + http://unlicense.org + repo + + + + + + OpenAPI-Generator Contributors + team@openapitools.org + OpenAPITools.org + http://openapitools.org + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.4.0 + + + enforce-maven + + enforce + + + + + 2.2.0 + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + + + + loggerPath + conf/log4j.properties + + + -Xms512m -Xmx1500m + methods + false + true + + + + + org.junit.jupiter + junit-jupiter-engine + ${junit-version} + + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + + test-jar + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.4.0 + + + add_sources + generate-sources + + add-source + + + + src/main/java + + + + + add_test_sources + generate-test-sources + + add-test-source + + + + src/test/java + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 17 + 17 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + none + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + + + + + sign-artifacts + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + + + + + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + + + org.springframework + spring-web + ${spring-web-version} + + + org.springframework + spring-context + ${spring-web-version} + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson-version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind-version} + + + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider + ${jackson-version} + + + org.openapitools + jackson-databind-nullable + ${jackson-databind-nullable-version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson-version} + + + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} + provided + + + + + org.junit.jupiter + junit-jupiter-engine + ${junit-version} + test + + + + UTF-8 + 2.17.1 + 2.17.1 + 0.2.6 + 6.1.14 + 2.1.1 + 3.0.2 + 5.10.2 + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/settings.gradle b/samples/client/petstore/java/resttemplate-generateAliasAsModel/settings.gradle new file mode 100644 index 000000000000..32367055ed7f --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "petstore-resttemplate-generateAliasAsModel" \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/AndroidManifest.xml b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/AndroidManifest.xml new file mode 100644 index 000000000000..54fbcb3da1e8 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ApiClient.java new file mode 100644 index 000000000000..31193e4012cc --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ApiClient.java @@ -0,0 +1,814 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpRequest; +import org.springframework.http.HttpStatus; +import org.springframework.http.InvalidMediaTypeException; +import org.springframework.http.MediaType; +import org.springframework.http.RequestEntity; +import org.springframework.http.RequestEntity.BodyBuilder; +import org.springframework.http.ResponseEntity; +import org.springframework.http.client.BufferingClientHttpRequestFactory; +import org.springframework.http.client.ClientHttpRequestExecution; +import org.springframework.http.client.ClientHttpRequestInterceptor; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.util.StringUtils; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.client.HttpServerErrorException; +import org.springframework.web.client.RestClientException; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.util.UriComponentsBuilder; +import org.springframework.web.util.DefaultUriBuilderFactory; +import org.openapitools.jackson.nullable.JsonNullableModule; + + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.text.DateFormat; +import java.text.ParseException; +import java.util.Arrays; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.TimeZone; +import java.util.function.Supplier; +import java.time.OffsetDateTime; + +import org.openapitools.client.auth.Authentication; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class ApiClient extends JavaTimeFormatter { + public enum CollectionFormat { + CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null); + + private final String separator; + + private CollectionFormat(String separator) { + this.separator = separator; + } + + private String collectionToString(Collection collection) { + return StringUtils.collectionToDelimitedString(collection, separator); + } + } + + private boolean debugging = false; + + private HttpHeaders defaultHeaders = new HttpHeaders(); + private MultiValueMap defaultCookies = new LinkedMultiValueMap(); + + private int maxAttemptsForRetry = 1; + + private long waitTimeMillis = 10; + + private String basePath = "http://localhost"; + + private RestTemplate restTemplate; + + private Map authentications; + + private DateFormat dateFormat; + + public ApiClient() { + this.restTemplate = buildRestTemplate(); + init(); + } + + public ApiClient(RestTemplate restTemplate) { + this.restTemplate = restTemplate; + init(); + } + + protected void init() { + // Use RFC3339 format for date and datetime. + // See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14 + this.dateFormat = new RFC3339DateFormat(); + + // Use UTC as the default time zone. + this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + + // Set default User-Agent. + setUserAgent("Java-SDK"); + + // Setup authentications (key: authentication name, value: authentication). + authentications = new HashMap(); + // Prevent the authentications from being modified. + authentications = Collections.unmodifiableMap(authentications); + } + + /** + * Get the current base path + * + * @return String the base path + */ + public String getBasePath() { + return basePath; + } + + /** + * Set the base path, which should include the host + * + * @param basePath the base path + * @return ApiClient this client + */ + public ApiClient setBasePath(String basePath) { + this.basePath = basePath; + return this; + } + + /** + * Get the max attempts for retry + * + * @return int the max attempts + */ + public int getMaxAttemptsForRetry() { + return maxAttemptsForRetry; + } + + /** + * Set the max attempts for retry + * + * @param maxAttemptsForRetry the max attempts for retry + * @return ApiClient this client + */ + public ApiClient setMaxAttemptsForRetry(int maxAttemptsForRetry) { + this.maxAttemptsForRetry = maxAttemptsForRetry; + return this; + } + + /** + * Get the wait time in milliseconds + * + * @return long wait time in milliseconds + */ + public long getWaitTimeMillis() { + return waitTimeMillis; + } + + /** + * Set the wait time in milliseconds + * + * @param waitTimeMillis the wait time in milliseconds + * @return ApiClient this client + */ + public ApiClient setWaitTimeMillis(long waitTimeMillis) { + this.waitTimeMillis = waitTimeMillis; + return this; + } + + /** + * Get authentications (key: authentication name, value: authentication). + * + * @return Map the currently configured authentication types + */ + public Map getAuthentications() { + return authentications; + } + + /** + * Get authentication for the given name. + * + * @param authName The authentication name + * @return The authentication, null if not found + */ + public Authentication getAuthentication(String authName) { + return authentications.get(authName); + } + + + + + + /** + * Set the User-Agent header's value (by adding to the default header map). + * + * @param userAgent the user agent string + * @return ApiClient this client + */ + public ApiClient setUserAgent(String userAgent) { + addDefaultHeader("User-Agent", userAgent); + return this; + } + + /** + * Add a default header. + * + * @param name The header's name + * @param value The header's value + * @return ApiClient this client + */ + public ApiClient addDefaultHeader(String name, String value) { + if (defaultHeaders.containsKey(name)) { + defaultHeaders.remove(name); + } + defaultHeaders.add(name, value); + return this; + } + + /** + * Add a default cookie. + * + * @param name The cookie's name + * @param value The cookie's value + * @return ApiClient this client + */ + public ApiClient addDefaultCookie(String name, String value) { + if (defaultCookies.containsKey(name)) { + defaultCookies.remove(name); + } + defaultCookies.add(name, value); + return this; + } + + public void setDebugging(boolean debugging) { + List currentInterceptors = this.restTemplate.getInterceptors(); + if (debugging) { + if (currentInterceptors == null) { + currentInterceptors = new ArrayList(); + } + ClientHttpRequestInterceptor interceptor = new ApiClientHttpRequestInterceptor(); + currentInterceptors.add(interceptor); + this.restTemplate.setInterceptors(currentInterceptors); + } else { + if (currentInterceptors != null && !currentInterceptors.isEmpty()) { + Iterator iter = currentInterceptors.iterator(); + while (iter.hasNext()) { + ClientHttpRequestInterceptor interceptor = iter.next(); + if (interceptor instanceof ApiClientHttpRequestInterceptor) { + iter.remove(); + } + } + this.restTemplate.setInterceptors(currentInterceptors); + } + } + this.debugging = debugging; + } + + /** + * Check that whether debugging is enabled for this API client. + * @return boolean true if this client is enabled for debugging, false otherwise + */ + public boolean isDebugging() { + return debugging; + } + + /** + * Get the date format used to parse/format date parameters. + * @return DateFormat format + */ + public DateFormat getDateFormat() { + return dateFormat; + } + + /** + * Set the date format used to parse/format date parameters. + * @param dateFormat Date format + * @return API client + */ + public ApiClient setDateFormat(DateFormat dateFormat) { + this.dateFormat = dateFormat; + return this; + } + + /** + * Parse the given string into Date object. + * + * @param str the string to parse + * @return the Date parsed from the string + */ + public Date parseDate(String str) { + try { + return dateFormat.parse(str); + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + + /** + * Format the given Date object into string. + * + * @param date the date to format + * @return the formatted date as string + */ + public String formatDate(Date date) { + return dateFormat.format(date); + } + + /** + * Format the given parameter object into string. + * + * @param param the object to convert + * @return String the parameter represented as a String + */ + public String parameterToString(Object param) { + if (param == null) { + return ""; + } else if (param instanceof Date) { + return formatDate( (Date) param); + } else if (param instanceof OffsetDateTime) { + return formatOffsetDateTime((OffsetDateTime) param); + } else if (param instanceof Collection) { + StringBuilder b = new StringBuilder(); + for (Object o : (Collection) param) { + if (b.length() > 0) { + b.append(","); + } + b.append(String.valueOf(o)); + } + return b.toString(); + } else { + return String.valueOf(param); + } + } + + /** + * Formats the specified collection path parameter to a string value. + * + * @param collectionFormat The collection format of the parameter. + * @param values The values of the parameter. + * @return String representation of the parameter + */ + public String collectionPathParameterToString(CollectionFormat collectionFormat, Collection values) { + // create the value based on the collection format + if (CollectionFormat.MULTI.equals(collectionFormat)) { + // not valid for path params + return parameterToString(values); + } + + // collectionFormat is assumed to be "csv" by default + if (collectionFormat == null) { + collectionFormat = CollectionFormat.CSV; + } + + return collectionFormat.collectionToString(values); + } + + /** + * Converts a parameter to a {@link MultiValueMap} for use in REST requests + * + * @param collectionFormat The format to convert to + * @param name The name of the parameter + * @param value The parameter's value + * @return a Map containing the String value(s) of the input parameter + */ + public MultiValueMap parameterToMultiValueMap(CollectionFormat collectionFormat, String name, Object value) { + final MultiValueMap params = new LinkedMultiValueMap(); + + if (name == null || name.isEmpty() || value == null) { + return params; + } + + if (collectionFormat == null) { + collectionFormat = CollectionFormat.CSV; + } + + if (value instanceof Map) { + @SuppressWarnings("unchecked") + final Map valuesMap = (Map) value; + for (final Entry entry : valuesMap.entrySet()) { + params.add(entry.getKey(), parameterToString(entry.getValue())); + } + return params; + } + + Collection valueCollection = null; + if (value instanceof Collection) { + valueCollection = (Collection) value; + } else { + params.add(name, parameterToString(value)); + return params; + } + + if (valueCollection.isEmpty()) { + return params; + } + + if (collectionFormat.equals(CollectionFormat.MULTI)) { + for (Object item : valueCollection) { + params.add(name, parameterToString(item)); + } + return params; + } + + List values = new ArrayList(); + for (Object o : valueCollection) { + values.add(parameterToString(o)); + } + params.add(name, collectionFormat.collectionToString(values)); + + return params; + } + + /** + * Check if the given {@code String} is a JSON MIME. + * + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents JSON, false otherwise + */ + public boolean isJsonMime(String mediaType) { + // "* / *" is default to JSON + if ("*/*".equals(mediaType)) { + return true; + } + + try { + return isJsonMime(MediaType.parseMediaType(mediaType)); + } catch (InvalidMediaTypeException e) { + } + return false; + } + + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents JSON, false otherwise + */ + public boolean isJsonMime(MediaType mediaType) { + return mediaType != null && (MediaType.APPLICATION_JSON.isCompatibleWith(mediaType) || mediaType.getSubtype().matches("^.*\\+json[;]?\\s*$")); + } + + /** + * Check if the given {@code String} is a Problem JSON MIME (RFC-7807). + * + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents Problem JSON, false otherwise + */ + public boolean isProblemJsonMime(String mediaType) { + return "application/problem+json".equalsIgnoreCase(mediaType); + } + + /** + * Select the Accept header's value from the given accepts array: + * if JSON exists in the given array, use it; + * otherwise use all of them (joining into a string) + * + * @param accepts The accepts array to select from + * @return List The list of MediaTypes to use for the Accept header + */ + public List selectHeaderAccept(String[] accepts) { + if (accepts.length == 0) { + return null; + } + for (String accept : accepts) { + MediaType mediaType = MediaType.parseMediaType(accept); + if (isJsonMime(mediaType) && !isProblemJsonMime(accept)) { + return Collections.singletonList(mediaType); + } + } + return MediaType.parseMediaTypes(StringUtils.arrayToCommaDelimitedString(accepts)); + } + + /** + * Select the Content-Type header's value from the given array: + * if JSON exists in the given array, use it; + * otherwise use the first one of the array. + * + * @param contentTypes The Content-Type array to select from + * @return MediaType The Content-Type header to use. If the given array is empty, JSON will be used. + */ + public MediaType selectHeaderContentType(String[] contentTypes) { + if (contentTypes.length == 0) { + return MediaType.APPLICATION_JSON; + } + for (String contentType : contentTypes) { + MediaType mediaType = MediaType.parseMediaType(contentType); + if (isJsonMime(mediaType)) { + return mediaType; + } + } + return MediaType.parseMediaType(contentTypes[0]); + } + + /** + * Select the body to use for the request + * + * @param obj the body object + * @param formParams the form parameters + * @param contentType the content type of the request + * @return Object the selected body + */ + protected Object selectBody(Object obj, MultiValueMap formParams, MediaType contentType) { + boolean isForm = MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType) || MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(contentType); + return isForm ? formParams : obj; + } + + /** + * Expand path template with variables + * + * @param pathTemplate path template with placeholders + * @param variables variables to replace + * @return path with placeholders replaced by variables + */ + public String expandPath(String pathTemplate, Map variables) { + return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString(); + } + + /** + * Include queryParams in uriParams taking into account the paramName + * + * @param queryParams The query parameters + * @param uriParams The path parameters + * return templatized query string + */ + public String generateQueryUri(MultiValueMap queryParams, Map uriParams) { + StringBuilder queryBuilder = new StringBuilder(); + queryParams.forEach((name, values) -> { + try { + final String encodedName = URLEncoder.encode(name.toString(), "UTF-8"); + if (CollectionUtils.isEmpty(values)) { + if (queryBuilder.length() != 0) { + queryBuilder.append('&'); + } + queryBuilder.append(encodedName); + } else { + int valueItemCounter = 0; + for (Object value : values) { + if (queryBuilder.length() != 0) { + queryBuilder.append('&'); + } + queryBuilder.append(encodedName); + if (value != null) { + String templatizedKey = encodedName + valueItemCounter++; + uriParams.put(templatizedKey, value.toString()); + queryBuilder.append('=').append("{").append(templatizedKey).append("}"); + } + } + } + } catch (UnsupportedEncodingException e) { + + } + }); + return queryBuilder.toString(); + + } + + /** + * Invoke API by sending HTTP request with the given options. + * + * @param the return type to use + * @param path The sub-path of the HTTP URL + * @param method The request method + * @param pathParams The path parameters + * @param queryParams The query parameters + * @param body The request body object + * @param headerParams The header parameters + * @param cookieParams The cookie parameters + * @param formParams The form parameters + * @param accept The request's Accept header + * @param contentType The request's Content-Type header + * @param authNames The authentications to apply + * @param returnType The return type into which to deserialize the response + * @return ResponseEntity<T> The response of the chosen type + */ + public ResponseEntity invokeAPI(String path, HttpMethod method, Map pathParams, MultiValueMap queryParams, Object body, HttpHeaders headerParams, MultiValueMap cookieParams, MultiValueMap formParams, List accept, MediaType contentType, String[] authNames, ParameterizedTypeReference returnType) throws RestClientException { + updateParamsForAuth(authNames, queryParams, headerParams, cookieParams); + + Map uriParams = new HashMap<>(); + uriParams.putAll(pathParams); + + String finalUri = path; + + if (queryParams != null && !queryParams.isEmpty()) { + //Include queryParams in uriParams taking into account the paramName + String queryUri = generateQueryUri(queryParams, uriParams); + //Append to finalUri the templatized query string like "?param1={param1Value}&....... + finalUri += "?" + queryUri; + } + String expandedPath = this.expandPath(finalUri, uriParams); + final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(expandedPath); + + URI uri; + try { + uri = new URI(builder.build().toUriString()); + } catch (URISyntaxException ex) { + throw new RestClientException("Could not build URL: " + builder.toUriString(), ex); + } + + final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromHttpUrl(basePath).toUriString() + finalUri, uriParams); + if (accept != null) { + requestBuilder.accept(accept.toArray(new MediaType[accept.size()])); + } + if (contentType != null) { + requestBuilder.contentType(contentType); + } + + addHeadersToRequest(headerParams, requestBuilder); + addHeadersToRequest(defaultHeaders, requestBuilder); + addCookiesToRequest(cookieParams, requestBuilder); + addCookiesToRequest(defaultCookies, requestBuilder); + + RequestEntity requestEntity = requestBuilder.body(selectBody(body, formParams, contentType)); + + ResponseEntity responseEntity = null; + int attempts = 0; + while (attempts < maxAttemptsForRetry) { + try { + responseEntity = restTemplate.exchange(requestEntity, returnType); + break; + } catch (HttpServerErrorException | HttpClientErrorException ex) { + if (ex instanceof HttpServerErrorException + || ((HttpClientErrorException) ex) + .getStatusCode() + .equals(HttpStatus.TOO_MANY_REQUESTS)) { + attempts++; + if (attempts < maxAttemptsForRetry) { + try { + Thread.sleep(waitTimeMillis); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } else { + throw ex; + } + } else { + throw ex; + } + } + } + + if (responseEntity == null) { + throw new RestClientException("ResponseEntity is null"); + } + + if (responseEntity.getStatusCode().is2xxSuccessful()) { + return responseEntity; + } else { + // The error handler built into the RestTemplate should handle 400 and 500 series errors. + throw new RestClientException("API returned " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler"); + } + } + + /** + * Add headers to the request that is being built + * @param headers The headers to add + * @param requestBuilder The current request + */ + protected void addHeadersToRequest(HttpHeaders headers, BodyBuilder requestBuilder) { + for (Entry> entry : headers.entrySet()) { + List values = entry.getValue(); + for (String value : values) { + if (value != null) { + requestBuilder.header(entry.getKey(), value); + } + } + } + } + + /** + * Add cookies to the request that is being built + * + * @param cookies The cookies to add + * @param requestBuilder The current request + */ + protected void addCookiesToRequest(MultiValueMap cookies, BodyBuilder requestBuilder) { + if (!cookies.isEmpty()) { + requestBuilder.header("Cookie", buildCookieHeader(cookies)); + } + } + + /** + * Build cookie header. Keeps a single value per cookie (as per + * RFC6265 section 5.3). + * + * @param cookies map all cookies + * @return header string for cookies. + */ + private String buildCookieHeader(MultiValueMap cookies) { + final StringBuilder cookieValue = new StringBuilder(); + String delimiter = ""; + for (final Map.Entry> entry : cookies.entrySet()) { + final String value = entry.getValue().get(entry.getValue().size() - 1); + cookieValue.append(String.format("%s%s=%s", delimiter, entry.getKey(), value)); + delimiter = "; "; + } + return cookieValue.toString(); + } + + /** + * Build the RestTemplate used to make HTTP requests. + * @return RestTemplate + */ + protected RestTemplate buildRestTemplate() { + RestTemplate restTemplate = new RestTemplate(); + // This allows us to read the response more than once - Necessary for debugging. + restTemplate.setRequestFactory(new BufferingClientHttpRequestFactory(restTemplate.getRequestFactory())); + + // disable default URL encoding + DefaultUriBuilderFactory uriBuilderFactory = new DefaultUriBuilderFactory(); + uriBuilderFactory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.VALUES_ONLY); + restTemplate.setUriTemplateHandler(uriBuilderFactory); + return restTemplate; + } + + /** + * Update query and header parameters based on authentication settings. + * + * @param authNames The authentications to apply + * @param queryParams The query parameters + * @param headerParams The header parameters + */ + protected void updateParamsForAuth(String[] authNames, MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + for (String authName : authNames) { + Authentication auth = authentications.get(authName); + if (auth == null) { + throw new RestClientException("Authentication undefined: " + authName); + } + auth.applyToParams(queryParams, headerParams, cookieParams); + } + } + + private class ApiClientHttpRequestInterceptor implements ClientHttpRequestInterceptor { + private final Log log = LogFactory.getLog(ApiClientHttpRequestInterceptor.class); + + @Override + public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { + logRequest(request, body); + ClientHttpResponse response = execution.execute(request, body); + logResponse(response); + return response; + } + + private void logRequest(HttpRequest request, byte[] body) throws UnsupportedEncodingException { + log.info("URI: " + request.getURI()); + log.info("HTTP Method: " + request.getMethod()); + log.info("HTTP Headers: " + headersToString(request.getHeaders())); + log.info("Request Body: " + new String(body, StandardCharsets.UTF_8)); + } + + private void logResponse(ClientHttpResponse response) throws IOException { + log.info("HTTP Status Code: " + response.getStatusCode().value()); + log.info("Status Text: " + response.getStatusText()); + log.info("HTTP Headers: " + headersToString(response.getHeaders())); + log.info("Response Body: " + bodyToString(response.getBody())); + } + + private String headersToString(HttpHeaders headers) { + if(headers == null || headers.isEmpty()) { + return ""; + } + StringBuilder builder = new StringBuilder(); + for (Entry> entry : headers.entrySet()) { + builder.append(entry.getKey()).append("=["); + for (String value : entry.getValue()) { + builder.append(value).append(","); + } + builder.setLength(builder.length() - 1); // Get rid of trailing comma + builder.append("],"); + } + builder.setLength(builder.length() - 1); // Get rid of trailing comma + return builder.toString(); + } + + private String bodyToString(InputStream body) throws IOException { + StringBuilder builder = new StringBuilder(); + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(body, StandardCharsets.UTF_8)); + String line = bufferedReader.readLine(); + while (line != null) { + builder.append(line).append(System.lineSeparator()); + line = bufferedReader.readLine(); + } + bufferedReader.close(); + return builder.toString(); + } + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/BaseApi.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/BaseApi.java new file mode 100644 index 000000000000..f747a96a0599 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/BaseApi.java @@ -0,0 +1,87 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import org.springframework.web.client.RestClientException; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public abstract class BaseApi { + + protected ApiClient apiClient; + + public BaseApi() { + this(new ApiClient()); + } + + public BaseApi(ApiClient apiClient) { + this.apiClient = apiClient; + } + + public ApiClient getApiClient() { + return apiClient; + } + + public void setApiClient(ApiClient apiClient) { + this.apiClient = apiClient; + } + + /** + * Directly invoke the API for the given URL. Useful if the API returns direct links/URLs for subsequent requests. + * @param url The URL for the request, either full URL or only the path. + * @param method The HTTP method for the request. + * @return ResponseEntity<Void> + * @throws RestClientException if an error occurs while attempting to invoke the API + */ + public ResponseEntity invokeAPI(String url, HttpMethod method) throws RestClientException { + return invokeAPI(url, method, null, new ParameterizedTypeReference() {}); + } + + /** + * Directly invoke the API for the given URL. Useful if the API returns direct links/URLs for subsequent requests. + * @param url The URL for the request, either full URL or only the path. + * @param method The HTTP method for the request. + * @param request The request object. + * @return ResponseEntity<Void> + * @throws RestClientException if an error occurs while attempting to invoke the API + */ + public ResponseEntity invokeAPI(String url, HttpMethod method, Object request) throws RestClientException { + return invokeAPI(url, method, request, new ParameterizedTypeReference() {}); + } + + /** + * Directly invoke the API for the given URL. Useful if the API returns direct links/URLs for subsequent requests. + * @param url The URL for the request, either full URL or only the path. + * @param method The HTTP method for the request. + * @param returnType The return type. + * @return ResponseEntity in the specified type. + * @throws RestClientException if an error occurs while attempting to invoke the API + */ + public ResponseEntity invokeAPI(String url, HttpMethod method, ParameterizedTypeReference returnType) throws RestClientException { + return invokeAPI(url, method, null, returnType); + } + + /** + * Directly invoke the API for the given URL. Useful if the API returns direct links/URLs for subsequent requests. + * @param url The URL for the request, either full URL or only the path. + * @param method The HTTP method for the request. + * @param request The request object. + * @param returnType The return type. + * @return ResponseEntity in the specified type. + * @throws RestClientException if an error occurs while attempting to invoke the API + */ + public abstract ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException; +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/JavaTimeFormatter.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/JavaTimeFormatter.java new file mode 100644 index 000000000000..c3ec1fa7be8c --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/JavaTimeFormatter.java @@ -0,0 +1,64 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; + +/** + * Class that add parsing/formatting support for Java 8+ {@code OffsetDateTime} class. + * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}. + */ +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class JavaTimeFormatter { + + private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME; + + /** + * Get the date format used to parse/format {@code OffsetDateTime} parameters. + * @return DateTimeFormatter + */ + public DateTimeFormatter getOffsetDateTimeFormatter() { + return offsetDateTimeFormatter; + } + + /** + * Set the date format used to parse/format {@code OffsetDateTime} parameters. + * @param offsetDateTimeFormatter {@code DateTimeFormatter} + */ + public void setOffsetDateTimeFormatter(DateTimeFormatter offsetDateTimeFormatter) { + this.offsetDateTimeFormatter = offsetDateTimeFormatter; + } + + /** + * Parse the given string into {@code OffsetDateTime} object. + * @param str String + * @return {@code OffsetDateTime} + */ + public OffsetDateTime parseOffsetDateTime(String str) { + try { + return OffsetDateTime.parse(str, offsetDateTimeFormatter); + } catch (DateTimeParseException e) { + throw new RuntimeException(e); + } + } + /** + * Format the given {@code OffsetDateTime} object into string. + * @param offsetDateTime {@code OffsetDateTime} + * @return {@code OffsetDateTime} in string format + */ + public String formatOffsetDateTime(OffsetDateTime offsetDateTime) { + return offsetDateTimeFormatter.format(offsetDateTime); + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339DateFormat.java new file mode 100644 index 000000000000..506639a06425 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339DateFormat.java @@ -0,0 +1,58 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import com.fasterxml.jackson.databind.util.StdDateFormat; + +import java.text.DateFormat; +import java.text.FieldPosition; +import java.text.ParsePosition; +import java.util.Date; +import java.text.DecimalFormat; +import java.util.GregorianCalendar; +import java.util.TimeZone; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class RFC3339DateFormat extends DateFormat { + private static final long serialVersionUID = 1L; + private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); + + private final StdDateFormat fmt = new StdDateFormat() + .withTimeZone(TIMEZONE_Z) + .withColonInTimeZone(true); + + public RFC3339DateFormat() { + this.calendar = new GregorianCalendar(); + this.numberFormat = new DecimalFormat(); + } + + @Override + public Date parse(String source) { + return parse(source, new ParsePosition(0)); + } + + @Override + public Date parse(String source, ParsePosition pos) { + return fmt.parse(source, pos); + } + + @Override + public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { + return fmt.format(date, toAppendTo, fieldPosition); + } + + @Override + public Object clone() { + return super.clone(); + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java new file mode 100644 index 000000000000..ec00ea89b684 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java @@ -0,0 +1,100 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import java.io.IOException; +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.util.function.BiFunction; +import java.util.function.Function; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeFeature; +import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class RFC3339InstantDeserializer extends InstantDeserializer { + + private final static boolean DEFAULT_NORMALIZE_ZONE_ID = JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID.enabledByDefault(); + private final static boolean DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + = JavaTimeFeature.ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS.enabledByDefault(); + + public static final RFC3339InstantDeserializer INSTANT = new RFC3339InstantDeserializer<>( + Instant.class, DateTimeFormatter.ISO_INSTANT, + Instant::from, + a -> Instant.ofEpochMilli( a.value ), + a -> Instant.ofEpochSecond( a.integer, a.fraction ), + null, + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer OFFSET_DATE_TIME = new RFC3339InstantDeserializer<>( + OffsetDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME, + OffsetDateTime::from, + a -> OffsetDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> OffsetDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + (d, z) -> ( d.isEqual( OffsetDateTime.MIN ) || d.isEqual( OffsetDateTime.MAX ) ? + d : + d.withOffsetSameInstant( z.getRules().getOffset( d.toLocalDateTime() ) ) ), + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer ZONED_DATE_TIME = new RFC3339InstantDeserializer<>( + ZonedDateTime.class, DateTimeFormatter.ISO_ZONED_DATE_TIME, + ZonedDateTime::from, + a -> ZonedDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> ZonedDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + ZonedDateTime::withZoneSameInstant, + false, // keep zero offset and Z separate since zones explicitly supported + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + protected RFC3339InstantDeserializer( + Class supportedType, + DateTimeFormatter formatter, + Function parsedToValue, + Function fromMilliseconds, + Function fromNanoseconds, + BiFunction adjust, + boolean replaceZeroOffsetAsZ, + boolean normalizeZoneId, + boolean readNumericStringsAsTimestamp) { + super( + supportedType, + formatter, + parsedToValue, + fromMilliseconds, + fromNanoseconds, + adjust, + replaceZeroOffsetAsZ, + normalizeZoneId, + readNumericStringsAsTimestamp + ); + } + + @Override + protected T _fromString(JsonParser p, DeserializationContext ctxt, String string0) throws IOException { + return super._fromString(p, ctxt, string0.replace( ' ', 'T' )); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java new file mode 100644 index 000000000000..197f8c344b29 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java @@ -0,0 +1,31 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; + +import com.fasterxml.jackson.databind.module.SimpleModule; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class RFC3339JavaTimeModule extends SimpleModule { + + public RFC3339JavaTimeModule() { + super("RFC3339JavaTimeModule"); + + addDeserializer(Instant.class, RFC3339InstantDeserializer.INSTANT); + addDeserializer(OffsetDateTime.class, RFC3339InstantDeserializer.OFFSET_DATE_TIME); + addDeserializer(ZonedDateTime.class, RFC3339InstantDeserializer.ZONED_DATE_TIME); + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerConfiguration.java new file mode 100644 index 000000000000..7290219322af --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerConfiguration.java @@ -0,0 +1,72 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import java.util.Map; + +/** + * Representing a Server configuration. + */ +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class ServerConfiguration { + public String URL; + public String description; + public Map variables; + + /** + * @param URL A URL to the target host. + * @param description A description of the host designated by the URL. + * @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template. + */ + public ServerConfiguration(String URL, String description, Map variables) { + this.URL = URL; + this.description = description; + this.variables = variables; + } + + /** + * Format URL template using given variables. + * + * @param variables A map between a variable name and its value. + * @return Formatted URL. + */ + public String URL(Map variables) { + String url = this.URL; + + // go through variables and replace placeholders + for (Map.Entry variable: this.variables.entrySet()) { + String name = variable.getKey(); + ServerVariable serverVariable = variable.getValue(); + String value = serverVariable.defaultValue; + + if (variables != null && variables.containsKey(name)) { + value = variables.get(name); + if (serverVariable.enumValues.size() > 0 && !serverVariable.enumValues.contains(value)) { + throw new IllegalArgumentException("The variable " + name + " in the server URL has invalid value " + value + "."); + } + } + url = url.replace("{" + name + "}", value); + } + return url; + } + + /** + * Format URL template using default server variables. + * + * @return Formatted URL. + */ + public String URL() { + return URL(null); + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerVariable.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerVariable.java new file mode 100644 index 000000000000..37b5d739f3a8 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerVariable.java @@ -0,0 +1,37 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import java.util.HashSet; + +/** + * Representing a Server Variable for server URL template substitution. + */ +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class ServerVariable { + public String description; + public String defaultValue; + public HashSet enumValues = null; + + /** + * @param description A description for the server variable. + * @param defaultValue The default value to use for substitution. + * @param enumValues An enumeration of string values to be used if the substitution options are from a limited set. + */ + public ServerVariable(String description, String defaultValue, HashSet enumValues) { + this.description = description; + this.defaultValue = defaultValue; + this.enumValues = enumValues; + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/api/FakeApi.java new file mode 100644 index 000000000000..45929d97003b --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/api/FakeApi.java @@ -0,0 +1,108 @@ +package org.openapitools.client.api; + +import org.openapitools.client.ApiClient; +import org.openapitools.client.BaseApi; + +import org.openapitools.client.model.AdditionalProperties; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.stream.Collectors; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestClientException; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.core.io.FileSystemResource; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class FakeApi extends BaseApi { + + public FakeApi() { + super(new ApiClient()); + } + + public FakeApi(ApiClient apiClient) { + super(apiClient); + } + + /** + * test referenced additionalProperties + * + *

200 - successful operation + * @param additionalProperties request body (required) + * @throws RestClientException if an error occurs while attempting to invoke the API + */ + public void testAdditionalPropertiesReference(AdditionalProperties additionalProperties) throws RestClientException { + testAdditionalPropertiesReferenceWithHttpInfo(additionalProperties); + } + + /** + * test referenced additionalProperties + * + *

200 - successful operation + * @param additionalProperties request body (required) + * @return ResponseEntity<Void> + * @throws RestClientException if an error occurs while attempting to invoke the API + */ + public ResponseEntity testAdditionalPropertiesReferenceWithHttpInfo(AdditionalProperties additionalProperties) throws RestClientException { + Object localVarPostBody = additionalProperties; + + // verify the required parameter 'additionalProperties' is set + if (additionalProperties == null) { + throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'additionalProperties' when calling testAdditionalPropertiesReference"); + } + + + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final HttpHeaders localVarHeaderParams = new HttpHeaders(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + + final String[] localVarAccepts = { }; + final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); + final String[] localVarContentTypes = { + "application/json" + }; + final MediaType localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); + + String[] localVarAuthNames = new String[] { }; + + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + } + + @Override + public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { + String localVarPath = url.replace(apiClient.getBasePath(), ""); + Object localVarPostBody = request; + + final Map uriVariables = new HashMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final HttpHeaders localVarHeaderParams = new HttpHeaders(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + + final String[] localVarAccepts = { }; + final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); + final String[] localVarContentTypes = { + "application/json" + }; + final MediaType localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); + + String[] localVarAuthNames = new String[] { }; + + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java new file mode 100644 index 000000000000..f0825a136331 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java @@ -0,0 +1,75 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class ApiKeyAuth implements Authentication { + private final String location; + private final String paramName; + + private String apiKey; + private String apiKeyPrefix; + + public ApiKeyAuth(String location, String paramName) { + this.location = location; + this.paramName = paramName; + } + + public String getLocation() { + return location; + } + + public String getParamName() { + return paramName; + } + + public String getApiKey() { + return apiKey; + } + + public void setApiKey(String apiKey) { + this.apiKey = apiKey; + } + + public String getApiKeyPrefix() { + return apiKeyPrefix; + } + + public void setApiKeyPrefix(String apiKeyPrefix) { + this.apiKeyPrefix = apiKeyPrefix; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + if (apiKey == null) { + return; + } + String value; + if (apiKeyPrefix != null) { + value = apiKeyPrefix + " " + apiKey; + } else { + value = apiKey; + } + if (location.equals("query")) { + queryParams.add(paramName, value); + } else if (location.equals("header")) { + headerParams.add(paramName, value); + } else if (location.equals("cookie")) { + cookieParams.add(paramName, value); + } + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/Authentication.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/Authentication.java new file mode 100644 index 000000000000..dd7f1db34295 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/Authentication.java @@ -0,0 +1,27 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +public interface Authentication { + /** + * Apply authentication settings to header and / or query parameters. + * @param queryParams The query parameters for the request + * @param headerParams The header parameters for the request + * @param cookieParams The cookie parameters for the request + */ + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams); +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java new file mode 100644 index 000000000000..57c8028acc3a --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java @@ -0,0 +1,51 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import java.nio.charset.StandardCharsets; +import java.util.Base64; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class HttpBasicAuth implements Authentication { + private String username; + private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + if (username == null && password == null) { + return; + } + String str = (username == null ? "" : username) + ":" + (password == null ? "" : password); + headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8))); + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java new file mode 100644 index 000000000000..a8fe619f187f --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java @@ -0,0 +1,69 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import java.util.Optional; +import java.util.function.Supplier; +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class HttpBearerAuth implements Authentication { + private final String scheme; + private Supplier tokenSupplier; + + public HttpBearerAuth(String scheme) { + this.scheme = scheme; + } + + /** + * Gets the token, which together with the scheme, will be sent as the value of the Authorization header. + * + * @return The bearer token + */ + public String getBearerToken() { + return tokenSupplier.get(); + } + + /** + * Sets the token, which together with the scheme, will be sent as the value of the Authorization header. + * + * @param bearerToken The bearer token to send in the Authorization header + */ + public void setBearerToken(String bearerToken) { + this.tokenSupplier = () -> bearerToken; + } + + /** + * Sets the supplier of tokens, which together with the scheme, will be sent as the value of the Authorization header. + * + * @param tokenSupplier The supplier of bearer tokens to send in the Authorization header + */ + public void setBearerToken(Supplier tokenSupplier) { + this.tokenSupplier = tokenSupplier; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + String bearerToken = Optional.ofNullable(tokenSupplier).map(Supplier::get).orElse(null); + if (bearerToken == null) { + return; + } + headerParams.add(HttpHeaders.AUTHORIZATION, (scheme != null ? upperCaseBearer(scheme) + " " : "") + bearerToken); + } + + private static String upperCaseBearer(String scheme) { + return ("bearer".equalsIgnoreCase(scheme)) ? "Bearer" : scheme; + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalProperties.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalProperties.java new file mode 100644 index 000000000000..238b2aa92d3f --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalProperties.java @@ -0,0 +1,181 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.AdditionalPropertiesClass; +import org.openapitools.client.model.AdditionalPropertiesClassRef; +import org.openapitools.client.model.MixedPropertiesAndAdditionalPropertiesClass; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalProperties + */ +@JsonPropertyOrder({ + AdditionalProperties.JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS_REF, + AdditionalProperties.JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS, + AdditionalProperties.JSON_PROPERTY_MIXED +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalProperties { + public static final String JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS_REF = "additionalPropertiesClassRef"; + @jakarta.annotation.Nullable + private AdditionalPropertiesClassRef additionalPropertiesClassRef; + + public static final String JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS = "additionalPropertiesClass"; + @jakarta.annotation.Nullable + private AdditionalPropertiesClass additionalPropertiesClass; + + public static final String JSON_PROPERTY_MIXED = "mixed"; + @jakarta.annotation.Nullable + private MixedPropertiesAndAdditionalPropertiesClass mixed; + + public AdditionalProperties() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalProperties(@JsonProperty(JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS_REF) AdditionalPropertiesClassRef additionalPropertiesClassRef, @JsonProperty(JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS) AdditionalPropertiesClass additionalPropertiesClass, @JsonProperty(JSON_PROPERTY_MIXED) MixedPropertiesAndAdditionalPropertiesClass mixed) { + this.additionalPropertiesClassRef = additionalPropertiesClassRef; + this.additionalPropertiesClass = additionalPropertiesClass; + this.mixed = mixed; + } + + public AdditionalProperties additionalPropertiesClassRef(@jakarta.annotation.Nullable AdditionalPropertiesClassRef additionalPropertiesClassRef) { + + this.additionalPropertiesClassRef = additionalPropertiesClassRef; + return this; + } + + /** + * Get additionalPropertiesClassRef + * @return additionalPropertiesClassRef + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS_REF) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertiesClassRef getAdditionalPropertiesClassRef() { + return additionalPropertiesClassRef; + } + + + @JsonProperty(JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS_REF) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalPropertiesClassRef(@jakarta.annotation.Nullable AdditionalPropertiesClassRef additionalPropertiesClassRef) { + this.additionalPropertiesClassRef = additionalPropertiesClassRef; + } + + public AdditionalProperties additionalPropertiesClass(@jakarta.annotation.Nullable AdditionalPropertiesClass additionalPropertiesClass) { + + this.additionalPropertiesClass = additionalPropertiesClass; + return this; + } + + /** + * Get additionalPropertiesClass + * @return additionalPropertiesClass + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertiesClass getAdditionalPropertiesClass() { + return additionalPropertiesClass; + } + + + @JsonProperty(JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalPropertiesClass(@jakarta.annotation.Nullable AdditionalPropertiesClass additionalPropertiesClass) { + this.additionalPropertiesClass = additionalPropertiesClass; + } + + public AdditionalProperties mixed(@jakarta.annotation.Nullable MixedPropertiesAndAdditionalPropertiesClass mixed) { + + this.mixed = mixed; + return this; + } + + /** + * Get mixed + * @return mixed + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MIXED) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public MixedPropertiesAndAdditionalPropertiesClass getMixed() { + return mixed; + } + + + @JsonProperty(JSON_PROPERTY_MIXED) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMixed(@jakarta.annotation.Nullable MixedPropertiesAndAdditionalPropertiesClass mixed) { + this.mixed = mixed; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalProperties additionalProperties = (AdditionalProperties) o; + return Objects.equals(this.additionalPropertiesClassRef, additionalProperties.additionalPropertiesClassRef) && + Objects.equals(this.additionalPropertiesClass, additionalProperties.additionalPropertiesClass) && + Objects.equals(this.mixed, additionalProperties.mixed); + } + + @Override + public int hashCode() { + return Objects.hash(additionalPropertiesClassRef, additionalPropertiesClass, mixed); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalProperties {\n"); + sb.append(" additionalPropertiesClassRef: ").append(toIndentedString(additionalPropertiesClassRef)).append("\n"); + sb.append(" additionalPropertiesClass: ").append(toIndentedString(additionalPropertiesClass)).append("\n"); + sb.append(" mixed: ").append(toIndentedString(mixed)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java new file mode 100644 index 000000000000..b16ddf86bd17 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -0,0 +1,161 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesAnyType + */ +@JsonPropertyOrder({ + AdditionalPropertiesAnyType.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesAnyType { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesAnyType() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesAnyType(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesAnyType name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; + return Objects.equals(this.name, additionalPropertiesAnyType.name) && + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesAnyType {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java new file mode 100644 index 000000000000..f3658dad9c55 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -0,0 +1,162 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.List; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesArray + */ +@JsonPropertyOrder({ + AdditionalPropertiesArray.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesArray { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesArray() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesArray(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesArray name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; + return Objects.equals(this.name, additionalPropertiesArray.name) && + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesArray {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java new file mode 100644 index 000000000000..450110d13137 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -0,0 +1,161 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesBoolean + */ +@JsonPropertyOrder({ + AdditionalPropertiesBoolean.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesBoolean { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesBoolean() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesBoolean(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesBoolean name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; + return Objects.equals(this.name, additionalPropertiesBoolean.name) && + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesBoolean {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java new file mode 100644 index 000000000000..df61370ca5ef --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -0,0 +1,533 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; +import com.fasterxml.jackson.annotation.JsonIgnore; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesClass + */ +@JsonPropertyOrder({ + AdditionalPropertiesClass.JSON_PROPERTY_MAP_STRING, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_NUMBER, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_INTEGER, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_BOOLEAN, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_INTEGER, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_ANYTYPE, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_STRING, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_ANYTYPE, + AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE1, + AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2, + AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3 +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesClass { + public static final String JSON_PROPERTY_MAP_STRING = "map_string"; + @jakarta.annotation.Nullable + private Map mapString = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; + @jakarta.annotation.Nullable + private Map mapNumber = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; + @jakarta.annotation.Nullable + private Map mapInteger = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; + @jakarta.annotation.Nullable + private Map mapBoolean = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; + @jakarta.annotation.Nullable + private Map> mapArrayInteger = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; + @jakarta.annotation.Nullable + private Map> mapArrayAnytype = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; + @jakarta.annotation.Nullable + private Map> mapMapString = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; + @jakarta.annotation.Nullable + private Map> mapMapAnytype = new HashMap<>(); + + public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; + @jakarta.annotation.Nullable + private Object anytype1; + + public static final String JSON_PROPERTY_ANYTYPE2 = "anytype_2"; + @jakarta.annotation.Nullable + private JsonNullable anytype2 = JsonNullable.of(null); + + public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3"; + @jakarta.annotation.Nullable + private Object anytype3; + + public AdditionalPropertiesClass() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesClass(@JsonProperty(JSON_PROPERTY_MAP_STRING) Map mapString, @JsonProperty(JSON_PROPERTY_MAP_NUMBER) Map mapNumber, @JsonProperty(JSON_PROPERTY_MAP_INTEGER) Map mapInteger, @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) Map mapBoolean, @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) Map> mapArrayInteger, @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) Map> mapArrayAnytype, @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) Map> mapMapString, @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) Map> mapMapAnytype, @JsonProperty(JSON_PROPERTY_ANYTYPE1) Object anytype1, @JsonProperty(JSON_PROPERTY_ANYTYPE2) Object anytype2, @JsonProperty(JSON_PROPERTY_ANYTYPE3) Object anytype3) { + this.mapString = mapString; + this.mapNumber = mapNumber; + this.mapInteger = mapInteger; + this.mapBoolean = mapBoolean; + this.mapArrayInteger = mapArrayInteger; + this.mapArrayAnytype = mapArrayAnytype; + this.mapMapString = mapMapString; + this.mapMapAnytype = mapMapAnytype; + this.anytype1 = anytype1; + this.anytype2 = anytype2 == null ? JsonNullable.undefined() : JsonNullable.of(anytype2); + this.anytype3 = anytype3; + } + + public AdditionalPropertiesClass mapString(@jakarta.annotation.Nullable Map mapString) { + + this.mapString = mapString; + return this; + } + + public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) { + if (this.mapString == null) { + this.mapString = new HashMap<>(); + } + this.mapString.put(key, mapStringItem); + return this; + } + + /** + * Get mapString + * @return mapString + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map getMapString() { + return mapString; + } + + + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapString(@jakarta.annotation.Nullable Map mapString) { + this.mapString = mapString; + } + + public AdditionalPropertiesClass mapNumber(@jakarta.annotation.Nullable Map mapNumber) { + + this.mapNumber = mapNumber; + return this; + } + + public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) { + if (this.mapNumber == null) { + this.mapNumber = new HashMap<>(); + } + this.mapNumber.put(key, mapNumberItem); + return this; + } + + /** + * Get mapNumber + * @return mapNumber + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map getMapNumber() { + return mapNumber; + } + + + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapNumber(@jakarta.annotation.Nullable Map mapNumber) { + this.mapNumber = mapNumber; + } + + public AdditionalPropertiesClass mapInteger(@jakarta.annotation.Nullable Map mapInteger) { + + this.mapInteger = mapInteger; + return this; + } + + public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) { + if (this.mapInteger == null) { + this.mapInteger = new HashMap<>(); + } + this.mapInteger.put(key, mapIntegerItem); + return this; + } + + /** + * Get mapInteger + * @return mapInteger + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map getMapInteger() { + return mapInteger; + } + + + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapInteger(@jakarta.annotation.Nullable Map mapInteger) { + this.mapInteger = mapInteger; + } + + public AdditionalPropertiesClass mapBoolean(@jakarta.annotation.Nullable Map mapBoolean) { + + this.mapBoolean = mapBoolean; + return this; + } + + public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) { + if (this.mapBoolean == null) { + this.mapBoolean = new HashMap<>(); + } + this.mapBoolean.put(key, mapBooleanItem); + return this; + } + + /** + * Get mapBoolean + * @return mapBoolean + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map getMapBoolean() { + return mapBoolean; + } + + + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapBoolean(@jakarta.annotation.Nullable Map mapBoolean) { + this.mapBoolean = mapBoolean; + } + + public AdditionalPropertiesClass mapArrayInteger(@jakarta.annotation.Nullable Map> mapArrayInteger) { + + this.mapArrayInteger = mapArrayInteger; + return this; + } + + public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List mapArrayIntegerItem) { + if (this.mapArrayInteger == null) { + this.mapArrayInteger = new HashMap<>(); + } + this.mapArrayInteger.put(key, mapArrayIntegerItem); + return this; + } + + /** + * Get mapArrayInteger + * @return mapArrayInteger + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map> getMapArrayInteger() { + return mapArrayInteger; + } + + + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapArrayInteger(@jakarta.annotation.Nullable Map> mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + } + + public AdditionalPropertiesClass mapArrayAnytype(@jakarta.annotation.Nullable Map> mapArrayAnytype) { + + this.mapArrayAnytype = mapArrayAnytype; + return this; + } + + public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List mapArrayAnytypeItem) { + if (this.mapArrayAnytype == null) { + this.mapArrayAnytype = new HashMap<>(); + } + this.mapArrayAnytype.put(key, mapArrayAnytypeItem); + return this; + } + + /** + * Get mapArrayAnytype + * @return mapArrayAnytype + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map> getMapArrayAnytype() { + return mapArrayAnytype; + } + + + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapArrayAnytype(@jakarta.annotation.Nullable Map> mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + } + + public AdditionalPropertiesClass mapMapString(@jakarta.annotation.Nullable Map> mapMapString) { + + this.mapMapString = mapMapString; + return this; + } + + public AdditionalPropertiesClass putMapMapStringItem(String key, Map mapMapStringItem) { + if (this.mapMapString == null) { + this.mapMapString = new HashMap<>(); + } + this.mapMapString.put(key, mapMapStringItem); + return this; + } + + /** + * Get mapMapString + * @return mapMapString + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map> getMapMapString() { + return mapMapString; + } + + + @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapMapString(@jakarta.annotation.Nullable Map> mapMapString) { + this.mapMapString = mapMapString; + } + + public AdditionalPropertiesClass mapMapAnytype(@jakarta.annotation.Nullable Map> mapMapAnytype) { + + this.mapMapAnytype = mapMapAnytype; + return this; + } + + public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map mapMapAnytypeItem) { + if (this.mapMapAnytype == null) { + this.mapMapAnytype = new HashMap<>(); + } + this.mapMapAnytype.put(key, mapMapAnytypeItem); + return this; + } + + /** + * Get mapMapAnytype + * @return mapMapAnytype + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map> getMapMapAnytype() { + return mapMapAnytype; + } + + + @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapMapAnytype(@jakarta.annotation.Nullable Map> mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + } + + public AdditionalPropertiesClass anytype1(@jakarta.annotation.Nullable Object anytype1) { + + this.anytype1 = anytype1; + return this; + } + + /** + * Get anytype1 + * @return anytype1 + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Object getAnytype1() { + return anytype1; + } + + + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAnytype1(@jakarta.annotation.Nullable Object anytype1) { + this.anytype1 = anytype1; + } + + public AdditionalPropertiesClass anytype2(@jakarta.annotation.Nullable Object anytype2) { + this.anytype2 = JsonNullable.of(anytype2); + + return this; + } + + /** + * Get anytype2 + * @return anytype2 + */ + @jakarta.annotation.Nullable + @JsonIgnore + + public Object getAnytype2() { + return anytype2.orElse(null); + } + + @JsonProperty(JSON_PROPERTY_ANYTYPE2) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable getAnytype2_JsonNullable() { + return anytype2; + } + + @JsonProperty(JSON_PROPERTY_ANYTYPE2) + public void setAnytype2_JsonNullable(JsonNullable anytype2) { + this.anytype2 = anytype2; + } + + public void setAnytype2(@jakarta.annotation.Nullable Object anytype2) { + this.anytype2 = JsonNullable.of(anytype2); + } + + public AdditionalPropertiesClass anytype3(@jakarta.annotation.Nullable Object anytype3) { + + this.anytype3 = anytype3; + return this; + } + + /** + * Get anytype3 + * @return anytype3 + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ANYTYPE3) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Object getAnytype3() { + return anytype3; + } + + + @JsonProperty(JSON_PROPERTY_ANYTYPE3) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAnytype3(@jakarta.annotation.Nullable Object anytype3) { + this.anytype3 = anytype3; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o; + return Objects.equals(this.mapString, additionalPropertiesClass.mapString) && + Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) && + Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) && + Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) && + Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) && + Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) && + Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && + Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && + Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && + Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesClass {\n"); + sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); + sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); + sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); + sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); + sb.append(" mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n"); + sb.append(" mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n"); + sb.append(" mapMapString: ").append(toIndentedString(mapMapString)).append("\n"); + sb.append(" mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n"); + sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); + sb.append(" anytype2: ").append(toIndentedString(anytype2)).append("\n"); + sb.append(" anytype3: ").append(toIndentedString(anytype3)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClassRef.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClassRef.java new file mode 100644 index 000000000000..01ddff00297f --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClassRef.java @@ -0,0 +1,248 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.AdditionalPropertiesBoolean; +import org.openapitools.client.model.AdditionalPropertiesInteger; +import org.openapitools.client.model.AdditionalPropertiesNumber; +import org.openapitools.client.model.AdditionalPropertiesString; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesClassRef + */ +@JsonPropertyOrder({ + AdditionalPropertiesClassRef.JSON_PROPERTY_MAP_STRING, + AdditionalPropertiesClassRef.JSON_PROPERTY_MAP_NUMBER, + AdditionalPropertiesClassRef.JSON_PROPERTY_MAP_INTEGER, + AdditionalPropertiesClassRef.JSON_PROPERTY_MAP_BOOLEAN, + AdditionalPropertiesClassRef.JSON_PROPERTY_ANYTYPE1 +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesClassRef { + public static final String JSON_PROPERTY_MAP_STRING = "map_string"; + @jakarta.annotation.Nullable + private AdditionalPropertiesString mapString; + + public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; + @jakarta.annotation.Nullable + private AdditionalPropertiesNumber mapNumber; + + public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; + @jakarta.annotation.Nullable + private AdditionalPropertiesInteger mapInteger; + + public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; + @jakarta.annotation.Nullable + private AdditionalPropertiesBoolean mapBoolean; + + public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; + @jakarta.annotation.Nullable + private Object anytype1; + + public AdditionalPropertiesClassRef() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesClassRef(@JsonProperty(JSON_PROPERTY_MAP_STRING) AdditionalPropertiesString mapString, @JsonProperty(JSON_PROPERTY_MAP_NUMBER) AdditionalPropertiesNumber mapNumber, @JsonProperty(JSON_PROPERTY_MAP_INTEGER) AdditionalPropertiesInteger mapInteger, @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) AdditionalPropertiesBoolean mapBoolean, @JsonProperty(JSON_PROPERTY_ANYTYPE1) Object anytype1) { + this.mapString = mapString; + this.mapNumber = mapNumber; + this.mapInteger = mapInteger; + this.mapBoolean = mapBoolean; + this.anytype1 = anytype1; + } + + public AdditionalPropertiesClassRef mapString(@jakarta.annotation.Nullable AdditionalPropertiesString mapString) { + + this.mapString = mapString; + return this; + } + + /** + * Get mapString + * @return mapString + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertiesString getMapString() { + return mapString; + } + + + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapString(@jakarta.annotation.Nullable AdditionalPropertiesString mapString) { + this.mapString = mapString; + } + + public AdditionalPropertiesClassRef mapNumber(@jakarta.annotation.Nullable AdditionalPropertiesNumber mapNumber) { + + this.mapNumber = mapNumber; + return this; + } + + /** + * Get mapNumber + * @return mapNumber + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertiesNumber getMapNumber() { + return mapNumber; + } + + + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapNumber(@jakarta.annotation.Nullable AdditionalPropertiesNumber mapNumber) { + this.mapNumber = mapNumber; + } + + public AdditionalPropertiesClassRef mapInteger(@jakarta.annotation.Nullable AdditionalPropertiesInteger mapInteger) { + + this.mapInteger = mapInteger; + return this; + } + + /** + * Get mapInteger + * @return mapInteger + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertiesInteger getMapInteger() { + return mapInteger; + } + + + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapInteger(@jakarta.annotation.Nullable AdditionalPropertiesInteger mapInteger) { + this.mapInteger = mapInteger; + } + + public AdditionalPropertiesClassRef mapBoolean(@jakarta.annotation.Nullable AdditionalPropertiesBoolean mapBoolean) { + + this.mapBoolean = mapBoolean; + return this; + } + + /** + * Get mapBoolean + * @return mapBoolean + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertiesBoolean getMapBoolean() { + return mapBoolean; + } + + + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapBoolean(@jakarta.annotation.Nullable AdditionalPropertiesBoolean mapBoolean) { + this.mapBoolean = mapBoolean; + } + + public AdditionalPropertiesClassRef anytype1(@jakarta.annotation.Nullable Object anytype1) { + + this.anytype1 = anytype1; + return this; + } + + /** + * Get anytype1 + * @return anytype1 + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Object getAnytype1() { + return anytype1; + } + + + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAnytype1(@jakarta.annotation.Nullable Object anytype1) { + this.anytype1 = anytype1; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesClassRef additionalPropertiesClassRef = (AdditionalPropertiesClassRef) o; + return Objects.equals(this.mapString, additionalPropertiesClassRef.mapString) && + Objects.equals(this.mapNumber, additionalPropertiesClassRef.mapNumber) && + Objects.equals(this.mapInteger, additionalPropertiesClassRef.mapInteger) && + Objects.equals(this.mapBoolean, additionalPropertiesClassRef.mapBoolean) && + Objects.equals(this.anytype1, additionalPropertiesClassRef.anytype1); + } + + @Override + public int hashCode() { + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, anytype1); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesClassRef {\n"); + sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); + sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); + sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); + sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); + sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java new file mode 100644 index 000000000000..c1cd6a237ee6 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -0,0 +1,161 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesInteger + */ +@JsonPropertyOrder({ + AdditionalPropertiesInteger.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesInteger { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesInteger() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesInteger(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesInteger name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; + return Objects.equals(this.name, additionalPropertiesInteger.name) && + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesInteger {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java new file mode 100644 index 000000000000..fe6831e10bae --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -0,0 +1,162 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesNumber + */ +@JsonPropertyOrder({ + AdditionalPropertiesNumber.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesNumber { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesNumber() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesNumber(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesNumber name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; + return Objects.equals(this.name, additionalPropertiesNumber.name) && + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesNumber {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java new file mode 100644 index 000000000000..7102ff19b1e0 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -0,0 +1,162 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesObject + */ +@JsonPropertyOrder({ + AdditionalPropertiesObject.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesObject { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesObject() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesObject(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesObject name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; + return Objects.equals(this.name, additionalPropertiesObject.name) && + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesObject {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java new file mode 100644 index 000000000000..8d211371c48a --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -0,0 +1,161 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesString + */ +@JsonPropertyOrder({ + AdditionalPropertiesString.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesString { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesString() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesString(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesString name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; + return Objects.equals(this.name, additionalPropertiesString.name) && + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesString {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayAnyType.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayAnyType.java new file mode 100644 index 000000000000..9116e4fc4061 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayAnyType.java @@ -0,0 +1,118 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import java.util.List; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyArrayAnyType + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyArrayAnyType { + public AdditionalPropertyArrayAnyType() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyArrayAnyType putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyArrayAnyType additionalPropertyArrayAnyType = (AdditionalPropertyArrayAnyType) o; + return Objects.equals(this.additionalProperties, additionalPropertyArrayAnyType.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyArrayAnyType {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayInteger.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayInteger.java new file mode 100644 index 000000000000..a7ff47f87a77 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayInteger.java @@ -0,0 +1,118 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import java.util.List; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyArrayInteger + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyArrayInteger { + public AdditionalPropertyArrayInteger() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyArrayInteger putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyArrayInteger additionalPropertyArrayInteger = (AdditionalPropertyArrayInteger) o; + return Objects.equals(this.additionalProperties, additionalPropertyArrayInteger.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyArrayInteger {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyBoolean.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyBoolean.java new file mode 100644 index 000000000000..d756b7e89605 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyBoolean.java @@ -0,0 +1,117 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyBoolean + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyBoolean { + public AdditionalPropertyBoolean() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyBoolean additionalPropertyBoolean = (AdditionalPropertyBoolean) o; + return Objects.equals(this.additionalProperties, additionalPropertyBoolean.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyBoolean {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyClassRef.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyClassRef.java new file mode 100644 index 000000000000..f818d4c8d60c --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyClassRef.java @@ -0,0 +1,384 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.AdditionalPropertyArrayAnyType; +import org.openapitools.client.model.AdditionalPropertyArrayInteger; +import org.openapitools.client.model.AdditionalPropertyBoolean; +import org.openapitools.client.model.AdditionalPropertyInteger; +import org.openapitools.client.model.AdditionalPropertyMapAnyType; +import org.openapitools.client.model.AdditionalPropertyMapString; +import org.openapitools.client.model.AdditionalPropertyNumber; +import org.openapitools.client.model.AdditionalPropertyString; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyClassRef + */ +@JsonPropertyOrder({ + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_STRING, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_NUMBER, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_INTEGER, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_BOOLEAN, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_ARRAY_INTEGER, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_ARRAY_ANYTYPE, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_MAP_STRING, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_MAP_ANYTYPE, + AdditionalPropertyClassRef.JSON_PROPERTY_ANYTYPE1 +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyClassRef { + public static final String JSON_PROPERTY_MAP_STRING = "map_string"; + @jakarta.annotation.Nullable + private AdditionalPropertyString mapString; + + public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; + @jakarta.annotation.Nullable + private AdditionalPropertyNumber mapNumber; + + public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; + @jakarta.annotation.Nullable + private AdditionalPropertyInteger mapInteger; + + public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; + @jakarta.annotation.Nullable + private AdditionalPropertyBoolean mapBoolean; + + public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; + @jakarta.annotation.Nullable + private AdditionalPropertyArrayInteger mapArrayInteger; + + public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; + @jakarta.annotation.Nullable + private AdditionalPropertyArrayAnyType mapArrayAnytype; + + public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; + @jakarta.annotation.Nullable + private AdditionalPropertyMapString mapMapString; + + public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; + @jakarta.annotation.Nullable + private AdditionalPropertyMapAnyType mapMapAnytype; + + public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; + @jakarta.annotation.Nullable + private Object anytype1; + + public AdditionalPropertyClassRef() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertyClassRef(@JsonProperty(JSON_PROPERTY_MAP_STRING) AdditionalPropertyString mapString, @JsonProperty(JSON_PROPERTY_MAP_NUMBER) AdditionalPropertyNumber mapNumber, @JsonProperty(JSON_PROPERTY_MAP_INTEGER) AdditionalPropertyInteger mapInteger, @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) AdditionalPropertyBoolean mapBoolean, @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) AdditionalPropertyArrayInteger mapArrayInteger, @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) AdditionalPropertyArrayAnyType mapArrayAnytype, @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) AdditionalPropertyMapString mapMapString, @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) AdditionalPropertyMapAnyType mapMapAnytype, @JsonProperty(JSON_PROPERTY_ANYTYPE1) Object anytype1) { + this.mapString = mapString; + this.mapNumber = mapNumber; + this.mapInteger = mapInteger; + this.mapBoolean = mapBoolean; + this.mapArrayInteger = mapArrayInteger; + this.mapArrayAnytype = mapArrayAnytype; + this.mapMapString = mapMapString; + this.mapMapAnytype = mapMapAnytype; + this.anytype1 = anytype1; + } + + public AdditionalPropertyClassRef mapString(@jakarta.annotation.Nullable AdditionalPropertyString mapString) { + + this.mapString = mapString; + return this; + } + + /** + * Get mapString + * @return mapString + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyString getMapString() { + return mapString; + } + + + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapString(@jakarta.annotation.Nullable AdditionalPropertyString mapString) { + this.mapString = mapString; + } + + public AdditionalPropertyClassRef mapNumber(@jakarta.annotation.Nullable AdditionalPropertyNumber mapNumber) { + + this.mapNumber = mapNumber; + return this; + } + + /** + * Get mapNumber + * @return mapNumber + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyNumber getMapNumber() { + return mapNumber; + } + + + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapNumber(@jakarta.annotation.Nullable AdditionalPropertyNumber mapNumber) { + this.mapNumber = mapNumber; + } + + public AdditionalPropertyClassRef mapInteger(@jakarta.annotation.Nullable AdditionalPropertyInteger mapInteger) { + + this.mapInteger = mapInteger; + return this; + } + + /** + * Get mapInteger + * @return mapInteger + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyInteger getMapInteger() { + return mapInteger; + } + + + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapInteger(@jakarta.annotation.Nullable AdditionalPropertyInteger mapInteger) { + this.mapInteger = mapInteger; + } + + public AdditionalPropertyClassRef mapBoolean(@jakarta.annotation.Nullable AdditionalPropertyBoolean mapBoolean) { + + this.mapBoolean = mapBoolean; + return this; + } + + /** + * Get mapBoolean + * @return mapBoolean + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyBoolean getMapBoolean() { + return mapBoolean; + } + + + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapBoolean(@jakarta.annotation.Nullable AdditionalPropertyBoolean mapBoolean) { + this.mapBoolean = mapBoolean; + } + + public AdditionalPropertyClassRef mapArrayInteger(@jakarta.annotation.Nullable AdditionalPropertyArrayInteger mapArrayInteger) { + + this.mapArrayInteger = mapArrayInteger; + return this; + } + + /** + * Get mapArrayInteger + * @return mapArrayInteger + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyArrayInteger getMapArrayInteger() { + return mapArrayInteger; + } + + + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapArrayInteger(@jakarta.annotation.Nullable AdditionalPropertyArrayInteger mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + } + + public AdditionalPropertyClassRef mapArrayAnytype(@jakarta.annotation.Nullable AdditionalPropertyArrayAnyType mapArrayAnytype) { + + this.mapArrayAnytype = mapArrayAnytype; + return this; + } + + /** + * Get mapArrayAnytype + * @return mapArrayAnytype + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyArrayAnyType getMapArrayAnytype() { + return mapArrayAnytype; + } + + + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapArrayAnytype(@jakarta.annotation.Nullable AdditionalPropertyArrayAnyType mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + } + + public AdditionalPropertyClassRef mapMapString(@jakarta.annotation.Nullable AdditionalPropertyMapString mapMapString) { + + this.mapMapString = mapMapString; + return this; + } + + /** + * Get mapMapString + * @return mapMapString + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyMapString getMapMapString() { + return mapMapString; + } + + + @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapMapString(@jakarta.annotation.Nullable AdditionalPropertyMapString mapMapString) { + this.mapMapString = mapMapString; + } + + public AdditionalPropertyClassRef mapMapAnytype(@jakarta.annotation.Nullable AdditionalPropertyMapAnyType mapMapAnytype) { + + this.mapMapAnytype = mapMapAnytype; + return this; + } + + /** + * Get mapMapAnytype + * @return mapMapAnytype + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyMapAnyType getMapMapAnytype() { + return mapMapAnytype; + } + + + @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapMapAnytype(@jakarta.annotation.Nullable AdditionalPropertyMapAnyType mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + } + + public AdditionalPropertyClassRef anytype1(@jakarta.annotation.Nullable Object anytype1) { + + this.anytype1 = anytype1; + return this; + } + + /** + * Get anytype1 + * @return anytype1 + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Object getAnytype1() { + return anytype1; + } + + + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAnytype1(@jakarta.annotation.Nullable Object anytype1) { + this.anytype1 = anytype1; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyClassRef additionalPropertyClassRef = (AdditionalPropertyClassRef) o; + return Objects.equals(this.mapString, additionalPropertyClassRef.mapString) && + Objects.equals(this.mapNumber, additionalPropertyClassRef.mapNumber) && + Objects.equals(this.mapInteger, additionalPropertyClassRef.mapInteger) && + Objects.equals(this.mapBoolean, additionalPropertyClassRef.mapBoolean) && + Objects.equals(this.mapArrayInteger, additionalPropertyClassRef.mapArrayInteger) && + Objects.equals(this.mapArrayAnytype, additionalPropertyClassRef.mapArrayAnytype) && + Objects.equals(this.mapMapString, additionalPropertyClassRef.mapMapString) && + Objects.equals(this.mapMapAnytype, additionalPropertyClassRef.mapMapAnytype) && + Objects.equals(this.anytype1, additionalPropertyClassRef.anytype1); + } + + @Override + public int hashCode() { + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyClassRef {\n"); + sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); + sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); + sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); + sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); + sb.append(" mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n"); + sb.append(" mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n"); + sb.append(" mapMapString: ").append(toIndentedString(mapMapString)).append("\n"); + sb.append(" mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n"); + sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyInteger.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyInteger.java new file mode 100644 index 000000000000..bbd6bac936a2 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyInteger.java @@ -0,0 +1,117 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyInteger + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyInteger { + public AdditionalPropertyInteger() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyInteger additionalPropertyInteger = (AdditionalPropertyInteger) o; + return Objects.equals(this.additionalProperties, additionalPropertyInteger.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyInteger {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapAnyType.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapAnyType.java new file mode 100644 index 000000000000..c0123f575a97 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapAnyType.java @@ -0,0 +1,118 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyMapAnyType + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyMapAnyType { + public AdditionalPropertyMapAnyType() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyMapAnyType putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyMapAnyType additionalPropertyMapAnyType = (AdditionalPropertyMapAnyType) o; + return Objects.equals(this.additionalProperties, additionalPropertyMapAnyType.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyMapAnyType {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapString.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapString.java new file mode 100644 index 000000000000..a8cece858262 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapString.java @@ -0,0 +1,118 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyMapString + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyMapString { + public AdditionalPropertyMapString() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyMapString putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyMapString additionalPropertyMapString = (AdditionalPropertyMapString) o; + return Objects.equals(this.additionalProperties, additionalPropertyMapString.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyMapString {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyNumber.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyNumber.java new file mode 100644 index 000000000000..1c89affaa19f --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyNumber.java @@ -0,0 +1,118 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyNumber + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyNumber { + public AdditionalPropertyNumber() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyNumber additionalPropertyNumber = (AdditionalPropertyNumber) o; + return Objects.equals(this.additionalProperties, additionalPropertyNumber.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyNumber {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyString.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyString.java new file mode 100644 index 000000000000..af8ee8fd795d --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyString.java @@ -0,0 +1,117 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyString + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyString { + public AdditionalPropertyString() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyString additionalPropertyString = (AdditionalPropertyString) o; + return Objects.equals(this.additionalProperties, additionalPropertyString.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyString {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/Animal.java new file mode 100644 index 000000000000..96b332f40a06 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/Animal.java @@ -0,0 +1,112 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * Animal + */ +@JsonPropertyOrder({ + Animal.JSON_PROPERTY_CLASS_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class Animal { + public static final String JSON_PROPERTY_CLASS_NAME = "className"; + @jakarta.annotation.Nullable + private String className; + + public Animal() { + } + + /** + * Constructor with all args parameters + */ + public Animal(@JsonProperty(JSON_PROPERTY_CLASS_NAME) String className) { + this.className = className; + } + + public Animal className(@jakarta.annotation.Nullable String className) { + + this.className = className; + return this; + } + + /** + * Get className + * @return className + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CLASS_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getClassName() { + return className; + } + + + @JsonProperty(JSON_PROPERTY_CLASS_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setClassName(@jakarta.annotation.Nullable String className) { + this.className = className; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Animal animal = (Animal) o; + return Objects.equals(this.className, animal.className); + } + + @Override + public int hashCode() { + return Objects.hash(className); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Animal {\n"); + sb.append(" className: ").append(toIndentedString(className)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java new file mode 100644 index 000000000000..08b2da4585c8 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -0,0 +1,191 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import org.openapitools.client.model.Animal; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * MixedPropertiesAndAdditionalPropertiesClass + */ +@JsonPropertyOrder({ + MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_UUID, + MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME, + MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class MixedPropertiesAndAdditionalPropertiesClass { + public static final String JSON_PROPERTY_UUID = "uuid"; + @jakarta.annotation.Nullable + private UUID uuid; + + public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; + @jakarta.annotation.Nullable + private OffsetDateTime dateTime; + + public static final String JSON_PROPERTY_MAP = "map"; + @jakarta.annotation.Nullable + private Map map = new HashMap<>(); + + public MixedPropertiesAndAdditionalPropertiesClass() { + } + + /** + * Constructor with all args parameters + */ + public MixedPropertiesAndAdditionalPropertiesClass(@JsonProperty(JSON_PROPERTY_UUID) UUID uuid, @JsonProperty(JSON_PROPERTY_DATE_TIME) OffsetDateTime dateTime, @JsonProperty(JSON_PROPERTY_MAP) Map map) { + this.uuid = uuid; + this.dateTime = dateTime; + this.map = map; + } + + public MixedPropertiesAndAdditionalPropertiesClass uuid(@jakarta.annotation.Nullable UUID uuid) { + + this.uuid = uuid; + return this; + } + + /** + * Get uuid + * @return uuid + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_UUID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public UUID getUuid() { + return uuid; + } + + + @JsonProperty(JSON_PROPERTY_UUID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setUuid(@jakarta.annotation.Nullable UUID uuid) { + this.uuid = uuid; + } + + public MixedPropertiesAndAdditionalPropertiesClass dateTime(@jakarta.annotation.Nullable OffsetDateTime dateTime) { + + this.dateTime = dateTime; + return this; + } + + /** + * Get dateTime + * @return dateTime + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_DATE_TIME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OffsetDateTime getDateTime() { + return dateTime; + } + + + @JsonProperty(JSON_PROPERTY_DATE_TIME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDateTime(@jakarta.annotation.Nullable OffsetDateTime dateTime) { + this.dateTime = dateTime; + } + + public MixedPropertiesAndAdditionalPropertiesClass map(@jakarta.annotation.Nullable Map map) { + + this.map = map; + return this; + } + + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { + if (this.map == null) { + this.map = new HashMap<>(); + } + this.map.put(key, mapItem); + return this; + } + + /** + * Get map + * @return map + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map getMap() { + return map; + } + + + @JsonProperty(JSON_PROPERTY_MAP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMap(@jakarta.annotation.Nullable Map map) { + this.map = map; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; + return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && + Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && + Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + } + + @Override + public int hashCode() { + return Objects.hash(uuid, dateTime, map); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); + sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); + sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/api/FakeApiTest.java new file mode 100644 index 000000000000..314b2e572c55 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/api/FakeApiTest.java @@ -0,0 +1,54 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.api; + +import org.openapitools.client.model.AdditionalProperties; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.web.client.RestClientException; + +import java.time.LocalDate; +import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * API tests for FakeApi + */ +@Disabled +class FakeApiTest { + + private final FakeApi api = new FakeApi(); + + + /** + * test referenced additionalProperties + * + * + * + * @throws RestClientException + * if the Api call fails + */ + @Test + void testAdditionalPropertiesReferenceTest() { + AdditionalProperties additionalProperties = null; + + api.testAdditionalPropertiesReference(additionalProperties); + + // TODO: test validations + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java new file mode 100644 index 000000000000..f7ff300c4fed --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java @@ -0,0 +1,47 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesAnyType + */ +class AdditionalPropertiesAnyTypeTest { + private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType(); + + /** + * Model tests for AdditionalPropertiesAnyType + */ + @Test + void testAdditionalPropertiesAnyType() { + // TODO: test AdditionalPropertiesAnyType + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java new file mode 100644 index 000000000000..89a861cf98d6 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java @@ -0,0 +1,48 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesArray + */ +class AdditionalPropertiesArrayTest { + private final AdditionalPropertiesArray model = new AdditionalPropertiesArray(); + + /** + * Model tests for AdditionalPropertiesArray + */ + @Test + void testAdditionalPropertiesArray() { + // TODO: test AdditionalPropertiesArray + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java new file mode 100644 index 000000000000..a36266ecfcd5 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java @@ -0,0 +1,47 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesBoolean + */ +class AdditionalPropertiesBooleanTest { + private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean(); + + /** + * Model tests for AdditionalPropertiesBoolean + */ + @Test + void testAdditionalPropertiesBoolean() { + // TODO: test AdditionalPropertiesBoolean + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassRefTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassRefTest.java new file mode 100644 index 000000000000..758ca38bbe68 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassRefTest.java @@ -0,0 +1,83 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.AdditionalPropertiesBoolean; +import org.openapitools.client.model.AdditionalPropertiesInteger; +import org.openapitools.client.model.AdditionalPropertiesNumber; +import org.openapitools.client.model.AdditionalPropertiesString; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesClassRef + */ +class AdditionalPropertiesClassRefTest { + private final AdditionalPropertiesClassRef model = new AdditionalPropertiesClassRef(); + + /** + * Model tests for AdditionalPropertiesClassRef + */ + @Test + void testAdditionalPropertiesClassRef() { + // TODO: test AdditionalPropertiesClassRef + } + + /** + * Test the property 'mapString' + */ + @Test + void mapStringTest() { + // TODO: test mapString + } + + /** + * Test the property 'mapNumber' + */ + @Test + void mapNumberTest() { + // TODO: test mapNumber + } + + /** + * Test the property 'mapInteger' + */ + @Test + void mapIntegerTest() { + // TODO: test mapInteger + } + + /** + * Test the property 'mapBoolean' + */ + @Test + void mapBooleanTest() { + // TODO: test mapBoolean + } + + /** + * Test the property 'anytype1' + */ + @Test + void anytype1Test() { + // TODO: test anytype1 + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java new file mode 100644 index 000000000000..8c927e47dc25 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java @@ -0,0 +1,135 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; +import com.fasterxml.jackson.annotation.JsonIgnore; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesClass + */ +class AdditionalPropertiesClassTest { + private final AdditionalPropertiesClass model = new AdditionalPropertiesClass(); + + /** + * Model tests for AdditionalPropertiesClass + */ + @Test + void testAdditionalPropertiesClass() { + // TODO: test AdditionalPropertiesClass + } + + /** + * Test the property 'mapString' + */ + @Test + void mapStringTest() { + // TODO: test mapString + } + + /** + * Test the property 'mapNumber' + */ + @Test + void mapNumberTest() { + // TODO: test mapNumber + } + + /** + * Test the property 'mapInteger' + */ + @Test + void mapIntegerTest() { + // TODO: test mapInteger + } + + /** + * Test the property 'mapBoolean' + */ + @Test + void mapBooleanTest() { + // TODO: test mapBoolean + } + + /** + * Test the property 'mapArrayInteger' + */ + @Test + void mapArrayIntegerTest() { + // TODO: test mapArrayInteger + } + + /** + * Test the property 'mapArrayAnytype' + */ + @Test + void mapArrayAnytypeTest() { + // TODO: test mapArrayAnytype + } + + /** + * Test the property 'mapMapString' + */ + @Test + void mapMapStringTest() { + // TODO: test mapMapString + } + + /** + * Test the property 'mapMapAnytype' + */ + @Test + void mapMapAnytypeTest() { + // TODO: test mapMapAnytype + } + + /** + * Test the property 'anytype1' + */ + @Test + void anytype1Test() { + // TODO: test anytype1 + } + + /** + * Test the property 'anytype2' + */ + @Test + void anytype2Test() { + // TODO: test anytype2 + } + + /** + * Test the property 'anytype3' + */ + @Test + void anytype3Test() { + // TODO: test anytype3 + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java new file mode 100644 index 000000000000..795040cd89e6 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java @@ -0,0 +1,47 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesInteger + */ +class AdditionalPropertiesIntegerTest { + private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger(); + + /** + * Model tests for AdditionalPropertiesInteger + */ + @Test + void testAdditionalPropertiesInteger() { + // TODO: test AdditionalPropertiesInteger + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java new file mode 100644 index 000000000000..6d7141d9438f --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java @@ -0,0 +1,48 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesNumber + */ +class AdditionalPropertiesNumberTest { + private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber(); + + /** + * Model tests for AdditionalPropertiesNumber + */ + @Test + void testAdditionalPropertiesNumber() { + // TODO: test AdditionalPropertiesNumber + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java new file mode 100644 index 000000000000..7206df8f6d39 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java @@ -0,0 +1,48 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesObject + */ +class AdditionalPropertiesObjectTest { + private final AdditionalPropertiesObject model = new AdditionalPropertiesObject(); + + /** + * Model tests for AdditionalPropertiesObject + */ + @Test + void testAdditionalPropertiesObject() { + // TODO: test AdditionalPropertiesObject + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java new file mode 100644 index 000000000000..d1766528dfec --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java @@ -0,0 +1,47 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesString + */ +class AdditionalPropertiesStringTest { + private final AdditionalPropertiesString model = new AdditionalPropertiesString(); + + /** + * Model tests for AdditionalPropertiesString + */ + @Test + void testAdditionalPropertiesString() { + // TODO: test AdditionalPropertiesString + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesTest.java new file mode 100644 index 000000000000..4a20e2f1b125 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesTest.java @@ -0,0 +1,66 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.AdditionalPropertiesClass; +import org.openapitools.client.model.AdditionalPropertiesClassRef; +import org.openapitools.client.model.MixedPropertiesAndAdditionalPropertiesClass; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalProperties + */ +class AdditionalPropertiesTest { + private final AdditionalProperties model = new AdditionalProperties(); + + /** + * Model tests for AdditionalProperties + */ + @Test + void testAdditionalProperties() { + // TODO: test AdditionalProperties + } + + /** + * Test the property 'additionalPropertiesClassRef' + */ + @Test + void additionalPropertiesClassRefTest() { + // TODO: test additionalPropertiesClassRef + } + + /** + * Test the property 'additionalPropertiesClass' + */ + @Test + void additionalPropertiesClassTest() { + // TODO: test additionalPropertiesClass + } + + /** + * Test the property 'mixed' + */ + @Test + void mixedTest() { + // TODO: test mixed + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayAnyTypeTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayAnyTypeTest.java new file mode 100644 index 000000000000..5d51c109c230 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayAnyTypeTest.java @@ -0,0 +1,35 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyArrayAnyType + */ +class AdditionalPropertyArrayAnyTypeTest { + private final AdditionalPropertyArrayAnyType model = new AdditionalPropertyArrayAnyType(); + + /** + * Model tests for AdditionalPropertyArrayAnyType + */ + @Test + void testAdditionalPropertyArrayAnyType() { + // TODO: test AdditionalPropertyArrayAnyType + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayIntegerTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayIntegerTest.java new file mode 100644 index 000000000000..32a377c655cf --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayIntegerTest.java @@ -0,0 +1,35 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyArrayInteger + */ +class AdditionalPropertyArrayIntegerTest { + private final AdditionalPropertyArrayInteger model = new AdditionalPropertyArrayInteger(); + + /** + * Model tests for AdditionalPropertyArrayInteger + */ + @Test + void testAdditionalPropertyArrayInteger() { + // TODO: test AdditionalPropertyArrayInteger + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyBooleanTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyBooleanTest.java new file mode 100644 index 000000000000..97bedd193adc --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyBooleanTest.java @@ -0,0 +1,34 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyBoolean + */ +class AdditionalPropertyBooleanTest { + private final AdditionalPropertyBoolean model = new AdditionalPropertyBoolean(); + + /** + * Model tests for AdditionalPropertyBoolean + */ + @Test + void testAdditionalPropertyBoolean() { + // TODO: test AdditionalPropertyBoolean + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyClassRefTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyClassRefTest.java new file mode 100644 index 000000000000..88c3a021060e --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyClassRefTest.java @@ -0,0 +1,119 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.AdditionalPropertyArrayAnyType; +import org.openapitools.client.model.AdditionalPropertyArrayInteger; +import org.openapitools.client.model.AdditionalPropertyBoolean; +import org.openapitools.client.model.AdditionalPropertyInteger; +import org.openapitools.client.model.AdditionalPropertyMapAnyType; +import org.openapitools.client.model.AdditionalPropertyMapString; +import org.openapitools.client.model.AdditionalPropertyNumber; +import org.openapitools.client.model.AdditionalPropertyString; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyClassRef + */ +class AdditionalPropertyClassRefTest { + private final AdditionalPropertyClassRef model = new AdditionalPropertyClassRef(); + + /** + * Model tests for AdditionalPropertyClassRef + */ + @Test + void testAdditionalPropertyClassRef() { + // TODO: test AdditionalPropertyClassRef + } + + /** + * Test the property 'mapString' + */ + @Test + void mapStringTest() { + // TODO: test mapString + } + + /** + * Test the property 'mapNumber' + */ + @Test + void mapNumberTest() { + // TODO: test mapNumber + } + + /** + * Test the property 'mapInteger' + */ + @Test + void mapIntegerTest() { + // TODO: test mapInteger + } + + /** + * Test the property 'mapBoolean' + */ + @Test + void mapBooleanTest() { + // TODO: test mapBoolean + } + + /** + * Test the property 'mapArrayInteger' + */ + @Test + void mapArrayIntegerTest() { + // TODO: test mapArrayInteger + } + + /** + * Test the property 'mapArrayAnytype' + */ + @Test + void mapArrayAnytypeTest() { + // TODO: test mapArrayAnytype + } + + /** + * Test the property 'mapMapString' + */ + @Test + void mapMapStringTest() { + // TODO: test mapMapString + } + + /** + * Test the property 'mapMapAnytype' + */ + @Test + void mapMapAnytypeTest() { + // TODO: test mapMapAnytype + } + + /** + * Test the property 'anytype1' + */ + @Test + void anytype1Test() { + // TODO: test anytype1 + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyIntegerTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyIntegerTest.java new file mode 100644 index 000000000000..1156ee279ba9 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyIntegerTest.java @@ -0,0 +1,34 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyInteger + */ +class AdditionalPropertyIntegerTest { + private final AdditionalPropertyInteger model = new AdditionalPropertyInteger(); + + /** + * Model tests for AdditionalPropertyInteger + */ + @Test + void testAdditionalPropertyInteger() { + // TODO: test AdditionalPropertyInteger + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapAnyTypeTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapAnyTypeTest.java new file mode 100644 index 000000000000..90bd376d3913 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapAnyTypeTest.java @@ -0,0 +1,35 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyMapAnyType + */ +class AdditionalPropertyMapAnyTypeTest { + private final AdditionalPropertyMapAnyType model = new AdditionalPropertyMapAnyType(); + + /** + * Model tests for AdditionalPropertyMapAnyType + */ + @Test + void testAdditionalPropertyMapAnyType() { + // TODO: test AdditionalPropertyMapAnyType + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapStringTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapStringTest.java new file mode 100644 index 000000000000..2ab5a7f5c9e9 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapStringTest.java @@ -0,0 +1,35 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyMapString + */ +class AdditionalPropertyMapStringTest { + private final AdditionalPropertyMapString model = new AdditionalPropertyMapString(); + + /** + * Model tests for AdditionalPropertyMapString + */ + @Test + void testAdditionalPropertyMapString() { + // TODO: test AdditionalPropertyMapString + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyNumberTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyNumberTest.java new file mode 100644 index 000000000000..11494a2b487d --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyNumberTest.java @@ -0,0 +1,35 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.math.BigDecimal; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyNumber + */ +class AdditionalPropertyNumberTest { + private final AdditionalPropertyNumber model = new AdditionalPropertyNumber(); + + /** + * Model tests for AdditionalPropertyNumber + */ + @Test + void testAdditionalPropertyNumber() { + // TODO: test AdditionalPropertyNumber + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyStringTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyStringTest.java new file mode 100644 index 000000000000..cda2eac70042 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyStringTest.java @@ -0,0 +1,34 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyString + */ +class AdditionalPropertyStringTest { + private final AdditionalPropertyString model = new AdditionalPropertyString(); + + /** + * Model tests for AdditionalPropertyString + */ + @Test + void testAdditionalPropertyString() { + // TODO: test AdditionalPropertyString + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AnimalTest.java new file mode 100644 index 000000000000..c00fc7564512 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AnimalTest.java @@ -0,0 +1,47 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for Animal + */ +class AnimalTest { + private final Animal model = new Animal(); + + /** + * Model tests for Animal + */ + @Test + void testAnimal() { + // TODO: test Animal + } + + /** + * Test the property 'className' + */ + @Test + void classNameTest() { + // TODO: test className + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java new file mode 100644 index 000000000000..f23a46dc7539 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java @@ -0,0 +1,68 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import org.openapitools.client.model.Animal; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for MixedPropertiesAndAdditionalPropertiesClass + */ +class MixedPropertiesAndAdditionalPropertiesClassTest { + private final MixedPropertiesAndAdditionalPropertiesClass model = new MixedPropertiesAndAdditionalPropertiesClass(); + + /** + * Model tests for MixedPropertiesAndAdditionalPropertiesClass + */ + @Test + void testMixedPropertiesAndAdditionalPropertiesClass() { + // TODO: test MixedPropertiesAndAdditionalPropertiesClass + } + + /** + * Test the property 'uuid' + */ + @Test + void uuidTest() { + // TODO: test uuid + } + + /** + * Test the property 'dateTime' + */ + @Test + void dateTimeTest() { + // TODO: test dateTime + } + + /** + * Test the property 'map' + */ + @Test + void mapTest() { + // TODO: test map + } + +} diff --git a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator-ignore b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES new file mode 100644 index 000000000000..a1e16aa7e276 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES @@ -0,0 +1,34 @@ +.openapi-generator-ignore +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/FakeApi.java +src/main/java/org/openapitools/api/FakeApiController.java +src/main/java/org/openapitools/configuration/HomeController.java +src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java +src/main/java/org/openapitools/model/AdditionalProperties.java +src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +src/main/java/org/openapitools/model/AdditionalPropertiesClassRef.java +src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +src/main/java/org/openapitools/model/AdditionalPropertiesString.java +src/main/java/org/openapitools/model/AdditionalPropertyArrayAnyType.java +src/main/java/org/openapitools/model/AdditionalPropertyArrayInteger.java +src/main/java/org/openapitools/model/AdditionalPropertyBoolean.java +src/main/java/org/openapitools/model/AdditionalPropertyClassRef.java +src/main/java/org/openapitools/model/AdditionalPropertyInteger.java +src/main/java/org/openapitools/model/AdditionalPropertyMapAnyType.java +src/main/java/org/openapitools/model/AdditionalPropertyMapString.java +src/main/java/org/openapitools/model/AdditionalPropertyNumber.java +src/main/java/org/openapitools/model/AdditionalPropertyString.java +src/main/java/org/openapitools/model/Animal.java +src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +src/main/resources/application.properties +src/main/resources/openapi.yaml +src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java diff --git a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/VERSION b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/VERSION new file mode 100644 index 000000000000..96cfbb19ae28 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.13.0-SNAPSHOT diff --git a/samples/server/petstore/springboot-generateAliasAsModel/README.md b/samples/server/petstore/springboot-generateAliasAsModel/README.md new file mode 100644 index 000000000000..9129047bc325 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/README.md @@ -0,0 +1,23 @@ +# OpenAPI generated server + +Spring Boot Server + +## 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. + +The underlying library integrating OpenAPI to Spring Boot is [springfox](https://github.com/springfox/springfox). +Springfox will generate an OpenAPI v2 (fka Swagger RESTful API Documentation Specification) specification based on the +generated Controller and Model classes. The specification is available to download using the following url: +http://localhost:8080/v2/api-docs/ + +**HEADS-UP**: Springfox is deprecated for removal in version 6.0.0 of openapi-generator. The project seems to be no longer +maintained (last commit is of Oct 14, 2020). It works with Spring Boot 2.5.x but not with 2.6. Spring Boot 2.5 is +supported until 2022-05-19. Users of openapi-generator should migrate to the springdoc documentation provider which is, +as an added bonus, OpenAPI v3 compatible. + + + +Start your server as a simple java application +Change default port value in application.properties \ No newline at end of file diff --git a/samples/server/petstore/springboot-generateAliasAsModel/pom.xml b/samples/server/petstore/springboot-generateAliasAsModel/pom.xml new file mode 100644 index 000000000000..d6f2f7cc7328 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/pom.xml @@ -0,0 +1,81 @@ + + 4.0.0 + org.openapitools + spring-boot-generateAliasAsModel + jar + spring-boot-generateAliasAsModel + 1.0.0 + + 1.8 + ${java.version} + ${java.version} + UTF-8 + 2.9.2 + + + org.springframework.boot + spring-boot-starter-parent + 2.5.14 + + + + src/main/java + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.data + spring-data-commons + + + + io.springfox + springfox-swagger2 + ${springfox.version} + + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + org.openapitools + jackson-databind-nullable + 0.2.6 + + + + org.springframework.boot + spring-boot-starter-validation + + + com.fasterxml.jackson.core + jackson-databind + + + org.springframework.boot + spring-boot-starter-test + test + + + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/OpenApiGeneratorApplication.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/OpenApiGeneratorApplication.java new file mode 100644 index 000000000000..97252a8a9402 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/OpenApiGeneratorApplication.java @@ -0,0 +1,30 @@ +package org.openapitools; + +import com.fasterxml.jackson.databind.Module; +import org.openapitools.jackson.nullable.JsonNullableModule; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.FilterType; +import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator; + +@SpringBootApplication( + nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class +) +@ComponentScan( + basePackages = {"org.openapitools", "org.openapitools.api" , "org.openapitools.configuration"}, + nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class +) +public class OpenApiGeneratorApplication { + + public static void main(String[] args) { + SpringApplication.run(OpenApiGeneratorApplication.class, args); + } + + @Bean(name = "org.openapitools.OpenApiGeneratorApplication.jsonNullableModule") + public Module jsonNullableModule() { + return new JsonNullableModule(); + } + +} \ No newline at end of file diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/RFC3339DateFormat.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/RFC3339DateFormat.java new file mode 100644 index 000000000000..bcd3936d8b34 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/RFC3339DateFormat.java @@ -0,0 +1,38 @@ +package org.openapitools; + +import com.fasterxml.jackson.databind.util.StdDateFormat; + +import java.text.DateFormat; +import java.text.FieldPosition; +import java.text.ParsePosition; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.TimeZone; + +public class RFC3339DateFormat extends DateFormat { + private static final long serialVersionUID = 1L; + private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); + + private final StdDateFormat fmt = new StdDateFormat() + .withTimeZone(TIMEZONE_Z) + .withColonInTimeZone(true); + + public RFC3339DateFormat() { + this.calendar = new GregorianCalendar(); + } + + @Override + public Date parse(String source, ParsePosition pos) { + return fmt.parse(source, pos); + } + + @Override + public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { + return fmt.format(date, toAppendTo, fieldPosition); + } + + @Override + public Object clone() { + return this; + } +} \ No newline at end of file diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/ApiUtil.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/ApiUtil.java new file mode 100644 index 000000000000..1245b1dd0ccf --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/ApiUtil.java @@ -0,0 +1,19 @@ +package org.openapitools.api; + +import org.springframework.web.context.request.NativeWebRequest; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +public class ApiUtil { + public static void setExampleResponse(NativeWebRequest req, String contentType, String example) { + try { + HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class); + res.setCharacterEncoding("UTF-8"); + res.addHeader("Content-Type", contentType); + res.getWriter().print(example); + } catch (IOException e) { + throw new RuntimeException(e); + } + } +} diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApi.java new file mode 100644 index 000000000000..f10893a786e5 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApi.java @@ -0,0 +1,63 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.13.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package org.openapitools.api; + +import org.openapitools.model.AdditionalProperties; +import io.swagger.annotations.*; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.Valid; +import javax.validation.constraints.*; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import javax.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +@Validated +@Api(value = "fake", description = "the fake API") +public interface FakeApi { + + default Optional getRequest() { + return Optional.empty(); + } + + /** + * POST /fake/additionalProperties-reference : test referenced additionalProperties + * + * + * @param additionalProperties request body (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "fake" }, + value = "test referenced additionalProperties", + nickname = "testAdditionalPropertiesReference", + notes = "" + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation") + }) + @RequestMapping( + method = RequestMethod.POST, + value = "/fake/additionalProperties-reference", + consumes = { "application/json" } + ) + + default ResponseEntity testAdditionalPropertiesReference( + @ApiParam(value = "request body", required = true) @Valid @RequestBody AdditionalProperties additionalProperties + ) { + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + +} diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApiController.java new file mode 100644 index 000000000000..29a6e56dc1e6 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApiController.java @@ -0,0 +1,46 @@ +package org.openapitools.api; + +import org.openapitools.model.AdditionalProperties; + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.context.request.NativeWebRequest; + +import javax.validation.constraints.*; +import javax.validation.Valid; + +import java.util.List; +import java.util.Map; +import java.util.Optional; +import javax.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +@Controller +@RequestMapping("${openapi.generateAliasAsModel.base-path:}") +public class FakeApiController implements FakeApi { + + private final NativeWebRequest request; + + @Autowired + public FakeApiController(NativeWebRequest request) { + this.request = request; + } + + @Override + public Optional getRequest() { + return Optional.ofNullable(request); + } + +} diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/HomeController.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/HomeController.java new file mode 100644 index 000000000000..707313504790 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/HomeController.java @@ -0,0 +1,13 @@ +package org.openapitools.configuration; + +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * Home redirection to OpenAPI api documentation + */ +@Controller +public class HomeController { + +} \ No newline at end of file diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java new file mode 100644 index 000000000000..009eaa9a22f2 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java @@ -0,0 +1,71 @@ +package org.openapitools.configuration; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import org.springframework.web.util.UriComponentsBuilder; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.paths.Paths; +import springfox.documentation.spring.web.paths.RelativePathProvider; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +import javax.annotation.Generated; +import javax.servlet.ServletContext; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +@Configuration +@EnableSwagger2 +public class SpringFoxConfiguration { + + ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("generateAliasAsModel") + .description("This spec is mainly for testing generateAliasAsModel and") + .license("") + .licenseUrl("http://unlicense.org") + .termsOfServiceUrl("") + .version("1.0.0") + .contact(new Contact("","", "")) + .build(); + } + + @Bean + public Docket customImplementation(ServletContext servletContext, @Value("${openapi.generateAliasAsModel.base-path:}") String basePath) { + return new Docket(DocumentationType.SWAGGER_2) + .select() + .apis(RequestHandlerSelectors.basePackage("org.openapitools.api")) + .build() + .pathProvider(new BasePathAwareRelativePathProvider(servletContext, basePath)) + .directModelSubstitute(java.time.LocalDate.class, java.sql.Date.class) + .directModelSubstitute(java.time.OffsetDateTime.class, java.util.Date.class) + .apiInfo(apiInfo()); + } + + class BasePathAwareRelativePathProvider extends RelativePathProvider { + private String basePath; + + public BasePathAwareRelativePathProvider(ServletContext servletContext, String basePath) { + super(servletContext); + this.basePath = basePath; + } + + @Override + protected String applicationPath() { + return Paths.removeAdjacentForwardSlashes(UriComponentsBuilder.fromPath(super.applicationPath()).path(basePath).build().toString()); + } + + @Override + public String getOperationPath(String operationPath) { + UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromPath("/"); + return Paths.removeAdjacentForwardSlashes( + uriComponentsBuilder.path(operationPath.replaceFirst("^" + basePath, "")).build().toString()); + } + } + +} diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalProperties.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalProperties.java new file mode 100644 index 000000000000..0661a2ed24ab --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalProperties.java @@ -0,0 +1,136 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.model.AdditionalPropertiesClass; +import org.openapitools.model.AdditionalPropertiesClassRef; +import org.openapitools.model.MixedPropertiesAndAdditionalPropertiesClass; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * AdditionalProperties + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalProperties { + + private @Nullable AdditionalPropertiesClassRef additionalPropertiesClassRef; + + private @Nullable AdditionalPropertiesClass additionalPropertiesClass; + + private @Nullable MixedPropertiesAndAdditionalPropertiesClass mixed; + + public AdditionalProperties additionalPropertiesClassRef(AdditionalPropertiesClassRef additionalPropertiesClassRef) { + this.additionalPropertiesClassRef = additionalPropertiesClassRef; + return this; + } + + /** + * Get additionalPropertiesClassRef + * @return additionalPropertiesClassRef + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("additionalPropertiesClassRef") + public AdditionalPropertiesClassRef getAdditionalPropertiesClassRef() { + return additionalPropertiesClassRef; + } + + public void setAdditionalPropertiesClassRef(AdditionalPropertiesClassRef additionalPropertiesClassRef) { + this.additionalPropertiesClassRef = additionalPropertiesClassRef; + } + + public AdditionalProperties additionalPropertiesClass(AdditionalPropertiesClass additionalPropertiesClass) { + this.additionalPropertiesClass = additionalPropertiesClass; + return this; + } + + /** + * Get additionalPropertiesClass + * @return additionalPropertiesClass + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("additionalPropertiesClass") + public AdditionalPropertiesClass getAdditionalPropertiesClass() { + return additionalPropertiesClass; + } + + public void setAdditionalPropertiesClass(AdditionalPropertiesClass additionalPropertiesClass) { + this.additionalPropertiesClass = additionalPropertiesClass; + } + + public AdditionalProperties mixed(MixedPropertiesAndAdditionalPropertiesClass mixed) { + this.mixed = mixed; + return this; + } + + /** + * Get mixed + * @return mixed + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("mixed") + public MixedPropertiesAndAdditionalPropertiesClass getMixed() { + return mixed; + } + + public void setMixed(MixedPropertiesAndAdditionalPropertiesClass mixed) { + this.mixed = mixed; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalProperties additionalProperties = (AdditionalProperties) o; + return Objects.equals(this.additionalPropertiesClassRef, additionalProperties.additionalPropertiesClassRef) && + Objects.equals(this.additionalPropertiesClass, additionalProperties.additionalPropertiesClass) && + Objects.equals(this.mixed, additionalProperties.mixed); + } + + @Override + public int hashCode() { + return Objects.hash(additionalPropertiesClassRef, additionalPropertiesClass, mixed); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalProperties {\n"); + sb.append(" additionalPropertiesClassRef: ").append(toIndentedString(additionalPropertiesClassRef)).append("\n"); + sb.append(" additionalPropertiesClass: ").append(toIndentedString(additionalPropertiesClass)).append("\n"); + sb.append(" mixed: ").append(toIndentedString(mixed)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java new file mode 100644 index 000000000000..708ff8488409 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -0,0 +1,129 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesAnyType + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesAnyType { + + private @Nullable String name; + + public AdditionalPropertiesAnyType name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; + return Objects.equals(this.name, additionalPropertiesAnyType.name) && + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesAnyType {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java new file mode 100644 index 000000000000..f9911831c038 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -0,0 +1,130 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesArray + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesArray { + + private @Nullable String name; + + public AdditionalPropertiesArray name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; + return Objects.equals(this.name, additionalPropertiesArray.name) && + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesArray {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java new file mode 100644 index 000000000000..fa1118e2b881 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -0,0 +1,129 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesBoolean + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesBoolean { + + private @Nullable String name; + + public AdditionalPropertiesBoolean name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; + return Objects.equals(this.name, additionalPropertiesBoolean.name) && + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesBoolean {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java new file mode 100644 index 000000000000..991c11f3c705 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -0,0 +1,415 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; +import org.springframework.lang.Nullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertiesClass + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesClass { + + @Valid + private Map mapString = new HashMap<>(); + + @Valid + private Map mapNumber = new HashMap<>(); + + @Valid + private Map mapInteger = new HashMap<>(); + + @Valid + private Map mapBoolean = new HashMap<>(); + + @Valid + private Map> mapArrayInteger = new HashMap<>(); + + @Valid + private Map> mapArrayAnytype = new HashMap<>(); + + @Valid + private Map> mapMapString = new HashMap<>(); + + @Valid + private Map> mapMapAnytype = new HashMap<>(); + + private @Nullable Object anytype1; + + private JsonNullable anytype2 = JsonNullable.undefined(); + + private @Nullable Object anytype3; + + public AdditionalPropertiesClass mapString(Map mapString) { + this.mapString = mapString; + return this; + } + + public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) { + if (this.mapString == null) { + this.mapString = new HashMap<>(); + } + this.mapString.put(key, mapStringItem); + return this; + } + + /** + * Get mapString + * @return mapString + */ + + @ApiModelProperty(value = "") + @JsonProperty("map_string") + public Map getMapString() { + return mapString; + } + + public void setMapString(Map mapString) { + this.mapString = mapString; + } + + public AdditionalPropertiesClass mapNumber(Map mapNumber) { + this.mapNumber = mapNumber; + return this; + } + + public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) { + if (this.mapNumber == null) { + this.mapNumber = new HashMap<>(); + } + this.mapNumber.put(key, mapNumberItem); + return this; + } + + /** + * Get mapNumber + * @return mapNumber + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_number") + public Map getMapNumber() { + return mapNumber; + } + + public void setMapNumber(Map mapNumber) { + this.mapNumber = mapNumber; + } + + public AdditionalPropertiesClass mapInteger(Map mapInteger) { + this.mapInteger = mapInteger; + return this; + } + + public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) { + if (this.mapInteger == null) { + this.mapInteger = new HashMap<>(); + } + this.mapInteger.put(key, mapIntegerItem); + return this; + } + + /** + * Get mapInteger + * @return mapInteger + */ + + @ApiModelProperty(value = "") + @JsonProperty("map_integer") + public Map getMapInteger() { + return mapInteger; + } + + public void setMapInteger(Map mapInteger) { + this.mapInteger = mapInteger; + } + + public AdditionalPropertiesClass mapBoolean(Map mapBoolean) { + this.mapBoolean = mapBoolean; + return this; + } + + public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) { + if (this.mapBoolean == null) { + this.mapBoolean = new HashMap<>(); + } + this.mapBoolean.put(key, mapBooleanItem); + return this; + } + + /** + * Get mapBoolean + * @return mapBoolean + */ + + @ApiModelProperty(value = "") + @JsonProperty("map_boolean") + public Map getMapBoolean() { + return mapBoolean; + } + + public void setMapBoolean(Map mapBoolean) { + this.mapBoolean = mapBoolean; + } + + public AdditionalPropertiesClass mapArrayInteger(Map> mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + return this; + } + + public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List mapArrayIntegerItem) { + if (this.mapArrayInteger == null) { + this.mapArrayInteger = new HashMap<>(); + } + this.mapArrayInteger.put(key, mapArrayIntegerItem); + return this; + } + + /** + * Get mapArrayInteger + * @return mapArrayInteger + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") + public Map> getMapArrayInteger() { + return mapArrayInteger; + } + + public void setMapArrayInteger(Map> mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + } + + public AdditionalPropertiesClass mapArrayAnytype(Map> mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + return this; + } + + public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List mapArrayAnytypeItem) { + if (this.mapArrayAnytype == null) { + this.mapArrayAnytype = new HashMap<>(); + } + this.mapArrayAnytype.put(key, mapArrayAnytypeItem); + return this; + } + + /** + * Get mapArrayAnytype + * @return mapArrayAnytype + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") + public Map> getMapArrayAnytype() { + return mapArrayAnytype; + } + + public void setMapArrayAnytype(Map> mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + } + + public AdditionalPropertiesClass mapMapString(Map> mapMapString) { + this.mapMapString = mapMapString; + return this; + } + + public AdditionalPropertiesClass putMapMapStringItem(String key, Map mapMapStringItem) { + if (this.mapMapString == null) { + this.mapMapString = new HashMap<>(); + } + this.mapMapString.put(key, mapMapStringItem); + return this; + } + + /** + * Get mapMapString + * @return mapMapString + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_map_string") + public Map> getMapMapString() { + return mapMapString; + } + + public void setMapMapString(Map> mapMapString) { + this.mapMapString = mapMapString; + } + + public AdditionalPropertiesClass mapMapAnytype(Map> mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + return this; + } + + public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map mapMapAnytypeItem) { + if (this.mapMapAnytype == null) { + this.mapMapAnytype = new HashMap<>(); + } + this.mapMapAnytype.put(key, mapMapAnytypeItem); + return this; + } + + /** + * Get mapMapAnytype + * @return mapMapAnytype + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") + public Map> getMapMapAnytype() { + return mapMapAnytype; + } + + public void setMapMapAnytype(Map> mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + } + + public AdditionalPropertiesClass anytype1(Object anytype1) { + this.anytype1 = anytype1; + return this; + } + + /** + * Get anytype1 + * @return anytype1 + */ + + @ApiModelProperty(value = "") + @JsonProperty("anytype_1") + public Object getAnytype1() { + return anytype1; + } + + public void setAnytype1(Object anytype1) { + this.anytype1 = anytype1; + } + + public AdditionalPropertiesClass anytype2(Object anytype2) { + this.anytype2 = JsonNullable.of(anytype2); + return this; + } + + /** + * Get anytype2 + * @return anytype2 + */ + + @ApiModelProperty(value = "") + @JsonProperty("anytype_2") + public JsonNullable getAnytype2() { + return anytype2; + } + + public void setAnytype2(JsonNullable anytype2) { + this.anytype2 = anytype2; + } + + public AdditionalPropertiesClass anytype3(Object anytype3) { + this.anytype3 = anytype3; + return this; + } + + /** + * Get anytype3 + * @return anytype3 + */ + + @ApiModelProperty(value = "") + @JsonProperty("anytype_3") + public Object getAnytype3() { + return anytype3; + } + + public void setAnytype3(Object anytype3) { + this.anytype3 = anytype3; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o; + return Objects.equals(this.mapString, additionalPropertiesClass.mapString) && + Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) && + Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) && + Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) && + Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) && + Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) && + Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && + Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && + Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && + Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesClass {\n"); + sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); + sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); + sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); + sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); + sb.append(" mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n"); + sb.append(" mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n"); + sb.append(" mapMapString: ").append(toIndentedString(mapMapString)).append("\n"); + sb.append(" mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n"); + sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); + sb.append(" anytype2: ").append(toIndentedString(anytype2)).append("\n"); + sb.append(" anytype3: ").append(toIndentedString(anytype3)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClassRef.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClassRef.java new file mode 100644 index 000000000000..e5c581f64232 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClassRef.java @@ -0,0 +1,185 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.model.AdditionalPropertiesBoolean; +import org.openapitools.model.AdditionalPropertiesInteger; +import org.openapitools.model.AdditionalPropertiesNumber; +import org.openapitools.model.AdditionalPropertiesString; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertiesClassRef + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesClassRef { + + private @Nullable AdditionalPropertiesString mapString; + + private @Nullable AdditionalPropertiesNumber mapNumber; + + private @Nullable AdditionalPropertiesInteger mapInteger; + + private @Nullable AdditionalPropertiesBoolean mapBoolean; + + private @Nullable Object anytype1; + + public AdditionalPropertiesClassRef mapString(AdditionalPropertiesString mapString) { + this.mapString = mapString; + return this; + } + + /** + * Get mapString + * @return mapString + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_string") + public AdditionalPropertiesString getMapString() { + return mapString; + } + + public void setMapString(AdditionalPropertiesString mapString) { + this.mapString = mapString; + } + + public AdditionalPropertiesClassRef mapNumber(AdditionalPropertiesNumber mapNumber) { + this.mapNumber = mapNumber; + return this; + } + + /** + * Get mapNumber + * @return mapNumber + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_number") + public AdditionalPropertiesNumber getMapNumber() { + return mapNumber; + } + + public void setMapNumber(AdditionalPropertiesNumber mapNumber) { + this.mapNumber = mapNumber; + } + + public AdditionalPropertiesClassRef mapInteger(AdditionalPropertiesInteger mapInteger) { + this.mapInteger = mapInteger; + return this; + } + + /** + * Get mapInteger + * @return mapInteger + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_integer") + public AdditionalPropertiesInteger getMapInteger() { + return mapInteger; + } + + public void setMapInteger(AdditionalPropertiesInteger mapInteger) { + this.mapInteger = mapInteger; + } + + public AdditionalPropertiesClassRef mapBoolean(AdditionalPropertiesBoolean mapBoolean) { + this.mapBoolean = mapBoolean; + return this; + } + + /** + * Get mapBoolean + * @return mapBoolean + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_boolean") + public AdditionalPropertiesBoolean getMapBoolean() { + return mapBoolean; + } + + public void setMapBoolean(AdditionalPropertiesBoolean mapBoolean) { + this.mapBoolean = mapBoolean; + } + + public AdditionalPropertiesClassRef anytype1(Object anytype1) { + this.anytype1 = anytype1; + return this; + } + + /** + * Get anytype1 + * @return anytype1 + */ + + @ApiModelProperty(value = "") + @JsonProperty("anytype_1") + public Object getAnytype1() { + return anytype1; + } + + public void setAnytype1(Object anytype1) { + this.anytype1 = anytype1; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesClassRef additionalPropertiesClassRef = (AdditionalPropertiesClassRef) o; + return Objects.equals(this.mapString, additionalPropertiesClassRef.mapString) && + Objects.equals(this.mapNumber, additionalPropertiesClassRef.mapNumber) && + Objects.equals(this.mapInteger, additionalPropertiesClassRef.mapInteger) && + Objects.equals(this.mapBoolean, additionalPropertiesClassRef.mapBoolean) && + Objects.equals(this.anytype1, additionalPropertiesClassRef.anytype1); + } + + @Override + public int hashCode() { + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, anytype1); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesClassRef {\n"); + sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); + sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); + sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); + sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); + sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java new file mode 100644 index 000000000000..58383a099825 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -0,0 +1,129 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesInteger + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesInteger { + + private @Nullable String name; + + public AdditionalPropertiesInteger name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; + return Objects.equals(this.name, additionalPropertiesInteger.name) && + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesInteger {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java new file mode 100644 index 000000000000..88d0bc11b6b0 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -0,0 +1,130 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesNumber + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesNumber { + + private @Nullable String name; + + public AdditionalPropertiesNumber name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; + return Objects.equals(this.name, additionalPropertiesNumber.name) && + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesNumber {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java new file mode 100644 index 000000000000..e093ccd8e35f --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -0,0 +1,130 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Map; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesObject + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesObject { + + private @Nullable String name; + + public AdditionalPropertiesObject name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; + return Objects.equals(this.name, additionalPropertiesObject.name) && + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesObject {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesString.java new file mode 100644 index 000000000000..21a023b3db12 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -0,0 +1,129 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesString + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesString { + + private @Nullable String name; + + public AdditionalPropertiesString name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; + return Objects.equals(this.name, additionalPropertiesString.name) && + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesString {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayAnyType.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayAnyType.java new file mode 100644 index 000000000000..216d6aeda774 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayAnyType.java @@ -0,0 +1,101 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyArrayAnyType + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyArrayAnyType { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyArrayAnyType putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyArrayAnyType additionalPropertyArrayAnyType = (AdditionalPropertyArrayAnyType) o; + return Objects.equals(this.additionalProperties, additionalPropertyArrayAnyType.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyArrayAnyType {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayInteger.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayInteger.java new file mode 100644 index 000000000000..1e066f55168b --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayInteger.java @@ -0,0 +1,101 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyArrayInteger + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyArrayInteger { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyArrayInteger putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyArrayInteger additionalPropertyArrayInteger = (AdditionalPropertyArrayInteger) o; + return Objects.equals(this.additionalProperties, additionalPropertyArrayInteger.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyArrayInteger {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyBoolean.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyBoolean.java new file mode 100644 index 000000000000..dcd459172392 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyBoolean.java @@ -0,0 +1,100 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyBoolean + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyBoolean { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyBoolean additionalPropertyBoolean = (AdditionalPropertyBoolean) o; + return Objects.equals(this.additionalProperties, additionalPropertyBoolean.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyBoolean {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyClassRef.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyClassRef.java new file mode 100644 index 000000000000..bd1366623e58 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyClassRef.java @@ -0,0 +1,285 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.model.AdditionalPropertyArrayAnyType; +import org.openapitools.model.AdditionalPropertyArrayInteger; +import org.openapitools.model.AdditionalPropertyBoolean; +import org.openapitools.model.AdditionalPropertyInteger; +import org.openapitools.model.AdditionalPropertyMapAnyType; +import org.openapitools.model.AdditionalPropertyMapString; +import org.openapitools.model.AdditionalPropertyNumber; +import org.openapitools.model.AdditionalPropertyString; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertyClassRef + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyClassRef { + + private @Nullable AdditionalPropertyString mapString; + + private @Nullable AdditionalPropertyNumber mapNumber; + + private @Nullable AdditionalPropertyInteger mapInteger; + + private @Nullable AdditionalPropertyBoolean mapBoolean; + + private @Nullable AdditionalPropertyArrayInteger mapArrayInteger; + + private @Nullable AdditionalPropertyArrayAnyType mapArrayAnytype; + + private @Nullable AdditionalPropertyMapString mapMapString; + + private @Nullable AdditionalPropertyMapAnyType mapMapAnytype; + + private @Nullable Object anytype1; + + public AdditionalPropertyClassRef mapString(AdditionalPropertyString mapString) { + this.mapString = mapString; + return this; + } + + /** + * Get mapString + * @return mapString + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_string") + public AdditionalPropertyString getMapString() { + return mapString; + } + + public void setMapString(AdditionalPropertyString mapString) { + this.mapString = mapString; + } + + public AdditionalPropertyClassRef mapNumber(AdditionalPropertyNumber mapNumber) { + this.mapNumber = mapNumber; + return this; + } + + /** + * Get mapNumber + * @return mapNumber + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_number") + public AdditionalPropertyNumber getMapNumber() { + return mapNumber; + } + + public void setMapNumber(AdditionalPropertyNumber mapNumber) { + this.mapNumber = mapNumber; + } + + public AdditionalPropertyClassRef mapInteger(AdditionalPropertyInteger mapInteger) { + this.mapInteger = mapInteger; + return this; + } + + /** + * Get mapInteger + * @return mapInteger + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_integer") + public AdditionalPropertyInteger getMapInteger() { + return mapInteger; + } + + public void setMapInteger(AdditionalPropertyInteger mapInteger) { + this.mapInteger = mapInteger; + } + + public AdditionalPropertyClassRef mapBoolean(AdditionalPropertyBoolean mapBoolean) { + this.mapBoolean = mapBoolean; + return this; + } + + /** + * Get mapBoolean + * @return mapBoolean + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_boolean") + public AdditionalPropertyBoolean getMapBoolean() { + return mapBoolean; + } + + public void setMapBoolean(AdditionalPropertyBoolean mapBoolean) { + this.mapBoolean = mapBoolean; + } + + public AdditionalPropertyClassRef mapArrayInteger(AdditionalPropertyArrayInteger mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + return this; + } + + /** + * Get mapArrayInteger + * @return mapArrayInteger + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") + public AdditionalPropertyArrayInteger getMapArrayInteger() { + return mapArrayInteger; + } + + public void setMapArrayInteger(AdditionalPropertyArrayInteger mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + } + + public AdditionalPropertyClassRef mapArrayAnytype(AdditionalPropertyArrayAnyType mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + return this; + } + + /** + * Get mapArrayAnytype + * @return mapArrayAnytype + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") + public AdditionalPropertyArrayAnyType getMapArrayAnytype() { + return mapArrayAnytype; + } + + public void setMapArrayAnytype(AdditionalPropertyArrayAnyType mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + } + + public AdditionalPropertyClassRef mapMapString(AdditionalPropertyMapString mapMapString) { + this.mapMapString = mapMapString; + return this; + } + + /** + * Get mapMapString + * @return mapMapString + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_map_string") + public AdditionalPropertyMapString getMapMapString() { + return mapMapString; + } + + public void setMapMapString(AdditionalPropertyMapString mapMapString) { + this.mapMapString = mapMapString; + } + + public AdditionalPropertyClassRef mapMapAnytype(AdditionalPropertyMapAnyType mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + return this; + } + + /** + * Get mapMapAnytype + * @return mapMapAnytype + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") + public AdditionalPropertyMapAnyType getMapMapAnytype() { + return mapMapAnytype; + } + + public void setMapMapAnytype(AdditionalPropertyMapAnyType mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + } + + public AdditionalPropertyClassRef anytype1(Object anytype1) { + this.anytype1 = anytype1; + return this; + } + + /** + * Get anytype1 + * @return anytype1 + */ + + @ApiModelProperty(value = "") + @JsonProperty("anytype_1") + public Object getAnytype1() { + return anytype1; + } + + public void setAnytype1(Object anytype1) { + this.anytype1 = anytype1; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyClassRef additionalPropertyClassRef = (AdditionalPropertyClassRef) o; + return Objects.equals(this.mapString, additionalPropertyClassRef.mapString) && + Objects.equals(this.mapNumber, additionalPropertyClassRef.mapNumber) && + Objects.equals(this.mapInteger, additionalPropertyClassRef.mapInteger) && + Objects.equals(this.mapBoolean, additionalPropertyClassRef.mapBoolean) && + Objects.equals(this.mapArrayInteger, additionalPropertyClassRef.mapArrayInteger) && + Objects.equals(this.mapArrayAnytype, additionalPropertyClassRef.mapArrayAnytype) && + Objects.equals(this.mapMapString, additionalPropertyClassRef.mapMapString) && + Objects.equals(this.mapMapAnytype, additionalPropertyClassRef.mapMapAnytype) && + Objects.equals(this.anytype1, additionalPropertyClassRef.anytype1); + } + + @Override + public int hashCode() { + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyClassRef {\n"); + sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); + sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); + sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); + sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); + sb.append(" mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n"); + sb.append(" mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n"); + sb.append(" mapMapString: ").append(toIndentedString(mapMapString)).append("\n"); + sb.append(" mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n"); + sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyInteger.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyInteger.java new file mode 100644 index 000000000000..6355ff41e835 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyInteger.java @@ -0,0 +1,100 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyInteger + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyInteger { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyInteger additionalPropertyInteger = (AdditionalPropertyInteger) o; + return Objects.equals(this.additionalProperties, additionalPropertyInteger.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyInteger {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapAnyType.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapAnyType.java new file mode 100644 index 000000000000..79e210d44758 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapAnyType.java @@ -0,0 +1,101 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyMapAnyType + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyMapAnyType { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyMapAnyType putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyMapAnyType additionalPropertyMapAnyType = (AdditionalPropertyMapAnyType) o; + return Objects.equals(this.additionalProperties, additionalPropertyMapAnyType.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyMapAnyType {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapString.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapString.java new file mode 100644 index 000000000000..799fe3d4324c --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapString.java @@ -0,0 +1,101 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyMapString + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyMapString { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyMapString putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyMapString additionalPropertyMapString = (AdditionalPropertyMapString) o; + return Objects.equals(this.additionalProperties, additionalPropertyMapString.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyMapString {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyNumber.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyNumber.java new file mode 100644 index 000000000000..1ddf06a84c74 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyNumber.java @@ -0,0 +1,101 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import java.math.BigDecimal; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyNumber + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyNumber { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyNumber additionalPropertyNumber = (AdditionalPropertyNumber) o; + return Objects.equals(this.additionalProperties, additionalPropertyNumber.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyNumber {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyString.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyString.java new file mode 100644 index 000000000000..cdf2dd090cba --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyString.java @@ -0,0 +1,100 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyString + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyString { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyString additionalPropertyString = (AdditionalPropertyString) o; + return Objects.equals(this.additionalProperties, additionalPropertyString.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyString {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/Animal.java new file mode 100644 index 000000000000..935329bfeeb7 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/Animal.java @@ -0,0 +1,85 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * Animal + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class Animal { + + private @Nullable String className; + + public Animal className(String className) { + this.className = className; + return this; + } + + /** + * Get className + * @return className + */ + + @ApiModelProperty(value = "") + @JsonProperty("className") + public String getClassName() { + return className; + } + + public void setClassName(String className) { + this.className = className; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Animal animal = (Animal) o; + return Objects.equals(this.className, animal.className); + } + + @Override + public int hashCode() { + return Objects.hash(className); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Animal {\n"); + sb.append(" className: ").append(toIndentedString(className)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java new file mode 100644 index 000000000000..8a3cf2931d7c --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -0,0 +1,149 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import org.openapitools.model.Animal; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * MixedPropertiesAndAdditionalPropertiesClass + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class MixedPropertiesAndAdditionalPropertiesClass { + + private @Nullable UUID uuid; + + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private @Nullable OffsetDateTime dateTime; + + @Valid + private Map map = new HashMap<>(); + + public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + this.uuid = uuid; + return this; + } + + /** + * Get uuid + * @return uuid + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("uuid") + public UUID getUuid() { + return uuid; + } + + public void setUuid(UUID uuid) { + this.uuid = uuid; + } + + public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + this.dateTime = dateTime; + return this; + } + + /** + * Get dateTime + * @return dateTime + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("dateTime") + public OffsetDateTime getDateTime() { + return dateTime; + } + + public void setDateTime(OffsetDateTime dateTime) { + this.dateTime = dateTime; + } + + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + this.map = map; + return this; + } + + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { + if (this.map == null) { + this.map = new HashMap<>(); + } + this.map.put(key, mapItem); + return this; + } + + /** + * Get map + * @return map + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map") + public Map getMap() { + return map; + } + + public void setMap(Map map) { + this.map = map; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; + return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && + Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && + Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + } + + @Override + public int hashCode() { + return Objects.hash(uuid, dateTime, map); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); + sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); + sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/application.properties b/samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/application.properties new file mode 100644 index 000000000000..7e90813e59b2 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/application.properties @@ -0,0 +1,3 @@ +server.port=8080 +spring.jackson.date-format=org.openapitools.RFC3339DateFormat +spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/openapi.yaml new file mode 100644 index 000000000000..ca8697223650 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/openapi.yaml @@ -0,0 +1,332 @@ +openapi: 3.0.0 +info: + description: This spec is mainly for testing generateAliasAsModel and + title: generateAliasAsModel + version: 1.0.0 +servers: +- url: / +paths: + /fake/additionalProperties-reference: + post: + description: "" + operationId: testAdditionalPropertiesReference + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/AdditionalProperties' + description: request body + required: true + responses: + "200": + description: successful operation + summary: test referenced additionalProperties + tags: + - fake + x-content-type: application/json + x-accepts: + - application/json + x-tags: + - tag: fake +components: + schemas: + AdditionalProperties: + example: + additionalPropertiesClass: + map_map_string: + key: + key: map_map_string + map_integer: + key: 6 + map_number: + key: 0.8008281904610115 + map_array_anytype: + key: + - "{}" + - "{}" + map_string: + key: map_string + anytype_2: "" + anytype_1: "{}" + map_boolean: + key: true + map_array_integer: + key: + - 1 + - 1 + map_map_anytype: + key: + key: "{}" + anytype_3: "{}" + mixed: + dateTime: 2000-01-23T04:56:07.000+00:00 + uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + map: + key: + className: className + additionalPropertiesClassRef: + map_integer: + name: name + map_number: + name: name + map_string: + name: name + anytype_1: "{}" + map_boolean: + name: name + properties: + additionalPropertiesClassRef: + $ref: '#/components/schemas/AdditionalPropertiesClassRef' + additionalPropertiesClass: + $ref: '#/components/schemas/AdditionalPropertiesClass' + mixed: + $ref: '#/components/schemas/MixedPropertiesAndAdditionalPropertiesClass' + type: object + AdditionalPropertiesClassRef: + example: + map_integer: + name: name + map_number: + name: name + map_string: + name: name + anytype_1: "{}" + map_boolean: + name: name + properties: + map_string: + $ref: '#/components/schemas/AdditionalPropertiesString' + map_number: + $ref: '#/components/schemas/AdditionalPropertiesNumber' + map_integer: + $ref: '#/components/schemas/AdditionalPropertiesInteger' + map_boolean: + $ref: '#/components/schemas/AdditionalPropertiesBoolean' + anytype_1: + type: object + type: object + AdditionalPropertyClassRef: + properties: + map_string: + $ref: '#/components/schemas/AdditionalPropertyString' + map_number: + $ref: '#/components/schemas/AdditionalPropertyNumber' + map_integer: + $ref: '#/components/schemas/AdditionalPropertyInteger' + map_boolean: + $ref: '#/components/schemas/AdditionalPropertyBoolean' + map_array_integer: + $ref: '#/components/schemas/AdditionalPropertyArrayInteger' + map_array_anytype: + $ref: '#/components/schemas/AdditionalPropertyArrayAnyType' + map_map_string: + $ref: '#/components/schemas/AdditionalPropertyMapString' + map_map_anytype: + $ref: '#/components/schemas/AdditionalPropertyMapAnyType' + anytype_1: + type: object + type: object + AdditionalPropertyString: + additionalProperties: + type: string + type: object + AdditionalPropertyNumber: + additionalProperties: + type: number + type: object + AdditionalPropertyInteger: + additionalProperties: + type: integer + type: object + AdditionalPropertyBoolean: + additionalProperties: + type: boolean + type: object + AdditionalPropertyArrayInteger: + additionalProperties: + items: + type: integer + type: array + type: object + AdditionalPropertyArrayAnyType: + additionalProperties: + items: + type: object + type: array + type: object + AdditionalPropertyMapString: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + AdditionalPropertyMapAnyType: + additionalProperties: + additionalProperties: + type: object + type: object + type: object + AnyType1: + type: object + AdditionalPropertiesClass: + example: + map_map_string: + key: + key: map_map_string + map_integer: + key: 6 + map_number: + key: 0.8008281904610115 + map_array_anytype: + key: + - "{}" + - "{}" + map_string: + key: map_string + anytype_2: "" + anytype_1: "{}" + map_boolean: + key: true + map_array_integer: + key: + - 1 + - 1 + map_map_anytype: + key: + key: "{}" + anytype_3: "{}" + properties: + map_string: + additionalProperties: + type: string + type: object + map_number: + additionalProperties: + type: number + type: object + map_integer: + additionalProperties: + type: integer + type: object + map_boolean: + additionalProperties: + type: boolean + type: object + map_array_integer: + additionalProperties: + items: + type: integer + type: array + type: object + map_array_anytype: + additionalProperties: + items: + type: object + type: array + type: object + map_map_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_map_anytype: + additionalProperties: + additionalProperties: + type: object + type: object + type: object + anytype_1: + type: object + anytype_2: {} + anytype_3: + properties: {} + type: object + type: object + AdditionalPropertiesString: + additionalProperties: + type: string + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesInteger: + additionalProperties: + type: integer + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesNumber: + additionalProperties: + type: number + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesBoolean: + additionalProperties: + type: boolean + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesArray: + additionalProperties: + items: + type: object + type: array + properties: + name: + type: string + type: object + AdditionalPropertiesObject: + additionalProperties: + additionalProperties: + type: object + type: object + properties: + name: + type: string + type: object + AdditionalPropertiesAnyType: + additionalProperties: + type: object + properties: + name: + type: string + type: object + MixedPropertiesAndAdditionalPropertiesClass: + example: + dateTime: 2000-01-23T04:56:07.000+00:00 + uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + map: + key: + className: className + properties: + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + Animal: + example: + className: className + properties: + className: + type: string + type: object diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java b/samples/server/petstore/springboot-generateAliasAsModel/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java new file mode 100644 index 000000000000..3681f67e7705 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java @@ -0,0 +1,13 @@ +package org.openapitools; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class OpenApiGeneratorApplicationTests { + + @Test + void contextLoads() { + } + +} \ No newline at end of file From d5dcfa65b96e009ab1e2485f1c7a3a78bc567ddf Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 11:03:10 +0100 Subject: [PATCH 10/47] Remove unused sample --- .../resources/3_0/additionalProperties.yaml | 66 ------------------- 1 file changed, 66 deletions(-) delete mode 100644 modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml diff --git a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml deleted file mode 100644 index d7e6cedb8f00..000000000000 --- a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml +++ /dev/null @@ -1,66 +0,0 @@ -openapi: 3.0.0 -info: - title: "test for additionalProperties" - version: 1.0.0 -paths: - /test: - get: - responses: - "200": - description: test - content: - application/json: - schema: - $ref: '#/components/schemas/Response' -components: - schemas: - Response: - type: object - properties: - inlineMap: - type: object - additionalProperties: - type: string - additionalPropertiesOnlyTypeObject: - $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeObject' - additionalPropertiesOnlyTypeString: - $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeString' - additionalPropertiesTypeObject: - $ref: '#/components/schemas/AdditionalPropertiesTypeObject' - additionalPropertiesTypeString: - $ref: '#/components/schemas/AdditionalPropertiesTypeString' - additionalPropertiesTrue: - $ref: '#/components/schemas/AdditionalPropertiesTrue' - additionalPropertiesOnlyTrue: - $ref: '#/components/schemas/AdditionalPropertiesOnlyTrue' - AdditionalPropertiesOnlyTypeObject: - type: object - additionalProperties: - type: object - AdditionalPropertiesOnlyTypeString: - type: object - additionalProperties: - type: string - AdditionalPropertiesTypeObject: - type: object - properties: - name: - type: string - additionalProperties: - type: object - AdditionalPropertiesTypeString: - type: object - properties: - name: - type: string - additionalProperties: - type: string - AdditionalPropertiesOnlyTrue: - type: object - additionalProperties: true - AdditionalPropertiesTrue: - type: object - properties: - name: - type: string - additionalProperties: true From 579cd8dbcef5efa34dd19f01e337e4b2fd387b41 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 11:48:21 +0100 Subject: [PATCH 11/47] Fix test for AdditionalProperties --- .../codegen/java/JavaClientCodegenTest.java | 4 +- .../resources/3_0/additionalProperties.yaml | 66 +++++++++++++++++++ 2 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 962f18b980e0..d006174fb516 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -41,7 +41,6 @@ import org.openapitools.codegen.model.OperationsMap; import org.openapitools.codegen.testutils.ConfigAssert; import org.testng.annotations.DataProvider; -import org.testng.annotations.Parameters; import org.testng.annotations.Test; import java.io.File; @@ -3516,7 +3515,7 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties)"); JavaFileAssert.assertThat(files.get("Response.java")).fileContains( - + "Map inlineMap = new HashMap<>();", "AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); } @@ -3558,7 +3557,6 @@ public void testAdditionalPropertiesWithGenerateAliasForMicroProfile() { "return Objects.hash(name, super.hashCode())"); JavaFileAssert.assertThat(files.get("Response.java")).fileContains( - "Map inlineMap = new HashMap<>();", "AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml new file mode 100644 index 000000000000..d7e6cedb8f00 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml @@ -0,0 +1,66 @@ +openapi: 3.0.0 +info: + title: "test for additionalProperties" + version: 1.0.0 +paths: + /test: + get: + responses: + "200": + description: test + content: + application/json: + schema: + $ref: '#/components/schemas/Response' +components: + schemas: + Response: + type: object + properties: + inlineMap: + type: object + additionalProperties: + type: string + additionalPropertiesOnlyTypeObject: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeObject' + additionalPropertiesOnlyTypeString: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeString' + additionalPropertiesTypeObject: + $ref: '#/components/schemas/AdditionalPropertiesTypeObject' + additionalPropertiesTypeString: + $ref: '#/components/schemas/AdditionalPropertiesTypeString' + additionalPropertiesTrue: + $ref: '#/components/schemas/AdditionalPropertiesTrue' + additionalPropertiesOnlyTrue: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTrue' + AdditionalPropertiesOnlyTypeObject: + type: object + additionalProperties: + type: object + AdditionalPropertiesOnlyTypeString: + type: object + additionalProperties: + type: string + AdditionalPropertiesTypeObject: + type: object + properties: + name: + type: string + additionalProperties: + type: object + AdditionalPropertiesTypeString: + type: object + properties: + name: + type: string + additionalProperties: + type: string + AdditionalPropertiesOnlyTrue: + type: object + additionalProperties: true + AdditionalPropertiesTrue: + type: object + properties: + name: + type: string + additionalProperties: true From 01a7e95b5e005070296e9c8563f0d2b52b6a38aa Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 12:03:48 +0100 Subject: [PATCH 12/47] Default is still new HashMap<>() --- .../org/openapitools/codegen/java/AbstractJavaCodegenTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java index 73bb96fe7eac..b85b45544691 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java @@ -552,7 +552,7 @@ public void toDefaultValueTest() { ModelUtils.setGenerateAliasAsModel(true); defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), schema); - Assert.assertNull(defaultValue); + Assert.assertEquals(defaultValue, "new HashMap<>()"); // Test default value for date format DateSchema dateSchema = new DateSchema(); From b30db6b37f85994aa44652986e57653cdc3fea36 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 12:18:22 +0100 Subject: [PATCH 13/47] Fix missing file in test --- .../org/openapitools/codegen/java/spring/SpringCodegenTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 0939e43012f5..2e844a0eac45 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5391,7 +5391,7 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash .setGeneratorName("spring") .setGenerateAliasAsModel(true) //.setInputSpec("src/test/resources/3_0/additionalProperties.yaml") - .setInputSpec("C:\\dev\\openapi-generator\\modules\\openapi-generator\\src\\test\\resources\\3_0\\petstore-with-fake-endpoints-models-for-testing.yaml") + .setInputSpec("C:\\dev\\openapi-generator\\modules\\openapi-generator\\src\\test\\resources\\3_0\\additionalProperties.yaml") .setOutputDir(output.toString().replace("\\", "/")); Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() From c5ad4d21e9c7b699bb91fd0f735d7d8f0261cdcc Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 12:46:23 +0100 Subject: [PATCH 14/47] Fix wrong windows path --- .../openapitools/codegen/java/spring/SpringCodegenTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 2e844a0eac45..f863ef7179d3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5390,8 +5390,7 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash final CodegenConfigurator configurator = new CodegenConfigurator() .setGeneratorName("spring") .setGenerateAliasAsModel(true) - //.setInputSpec("src/test/resources/3_0/additionalProperties.yaml") - .setInputSpec("C:\\dev\\openapi-generator\\modules\\openapi-generator\\src\\test\\resources\\3_0\\additionalProperties.yaml") + .setInputSpec("src/test/resources/3_0/additionalProperties.yaml") .setOutputDir(output.toString().replace("\\", "/")); Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() From 95b32fd00f2bd8baebc473e2519b359d834b51bb Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 13:05:03 +0100 Subject: [PATCH 15/47] Files includes FakeApiController --- .../springboot-generateAliasAsModel/.openapi-generator/FILES | 1 - 1 file changed, 1 deletion(-) diff --git a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES index a1e16aa7e276..bb35603695e3 100644 --- a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES @@ -1,4 +1,3 @@ -.openapi-generator-ignore README.md pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java From b317d386df5f0a0346cb6c51a4c2d58c9d06084f Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 13:49:08 +0100 Subject: [PATCH 16/47] Files includes FakeApiController --- generateSample.bat | 9 +++++++++ .../.openapi-generator/FILES | 1 + 2 files changed, 10 insertions(+) create mode 100644 generateSample.bat diff --git a/generateSample.bat b/generateSample.bat new file mode 100644 index 000000000000..731c33ffb12e --- /dev/null +++ b/generateSample.bat @@ -0,0 +1,9 @@ +set generatorcli=C:\dev\openapi-generator\modules\openapi-generator-cli\target\openapi-generator-cli.jar +set root=C:\dev\openapi-generator +rem "--include-base-dir" "%root%" +set files=java-* +rem set files=spring* +set files=spring-boot-gen* +rem files=java-resttemplate-generateAliasAsModel* +rem set files=spring* +java -ea -server -Duser.timezone=UTC -jar %generatorcli% batch --fail-fast -- bin/configs/%files% \ No newline at end of file diff --git a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES index bb35603695e3..a1e16aa7e276 100644 --- a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES @@ -1,3 +1,4 @@ +.openapi-generator-ignore README.md pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java From 523a992a67934aa5253efaf88d0c8cc792c720c9 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 13:50:59 +0100 Subject: [PATCH 17/47] Remove custom batch --- generateSample.bat | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 generateSample.bat diff --git a/generateSample.bat b/generateSample.bat deleted file mode 100644 index 731c33ffb12e..000000000000 --- a/generateSample.bat +++ /dev/null @@ -1,9 +0,0 @@ -set generatorcli=C:\dev\openapi-generator\modules\openapi-generator-cli\target\openapi-generator-cli.jar -set root=C:\dev\openapi-generator -rem "--include-base-dir" "%root%" -set files=java-* -rem set files=spring* -set files=spring-boot-gen* -rem files=java-resttemplate-generateAliasAsModel* -rem set files=spring* -java -ea -server -Duser.timezone=UTC -jar %generatorcli% batch --fail-fast -- bin/configs/%files% \ No newline at end of file From 95f22722df7e9d134554fe4010b464609f86afbd Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 14:59:06 +0100 Subject: [PATCH 18/47] Remove .git --- .../springboot-generateAliasAsModel/.openapi-generator/FILES | 2 -- 1 file changed, 2 deletions(-) diff --git a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES index a1e16aa7e276..86ac7e830992 100644 --- a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES @@ -1,11 +1,9 @@ -.openapi-generator-ignore 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/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalProperties.java From 8ead4b6e3f18bcc437a80fe8df68e5be7a945f8d Mon Sep 17 00:00:00 2001 From: Daniel Schreiber Date: Wed, 12 Mar 2025 09:22:49 +0100 Subject: [PATCH 19/47] [typescript-angular] fix: correctly serialize query params objects (#20850) fixes #20799 --- .../main/resources/typescript-angular/api.base.service.mustache | 2 +- .../builds/composed-schemas-tagged-unions/api.base.service.ts | 2 +- .../builds/composed-schemas/api.base.service.ts | 2 +- .../builds/default/api.base.service.ts | 2 +- .../builds/default/api.base.service.ts | 2 +- .../builds/default/api.base.service.ts | 2 +- .../builds/with-npm/api.base.service.ts | 2 +- .../builds/default/api.base.service.ts | 2 +- .../builds/default/api.base.service.ts | 2 +- .../builds/default/api.base.service.ts | 2 +- .../builds/with-npm/api.base.service.ts | 2 +- .../builds/default/api.base.service.ts | 2 +- .../api.base.service.ts | 2 +- .../builds/default/api.base.service.ts | 2 +- .../builds/default/api.base.service.ts | 2 +- .../builds/default/api.base.service.ts | 2 +- .../builds/default/api.base.service.ts | 2 +- .../builds/default/api.base.service.ts | 2 +- .../typescript-angular-v19/builds/default/api.base.service.ts | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/api.base.service.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/api.base.service.mustache index 1cf58d82be9a..92a07771a0e5 100644 --- a/modules/openapi-generator/src/main/resources/typescript-angular/api.base.service.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-angular/api.base.service.mustache @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api.base.service.ts b/samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api.base.service.ts index 0b8e5aa434c2..8184ceb97294 100644 --- a/samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api.base.service.ts +++ b/samples/client/others/typescript-angular/builds/composed-schemas-tagged-unions/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/others/typescript-angular/builds/composed-schemas/api.base.service.ts b/samples/client/others/typescript-angular/builds/composed-schemas/api.base.service.ts index 0b8e5aa434c2..8184ceb97294 100644 --- a/samples/client/others/typescript-angular/builds/composed-schemas/api.base.service.ts +++ b/samples/client/others/typescript-angular/builds/composed-schemas/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api.base.service.ts index 89d8f443b44c..82eaead92fe9 100644 --- a/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v12-oneOf/builds/default/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api.base.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/api.base.service.ts index 89d8f443b44c..82eaead92fe9 100644 --- a/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v13-oneOf/builds/default/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api.base.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v14-query-param-object-format/api.base.service.ts b/samples/client/petstore/typescript-angular-v14-query-param-object-format/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v14-query-param-object-format/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v14-query-param-object-format/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v15-provided-in-root/builds/default/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v16-provided-in-root/builds/default/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v17-provided-in-root/builds/default/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v18-provided-in-root/builds/default/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } diff --git a/samples/client/petstore/typescript-angular-v19/builds/default/api.base.service.ts b/samples/client/petstore/typescript-angular-v19/builds/default/api.base.service.ts index fd901a4f11e5..0743145a27c2 100644 --- a/samples/client/petstore/typescript-angular-v19/builds/default/api.base.service.ts +++ b/samples/client/petstore/typescript-angular-v19/builds/default/api.base.service.ts @@ -31,7 +31,7 @@ export class BaseService { protected addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams { // If the value is an object (but not a Date), recursively add its keys. if (typeof value === 'object' && !(value instanceof Date)) { - return this.addToHttpParamsRecursive(httpParams, value, key); + return this.addToHttpParamsRecursive(httpParams, value); } return this.addToHttpParamsRecursive(httpParams, value, key); } From 7d9e1ecc22ac35a7f2c273ae209bd813faf38867 Mon Sep 17 00:00:00 2001 From: Josh Keighley Date: Wed, 12 Mar 2025 08:35:36 +0000 Subject: [PATCH 20/47] Bump feign version to 13.5 from 10.12. (#20849) --- .../resources/Java/libraries/feign/build.gradle.mustache | 2 +- .../resources/Java/libraries/feign/build.sbt.mustache | 8 ++++---- samples/client/echo_api/java/feign-gson/build.gradle | 2 +- samples/client/echo_api/java/feign-gson/build.sbt | 6 +++--- .../client/petstore/java/feign-no-nullable/build.gradle | 2 +- samples/client/petstore/java/feign-no-nullable/build.sbt | 8 ++++---- samples/client/petstore/java/feign/build.gradle | 2 +- samples/client/petstore/java/feign/build.sbt | 8 ++++---- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache index 2b4e0340e7fc..ba05fdcb774d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache @@ -110,7 +110,7 @@ ext { jackson_databind_nullable_version = "0.2.6" {{/openApiNullable}} jakarta_annotation_version = "1.3.5" - feign_version = "10.12" + feign_version = "13.5" feign_form_version = "3.8.0" junit_version = "5.7.0" scribejava_version = "8.0.0" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache index 1a24b99f55d7..8646f92d96e7 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache @@ -11,13 +11,13 @@ lazy val root = (project in file(".")). libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.11" % "compile", "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile", - "io.github.openfeign" % "feign-core" % "10.12" % "compile", + "io.github.openfeign" % "feign-core" % "13.5" % "compile", {{#jackson}} - "io.github.openfeign" % "feign-jackson" % "10.12" % "compile", + "io.github.openfeign" % "feign-jackson" % "13.5" % "compile", {{/jackson}} - "io.github.openfeign" % "feign-slf4j" % "10.12" % "compile", + "io.github.openfeign" % "feign-slf4j" % "13.5" % "compile", "io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile", - "io.github.openfeign" % "feign-okhttp" % "10.12" % "compile", + "io.github.openfeign" % "feign-okhttp" % "13.5" % "compile", {{#jackson}} "com.fasterxml.jackson.core" % "jackson-core" % "2.17.1" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.17.1" % "compile", diff --git a/samples/client/echo_api/java/feign-gson/build.gradle b/samples/client/echo_api/java/feign-gson/build.gradle index aa74efa510c9..8ce798c575c4 100644 --- a/samples/client/echo_api/java/feign-gson/build.gradle +++ b/samples/client/echo_api/java/feign-gson/build.gradle @@ -104,7 +104,7 @@ ext { swagger_annotations_version = "1.6.11" jackson_databind_nullable_version = "0.2.6" jakarta_annotation_version = "1.3.5" - feign_version = "10.12" + feign_version = "13.5" feign_form_version = "3.8.0" junit_version = "5.7.0" scribejava_version = "8.0.0" diff --git a/samples/client/echo_api/java/feign-gson/build.sbt b/samples/client/echo_api/java/feign-gson/build.sbt index e6b7d9eecd85..65b364795904 100644 --- a/samples/client/echo_api/java/feign-gson/build.sbt +++ b/samples/client/echo_api/java/feign-gson/build.sbt @@ -11,10 +11,10 @@ lazy val root = (project in file(".")). libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.11" % "compile", "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile", - "io.github.openfeign" % "feign-core" % "10.12" % "compile", - "io.github.openfeign" % "feign-slf4j" % "10.12" % "compile", + "io.github.openfeign" % "feign-core" % "13.5" % "compile", + "io.github.openfeign" % "feign-slf4j" % "13.5" % "compile", "io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile", - "io.github.openfeign" % "feign-okhttp" % "10.12" % "compile", + "io.github.openfeign" % "feign-okhttp" % "13.5" % "compile", "com.github.scribejava" % "scribejava-core" % "8.0.0" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile", "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", diff --git a/samples/client/petstore/java/feign-no-nullable/build.gradle b/samples/client/petstore/java/feign-no-nullable/build.gradle index 7df6a10718df..3b3c185a1d13 100644 --- a/samples/client/petstore/java/feign-no-nullable/build.gradle +++ b/samples/client/petstore/java/feign-no-nullable/build.gradle @@ -105,7 +105,7 @@ ext { jackson_version = "2.17.1" jackson_databind_version = "2.17.1" jakarta_annotation_version = "1.3.5" - feign_version = "10.12" + feign_version = "13.5" feign_form_version = "3.8.0" junit_version = "5.7.0" scribejava_version = "8.0.0" diff --git a/samples/client/petstore/java/feign-no-nullable/build.sbt b/samples/client/petstore/java/feign-no-nullable/build.sbt index 1f85088e35a9..202c26e89221 100644 --- a/samples/client/petstore/java/feign-no-nullable/build.sbt +++ b/samples/client/petstore/java/feign-no-nullable/build.sbt @@ -11,11 +11,11 @@ lazy val root = (project in file(".")). libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.11" % "compile", "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile", - "io.github.openfeign" % "feign-core" % "10.12" % "compile", - "io.github.openfeign" % "feign-jackson" % "10.12" % "compile", - "io.github.openfeign" % "feign-slf4j" % "10.12" % "compile", + "io.github.openfeign" % "feign-core" % "13.5" % "compile", + "io.github.openfeign" % "feign-jackson" % "13.5" % "compile", + "io.github.openfeign" % "feign-slf4j" % "13.5" % "compile", "io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile", - "io.github.openfeign" % "feign-okhttp" % "10.12" % "compile", + "io.github.openfeign" % "feign-okhttp" % "13.5" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.17.1" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.17.1" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.17.1" % "compile", diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle index 5ccd73ddaf0b..07a486b9dad3 100644 --- a/samples/client/petstore/java/feign/build.gradle +++ b/samples/client/petstore/java/feign/build.gradle @@ -106,7 +106,7 @@ ext { jackson_databind_version = "2.17.1" jackson_databind_nullable_version = "0.2.6" jakarta_annotation_version = "1.3.5" - feign_version = "10.12" + feign_version = "13.5" feign_form_version = "3.8.0" junit_version = "5.7.0" scribejava_version = "8.0.0" diff --git a/samples/client/petstore/java/feign/build.sbt b/samples/client/petstore/java/feign/build.sbt index 30086a46ebcc..0fad7e2fa936 100644 --- a/samples/client/petstore/java/feign/build.sbt +++ b/samples/client/petstore/java/feign/build.sbt @@ -11,11 +11,11 @@ lazy val root = (project in file(".")). libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.6.11" % "compile", "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile", - "io.github.openfeign" % "feign-core" % "10.12" % "compile", - "io.github.openfeign" % "feign-jackson" % "10.12" % "compile", - "io.github.openfeign" % "feign-slf4j" % "10.12" % "compile", + "io.github.openfeign" % "feign-core" % "13.5" % "compile", + "io.github.openfeign" % "feign-jackson" % "13.5" % "compile", + "io.github.openfeign" % "feign-slf4j" % "13.5" % "compile", "io.github.openfeign.form" % "feign-form" % "3.8.0" % "compile", - "io.github.openfeign" % "feign-okhttp" % "10.12" % "compile", + "io.github.openfeign" % "feign-okhttp" % "13.5" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.17.1" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.17.1" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.17.1" % "compile", From 7f40ce0dd80d47c8874fbe7a094f2c5d30f48da0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20Ils=C3=B8?= Date: Wed, 12 Mar 2025 09:49:03 +0100 Subject: [PATCH 21/47] Use interfaces for Polly retry policies (#20821) This enables use of ResiliencePipelineBuilder which returns the interface when calling AsSyncPolicy / AsAsyncPolicy --- .../src/main/resources/csharp/RetryConfiguration.mustache | 8 ++++---- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/RetryConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/RetryConfiguration.mustache index 93ba14d93920..78f45b572a45 100644 --- a/modules/openapi-generator/src/main/resources/csharp/RetryConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/RetryConfiguration.mustache @@ -19,23 +19,23 @@ namespace {{packageName}}.Client /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } {{/useRestSharp}} {{#useHttpClient}} /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } {{/useHttpClient}} } } diff --git a/samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Client/RetryConfiguration.cs index f2120fba4af0..900c2c35e05e 100644 --- a/samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -22,11 +22,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } diff --git a/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/RetryConfiguration.cs index c02b5480e9dd..5966f7322781 100644 --- a/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs index 139ef334aa05..59bb944f3871 100644 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs index 139ef334aa05..59bb944f3871 100644 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } diff --git a/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/RetryConfiguration.cs index f9141a100059..500e02299dc7 100644 --- a/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } diff --git a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs index 7011f69e775a..e6080c67e845 100644 --- a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } diff --git a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs index 7011f69e775a..e6080c67e845 100644 --- a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } diff --git a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs index 7011f69e775a..e6080c67e845 100644 --- a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } diff --git a/samples/client/petstore/csharp/restsharp/net8/ParameterMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/ParameterMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs index db6fbad265ee..63165acf08de 100644 --- a/samples/client/petstore/csharp/restsharp/net8/ParameterMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/petstore/csharp/restsharp/net8/ParameterMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs index 7011f69e775a..e6080c67e845 100644 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } diff --git a/samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs index ca42aee633b5..79e39894fbe2 100644 --- a/samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } diff --git a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs index 7011f69e775a..e6080c67e845 100644 --- a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs index 7011f69e775a..e6080c67e845 100644 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs index 7011f69e775a..e6080c67e845 100644 --- a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } From e40f9e38018911df44f2310bbed0352fe65e2141 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 12 Mar 2025 18:18:16 +0800 Subject: [PATCH 22/47] update C# samples --- .../src/Org.OpenAPITools/Client/RetryConfiguration.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/RetryConfiguration.cs index f9141a100059..500e02299dc7 100644 --- a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/RetryConfiguration.cs +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/RetryConfiguration.cs @@ -21,11 +21,11 @@ public static class RetryConfiguration /// /// Retry policy /// - public static Policy RetryPolicy { get; set; } + public static ISyncPolicy RetryPolicy { get; set; } /// /// Async retry policy /// - public static AsyncPolicy AsyncRetryPolicy { get; set; } + public static IAsyncPolicy AsyncRetryPolicy { get; set; } } } From 3ab495a0aa094eb9b1c7a46aea0adca8de8deeb6 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 12 Mar 2025 20:28:18 +0800 Subject: [PATCH 23/47] Fix operationId mapping (#20846) * fix operationId mapping * add tests * minor change --- .../org/openapitools/codegen/DefaultCodegen.java | 12 ++++++------ .../openapitools/codegen/DefaultCodegenTest.java | 14 ++++++++++++++ .../src/test/resources/3_0/type-alias.yaml | 1 + 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index be35976665e2..3bb9d43238d5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -5657,6 +5657,7 @@ protected boolean isReservedWord(String word) { */ protected String getOrGenerateOperationId(Operation operation, String path, String httpMethod) { String operationId = operation.getOperationId(); + if (StringUtils.isBlank(operationId)) { String tmpPath = path; tmpPath = tmpPath.replaceAll("\\{", ""); @@ -5681,6 +5682,10 @@ protected String getOrGenerateOperationId(Operation operation, String path, Stri LOGGER.warn("Empty operationId found for path: {} {}. Renamed to auto-generated operationId: {}", httpMethod, path, operationId); } + if (operationIdNameMapping.containsKey(operationId)) { + return operationIdNameMapping.get(operationId); + } + // remove prefix in operationId if (removeOperationIdPrefix) { // The prefix is everything before the removeOperationIdPrefixCount occurrence of removeOperationIdPrefixDelimiter @@ -5693,13 +5698,8 @@ protected String getOrGenerateOperationId(Operation operation, String path, Stri operationId = String.join(removeOperationIdPrefixDelimiter, Arrays.copyOfRange(components, component_number, components.length)); } } - operationId = removeNonNameElementToCamelCase(operationId); - if (operationIdNameMapping.containsKey(operationId)) { - return operationIdNameMapping.get(operationId); - } else { - return toOperationId(operationId); - } + return toOperationId(removeNonNameElementToCamelCase(operationId)); } /** diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java index c01501af6ac7..4fe17e2dd39f 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java @@ -2326,6 +2326,20 @@ public void schemaMapping() { Assertions.assertEquals(codegenModel.vars.get(0).getBaseType(), "TypeAlias"); } + @Test + public void operationIdNameMapping() { + DefaultCodegen codegen = new DefaultCodegen(); + codegen.operationIdNameMapping.put("edge case !@# 123", "fix_edge_case"); + + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/3_0/type-alias.yaml", null, new ParseOptions()).getOpenAPI(); + codegen.setOpenAPI(openAPI); + + CodegenOperation codegenOperation = codegen.fromOperation("/type-alias", "get", openAPI.getPaths().get("/type-alias").getGet(), null); + Assertions.assertEquals(codegenOperation.operationId, "fix_edge_case"); + Assertions.assertEquals(codegen.getOrGenerateOperationId(openAPI.getPaths().get("/type-alias").getGet(), "/type-alias", "get"), "fix_edge_case"); + } + @Test public void modelWithPrefixDoNotContainInheritedVars() { DefaultCodegen codegen = new DefaultCodegen(); diff --git a/modules/openapi-generator/src/test/resources/3_0/type-alias.yaml b/modules/openapi-generator/src/test/resources/3_0/type-alias.yaml index 5ae62c68bc97..b2c506f63431 100644 --- a/modules/openapi-generator/src/test/resources/3_0/type-alias.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/type-alias.yaml @@ -6,6 +6,7 @@ info: paths: /type-alias: get: + operationId: edge case !@# 123 responses: 200: description: OK From 5c51ee49a28f02e010e02043bdb0c7f0e67a50f3 Mon Sep 17 00:00:00 2001 From: Pietro Bongiovanni Date: Thu, 13 Mar 2025 11:45:50 +0100 Subject: [PATCH 24/47] [Rust Server] Bump up env_logger to 0.11 (#20865) * Bump up env_logger to 0.11 * regenerate examples * regenerate examples --- .../src/main/resources/rust-server/Cargo.mustache | 2 +- .../server/petstore/rust-server/output/multipart-v3/Cargo.toml | 2 +- .../server/petstore/rust-server/output/no-example-v3/Cargo.toml | 2 +- .../server/petstore/rust-server/output/openapi-v3/Cargo.toml | 2 +- samples/server/petstore/rust-server/output/ops-v3/Cargo.toml | 2 +- .../petstore-with-fake-endpoints-models-for-testing/Cargo.toml | 2 +- .../petstore/rust-server/output/ping-bearer-auth/Cargo.toml | 2 +- .../petstore/rust-server/output/rust-server-test/Cargo.toml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache b/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache index 8d465eb50d86..cec9e012796a 100644 --- a/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache +++ b/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache @@ -154,7 +154,7 @@ jsonwebtoken = { version = "9.3.0", optional = false } [dev-dependencies] clap = "2.25" -env_logger = "0.7" +env_logger = "0.11" tokio = { version = "1.14", features = ["full"] } native-tls = "0.2" diff --git a/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml b/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml index 444e251bab85..c17bc7e481fd 100644 --- a/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml +++ b/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml @@ -84,7 +84,7 @@ jsonwebtoken = { version = "9.3.0", optional = false } [dev-dependencies] clap = "2.25" -env_logger = "0.7" +env_logger = "0.11" tokio = { version = "1.14", features = ["full"] } native-tls = "0.2" diff --git a/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml b/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml index 1f1e452d0471..4315116e7edf 100644 --- a/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml +++ b/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml @@ -74,7 +74,7 @@ jsonwebtoken = { version = "9.3.0", optional = false } [dev-dependencies] clap = "2.25" -env_logger = "0.7" +env_logger = "0.11" tokio = { version = "1.14", features = ["full"] } native-tls = "0.2" diff --git a/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml b/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml index a1cf21cbf974..4f8d249eb265 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml +++ b/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml @@ -82,7 +82,7 @@ jsonwebtoken = { version = "9.3.0", optional = false } [dev-dependencies] clap = "2.25" -env_logger = "0.7" +env_logger = "0.11" tokio = { version = "1.14", features = ["full"] } native-tls = "0.2" diff --git a/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml b/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml index fc19dc60a482..0c33be7b5ea2 100644 --- a/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml +++ b/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml @@ -74,7 +74,7 @@ jsonwebtoken = { version = "9.3.0", optional = false } [dev-dependencies] clap = "2.25" -env_logger = "0.7" +env_logger = "0.11" tokio = { version = "1.14", features = ["full"] } native-tls = "0.2" diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml index db8bccb72c4f..0c809c91fdd6 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml @@ -88,7 +88,7 @@ jsonwebtoken = { version = "9.3.0", optional = false } [dev-dependencies] clap = "2.25" -env_logger = "0.7" +env_logger = "0.11" tokio = { version = "1.14", features = ["full"] } native-tls = "0.2" diff --git a/samples/server/petstore/rust-server/output/ping-bearer-auth/Cargo.toml b/samples/server/petstore/rust-server/output/ping-bearer-auth/Cargo.toml index db9f608a7419..c8e60c539bba 100644 --- a/samples/server/petstore/rust-server/output/ping-bearer-auth/Cargo.toml +++ b/samples/server/petstore/rust-server/output/ping-bearer-auth/Cargo.toml @@ -74,7 +74,7 @@ jsonwebtoken = { version = "9.3.0", optional = false } [dev-dependencies] clap = "2.25" -env_logger = "0.7" +env_logger = "0.11" tokio = { version = "1.14", features = ["full"] } native-tls = "0.2" diff --git a/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml b/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml index 730e5121bb17..f85aaea14517 100644 --- a/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml +++ b/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml @@ -74,7 +74,7 @@ jsonwebtoken = { version = "9.3.0", optional = false } [dev-dependencies] clap = "2.25" -env_logger = "0.7" +env_logger = "0.11" tokio = { version = "1.14", features = ["full"] } native-tls = "0.2" From a3fb8f59f81168d7590767d732a27df2e2ebc939 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Mar 2025 18:47:34 +0800 Subject: [PATCH 25/47] Bump dorny/test-reporter from 1 to 2 (#20862) Bumps [dorny/test-reporter](https://github.com/dorny/test-reporter) from 1 to 2. - [Release notes](https://github.com/dorny/test-reporter/releases) - [Changelog](https://github.com/dorny/test-reporter/blob/main/CHANGELOG.md) - [Commits](https://github.com/dorny/test-reporter/compare/v1...v2) --- updated-dependencies: - dependency-name: dorny/test-reporter dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/openapi-generator-test-results.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/openapi-generator-test-results.yaml b/.github/workflows/openapi-generator-test-results.yaml index f246b16c36b1..4df154ea16d3 100644 --- a/.github/workflows/openapi-generator-test-results.yaml +++ b/.github/workflows/openapi-generator-test-results.yaml @@ -11,7 +11,7 @@ jobs: report: runs-on: ubuntu-latest steps: - - uses: dorny/test-reporter@v1 + - uses: dorny/test-reporter@v2 with: artifact: surefire-test-results name: JUnit Test results From 1c1365513f8ff1c3f4d067f5a06ba516ecb98106 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Mar 2025 23:26:24 +0800 Subject: [PATCH 26/47] Bump @babel/helpers from 7.20.13 to 7.26.10 in /website (#20867) Bumps [@babel/helpers](https://github.com/babel/babel/tree/HEAD/packages/babel-helpers) from 7.20.13 to 7.26.10. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.26.10/packages/babel-helpers) --- updated-dependencies: - dependency-name: "@babel/helpers" dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- website/yarn.lock | 56 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/website/yarn.lock b/website/yarn.lock index 228d89d5e9ed..a5a3df17c6f3 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -145,6 +145,15 @@ dependencies: "@babel/highlight" "^7.18.6" +"@babel/code-frame@^7.26.2": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85" + integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ== + dependencies: + "@babel/helper-validator-identifier" "^7.25.9" + js-tokens "^4.0.0" + picocolors "^1.0.0" + "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5": version "7.20.14" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.14.tgz#4106fc8b755f3e3ee0a0a7c27dde5de1d2b2baf8" @@ -382,11 +391,21 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== +"@babel/helper-string-parser@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" + integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== + "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": version "7.19.1" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== +"@babel/helper-validator-identifier@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" + integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== + "@babel/helper-validator-option@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" @@ -403,13 +422,12 @@ "@babel/types" "^7.20.5" "@babel/helpers@^7.12.5", "@babel/helpers@^7.20.7": - version "7.20.13" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.13.tgz#e3cb731fb70dc5337134cadc24cbbad31cc87ad2" - integrity sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg== + version "7.26.10" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.10.tgz#6baea3cd62ec2d0c1068778d63cb1314f6637384" + integrity sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g== dependencies: - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.13" - "@babel/types" "^7.20.7" + "@babel/template" "^7.26.9" + "@babel/types" "^7.26.10" "@babel/highlight@^7.18.6": version "7.18.6" @@ -425,6 +443,13 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.13.tgz#ddf1eb5a813588d2fb1692b70c6fce75b945c088" integrity sha512-gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw== +"@babel/parser@^7.26.9": + version "7.26.10" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.10.tgz#e9bdb82f14b97df6569b0b038edd436839c57749" + integrity sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA== + dependencies: + "@babel/types" "^7.26.10" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2" @@ -1154,7 +1179,16 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/traverse@^7.12.9", "@babel/traverse@^7.18.8", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.13", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7": +"@babel/template@^7.26.9": + version "7.26.9" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.26.9.tgz#4577ad3ddf43d194528cff4e1fa6b232fa609bb2" + integrity sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA== + dependencies: + "@babel/code-frame" "^7.26.2" + "@babel/parser" "^7.26.9" + "@babel/types" "^7.26.9" + +"@babel/traverse@^7.12.9", "@babel/traverse@^7.18.8", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7": version "7.20.13" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.13.tgz#817c1ba13d11accca89478bd5481b2d168d07473" integrity sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ== @@ -1179,6 +1213,14 @@ "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" +"@babel/types@^7.26.10", "@babel/types@^7.26.9": + version "7.26.10" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.10.tgz#396382f6335bd4feb65741eacfc808218f859259" + integrity sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ== + dependencies: + "@babel/helper-string-parser" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@colors/colors@1.5.0": version "1.5.0" resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" From b1f572e116c8a6c694881af380e622f67fb34848 Mon Sep 17 00:00:00 2001 From: Jarangutan <53702919+jarangutan@users.noreply.github.com> Date: Sat, 15 Mar 2025 09:27:56 -0400 Subject: [PATCH 27/47] [go-server] move errMsg helpers to helpers file (#20876) --- .../src/main/resources/go-server/helpers.mustache | 4 ++++ .../src/main/resources/go-server/routers.mustache | 4 ---- samples/openapi3/server/petstore/go/go-petstore/go/helpers.go | 4 ++++ samples/openapi3/server/petstore/go/go-petstore/go/routers.go | 4 ---- .../server/others/go-server/no-body-path-params/go/helpers.go | 4 ++++ .../server/others/go-server/no-body-path-params/go/routers.go | 4 ---- samples/server/petstore/go-api-server/go/helpers.go | 4 ++++ samples/server/petstore/go-api-server/go/routers.go | 4 ---- samples/server/petstore/go-chi-server/go/helpers.go | 4 ++++ samples/server/petstore/go-chi-server/go/routers.go | 4 ---- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/go-server/helpers.mustache b/modules/openapi-generator/src/main/resources/go-server/helpers.mustache index 9a47f81c7dae..b50fd0176d79 100644 --- a/modules/openapi-generator/src/main/resources/go-server/helpers.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/helpers.mustache @@ -15,6 +15,10 @@ import ( "time" ) +const errMsgRequiredMissing = "required parameter is missing" +const errMsgMinValueConstraint = "provided parameter is not respecting minimum value constraint" +const errMsgMaxValueConstraint = "provided parameter is not respecting maximum value constraint" + // Response return a ImplResponse struct filled func Response(code int, body interface{}) ImplResponse { return ImplResponse { diff --git a/modules/openapi-generator/src/main/resources/go-server/routers.mustache b/modules/openapi-generator/src/main/resources/go-server/routers.mustache index 0e10f7b97ca9..8eb5eac7b5a7 100644 --- a/modules/openapi-generator/src/main/resources/go-server/routers.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/routers.mustache @@ -34,10 +34,6 @@ type Router interface { Routes() Routes } -const errMsgRequiredMissing = "required parameter is missing" -const errMsgMinValueConstraint = "provided parameter is not respecting minimum value constraint" -const errMsgMaxValueConstraint = "provided parameter is not respecting maximum value constraint" - // NewRouter creates a new router for any number of api routers func NewRouter(routers ...Router) {{#routers}}{{#mux}}*mux.Router{{/mux}}{{#chi}}chi.Router{{/chi}}{{/routers}} { {{#routers}} diff --git a/samples/openapi3/server/petstore/go/go-petstore/go/helpers.go b/samples/openapi3/server/petstore/go/go-petstore/go/helpers.go index 6f7103489034..6f0e318d8e1f 100644 --- a/samples/openapi3/server/petstore/go/go-petstore/go/helpers.go +++ b/samples/openapi3/server/petstore/go/go-petstore/go/helpers.go @@ -24,6 +24,10 @@ import ( "time" ) +const errMsgRequiredMissing = "required parameter is missing" +const errMsgMinValueConstraint = "provided parameter is not respecting minimum value constraint" +const errMsgMaxValueConstraint = "provided parameter is not respecting maximum value constraint" + // Response return a ImplResponse struct filled func Response(code int, body interface{}) ImplResponse { return ImplResponse { diff --git a/samples/openapi3/server/petstore/go/go-petstore/go/routers.go b/samples/openapi3/server/petstore/go/go-petstore/go/routers.go index 438895d1afec..392e3598b380 100644 --- a/samples/openapi3/server/petstore/go/go-petstore/go/routers.go +++ b/samples/openapi3/server/petstore/go/go-petstore/go/routers.go @@ -30,10 +30,6 @@ type Router interface { Routes() Routes } -const errMsgRequiredMissing = "required parameter is missing" -const errMsgMinValueConstraint = "provided parameter is not respecting minimum value constraint" -const errMsgMaxValueConstraint = "provided parameter is not respecting maximum value constraint" - // NewRouter creates a new router for any number of api routers func NewRouter(routers ...Router) chi.Router { router := chi.NewRouter() diff --git a/samples/server/others/go-server/no-body-path-params/go/helpers.go b/samples/server/others/go-server/no-body-path-params/go/helpers.go index 1306a51d3d66..a4df01617325 100644 --- a/samples/server/others/go-server/no-body-path-params/go/helpers.go +++ b/samples/server/others/go-server/no-body-path-params/go/helpers.go @@ -24,6 +24,10 @@ import ( "time" ) +const errMsgRequiredMissing = "required parameter is missing" +const errMsgMinValueConstraint = "provided parameter is not respecting minimum value constraint" +const errMsgMaxValueConstraint = "provided parameter is not respecting maximum value constraint" + // Response return a ImplResponse struct filled func Response(code int, body interface{}) ImplResponse { return ImplResponse { diff --git a/samples/server/others/go-server/no-body-path-params/go/routers.go b/samples/server/others/go-server/no-body-path-params/go/routers.go index d89a1de60ce2..b03b76a1354b 100644 --- a/samples/server/others/go-server/no-body-path-params/go/routers.go +++ b/samples/server/others/go-server/no-body-path-params/go/routers.go @@ -30,10 +30,6 @@ type Router interface { Routes() Routes } -const errMsgRequiredMissing = "required parameter is missing" -const errMsgMinValueConstraint = "provided parameter is not respecting minimum value constraint" -const errMsgMaxValueConstraint = "provided parameter is not respecting maximum value constraint" - // NewRouter creates a new router for any number of api routers func NewRouter(routers ...Router) *mux.Router { router := mux.NewRouter().StrictSlash(true) diff --git a/samples/server/petstore/go-api-server/go/helpers.go b/samples/server/petstore/go-api-server/go/helpers.go index 6f7103489034..6f0e318d8e1f 100644 --- a/samples/server/petstore/go-api-server/go/helpers.go +++ b/samples/server/petstore/go-api-server/go/helpers.go @@ -24,6 +24,10 @@ import ( "time" ) +const errMsgRequiredMissing = "required parameter is missing" +const errMsgMinValueConstraint = "provided parameter is not respecting minimum value constraint" +const errMsgMaxValueConstraint = "provided parameter is not respecting maximum value constraint" + // Response return a ImplResponse struct filled func Response(code int, body interface{}) ImplResponse { return ImplResponse { diff --git a/samples/server/petstore/go-api-server/go/routers.go b/samples/server/petstore/go-api-server/go/routers.go index cbb3a397f4a9..d16a9e0a13bc 100644 --- a/samples/server/petstore/go-api-server/go/routers.go +++ b/samples/server/petstore/go-api-server/go/routers.go @@ -30,10 +30,6 @@ type Router interface { Routes() Routes } -const errMsgRequiredMissing = "required parameter is missing" -const errMsgMinValueConstraint = "provided parameter is not respecting minimum value constraint" -const errMsgMaxValueConstraint = "provided parameter is not respecting maximum value constraint" - // NewRouter creates a new router for any number of api routers func NewRouter(routers ...Router) *mux.Router { router := mux.NewRouter().StrictSlash(true) diff --git a/samples/server/petstore/go-chi-server/go/helpers.go b/samples/server/petstore/go-chi-server/go/helpers.go index 6f7103489034..6f0e318d8e1f 100644 --- a/samples/server/petstore/go-chi-server/go/helpers.go +++ b/samples/server/petstore/go-chi-server/go/helpers.go @@ -24,6 +24,10 @@ import ( "time" ) +const errMsgRequiredMissing = "required parameter is missing" +const errMsgMinValueConstraint = "provided parameter is not respecting minimum value constraint" +const errMsgMaxValueConstraint = "provided parameter is not respecting maximum value constraint" + // Response return a ImplResponse struct filled func Response(code int, body interface{}) ImplResponse { return ImplResponse { diff --git a/samples/server/petstore/go-chi-server/go/routers.go b/samples/server/petstore/go-chi-server/go/routers.go index 438895d1afec..392e3598b380 100644 --- a/samples/server/petstore/go-chi-server/go/routers.go +++ b/samples/server/petstore/go-chi-server/go/routers.go @@ -30,10 +30,6 @@ type Router interface { Routes() Routes } -const errMsgRequiredMissing = "required parameter is missing" -const errMsgMinValueConstraint = "provided parameter is not respecting minimum value constraint" -const errMsgMaxValueConstraint = "provided parameter is not respecting maximum value constraint" - // NewRouter creates a new router for any number of api routers func NewRouter(routers ...Router) chi.Router { router := chi.NewRouter() From 89f2fac7f4536ffb5fb1d963e0ef5697d3577d27 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 16 Mar 2025 11:13:48 +0100 Subject: [PATCH 28/47] fix indentation --- .../src/test/resources/3_0/additionalProperties.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml index d7e6cedb8f00..0c8e6d4f3872 100644 --- a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml @@ -31,8 +31,8 @@ components: $ref: '#/components/schemas/AdditionalPropertiesTypeString' additionalPropertiesTrue: $ref: '#/components/schemas/AdditionalPropertiesTrue' - additionalPropertiesOnlyTrue: - $ref: '#/components/schemas/AdditionalPropertiesOnlyTrue' + additionalPropertiesOnlyTrue: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTrue' AdditionalPropertiesOnlyTypeObject: type: object additionalProperties: From a5ff8a0937f039e1ec26672f26b8356949bf0c09 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 16 Mar 2025 11:14:13 +0100 Subject: [PATCH 29/47] Add handling of hashCode for additionalProperties --- .../src/main/resources/Java/libraries/native/pojo.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache index daa3ee0df4d8..428a8282a37b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache @@ -306,7 +306,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} From 984a6f9b186bef410f58ddc64f8c454b64f861ef Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sat, 8 Mar 2025 20:03:42 +0100 Subject: [PATCH 30/47] Fix hashCode for additionalProperties --- .../Java/libraries/feign/pojo.mustache | 2 +- .../microprofile/pojoOverrides.mustache | 2 +- .../Java/libraries/resttemplate/pojo.mustache | 2 +- .../codegen/java/JavaClientCodegenTest.java | 30 +++++++++++++++++++ .../java/spring/SpringCodegenTest.java | 15 ++++++++++ .../resources/3_0/additionalProperties.yaml | 20 +++++++++++++ 6 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache index 76f119eb4ef7..a5bcc87bd928 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache @@ -280,7 +280,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache index f0fbb0b200e8..28fdf0da2f1b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache @@ -28,7 +28,7 @@ return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache index 192b7014c16a..79d8b0e63cd0 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache @@ -321,7 +321,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 254288edc2b8..cc02e356a12d 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -41,6 +41,7 @@ import org.openapitools.codegen.model.OperationsMap; import org.openapitools.codegen.testutils.ConfigAssert; import org.testng.annotations.DataProvider; +import org.testng.annotations.Parameters; import org.testng.annotations.Test; import java.io.File; @@ -3476,4 +3477,33 @@ public void testEnumWithImplements() { JavaFileAssert.assertThat(files.get("Type.java")).fileContains("Type implements java.io.Serializable {"); } + + @DataProvider(name = "javaClientLibrariesForHashCodeTest") + public Object[][] javaClientLibraries() { + return new Object[][] { + {JavaClientCodegen.RESTTEMPLATE, "Objects.hash(additionalProperties)" }, + {JavaClientCodegen.NATIVE, "Objects.hash(super.hashCode(), additionalProperties)"}, + {JavaClientCodegen.OKHTTP_GSON, "Objects.hash(additionalProperties)" }, + {JavaClientCodegen.MICROPROFILE, "Objects.hash(super.hashCode(), additionalProperties)" }, + {JavaClientCodegen.JERSEY2, "Objects.hash(additionalProperties)" }, + {JavaClientCodegen.JERSEY3, "Objects.hash(additionalProperties)" }, + {JavaClientCodegen.FEIGN, "Objects.hash(additionalProperties)" }, + }; + } + + @Test(dataProvider = "javaClientLibrariesForHashCodeTest") + public void testAdditionalPropertiesWithGnerateAliasAsModelGenerateCorrectHashCode(String library, String hashCode) { + final Path output = newTempFolder(); + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("java") + .setGenerateAliasAsModel(true) + .setLibrary(library) + .setInputSpec("src/test/resources/3_0/additionalProperties.yaml") + .setOutputDir(output.toString().replace("\\", "/")); + + Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() + .stream().collect(Collectors.toMap(File::getName, Function.identity())); + + JavaFileAssert.assertThat(files.get("SampleObject.java")).fileContains(hashCode); + } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index a7ccd9d369e3..8c5c19dc03d3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5383,4 +5383,19 @@ public void testEnumWithImplements() { JavaFileAssert.assertThat(files.get("Type.java")).fileContains("Type implements java.io.Serializable {"); } + + @Test + public void testAdditionalPropertiesWithGnerateAliasAsModelGenerateCorrectHashCode() { + final Path output = newTempFolder(); + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("spring") + .setGenerateAliasAsModel(true) + .setInputSpec("src/test/resources/3_0/additionalProperties.yaml") + .setOutputDir(output.toString().replace("\\", "/")); + + Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() + .stream().collect(Collectors.toMap(File::getName, Function.identity())); + + JavaFileAssert.assertThat(files.get("SampleObject.java")).fileContains(" return Objects.hash(additionalProperties)"); + } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml new file mode 100644 index 000000000000..dceeaf005169 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml @@ -0,0 +1,20 @@ +openapi: 3.0.0 +info: + title: "test for additionalProperties" + version: 1.0.0 +paths: + /test: + get: + responses: + "200": + description: test + content: + application/json: + schema: + $ref: '#/components/schemas/SampleObject' +components: + schemas: + SampleObject: + type: object + additionalProperties: + type: object \ No newline at end of file From e9e3411b457140c4fcb969cac36b8464f0812c1c Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 9 Mar 2025 15:32:35 +0100 Subject: [PATCH 31/47] Fix hashcode and equals --- .../main/resources/Java/libraries/webclient/pojo.mustache | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache index 2b9423b773f9..acdcfe8c0b27 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache @@ -306,8 +306,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}} && Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} @@ -321,7 +323,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} From 6f2b450d4c5bd628b20c0d4cb0b4f1d9bebc5b79 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 9 Mar 2025 16:13:47 +0100 Subject: [PATCH 32/47] Revert Microfile (still using extends HashMap) --- .../Java/libraries/feign/pojo.mustache | 6 ++- .../Java/libraries/jersey2/pojo.mustache | 6 ++- .../Java/libraries/jersey3/pojo.mustache | 6 ++- .../microprofile/pojoOverrides.mustache | 2 +- .../Java/libraries/native/pojo.mustache | 6 ++- .../Java/libraries/okhttp-gson/pojo.mustache | 6 ++- .../Java/libraries/resttemplate/pojo.mustache | 6 ++- .../src/main/resources/Java/pojo.mustache | 6 ++- .../main/resources/JavaSpring/pojo.mustache | 6 ++- .../codegen/java/JavaClientCodegenTest.java | 27 +++++++---- .../java/spring/SpringCodegenTest.java | 14 +++++- .../resources/3_0/additionalProperties.yaml | 48 +++++++++++++++++-- .../openapitools/client/model/ParentPet.java | 3 +- 13 files changed, 110 insertions(+), 32 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache index a5bcc87bd928..e9ade1874c5a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache @@ -265,8 +265,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}} && Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache index 0d8bc23c6cc7..d3dae8723595 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache @@ -285,8 +285,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}}&& Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache index 0d8bc23c6cc7..d3dae8723595 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache @@ -285,8 +285,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}}&& Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache index 28fdf0da2f1b..f0fbb0b200e8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojoOverrides.mustache @@ -28,7 +28,7 @@ return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}); {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache index 5413d1cdcd8e..daa3ee0df4d8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache @@ -289,8 +289,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}}&& Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache index 3d76d23b0c86..a26ad49fc5ad 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache @@ -203,8 +203,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{^-last}} && {{/-last}}{{/vars}}{{#isAdditionalPropertiesTrue}}&& Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/isAdditionalPropertiesTrue}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache index 79d8b0e63cd0..6c4100566def 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache @@ -306,8 +306,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}} && Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache index 09482dd66e66..22feb2655c3b 100644 --- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache @@ -304,8 +304,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{classname}} {{classVarName}} = ({{classname}}) o; return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index ac4d556fd22a..eadabd7f1c2a 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -318,8 +318,10 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}} return {{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}equalsNullable(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals(this.{{name}}, {{classVarName}}.{{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}} && {{/-last}}{{/vars}}{{#additionalPropertiesType}} && Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{/additionalPropertiesType}}{{#parent}} && - super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}} - return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/hasVars}} + super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}{{#additionalPropertiesType}} + {{classname}} {{classVarName}} = ({{classname}}) o; + return Objects.equals(this.additionalProperties, {{classVarName}}.additionalProperties){{#parent}} && super.equals(o){{/parent}};{{/additionalPropertiesType}}{{^additionalPropertiesType}} + return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};{{/additionalPropertiesType}}{{/hasVars}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} private static boolean equalsNullable(JsonNullable a, JsonNullable b) { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index cc02e356a12d..e44390948058 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -3481,18 +3481,18 @@ public void testEnumWithImplements() { @DataProvider(name = "javaClientLibrariesForHashCodeTest") public Object[][] javaClientLibraries() { return new Object[][] { - {JavaClientCodegen.RESTTEMPLATE, "Objects.hash(additionalProperties)" }, - {JavaClientCodegen.NATIVE, "Objects.hash(super.hashCode(), additionalProperties)"}, - {JavaClientCodegen.OKHTTP_GSON, "Objects.hash(additionalProperties)" }, - {JavaClientCodegen.MICROPROFILE, "Objects.hash(super.hashCode(), additionalProperties)" }, - {JavaClientCodegen.JERSEY2, "Objects.hash(additionalProperties)" }, - {JavaClientCodegen.JERSEY3, "Objects.hash(additionalProperties)" }, - {JavaClientCodegen.FEIGN, "Objects.hash(additionalProperties)" }, + {JavaClientCodegen.RESTTEMPLATE, "Objects.hash(additionalProperties)", "Objects.hash(name, additionalProperties)" }, + {JavaClientCodegen.NATIVE, "Objects.hash(super.hashCode(), additionalProperties)", "Objects.hash(name, super.hashCode(), additionalProperties)" }, + {JavaClientCodegen.OKHTTP_GSON, "Objects.hash(additionalProperties)", "Objects.hash(name, additionalProperties)" }, + {JavaClientCodegen.JERSEY2, "Objects.hash(additionalProperties)", "Objects.hash(name, additionalProperties)" }, + {JavaClientCodegen.JERSEY3, "Objects.hash(additionalProperties)", "Objects.hash(name, additionalProperties)" }, + {JavaClientCodegen.FEIGN, "Objects.hash(additionalProperties)", "Objects.hash(name, additionalProperties)" }, + {JavaClientCodegen.WEBCLIENT, "Objects.hash(additionalProperties)", "Objects.hash(name, additionalProperties)" }, }; } @Test(dataProvider = "javaClientLibrariesForHashCodeTest") - public void testAdditionalPropertiesWithGnerateAliasAsModelGenerateCorrectHashCode(String library, String hashCode) { + public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHashCode(String library, String hashCode, String hashCodeWithName) { final Path output = newTempFolder(); final CodegenConfigurator configurator = new CodegenConfigurator() .setGeneratorName("java") @@ -3504,6 +3504,15 @@ public void testAdditionalPropertiesWithGnerateAliasAsModelGenerateCorrectHashCo Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() .stream().collect(Collectors.toMap(File::getName, Function.identity())); - JavaFileAssert.assertThat(files.get("SampleObject.java")).fileContains(hashCode); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeObject.java")).fileContains(hashCode); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains(hashCode); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTrue.java")).fileContains(hashCode); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeObject.java")).fileContains(hashCodeWithName); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeString.java")).fileContains(hashCodeWithName); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTrue.java")).fileContains(hashCodeWithName); + + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains( + "AdditionalPropertiesOnlyTypeString additionalPropertiesOnlyTypeString = (AdditionalPropertiesOnlyTypeString) o;", + "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties)"); } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 8c5c19dc03d3..74dd87a2e248 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5385,7 +5385,7 @@ public void testEnumWithImplements() { } @Test - public void testAdditionalPropertiesWithGnerateAliasAsModelGenerateCorrectHashCode() { + public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHashCodeAndEquals() { final Path output = newTempFolder(); final CodegenConfigurator configurator = new CodegenConfigurator() .setGeneratorName("spring") @@ -5396,6 +5396,16 @@ public void testAdditionalPropertiesWithGnerateAliasAsModelGenerateCorrectHashCo Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() .stream().collect(Collectors.toMap(File::getName, Function.identity())); - JavaFileAssert.assertThat(files.get("SampleObject.java")).fileContains(" return Objects.hash(additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains("return Objects.hash(additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeObject.java")).fileContains("return Objects.hash(additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains("return Objects.hash(additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTrue.java")).fileContains("return Objects.hash(additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeObject.java")).fileContains("return Objects.hash(name, additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeString.java")).fileContains("return Objects.hash(name, additionalProperties)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTrue.java")).fileContains("return Objects.hash(name, additionalProperties)"); + + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains( + "AdditionalPropertiesOnlyTypeString additionalPropertiesOnlyTypeString = (AdditionalPropertiesOnlyTypeString) o;", + "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties);"); } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml index dceeaf005169..6610ba0a1cd6 100644 --- a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml @@ -11,10 +11,52 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/SampleObject' + $ref: '#/components/schemas/Response' components: schemas: - SampleObject: + Response: type: object + properties: + additionalPropertiesOnlyTypeObject: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeObject' + additionalPropertiesOnlyTypeString: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeString' + additionalPropertiesTypeObject: + $ref: '#/components/schemas/AdditionalPropertiesTypeObject' + additionalPropertiesTypeString: + $ref: '#/components/schemas/AdditionalPropertiesTypeString' + additionalPropertiesTrue: + $ref: '#/components/schemas/AdditionalPropertiesTrue' + additionalPropertiesOnlyTrue: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTrue' + AdditionalPropertiesOnlyTypeObject: + type: object + additionalProperties: + type: object + AdditionalPropertiesOnlyTypeString: + type: object + additionalProperties: + type: string + AdditionalPropertiesTypeObject: + type: object + properties: + name: + type: string additionalProperties: - type: object \ No newline at end of file + type: object + AdditionalPropertiesTypeString: + type: object + properties: + name: + type: string + additionalProperties: + type: string + AdditionalPropertiesOnlyTrue: + type: object + additionalProperties: true + AdditionalPropertiesTrue: + type: object + properties: + name: + type: string + additionalProperties: true diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java index 94b5215c103d..293ac69e95fc 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java @@ -108,7 +108,8 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - return super.equals(o); + ParentPet parentPet = (ParentPet) o; + return Objects.equals(this.additionalProperties, parentPet.additionalProperties) && super.equals(o); } @Override From 6e3b5945fdfc5eb343aaeec182a9bcbfbb7d80b5 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 9 Mar 2025 18:00:26 +0100 Subject: [PATCH 33/47] Fix defaultValue for AdditionalProperties fields when using generateAliasAsModel --- .../languages/AbstractJavaCodegen.java | 6 +++ .../codegen/java/JavaClientCodegenTest.java | 42 +++++++++++++++++++ .../java/spring/SpringCodegenTest.java | 2 + 3 files changed, 50 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 66175b1b9543..d4028bd09810 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -68,6 +68,7 @@ import static org.openapitools.codegen.utils.CamelizeOption.*; import static org.openapitools.codegen.utils.ModelUtils.getSchemaItems; +import static org.openapitools.codegen.utils.ModelUtils.isGenerateAliasAsModel; import static org.openapitools.codegen.utils.OnceLogger.once; import static org.openapitools.codegen.utils.StringUtils.*; @@ -1329,6 +1330,11 @@ public String toDefaultValue(CodegenProperty cp, Schema schema) { return null; } + if (isGenerateAliasAsModel()) { + // additionalProperties generated + return null; + } + return String.format(Locale.ROOT, "new %s<>()", instantiationTypes().getOrDefault("map", "HashMap")); } else if (ModelUtils.isIntegerSchema(schema)) { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index e44390948058..ad9c4416a894 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -3514,5 +3514,47 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains( "AdditionalPropertiesOnlyTypeString additionalPropertiesOnlyTypeString = (AdditionalPropertiesOnlyTypeString) o;", "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties)"); + + JavaFileAssert.assertThat(files.get("Response.java")).fileContains("AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); + } + + @Test + public void testAdditionalPropertiesWithGenerateAliasForMicroProfile() { + final Path output = newTempFolder(); + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("java") + .setGenerateAliasAsModel(true) + .setLibrary(MICROPROFILE) + .setInputSpec("src/test/resources/3_0/additionalProperties.yaml") + .setOutputDir(output.toString().replace("\\", "/")); + + Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() + .stream().collect(Collectors.toMap(File::getName, Function.identity())); + + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeObject.java")).fileContains( + "extends HashMap", + "return Objects.hash(super.hashCode())", + "return super.equals(o)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains( + "extends HashMap", + "return Objects.hash(super.hashCode())", + "return super.equals(o)"); + + JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTrue.java")).fileContains( + "extends HashMap", + "return Objects.hash(super.hashCode())", + "return super.equals(o)"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeObject.java")).fileContains( + "HashMap", + "return Objects.hash(name, super.hashCode())"); + + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeString.java")).fileContains( + "HashMap", + "return Objects.hash(name, super.hashCode())"); + JavaFileAssert.assertThat(files.get("AdditionalPropertiesTrue.java")).fileContains( + "HashMap", + "return Objects.hash(name, super.hashCode())"); + + JavaFileAssert.assertThat(files.get("Response.java")).fileContains("AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 74dd87a2e248..f863ef7179d3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5407,5 +5407,7 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains( "AdditionalPropertiesOnlyTypeString additionalPropertiesOnlyTypeString = (AdditionalPropertiesOnlyTypeString) o;", "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties);"); + + JavaFileAssert.assertThat(files.get("Response.java")).fileContains("AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); } } \ No newline at end of file From eb650e0274910be07ec696a7b0946b4e82033771 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 9 Mar 2025 18:42:33 +0100 Subject: [PATCH 34/47] Fix test for defaultValue for AdditionalProperties fields when using generateAliasAsModel --- .../org/openapitools/codegen/java/AbstractJavaCodegenTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java index b85b45544691..73bb96fe7eac 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java @@ -552,7 +552,7 @@ public void toDefaultValueTest() { ModelUtils.setGenerateAliasAsModel(true); defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), schema); - Assert.assertEquals(defaultValue, "new HashMap<>()"); + Assert.assertNull(defaultValue); // Test default value for date format DateSchema dateSchema = new DateSchema(); From fc023febd0bcf4470fd520019f0563c224557230 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Mon, 10 Mar 2025 17:43:52 +0100 Subject: [PATCH 35/47] Fix test for defaultValue for AdditionalProperties fields when using generateAliasAsModel --- ...ava-resttemplate-generateAliasAsModel.yaml | 12 + .../spring-boot-generateAliasAsModel.yaml | 12 + .../languages/AbstractJavaCodegen.java | 4 +- .../codegen/java/JavaClientCodegenTest.java | 8 +- .../java/spring/SpringCodegenTest.java | 3 +- .../resources/3_0/additionalProperties.yaml | 4 + .../3_0/java/generateAliasAsModel.yaml | 230 +++++ .../.github/workflows/maven.yml | 30 + .../.gitignore | 21 + .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 72 ++ .../.openapi-generator/VERSION | 1 + .../.travis.yml | 22 + .../README.md | 158 ++++ .../api/openapi.yaml | 331 +++++++ .../build.gradle | 137 +++ .../build.sbt | 1 + .../docs/AdditionalProperties.md | 15 + .../docs/AdditionalPropertiesAnyType.md | 13 + .../docs/AdditionalPropertiesArray.md | 13 + .../docs/AdditionalPropertiesBoolean.md | 13 + .../docs/AdditionalPropertiesClass.md | 23 + .../docs/AdditionalPropertiesClassRef.md | 17 + .../docs/AdditionalPropertiesInteger.md | 13 + .../docs/AdditionalPropertiesNumber.md | 13 + .../docs/AdditionalPropertiesObject.md | 13 + .../docs/AdditionalPropertiesString.md | 13 + .../docs/AdditionalPropertyArrayAnyType.md | 12 + .../docs/AdditionalPropertyArrayInteger.md | 12 + .../docs/AdditionalPropertyBoolean.md | 12 + .../docs/AdditionalPropertyClassRef.md | 21 + .../docs/AdditionalPropertyInteger.md | 12 + .../docs/AdditionalPropertyMapAnyType.md | 12 + .../docs/AdditionalPropertyMapString.md | 12 + .../docs/AdditionalPropertyNumber.md | 12 + .../docs/AdditionalPropertyString.md | 12 + .../docs/Animal.md | 13 + .../docs/FakeApi.md | 74 ++ ...dPropertiesAndAdditionalPropertiesClass.md | 15 + .../git_push.sh | 57 ++ .../gradle.properties | 6 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../resttemplate-generateAliasAsModel/gradlew | 249 ++++++ .../gradlew.bat | 92 ++ .../resttemplate-generateAliasAsModel/pom.xml | 285 ++++++ .../settings.gradle | 1 + .../src/main/AndroidManifest.xml | 3 + .../org/openapitools/client/ApiClient.java | 814 ++++++++++++++++++ .../java/org/openapitools/client/BaseApi.java | 87 ++ .../client/JavaTimeFormatter.java | 64 ++ .../client/RFC3339DateFormat.java | 58 ++ .../client/RFC3339InstantDeserializer.java | 100 +++ .../client/RFC3339JavaTimeModule.java | 31 + .../client/ServerConfiguration.java | 72 ++ .../openapitools/client/ServerVariable.java | 37 + .../org/openapitools/client/api/FakeApi.java | 108 +++ .../openapitools/client/auth/ApiKeyAuth.java | 75 ++ .../client/auth/Authentication.java | 27 + .../client/auth/HttpBasicAuth.java | 51 ++ .../client/auth/HttpBearerAuth.java | 69 ++ .../client/model/AdditionalProperties.java | 181 ++++ .../model/AdditionalPropertiesAnyType.java | 161 ++++ .../model/AdditionalPropertiesArray.java | 162 ++++ .../model/AdditionalPropertiesBoolean.java | 161 ++++ .../model/AdditionalPropertiesClass.java | 533 ++++++++++++ .../model/AdditionalPropertiesClassRef.java | 248 ++++++ .../model/AdditionalPropertiesInteger.java | 161 ++++ .../model/AdditionalPropertiesNumber.java | 162 ++++ .../model/AdditionalPropertiesObject.java | 162 ++++ .../model/AdditionalPropertiesString.java | 161 ++++ .../model/AdditionalPropertyArrayAnyType.java | 118 +++ .../model/AdditionalPropertyArrayInteger.java | 118 +++ .../model/AdditionalPropertyBoolean.java | 117 +++ .../model/AdditionalPropertyClassRef.java | 384 +++++++++ .../model/AdditionalPropertyInteger.java | 117 +++ .../model/AdditionalPropertyMapAnyType.java | 118 +++ .../model/AdditionalPropertyMapString.java | 118 +++ .../model/AdditionalPropertyNumber.java | 118 +++ .../model/AdditionalPropertyString.java | 117 +++ .../org/openapitools/client/model/Animal.java | 112 +++ ...ropertiesAndAdditionalPropertiesClass.java | 191 ++++ .../openapitools/client/api/FakeApiTest.java | 54 ++ .../AdditionalPropertiesAnyTypeTest.java | 47 + .../model/AdditionalPropertiesArrayTest.java | 48 ++ .../AdditionalPropertiesBooleanTest.java | 47 + .../AdditionalPropertiesClassRefTest.java | 83 ++ .../model/AdditionalPropertiesClassTest.java | 135 +++ .../AdditionalPropertiesIntegerTest.java | 47 + .../model/AdditionalPropertiesNumberTest.java | 48 ++ .../model/AdditionalPropertiesObjectTest.java | 48 ++ .../model/AdditionalPropertiesStringTest.java | 47 + .../model/AdditionalPropertiesTest.java | 66 ++ .../AdditionalPropertyArrayAnyTypeTest.java | 35 + .../AdditionalPropertyArrayIntegerTest.java | 35 + .../model/AdditionalPropertyBooleanTest.java | 34 + .../model/AdditionalPropertyClassRefTest.java | 119 +++ .../model/AdditionalPropertyIntegerTest.java | 34 + .../AdditionalPropertyMapAnyTypeTest.java | 35 + .../AdditionalPropertyMapStringTest.java | 35 + .../model/AdditionalPropertyNumberTest.java | 35 + .../model/AdditionalPropertyStringTest.java | 34 + .../openapitools/client/model/AnimalTest.java | 47 + ...rtiesAndAdditionalPropertiesClassTest.java | 68 ++ .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 34 + .../.openapi-generator/VERSION | 1 + .../springboot-generateAliasAsModel/README.md | 23 + .../springboot-generateAliasAsModel/pom.xml | 81 ++ .../OpenApiGeneratorApplication.java | 30 + .../org/openapitools/RFC3339DateFormat.java | 38 + .../java/org/openapitools/api/ApiUtil.java | 19 + .../java/org/openapitools/api/FakeApi.java | 63 ++ .../openapitools/api/FakeApiController.java | 46 + .../configuration/HomeController.java | 13 + .../configuration/SpringFoxConfiguration.java | 71 ++ .../model/AdditionalProperties.java | 136 +++ .../model/AdditionalPropertiesAnyType.java | 129 +++ .../model/AdditionalPropertiesArray.java | 130 +++ .../model/AdditionalPropertiesBoolean.java | 129 +++ .../model/AdditionalPropertiesClass.java | 415 +++++++++ .../model/AdditionalPropertiesClassRef.java | 185 ++++ .../model/AdditionalPropertiesInteger.java | 129 +++ .../model/AdditionalPropertiesNumber.java | 130 +++ .../model/AdditionalPropertiesObject.java | 130 +++ .../model/AdditionalPropertiesString.java | 129 +++ .../model/AdditionalPropertyArrayAnyType.java | 101 +++ .../model/AdditionalPropertyArrayInteger.java | 101 +++ .../model/AdditionalPropertyBoolean.java | 100 +++ .../model/AdditionalPropertyClassRef.java | 285 ++++++ .../model/AdditionalPropertyInteger.java | 100 +++ .../model/AdditionalPropertyMapAnyType.java | 101 +++ .../model/AdditionalPropertyMapString.java | 101 +++ .../model/AdditionalPropertyNumber.java | 101 +++ .../model/AdditionalPropertyString.java | 100 +++ .../java/org/openapitools/model/Animal.java | 85 ++ ...ropertiesAndAdditionalPropertiesClass.java | 149 ++++ .../src/main/resources/application.properties | 3 + .../src/main/resources/openapi.yaml | 332 +++++++ .../OpenApiGeneratorApplicationTests.java | 13 + 140 files changed, 12379 insertions(+), 5 deletions(-) create mode 100644 bin/configs/java-resttemplate-generateAliasAsModel.yaml create mode 100644 bin/configs/spring-boot-generateAliasAsModel.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/.github/workflows/maven.yml create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/.gitignore create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator-ignore create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/FILES create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/VERSION create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/.travis.yml create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/README.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/api/openapi.yaml create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/build.gradle create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/build.sbt create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalProperties.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesAnyType.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesArray.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesBoolean.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClass.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClassRef.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesInteger.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesNumber.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesObject.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesString.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayAnyType.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayInteger.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyBoolean.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyClassRef.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyInteger.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapAnyType.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapString.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyNumber.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyString.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/Animal.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/FakeApi.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/git_push.sh create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle.properties create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle/wrapper/gradle-wrapper.jar create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle/wrapper/gradle-wrapper.properties create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/gradlew create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/gradlew.bat create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/pom.xml create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/settings.gradle create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/AndroidManifest.xml create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ApiClient.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/BaseApi.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/JavaTimeFormatter.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339DateFormat.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerConfiguration.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerVariable.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/api/FakeApi.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/Authentication.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalProperties.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClassRef.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayAnyType.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayInteger.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyBoolean.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyClassRef.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyInteger.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapAnyType.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapString.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyNumber.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyString.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/Animal.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/api/FakeApiTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassRefTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayAnyTypeTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayIntegerTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyBooleanTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyClassRefTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyIntegerTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapAnyTypeTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapStringTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyNumberTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyStringTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AnimalTest.java create mode 100644 samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator-ignore create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/VERSION create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/README.md create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/pom.xml create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/OpenApiGeneratorApplication.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/RFC3339DateFormat.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/ApiUtil.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApi.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApiController.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/HomeController.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalProperties.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClassRef.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesString.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayAnyType.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayInteger.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyBoolean.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyClassRef.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyInteger.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapAnyType.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapString.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyNumber.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyString.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/Animal.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/application.properties create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/openapi.yaml create mode 100644 samples/server/petstore/springboot-generateAliasAsModel/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java diff --git a/bin/configs/java-resttemplate-generateAliasAsModel.yaml b/bin/configs/java-resttemplate-generateAliasAsModel.yaml new file mode 100644 index 000000000000..d45737fa2fc1 --- /dev/null +++ b/bin/configs/java-resttemplate-generateAliasAsModel.yaml @@ -0,0 +1,12 @@ +generatorName: java +outputDir: samples/client/petstore/java/resttemplate-generateAliasAsModel +library: resttemplate +inputSpec: modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml +templateDir: modules/openapi-generator/src/main/resources/Java +generateAliasAsModel: true +additionalProperties: + java8: true + useJakartaEe: true + artifactId: petstore-resttemplate-generateAliasAsModel + hideGenerationTimestamp: "true" + generateConstructorWithAllArgs: true diff --git a/bin/configs/spring-boot-generateAliasAsModel.yaml b/bin/configs/spring-boot-generateAliasAsModel.yaml new file mode 100644 index 000000000000..5e6e81eae31c --- /dev/null +++ b/bin/configs/spring-boot-generateAliasAsModel.yaml @@ -0,0 +1,12 @@ +generatorName: spring +outputDir: samples/server/petstore/springboot-generateAliasAsModel +library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring +generateAliasAsModel: "true" +additionalProperties: + documentationProvider: springfox + useSwaggerUI: false + java8: true + artifactId: spring-boot-generateAliasAsModel + hideGenerationTimestamp: "true" diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index d4028bd09810..c550a72aeab1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -1330,8 +1330,8 @@ public String toDefaultValue(CodegenProperty cp, Schema schema) { return null; } - if (isGenerateAliasAsModel()) { - // additionalProperties generated + if (ModelUtils.isGenerateAliasAsModel() && !cp.dataType.contains("Map<")) { + // Aliased class used as the field name instead of Map<> return null; } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index ad9c4416a894..962f18b980e0 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -3515,7 +3515,9 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash "AdditionalPropertiesOnlyTypeString additionalPropertiesOnlyTypeString = (AdditionalPropertiesOnlyTypeString) o;", "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties)"); - JavaFileAssert.assertThat(files.get("Response.java")).fileContains("AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); + JavaFileAssert.assertThat(files.get("Response.java")).fileContains( + + "AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); } @Test @@ -3555,6 +3557,8 @@ public void testAdditionalPropertiesWithGenerateAliasForMicroProfile() { "HashMap", "return Objects.hash(name, super.hashCode())"); - JavaFileAssert.assertThat(files.get("Response.java")).fileContains("AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); + JavaFileAssert.assertThat(files.get("Response.java")).fileContains( + "Map inlineMap = new HashMap<>();", + "AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index f863ef7179d3..0939e43012f5 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5390,7 +5390,8 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash final CodegenConfigurator configurator = new CodegenConfigurator() .setGeneratorName("spring") .setGenerateAliasAsModel(true) - .setInputSpec("src/test/resources/3_0/additionalProperties.yaml") + //.setInputSpec("src/test/resources/3_0/additionalProperties.yaml") + .setInputSpec("C:\\dev\\openapi-generator\\modules\\openapi-generator\\src\\test\\resources\\3_0\\petstore-with-fake-endpoints-models-for-testing.yaml") .setOutputDir(output.toString().replace("\\", "/")); Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() diff --git a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml index 6610ba0a1cd6..d7e6cedb8f00 100644 --- a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml @@ -17,6 +17,10 @@ components: Response: type: object properties: + inlineMap: + type: object + additionalProperties: + type: string additionalPropertiesOnlyTypeObject: $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeObject' additionalPropertiesOnlyTypeString: diff --git a/modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml b/modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml new file mode 100644 index 000000000000..ba9852b6bbac --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/java/generateAliasAsModel.yaml @@ -0,0 +1,230 @@ +openapi: 3.0.0 +info: + description: This spec is mainly for testing generateAliasAsModel and + version: 1.0.0 + title: generateAliasAsModel +paths: + /fake/additionalProperties-reference: + post: + tags: + - fake + summary: test referenced additionalProperties + description: '' + operationId: testAdditionalPropertiesReference + responses: + '200': + description: successful operation + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/AdditionalProperties' + description: request body + required: true +components: + schemas: + AdditionalProperties: + type: object + properties: + additionalPropertiesClassRef: + $ref: "#/components/schemas/AdditionalPropertiesClassRef" + additionalPropertiesClass: + $ref: "#/components/schemas/AdditionalPropertiesClass" + mixed: + $ref: "#/components/schemas/MixedPropertiesAndAdditionalPropertiesClass" + AdditionalPropertiesClassRef: + type: object + properties: + map_string: + $ref: "#/components/schemas/AdditionalPropertiesString" + map_number: + $ref: "#/components/schemas/AdditionalPropertiesNumber" + map_integer: + $ref: "#/components/schemas/AdditionalPropertiesInteger" + map_boolean: + $ref: "#/components/schemas/AdditionalPropertiesBoolean" + anytype_1: + $ref: "#/components/schemas/AnyType1" + AdditionalPropertyClassRef: + type: object + properties: + map_string: + $ref: "#/components/schemas/AdditionalPropertyString" + map_number: + $ref: "#/components/schemas/AdditionalPropertyNumber" + map_integer: + $ref: "#/components/schemas/AdditionalPropertyInteger" + map_boolean: + $ref: "#/components/schemas/AdditionalPropertyBoolean" + map_array_integer: + $ref: "#/components/schemas/AdditionalPropertyArrayInteger" + map_array_anytype: + $ref: "#/components/schemas/AdditionalPropertyArrayAnyType" + map_map_string: + $ref: "#/components/schemas/AdditionalPropertyMapString" + map_map_anytype: + $ref: "#/components/schemas/AdditionalPropertyMapAnyType" + anytype_1: + $ref: "#/components/schemas/AnyType1" + AdditionalPropertyString: + type: object + additionalProperties: + type: string + AdditionalPropertyNumber: + type: object + additionalProperties: + type: number + AdditionalPropertyInteger: + type: object + additionalProperties: + type: integer + AdditionalPropertyBoolean: + type: object + additionalProperties: + type: boolean + AdditionalPropertyArrayInteger: + type: object + additionalProperties: + type: array + items: + type: integer + AdditionalPropertyArrayAnyType: + type: object + additionalProperties: + type: array + items: + type: object + AdditionalPropertyMapString: + type: object + additionalProperties: + type: object + additionalProperties: + type: string + AdditionalPropertyMapAnyType: + type: object + additionalProperties: + type: object + additionalProperties: + type: object + AnyType1: + type: object + AdditionalPropertiesClass: + type: object + properties: + map_string: + type: object + additionalProperties: + type: string + map_number: + type: object + additionalProperties: + type: number + map_integer: + type: object + additionalProperties: + type: integer + map_boolean: + type: object + additionalProperties: + type: boolean + map_array_integer: + type: object + additionalProperties: + type: array + items: + type: integer + map_array_anytype: + type: object + additionalProperties: + type: array + items: + type: object + map_map_string: + type: object + additionalProperties: + type: object + additionalProperties: + type: string + map_map_anytype: + type: object + additionalProperties: + type: object + additionalProperties: + type: object + anytype_1: + type: object + anytype_2: {} + anytype_3: + type: object + properties: {} + AdditionalPropertiesString: + type: object + properties: + name: + type: string + additionalProperties: + type: string + AdditionalPropertiesInteger: + type: object + properties: + name: + type: string + additionalProperties: + type: integer + AdditionalPropertiesNumber: + type: object + properties: + name: + type: string + additionalProperties: + type: number + AdditionalPropertiesBoolean: + type: object + properties: + name: + type: string + additionalProperties: + type: boolean + AdditionalPropertiesArray: + type: object + properties: + name: + type: string + additionalProperties: + type: array + items: + type: object + AdditionalPropertiesObject: + type: object + properties: + name: + type: string + additionalProperties: + type: object + additionalProperties: + type: object + AdditionalPropertiesAnyType: + type: object + properties: + name: + type: string + additionalProperties: + type: object + MixedPropertiesAndAdditionalPropertiesClass: + type: object + properties: + uuid: + type: string + format: uuid + dateTime: + type: string + format: date-time + map: + type: object + additionalProperties: + $ref: "#/components/schemas/Animal" + Animal: + type: object + properties: + className: + type: string diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/.github/workflows/maven.yml b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.github/workflows/maven.yml new file mode 100644 index 000000000000..6cb712e63f5e --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.github/workflows/maven.yml @@ -0,0 +1,30 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven +# +# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech) + +name: Java CI with Maven + +on: + push: + branches: [ main, master ] + pull_request: + branches: [ main, master ] + +jobs: + build: + name: Build generateAliasAsModel + runs-on: ubuntu-latest + strategy: + matrix: + java: [ 17, 21 ] + steps: + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn -B package --no-transfer-progress --file pom.xml diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/.gitignore b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.gitignore new file mode 100644 index 000000000000..a530464afa1b --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.gitignore @@ -0,0 +1,21 @@ +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# exclude jar for gradle wrapper +!gradle/wrapper/*.jar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# build files +**/target +target +.gradle +build diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator-ignore b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/FILES b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/FILES new file mode 100644 index 000000000000..28e9a19600c1 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/FILES @@ -0,0 +1,72 @@ +.github/workflows/maven.yml +.gitignore +.travis.yml +README.md +api/openapi.yaml +build.gradle +build.sbt +docs/AdditionalProperties.md +docs/AdditionalPropertiesAnyType.md +docs/AdditionalPropertiesArray.md +docs/AdditionalPropertiesBoolean.md +docs/AdditionalPropertiesClass.md +docs/AdditionalPropertiesClassRef.md +docs/AdditionalPropertiesInteger.md +docs/AdditionalPropertiesNumber.md +docs/AdditionalPropertiesObject.md +docs/AdditionalPropertiesString.md +docs/AdditionalPropertyArrayAnyType.md +docs/AdditionalPropertyArrayInteger.md +docs/AdditionalPropertyBoolean.md +docs/AdditionalPropertyClassRef.md +docs/AdditionalPropertyInteger.md +docs/AdditionalPropertyMapAnyType.md +docs/AdditionalPropertyMapString.md +docs/AdditionalPropertyNumber.md +docs/AdditionalPropertyString.md +docs/Animal.md +docs/FakeApi.md +docs/MixedPropertiesAndAdditionalPropertiesClass.md +git_push.sh +gradle.properties +gradle/wrapper/gradle-wrapper.jar +gradle/wrapper/gradle-wrapper.properties +gradlew +gradlew.bat +pom.xml +settings.gradle +src/main/AndroidManifest.xml +src/main/java/org/openapitools/client/ApiClient.java +src/main/java/org/openapitools/client/BaseApi.java +src/main/java/org/openapitools/client/JavaTimeFormatter.java +src/main/java/org/openapitools/client/RFC3339DateFormat.java +src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java +src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java +src/main/java/org/openapitools/client/ServerConfiguration.java +src/main/java/org/openapitools/client/ServerVariable.java +src/main/java/org/openapitools/client/api/FakeApi.java +src/main/java/org/openapitools/client/auth/ApiKeyAuth.java +src/main/java/org/openapitools/client/auth/Authentication.java +src/main/java/org/openapitools/client/auth/HttpBasicAuth.java +src/main/java/org/openapitools/client/auth/HttpBearerAuth.java +src/main/java/org/openapitools/client/model/AdditionalProperties.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesClassRef.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +src/main/java/org/openapitools/client/model/AdditionalPropertyArrayAnyType.java +src/main/java/org/openapitools/client/model/AdditionalPropertyArrayInteger.java +src/main/java/org/openapitools/client/model/AdditionalPropertyBoolean.java +src/main/java/org/openapitools/client/model/AdditionalPropertyClassRef.java +src/main/java/org/openapitools/client/model/AdditionalPropertyInteger.java +src/main/java/org/openapitools/client/model/AdditionalPropertyMapAnyType.java +src/main/java/org/openapitools/client/model/AdditionalPropertyMapString.java +src/main/java/org/openapitools/client/model/AdditionalPropertyNumber.java +src/main/java/org/openapitools/client/model/AdditionalPropertyString.java +src/main/java/org/openapitools/client/model/Animal.java +src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/VERSION new file mode 100644 index 000000000000..96cfbb19ae28 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.13.0-SNAPSHOT diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/.travis.yml b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.travis.yml new file mode 100644 index 000000000000..1b6741c083c7 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/.travis.yml @@ -0,0 +1,22 @@ +# +# Generated by OpenAPI Generator: https://openapi-generator.tech +# +# Ref: https://docs.travis-ci.com/user/languages/java/ +# +language: java +jdk: + - openjdk12 + - openjdk11 + - openjdk10 + - openjdk9 + - openjdk8 +before_install: + # ensure gradlew has proper permission + - chmod a+x ./gradlew +script: + # test using maven + #- mvn test + # test using gradle + - gradle test + # test using sbt + # - sbt test diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/README.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/README.md new file mode 100644 index 000000000000..b2fe735054e8 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/README.md @@ -0,0 +1,158 @@ +# petstore-resttemplate-generateAliasAsModel + +generateAliasAsModel + +- API version: 1.0.0 + +- Generator version: 7.13.0-SNAPSHOT + +This spec is mainly for testing generateAliasAsModel and + + +*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)* + +## Requirements + +Building the API client library requires: + +1. Java 1.8+ +2. Maven/Gradle + +## Installation + +To install the API client library to your local Maven repository, simply execute: + +```shell +mvn clean install +``` + +To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: + +```shell +mvn clean deploy +``` + +Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information. + +### Maven users + +Add this dependency to your project's POM: + +```xml + + org.openapitools + petstore-resttemplate-generateAliasAsModel + 1.0.0 + compile + +``` + +### Gradle users + +Add this dependency to your project's build file: + +```groovy + repositories { + mavenCentral() // Needed if the 'petstore-resttemplate-generateAliasAsModel' jar has been published to maven central. + mavenLocal() // Needed if the 'petstore-resttemplate-generateAliasAsModel' jar has been published to the local maven repo. + } + + dependencies { + implementation "org.openapitools:petstore-resttemplate-generateAliasAsModel:1.0.0" + } +``` + +### Others + +At first generate the JAR by executing: + +```shell +mvn clean package +``` + +Then manually install the following JARs: + +- `target/petstore-resttemplate-generateAliasAsModel-1.0.0.jar` +- `target/lib/*.jar` + +## Getting Started + +Please follow the [installation](#installation) instruction and execute the following Java code: + +```java + +import org.openapitools.client.*; +import org.openapitools.client.auth.*; +import org.openapitools.client.model.*; +import org.openapitools.client.api.FakeApi; + +public class FakeApiExample { + + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost"); + + FakeApi apiInstance = new FakeApi(defaultClient); + AdditionalProperties additionalProperties = new AdditionalProperties(); // AdditionalProperties | request body + try { + apiInstance.testAdditionalPropertiesReference(additionalProperties); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testAdditionalPropertiesReference"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} + +``` + +## Documentation for API Endpoints + +All URIs are relative to *http://localhost* + +Class | Method | HTTP request | Description +------------ | ------------- | ------------- | ------------- +*FakeApi* | [**testAdditionalPropertiesReference**](docs/FakeApi.md#testAdditionalPropertiesReference) | **POST** /fake/additionalProperties-reference | test referenced additionalProperties + + +## Documentation for Models + + - [AdditionalProperties](docs/AdditionalProperties.md) + - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md) + - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md) + - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md) + - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md) + - [AdditionalPropertiesClassRef](docs/AdditionalPropertiesClassRef.md) + - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md) + - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md) + - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md) + - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md) + - [AdditionalPropertyArrayAnyType](docs/AdditionalPropertyArrayAnyType.md) + - [AdditionalPropertyArrayInteger](docs/AdditionalPropertyArrayInteger.md) + - [AdditionalPropertyBoolean](docs/AdditionalPropertyBoolean.md) + - [AdditionalPropertyClassRef](docs/AdditionalPropertyClassRef.md) + - [AdditionalPropertyInteger](docs/AdditionalPropertyInteger.md) + - [AdditionalPropertyMapAnyType](docs/AdditionalPropertyMapAnyType.md) + - [AdditionalPropertyMapString](docs/AdditionalPropertyMapString.md) + - [AdditionalPropertyNumber](docs/AdditionalPropertyNumber.md) + - [AdditionalPropertyString](docs/AdditionalPropertyString.md) + - [Animal](docs/Animal.md) + - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md) + + + +## Documentation for Authorization + +Endpoints do not require authorization. + + +## Recommendation + +It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues. + +## Author + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/api/openapi.yaml b/samples/client/petstore/java/resttemplate-generateAliasAsModel/api/openapi.yaml new file mode 100644 index 000000000000..c47f2509d7fd --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/api/openapi.yaml @@ -0,0 +1,331 @@ +openapi: 3.0.0 +info: + description: This spec is mainly for testing generateAliasAsModel and + title: generateAliasAsModel + version: 1.0.0 +servers: +- url: / +paths: + /fake/additionalProperties-reference: + post: + description: "" + operationId: testAdditionalPropertiesReference + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/AdditionalProperties' + description: request body + required: true + responses: + "200": + description: successful operation + summary: test referenced additionalProperties + tags: + - fake + x-content-type: application/json + x-accepts: + - application/json +components: + schemas: + AdditionalProperties: + example: + additionalPropertiesClass: + map_map_string: + key: + key: map_map_string + map_integer: + key: 6 + map_number: + key: 0.8008281904610115 + map_array_anytype: + key: + - "{}" + - "{}" + map_string: + key: map_string + anytype_2: "" + anytype_1: "{}" + map_boolean: + key: true + map_array_integer: + key: + - 1 + - 1 + map_map_anytype: + key: + key: "{}" + anytype_3: "{}" + mixed: + dateTime: 2000-01-23T04:56:07.000+00:00 + uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + map: + key: + className: className + additionalPropertiesClassRef: + map_integer: + name: name + map_number: + name: name + map_string: + name: name + anytype_1: "{}" + map_boolean: + name: name + properties: + additionalPropertiesClassRef: + $ref: '#/components/schemas/AdditionalPropertiesClassRef' + additionalPropertiesClass: + $ref: '#/components/schemas/AdditionalPropertiesClass' + mixed: + $ref: '#/components/schemas/MixedPropertiesAndAdditionalPropertiesClass' + type: object + AdditionalPropertiesClassRef: + example: + map_integer: + name: name + map_number: + name: name + map_string: + name: name + anytype_1: "{}" + map_boolean: + name: name + properties: + map_string: + $ref: '#/components/schemas/AdditionalPropertiesString' + map_number: + $ref: '#/components/schemas/AdditionalPropertiesNumber' + map_integer: + $ref: '#/components/schemas/AdditionalPropertiesInteger' + map_boolean: + $ref: '#/components/schemas/AdditionalPropertiesBoolean' + anytype_1: + type: object + type: object + AdditionalPropertyClassRef: + properties: + map_string: + $ref: '#/components/schemas/AdditionalPropertyString' + map_number: + $ref: '#/components/schemas/AdditionalPropertyNumber' + map_integer: + $ref: '#/components/schemas/AdditionalPropertyInteger' + map_boolean: + $ref: '#/components/schemas/AdditionalPropertyBoolean' + map_array_integer: + $ref: '#/components/schemas/AdditionalPropertyArrayInteger' + map_array_anytype: + $ref: '#/components/schemas/AdditionalPropertyArrayAnyType' + map_map_string: + $ref: '#/components/schemas/AdditionalPropertyMapString' + map_map_anytype: + $ref: '#/components/schemas/AdditionalPropertyMapAnyType' + anytype_1: + type: object + type: object + AdditionalPropertyString: + additionalProperties: + type: string + type: object + AdditionalPropertyNumber: + additionalProperties: + type: number + type: object + AdditionalPropertyInteger: + additionalProperties: + type: integer + type: object + AdditionalPropertyBoolean: + additionalProperties: + type: boolean + type: object + AdditionalPropertyArrayInteger: + additionalProperties: + items: + type: integer + type: array + type: object + AdditionalPropertyArrayAnyType: + additionalProperties: + items: + type: object + type: array + type: object + AdditionalPropertyMapString: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + AdditionalPropertyMapAnyType: + additionalProperties: + additionalProperties: + type: object + type: object + type: object + AnyType1: + type: object + AdditionalPropertiesClass: + example: + map_map_string: + key: + key: map_map_string + map_integer: + key: 6 + map_number: + key: 0.8008281904610115 + map_array_anytype: + key: + - "{}" + - "{}" + map_string: + key: map_string + anytype_2: "" + anytype_1: "{}" + map_boolean: + key: true + map_array_integer: + key: + - 1 + - 1 + map_map_anytype: + key: + key: "{}" + anytype_3: "{}" + properties: + map_string: + additionalProperties: + type: string + type: object + map_number: + additionalProperties: + type: number + type: object + map_integer: + additionalProperties: + type: integer + type: object + map_boolean: + additionalProperties: + type: boolean + type: object + map_array_integer: + additionalProperties: + items: + type: integer + type: array + type: object + map_array_anytype: + additionalProperties: + items: + type: object + type: array + type: object + map_map_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_map_anytype: + additionalProperties: + additionalProperties: + type: object + type: object + type: object + anytype_1: + type: object + anytype_2: {} + anytype_3: + properties: {} + type: object + type: object + AdditionalPropertiesString: + additionalProperties: + type: string + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesInteger: + additionalProperties: + type: integer + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesNumber: + additionalProperties: + type: number + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesBoolean: + additionalProperties: + type: boolean + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesArray: + additionalProperties: + items: + type: object + type: array + properties: + name: + type: string + type: object + AdditionalPropertiesObject: + additionalProperties: + additionalProperties: + type: object + type: object + properties: + name: + type: string + type: object + AdditionalPropertiesAnyType: + additionalProperties: + type: object + properties: + name: + type: string + type: object + MixedPropertiesAndAdditionalPropertiesClass: + example: + dateTime: 2000-01-23T04:56:07.000+00:00 + uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + map: + key: + className: className + properties: + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + Animal: + example: + className: className + properties: + className: + type: string + type: object + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/build.gradle b/samples/client/petstore/java/resttemplate-generateAliasAsModel/build.gradle new file mode 100644 index 000000000000..89c4e831de56 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/build.gradle @@ -0,0 +1,137 @@ +apply plugin: 'idea' +apply plugin: 'eclipse' + +group = 'org.openapitools' +version = '1.0.0' + +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.5.+' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' + } +} + +repositories { + mavenCentral() +} + + +if(hasProperty('target') && target == 'android') { + + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 23 + buildToolsVersion '23.0.2' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 22 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + + dependencies { + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDirectory + task.destinationDirectory = project.file("${project.buildDir}/outputs/jar") + task.archiveFileName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + archiveClassifier = 'sources' + } + + artifacts { + archives sourcesJar + } + +} else { + + apply plugin: 'java' + apply plugin: 'maven-publish' + + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + + publishing { + publications { + maven(MavenPublication) { + artifactId = 'petstore-resttemplate-generateAliasAsModel' + from components.java + } + } + } + + task execute(type:JavaExec) { + mainClass = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } +} + +ext { + jackson_version = "2.17.1" + jackson_databind_version = "2.17.1" + jackson_databind_nullable_version = "0.2.6" + spring_web_version = "6.1.5" + jakarta_annotation_version = "2.1.1" + beanvalidation_version = "3.0.2" + jodatime_version = "2.9.9" + junit_version = "5.10.2" +} + +dependencies { + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "org.springframework:spring-web:$spring_web_version" + implementation "org.springframework:spring-context:$spring_web_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" + testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version" +} + +test { + // Enable JUnit 5 (Gradle 4.6+). + useJUnitPlatform() + + // Always run tests, even when nothing changed. + dependsOn 'cleanTest' + + // Show test results. + testLogging { + events "passed", "skipped", "failed" + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/build.sbt b/samples/client/petstore/java/resttemplate-generateAliasAsModel/build.sbt new file mode 100644 index 000000000000..464090415c47 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/build.sbt @@ -0,0 +1 @@ +# TODO diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalProperties.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalProperties.md new file mode 100644 index 000000000000..c9b86a3f67bf --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalProperties.md @@ -0,0 +1,15 @@ + + +# AdditionalProperties + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**additionalPropertiesClassRef** | [**AdditionalPropertiesClassRef**](AdditionalPropertiesClassRef.md) | | [optional] | +|**additionalPropertiesClass** | [**AdditionalPropertiesClass**](AdditionalPropertiesClass.md) | | [optional] | +|**mixed** | [**MixedPropertiesAndAdditionalPropertiesClass**](MixedPropertiesAndAdditionalPropertiesClass.md) | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesAnyType.md new file mode 100644 index 000000000000..5158bd815e67 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesAnyType.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesAnyType + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesArray.md new file mode 100644 index 000000000000..9edcf46b0e44 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesArray.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesArray + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesBoolean.md new file mode 100644 index 000000000000..1e1ed764a56e --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesBoolean.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesBoolean + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClass.md new file mode 100644 index 000000000000..79402f75c68c --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClass.md @@ -0,0 +1,23 @@ + + +# AdditionalPropertiesClass + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**mapString** | **Map<String, String>** | | [optional] | +|**mapNumber** | **Map<String, BigDecimal>** | | [optional] | +|**mapInteger** | **Map<String, Integer>** | | [optional] | +|**mapBoolean** | **Map<String, Boolean>** | | [optional] | +|**mapArrayInteger** | **Map<String, List<Integer>>** | | [optional] | +|**mapArrayAnytype** | **Map<String, List<Object>>** | | [optional] | +|**mapMapString** | **Map<String, Map<String, String>>** | | [optional] | +|**mapMapAnytype** | **Map<String, Map<String, Object>>** | | [optional] | +|**anytype1** | **Object** | | [optional] | +|**anytype2** | **Object** | | [optional] | +|**anytype3** | **Object** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClassRef.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClassRef.md new file mode 100644 index 000000000000..e9ce9d66cead --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesClassRef.md @@ -0,0 +1,17 @@ + + +# AdditionalPropertiesClassRef + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**mapString** | **AdditionalPropertiesString** | | [optional] | +|**mapNumber** | **AdditionalPropertiesNumber** | | [optional] | +|**mapInteger** | **AdditionalPropertiesInteger** | | [optional] | +|**mapBoolean** | **AdditionalPropertiesBoolean** | | [optional] | +|**anytype1** | **Object** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesInteger.md new file mode 100644 index 000000000000..cbc1673c059b --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesInteger.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesInteger + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesNumber.md new file mode 100644 index 000000000000..0bd133ccf09a --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesNumber.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesNumber + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesObject.md new file mode 100644 index 000000000000..3f419f8551ff --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesObject.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesObject + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesString.md new file mode 100644 index 000000000000..269a1961cf88 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertiesString.md @@ -0,0 +1,13 @@ + + +# AdditionalPropertiesString + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayAnyType.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayAnyType.md new file mode 100644 index 000000000000..4ae382b2b5e9 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayAnyType.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyArrayAnyType + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayInteger.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayInteger.md new file mode 100644 index 000000000000..ed185b2a6053 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyArrayInteger.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyArrayInteger + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyBoolean.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyBoolean.md new file mode 100644 index 000000000000..b634164ebef5 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyBoolean.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyBoolean + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyClassRef.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyClassRef.md new file mode 100644 index 000000000000..9d4eccae8ddb --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyClassRef.md @@ -0,0 +1,21 @@ + + +# AdditionalPropertyClassRef + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**mapString** | **AdditionalPropertyString** | | [optional] | +|**mapNumber** | **AdditionalPropertyNumber** | | [optional] | +|**mapInteger** | **AdditionalPropertyInteger** | | [optional] | +|**mapBoolean** | **AdditionalPropertyBoolean** | | [optional] | +|**mapArrayInteger** | **AdditionalPropertyArrayInteger** | | [optional] | +|**mapArrayAnytype** | **AdditionalPropertyArrayAnyType** | | [optional] | +|**mapMapString** | **AdditionalPropertyMapString** | | [optional] | +|**mapMapAnytype** | **AdditionalPropertyMapAnyType** | | [optional] | +|**anytype1** | **Object** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyInteger.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyInteger.md new file mode 100644 index 000000000000..07cd0f92230c --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyInteger.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyInteger + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapAnyType.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapAnyType.md new file mode 100644 index 000000000000..cc720157c677 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapAnyType.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyMapAnyType + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapString.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapString.md new file mode 100644 index 000000000000..f5780fcd841c --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyMapString.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyMapString + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyNumber.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyNumber.md new file mode 100644 index 000000000000..dbbcd452a315 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyNumber.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyNumber + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyString.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyString.md new file mode 100644 index 000000000000..f6633e10bb2a --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/AdditionalPropertyString.md @@ -0,0 +1,12 @@ + + +# AdditionalPropertyString + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/Animal.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/Animal.md new file mode 100644 index 000000000000..5214d5c8b586 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/Animal.md @@ -0,0 +1,13 @@ + + +# Animal + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**className** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/FakeApi.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/FakeApi.md new file mode 100644 index 000000000000..fc7494aedc84 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/FakeApi.md @@ -0,0 +1,74 @@ +# FakeApi + +All URIs are relative to *http://localhost* + +| Method | HTTP request | Description | +|------------- | ------------- | -------------| +| [**testAdditionalPropertiesReference**](FakeApi.md#testAdditionalPropertiesReference) | **POST** /fake/additionalProperties-reference | test referenced additionalProperties | + + + +## testAdditionalPropertiesReference + +> testAdditionalPropertiesReference(additionalProperties) + +test referenced additionalProperties + + + +### Example + +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost"); + + FakeApi apiInstance = new FakeApi(defaultClient); + AdditionalProperties additionalProperties = new AdditionalProperties(); // AdditionalProperties | request body + try { + apiInstance.testAdditionalPropertiesReference(additionalProperties); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testAdditionalPropertiesReference"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + + +| Name | Type | Description | Notes | +|------------- | ------------- | ------------- | -------------| +| **additionalProperties** | [**AdditionalProperties**](AdditionalProperties.md)| request body | | + +### Return type + +null (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: application/json +- **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | successful operation | - | + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md new file mode 100644 index 000000000000..a5ddf0faa6a9 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md @@ -0,0 +1,15 @@ + + +# MixedPropertiesAndAdditionalPropertiesClass + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**uuid** | **UUID** | | [optional] | +|**dateTime** | **OffsetDateTime** | | [optional] | +|**map** | [**Map<String, Animal>**](Animal.md) | | [optional] | + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/git_push.sh b/samples/client/petstore/java/resttemplate-generateAliasAsModel/git_push.sh new file mode 100644 index 000000000000..f53a75d4fabe --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/git_push.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ +# +# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com" + +git_user_id=$1 +git_repo_id=$2 +release_note=$3 +git_host=$4 + +if [ "$git_host" = "" ]; then + git_host="github.com" + echo "[INFO] No command line input provided. Set \$git_host to $git_host" +fi + +if [ "$git_user_id" = "" ]; then + git_user_id="GIT_USER_ID" + echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id" +fi + +if [ "$git_repo_id" = "" ]; then + git_repo_id="GIT_REPO_ID" + echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id" +fi + +if [ "$release_note" = "" ]; then + release_note="Minor update" + echo "[INFO] No command line input provided. Set \$release_note to $release_note" +fi + +# Initialize the local directory as a Git repository +git init + +# Adds the files in the local repository and stages them for commit. +git add . + +# Commits the tracked changes and prepares them to be pushed to a remote repository. +git commit -m "$release_note" + +# Sets the new remote +git_remote=$(git remote) +if [ "$git_remote" = "" ]; then # git remote not defined + + if [ "$GIT_TOKEN" = "" ]; then + echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." + git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git + else + git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git + fi + +fi + +git pull origin master + +# Pushes (Forces) the changes in the local repository up to the remote repository +echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git" +git push origin master 2>&1 | grep -v 'To https' diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle.properties b/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle.properties new file mode 100644 index 000000000000..a3408578278a --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle.properties @@ -0,0 +1,6 @@ +# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator). +# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option. +# +# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties +# For example, uncomment below to build for Android +#target = android diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} +case $link in #( +/*) app_path=$link ;; #( +*) app_path=$APP_HOME$link ;; +esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { +echo "$*" +} >&2 + +die () { +echo +echo "$*" +echo +exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( +CYGWIN* ) cygwin=true ;; #( +Darwin* ) darwin=true ;; #( +MSYS* | MINGW* ) msys=true ;; #( +NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then +if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +# IBM's JDK on AIX uses strange locations for the executables +JAVACMD=$JAVA_HOME/jre/sh/java +else +JAVACMD=$JAVA_HOME/bin/java +fi +if [ ! -x "$JAVACMD" ] ; then +die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +else +JAVACMD=java +if ! command -v java >/dev/null 2>&1 +then +die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then +case $MAX_FD in #( +max*) +# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +MAX_FD=$( ulimit -H -n ) || +warn "Could not query maximum file descriptor limit" +esac +case $MAX_FD in #( +'' | soft) :;; #( +*) +# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +ulimit -n "$MAX_FD" || +warn "Could not set maximum file descriptor limit to $MAX_FD" +esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then +APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) +CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + +JAVACMD=$( cygpath --unix "$JAVACMD" ) + +# Now convert the arguments - kludge to limit ourselves to /bin/sh +for arg do +if +case $arg in #( +-*) false ;; # don't mess with options #( +/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath +[ -e "$t" ] ;; #( +*) false ;; +esac +then +arg=$( cygpath --path --ignore --mixed "$arg" ) +fi +# Roll the args list around exactly as many times as the number of +# args, so each arg winds up back in the position where it started, but +# possibly modified. +# +# NB: a `for` loop captures its iteration list before it begins, so +# changing the positional parameters here affects neither the number of +# iterations, nor the values presented in `arg`. +shift # remove old arg +set -- "$@" "$arg" # push replacement arg +done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ +"-Dorg.gradle.appname=$APP_BASE_NAME" \ +-classpath "$CLASSPATH" \ +org.gradle.wrapper.GradleWrapperMain \ +"$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then +die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( +printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | +xargs -n1 | +sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | +tr '\n' ' ' +)" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradlew.bat b/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradlew.bat new file mode 100644 index 000000000000..25da30dbdeee --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/pom.xml b/samples/client/petstore/java/resttemplate-generateAliasAsModel/pom.xml new file mode 100644 index 000000000000..7436680f44a0 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/pom.xml @@ -0,0 +1,285 @@ + + 4.0.0 + org.openapitools + petstore-resttemplate-generateAliasAsModel + jar + petstore-resttemplate-generateAliasAsModel + 1.0.0 + https://github.com/openapitools/openapi-generator + OpenAPI Java + + scm:git:git@github.com:openapitools/openapi-generator.git + scm:git:git@github.com:openapitools/openapi-generator.git + https://github.com/openapitools/openapi-generator + + + + + Unlicense + http://unlicense.org + repo + + + + + + OpenAPI-Generator Contributors + team@openapitools.org + OpenAPITools.org + http://openapitools.org + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.4.0 + + + enforce-maven + + enforce + + + + + 2.2.0 + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + + + + loggerPath + conf/log4j.properties + + + -Xms512m -Xmx1500m + methods + false + true + + + + + org.junit.jupiter + junit-jupiter-engine + ${junit-version} + + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + + test-jar + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.4.0 + + + add_sources + generate-sources + + add-source + + + + src/main/java + + + + + add_test_sources + generate-test-sources + + add-test-source + + + + src/test/java + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 17 + 17 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + none + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + + + + + sign-artifacts + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + + + + + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + + + org.springframework + spring-web + ${spring-web-version} + + + org.springframework + spring-context + ${spring-web-version} + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson-version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind-version} + + + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider + ${jackson-version} + + + org.openapitools + jackson-databind-nullable + ${jackson-databind-nullable-version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson-version} + + + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} + provided + + + + + org.junit.jupiter + junit-jupiter-engine + ${junit-version} + test + + + + UTF-8 + 2.17.1 + 2.17.1 + 0.2.6 + 6.1.14 + 2.1.1 + 3.0.2 + 5.10.2 + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/settings.gradle b/samples/client/petstore/java/resttemplate-generateAliasAsModel/settings.gradle new file mode 100644 index 000000000000..32367055ed7f --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "petstore-resttemplate-generateAliasAsModel" \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/AndroidManifest.xml b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/AndroidManifest.xml new file mode 100644 index 000000000000..54fbcb3da1e8 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ApiClient.java new file mode 100644 index 000000000000..31193e4012cc --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ApiClient.java @@ -0,0 +1,814 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpRequest; +import org.springframework.http.HttpStatus; +import org.springframework.http.InvalidMediaTypeException; +import org.springframework.http.MediaType; +import org.springframework.http.RequestEntity; +import org.springframework.http.RequestEntity.BodyBuilder; +import org.springframework.http.ResponseEntity; +import org.springframework.http.client.BufferingClientHttpRequestFactory; +import org.springframework.http.client.ClientHttpRequestExecution; +import org.springframework.http.client.ClientHttpRequestInterceptor; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.util.StringUtils; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.client.HttpServerErrorException; +import org.springframework.web.client.RestClientException; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.util.UriComponentsBuilder; +import org.springframework.web.util.DefaultUriBuilderFactory; +import org.openapitools.jackson.nullable.JsonNullableModule; + + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.text.DateFormat; +import java.text.ParseException; +import java.util.Arrays; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.TimeZone; +import java.util.function.Supplier; +import java.time.OffsetDateTime; + +import org.openapitools.client.auth.Authentication; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class ApiClient extends JavaTimeFormatter { + public enum CollectionFormat { + CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null); + + private final String separator; + + private CollectionFormat(String separator) { + this.separator = separator; + } + + private String collectionToString(Collection collection) { + return StringUtils.collectionToDelimitedString(collection, separator); + } + } + + private boolean debugging = false; + + private HttpHeaders defaultHeaders = new HttpHeaders(); + private MultiValueMap defaultCookies = new LinkedMultiValueMap(); + + private int maxAttemptsForRetry = 1; + + private long waitTimeMillis = 10; + + private String basePath = "http://localhost"; + + private RestTemplate restTemplate; + + private Map authentications; + + private DateFormat dateFormat; + + public ApiClient() { + this.restTemplate = buildRestTemplate(); + init(); + } + + public ApiClient(RestTemplate restTemplate) { + this.restTemplate = restTemplate; + init(); + } + + protected void init() { + // Use RFC3339 format for date and datetime. + // See http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14 + this.dateFormat = new RFC3339DateFormat(); + + // Use UTC as the default time zone. + this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + + // Set default User-Agent. + setUserAgent("Java-SDK"); + + // Setup authentications (key: authentication name, value: authentication). + authentications = new HashMap(); + // Prevent the authentications from being modified. + authentications = Collections.unmodifiableMap(authentications); + } + + /** + * Get the current base path + * + * @return String the base path + */ + public String getBasePath() { + return basePath; + } + + /** + * Set the base path, which should include the host + * + * @param basePath the base path + * @return ApiClient this client + */ + public ApiClient setBasePath(String basePath) { + this.basePath = basePath; + return this; + } + + /** + * Get the max attempts for retry + * + * @return int the max attempts + */ + public int getMaxAttemptsForRetry() { + return maxAttemptsForRetry; + } + + /** + * Set the max attempts for retry + * + * @param maxAttemptsForRetry the max attempts for retry + * @return ApiClient this client + */ + public ApiClient setMaxAttemptsForRetry(int maxAttemptsForRetry) { + this.maxAttemptsForRetry = maxAttemptsForRetry; + return this; + } + + /** + * Get the wait time in milliseconds + * + * @return long wait time in milliseconds + */ + public long getWaitTimeMillis() { + return waitTimeMillis; + } + + /** + * Set the wait time in milliseconds + * + * @param waitTimeMillis the wait time in milliseconds + * @return ApiClient this client + */ + public ApiClient setWaitTimeMillis(long waitTimeMillis) { + this.waitTimeMillis = waitTimeMillis; + return this; + } + + /** + * Get authentications (key: authentication name, value: authentication). + * + * @return Map the currently configured authentication types + */ + public Map getAuthentications() { + return authentications; + } + + /** + * Get authentication for the given name. + * + * @param authName The authentication name + * @return The authentication, null if not found + */ + public Authentication getAuthentication(String authName) { + return authentications.get(authName); + } + + + + + + /** + * Set the User-Agent header's value (by adding to the default header map). + * + * @param userAgent the user agent string + * @return ApiClient this client + */ + public ApiClient setUserAgent(String userAgent) { + addDefaultHeader("User-Agent", userAgent); + return this; + } + + /** + * Add a default header. + * + * @param name The header's name + * @param value The header's value + * @return ApiClient this client + */ + public ApiClient addDefaultHeader(String name, String value) { + if (defaultHeaders.containsKey(name)) { + defaultHeaders.remove(name); + } + defaultHeaders.add(name, value); + return this; + } + + /** + * Add a default cookie. + * + * @param name The cookie's name + * @param value The cookie's value + * @return ApiClient this client + */ + public ApiClient addDefaultCookie(String name, String value) { + if (defaultCookies.containsKey(name)) { + defaultCookies.remove(name); + } + defaultCookies.add(name, value); + return this; + } + + public void setDebugging(boolean debugging) { + List currentInterceptors = this.restTemplate.getInterceptors(); + if (debugging) { + if (currentInterceptors == null) { + currentInterceptors = new ArrayList(); + } + ClientHttpRequestInterceptor interceptor = new ApiClientHttpRequestInterceptor(); + currentInterceptors.add(interceptor); + this.restTemplate.setInterceptors(currentInterceptors); + } else { + if (currentInterceptors != null && !currentInterceptors.isEmpty()) { + Iterator iter = currentInterceptors.iterator(); + while (iter.hasNext()) { + ClientHttpRequestInterceptor interceptor = iter.next(); + if (interceptor instanceof ApiClientHttpRequestInterceptor) { + iter.remove(); + } + } + this.restTemplate.setInterceptors(currentInterceptors); + } + } + this.debugging = debugging; + } + + /** + * Check that whether debugging is enabled for this API client. + * @return boolean true if this client is enabled for debugging, false otherwise + */ + public boolean isDebugging() { + return debugging; + } + + /** + * Get the date format used to parse/format date parameters. + * @return DateFormat format + */ + public DateFormat getDateFormat() { + return dateFormat; + } + + /** + * Set the date format used to parse/format date parameters. + * @param dateFormat Date format + * @return API client + */ + public ApiClient setDateFormat(DateFormat dateFormat) { + this.dateFormat = dateFormat; + return this; + } + + /** + * Parse the given string into Date object. + * + * @param str the string to parse + * @return the Date parsed from the string + */ + public Date parseDate(String str) { + try { + return dateFormat.parse(str); + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + + /** + * Format the given Date object into string. + * + * @param date the date to format + * @return the formatted date as string + */ + public String formatDate(Date date) { + return dateFormat.format(date); + } + + /** + * Format the given parameter object into string. + * + * @param param the object to convert + * @return String the parameter represented as a String + */ + public String parameterToString(Object param) { + if (param == null) { + return ""; + } else if (param instanceof Date) { + return formatDate( (Date) param); + } else if (param instanceof OffsetDateTime) { + return formatOffsetDateTime((OffsetDateTime) param); + } else if (param instanceof Collection) { + StringBuilder b = new StringBuilder(); + for (Object o : (Collection) param) { + if (b.length() > 0) { + b.append(","); + } + b.append(String.valueOf(o)); + } + return b.toString(); + } else { + return String.valueOf(param); + } + } + + /** + * Formats the specified collection path parameter to a string value. + * + * @param collectionFormat The collection format of the parameter. + * @param values The values of the parameter. + * @return String representation of the parameter + */ + public String collectionPathParameterToString(CollectionFormat collectionFormat, Collection values) { + // create the value based on the collection format + if (CollectionFormat.MULTI.equals(collectionFormat)) { + // not valid for path params + return parameterToString(values); + } + + // collectionFormat is assumed to be "csv" by default + if (collectionFormat == null) { + collectionFormat = CollectionFormat.CSV; + } + + return collectionFormat.collectionToString(values); + } + + /** + * Converts a parameter to a {@link MultiValueMap} for use in REST requests + * + * @param collectionFormat The format to convert to + * @param name The name of the parameter + * @param value The parameter's value + * @return a Map containing the String value(s) of the input parameter + */ + public MultiValueMap parameterToMultiValueMap(CollectionFormat collectionFormat, String name, Object value) { + final MultiValueMap params = new LinkedMultiValueMap(); + + if (name == null || name.isEmpty() || value == null) { + return params; + } + + if (collectionFormat == null) { + collectionFormat = CollectionFormat.CSV; + } + + if (value instanceof Map) { + @SuppressWarnings("unchecked") + final Map valuesMap = (Map) value; + for (final Entry entry : valuesMap.entrySet()) { + params.add(entry.getKey(), parameterToString(entry.getValue())); + } + return params; + } + + Collection valueCollection = null; + if (value instanceof Collection) { + valueCollection = (Collection) value; + } else { + params.add(name, parameterToString(value)); + return params; + } + + if (valueCollection.isEmpty()) { + return params; + } + + if (collectionFormat.equals(CollectionFormat.MULTI)) { + for (Object item : valueCollection) { + params.add(name, parameterToString(item)); + } + return params; + } + + List values = new ArrayList(); + for (Object o : valueCollection) { + values.add(parameterToString(o)); + } + params.add(name, collectionFormat.collectionToString(values)); + + return params; + } + + /** + * Check if the given {@code String} is a JSON MIME. + * + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents JSON, false otherwise + */ + public boolean isJsonMime(String mediaType) { + // "* / *" is default to JSON + if ("*/*".equals(mediaType)) { + return true; + } + + try { + return isJsonMime(MediaType.parseMediaType(mediaType)); + } catch (InvalidMediaTypeException e) { + } + return false; + } + + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents JSON, false otherwise + */ + public boolean isJsonMime(MediaType mediaType) { + return mediaType != null && (MediaType.APPLICATION_JSON.isCompatibleWith(mediaType) || mediaType.getSubtype().matches("^.*\\+json[;]?\\s*$")); + } + + /** + * Check if the given {@code String} is a Problem JSON MIME (RFC-7807). + * + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents Problem JSON, false otherwise + */ + public boolean isProblemJsonMime(String mediaType) { + return "application/problem+json".equalsIgnoreCase(mediaType); + } + + /** + * Select the Accept header's value from the given accepts array: + * if JSON exists in the given array, use it; + * otherwise use all of them (joining into a string) + * + * @param accepts The accepts array to select from + * @return List The list of MediaTypes to use for the Accept header + */ + public List selectHeaderAccept(String[] accepts) { + if (accepts.length == 0) { + return null; + } + for (String accept : accepts) { + MediaType mediaType = MediaType.parseMediaType(accept); + if (isJsonMime(mediaType) && !isProblemJsonMime(accept)) { + return Collections.singletonList(mediaType); + } + } + return MediaType.parseMediaTypes(StringUtils.arrayToCommaDelimitedString(accepts)); + } + + /** + * Select the Content-Type header's value from the given array: + * if JSON exists in the given array, use it; + * otherwise use the first one of the array. + * + * @param contentTypes The Content-Type array to select from + * @return MediaType The Content-Type header to use. If the given array is empty, JSON will be used. + */ + public MediaType selectHeaderContentType(String[] contentTypes) { + if (contentTypes.length == 0) { + return MediaType.APPLICATION_JSON; + } + for (String contentType : contentTypes) { + MediaType mediaType = MediaType.parseMediaType(contentType); + if (isJsonMime(mediaType)) { + return mediaType; + } + } + return MediaType.parseMediaType(contentTypes[0]); + } + + /** + * Select the body to use for the request + * + * @param obj the body object + * @param formParams the form parameters + * @param contentType the content type of the request + * @return Object the selected body + */ + protected Object selectBody(Object obj, MultiValueMap formParams, MediaType contentType) { + boolean isForm = MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType) || MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(contentType); + return isForm ? formParams : obj; + } + + /** + * Expand path template with variables + * + * @param pathTemplate path template with placeholders + * @param variables variables to replace + * @return path with placeholders replaced by variables + */ + public String expandPath(String pathTemplate, Map variables) { + return restTemplate.getUriTemplateHandler().expand(pathTemplate, variables).toString(); + } + + /** + * Include queryParams in uriParams taking into account the paramName + * + * @param queryParams The query parameters + * @param uriParams The path parameters + * return templatized query string + */ + public String generateQueryUri(MultiValueMap queryParams, Map uriParams) { + StringBuilder queryBuilder = new StringBuilder(); + queryParams.forEach((name, values) -> { + try { + final String encodedName = URLEncoder.encode(name.toString(), "UTF-8"); + if (CollectionUtils.isEmpty(values)) { + if (queryBuilder.length() != 0) { + queryBuilder.append('&'); + } + queryBuilder.append(encodedName); + } else { + int valueItemCounter = 0; + for (Object value : values) { + if (queryBuilder.length() != 0) { + queryBuilder.append('&'); + } + queryBuilder.append(encodedName); + if (value != null) { + String templatizedKey = encodedName + valueItemCounter++; + uriParams.put(templatizedKey, value.toString()); + queryBuilder.append('=').append("{").append(templatizedKey).append("}"); + } + } + } + } catch (UnsupportedEncodingException e) { + + } + }); + return queryBuilder.toString(); + + } + + /** + * Invoke API by sending HTTP request with the given options. + * + * @param the return type to use + * @param path The sub-path of the HTTP URL + * @param method The request method + * @param pathParams The path parameters + * @param queryParams The query parameters + * @param body The request body object + * @param headerParams The header parameters + * @param cookieParams The cookie parameters + * @param formParams The form parameters + * @param accept The request's Accept header + * @param contentType The request's Content-Type header + * @param authNames The authentications to apply + * @param returnType The return type into which to deserialize the response + * @return ResponseEntity<T> The response of the chosen type + */ + public ResponseEntity invokeAPI(String path, HttpMethod method, Map pathParams, MultiValueMap queryParams, Object body, HttpHeaders headerParams, MultiValueMap cookieParams, MultiValueMap formParams, List accept, MediaType contentType, String[] authNames, ParameterizedTypeReference returnType) throws RestClientException { + updateParamsForAuth(authNames, queryParams, headerParams, cookieParams); + + Map uriParams = new HashMap<>(); + uriParams.putAll(pathParams); + + String finalUri = path; + + if (queryParams != null && !queryParams.isEmpty()) { + //Include queryParams in uriParams taking into account the paramName + String queryUri = generateQueryUri(queryParams, uriParams); + //Append to finalUri the templatized query string like "?param1={param1Value}&....... + finalUri += "?" + queryUri; + } + String expandedPath = this.expandPath(finalUri, uriParams); + final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(expandedPath); + + URI uri; + try { + uri = new URI(builder.build().toUriString()); + } catch (URISyntaxException ex) { + throw new RestClientException("Could not build URL: " + builder.toUriString(), ex); + } + + final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromHttpUrl(basePath).toUriString() + finalUri, uriParams); + if (accept != null) { + requestBuilder.accept(accept.toArray(new MediaType[accept.size()])); + } + if (contentType != null) { + requestBuilder.contentType(contentType); + } + + addHeadersToRequest(headerParams, requestBuilder); + addHeadersToRequest(defaultHeaders, requestBuilder); + addCookiesToRequest(cookieParams, requestBuilder); + addCookiesToRequest(defaultCookies, requestBuilder); + + RequestEntity requestEntity = requestBuilder.body(selectBody(body, formParams, contentType)); + + ResponseEntity responseEntity = null; + int attempts = 0; + while (attempts < maxAttemptsForRetry) { + try { + responseEntity = restTemplate.exchange(requestEntity, returnType); + break; + } catch (HttpServerErrorException | HttpClientErrorException ex) { + if (ex instanceof HttpServerErrorException + || ((HttpClientErrorException) ex) + .getStatusCode() + .equals(HttpStatus.TOO_MANY_REQUESTS)) { + attempts++; + if (attempts < maxAttemptsForRetry) { + try { + Thread.sleep(waitTimeMillis); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } else { + throw ex; + } + } else { + throw ex; + } + } + } + + if (responseEntity == null) { + throw new RestClientException("ResponseEntity is null"); + } + + if (responseEntity.getStatusCode().is2xxSuccessful()) { + return responseEntity; + } else { + // The error handler built into the RestTemplate should handle 400 and 500 series errors. + throw new RestClientException("API returned " + responseEntity.getStatusCode() + " and it wasn't handled by the RestTemplate error handler"); + } + } + + /** + * Add headers to the request that is being built + * @param headers The headers to add + * @param requestBuilder The current request + */ + protected void addHeadersToRequest(HttpHeaders headers, BodyBuilder requestBuilder) { + for (Entry> entry : headers.entrySet()) { + List values = entry.getValue(); + for (String value : values) { + if (value != null) { + requestBuilder.header(entry.getKey(), value); + } + } + } + } + + /** + * Add cookies to the request that is being built + * + * @param cookies The cookies to add + * @param requestBuilder The current request + */ + protected void addCookiesToRequest(MultiValueMap cookies, BodyBuilder requestBuilder) { + if (!cookies.isEmpty()) { + requestBuilder.header("Cookie", buildCookieHeader(cookies)); + } + } + + /** + * Build cookie header. Keeps a single value per cookie (as per + * RFC6265 section 5.3). + * + * @param cookies map all cookies + * @return header string for cookies. + */ + private String buildCookieHeader(MultiValueMap cookies) { + final StringBuilder cookieValue = new StringBuilder(); + String delimiter = ""; + for (final Map.Entry> entry : cookies.entrySet()) { + final String value = entry.getValue().get(entry.getValue().size() - 1); + cookieValue.append(String.format("%s%s=%s", delimiter, entry.getKey(), value)); + delimiter = "; "; + } + return cookieValue.toString(); + } + + /** + * Build the RestTemplate used to make HTTP requests. + * @return RestTemplate + */ + protected RestTemplate buildRestTemplate() { + RestTemplate restTemplate = new RestTemplate(); + // This allows us to read the response more than once - Necessary for debugging. + restTemplate.setRequestFactory(new BufferingClientHttpRequestFactory(restTemplate.getRequestFactory())); + + // disable default URL encoding + DefaultUriBuilderFactory uriBuilderFactory = new DefaultUriBuilderFactory(); + uriBuilderFactory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.VALUES_ONLY); + restTemplate.setUriTemplateHandler(uriBuilderFactory); + return restTemplate; + } + + /** + * Update query and header parameters based on authentication settings. + * + * @param authNames The authentications to apply + * @param queryParams The query parameters + * @param headerParams The header parameters + */ + protected void updateParamsForAuth(String[] authNames, MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + for (String authName : authNames) { + Authentication auth = authentications.get(authName); + if (auth == null) { + throw new RestClientException("Authentication undefined: " + authName); + } + auth.applyToParams(queryParams, headerParams, cookieParams); + } + } + + private class ApiClientHttpRequestInterceptor implements ClientHttpRequestInterceptor { + private final Log log = LogFactory.getLog(ApiClientHttpRequestInterceptor.class); + + @Override + public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { + logRequest(request, body); + ClientHttpResponse response = execution.execute(request, body); + logResponse(response); + return response; + } + + private void logRequest(HttpRequest request, byte[] body) throws UnsupportedEncodingException { + log.info("URI: " + request.getURI()); + log.info("HTTP Method: " + request.getMethod()); + log.info("HTTP Headers: " + headersToString(request.getHeaders())); + log.info("Request Body: " + new String(body, StandardCharsets.UTF_8)); + } + + private void logResponse(ClientHttpResponse response) throws IOException { + log.info("HTTP Status Code: " + response.getStatusCode().value()); + log.info("Status Text: " + response.getStatusText()); + log.info("HTTP Headers: " + headersToString(response.getHeaders())); + log.info("Response Body: " + bodyToString(response.getBody())); + } + + private String headersToString(HttpHeaders headers) { + if(headers == null || headers.isEmpty()) { + return ""; + } + StringBuilder builder = new StringBuilder(); + for (Entry> entry : headers.entrySet()) { + builder.append(entry.getKey()).append("=["); + for (String value : entry.getValue()) { + builder.append(value).append(","); + } + builder.setLength(builder.length() - 1); // Get rid of trailing comma + builder.append("],"); + } + builder.setLength(builder.length() - 1); // Get rid of trailing comma + return builder.toString(); + } + + private String bodyToString(InputStream body) throws IOException { + StringBuilder builder = new StringBuilder(); + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(body, StandardCharsets.UTF_8)); + String line = bufferedReader.readLine(); + while (line != null) { + builder.append(line).append(System.lineSeparator()); + line = bufferedReader.readLine(); + } + bufferedReader.close(); + return builder.toString(); + } + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/BaseApi.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/BaseApi.java new file mode 100644 index 000000000000..f747a96a0599 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/BaseApi.java @@ -0,0 +1,87 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import org.springframework.web.client.RestClientException; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public abstract class BaseApi { + + protected ApiClient apiClient; + + public BaseApi() { + this(new ApiClient()); + } + + public BaseApi(ApiClient apiClient) { + this.apiClient = apiClient; + } + + public ApiClient getApiClient() { + return apiClient; + } + + public void setApiClient(ApiClient apiClient) { + this.apiClient = apiClient; + } + + /** + * Directly invoke the API for the given URL. Useful if the API returns direct links/URLs for subsequent requests. + * @param url The URL for the request, either full URL or only the path. + * @param method The HTTP method for the request. + * @return ResponseEntity<Void> + * @throws RestClientException if an error occurs while attempting to invoke the API + */ + public ResponseEntity invokeAPI(String url, HttpMethod method) throws RestClientException { + return invokeAPI(url, method, null, new ParameterizedTypeReference() {}); + } + + /** + * Directly invoke the API for the given URL. Useful if the API returns direct links/URLs for subsequent requests. + * @param url The URL for the request, either full URL or only the path. + * @param method The HTTP method for the request. + * @param request The request object. + * @return ResponseEntity<Void> + * @throws RestClientException if an error occurs while attempting to invoke the API + */ + public ResponseEntity invokeAPI(String url, HttpMethod method, Object request) throws RestClientException { + return invokeAPI(url, method, request, new ParameterizedTypeReference() {}); + } + + /** + * Directly invoke the API for the given URL. Useful if the API returns direct links/URLs for subsequent requests. + * @param url The URL for the request, either full URL or only the path. + * @param method The HTTP method for the request. + * @param returnType The return type. + * @return ResponseEntity in the specified type. + * @throws RestClientException if an error occurs while attempting to invoke the API + */ + public ResponseEntity invokeAPI(String url, HttpMethod method, ParameterizedTypeReference returnType) throws RestClientException { + return invokeAPI(url, method, null, returnType); + } + + /** + * Directly invoke the API for the given URL. Useful if the API returns direct links/URLs for subsequent requests. + * @param url The URL for the request, either full URL or only the path. + * @param method The HTTP method for the request. + * @param request The request object. + * @param returnType The return type. + * @return ResponseEntity in the specified type. + * @throws RestClientException if an error occurs while attempting to invoke the API + */ + public abstract ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException; +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/JavaTimeFormatter.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/JavaTimeFormatter.java new file mode 100644 index 000000000000..c3ec1fa7be8c --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/JavaTimeFormatter.java @@ -0,0 +1,64 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; + +/** + * Class that add parsing/formatting support for Java 8+ {@code OffsetDateTime} class. + * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}. + */ +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class JavaTimeFormatter { + + private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME; + + /** + * Get the date format used to parse/format {@code OffsetDateTime} parameters. + * @return DateTimeFormatter + */ + public DateTimeFormatter getOffsetDateTimeFormatter() { + return offsetDateTimeFormatter; + } + + /** + * Set the date format used to parse/format {@code OffsetDateTime} parameters. + * @param offsetDateTimeFormatter {@code DateTimeFormatter} + */ + public void setOffsetDateTimeFormatter(DateTimeFormatter offsetDateTimeFormatter) { + this.offsetDateTimeFormatter = offsetDateTimeFormatter; + } + + /** + * Parse the given string into {@code OffsetDateTime} object. + * @param str String + * @return {@code OffsetDateTime} + */ + public OffsetDateTime parseOffsetDateTime(String str) { + try { + return OffsetDateTime.parse(str, offsetDateTimeFormatter); + } catch (DateTimeParseException e) { + throw new RuntimeException(e); + } + } + /** + * Format the given {@code OffsetDateTime} object into string. + * @param offsetDateTime {@code OffsetDateTime} + * @return {@code OffsetDateTime} in string format + */ + public String formatOffsetDateTime(OffsetDateTime offsetDateTime) { + return offsetDateTimeFormatter.format(offsetDateTime); + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339DateFormat.java new file mode 100644 index 000000000000..506639a06425 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339DateFormat.java @@ -0,0 +1,58 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import com.fasterxml.jackson.databind.util.StdDateFormat; + +import java.text.DateFormat; +import java.text.FieldPosition; +import java.text.ParsePosition; +import java.util.Date; +import java.text.DecimalFormat; +import java.util.GregorianCalendar; +import java.util.TimeZone; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class RFC3339DateFormat extends DateFormat { + private static final long serialVersionUID = 1L; + private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); + + private final StdDateFormat fmt = new StdDateFormat() + .withTimeZone(TIMEZONE_Z) + .withColonInTimeZone(true); + + public RFC3339DateFormat() { + this.calendar = new GregorianCalendar(); + this.numberFormat = new DecimalFormat(); + } + + @Override + public Date parse(String source) { + return parse(source, new ParsePosition(0)); + } + + @Override + public Date parse(String source, ParsePosition pos) { + return fmt.parse(source, pos); + } + + @Override + public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { + return fmt.format(date, toAppendTo, fieldPosition); + } + + @Override + public Object clone() { + return super.clone(); + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java new file mode 100644 index 000000000000..ec00ea89b684 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java @@ -0,0 +1,100 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import java.io.IOException; +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.util.function.BiFunction; +import java.util.function.Function; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeFeature; +import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class RFC3339InstantDeserializer extends InstantDeserializer { + + private final static boolean DEFAULT_NORMALIZE_ZONE_ID = JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID.enabledByDefault(); + private final static boolean DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + = JavaTimeFeature.ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS.enabledByDefault(); + + public static final RFC3339InstantDeserializer INSTANT = new RFC3339InstantDeserializer<>( + Instant.class, DateTimeFormatter.ISO_INSTANT, + Instant::from, + a -> Instant.ofEpochMilli( a.value ), + a -> Instant.ofEpochSecond( a.integer, a.fraction ), + null, + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer OFFSET_DATE_TIME = new RFC3339InstantDeserializer<>( + OffsetDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME, + OffsetDateTime::from, + a -> OffsetDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> OffsetDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + (d, z) -> ( d.isEqual( OffsetDateTime.MIN ) || d.isEqual( OffsetDateTime.MAX ) ? + d : + d.withOffsetSameInstant( z.getRules().getOffset( d.toLocalDateTime() ) ) ), + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer ZONED_DATE_TIME = new RFC3339InstantDeserializer<>( + ZonedDateTime.class, DateTimeFormatter.ISO_ZONED_DATE_TIME, + ZonedDateTime::from, + a -> ZonedDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> ZonedDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + ZonedDateTime::withZoneSameInstant, + false, // keep zero offset and Z separate since zones explicitly supported + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + protected RFC3339InstantDeserializer( + Class supportedType, + DateTimeFormatter formatter, + Function parsedToValue, + Function fromMilliseconds, + Function fromNanoseconds, + BiFunction adjust, + boolean replaceZeroOffsetAsZ, + boolean normalizeZoneId, + boolean readNumericStringsAsTimestamp) { + super( + supportedType, + formatter, + parsedToValue, + fromMilliseconds, + fromNanoseconds, + adjust, + replaceZeroOffsetAsZ, + normalizeZoneId, + readNumericStringsAsTimestamp + ); + } + + @Override + protected T _fromString(JsonParser p, DeserializationContext ctxt, String string0) throws IOException { + return super._fromString(p, ctxt, string0.replace( ' ', 'T' )); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java new file mode 100644 index 000000000000..197f8c344b29 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java @@ -0,0 +1,31 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; + +import com.fasterxml.jackson.databind.module.SimpleModule; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class RFC3339JavaTimeModule extends SimpleModule { + + public RFC3339JavaTimeModule() { + super("RFC3339JavaTimeModule"); + + addDeserializer(Instant.class, RFC3339InstantDeserializer.INSTANT); + addDeserializer(OffsetDateTime.class, RFC3339InstantDeserializer.OFFSET_DATE_TIME); + addDeserializer(ZonedDateTime.class, RFC3339InstantDeserializer.ZONED_DATE_TIME); + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerConfiguration.java new file mode 100644 index 000000000000..7290219322af --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerConfiguration.java @@ -0,0 +1,72 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import java.util.Map; + +/** + * Representing a Server configuration. + */ +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class ServerConfiguration { + public String URL; + public String description; + public Map variables; + + /** + * @param URL A URL to the target host. + * @param description A description of the host designated by the URL. + * @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template. + */ + public ServerConfiguration(String URL, String description, Map variables) { + this.URL = URL; + this.description = description; + this.variables = variables; + } + + /** + * Format URL template using given variables. + * + * @param variables A map between a variable name and its value. + * @return Formatted URL. + */ + public String URL(Map variables) { + String url = this.URL; + + // go through variables and replace placeholders + for (Map.Entry variable: this.variables.entrySet()) { + String name = variable.getKey(); + ServerVariable serverVariable = variable.getValue(); + String value = serverVariable.defaultValue; + + if (variables != null && variables.containsKey(name)) { + value = variables.get(name); + if (serverVariable.enumValues.size() > 0 && !serverVariable.enumValues.contains(value)) { + throw new IllegalArgumentException("The variable " + name + " in the server URL has invalid value " + value + "."); + } + } + url = url.replace("{" + name + "}", value); + } + return url; + } + + /** + * Format URL template using default server variables. + * + * @return Formatted URL. + */ + public String URL() { + return URL(null); + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerVariable.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerVariable.java new file mode 100644 index 000000000000..37b5d739f3a8 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/ServerVariable.java @@ -0,0 +1,37 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import java.util.HashSet; + +/** + * Representing a Server Variable for server URL template substitution. + */ +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class ServerVariable { + public String description; + public String defaultValue; + public HashSet enumValues = null; + + /** + * @param description A description for the server variable. + * @param defaultValue The default value to use for substitution. + * @param enumValues An enumeration of string values to be used if the substitution options are from a limited set. + */ + public ServerVariable(String description, String defaultValue, HashSet enumValues) { + this.description = description; + this.defaultValue = defaultValue; + this.enumValues = enumValues; + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/api/FakeApi.java new file mode 100644 index 000000000000..45929d97003b --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/api/FakeApi.java @@ -0,0 +1,108 @@ +package org.openapitools.client.api; + +import org.openapitools.client.ApiClient; +import org.openapitools.client.BaseApi; + +import org.openapitools.client.model.AdditionalProperties; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.stream.Collectors; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestClientException; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.core.io.FileSystemResource; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class FakeApi extends BaseApi { + + public FakeApi() { + super(new ApiClient()); + } + + public FakeApi(ApiClient apiClient) { + super(apiClient); + } + + /** + * test referenced additionalProperties + * + *

200 - successful operation + * @param additionalProperties request body (required) + * @throws RestClientException if an error occurs while attempting to invoke the API + */ + public void testAdditionalPropertiesReference(AdditionalProperties additionalProperties) throws RestClientException { + testAdditionalPropertiesReferenceWithHttpInfo(additionalProperties); + } + + /** + * test referenced additionalProperties + * + *

200 - successful operation + * @param additionalProperties request body (required) + * @return ResponseEntity<Void> + * @throws RestClientException if an error occurs while attempting to invoke the API + */ + public ResponseEntity testAdditionalPropertiesReferenceWithHttpInfo(AdditionalProperties additionalProperties) throws RestClientException { + Object localVarPostBody = additionalProperties; + + // verify the required parameter 'additionalProperties' is set + if (additionalProperties == null) { + throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'additionalProperties' when calling testAdditionalPropertiesReference"); + } + + + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final HttpHeaders localVarHeaderParams = new HttpHeaders(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + + final String[] localVarAccepts = { }; + final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); + final String[] localVarContentTypes = { + "application/json" + }; + final MediaType localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); + + String[] localVarAuthNames = new String[] { }; + + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + } + + @Override + public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { + String localVarPath = url.replace(apiClient.getBasePath(), ""); + Object localVarPostBody = request; + + final Map uriVariables = new HashMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final HttpHeaders localVarHeaderParams = new HttpHeaders(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + + final String[] localVarAccepts = { }; + final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); + final String[] localVarContentTypes = { + "application/json" + }; + final MediaType localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); + + String[] localVarAuthNames = new String[] { }; + + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java new file mode 100644 index 000000000000..f0825a136331 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java @@ -0,0 +1,75 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class ApiKeyAuth implements Authentication { + private final String location; + private final String paramName; + + private String apiKey; + private String apiKeyPrefix; + + public ApiKeyAuth(String location, String paramName) { + this.location = location; + this.paramName = paramName; + } + + public String getLocation() { + return location; + } + + public String getParamName() { + return paramName; + } + + public String getApiKey() { + return apiKey; + } + + public void setApiKey(String apiKey) { + this.apiKey = apiKey; + } + + public String getApiKeyPrefix() { + return apiKeyPrefix; + } + + public void setApiKeyPrefix(String apiKeyPrefix) { + this.apiKeyPrefix = apiKeyPrefix; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + if (apiKey == null) { + return; + } + String value; + if (apiKeyPrefix != null) { + value = apiKeyPrefix + " " + apiKey; + } else { + value = apiKey; + } + if (location.equals("query")) { + queryParams.add(paramName, value); + } else if (location.equals("header")) { + headerParams.add(paramName, value); + } else if (location.equals("cookie")) { + cookieParams.add(paramName, value); + } + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/Authentication.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/Authentication.java new file mode 100644 index 000000000000..dd7f1db34295 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/Authentication.java @@ -0,0 +1,27 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +public interface Authentication { + /** + * Apply authentication settings to header and / or query parameters. + * @param queryParams The query parameters for the request + * @param headerParams The header parameters for the request + * @param cookieParams The cookie parameters for the request + */ + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams); +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java new file mode 100644 index 000000000000..57c8028acc3a --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java @@ -0,0 +1,51 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import java.nio.charset.StandardCharsets; +import java.util.Base64; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class HttpBasicAuth implements Authentication { + private String username; + private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + if (username == null && password == null) { + return; + } + String str = (username == null ? "" : username) + ":" + (password == null ? "" : password); + headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8))); + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java new file mode 100644 index 000000000000..a8fe619f187f --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java @@ -0,0 +1,69 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import java.util.Optional; +import java.util.function.Supplier; +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class HttpBearerAuth implements Authentication { + private final String scheme; + private Supplier tokenSupplier; + + public HttpBearerAuth(String scheme) { + this.scheme = scheme; + } + + /** + * Gets the token, which together with the scheme, will be sent as the value of the Authorization header. + * + * @return The bearer token + */ + public String getBearerToken() { + return tokenSupplier.get(); + } + + /** + * Sets the token, which together with the scheme, will be sent as the value of the Authorization header. + * + * @param bearerToken The bearer token to send in the Authorization header + */ + public void setBearerToken(String bearerToken) { + this.tokenSupplier = () -> bearerToken; + } + + /** + * Sets the supplier of tokens, which together with the scheme, will be sent as the value of the Authorization header. + * + * @param tokenSupplier The supplier of bearer tokens to send in the Authorization header + */ + public void setBearerToken(Supplier tokenSupplier) { + this.tokenSupplier = tokenSupplier; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + String bearerToken = Optional.ofNullable(tokenSupplier).map(Supplier::get).orElse(null); + if (bearerToken == null) { + return; + } + headerParams.add(HttpHeaders.AUTHORIZATION, (scheme != null ? upperCaseBearer(scheme) + " " : "") + bearerToken); + } + + private static String upperCaseBearer(String scheme) { + return ("bearer".equalsIgnoreCase(scheme)) ? "Bearer" : scheme; + } +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalProperties.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalProperties.java new file mode 100644 index 000000000000..238b2aa92d3f --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalProperties.java @@ -0,0 +1,181 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.AdditionalPropertiesClass; +import org.openapitools.client.model.AdditionalPropertiesClassRef; +import org.openapitools.client.model.MixedPropertiesAndAdditionalPropertiesClass; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalProperties + */ +@JsonPropertyOrder({ + AdditionalProperties.JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS_REF, + AdditionalProperties.JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS, + AdditionalProperties.JSON_PROPERTY_MIXED +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalProperties { + public static final String JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS_REF = "additionalPropertiesClassRef"; + @jakarta.annotation.Nullable + private AdditionalPropertiesClassRef additionalPropertiesClassRef; + + public static final String JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS = "additionalPropertiesClass"; + @jakarta.annotation.Nullable + private AdditionalPropertiesClass additionalPropertiesClass; + + public static final String JSON_PROPERTY_MIXED = "mixed"; + @jakarta.annotation.Nullable + private MixedPropertiesAndAdditionalPropertiesClass mixed; + + public AdditionalProperties() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalProperties(@JsonProperty(JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS_REF) AdditionalPropertiesClassRef additionalPropertiesClassRef, @JsonProperty(JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS) AdditionalPropertiesClass additionalPropertiesClass, @JsonProperty(JSON_PROPERTY_MIXED) MixedPropertiesAndAdditionalPropertiesClass mixed) { + this.additionalPropertiesClassRef = additionalPropertiesClassRef; + this.additionalPropertiesClass = additionalPropertiesClass; + this.mixed = mixed; + } + + public AdditionalProperties additionalPropertiesClassRef(@jakarta.annotation.Nullable AdditionalPropertiesClassRef additionalPropertiesClassRef) { + + this.additionalPropertiesClassRef = additionalPropertiesClassRef; + return this; + } + + /** + * Get additionalPropertiesClassRef + * @return additionalPropertiesClassRef + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS_REF) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertiesClassRef getAdditionalPropertiesClassRef() { + return additionalPropertiesClassRef; + } + + + @JsonProperty(JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS_REF) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalPropertiesClassRef(@jakarta.annotation.Nullable AdditionalPropertiesClassRef additionalPropertiesClassRef) { + this.additionalPropertiesClassRef = additionalPropertiesClassRef; + } + + public AdditionalProperties additionalPropertiesClass(@jakarta.annotation.Nullable AdditionalPropertiesClass additionalPropertiesClass) { + + this.additionalPropertiesClass = additionalPropertiesClass; + return this; + } + + /** + * Get additionalPropertiesClass + * @return additionalPropertiesClass + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertiesClass getAdditionalPropertiesClass() { + return additionalPropertiesClass; + } + + + @JsonProperty(JSON_PROPERTY_ADDITIONAL_PROPERTIES_CLASS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalPropertiesClass(@jakarta.annotation.Nullable AdditionalPropertiesClass additionalPropertiesClass) { + this.additionalPropertiesClass = additionalPropertiesClass; + } + + public AdditionalProperties mixed(@jakarta.annotation.Nullable MixedPropertiesAndAdditionalPropertiesClass mixed) { + + this.mixed = mixed; + return this; + } + + /** + * Get mixed + * @return mixed + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MIXED) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public MixedPropertiesAndAdditionalPropertiesClass getMixed() { + return mixed; + } + + + @JsonProperty(JSON_PROPERTY_MIXED) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMixed(@jakarta.annotation.Nullable MixedPropertiesAndAdditionalPropertiesClass mixed) { + this.mixed = mixed; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalProperties additionalProperties = (AdditionalProperties) o; + return Objects.equals(this.additionalPropertiesClassRef, additionalProperties.additionalPropertiesClassRef) && + Objects.equals(this.additionalPropertiesClass, additionalProperties.additionalPropertiesClass) && + Objects.equals(this.mixed, additionalProperties.mixed); + } + + @Override + public int hashCode() { + return Objects.hash(additionalPropertiesClassRef, additionalPropertiesClass, mixed); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalProperties {\n"); + sb.append(" additionalPropertiesClassRef: ").append(toIndentedString(additionalPropertiesClassRef)).append("\n"); + sb.append(" additionalPropertiesClass: ").append(toIndentedString(additionalPropertiesClass)).append("\n"); + sb.append(" mixed: ").append(toIndentedString(mixed)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java new file mode 100644 index 000000000000..b16ddf86bd17 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -0,0 +1,161 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesAnyType + */ +@JsonPropertyOrder({ + AdditionalPropertiesAnyType.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesAnyType { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesAnyType() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesAnyType(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesAnyType name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; + return Objects.equals(this.name, additionalPropertiesAnyType.name) && + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesAnyType {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java new file mode 100644 index 000000000000..f3658dad9c55 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -0,0 +1,162 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.List; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesArray + */ +@JsonPropertyOrder({ + AdditionalPropertiesArray.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesArray { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesArray() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesArray(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesArray name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; + return Objects.equals(this.name, additionalPropertiesArray.name) && + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesArray {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java new file mode 100644 index 000000000000..450110d13137 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -0,0 +1,161 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesBoolean + */ +@JsonPropertyOrder({ + AdditionalPropertiesBoolean.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesBoolean { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesBoolean() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesBoolean(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesBoolean name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; + return Objects.equals(this.name, additionalPropertiesBoolean.name) && + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesBoolean {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java new file mode 100644 index 000000000000..df61370ca5ef --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -0,0 +1,533 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; +import com.fasterxml.jackson.annotation.JsonIgnore; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesClass + */ +@JsonPropertyOrder({ + AdditionalPropertiesClass.JSON_PROPERTY_MAP_STRING, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_NUMBER, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_INTEGER, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_BOOLEAN, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_INTEGER, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_ARRAY_ANYTYPE, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_STRING, + AdditionalPropertiesClass.JSON_PROPERTY_MAP_MAP_ANYTYPE, + AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE1, + AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2, + AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3 +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesClass { + public static final String JSON_PROPERTY_MAP_STRING = "map_string"; + @jakarta.annotation.Nullable + private Map mapString = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; + @jakarta.annotation.Nullable + private Map mapNumber = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; + @jakarta.annotation.Nullable + private Map mapInteger = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; + @jakarta.annotation.Nullable + private Map mapBoolean = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; + @jakarta.annotation.Nullable + private Map> mapArrayInteger = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; + @jakarta.annotation.Nullable + private Map> mapArrayAnytype = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; + @jakarta.annotation.Nullable + private Map> mapMapString = new HashMap<>(); + + public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; + @jakarta.annotation.Nullable + private Map> mapMapAnytype = new HashMap<>(); + + public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; + @jakarta.annotation.Nullable + private Object anytype1; + + public static final String JSON_PROPERTY_ANYTYPE2 = "anytype_2"; + @jakarta.annotation.Nullable + private JsonNullable anytype2 = JsonNullable.of(null); + + public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3"; + @jakarta.annotation.Nullable + private Object anytype3; + + public AdditionalPropertiesClass() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesClass(@JsonProperty(JSON_PROPERTY_MAP_STRING) Map mapString, @JsonProperty(JSON_PROPERTY_MAP_NUMBER) Map mapNumber, @JsonProperty(JSON_PROPERTY_MAP_INTEGER) Map mapInteger, @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) Map mapBoolean, @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) Map> mapArrayInteger, @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) Map> mapArrayAnytype, @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) Map> mapMapString, @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) Map> mapMapAnytype, @JsonProperty(JSON_PROPERTY_ANYTYPE1) Object anytype1, @JsonProperty(JSON_PROPERTY_ANYTYPE2) Object anytype2, @JsonProperty(JSON_PROPERTY_ANYTYPE3) Object anytype3) { + this.mapString = mapString; + this.mapNumber = mapNumber; + this.mapInteger = mapInteger; + this.mapBoolean = mapBoolean; + this.mapArrayInteger = mapArrayInteger; + this.mapArrayAnytype = mapArrayAnytype; + this.mapMapString = mapMapString; + this.mapMapAnytype = mapMapAnytype; + this.anytype1 = anytype1; + this.anytype2 = anytype2 == null ? JsonNullable.undefined() : JsonNullable.of(anytype2); + this.anytype3 = anytype3; + } + + public AdditionalPropertiesClass mapString(@jakarta.annotation.Nullable Map mapString) { + + this.mapString = mapString; + return this; + } + + public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) { + if (this.mapString == null) { + this.mapString = new HashMap<>(); + } + this.mapString.put(key, mapStringItem); + return this; + } + + /** + * Get mapString + * @return mapString + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map getMapString() { + return mapString; + } + + + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapString(@jakarta.annotation.Nullable Map mapString) { + this.mapString = mapString; + } + + public AdditionalPropertiesClass mapNumber(@jakarta.annotation.Nullable Map mapNumber) { + + this.mapNumber = mapNumber; + return this; + } + + public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) { + if (this.mapNumber == null) { + this.mapNumber = new HashMap<>(); + } + this.mapNumber.put(key, mapNumberItem); + return this; + } + + /** + * Get mapNumber + * @return mapNumber + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map getMapNumber() { + return mapNumber; + } + + + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapNumber(@jakarta.annotation.Nullable Map mapNumber) { + this.mapNumber = mapNumber; + } + + public AdditionalPropertiesClass mapInteger(@jakarta.annotation.Nullable Map mapInteger) { + + this.mapInteger = mapInteger; + return this; + } + + public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) { + if (this.mapInteger == null) { + this.mapInteger = new HashMap<>(); + } + this.mapInteger.put(key, mapIntegerItem); + return this; + } + + /** + * Get mapInteger + * @return mapInteger + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map getMapInteger() { + return mapInteger; + } + + + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapInteger(@jakarta.annotation.Nullable Map mapInteger) { + this.mapInteger = mapInteger; + } + + public AdditionalPropertiesClass mapBoolean(@jakarta.annotation.Nullable Map mapBoolean) { + + this.mapBoolean = mapBoolean; + return this; + } + + public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) { + if (this.mapBoolean == null) { + this.mapBoolean = new HashMap<>(); + } + this.mapBoolean.put(key, mapBooleanItem); + return this; + } + + /** + * Get mapBoolean + * @return mapBoolean + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map getMapBoolean() { + return mapBoolean; + } + + + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapBoolean(@jakarta.annotation.Nullable Map mapBoolean) { + this.mapBoolean = mapBoolean; + } + + public AdditionalPropertiesClass mapArrayInteger(@jakarta.annotation.Nullable Map> mapArrayInteger) { + + this.mapArrayInteger = mapArrayInteger; + return this; + } + + public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List mapArrayIntegerItem) { + if (this.mapArrayInteger == null) { + this.mapArrayInteger = new HashMap<>(); + } + this.mapArrayInteger.put(key, mapArrayIntegerItem); + return this; + } + + /** + * Get mapArrayInteger + * @return mapArrayInteger + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map> getMapArrayInteger() { + return mapArrayInteger; + } + + + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapArrayInteger(@jakarta.annotation.Nullable Map> mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + } + + public AdditionalPropertiesClass mapArrayAnytype(@jakarta.annotation.Nullable Map> mapArrayAnytype) { + + this.mapArrayAnytype = mapArrayAnytype; + return this; + } + + public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List mapArrayAnytypeItem) { + if (this.mapArrayAnytype == null) { + this.mapArrayAnytype = new HashMap<>(); + } + this.mapArrayAnytype.put(key, mapArrayAnytypeItem); + return this; + } + + /** + * Get mapArrayAnytype + * @return mapArrayAnytype + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map> getMapArrayAnytype() { + return mapArrayAnytype; + } + + + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapArrayAnytype(@jakarta.annotation.Nullable Map> mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + } + + public AdditionalPropertiesClass mapMapString(@jakarta.annotation.Nullable Map> mapMapString) { + + this.mapMapString = mapMapString; + return this; + } + + public AdditionalPropertiesClass putMapMapStringItem(String key, Map mapMapStringItem) { + if (this.mapMapString == null) { + this.mapMapString = new HashMap<>(); + } + this.mapMapString.put(key, mapMapStringItem); + return this; + } + + /** + * Get mapMapString + * @return mapMapString + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map> getMapMapString() { + return mapMapString; + } + + + @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapMapString(@jakarta.annotation.Nullable Map> mapMapString) { + this.mapMapString = mapMapString; + } + + public AdditionalPropertiesClass mapMapAnytype(@jakarta.annotation.Nullable Map> mapMapAnytype) { + + this.mapMapAnytype = mapMapAnytype; + return this; + } + + public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map mapMapAnytypeItem) { + if (this.mapMapAnytype == null) { + this.mapMapAnytype = new HashMap<>(); + } + this.mapMapAnytype.put(key, mapMapAnytypeItem); + return this; + } + + /** + * Get mapMapAnytype + * @return mapMapAnytype + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map> getMapMapAnytype() { + return mapMapAnytype; + } + + + @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapMapAnytype(@jakarta.annotation.Nullable Map> mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + } + + public AdditionalPropertiesClass anytype1(@jakarta.annotation.Nullable Object anytype1) { + + this.anytype1 = anytype1; + return this; + } + + /** + * Get anytype1 + * @return anytype1 + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Object getAnytype1() { + return anytype1; + } + + + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAnytype1(@jakarta.annotation.Nullable Object anytype1) { + this.anytype1 = anytype1; + } + + public AdditionalPropertiesClass anytype2(@jakarta.annotation.Nullable Object anytype2) { + this.anytype2 = JsonNullable.of(anytype2); + + return this; + } + + /** + * Get anytype2 + * @return anytype2 + */ + @jakarta.annotation.Nullable + @JsonIgnore + + public Object getAnytype2() { + return anytype2.orElse(null); + } + + @JsonProperty(JSON_PROPERTY_ANYTYPE2) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable getAnytype2_JsonNullable() { + return anytype2; + } + + @JsonProperty(JSON_PROPERTY_ANYTYPE2) + public void setAnytype2_JsonNullable(JsonNullable anytype2) { + this.anytype2 = anytype2; + } + + public void setAnytype2(@jakarta.annotation.Nullable Object anytype2) { + this.anytype2 = JsonNullable.of(anytype2); + } + + public AdditionalPropertiesClass anytype3(@jakarta.annotation.Nullable Object anytype3) { + + this.anytype3 = anytype3; + return this; + } + + /** + * Get anytype3 + * @return anytype3 + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ANYTYPE3) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Object getAnytype3() { + return anytype3; + } + + + @JsonProperty(JSON_PROPERTY_ANYTYPE3) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAnytype3(@jakarta.annotation.Nullable Object anytype3) { + this.anytype3 = anytype3; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o; + return Objects.equals(this.mapString, additionalPropertiesClass.mapString) && + Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) && + Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) && + Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) && + Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) && + Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) && + Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && + Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && + Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && + Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesClass {\n"); + sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); + sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); + sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); + sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); + sb.append(" mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n"); + sb.append(" mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n"); + sb.append(" mapMapString: ").append(toIndentedString(mapMapString)).append("\n"); + sb.append(" mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n"); + sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); + sb.append(" anytype2: ").append(toIndentedString(anytype2)).append("\n"); + sb.append(" anytype3: ").append(toIndentedString(anytype3)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClassRef.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClassRef.java new file mode 100644 index 000000000000..01ddff00297f --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClassRef.java @@ -0,0 +1,248 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.AdditionalPropertiesBoolean; +import org.openapitools.client.model.AdditionalPropertiesInteger; +import org.openapitools.client.model.AdditionalPropertiesNumber; +import org.openapitools.client.model.AdditionalPropertiesString; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesClassRef + */ +@JsonPropertyOrder({ + AdditionalPropertiesClassRef.JSON_PROPERTY_MAP_STRING, + AdditionalPropertiesClassRef.JSON_PROPERTY_MAP_NUMBER, + AdditionalPropertiesClassRef.JSON_PROPERTY_MAP_INTEGER, + AdditionalPropertiesClassRef.JSON_PROPERTY_MAP_BOOLEAN, + AdditionalPropertiesClassRef.JSON_PROPERTY_ANYTYPE1 +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesClassRef { + public static final String JSON_PROPERTY_MAP_STRING = "map_string"; + @jakarta.annotation.Nullable + private AdditionalPropertiesString mapString; + + public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; + @jakarta.annotation.Nullable + private AdditionalPropertiesNumber mapNumber; + + public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; + @jakarta.annotation.Nullable + private AdditionalPropertiesInteger mapInteger; + + public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; + @jakarta.annotation.Nullable + private AdditionalPropertiesBoolean mapBoolean; + + public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; + @jakarta.annotation.Nullable + private Object anytype1; + + public AdditionalPropertiesClassRef() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesClassRef(@JsonProperty(JSON_PROPERTY_MAP_STRING) AdditionalPropertiesString mapString, @JsonProperty(JSON_PROPERTY_MAP_NUMBER) AdditionalPropertiesNumber mapNumber, @JsonProperty(JSON_PROPERTY_MAP_INTEGER) AdditionalPropertiesInteger mapInteger, @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) AdditionalPropertiesBoolean mapBoolean, @JsonProperty(JSON_PROPERTY_ANYTYPE1) Object anytype1) { + this.mapString = mapString; + this.mapNumber = mapNumber; + this.mapInteger = mapInteger; + this.mapBoolean = mapBoolean; + this.anytype1 = anytype1; + } + + public AdditionalPropertiesClassRef mapString(@jakarta.annotation.Nullable AdditionalPropertiesString mapString) { + + this.mapString = mapString; + return this; + } + + /** + * Get mapString + * @return mapString + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertiesString getMapString() { + return mapString; + } + + + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapString(@jakarta.annotation.Nullable AdditionalPropertiesString mapString) { + this.mapString = mapString; + } + + public AdditionalPropertiesClassRef mapNumber(@jakarta.annotation.Nullable AdditionalPropertiesNumber mapNumber) { + + this.mapNumber = mapNumber; + return this; + } + + /** + * Get mapNumber + * @return mapNumber + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertiesNumber getMapNumber() { + return mapNumber; + } + + + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapNumber(@jakarta.annotation.Nullable AdditionalPropertiesNumber mapNumber) { + this.mapNumber = mapNumber; + } + + public AdditionalPropertiesClassRef mapInteger(@jakarta.annotation.Nullable AdditionalPropertiesInteger mapInteger) { + + this.mapInteger = mapInteger; + return this; + } + + /** + * Get mapInteger + * @return mapInteger + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertiesInteger getMapInteger() { + return mapInteger; + } + + + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapInteger(@jakarta.annotation.Nullable AdditionalPropertiesInteger mapInteger) { + this.mapInteger = mapInteger; + } + + public AdditionalPropertiesClassRef mapBoolean(@jakarta.annotation.Nullable AdditionalPropertiesBoolean mapBoolean) { + + this.mapBoolean = mapBoolean; + return this; + } + + /** + * Get mapBoolean + * @return mapBoolean + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertiesBoolean getMapBoolean() { + return mapBoolean; + } + + + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapBoolean(@jakarta.annotation.Nullable AdditionalPropertiesBoolean mapBoolean) { + this.mapBoolean = mapBoolean; + } + + public AdditionalPropertiesClassRef anytype1(@jakarta.annotation.Nullable Object anytype1) { + + this.anytype1 = anytype1; + return this; + } + + /** + * Get anytype1 + * @return anytype1 + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Object getAnytype1() { + return anytype1; + } + + + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAnytype1(@jakarta.annotation.Nullable Object anytype1) { + this.anytype1 = anytype1; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesClassRef additionalPropertiesClassRef = (AdditionalPropertiesClassRef) o; + return Objects.equals(this.mapString, additionalPropertiesClassRef.mapString) && + Objects.equals(this.mapNumber, additionalPropertiesClassRef.mapNumber) && + Objects.equals(this.mapInteger, additionalPropertiesClassRef.mapInteger) && + Objects.equals(this.mapBoolean, additionalPropertiesClassRef.mapBoolean) && + Objects.equals(this.anytype1, additionalPropertiesClassRef.anytype1); + } + + @Override + public int hashCode() { + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, anytype1); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesClassRef {\n"); + sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); + sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); + sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); + sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); + sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java new file mode 100644 index 000000000000..c1cd6a237ee6 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -0,0 +1,161 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesInteger + */ +@JsonPropertyOrder({ + AdditionalPropertiesInteger.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesInteger { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesInteger() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesInteger(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesInteger name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; + return Objects.equals(this.name, additionalPropertiesInteger.name) && + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesInteger {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java new file mode 100644 index 000000000000..fe6831e10bae --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -0,0 +1,162 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesNumber + */ +@JsonPropertyOrder({ + AdditionalPropertiesNumber.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesNumber { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesNumber() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesNumber(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesNumber name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; + return Objects.equals(this.name, additionalPropertiesNumber.name) && + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesNumber {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java new file mode 100644 index 000000000000..7102ff19b1e0 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -0,0 +1,162 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesObject + */ +@JsonPropertyOrder({ + AdditionalPropertiesObject.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesObject { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesObject() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesObject(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesObject name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; + return Objects.equals(this.name, additionalPropertiesObject.name) && + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesObject {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java new file mode 100644 index 000000000000..8d211371c48a --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -0,0 +1,161 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertiesString + */ +@JsonPropertyOrder({ + AdditionalPropertiesString.JSON_PROPERTY_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesString { + public static final String JSON_PROPERTY_NAME = "name"; + @jakarta.annotation.Nullable + private String name; + + public AdditionalPropertiesString() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertiesString(@JsonProperty(JSON_PROPERTY_NAME) String name) { + this.name = name; + } + + public AdditionalPropertiesString name(@jakarta.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@jakarta.annotation.Nullable String name) { + this.name = name; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; + return Objects.equals(this.name, additionalPropertiesString.name) && + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesString {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayAnyType.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayAnyType.java new file mode 100644 index 000000000000..9116e4fc4061 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayAnyType.java @@ -0,0 +1,118 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import java.util.List; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyArrayAnyType + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyArrayAnyType { + public AdditionalPropertyArrayAnyType() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyArrayAnyType putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyArrayAnyType additionalPropertyArrayAnyType = (AdditionalPropertyArrayAnyType) o; + return Objects.equals(this.additionalProperties, additionalPropertyArrayAnyType.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyArrayAnyType {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayInteger.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayInteger.java new file mode 100644 index 000000000000..a7ff47f87a77 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyArrayInteger.java @@ -0,0 +1,118 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import java.util.List; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyArrayInteger + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyArrayInteger { + public AdditionalPropertyArrayInteger() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyArrayInteger putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyArrayInteger additionalPropertyArrayInteger = (AdditionalPropertyArrayInteger) o; + return Objects.equals(this.additionalProperties, additionalPropertyArrayInteger.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyArrayInteger {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyBoolean.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyBoolean.java new file mode 100644 index 000000000000..d756b7e89605 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyBoolean.java @@ -0,0 +1,117 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyBoolean + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyBoolean { + public AdditionalPropertyBoolean() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyBoolean additionalPropertyBoolean = (AdditionalPropertyBoolean) o; + return Objects.equals(this.additionalProperties, additionalPropertyBoolean.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyBoolean {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyClassRef.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyClassRef.java new file mode 100644 index 000000000000..f818d4c8d60c --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyClassRef.java @@ -0,0 +1,384 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.AdditionalPropertyArrayAnyType; +import org.openapitools.client.model.AdditionalPropertyArrayInteger; +import org.openapitools.client.model.AdditionalPropertyBoolean; +import org.openapitools.client.model.AdditionalPropertyInteger; +import org.openapitools.client.model.AdditionalPropertyMapAnyType; +import org.openapitools.client.model.AdditionalPropertyMapString; +import org.openapitools.client.model.AdditionalPropertyNumber; +import org.openapitools.client.model.AdditionalPropertyString; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyClassRef + */ +@JsonPropertyOrder({ + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_STRING, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_NUMBER, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_INTEGER, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_BOOLEAN, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_ARRAY_INTEGER, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_ARRAY_ANYTYPE, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_MAP_STRING, + AdditionalPropertyClassRef.JSON_PROPERTY_MAP_MAP_ANYTYPE, + AdditionalPropertyClassRef.JSON_PROPERTY_ANYTYPE1 +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyClassRef { + public static final String JSON_PROPERTY_MAP_STRING = "map_string"; + @jakarta.annotation.Nullable + private AdditionalPropertyString mapString; + + public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; + @jakarta.annotation.Nullable + private AdditionalPropertyNumber mapNumber; + + public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; + @jakarta.annotation.Nullable + private AdditionalPropertyInteger mapInteger; + + public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; + @jakarta.annotation.Nullable + private AdditionalPropertyBoolean mapBoolean; + + public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; + @jakarta.annotation.Nullable + private AdditionalPropertyArrayInteger mapArrayInteger; + + public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; + @jakarta.annotation.Nullable + private AdditionalPropertyArrayAnyType mapArrayAnytype; + + public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; + @jakarta.annotation.Nullable + private AdditionalPropertyMapString mapMapString; + + public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; + @jakarta.annotation.Nullable + private AdditionalPropertyMapAnyType mapMapAnytype; + + public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; + @jakarta.annotation.Nullable + private Object anytype1; + + public AdditionalPropertyClassRef() { + } + + /** + * Constructor with all args parameters + */ + public AdditionalPropertyClassRef(@JsonProperty(JSON_PROPERTY_MAP_STRING) AdditionalPropertyString mapString, @JsonProperty(JSON_PROPERTY_MAP_NUMBER) AdditionalPropertyNumber mapNumber, @JsonProperty(JSON_PROPERTY_MAP_INTEGER) AdditionalPropertyInteger mapInteger, @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) AdditionalPropertyBoolean mapBoolean, @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) AdditionalPropertyArrayInteger mapArrayInteger, @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) AdditionalPropertyArrayAnyType mapArrayAnytype, @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) AdditionalPropertyMapString mapMapString, @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) AdditionalPropertyMapAnyType mapMapAnytype, @JsonProperty(JSON_PROPERTY_ANYTYPE1) Object anytype1) { + this.mapString = mapString; + this.mapNumber = mapNumber; + this.mapInteger = mapInteger; + this.mapBoolean = mapBoolean; + this.mapArrayInteger = mapArrayInteger; + this.mapArrayAnytype = mapArrayAnytype; + this.mapMapString = mapMapString; + this.mapMapAnytype = mapMapAnytype; + this.anytype1 = anytype1; + } + + public AdditionalPropertyClassRef mapString(@jakarta.annotation.Nullable AdditionalPropertyString mapString) { + + this.mapString = mapString; + return this; + } + + /** + * Get mapString + * @return mapString + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyString getMapString() { + return mapString; + } + + + @JsonProperty(JSON_PROPERTY_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapString(@jakarta.annotation.Nullable AdditionalPropertyString mapString) { + this.mapString = mapString; + } + + public AdditionalPropertyClassRef mapNumber(@jakarta.annotation.Nullable AdditionalPropertyNumber mapNumber) { + + this.mapNumber = mapNumber; + return this; + } + + /** + * Get mapNumber + * @return mapNumber + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyNumber getMapNumber() { + return mapNumber; + } + + + @JsonProperty(JSON_PROPERTY_MAP_NUMBER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapNumber(@jakarta.annotation.Nullable AdditionalPropertyNumber mapNumber) { + this.mapNumber = mapNumber; + } + + public AdditionalPropertyClassRef mapInteger(@jakarta.annotation.Nullable AdditionalPropertyInteger mapInteger) { + + this.mapInteger = mapInteger; + return this; + } + + /** + * Get mapInteger + * @return mapInteger + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyInteger getMapInteger() { + return mapInteger; + } + + + @JsonProperty(JSON_PROPERTY_MAP_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapInteger(@jakarta.annotation.Nullable AdditionalPropertyInteger mapInteger) { + this.mapInteger = mapInteger; + } + + public AdditionalPropertyClassRef mapBoolean(@jakarta.annotation.Nullable AdditionalPropertyBoolean mapBoolean) { + + this.mapBoolean = mapBoolean; + return this; + } + + /** + * Get mapBoolean + * @return mapBoolean + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyBoolean getMapBoolean() { + return mapBoolean; + } + + + @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapBoolean(@jakarta.annotation.Nullable AdditionalPropertyBoolean mapBoolean) { + this.mapBoolean = mapBoolean; + } + + public AdditionalPropertyClassRef mapArrayInteger(@jakarta.annotation.Nullable AdditionalPropertyArrayInteger mapArrayInteger) { + + this.mapArrayInteger = mapArrayInteger; + return this; + } + + /** + * Get mapArrayInteger + * @return mapArrayInteger + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyArrayInteger getMapArrayInteger() { + return mapArrayInteger; + } + + + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapArrayInteger(@jakarta.annotation.Nullable AdditionalPropertyArrayInteger mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + } + + public AdditionalPropertyClassRef mapArrayAnytype(@jakarta.annotation.Nullable AdditionalPropertyArrayAnyType mapArrayAnytype) { + + this.mapArrayAnytype = mapArrayAnytype; + return this; + } + + /** + * Get mapArrayAnytype + * @return mapArrayAnytype + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyArrayAnyType getMapArrayAnytype() { + return mapArrayAnytype; + } + + + @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapArrayAnytype(@jakarta.annotation.Nullable AdditionalPropertyArrayAnyType mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + } + + public AdditionalPropertyClassRef mapMapString(@jakarta.annotation.Nullable AdditionalPropertyMapString mapMapString) { + + this.mapMapString = mapMapString; + return this; + } + + /** + * Get mapMapString + * @return mapMapString + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyMapString getMapMapString() { + return mapMapString; + } + + + @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapMapString(@jakarta.annotation.Nullable AdditionalPropertyMapString mapMapString) { + this.mapMapString = mapMapString; + } + + public AdditionalPropertyClassRef mapMapAnytype(@jakarta.annotation.Nullable AdditionalPropertyMapAnyType mapMapAnytype) { + + this.mapMapAnytype = mapMapAnytype; + return this; + } + + /** + * Get mapMapAnytype + * @return mapMapAnytype + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public AdditionalPropertyMapAnyType getMapMapAnytype() { + return mapMapAnytype; + } + + + @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMapMapAnytype(@jakarta.annotation.Nullable AdditionalPropertyMapAnyType mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + } + + public AdditionalPropertyClassRef anytype1(@jakarta.annotation.Nullable Object anytype1) { + + this.anytype1 = anytype1; + return this; + } + + /** + * Get anytype1 + * @return anytype1 + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Object getAnytype1() { + return anytype1; + } + + + @JsonProperty(JSON_PROPERTY_ANYTYPE1) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAnytype1(@jakarta.annotation.Nullable Object anytype1) { + this.anytype1 = anytype1; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyClassRef additionalPropertyClassRef = (AdditionalPropertyClassRef) o; + return Objects.equals(this.mapString, additionalPropertyClassRef.mapString) && + Objects.equals(this.mapNumber, additionalPropertyClassRef.mapNumber) && + Objects.equals(this.mapInteger, additionalPropertyClassRef.mapInteger) && + Objects.equals(this.mapBoolean, additionalPropertyClassRef.mapBoolean) && + Objects.equals(this.mapArrayInteger, additionalPropertyClassRef.mapArrayInteger) && + Objects.equals(this.mapArrayAnytype, additionalPropertyClassRef.mapArrayAnytype) && + Objects.equals(this.mapMapString, additionalPropertyClassRef.mapMapString) && + Objects.equals(this.mapMapAnytype, additionalPropertyClassRef.mapMapAnytype) && + Objects.equals(this.anytype1, additionalPropertyClassRef.anytype1); + } + + @Override + public int hashCode() { + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyClassRef {\n"); + sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); + sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); + sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); + sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); + sb.append(" mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n"); + sb.append(" mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n"); + sb.append(" mapMapString: ").append(toIndentedString(mapMapString)).append("\n"); + sb.append(" mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n"); + sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyInteger.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyInteger.java new file mode 100644 index 000000000000..bbd6bac936a2 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyInteger.java @@ -0,0 +1,117 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyInteger + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyInteger { + public AdditionalPropertyInteger() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyInteger additionalPropertyInteger = (AdditionalPropertyInteger) o; + return Objects.equals(this.additionalProperties, additionalPropertyInteger.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyInteger {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapAnyType.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapAnyType.java new file mode 100644 index 000000000000..c0123f575a97 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapAnyType.java @@ -0,0 +1,118 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyMapAnyType + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyMapAnyType { + public AdditionalPropertyMapAnyType() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyMapAnyType putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyMapAnyType additionalPropertyMapAnyType = (AdditionalPropertyMapAnyType) o; + return Objects.equals(this.additionalProperties, additionalPropertyMapAnyType.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyMapAnyType {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapString.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapString.java new file mode 100644 index 000000000000..a8cece858262 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyMapString.java @@ -0,0 +1,118 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyMapString + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyMapString { + public AdditionalPropertyMapString() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyMapString putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyMapString additionalPropertyMapString = (AdditionalPropertyMapString) o; + return Objects.equals(this.additionalProperties, additionalPropertyMapString.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyMapString {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyNumber.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyNumber.java new file mode 100644 index 000000000000..1c89affaa19f --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyNumber.java @@ -0,0 +1,118 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyNumber + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyNumber { + public AdditionalPropertyNumber() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyNumber additionalPropertyNumber = (AdditionalPropertyNumber) o; + return Objects.equals(this.additionalProperties, additionalPropertyNumber.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyNumber {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyString.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyString.java new file mode 100644 index 000000000000..af8ee8fd795d --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/AdditionalPropertyString.java @@ -0,0 +1,117 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * AdditionalPropertyString + */ +@JsonPropertyOrder({ +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyString { + public AdditionalPropertyString() { + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + * @param key the name of the property + * @param value the value of the property + * @return self reference + */ + @JsonAnySetter + public AdditionalPropertyString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) properties. + * @return the additional (undeclared) properties + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + * @param key the name of the property + * @return the additional (undeclared) property with the specified name + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyString additionalPropertyString = (AdditionalPropertyString) o; + return Objects.equals(this.additionalProperties, additionalPropertyString.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyString {\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/Animal.java new file mode 100644 index 000000000000..96b332f40a06 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/Animal.java @@ -0,0 +1,112 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * Animal + */ +@JsonPropertyOrder({ + Animal.JSON_PROPERTY_CLASS_NAME +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class Animal { + public static final String JSON_PROPERTY_CLASS_NAME = "className"; + @jakarta.annotation.Nullable + private String className; + + public Animal() { + } + + /** + * Constructor with all args parameters + */ + public Animal(@JsonProperty(JSON_PROPERTY_CLASS_NAME) String className) { + this.className = className; + } + + public Animal className(@jakarta.annotation.Nullable String className) { + + this.className = className; + return this; + } + + /** + * Get className + * @return className + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CLASS_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getClassName() { + return className; + } + + + @JsonProperty(JSON_PROPERTY_CLASS_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setClassName(@jakarta.annotation.Nullable String className) { + this.className = className; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Animal animal = (Animal) o; + return Objects.equals(this.className, animal.className); + } + + @Override + public int hashCode() { + return Objects.hash(className); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Animal {\n"); + sb.append(" className: ").append(toIndentedString(className)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java new file mode 100644 index 000000000000..08b2da4585c8 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -0,0 +1,191 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import org.openapitools.client.model.Animal; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * MixedPropertiesAndAdditionalPropertiesClass + */ +@JsonPropertyOrder({ + MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_UUID, + MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME, + MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP +}) +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class MixedPropertiesAndAdditionalPropertiesClass { + public static final String JSON_PROPERTY_UUID = "uuid"; + @jakarta.annotation.Nullable + private UUID uuid; + + public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; + @jakarta.annotation.Nullable + private OffsetDateTime dateTime; + + public static final String JSON_PROPERTY_MAP = "map"; + @jakarta.annotation.Nullable + private Map map = new HashMap<>(); + + public MixedPropertiesAndAdditionalPropertiesClass() { + } + + /** + * Constructor with all args parameters + */ + public MixedPropertiesAndAdditionalPropertiesClass(@JsonProperty(JSON_PROPERTY_UUID) UUID uuid, @JsonProperty(JSON_PROPERTY_DATE_TIME) OffsetDateTime dateTime, @JsonProperty(JSON_PROPERTY_MAP) Map map) { + this.uuid = uuid; + this.dateTime = dateTime; + this.map = map; + } + + public MixedPropertiesAndAdditionalPropertiesClass uuid(@jakarta.annotation.Nullable UUID uuid) { + + this.uuid = uuid; + return this; + } + + /** + * Get uuid + * @return uuid + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_UUID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public UUID getUuid() { + return uuid; + } + + + @JsonProperty(JSON_PROPERTY_UUID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setUuid(@jakarta.annotation.Nullable UUID uuid) { + this.uuid = uuid; + } + + public MixedPropertiesAndAdditionalPropertiesClass dateTime(@jakarta.annotation.Nullable OffsetDateTime dateTime) { + + this.dateTime = dateTime; + return this; + } + + /** + * Get dateTime + * @return dateTime + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_DATE_TIME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OffsetDateTime getDateTime() { + return dateTime; + } + + + @JsonProperty(JSON_PROPERTY_DATE_TIME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDateTime(@jakarta.annotation.Nullable OffsetDateTime dateTime) { + this.dateTime = dateTime; + } + + public MixedPropertiesAndAdditionalPropertiesClass map(@jakarta.annotation.Nullable Map map) { + + this.map = map; + return this; + } + + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { + if (this.map == null) { + this.map = new HashMap<>(); + } + this.map.put(key, mapItem); + return this; + } + + /** + * Get map + * @return map + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_MAP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Map getMap() { + return map; + } + + + @JsonProperty(JSON_PROPERTY_MAP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMap(@jakarta.annotation.Nullable Map map) { + this.map = map; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; + return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && + Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && + Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + } + + @Override + public int hashCode() { + return Objects.hash(uuid, dateTime, map); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); + sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); + sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/api/FakeApiTest.java new file mode 100644 index 000000000000..314b2e572c55 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/api/FakeApiTest.java @@ -0,0 +1,54 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.api; + +import org.openapitools.client.model.AdditionalProperties; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.web.client.RestClientException; + +import java.time.LocalDate; +import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * API tests for FakeApi + */ +@Disabled +class FakeApiTest { + + private final FakeApi api = new FakeApi(); + + + /** + * test referenced additionalProperties + * + * + * + * @throws RestClientException + * if the Api call fails + */ + @Test + void testAdditionalPropertiesReferenceTest() { + AdditionalProperties additionalProperties = null; + + api.testAdditionalPropertiesReference(additionalProperties); + + // TODO: test validations + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java new file mode 100644 index 000000000000..f7ff300c4fed --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java @@ -0,0 +1,47 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesAnyType + */ +class AdditionalPropertiesAnyTypeTest { + private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType(); + + /** + * Model tests for AdditionalPropertiesAnyType + */ + @Test + void testAdditionalPropertiesAnyType() { + // TODO: test AdditionalPropertiesAnyType + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java new file mode 100644 index 000000000000..89a861cf98d6 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java @@ -0,0 +1,48 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesArray + */ +class AdditionalPropertiesArrayTest { + private final AdditionalPropertiesArray model = new AdditionalPropertiesArray(); + + /** + * Model tests for AdditionalPropertiesArray + */ + @Test + void testAdditionalPropertiesArray() { + // TODO: test AdditionalPropertiesArray + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java new file mode 100644 index 000000000000..a36266ecfcd5 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java @@ -0,0 +1,47 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesBoolean + */ +class AdditionalPropertiesBooleanTest { + private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean(); + + /** + * Model tests for AdditionalPropertiesBoolean + */ + @Test + void testAdditionalPropertiesBoolean() { + // TODO: test AdditionalPropertiesBoolean + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassRefTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassRefTest.java new file mode 100644 index 000000000000..758ca38bbe68 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassRefTest.java @@ -0,0 +1,83 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.AdditionalPropertiesBoolean; +import org.openapitools.client.model.AdditionalPropertiesInteger; +import org.openapitools.client.model.AdditionalPropertiesNumber; +import org.openapitools.client.model.AdditionalPropertiesString; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesClassRef + */ +class AdditionalPropertiesClassRefTest { + private final AdditionalPropertiesClassRef model = new AdditionalPropertiesClassRef(); + + /** + * Model tests for AdditionalPropertiesClassRef + */ + @Test + void testAdditionalPropertiesClassRef() { + // TODO: test AdditionalPropertiesClassRef + } + + /** + * Test the property 'mapString' + */ + @Test + void mapStringTest() { + // TODO: test mapString + } + + /** + * Test the property 'mapNumber' + */ + @Test + void mapNumberTest() { + // TODO: test mapNumber + } + + /** + * Test the property 'mapInteger' + */ + @Test + void mapIntegerTest() { + // TODO: test mapInteger + } + + /** + * Test the property 'mapBoolean' + */ + @Test + void mapBooleanTest() { + // TODO: test mapBoolean + } + + /** + * Test the property 'anytype1' + */ + @Test + void anytype1Test() { + // TODO: test anytype1 + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java new file mode 100644 index 000000000000..8c927e47dc25 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java @@ -0,0 +1,135 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; +import com.fasterxml.jackson.annotation.JsonIgnore; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesClass + */ +class AdditionalPropertiesClassTest { + private final AdditionalPropertiesClass model = new AdditionalPropertiesClass(); + + /** + * Model tests for AdditionalPropertiesClass + */ + @Test + void testAdditionalPropertiesClass() { + // TODO: test AdditionalPropertiesClass + } + + /** + * Test the property 'mapString' + */ + @Test + void mapStringTest() { + // TODO: test mapString + } + + /** + * Test the property 'mapNumber' + */ + @Test + void mapNumberTest() { + // TODO: test mapNumber + } + + /** + * Test the property 'mapInteger' + */ + @Test + void mapIntegerTest() { + // TODO: test mapInteger + } + + /** + * Test the property 'mapBoolean' + */ + @Test + void mapBooleanTest() { + // TODO: test mapBoolean + } + + /** + * Test the property 'mapArrayInteger' + */ + @Test + void mapArrayIntegerTest() { + // TODO: test mapArrayInteger + } + + /** + * Test the property 'mapArrayAnytype' + */ + @Test + void mapArrayAnytypeTest() { + // TODO: test mapArrayAnytype + } + + /** + * Test the property 'mapMapString' + */ + @Test + void mapMapStringTest() { + // TODO: test mapMapString + } + + /** + * Test the property 'mapMapAnytype' + */ + @Test + void mapMapAnytypeTest() { + // TODO: test mapMapAnytype + } + + /** + * Test the property 'anytype1' + */ + @Test + void anytype1Test() { + // TODO: test anytype1 + } + + /** + * Test the property 'anytype2' + */ + @Test + void anytype2Test() { + // TODO: test anytype2 + } + + /** + * Test the property 'anytype3' + */ + @Test + void anytype3Test() { + // TODO: test anytype3 + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java new file mode 100644 index 000000000000..795040cd89e6 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java @@ -0,0 +1,47 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesInteger + */ +class AdditionalPropertiesIntegerTest { + private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger(); + + /** + * Model tests for AdditionalPropertiesInteger + */ + @Test + void testAdditionalPropertiesInteger() { + // TODO: test AdditionalPropertiesInteger + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java new file mode 100644 index 000000000000..6d7141d9438f --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java @@ -0,0 +1,48 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesNumber + */ +class AdditionalPropertiesNumberTest { + private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber(); + + /** + * Model tests for AdditionalPropertiesNumber + */ + @Test + void testAdditionalPropertiesNumber() { + // TODO: test AdditionalPropertiesNumber + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java new file mode 100644 index 000000000000..7206df8f6d39 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java @@ -0,0 +1,48 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesObject + */ +class AdditionalPropertiesObjectTest { + private final AdditionalPropertiesObject model = new AdditionalPropertiesObject(); + + /** + * Model tests for AdditionalPropertiesObject + */ + @Test + void testAdditionalPropertiesObject() { + // TODO: test AdditionalPropertiesObject + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java new file mode 100644 index 000000000000..d1766528dfec --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java @@ -0,0 +1,47 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertiesString + */ +class AdditionalPropertiesStringTest { + private final AdditionalPropertiesString model = new AdditionalPropertiesString(); + + /** + * Model tests for AdditionalPropertiesString + */ + @Test + void testAdditionalPropertiesString() { + // TODO: test AdditionalPropertiesString + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesTest.java new file mode 100644 index 000000000000..4a20e2f1b125 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertiesTest.java @@ -0,0 +1,66 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.AdditionalPropertiesClass; +import org.openapitools.client.model.AdditionalPropertiesClassRef; +import org.openapitools.client.model.MixedPropertiesAndAdditionalPropertiesClass; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalProperties + */ +class AdditionalPropertiesTest { + private final AdditionalProperties model = new AdditionalProperties(); + + /** + * Model tests for AdditionalProperties + */ + @Test + void testAdditionalProperties() { + // TODO: test AdditionalProperties + } + + /** + * Test the property 'additionalPropertiesClassRef' + */ + @Test + void additionalPropertiesClassRefTest() { + // TODO: test additionalPropertiesClassRef + } + + /** + * Test the property 'additionalPropertiesClass' + */ + @Test + void additionalPropertiesClassTest() { + // TODO: test additionalPropertiesClass + } + + /** + * Test the property 'mixed' + */ + @Test + void mixedTest() { + // TODO: test mixed + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayAnyTypeTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayAnyTypeTest.java new file mode 100644 index 000000000000..5d51c109c230 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayAnyTypeTest.java @@ -0,0 +1,35 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyArrayAnyType + */ +class AdditionalPropertyArrayAnyTypeTest { + private final AdditionalPropertyArrayAnyType model = new AdditionalPropertyArrayAnyType(); + + /** + * Model tests for AdditionalPropertyArrayAnyType + */ + @Test + void testAdditionalPropertyArrayAnyType() { + // TODO: test AdditionalPropertyArrayAnyType + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayIntegerTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayIntegerTest.java new file mode 100644 index 000000000000..32a377c655cf --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyArrayIntegerTest.java @@ -0,0 +1,35 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyArrayInteger + */ +class AdditionalPropertyArrayIntegerTest { + private final AdditionalPropertyArrayInteger model = new AdditionalPropertyArrayInteger(); + + /** + * Model tests for AdditionalPropertyArrayInteger + */ + @Test + void testAdditionalPropertyArrayInteger() { + // TODO: test AdditionalPropertyArrayInteger + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyBooleanTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyBooleanTest.java new file mode 100644 index 000000000000..97bedd193adc --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyBooleanTest.java @@ -0,0 +1,34 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyBoolean + */ +class AdditionalPropertyBooleanTest { + private final AdditionalPropertyBoolean model = new AdditionalPropertyBoolean(); + + /** + * Model tests for AdditionalPropertyBoolean + */ + @Test + void testAdditionalPropertyBoolean() { + // TODO: test AdditionalPropertyBoolean + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyClassRefTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyClassRefTest.java new file mode 100644 index 000000000000..88c3a021060e --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyClassRefTest.java @@ -0,0 +1,119 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.AdditionalPropertyArrayAnyType; +import org.openapitools.client.model.AdditionalPropertyArrayInteger; +import org.openapitools.client.model.AdditionalPropertyBoolean; +import org.openapitools.client.model.AdditionalPropertyInteger; +import org.openapitools.client.model.AdditionalPropertyMapAnyType; +import org.openapitools.client.model.AdditionalPropertyMapString; +import org.openapitools.client.model.AdditionalPropertyNumber; +import org.openapitools.client.model.AdditionalPropertyString; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyClassRef + */ +class AdditionalPropertyClassRefTest { + private final AdditionalPropertyClassRef model = new AdditionalPropertyClassRef(); + + /** + * Model tests for AdditionalPropertyClassRef + */ + @Test + void testAdditionalPropertyClassRef() { + // TODO: test AdditionalPropertyClassRef + } + + /** + * Test the property 'mapString' + */ + @Test + void mapStringTest() { + // TODO: test mapString + } + + /** + * Test the property 'mapNumber' + */ + @Test + void mapNumberTest() { + // TODO: test mapNumber + } + + /** + * Test the property 'mapInteger' + */ + @Test + void mapIntegerTest() { + // TODO: test mapInteger + } + + /** + * Test the property 'mapBoolean' + */ + @Test + void mapBooleanTest() { + // TODO: test mapBoolean + } + + /** + * Test the property 'mapArrayInteger' + */ + @Test + void mapArrayIntegerTest() { + // TODO: test mapArrayInteger + } + + /** + * Test the property 'mapArrayAnytype' + */ + @Test + void mapArrayAnytypeTest() { + // TODO: test mapArrayAnytype + } + + /** + * Test the property 'mapMapString' + */ + @Test + void mapMapStringTest() { + // TODO: test mapMapString + } + + /** + * Test the property 'mapMapAnytype' + */ + @Test + void mapMapAnytypeTest() { + // TODO: test mapMapAnytype + } + + /** + * Test the property 'anytype1' + */ + @Test + void anytype1Test() { + // TODO: test anytype1 + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyIntegerTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyIntegerTest.java new file mode 100644 index 000000000000..1156ee279ba9 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyIntegerTest.java @@ -0,0 +1,34 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyInteger + */ +class AdditionalPropertyIntegerTest { + private final AdditionalPropertyInteger model = new AdditionalPropertyInteger(); + + /** + * Model tests for AdditionalPropertyInteger + */ + @Test + void testAdditionalPropertyInteger() { + // TODO: test AdditionalPropertyInteger + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapAnyTypeTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapAnyTypeTest.java new file mode 100644 index 000000000000..90bd376d3913 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapAnyTypeTest.java @@ -0,0 +1,35 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyMapAnyType + */ +class AdditionalPropertyMapAnyTypeTest { + private final AdditionalPropertyMapAnyType model = new AdditionalPropertyMapAnyType(); + + /** + * Model tests for AdditionalPropertyMapAnyType + */ + @Test + void testAdditionalPropertyMapAnyType() { + // TODO: test AdditionalPropertyMapAnyType + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapStringTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapStringTest.java new file mode 100644 index 000000000000..2ab5a7f5c9e9 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyMapStringTest.java @@ -0,0 +1,35 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyMapString + */ +class AdditionalPropertyMapStringTest { + private final AdditionalPropertyMapString model = new AdditionalPropertyMapString(); + + /** + * Model tests for AdditionalPropertyMapString + */ + @Test + void testAdditionalPropertyMapString() { + // TODO: test AdditionalPropertyMapString + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyNumberTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyNumberTest.java new file mode 100644 index 000000000000..11494a2b487d --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyNumberTest.java @@ -0,0 +1,35 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.math.BigDecimal; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyNumber + */ +class AdditionalPropertyNumberTest { + private final AdditionalPropertyNumber model = new AdditionalPropertyNumber(); + + /** + * Model tests for AdditionalPropertyNumber + */ + @Test + void testAdditionalPropertyNumber() { + // TODO: test AdditionalPropertyNumber + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyStringTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyStringTest.java new file mode 100644 index 000000000000..cda2eac70042 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AdditionalPropertyStringTest.java @@ -0,0 +1,34 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for AdditionalPropertyString + */ +class AdditionalPropertyStringTest { + private final AdditionalPropertyString model = new AdditionalPropertyString(); + + /** + * Model tests for AdditionalPropertyString + */ + @Test + void testAdditionalPropertyString() { + // TODO: test AdditionalPropertyString + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AnimalTest.java new file mode 100644 index 000000000000..c00fc7564512 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/AnimalTest.java @@ -0,0 +1,47 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for Animal + */ +class AnimalTest { + private final Animal model = new Animal(); + + /** + * Model tests for Animal + */ + @Test + void testAnimal() { + // TODO: test Animal + } + + /** + * Test the property 'className' + */ + @Test + void classNameTest() { + // TODO: test className + } + +} diff --git a/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java new file mode 100644 index 000000000000..f23a46dc7539 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-generateAliasAsModel/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java @@ -0,0 +1,68 @@ +/* + * generateAliasAsModel + * This spec is mainly for testing generateAliasAsModel and + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import org.openapitools.client.model.Animal; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for MixedPropertiesAndAdditionalPropertiesClass + */ +class MixedPropertiesAndAdditionalPropertiesClassTest { + private final MixedPropertiesAndAdditionalPropertiesClass model = new MixedPropertiesAndAdditionalPropertiesClass(); + + /** + * Model tests for MixedPropertiesAndAdditionalPropertiesClass + */ + @Test + void testMixedPropertiesAndAdditionalPropertiesClass() { + // TODO: test MixedPropertiesAndAdditionalPropertiesClass + } + + /** + * Test the property 'uuid' + */ + @Test + void uuidTest() { + // TODO: test uuid + } + + /** + * Test the property 'dateTime' + */ + @Test + void dateTimeTest() { + // TODO: test dateTime + } + + /** + * Test the property 'map' + */ + @Test + void mapTest() { + // TODO: test map + } + +} diff --git a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator-ignore b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES new file mode 100644 index 000000000000..a1e16aa7e276 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES @@ -0,0 +1,34 @@ +.openapi-generator-ignore +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/FakeApi.java +src/main/java/org/openapitools/api/FakeApiController.java +src/main/java/org/openapitools/configuration/HomeController.java +src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java +src/main/java/org/openapitools/model/AdditionalProperties.java +src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +src/main/java/org/openapitools/model/AdditionalPropertiesClassRef.java +src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +src/main/java/org/openapitools/model/AdditionalPropertiesString.java +src/main/java/org/openapitools/model/AdditionalPropertyArrayAnyType.java +src/main/java/org/openapitools/model/AdditionalPropertyArrayInteger.java +src/main/java/org/openapitools/model/AdditionalPropertyBoolean.java +src/main/java/org/openapitools/model/AdditionalPropertyClassRef.java +src/main/java/org/openapitools/model/AdditionalPropertyInteger.java +src/main/java/org/openapitools/model/AdditionalPropertyMapAnyType.java +src/main/java/org/openapitools/model/AdditionalPropertyMapString.java +src/main/java/org/openapitools/model/AdditionalPropertyNumber.java +src/main/java/org/openapitools/model/AdditionalPropertyString.java +src/main/java/org/openapitools/model/Animal.java +src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +src/main/resources/application.properties +src/main/resources/openapi.yaml +src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java diff --git a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/VERSION b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/VERSION new file mode 100644 index 000000000000..96cfbb19ae28 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.13.0-SNAPSHOT diff --git a/samples/server/petstore/springboot-generateAliasAsModel/README.md b/samples/server/petstore/springboot-generateAliasAsModel/README.md new file mode 100644 index 000000000000..9129047bc325 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/README.md @@ -0,0 +1,23 @@ +# OpenAPI generated server + +Spring Boot Server + +## 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. + +The underlying library integrating OpenAPI to Spring Boot is [springfox](https://github.com/springfox/springfox). +Springfox will generate an OpenAPI v2 (fka Swagger RESTful API Documentation Specification) specification based on the +generated Controller and Model classes. The specification is available to download using the following url: +http://localhost:8080/v2/api-docs/ + +**HEADS-UP**: Springfox is deprecated for removal in version 6.0.0 of openapi-generator. The project seems to be no longer +maintained (last commit is of Oct 14, 2020). It works with Spring Boot 2.5.x but not with 2.6. Spring Boot 2.5 is +supported until 2022-05-19. Users of openapi-generator should migrate to the springdoc documentation provider which is, +as an added bonus, OpenAPI v3 compatible. + + + +Start your server as a simple java application +Change default port value in application.properties \ No newline at end of file diff --git a/samples/server/petstore/springboot-generateAliasAsModel/pom.xml b/samples/server/petstore/springboot-generateAliasAsModel/pom.xml new file mode 100644 index 000000000000..d6f2f7cc7328 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/pom.xml @@ -0,0 +1,81 @@ + + 4.0.0 + org.openapitools + spring-boot-generateAliasAsModel + jar + spring-boot-generateAliasAsModel + 1.0.0 + + 1.8 + ${java.version} + ${java.version} + UTF-8 + 2.9.2 + + + org.springframework.boot + spring-boot-starter-parent + 2.5.14 + + + + src/main/java + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.data + spring-data-commons + + + + io.springfox + springfox-swagger2 + ${springfox.version} + + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + org.openapitools + jackson-databind-nullable + 0.2.6 + + + + org.springframework.boot + spring-boot-starter-validation + + + com.fasterxml.jackson.core + jackson-databind + + + org.springframework.boot + spring-boot-starter-test + test + + + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/OpenApiGeneratorApplication.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/OpenApiGeneratorApplication.java new file mode 100644 index 000000000000..97252a8a9402 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/OpenApiGeneratorApplication.java @@ -0,0 +1,30 @@ +package org.openapitools; + +import com.fasterxml.jackson.databind.Module; +import org.openapitools.jackson.nullable.JsonNullableModule; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.FilterType; +import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator; + +@SpringBootApplication( + nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class +) +@ComponentScan( + basePackages = {"org.openapitools", "org.openapitools.api" , "org.openapitools.configuration"}, + nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class +) +public class OpenApiGeneratorApplication { + + public static void main(String[] args) { + SpringApplication.run(OpenApiGeneratorApplication.class, args); + } + + @Bean(name = "org.openapitools.OpenApiGeneratorApplication.jsonNullableModule") + public Module jsonNullableModule() { + return new JsonNullableModule(); + } + +} \ No newline at end of file diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/RFC3339DateFormat.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/RFC3339DateFormat.java new file mode 100644 index 000000000000..bcd3936d8b34 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/RFC3339DateFormat.java @@ -0,0 +1,38 @@ +package org.openapitools; + +import com.fasterxml.jackson.databind.util.StdDateFormat; + +import java.text.DateFormat; +import java.text.FieldPosition; +import java.text.ParsePosition; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.TimeZone; + +public class RFC3339DateFormat extends DateFormat { + private static final long serialVersionUID = 1L; + private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); + + private final StdDateFormat fmt = new StdDateFormat() + .withTimeZone(TIMEZONE_Z) + .withColonInTimeZone(true); + + public RFC3339DateFormat() { + this.calendar = new GregorianCalendar(); + } + + @Override + public Date parse(String source, ParsePosition pos) { + return fmt.parse(source, pos); + } + + @Override + public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { + return fmt.format(date, toAppendTo, fieldPosition); + } + + @Override + public Object clone() { + return this; + } +} \ No newline at end of file diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/ApiUtil.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/ApiUtil.java new file mode 100644 index 000000000000..1245b1dd0ccf --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/ApiUtil.java @@ -0,0 +1,19 @@ +package org.openapitools.api; + +import org.springframework.web.context.request.NativeWebRequest; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +public class ApiUtil { + public static void setExampleResponse(NativeWebRequest req, String contentType, String example) { + try { + HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class); + res.setCharacterEncoding("UTF-8"); + res.addHeader("Content-Type", contentType); + res.getWriter().print(example); + } catch (IOException e) { + throw new RuntimeException(e); + } + } +} diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApi.java new file mode 100644 index 000000000000..f10893a786e5 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApi.java @@ -0,0 +1,63 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.13.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package org.openapitools.api; + +import org.openapitools.model.AdditionalProperties; +import io.swagger.annotations.*; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.Valid; +import javax.validation.constraints.*; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import javax.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +@Validated +@Api(value = "fake", description = "the fake API") +public interface FakeApi { + + default Optional getRequest() { + return Optional.empty(); + } + + /** + * POST /fake/additionalProperties-reference : test referenced additionalProperties + * + * + * @param additionalProperties request body (required) + * @return successful operation (status code 200) + */ + @ApiOperation( + tags = { "fake" }, + value = "test referenced additionalProperties", + nickname = "testAdditionalPropertiesReference", + notes = "" + ) + @ApiResponses({ + @ApiResponse(code = 200, message = "successful operation") + }) + @RequestMapping( + method = RequestMethod.POST, + value = "/fake/additionalProperties-reference", + consumes = { "application/json" } + ) + + default ResponseEntity testAdditionalPropertiesReference( + @ApiParam(value = "request body", required = true) @Valid @RequestBody AdditionalProperties additionalProperties + ) { + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + +} diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApiController.java new file mode 100644 index 000000000000..29a6e56dc1e6 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/api/FakeApiController.java @@ -0,0 +1,46 @@ +package org.openapitools.api; + +import org.openapitools.model.AdditionalProperties; + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.context.request.NativeWebRequest; + +import javax.validation.constraints.*; +import javax.validation.Valid; + +import java.util.List; +import java.util.Map; +import java.util.Optional; +import javax.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +@Controller +@RequestMapping("${openapi.generateAliasAsModel.base-path:}") +public class FakeApiController implements FakeApi { + + private final NativeWebRequest request; + + @Autowired + public FakeApiController(NativeWebRequest request) { + this.request = request; + } + + @Override + public Optional getRequest() { + return Optional.ofNullable(request); + } + +} diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/HomeController.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/HomeController.java new file mode 100644 index 000000000000..707313504790 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/HomeController.java @@ -0,0 +1,13 @@ +package org.openapitools.configuration; + +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * Home redirection to OpenAPI api documentation + */ +@Controller +public class HomeController { + +} \ No newline at end of file diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java new file mode 100644 index 000000000000..009eaa9a22f2 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java @@ -0,0 +1,71 @@ +package org.openapitools.configuration; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import org.springframework.web.util.UriComponentsBuilder; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.paths.Paths; +import springfox.documentation.spring.web.paths.RelativePathProvider; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +import javax.annotation.Generated; +import javax.servlet.ServletContext; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +@Configuration +@EnableSwagger2 +public class SpringFoxConfiguration { + + ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("generateAliasAsModel") + .description("This spec is mainly for testing generateAliasAsModel and") + .license("") + .licenseUrl("http://unlicense.org") + .termsOfServiceUrl("") + .version("1.0.0") + .contact(new Contact("","", "")) + .build(); + } + + @Bean + public Docket customImplementation(ServletContext servletContext, @Value("${openapi.generateAliasAsModel.base-path:}") String basePath) { + return new Docket(DocumentationType.SWAGGER_2) + .select() + .apis(RequestHandlerSelectors.basePackage("org.openapitools.api")) + .build() + .pathProvider(new BasePathAwareRelativePathProvider(servletContext, basePath)) + .directModelSubstitute(java.time.LocalDate.class, java.sql.Date.class) + .directModelSubstitute(java.time.OffsetDateTime.class, java.util.Date.class) + .apiInfo(apiInfo()); + } + + class BasePathAwareRelativePathProvider extends RelativePathProvider { + private String basePath; + + public BasePathAwareRelativePathProvider(ServletContext servletContext, String basePath) { + super(servletContext); + this.basePath = basePath; + } + + @Override + protected String applicationPath() { + return Paths.removeAdjacentForwardSlashes(UriComponentsBuilder.fromPath(super.applicationPath()).path(basePath).build().toString()); + } + + @Override + public String getOperationPath(String operationPath) { + UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromPath("/"); + return Paths.removeAdjacentForwardSlashes( + uriComponentsBuilder.path(operationPath.replaceFirst("^" + basePath, "")).build().toString()); + } + } + +} diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalProperties.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalProperties.java new file mode 100644 index 000000000000..0661a2ed24ab --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalProperties.java @@ -0,0 +1,136 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.model.AdditionalPropertiesClass; +import org.openapitools.model.AdditionalPropertiesClassRef; +import org.openapitools.model.MixedPropertiesAndAdditionalPropertiesClass; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * AdditionalProperties + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalProperties { + + private @Nullable AdditionalPropertiesClassRef additionalPropertiesClassRef; + + private @Nullable AdditionalPropertiesClass additionalPropertiesClass; + + private @Nullable MixedPropertiesAndAdditionalPropertiesClass mixed; + + public AdditionalProperties additionalPropertiesClassRef(AdditionalPropertiesClassRef additionalPropertiesClassRef) { + this.additionalPropertiesClassRef = additionalPropertiesClassRef; + return this; + } + + /** + * Get additionalPropertiesClassRef + * @return additionalPropertiesClassRef + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("additionalPropertiesClassRef") + public AdditionalPropertiesClassRef getAdditionalPropertiesClassRef() { + return additionalPropertiesClassRef; + } + + public void setAdditionalPropertiesClassRef(AdditionalPropertiesClassRef additionalPropertiesClassRef) { + this.additionalPropertiesClassRef = additionalPropertiesClassRef; + } + + public AdditionalProperties additionalPropertiesClass(AdditionalPropertiesClass additionalPropertiesClass) { + this.additionalPropertiesClass = additionalPropertiesClass; + return this; + } + + /** + * Get additionalPropertiesClass + * @return additionalPropertiesClass + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("additionalPropertiesClass") + public AdditionalPropertiesClass getAdditionalPropertiesClass() { + return additionalPropertiesClass; + } + + public void setAdditionalPropertiesClass(AdditionalPropertiesClass additionalPropertiesClass) { + this.additionalPropertiesClass = additionalPropertiesClass; + } + + public AdditionalProperties mixed(MixedPropertiesAndAdditionalPropertiesClass mixed) { + this.mixed = mixed; + return this; + } + + /** + * Get mixed + * @return mixed + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("mixed") + public MixedPropertiesAndAdditionalPropertiesClass getMixed() { + return mixed; + } + + public void setMixed(MixedPropertiesAndAdditionalPropertiesClass mixed) { + this.mixed = mixed; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalProperties additionalProperties = (AdditionalProperties) o; + return Objects.equals(this.additionalPropertiesClassRef, additionalProperties.additionalPropertiesClassRef) && + Objects.equals(this.additionalPropertiesClass, additionalProperties.additionalPropertiesClass) && + Objects.equals(this.mixed, additionalProperties.mixed); + } + + @Override + public int hashCode() { + return Objects.hash(additionalPropertiesClassRef, additionalPropertiesClass, mixed); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalProperties {\n"); + sb.append(" additionalPropertiesClassRef: ").append(toIndentedString(additionalPropertiesClassRef)).append("\n"); + sb.append(" additionalPropertiesClass: ").append(toIndentedString(additionalPropertiesClass)).append("\n"); + sb.append(" mixed: ").append(toIndentedString(mixed)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java new file mode 100644 index 000000000000..708ff8488409 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -0,0 +1,129 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesAnyType + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesAnyType { + + private @Nullable String name; + + public AdditionalPropertiesAnyType name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesAnyType putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; + return Objects.equals(this.name, additionalPropertiesAnyType.name) && + Objects.equals(this.additionalProperties, additionalPropertiesAnyType.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesAnyType {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java new file mode 100644 index 000000000000..f9911831c038 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -0,0 +1,130 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.List; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesArray + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesArray { + + private @Nullable String name; + + public AdditionalPropertiesArray name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesArray putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; + return Objects.equals(this.name, additionalPropertiesArray.name) && + Objects.equals(this.additionalProperties, additionalPropertiesArray.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesArray {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java new file mode 100644 index 000000000000..fa1118e2b881 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -0,0 +1,129 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesBoolean + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesBoolean { + + private @Nullable String name; + + public AdditionalPropertiesBoolean name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; + return Objects.equals(this.name, additionalPropertiesBoolean.name) && + Objects.equals(this.additionalProperties, additionalPropertiesBoolean.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesBoolean {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java new file mode 100644 index 000000000000..991c11f3c705 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -0,0 +1,415 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; +import org.springframework.lang.Nullable; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertiesClass + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesClass { + + @Valid + private Map mapString = new HashMap<>(); + + @Valid + private Map mapNumber = new HashMap<>(); + + @Valid + private Map mapInteger = new HashMap<>(); + + @Valid + private Map mapBoolean = new HashMap<>(); + + @Valid + private Map> mapArrayInteger = new HashMap<>(); + + @Valid + private Map> mapArrayAnytype = new HashMap<>(); + + @Valid + private Map> mapMapString = new HashMap<>(); + + @Valid + private Map> mapMapAnytype = new HashMap<>(); + + private @Nullable Object anytype1; + + private JsonNullable anytype2 = JsonNullable.undefined(); + + private @Nullable Object anytype3; + + public AdditionalPropertiesClass mapString(Map mapString) { + this.mapString = mapString; + return this; + } + + public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) { + if (this.mapString == null) { + this.mapString = new HashMap<>(); + } + this.mapString.put(key, mapStringItem); + return this; + } + + /** + * Get mapString + * @return mapString + */ + + @ApiModelProperty(value = "") + @JsonProperty("map_string") + public Map getMapString() { + return mapString; + } + + public void setMapString(Map mapString) { + this.mapString = mapString; + } + + public AdditionalPropertiesClass mapNumber(Map mapNumber) { + this.mapNumber = mapNumber; + return this; + } + + public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) { + if (this.mapNumber == null) { + this.mapNumber = new HashMap<>(); + } + this.mapNumber.put(key, mapNumberItem); + return this; + } + + /** + * Get mapNumber + * @return mapNumber + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_number") + public Map getMapNumber() { + return mapNumber; + } + + public void setMapNumber(Map mapNumber) { + this.mapNumber = mapNumber; + } + + public AdditionalPropertiesClass mapInteger(Map mapInteger) { + this.mapInteger = mapInteger; + return this; + } + + public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) { + if (this.mapInteger == null) { + this.mapInteger = new HashMap<>(); + } + this.mapInteger.put(key, mapIntegerItem); + return this; + } + + /** + * Get mapInteger + * @return mapInteger + */ + + @ApiModelProperty(value = "") + @JsonProperty("map_integer") + public Map getMapInteger() { + return mapInteger; + } + + public void setMapInteger(Map mapInteger) { + this.mapInteger = mapInteger; + } + + public AdditionalPropertiesClass mapBoolean(Map mapBoolean) { + this.mapBoolean = mapBoolean; + return this; + } + + public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) { + if (this.mapBoolean == null) { + this.mapBoolean = new HashMap<>(); + } + this.mapBoolean.put(key, mapBooleanItem); + return this; + } + + /** + * Get mapBoolean + * @return mapBoolean + */ + + @ApiModelProperty(value = "") + @JsonProperty("map_boolean") + public Map getMapBoolean() { + return mapBoolean; + } + + public void setMapBoolean(Map mapBoolean) { + this.mapBoolean = mapBoolean; + } + + public AdditionalPropertiesClass mapArrayInteger(Map> mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + return this; + } + + public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List mapArrayIntegerItem) { + if (this.mapArrayInteger == null) { + this.mapArrayInteger = new HashMap<>(); + } + this.mapArrayInteger.put(key, mapArrayIntegerItem); + return this; + } + + /** + * Get mapArrayInteger + * @return mapArrayInteger + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") + public Map> getMapArrayInteger() { + return mapArrayInteger; + } + + public void setMapArrayInteger(Map> mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + } + + public AdditionalPropertiesClass mapArrayAnytype(Map> mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + return this; + } + + public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List mapArrayAnytypeItem) { + if (this.mapArrayAnytype == null) { + this.mapArrayAnytype = new HashMap<>(); + } + this.mapArrayAnytype.put(key, mapArrayAnytypeItem); + return this; + } + + /** + * Get mapArrayAnytype + * @return mapArrayAnytype + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") + public Map> getMapArrayAnytype() { + return mapArrayAnytype; + } + + public void setMapArrayAnytype(Map> mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + } + + public AdditionalPropertiesClass mapMapString(Map> mapMapString) { + this.mapMapString = mapMapString; + return this; + } + + public AdditionalPropertiesClass putMapMapStringItem(String key, Map mapMapStringItem) { + if (this.mapMapString == null) { + this.mapMapString = new HashMap<>(); + } + this.mapMapString.put(key, mapMapStringItem); + return this; + } + + /** + * Get mapMapString + * @return mapMapString + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_map_string") + public Map> getMapMapString() { + return mapMapString; + } + + public void setMapMapString(Map> mapMapString) { + this.mapMapString = mapMapString; + } + + public AdditionalPropertiesClass mapMapAnytype(Map> mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + return this; + } + + public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map mapMapAnytypeItem) { + if (this.mapMapAnytype == null) { + this.mapMapAnytype = new HashMap<>(); + } + this.mapMapAnytype.put(key, mapMapAnytypeItem); + return this; + } + + /** + * Get mapMapAnytype + * @return mapMapAnytype + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") + public Map> getMapMapAnytype() { + return mapMapAnytype; + } + + public void setMapMapAnytype(Map> mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + } + + public AdditionalPropertiesClass anytype1(Object anytype1) { + this.anytype1 = anytype1; + return this; + } + + /** + * Get anytype1 + * @return anytype1 + */ + + @ApiModelProperty(value = "") + @JsonProperty("anytype_1") + public Object getAnytype1() { + return anytype1; + } + + public void setAnytype1(Object anytype1) { + this.anytype1 = anytype1; + } + + public AdditionalPropertiesClass anytype2(Object anytype2) { + this.anytype2 = JsonNullable.of(anytype2); + return this; + } + + /** + * Get anytype2 + * @return anytype2 + */ + + @ApiModelProperty(value = "") + @JsonProperty("anytype_2") + public JsonNullable getAnytype2() { + return anytype2; + } + + public void setAnytype2(JsonNullable anytype2) { + this.anytype2 = anytype2; + } + + public AdditionalPropertiesClass anytype3(Object anytype3) { + this.anytype3 = anytype3; + return this; + } + + /** + * Get anytype3 + * @return anytype3 + */ + + @ApiModelProperty(value = "") + @JsonProperty("anytype_3") + public Object getAnytype3() { + return anytype3; + } + + public void setAnytype3(Object anytype3) { + this.anytype3 = anytype3; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o; + return Objects.equals(this.mapString, additionalPropertiesClass.mapString) && + Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) && + Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) && + Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) && + Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) && + Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) && + Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && + Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && + Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && + equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) && + Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesClass {\n"); + sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); + sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); + sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); + sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); + sb.append(" mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n"); + sb.append(" mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n"); + sb.append(" mapMapString: ").append(toIndentedString(mapMapString)).append("\n"); + sb.append(" mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n"); + sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); + sb.append(" anytype2: ").append(toIndentedString(anytype2)).append("\n"); + sb.append(" anytype3: ").append(toIndentedString(anytype3)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClassRef.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClassRef.java new file mode 100644 index 000000000000..e5c581f64232 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesClassRef.java @@ -0,0 +1,185 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.model.AdditionalPropertiesBoolean; +import org.openapitools.model.AdditionalPropertiesInteger; +import org.openapitools.model.AdditionalPropertiesNumber; +import org.openapitools.model.AdditionalPropertiesString; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertiesClassRef + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesClassRef { + + private @Nullable AdditionalPropertiesString mapString; + + private @Nullable AdditionalPropertiesNumber mapNumber; + + private @Nullable AdditionalPropertiesInteger mapInteger; + + private @Nullable AdditionalPropertiesBoolean mapBoolean; + + private @Nullable Object anytype1; + + public AdditionalPropertiesClassRef mapString(AdditionalPropertiesString mapString) { + this.mapString = mapString; + return this; + } + + /** + * Get mapString + * @return mapString + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_string") + public AdditionalPropertiesString getMapString() { + return mapString; + } + + public void setMapString(AdditionalPropertiesString mapString) { + this.mapString = mapString; + } + + public AdditionalPropertiesClassRef mapNumber(AdditionalPropertiesNumber mapNumber) { + this.mapNumber = mapNumber; + return this; + } + + /** + * Get mapNumber + * @return mapNumber + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_number") + public AdditionalPropertiesNumber getMapNumber() { + return mapNumber; + } + + public void setMapNumber(AdditionalPropertiesNumber mapNumber) { + this.mapNumber = mapNumber; + } + + public AdditionalPropertiesClassRef mapInteger(AdditionalPropertiesInteger mapInteger) { + this.mapInteger = mapInteger; + return this; + } + + /** + * Get mapInteger + * @return mapInteger + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_integer") + public AdditionalPropertiesInteger getMapInteger() { + return mapInteger; + } + + public void setMapInteger(AdditionalPropertiesInteger mapInteger) { + this.mapInteger = mapInteger; + } + + public AdditionalPropertiesClassRef mapBoolean(AdditionalPropertiesBoolean mapBoolean) { + this.mapBoolean = mapBoolean; + return this; + } + + /** + * Get mapBoolean + * @return mapBoolean + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_boolean") + public AdditionalPropertiesBoolean getMapBoolean() { + return mapBoolean; + } + + public void setMapBoolean(AdditionalPropertiesBoolean mapBoolean) { + this.mapBoolean = mapBoolean; + } + + public AdditionalPropertiesClassRef anytype1(Object anytype1) { + this.anytype1 = anytype1; + return this; + } + + /** + * Get anytype1 + * @return anytype1 + */ + + @ApiModelProperty(value = "") + @JsonProperty("anytype_1") + public Object getAnytype1() { + return anytype1; + } + + public void setAnytype1(Object anytype1) { + this.anytype1 = anytype1; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesClassRef additionalPropertiesClassRef = (AdditionalPropertiesClassRef) o; + return Objects.equals(this.mapString, additionalPropertiesClassRef.mapString) && + Objects.equals(this.mapNumber, additionalPropertiesClassRef.mapNumber) && + Objects.equals(this.mapInteger, additionalPropertiesClassRef.mapInteger) && + Objects.equals(this.mapBoolean, additionalPropertiesClassRef.mapBoolean) && + Objects.equals(this.anytype1, additionalPropertiesClassRef.anytype1); + } + + @Override + public int hashCode() { + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, anytype1); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesClassRef {\n"); + sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); + sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); + sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); + sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); + sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java new file mode 100644 index 000000000000..58383a099825 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -0,0 +1,129 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesInteger + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesInteger { + + private @Nullable String name; + + public AdditionalPropertiesInteger name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; + return Objects.equals(this.name, additionalPropertiesInteger.name) && + Objects.equals(this.additionalProperties, additionalPropertiesInteger.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesInteger {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java new file mode 100644 index 000000000000..88d0bc11b6b0 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -0,0 +1,130 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesNumber + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesNumber { + + private @Nullable String name; + + public AdditionalPropertiesNumber name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; + return Objects.equals(this.name, additionalPropertiesNumber.name) && + Objects.equals(this.additionalProperties, additionalPropertiesNumber.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesNumber {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java new file mode 100644 index 000000000000..e093ccd8e35f --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -0,0 +1,130 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Map; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesObject + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesObject { + + private @Nullable String name; + + public AdditionalPropertiesObject name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesObject putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; + return Objects.equals(this.name, additionalPropertiesObject.name) && + Objects.equals(this.additionalProperties, additionalPropertiesObject.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesObject {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesString.java new file mode 100644 index 000000000000..21a023b3db12 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -0,0 +1,129 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertiesString + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertiesString { + + private @Nullable String name; + + public AdditionalPropertiesString name(String name) { + this.name = name; + return this; + } + + /** + * Get name + * @return name + */ + + @ApiModelProperty(value = "") + @JsonProperty("name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertiesString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; + return Objects.equals(this.name, additionalPropertiesString.name) && + Objects.equals(this.additionalProperties, additionalPropertiesString.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(name, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertiesString {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayAnyType.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayAnyType.java new file mode 100644 index 000000000000..216d6aeda774 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayAnyType.java @@ -0,0 +1,101 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyArrayAnyType + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyArrayAnyType { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyArrayAnyType putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyArrayAnyType additionalPropertyArrayAnyType = (AdditionalPropertyArrayAnyType) o; + return Objects.equals(this.additionalProperties, additionalPropertyArrayAnyType.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyArrayAnyType {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayInteger.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayInteger.java new file mode 100644 index 000000000000..1e066f55168b --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyArrayInteger.java @@ -0,0 +1,101 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyArrayInteger + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyArrayInteger { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyArrayInteger putAdditionalProperty(String key, List value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public List getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyArrayInteger additionalPropertyArrayInteger = (AdditionalPropertyArrayInteger) o; + return Objects.equals(this.additionalProperties, additionalPropertyArrayInteger.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyArrayInteger {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyBoolean.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyBoolean.java new file mode 100644 index 000000000000..dcd459172392 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyBoolean.java @@ -0,0 +1,100 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyBoolean + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyBoolean { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyBoolean putAdditionalProperty(String key, Boolean value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Boolean getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyBoolean additionalPropertyBoolean = (AdditionalPropertyBoolean) o; + return Objects.equals(this.additionalProperties, additionalPropertyBoolean.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyBoolean {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyClassRef.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyClassRef.java new file mode 100644 index 000000000000..bd1366623e58 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyClassRef.java @@ -0,0 +1,285 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.openapitools.model.AdditionalPropertyArrayAnyType; +import org.openapitools.model.AdditionalPropertyArrayInteger; +import org.openapitools.model.AdditionalPropertyBoolean; +import org.openapitools.model.AdditionalPropertyInteger; +import org.openapitools.model.AdditionalPropertyMapAnyType; +import org.openapitools.model.AdditionalPropertyMapString; +import org.openapitools.model.AdditionalPropertyNumber; +import org.openapitools.model.AdditionalPropertyString; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * AdditionalPropertyClassRef + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyClassRef { + + private @Nullable AdditionalPropertyString mapString; + + private @Nullable AdditionalPropertyNumber mapNumber; + + private @Nullable AdditionalPropertyInteger mapInteger; + + private @Nullable AdditionalPropertyBoolean mapBoolean; + + private @Nullable AdditionalPropertyArrayInteger mapArrayInteger; + + private @Nullable AdditionalPropertyArrayAnyType mapArrayAnytype; + + private @Nullable AdditionalPropertyMapString mapMapString; + + private @Nullable AdditionalPropertyMapAnyType mapMapAnytype; + + private @Nullable Object anytype1; + + public AdditionalPropertyClassRef mapString(AdditionalPropertyString mapString) { + this.mapString = mapString; + return this; + } + + /** + * Get mapString + * @return mapString + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_string") + public AdditionalPropertyString getMapString() { + return mapString; + } + + public void setMapString(AdditionalPropertyString mapString) { + this.mapString = mapString; + } + + public AdditionalPropertyClassRef mapNumber(AdditionalPropertyNumber mapNumber) { + this.mapNumber = mapNumber; + return this; + } + + /** + * Get mapNumber + * @return mapNumber + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_number") + public AdditionalPropertyNumber getMapNumber() { + return mapNumber; + } + + public void setMapNumber(AdditionalPropertyNumber mapNumber) { + this.mapNumber = mapNumber; + } + + public AdditionalPropertyClassRef mapInteger(AdditionalPropertyInteger mapInteger) { + this.mapInteger = mapInteger; + return this; + } + + /** + * Get mapInteger + * @return mapInteger + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_integer") + public AdditionalPropertyInteger getMapInteger() { + return mapInteger; + } + + public void setMapInteger(AdditionalPropertyInteger mapInteger) { + this.mapInteger = mapInteger; + } + + public AdditionalPropertyClassRef mapBoolean(AdditionalPropertyBoolean mapBoolean) { + this.mapBoolean = mapBoolean; + return this; + } + + /** + * Get mapBoolean + * @return mapBoolean + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_boolean") + public AdditionalPropertyBoolean getMapBoolean() { + return mapBoolean; + } + + public void setMapBoolean(AdditionalPropertyBoolean mapBoolean) { + this.mapBoolean = mapBoolean; + } + + public AdditionalPropertyClassRef mapArrayInteger(AdditionalPropertyArrayInteger mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + return this; + } + + /** + * Get mapArrayInteger + * @return mapArrayInteger + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_array_integer") + public AdditionalPropertyArrayInteger getMapArrayInteger() { + return mapArrayInteger; + } + + public void setMapArrayInteger(AdditionalPropertyArrayInteger mapArrayInteger) { + this.mapArrayInteger = mapArrayInteger; + } + + public AdditionalPropertyClassRef mapArrayAnytype(AdditionalPropertyArrayAnyType mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + return this; + } + + /** + * Get mapArrayAnytype + * @return mapArrayAnytype + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_array_anytype") + public AdditionalPropertyArrayAnyType getMapArrayAnytype() { + return mapArrayAnytype; + } + + public void setMapArrayAnytype(AdditionalPropertyArrayAnyType mapArrayAnytype) { + this.mapArrayAnytype = mapArrayAnytype; + } + + public AdditionalPropertyClassRef mapMapString(AdditionalPropertyMapString mapMapString) { + this.mapMapString = mapMapString; + return this; + } + + /** + * Get mapMapString + * @return mapMapString + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_map_string") + public AdditionalPropertyMapString getMapMapString() { + return mapMapString; + } + + public void setMapMapString(AdditionalPropertyMapString mapMapString) { + this.mapMapString = mapMapString; + } + + public AdditionalPropertyClassRef mapMapAnytype(AdditionalPropertyMapAnyType mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + return this; + } + + /** + * Get mapMapAnytype + * @return mapMapAnytype + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map_map_anytype") + public AdditionalPropertyMapAnyType getMapMapAnytype() { + return mapMapAnytype; + } + + public void setMapMapAnytype(AdditionalPropertyMapAnyType mapMapAnytype) { + this.mapMapAnytype = mapMapAnytype; + } + + public AdditionalPropertyClassRef anytype1(Object anytype1) { + this.anytype1 = anytype1; + return this; + } + + /** + * Get anytype1 + * @return anytype1 + */ + + @ApiModelProperty(value = "") + @JsonProperty("anytype_1") + public Object getAnytype1() { + return anytype1; + } + + public void setAnytype1(Object anytype1) { + this.anytype1 = anytype1; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyClassRef additionalPropertyClassRef = (AdditionalPropertyClassRef) o; + return Objects.equals(this.mapString, additionalPropertyClassRef.mapString) && + Objects.equals(this.mapNumber, additionalPropertyClassRef.mapNumber) && + Objects.equals(this.mapInteger, additionalPropertyClassRef.mapInteger) && + Objects.equals(this.mapBoolean, additionalPropertyClassRef.mapBoolean) && + Objects.equals(this.mapArrayInteger, additionalPropertyClassRef.mapArrayInteger) && + Objects.equals(this.mapArrayAnytype, additionalPropertyClassRef.mapArrayAnytype) && + Objects.equals(this.mapMapString, additionalPropertyClassRef.mapMapString) && + Objects.equals(this.mapMapAnytype, additionalPropertyClassRef.mapMapAnytype) && + Objects.equals(this.anytype1, additionalPropertyClassRef.anytype1); + } + + @Override + public int hashCode() { + return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyClassRef {\n"); + sb.append(" mapString: ").append(toIndentedString(mapString)).append("\n"); + sb.append(" mapNumber: ").append(toIndentedString(mapNumber)).append("\n"); + sb.append(" mapInteger: ").append(toIndentedString(mapInteger)).append("\n"); + sb.append(" mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n"); + sb.append(" mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n"); + sb.append(" mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n"); + sb.append(" mapMapString: ").append(toIndentedString(mapMapString)).append("\n"); + sb.append(" mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n"); + sb.append(" anytype1: ").append(toIndentedString(anytype1)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyInteger.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyInteger.java new file mode 100644 index 000000000000..6355ff41e835 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyInteger.java @@ -0,0 +1,100 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyInteger + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyInteger { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyInteger putAdditionalProperty(String key, Integer value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Integer getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyInteger additionalPropertyInteger = (AdditionalPropertyInteger) o; + return Objects.equals(this.additionalProperties, additionalPropertyInteger.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyInteger {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapAnyType.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapAnyType.java new file mode 100644 index 000000000000..79e210d44758 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapAnyType.java @@ -0,0 +1,101 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyMapAnyType + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyMapAnyType { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyMapAnyType putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyMapAnyType additionalPropertyMapAnyType = (AdditionalPropertyMapAnyType) o; + return Objects.equals(this.additionalProperties, additionalPropertyMapAnyType.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyMapAnyType {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapString.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapString.java new file mode 100644 index 000000000000..799fe3d4324c --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyMapString.java @@ -0,0 +1,101 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import java.util.Map; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyMapString + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyMapString { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyMapString putAdditionalProperty(String key, Map value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Map getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyMapString additionalPropertyMapString = (AdditionalPropertyMapString) o; + return Objects.equals(this.additionalProperties, additionalPropertyMapString.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyMapString {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyNumber.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyNumber.java new file mode 100644 index 000000000000..1ddf06a84c74 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyNumber.java @@ -0,0 +1,101 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import java.math.BigDecimal; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyNumber + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyNumber { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyNumber putAdditionalProperty(String key, BigDecimal value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public BigDecimal getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyNumber additionalPropertyNumber = (AdditionalPropertyNumber) o; + return Objects.equals(this.additionalProperties, additionalPropertyNumber.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyNumber {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyString.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyString.java new file mode 100644 index 000000000000..cdf2dd090cba --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/AdditionalPropertyString.java @@ -0,0 +1,100 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +/** + * AdditionalPropertyString + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class AdditionalPropertyString { + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + @JsonAnySetter + public AdditionalPropertyString putAdditionalProperty(String key, String value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + @JsonAnyGetter + public Map getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public String getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AdditionalPropertyString additionalPropertyString = (AdditionalPropertyString) o; + return Objects.equals(this.additionalProperties, additionalPropertyString.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AdditionalPropertyString {\n"); + + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/Animal.java new file mode 100644 index 000000000000..935329bfeeb7 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/Animal.java @@ -0,0 +1,85 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * Animal + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class Animal { + + private @Nullable String className; + + public Animal className(String className) { + this.className = className; + return this; + } + + /** + * Get className + * @return className + */ + + @ApiModelProperty(value = "") + @JsonProperty("className") + public String getClassName() { + return className; + } + + public void setClassName(String className) { + this.className = className; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Animal animal = (Animal) o; + return Objects.equals(this.className, animal.className); + } + + @Override + public int hashCode() { + return Objects.hash(className); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Animal {\n"); + sb.append(" className: ").append(toIndentedString(className)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java new file mode 100644 index 000000000000..8a3cf2931d7c --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -0,0 +1,149 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import org.openapitools.model.Animal; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.lang.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import javax.validation.Valid; +import javax.validation.constraints.*; + + +import java.util.*; +import javax.annotation.Generated; + +/** + * MixedPropertiesAndAdditionalPropertiesClass + */ + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.13.0-SNAPSHOT") +public class MixedPropertiesAndAdditionalPropertiesClass { + + private @Nullable UUID uuid; + + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private @Nullable OffsetDateTime dateTime; + + @Valid + private Map map = new HashMap<>(); + + public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + this.uuid = uuid; + return this; + } + + /** + * Get uuid + * @return uuid + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("uuid") + public UUID getUuid() { + return uuid; + } + + public void setUuid(UUID uuid) { + this.uuid = uuid; + } + + public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + this.dateTime = dateTime; + return this; + } + + /** + * Get dateTime + * @return dateTime + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("dateTime") + public OffsetDateTime getDateTime() { + return dateTime; + } + + public void setDateTime(OffsetDateTime dateTime) { + this.dateTime = dateTime; + } + + public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { + this.map = map; + return this; + } + + public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { + if (this.map == null) { + this.map = new HashMap<>(); + } + this.map.put(key, mapItem); + return this; + } + + /** + * Get map + * @return map + */ + @Valid + @ApiModelProperty(value = "") + @JsonProperty("map") + public Map getMap() { + return map; + } + + public void setMap(Map map) { + this.map = map; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; + return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && + Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && + Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); + } + + @Override + public int hashCode() { + return Objects.hash(uuid, dateTime, map); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n"); + sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n"); + sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n"); + sb.append(" map: ").append(toIndentedString(map)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} + diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/application.properties b/samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/application.properties new file mode 100644 index 000000000000..7e90813e59b2 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/application.properties @@ -0,0 +1,3 @@ +server.port=8080 +spring.jackson.date-format=org.openapitools.RFC3339DateFormat +spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/openapi.yaml new file mode 100644 index 000000000000..ca8697223650 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/main/resources/openapi.yaml @@ -0,0 +1,332 @@ +openapi: 3.0.0 +info: + description: This spec is mainly for testing generateAliasAsModel and + title: generateAliasAsModel + version: 1.0.0 +servers: +- url: / +paths: + /fake/additionalProperties-reference: + post: + description: "" + operationId: testAdditionalPropertiesReference + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/AdditionalProperties' + description: request body + required: true + responses: + "200": + description: successful operation + summary: test referenced additionalProperties + tags: + - fake + x-content-type: application/json + x-accepts: + - application/json + x-tags: + - tag: fake +components: + schemas: + AdditionalProperties: + example: + additionalPropertiesClass: + map_map_string: + key: + key: map_map_string + map_integer: + key: 6 + map_number: + key: 0.8008281904610115 + map_array_anytype: + key: + - "{}" + - "{}" + map_string: + key: map_string + anytype_2: "" + anytype_1: "{}" + map_boolean: + key: true + map_array_integer: + key: + - 1 + - 1 + map_map_anytype: + key: + key: "{}" + anytype_3: "{}" + mixed: + dateTime: 2000-01-23T04:56:07.000+00:00 + uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + map: + key: + className: className + additionalPropertiesClassRef: + map_integer: + name: name + map_number: + name: name + map_string: + name: name + anytype_1: "{}" + map_boolean: + name: name + properties: + additionalPropertiesClassRef: + $ref: '#/components/schemas/AdditionalPropertiesClassRef' + additionalPropertiesClass: + $ref: '#/components/schemas/AdditionalPropertiesClass' + mixed: + $ref: '#/components/schemas/MixedPropertiesAndAdditionalPropertiesClass' + type: object + AdditionalPropertiesClassRef: + example: + map_integer: + name: name + map_number: + name: name + map_string: + name: name + anytype_1: "{}" + map_boolean: + name: name + properties: + map_string: + $ref: '#/components/schemas/AdditionalPropertiesString' + map_number: + $ref: '#/components/schemas/AdditionalPropertiesNumber' + map_integer: + $ref: '#/components/schemas/AdditionalPropertiesInteger' + map_boolean: + $ref: '#/components/schemas/AdditionalPropertiesBoolean' + anytype_1: + type: object + type: object + AdditionalPropertyClassRef: + properties: + map_string: + $ref: '#/components/schemas/AdditionalPropertyString' + map_number: + $ref: '#/components/schemas/AdditionalPropertyNumber' + map_integer: + $ref: '#/components/schemas/AdditionalPropertyInteger' + map_boolean: + $ref: '#/components/schemas/AdditionalPropertyBoolean' + map_array_integer: + $ref: '#/components/schemas/AdditionalPropertyArrayInteger' + map_array_anytype: + $ref: '#/components/schemas/AdditionalPropertyArrayAnyType' + map_map_string: + $ref: '#/components/schemas/AdditionalPropertyMapString' + map_map_anytype: + $ref: '#/components/schemas/AdditionalPropertyMapAnyType' + anytype_1: + type: object + type: object + AdditionalPropertyString: + additionalProperties: + type: string + type: object + AdditionalPropertyNumber: + additionalProperties: + type: number + type: object + AdditionalPropertyInteger: + additionalProperties: + type: integer + type: object + AdditionalPropertyBoolean: + additionalProperties: + type: boolean + type: object + AdditionalPropertyArrayInteger: + additionalProperties: + items: + type: integer + type: array + type: object + AdditionalPropertyArrayAnyType: + additionalProperties: + items: + type: object + type: array + type: object + AdditionalPropertyMapString: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + AdditionalPropertyMapAnyType: + additionalProperties: + additionalProperties: + type: object + type: object + type: object + AnyType1: + type: object + AdditionalPropertiesClass: + example: + map_map_string: + key: + key: map_map_string + map_integer: + key: 6 + map_number: + key: 0.8008281904610115 + map_array_anytype: + key: + - "{}" + - "{}" + map_string: + key: map_string + anytype_2: "" + anytype_1: "{}" + map_boolean: + key: true + map_array_integer: + key: + - 1 + - 1 + map_map_anytype: + key: + key: "{}" + anytype_3: "{}" + properties: + map_string: + additionalProperties: + type: string + type: object + map_number: + additionalProperties: + type: number + type: object + map_integer: + additionalProperties: + type: integer + type: object + map_boolean: + additionalProperties: + type: boolean + type: object + map_array_integer: + additionalProperties: + items: + type: integer + type: array + type: object + map_array_anytype: + additionalProperties: + items: + type: object + type: array + type: object + map_map_string: + additionalProperties: + additionalProperties: + type: string + type: object + type: object + map_map_anytype: + additionalProperties: + additionalProperties: + type: object + type: object + type: object + anytype_1: + type: object + anytype_2: {} + anytype_3: + properties: {} + type: object + type: object + AdditionalPropertiesString: + additionalProperties: + type: string + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesInteger: + additionalProperties: + type: integer + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesNumber: + additionalProperties: + type: number + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesBoolean: + additionalProperties: + type: boolean + example: + name: name + properties: + name: + type: string + type: object + AdditionalPropertiesArray: + additionalProperties: + items: + type: object + type: array + properties: + name: + type: string + type: object + AdditionalPropertiesObject: + additionalProperties: + additionalProperties: + type: object + type: object + properties: + name: + type: string + type: object + AdditionalPropertiesAnyType: + additionalProperties: + type: object + properties: + name: + type: string + type: object + MixedPropertiesAndAdditionalPropertiesClass: + example: + dateTime: 2000-01-23T04:56:07.000+00:00 + uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + map: + key: + className: className + properties: + uuid: + format: uuid + type: string + dateTime: + format: date-time + type: string + map: + additionalProperties: + $ref: '#/components/schemas/Animal' + type: object + type: object + Animal: + example: + className: className + properties: + className: + type: string + type: object diff --git a/samples/server/petstore/springboot-generateAliasAsModel/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java b/samples/server/petstore/springboot-generateAliasAsModel/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java new file mode 100644 index 000000000000..3681f67e7705 --- /dev/null +++ b/samples/server/petstore/springboot-generateAliasAsModel/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java @@ -0,0 +1,13 @@ +package org.openapitools; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class OpenApiGeneratorApplicationTests { + + @Test + void contextLoads() { + } + +} \ No newline at end of file From e6abba41aa983b22299b4733e8229a6683fc60ac Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 11:03:10 +0100 Subject: [PATCH 36/47] Remove unused sample --- .../resources/3_0/additionalProperties.yaml | 66 ------------------- 1 file changed, 66 deletions(-) delete mode 100644 modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml diff --git a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml deleted file mode 100644 index d7e6cedb8f00..000000000000 --- a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml +++ /dev/null @@ -1,66 +0,0 @@ -openapi: 3.0.0 -info: - title: "test for additionalProperties" - version: 1.0.0 -paths: - /test: - get: - responses: - "200": - description: test - content: - application/json: - schema: - $ref: '#/components/schemas/Response' -components: - schemas: - Response: - type: object - properties: - inlineMap: - type: object - additionalProperties: - type: string - additionalPropertiesOnlyTypeObject: - $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeObject' - additionalPropertiesOnlyTypeString: - $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeString' - additionalPropertiesTypeObject: - $ref: '#/components/schemas/AdditionalPropertiesTypeObject' - additionalPropertiesTypeString: - $ref: '#/components/schemas/AdditionalPropertiesTypeString' - additionalPropertiesTrue: - $ref: '#/components/schemas/AdditionalPropertiesTrue' - additionalPropertiesOnlyTrue: - $ref: '#/components/schemas/AdditionalPropertiesOnlyTrue' - AdditionalPropertiesOnlyTypeObject: - type: object - additionalProperties: - type: object - AdditionalPropertiesOnlyTypeString: - type: object - additionalProperties: - type: string - AdditionalPropertiesTypeObject: - type: object - properties: - name: - type: string - additionalProperties: - type: object - AdditionalPropertiesTypeString: - type: object - properties: - name: - type: string - additionalProperties: - type: string - AdditionalPropertiesOnlyTrue: - type: object - additionalProperties: true - AdditionalPropertiesTrue: - type: object - properties: - name: - type: string - additionalProperties: true From cd542a50147bbc40e0ba34e1dac59fd188b4f9e0 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 11:48:21 +0100 Subject: [PATCH 37/47] Fix test for AdditionalProperties --- .../codegen/java/JavaClientCodegenTest.java | 4 +- .../resources/3_0/additionalProperties.yaml | 66 +++++++++++++++++++ 2 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 962f18b980e0..d006174fb516 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -41,7 +41,6 @@ import org.openapitools.codegen.model.OperationsMap; import org.openapitools.codegen.testutils.ConfigAssert; import org.testng.annotations.DataProvider; -import org.testng.annotations.Parameters; import org.testng.annotations.Test; import java.io.File; @@ -3516,7 +3515,7 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties)"); JavaFileAssert.assertThat(files.get("Response.java")).fileContains( - + "Map inlineMap = new HashMap<>();", "AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); } @@ -3558,7 +3557,6 @@ public void testAdditionalPropertiesWithGenerateAliasForMicroProfile() { "return Objects.hash(name, super.hashCode())"); JavaFileAssert.assertThat(files.get("Response.java")).fileContains( - "Map inlineMap = new HashMap<>();", "AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;"); } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml new file mode 100644 index 000000000000..d7e6cedb8f00 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml @@ -0,0 +1,66 @@ +openapi: 3.0.0 +info: + title: "test for additionalProperties" + version: 1.0.0 +paths: + /test: + get: + responses: + "200": + description: test + content: + application/json: + schema: + $ref: '#/components/schemas/Response' +components: + schemas: + Response: + type: object + properties: + inlineMap: + type: object + additionalProperties: + type: string + additionalPropertiesOnlyTypeObject: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeObject' + additionalPropertiesOnlyTypeString: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTypeString' + additionalPropertiesTypeObject: + $ref: '#/components/schemas/AdditionalPropertiesTypeObject' + additionalPropertiesTypeString: + $ref: '#/components/schemas/AdditionalPropertiesTypeString' + additionalPropertiesTrue: + $ref: '#/components/schemas/AdditionalPropertiesTrue' + additionalPropertiesOnlyTrue: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTrue' + AdditionalPropertiesOnlyTypeObject: + type: object + additionalProperties: + type: object + AdditionalPropertiesOnlyTypeString: + type: object + additionalProperties: + type: string + AdditionalPropertiesTypeObject: + type: object + properties: + name: + type: string + additionalProperties: + type: object + AdditionalPropertiesTypeString: + type: object + properties: + name: + type: string + additionalProperties: + type: string + AdditionalPropertiesOnlyTrue: + type: object + additionalProperties: true + AdditionalPropertiesTrue: + type: object + properties: + name: + type: string + additionalProperties: true From 8ee8978f872adc575949c1553242e04149ff340c Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 12:03:48 +0100 Subject: [PATCH 38/47] Default is still new HashMap<>() --- .../org/openapitools/codegen/java/AbstractJavaCodegenTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java index 73bb96fe7eac..b85b45544691 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java @@ -552,7 +552,7 @@ public void toDefaultValueTest() { ModelUtils.setGenerateAliasAsModel(true); defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), schema); - Assert.assertNull(defaultValue); + Assert.assertEquals(defaultValue, "new HashMap<>()"); // Test default value for date format DateSchema dateSchema = new DateSchema(); From 44e19990fc2043718311f6a300bd122fb09a9e7e Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 12:18:22 +0100 Subject: [PATCH 39/47] Fix missing file in test --- .../org/openapitools/codegen/java/spring/SpringCodegenTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 0939e43012f5..2e844a0eac45 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5391,7 +5391,7 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash .setGeneratorName("spring") .setGenerateAliasAsModel(true) //.setInputSpec("src/test/resources/3_0/additionalProperties.yaml") - .setInputSpec("C:\\dev\\openapi-generator\\modules\\openapi-generator\\src\\test\\resources\\3_0\\petstore-with-fake-endpoints-models-for-testing.yaml") + .setInputSpec("C:\\dev\\openapi-generator\\modules\\openapi-generator\\src\\test\\resources\\3_0\\additionalProperties.yaml") .setOutputDir(output.toString().replace("\\", "/")); Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() From 41e27a8ee192c35a48e7502152b09b9958233afb Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 12:46:23 +0100 Subject: [PATCH 40/47] Fix wrong windows path --- .../openapitools/codegen/java/spring/SpringCodegenTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 2e844a0eac45..f863ef7179d3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5390,8 +5390,7 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash final CodegenConfigurator configurator = new CodegenConfigurator() .setGeneratorName("spring") .setGenerateAliasAsModel(true) - //.setInputSpec("src/test/resources/3_0/additionalProperties.yaml") - .setInputSpec("C:\\dev\\openapi-generator\\modules\\openapi-generator\\src\\test\\resources\\3_0\\additionalProperties.yaml") + .setInputSpec("src/test/resources/3_0/additionalProperties.yaml") .setOutputDir(output.toString().replace("\\", "/")); Map files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate() From 5fcb5abe4c99ffb9c36f76d77e39813f5a36fa36 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 13:05:03 +0100 Subject: [PATCH 41/47] Files includes FakeApiController --- .../springboot-generateAliasAsModel/.openapi-generator/FILES | 1 - 1 file changed, 1 deletion(-) diff --git a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES index a1e16aa7e276..bb35603695e3 100644 --- a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES @@ -1,4 +1,3 @@ -.openapi-generator-ignore README.md pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java From bc3ad42c66790a45cd04f6d0166ce49480a60c7a Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 13:49:08 +0100 Subject: [PATCH 42/47] Files includes FakeApiController --- generateSample.bat | 9 +++++++++ .../.openapi-generator/FILES | 1 + 2 files changed, 10 insertions(+) create mode 100644 generateSample.bat diff --git a/generateSample.bat b/generateSample.bat new file mode 100644 index 000000000000..731c33ffb12e --- /dev/null +++ b/generateSample.bat @@ -0,0 +1,9 @@ +set generatorcli=C:\dev\openapi-generator\modules\openapi-generator-cli\target\openapi-generator-cli.jar +set root=C:\dev\openapi-generator +rem "--include-base-dir" "%root%" +set files=java-* +rem set files=spring* +set files=spring-boot-gen* +rem files=java-resttemplate-generateAliasAsModel* +rem set files=spring* +java -ea -server -Duser.timezone=UTC -jar %generatorcli% batch --fail-fast -- bin/configs/%files% \ No newline at end of file diff --git a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES index bb35603695e3..a1e16aa7e276 100644 --- a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES @@ -1,3 +1,4 @@ +.openapi-generator-ignore README.md pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java From 05d8e527e733ea164ff142daeff1a3a6818cb69d Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 13:50:59 +0100 Subject: [PATCH 43/47] Remove custom batch --- generateSample.bat | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 generateSample.bat diff --git a/generateSample.bat b/generateSample.bat deleted file mode 100644 index 731c33ffb12e..000000000000 --- a/generateSample.bat +++ /dev/null @@ -1,9 +0,0 @@ -set generatorcli=C:\dev\openapi-generator\modules\openapi-generator-cli\target\openapi-generator-cli.jar -set root=C:\dev\openapi-generator -rem "--include-base-dir" "%root%" -set files=java-* -rem set files=spring* -set files=spring-boot-gen* -rem files=java-resttemplate-generateAliasAsModel* -rem set files=spring* -java -ea -server -Duser.timezone=UTC -jar %generatorcli% batch --fail-fast -- bin/configs/%files% \ No newline at end of file From 47cd457377f49a3f39909fbdd77894793273eabd Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 11 Mar 2025 14:59:06 +0100 Subject: [PATCH 44/47] Remove .git --- .../springboot-generateAliasAsModel/.openapi-generator/FILES | 2 -- 1 file changed, 2 deletions(-) diff --git a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES index a1e16aa7e276..86ac7e830992 100644 --- a/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-generateAliasAsModel/.openapi-generator/FILES @@ -1,11 +1,9 @@ -.openapi-generator-ignore 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/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java src/main/java/org/openapitools/model/AdditionalProperties.java From f6e92450f09e1c5d12f5d25561e697e68943cf12 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 16 Mar 2025 11:13:48 +0100 Subject: [PATCH 45/47] fix indentation --- .../src/test/resources/3_0/additionalProperties.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml index d7e6cedb8f00..0c8e6d4f3872 100644 --- a/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/additionalProperties.yaml @@ -31,8 +31,8 @@ components: $ref: '#/components/schemas/AdditionalPropertiesTypeString' additionalPropertiesTrue: $ref: '#/components/schemas/AdditionalPropertiesTrue' - additionalPropertiesOnlyTrue: - $ref: '#/components/schemas/AdditionalPropertiesOnlyTrue' + additionalPropertiesOnlyTrue: + $ref: '#/components/schemas/AdditionalPropertiesOnlyTrue' AdditionalPropertiesOnlyTypeObject: type: object additionalProperties: From 4c660acd0f896b25349c50709146ca595380bd1f Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 16 Mar 2025 11:14:13 +0100 Subject: [PATCH 46/47] Add handling of hashCode for additionalProperties --- .../src/main/resources/Java/libraries/native/pojo.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache index daa3ee0df4d8..428a8282a37b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache @@ -306,7 +306,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}, additionalProperties{{/additionalPropertiesType}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}} From c36f864bf19dc243e8b08dea9fc3f785ef969378 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 16 Mar 2025 12:28:39 +0100 Subject: [PATCH 47/47] fix hashCode for okhttp-gson --- .../org/openapitools/codegen/languages/AbstractJavaCodegen.java | 1 - .../src/main/resources/Java/libraries/okhttp-gson/pojo.mustache | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index c550a72aeab1..5fcb24fd2043 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -68,7 +68,6 @@ import static org.openapitools.codegen.utils.CamelizeOption.*; import static org.openapitools.codegen.utils.ModelUtils.getSchemaItems; -import static org.openapitools.codegen.utils.ModelUtils.isGenerateAliasAsModel; import static org.openapitools.codegen.utils.OnceLogger.once; import static org.openapitools.codegen.utils.StringUtils.*; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache index a26ad49fc5ad..410ef0a13d66 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache @@ -220,7 +220,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens return HashCodeBuilder.reflectionHashCode(this); {{/useReflectionEqualsHashCode}} {{^useReflectionEqualsHashCode}} - return Objects.hash({{#vars}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#isAdditionalPropertiesTrue}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/isAdditionalPropertiesTrue}}); + return Objects.hash({{#vars}}{{#vendorExtensions.x-is-jackson-optional-nullable}}hashCodeNullable({{name}}){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}{{#additionalPropertiesType}}{{#hasVars}}, {{/hasVars}}{{^hasVars}}{{#parent}}, {{/parent}}{{/hasVars}}additionalProperties{{/additionalPropertiesType}}); {{/useReflectionEqualsHashCode}} }{{#vendorExtensions.x-jackson-optional-nullable-helpers}}