openapi-json-schema-tools · spacether · Apr 12, 2024 · Apr 11, 2024 · Apr 11, 2024 · Apr 11, 2024
diff --git a/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES b/samples/client/3_0_3_unit_test/java/.openapi-generator/FILES
@@ -87,7 +87,7 @@ docs/components/schemas/UniqueitemsValidation.md
 docs/components/schemas/UriFormat.md
 docs/components/schemas/UriReferenceFormat.md
 docs/components/schemas/UriTemplateFormat.md
-docs/servers/Server0.md
+docs/servers/RootServer0.md
 pom.xml
 src/main/java/org/openapijsonschematools/client/RootServerInfo.java
 src/main/java/org/openapijsonschematools/client/apiclient/ApiClient.java
@@ -313,8 +313,8 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/UniqueItemsVa
 src/main/java/org/openapijsonschematools/client/schemas/validation/UnsetAnyTypeJsonSchema.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/ValidationData.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/ValidationMetadata.java
+src/main/java/org/openapijsonschematools/client/servers/RootServer0.java
 src/main/java/org/openapijsonschematools/client/servers/Server.java
-src/main/java/org/openapijsonschematools/client/servers/Server0.java
 src/main/java/org/openapijsonschematools/client/servers/ServerProvider.java
 src/main/java/org/openapijsonschematools/client/servers/ServerWithVariables.java
 src/main/java/org/openapijsonschematools/client/servers/ServerWithoutVariables.java

diff --git a/samples/client/3_0_3_unit_test/java/README.md b/samples/client/3_0_3_unit_test/java/README.md
@@ -1,11 +1,11 @@
-# 
+# petstore
 sample spec for testing openapi functionality, built from json schema tests for draft6
 
 This Java package is automatically generated by the [OpenAPI JSON Schema Generator](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator) project:
 
-- API version: 0.0.1
-- Package version: 
-- Build package: JavaClientGenerator
+- OpenAPI document version: 0.0.1
+- Java Package version: 0.0.1
+- OpenAPI JSON Schema Generator, Generator: JavaClientGenerator
 
 ## Requirements
 
@@ -149,7 +149,7 @@ allowed input and output types.
 ## Servers
 | server_index | Class | Description |
 | ------------ | ----- | ----------- |
-| 0 | [Server0](docs/servers/Server0.md) | |
+| 0 | [RootServer0](docs/servers/RootServer0.md) | |
 
 ## Endpoints
 All URIs are relative to the selected server

diff --git a/samples/client/3_0_3_unit_test/java/docs/RootServerInfo.md b/samples/client/3_0_3_unit_test/java/docs/RootServerInfo.md
@@ -23,12 +23,12 @@ A class that stores servers and allows one to be returned with a ServerIndex ins
 ### Constructor Summary
 | Constructor and Description |
 | --------------------------- |
-| RootServerInfo1(@Nullable [Server0](servers/Server0.md) server0)<br>Creates an instance using passed in servers |
+| RootServerInfo1(@Nullable [RootServer0](servers/RootServer0.md) server0)<br>Creates an instance using passed in servers |
 
 ### Field Summary
 | Modifier and Type | Field and Description |
 | ----------------- | --------------------- |
-| [Server0](servers/Server0.md) | server0 |
+| [RootServer0](servers/RootServer0.md) | server0 |
 
 ### Method Summary
 | Modifier and Type | Method and Description |
