Samples regen

.circleci/testJava17ClientSamples.sh

@@ -1,3 +1,3 @@
- (cd samples/client/petstore/java && gradle wrapper && gradle test)
+ (cd samples/client/petstore/java && gradle wrapper && gradlew test --no-daemon)
  (cd samples/client/3_0_3_unit_test/java && mvn test)
  (cd samples/client/3_1_0_unit_test/java && mvn test)

.circleci/testKotlinClientSamples.sh

@@ -1,2 +1,2 @@
- (cd samples/client/3_0_3_unit_test/kotlin && gradle wrapper && ./gradlew cleanTest test)
- (cd samples/client/3_1_0_unit_test/kotlin && gradle wrapper && ./gradlew cleanTest test)
+ (cd samples/client/3_0_3_unit_test/kotlin && gradle wrapper && ./gradlew cleanTest test --no-daemon)
+ (cd samples/client/3_1_0_unit_test/kotlin && gradle wrapper && ./gradlew cleanTest test --no-daemon)

docs/generators/kotlin.md

@@ -142,6 +142,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>tailrec</li>
 <li>this</li>
 <li>throw</li>
+<li>tostring</li>
 <li>true</li>
 <li>try</li>
 <li>typealias</li>

samples/client/3_0_3_unit_test/kotlin/README.md

@@ -49,11 +49,11 @@ Here is the mapping from json schema types to Kotlin types:
 | object | FrozenMap (Map) |
 | array | FrozenList (List) |
 | string | String |
-| number | Number (int, long, float, double) |
-| integer | int, long, float, double (with values equal to integers) |
-| boolean | boolean |
+| number | Number (Int, Long, Float, Double) |
+| integer | Int, Long, Float, Double (with values equal to integers) |
+| boolean | Boolean |
 | null | Nothing? (null) |
-| AnyType (unset) | Object? |
+| AnyType (unset) | Any? |
 
 ### Storage of Json Schema Definition in Kotlin JsonSchema Classes
 In openapi v3.0.3 there are ~ 28 json schema keywords. Almost all of them can apply if

samples/client/3_0_3_unit_test/kotlin/build.gradle.kts

@@ -34,6 +34,6 @@ tasks.wrapper {
 tasks.test {
  useJUnitPlatform()
  testLogging {
- events( "started", "passed", "skipped", "failed")
+ events("passed", "skipped", "failed")
  }
 }

samples/client/3_0_3_unit_test/kotlin/src/main/kotlin/org/openapijsonschematools/client/components/schemas/RefInAdditionalproperties.kt

@@ -178,7 +178,7 @@ class RefInAdditionalproperties {
  }
  val propertySchema: JsonSchema<*> = schemas.entries.iterator().next().key
  val propertyInstance: Any? = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas)
- if (!(propertyInstance is Any)) {
+ if (!(propertyInstance is Any?)) {
  throw RuntimeException("Invalid instantiated value")
  }
  properties[entryKey] = propertyInstance

samples/client/3_0_3_unit_test/kotlin/src/main/kotlin/org/openapijsonschematools/client/components/schemas/RefInItems.kt

@@ -127,7 +127,7 @@ class RefInItems {
  }
  val itemSchema: JsonSchema<*> = schemas.entries.iterator().next().key
  val itemInstance: Any? = itemSchema.getNewInstance(item, itemPathToItem, pathToSchemas)
- if (!(itemInstance is Any)) {
+ if (!(itemInstance is Any?)) {
  throw RuntimeException("Invalid instantiated value")
  }
  items.add(itemInstance)

samples/client/3_0_3_unit_test/kotlin/src/main/kotlin/org/openapijsonschematools/client/components/schemas/RefInProperty.kt

@@ -43,7 +43,7 @@ class RefInProperty {
  val key = "a"
  throwIfKeyNotPresent(key)
  val value: Any? = get(key)
- if (!(value is Any)) {
+ if (!(value is Any?)) {
  throw RuntimeException("Invalid value stored for a")
  }
  return value

samples/client/3_1_0_unit_test/java/docs/components/schemas/NonAsciiPatternWithAdditionalproperties.md

@@ -122,14 +122,14 @@ A class that builds the Map input type
 
 ## NonAsciiPatternWithAdditionalpropertiesMap
 public static class NonAsciiPatternWithAdditionalpropertiesMap<br>
-extends FrozenMap<String, Object>
+extends FrozenMap<String, @Nullable Object>
 
 A class to store validated Map payloads
 
 ### Method Summary
 | Modifier and Type | Method and Description |
 | ----------------- | ---------------------- |
-| static [NonAsciiPatternWithAdditionalpropertiesMap](#nonasciipatternwithadditionalpropertiesmap) | of([Map<String, Object>](#nonasciipatternwithadditionalpropertiesmapbuilder) arg, SchemaConfiguration configuration) |
+| static [NonAsciiPatternWithAdditionalpropertiesMap](#nonasciipatternwithadditionalpropertiesmap) | of([Map<String, ? extends @Nullable Object>](#nonasciipatternwithadditionalpropertiesmapbuilder) arg, SchemaConfiguration configuration) |
 
 ## CircumflexAccentLatinSmallLetterAWithAcuteBoxed
 public sealed interface CircumflexAccentLatinSmallLetterAWithAcuteBoxed<br>

samples/client/3_1_0_unit_test/java/docs/components/schemas/PropertiesPatternpropertiesAdditionalpropertiesInteraction.md

@@ -110,7 +110,7 @@ PropertiesPatternpropertiesAdditionalpropertiesInteraction.PropertiesPatternprop
 
 ## PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder
 public class PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder<br>
-builder for `Map<String, Object>`
+builder for `Map<String, @Nullable Object>`
 
 A class that builds the Map input type
 
@@ -122,7 +122,7 @@ A class that builds the Map input type
 ### Method Summary
 | Modifier and Type | Method and Description |
 | ----------------- | ---------------------- |
-| Map<String, Object> | build()<br>Returns map input that should be used with Schema.validate |
+| Map<String, @Nullable Object> | build()<br>Returns map input that should be used with Schema.validate |
 | [PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder](#propertiespatternpropertiesadditionalpropertiesinteractionmapbuilder) | foo(List<@Nullable Object> value) |
 | [PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder](#propertiespatternpropertiesadditionalpropertiesinteractionmapbuilder) | bar(List<@Nullable Object> value) |
 | [PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder](#propertiespatternpropertiesadditionalpropertiesinteractionmapbuilder) | additionalProperty(String key, int value) |
@@ -132,14 +132,14 @@ A class that builds the Map input type
 
 ## PropertiesPatternpropertiesAdditionalpropertiesInteractionMap
 public static class PropertiesPatternpropertiesAdditionalpropertiesInteractionMap<br>
-extends FrozenMap<String, Object>
+extends FrozenMap<String, @Nullable Object>
 
 A class to store validated Map payloads
 
 ### Method Summary
 | Modifier and Type | Method and Description |
 | ----------------- | ---------------------- |
-| static [PropertiesPatternpropertiesAdditionalpropertiesInteractionMap](#propertiespatternpropertiesadditionalpropertiesinteractionmap) | of([Map<String, Object>](#propertiespatternpropertiesadditionalpropertiesinteractionmapbuilder) arg, SchemaConfiguration configuration) |
+| static [PropertiesPatternpropertiesAdditionalpropertiesInteractionMap](#propertiespatternpropertiesadditionalpropertiesinteractionmap) | of([Map<String, ? extends @Nullable Object>](#propertiespatternpropertiesadditionalpropertiesinteractionmapbuilder) arg, SchemaConfiguration configuration) |
 | FrozenList<?> | foo()<br>[optional] |
 | FrozenList<?> | bar()<br>[optional] |
 | Number | getAdditionalProperty(String name)<br>provides type safety for additional properties |

samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/NonAsciiPatternWithAdditionalproperties.java

@@ -58,7 +58,7 @@ protected NonAsciiPatternWithAdditionalpropertiesMap(FrozenMap<@Nullable Object>
  public static final Set<String> requiredKeys = Set.of();
  public static final Set<String> optionalKeys = Set.of();
  // map with no key value pairs
- public static NonAsciiPatternWithAdditionalpropertiesMap of(Map<String, @Nullable Object> arg, SchemaConfiguration configuration) throws ValidationException {
+ public static NonAsciiPatternWithAdditionalpropertiesMap of(Map<String, ? extends @Nullable Object> arg, SchemaConfiguration configuration) throws ValidationException {
  return NonAsciiPatternWithAdditionalproperties1.getInstance().validate(arg, configuration);
  }
  }

samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesPatternpropertiesAdditionalpropertiesInteraction.java

@@ -435,23 +435,23 @@ public static Bar getInstance() {
  }
 
 
- public static class PropertiesPatternpropertiesAdditionalpropertiesInteractionMap extends FrozenMap<Object> {
- protected PropertiesPatternpropertiesAdditionalpropertiesInteractionMap(FrozenMap<Object> m) {
+ public static class PropertiesPatternpropertiesAdditionalpropertiesInteractionMap extends FrozenMap<@Nullable Object> {
+ protected PropertiesPatternpropertiesAdditionalpropertiesInteractionMap(FrozenMap<@Nullable Object> m) {
  super(m);
  }
  public static final Set<String> requiredKeys = Set.of();
  public static final Set<String> optionalKeys = Set.of(
  "foo",
  "bar"
  );
- public static PropertiesPatternpropertiesAdditionalpropertiesInteractionMap of(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {
+ public static PropertiesPatternpropertiesAdditionalpropertiesInteractionMap of(Map<String, ? extends @Nullable Object> arg, SchemaConfiguration configuration) throws ValidationException {
  return PropertiesPatternpropertiesAdditionalpropertiesInteraction1.getInstance().validate(arg, configuration);
  }
 
  public FrozenList<?> foo() throws UnsetPropertyException {
  String key = "foo";
  throwIfKeyNotPresent(key);
- Object value = get(key);
+ @Nullable Object value = get(key);
  if (!(value instanceof FrozenList<?>)) {
  throw new RuntimeException("Invalid value stored for foo");
  }
@@ -461,7 +461,7 @@ public FrozenList<?> foo() throws UnsetPropertyException {
  public FrozenList<?> bar() throws UnsetPropertyException {
  String key = "bar";
  throwIfKeyNotPresent(key);
- Object value = get(key);
+ @Nullable Object value = get(key);
  if (!(value instanceof FrozenList<?>)) {
  throw new RuntimeException("Invalid value stored for bar");
  }
@@ -479,8 +479,8 @@ public Number getAdditionalProperty(String name) throws UnsetPropertyException,
  }
 
  public interface SetterForFoo <T> {
- Map<String, Object> getInstance();
- T getBuilderAfterFoo(Map<String, Object> instance);
+ Map<String, @Nullable Object> getInstance();
+ T getBuilderAfterFoo(Map<String, @Nullable Object> instance);
 
  default T foo(List<@Nullable Object> value) {
  var instance = getInstance();
@@ -490,8 +490,8 @@ default T foo(List<@Nullable Object> value) {
  }
 
  public interface SetterForBar <T> {
- Map<String, Object> getInstance();
- T getBuilderAfterBar(Map<String, Object> instance);
+ Map<String, @Nullable Object> getInstance();
+ T getBuilderAfterBar(Map<String, @Nullable Object> instance);
 
  default T bar(List<@Nullable Object> value) {
  var instance = getInstance();
@@ -502,8 +502,8 @@ default T bar(List<@Nullable Object> value) {
 
  public interface SetterForAdditionalProperties<T> {
  Set<String> getKnownKeys();
- Map<String, Object> getInstance();
- T getBuilderAfterAdditionalProperty(Map<String, Object> instance);
+ Map<String, @Nullable Object> getInstance();
+ T getBuilderAfterAdditionalProperty(Map<String, @Nullable Object> instance);
 
  default T additionalProperty(String key, int value) throws InvalidAdditionalPropertyException {
  MapUtils.throwIfKeyKnown(key, getKnownKeys(), true);
@@ -534,8 +534,8 @@ default T additionalProperty(String key, double value) throws InvalidAdditionalP
  }
  }
 
- public static class PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder implements GenericBuilder<Map<String, Object>>, SetterForFoo<PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder>, SetterForBar<PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder>, SetterForAdditionalProperties<PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder> {
- private final Map<String, Object> instance;
+ public static class PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder implements GenericBuilder<Map<String, @Nullable Object>>, SetterForFoo<PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder>, SetterForBar<PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder>, SetterForAdditionalProperties<PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder> {
+ private final Map<String, @Nullable Object> instance;
  private static final Set<String> knownKeys = Set.of(
  "foo",
  "bar"
@@ -546,19 +546,19 @@ public Set<String> getKnownKeys() {
  public PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder() {
  this.instance = new LinkedHashMap<>();
  }
- public Map<String, Object> build() {
+ public Map<String, @Nullable Object> build() {
  return instance;
  }
- public Map<String, Object> getInstance() {
+ public Map<String, @Nullable Object> getInstance() {
  return instance;
  }
- public PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder getBuilderAfterFoo(Map<String, Object> instance) {
+ public PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder getBuilderAfterFoo(Map<String, @Nullable Object> instance) {
  return this;
  }
- public PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder getBuilderAfterBar(Map<String, Object> instance) {
+ public PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder getBuilderAfterBar(Map<String, @Nullable Object> instance) {
  return this;
  }
- public PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder getBuilderAfterAdditionalProperty(Map<String, Object> instance) {
+ public PropertiesPatternpropertiesAdditionalpropertiesInteractionMapBuilder getBuilderAfterAdditionalProperty(Map<String, @Nullable Object> instance) {
  return this;
  }
  }
@@ -607,7 +607,7 @@ public static PropertiesPatternpropertiesAdditionalpropertiesInteraction1 getIns
  }
 
  public PropertiesPatternpropertiesAdditionalpropertiesInteractionMap getNewInstance(Map<?, ?> arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
- LinkedHashMap<String, Object> properties = new LinkedHashMap<>();
+ LinkedHashMap<String, @Nullable Object> properties = new LinkedHashMap<>();
  for(Map.Entry<?, ?> entry: arg.entrySet()) {
  @Nullable Object entryKey = entry.getKey();
  if (!(entryKey instanceof String)) {
@@ -623,12 +623,9 @@ public PropertiesPatternpropertiesAdditionalpropertiesInteractionMap getNewInsta
  }
  JsonSchema<?> propertySchema = schemas.entrySet().iterator().next().getKey();
  @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
- if (!(propertyInstance instanceof Object)) {
- throw new RuntimeException("Invalid instantiated value");
- }
- properties.put(propertyName, (Object) propertyInstance);
+ properties.put(propertyName, propertyInstance);
  }
- FrozenMap<Object> castProperties = new FrozenMap<>(properties);
+ FrozenMap<@Nullable Object> castProperties = new FrozenMap<>(properties);
  return new PropertiesPatternpropertiesAdditionalpropertiesInteractionMap(castProperties);
  }
 

samples/client/3_1_0_unit_test/kotlin/README.md

@@ -49,11 +49,11 @@ Here is the mapping from json schema types to Kotlin types:
 | object | FrozenMap (Map) |
 | array | FrozenList (List) |
 | string | String |
-| number | Number (int, long, float, double) |
-| integer | int, long, float, double (with values equal to integers) |
-| boolean | boolean |
+| number | Number (Int, Long, Float, Double) |
+| integer | Int, Long, Float, Double (with values equal to integers) |
+| boolean | Boolean |
 | null | Nothing? (null) |
-| AnyType (unset) | Object? |
+| AnyType (unset) | Any? |
 
 ### Storage of Json Schema Definition in Kotlin JsonSchema Classes
 In openapi v3.0.3 there are ~ 28 json schema keywords. Almost all of them can apply if

samples/client/3_1_0_unit_test/kotlin/build.gradle.kts

@@ -34,6 +34,6 @@ tasks.wrapper {
 tasks.test {
  useJUnitPlatform()
  testLogging {
- events( "started", "passed", "skipped", "failed")
+ events("passed", "skipped", "failed")
  }
 }

samples/client/3_1_0_unit_test/python/docs/components/schema/non_ascii_pattern_with_additionalproperties.md

@@ -19,6 +19,7 @@ Key | Type | Description | Notes
 ## NonAsciiPatternWithAdditionalpropertiesDict
 ```
 base class: schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES]
+
 ```
 ### __new__ method
 Keyword Argument | Type | Description | Notes

samples/client/3_1_0_unit_test/python/docs/components/schema/properties_patternproperties_additionalproperties_interaction.md

@@ -34,10 +34,7 @@ Key | Type | Description | Notes
 
 ## PropertiesPatternpropertiesAdditionalpropertiesInteractionDict
 ```
-base class: schemas.immutabledict[str, typing.Union[
- typing.Tuple[schemas.OUTPUT_BASE_TYPES],
- int,
-]]
+base class: schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES]
 
 ```
 ### __new__ method

samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/non_ascii_pattern_with_additionalproperties.py

@@ -15,6 +15,7 @@
 
 
 class NonAsciiPatternWithAdditionalpropertiesDict(schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES]):
+
  __required_keys__: typing.FrozenSet[str] = frozenset({
  })
  __optional_keys__: typing.FrozenSet[str] = frozenset({

samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/properties_patternproperties_additionalproperties_interaction.py

@@ -52,10 +52,7 @@ def validate(
 )
 
 
-class PropertiesPatternpropertiesAdditionalpropertiesInteractionDict(schemas.immutabledict[str, typing.Union[
- typing.Tuple[schemas.OUTPUT_BASE_TYPES],
- int,
-]]):
+class PropertiesPatternpropertiesAdditionalpropertiesInteractionDict(schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES]):
 
  __required_keys__: typing.FrozenSet[str] = frozenset({
  })

src/main/resources/kotlin/README.hbs

@@ -55,11 +55,11 @@ Here is the mapping from json schema types to Kotlin types:
 | object | FrozenMap (Map) |
 | array | FrozenList (List) |
 | string | String |
-| number | Number (int, long, float, double) |
-| integer | int, long, float, double (with values equal to integers) |
-| boolean | boolean |
+| number | Number (Int, Long, Float, Double) |
+| integer | Int, Long, Float, Double (with values equal to integers) |
+| boolean | Boolean |
 | null | Nothing? (null) |
-| AnyType (unset) | Object? |
+| AnyType (unset) | Any? |
 
 ### Storage of Json Schema Definition in Kotlin JsonSchema Classes
 In openapi v3.0.3 there are ~ 28 json schema keywords. Almost all of them can apply if

src/main/resources/kotlin/build.gradle.hbs

@@ -34,6 +34,6 @@ tasks.wrapper {
 tasks.test {
  useJUnitPlatform()
  testLogging {
- events( "started", "passed", "skipped", "failed")
+ events("passed", "skipped", "failed")
  }
 }