@@ -47,7 +47,7 @@ a builder for [RootServerInfo1](#rootserverinfo1)
 ### Method Summary
 | Modifier and Type | Method and Description |
 | ----------------- | ---------------------- |
-| [RootServerInfoBuilder](#rootserverinfobuilder) | server0([Server0](servers/Server0.md) server0)<br>sets the server |
+| [RootServerInfoBuilder](#rootserverinfobuilder) | rootServer0([RootServer0](servers/RootServer0.md) server0)<br>sets the server |
 | [RootServerInfo1](#rootserverinfo1) | build() |
 
 ## ServerIndex

diff --git a/..._3_unit_test/java/docs/servers/Server0.md → ...nit_test/java/docs/servers/RootServer0.md b/..._3_unit_test/java/docs/servers/Server0.md → ...nit_test/java/docs/servers/RootServer0.md
@@ -1,13 +1,13 @@
-org.openapijsonschematools.client.servers.Server0
-# Server Server0
-public class Server0
+org.openapijsonschematools.client.servers.RootServer0
+# Server RootServer0
+public class RootServer0
 
 A class that stores a server url
 
 ### Constructor Summary
 | Constructor and Description |
 | --------------------------- |
-| Server0()<br>Creates a server |
+| RootServer0()<br>Creates a server |
 
 ### Field Summary
 | Modifier and Type | Field and Description |

diff --git a/.../3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/RootServerInfo.java b/.../3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/RootServerInfo.java
@@ -1,6 +1,6 @@
 package org.openapijsonschematools.client;
 
-import org.openapijsonschematools.client.servers.Server0;
+import org.openapijsonschematools.client.servers.RootServer0;
 import org.openapijsonschematools.client.servers.Server;
 import org.openapijsonschematools.client.servers.ServerProvider;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -9,12 +9,12 @@
 
 public class RootServerInfo {
     public static class RootServerInfo1 implements ServerProvider<ServerIndex> {
-        private final Server0 server0;
+        private final RootServer0 server0;
 
         RootServerInfo1(
-            @Nullable Server0 server0
+            @Nullable RootServer0 server0
         ) {
-            this.server0 = Objects.requireNonNullElseGet(server0, Server0::new);
+            this.server0 = Objects.requireNonNullElseGet(server0, RootServer0::new);
         }
 
         @Override
@@ -24,11 +24,11 @@ public Server getServer(ServerIndex serverIndex) {
     }
 
     public static class RootServerInfoBuilder {
-        private @Nullable Server0 server0;
+        private @Nullable RootServer0 server0;
 
         public RootServerInfoBuilder() {}
 
-        public RootServerInfoBuilder server0(Server0 server0) {
+        public RootServerInfoBuilder rootServer0(RootServer0 server0) {
             this.server0 = server0;
             return this;
         }

diff --git a/...java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java b/...java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java
@@ -14,17 +14,20 @@ public class ApiConfiguration {
     private final ServerInfo serverInfo;
     private final ServerIndexInfo serverIndexInfo;
     private final @Nullable Duration timeout;
+    private final Map<String, List< String>> defaultHeaders;
 
     public ApiConfiguration() {
         serverInfo = new ServerInfoBuilder().build();
         serverIndexInfo = new ServerIndexInfoBuilder().build();
         timeout = null;
+        defaultHeaders = new HashMap<>();
     }
 
-    public ApiConfiguration(ServerInfo serverInfo, ServerIndexInfo serverIndexInfo, Duration timeout) {
+    public ApiConfiguration(ServerInfo serverInfo, ServerIndexInfo serverIndexInfo, Duration timeout, Map<String, List< String>> defaultHeaders) {
         this.serverInfo = serverInfo;
         this.serverIndexInfo = serverIndexInfo;
         this.timeout = timeout;
+        this.defaultHeaders = defaultHeaders;
     }
 
     public static class ServerInfo {
@@ -89,7 +92,7 @@ public Server getServer(RootServerInfo. @Nullable ServerIndex serverIndex) {
     }
 
     public Map<String, List< String>> getDefaultHeaders() {
-        return new HashMap<>();
+        return defaultHeaders;
     }
 
     public @Nullable Duration getTimeout() {

diff --git a/...onschematools/client/servers/Server0.java → ...hematools/client/servers/RootServer0.java b/...onschematools/client/servers/Server0.java → ...hematools/client/servers/RootServer0.java
@@ -2,8 +2,8 @@
 
 import org.openapijsonschematools.client.servers.ServerWithoutVariables;
 
-public class Server0 extends ServerWithoutVariables {
-    public Server0() {
+public class RootServer0 extends ServerWithoutVariables {
+    public RootServer0() {
         super("https://someserver.com/v1");
     }
 }
diff --git a/samples/client/3_0_3_unit_test/python/README.md b/samples/client/3_0_3_unit_test/python/README.md
@@ -3,9 +3,9 @@ sample spec for testing openapi functionality, built from json schema tests for
 
 This Python package is automatically generated by the [OpenAPI JSON Schema Generator](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator) project:
 
-- API version: 0.0.1
-- Package version: 1.0.0
-- Build package: PythonClientGenerator
+- OpenAPI document version: 0.0.1
+- Python Package version: 1.0.0
+- OpenAPI JSON Schema Generator, Generator: PythonClientGenerator
 
 ## Requirements
 

diff --git a/...uest_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body.py b/...uest_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/.../apis/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body.py b/.../apis/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...api/apis/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body.py b/...api/apis/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...ths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body.py b/...ths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...nit_test_api/apis/paths/request_body_post_allof_combined_with_anyof_oneof_request_body.py b/...nit_test_api/apis/paths/request_body_post_allof_combined_with_anyof_oneof_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...0_3_unit_test/python/src/unit_test_api/apis/paths/request_body_post_allof_request_body.py b/...0_3_unit_test/python/src/unit_test_api/apis/paths/request_body_post_allof_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/.../python/src/unit_test_api/apis/paths/request_body_post_allof_simple_types_request_body.py b/.../python/src/unit_test_api/apis/paths/request_body_post_allof_simple_types_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...hon/src/unit_test_api/apis/paths/request_body_post_allof_with_base_schema_request_body.py b/...hon/src/unit_test_api/apis/paths/request_body_post_allof_with_base_schema_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...rc/unit_test_api/apis/paths/request_body_post_allof_with_one_empty_schema_request_body.py b/...rc/unit_test_api/apis/paths/request_body_post_allof_with_one_empty_schema_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...t_test_api/apis/paths/request_body_post_allof_with_the_first_empty_schema_request_body.py b/...t_test_api/apis/paths/request_body_post_allof_with_the_first_empty_schema_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...it_test_api/apis/paths/request_body_post_allof_with_the_last_empty_schema_request_body.py b/...it_test_api/apis/paths/request_body_post_allof_with_the_last_empty_schema_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...c/unit_test_api/apis/paths/request_body_post_allof_with_two_empty_schemas_request_body.py b/...c/unit_test_api/apis/paths/request_body_post_allof_with_two_empty_schemas_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...python/src/unit_test_api/apis/paths/request_body_post_anyof_complex_types_request_body.py b/...python/src/unit_test_api/apis/paths/request_body_post_anyof_complex_types_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...0_3_unit_test/python/src/unit_test_api/apis/paths/request_body_post_anyof_request_body.py b/...0_3_unit_test/python/src/unit_test_api/apis/paths/request_body_post_anyof_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...hon/src/unit_test_api/apis/paths/request_body_post_anyof_with_base_schema_request_body.py b/...hon/src/unit_test_api/apis/paths/request_body_post_anyof_with_base_schema_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...rc/unit_test_api/apis/paths/request_body_post_anyof_with_one_empty_schema_request_body.py b/...rc/unit_test_api/apis/paths/request_body_post_anyof_with_one_empty_schema_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/.../src/unit_test_api/apis/paths/request_body_post_array_type_matches_arrays_request_body.py b/.../src/unit_test_api/apis/paths/request_body_post_array_type_matches_arrays_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/.../unit_test_api/apis/paths/request_body_post_boolean_type_matches_booleans_request_body.py b/.../unit_test_api/apis/paths/request_body_post_boolean_type_matches_booleans_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/..._3_unit_test/python/src/unit_test_api/apis/paths/request_body_post_by_int_request_body.py b/..._3_unit_test/python/src/unit_test_api/apis/paths/request_body_post_by_int_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...unit_test/python/src/unit_test_api/apis/paths/request_body_post_by_number_request_body.py b/...unit_test/python/src/unit_test_api/apis/paths/request_body_post_by_number_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...est/python/src/unit_test_api/apis/paths/request_body_post_by_small_number_request_body.py b/...est/python/src/unit_test_api/apis/paths/request_body_post_by_small_number_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 

diff --git a/...st/python/src/unit_test_api/apis/paths/request_body_post_date_time_format_request_body.py b/...st/python/src/unit_test_api/apis/paths/request_body_post_date_time_format_request_body.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 
 """
+    openapi 3.0.3 sample spec
+    sample spec for testing openapi functionality, built from json schema tests for draft6  # noqa: E501
+    The version of the OpenAPI document: 0.0.1
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """