Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

Commit 82cb963

Browse files
spacetherspacether
authored
Java, adds list builder (#346)
* Adds builder suffix to list and map builder classes * Array input docs separated into separate template * Adds list builder constructors and build method * Adds unset type add methods in list builder * Adds numeric types to listbuilder add * Petstore regen * integer and number input types changed to Number * Adds map input to list builder * Handles self references in list builder * Separates template for listInput add items * Handles ref type when building array * 303 sample regen * Uses array builder for 303 tests * Changes integer/number output types to Number * list builder add methods added to schema docs * Removes Input List Items section * Adds enum add methods to list builder * Petstore regenerated * Fixes handling of refed enums in listbuilder add * Adds ListBuilderTest * Petstore regen w/ listbuilder add links to enum classes * Turns on useContainter for schema docs in petstore * Sample regen so docs can show correct type for list builder and build method * Samples regen
1 parent 7c634a0 commit 82cb963

File tree

437 files changed

+4776
-2502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

437 files changed

+4776
-2502
lines changed

‎samples/client/3_0_3_unit_test/java/.openapi-generator/FILES

+1
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ src/test/java/org/openapijsonschematools/client/configurations/JsonSchemaKeyword
263263
src/test/java/org/openapijsonschematools/client/schemas/AnyTypeSchemaTest.java
264264
src/test/java/org/openapijsonschematools/client/schemas/ArrayTypeSchemaTest.java
265265
src/test/java/org/openapijsonschematools/client/schemas/BooleanSchemaTest.java
266+
src/test/java/org/openapijsonschematools/client/schemas/ListBuilderTest.java
266267
src/test/java/org/openapijsonschematools/client/schemas/ListSchemaTest.java
267268
src/test/java/org/openapijsonschematools/client/schemas/MapSchemaTest.java
268269
src/test/java/org/openapijsonschematools/client/schemas/NullSchemaTest.java

‎samples/client/3_0_3_unit_test/java/docs/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidate.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ A class that contains necessary nested
1111
| Modifier and Type | Class and Description |
1212
| ----------------- | ---------------------- |
1313
| static class | [AdditionalpropertiesAllowsASchemaWhichShouldValidate.AdditionalpropertiesAllowsASchemaWhichShouldValidate1](#additionalpropertiesallowsaschemawhichshouldvalidate1)<br> schema class |
14-
| static class | [AdditionalpropertiesAllowsASchemaWhichShouldValidate.AdditionalpropertiesAllowsASchemaWhichShouldValidateMapInput](#additionalpropertiesallowsaschemawhichshouldvalidatemapinput)<br> builder for Map payloads |
14+
| static class | [AdditionalpropertiesAllowsASchemaWhichShouldValidate.AdditionalpropertiesAllowsASchemaWhichShouldValidateMapBuilder](#additionalpropertiesallowsaschemawhichshouldvalidatemapbuilder)<br> builder for Map payloads |
1515
| static class | [AdditionalpropertiesAllowsASchemaWhichShouldValidate.AdditionalpropertiesAllowsASchemaWhichShouldValidateMap](#additionalpropertiesallowsaschemawhichshouldvalidatemap)<br> output class for Map payloads |
1616
| static class | [AdditionalpropertiesAllowsASchemaWhichShouldValidate.Bar](#bar)<br> schema class |
1717
| static class | [AdditionalpropertiesAllowsASchemaWhichShouldValidate.Foo](#foo)<br> schema class |
@@ -57,10 +57,10 @@ AdditionalpropertiesAllowsASchemaWhichShouldValidate.AdditionalpropertiesAllowsA
5757
### Method Summary
5858
| Modifier and Type | Method and Description |
5959
| ----------------- | ---------------------- |
60-
| [AdditionalpropertiesAllowsASchemaWhichShouldValidateMap](#additionalpropertiesallowsaschemawhichshouldvalidatemap) | validate([Map<?, ?>](#additionalpropertiesallowsaschemawhichshouldvalidatemapinput) arg, SchemaConfiguration configuration) |
60+
| [AdditionalpropertiesAllowsASchemaWhichShouldValidateMap](#additionalpropertiesallowsaschemawhichshouldvalidatemap) | validate([Map<?, ?>](#additionalpropertiesallowsaschemawhichshouldvalidatemapbuilder) arg, SchemaConfiguration configuration) |
6161
| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
62-
## AdditionalpropertiesAllowsASchemaWhichShouldValidateMapInput
63-
public class AdditionalpropertiesAllowsASchemaWhichShouldValidateMapInput<br>
62+
## AdditionalpropertiesAllowsASchemaWhichShouldValidateMapBuilder
63+
public class AdditionalpropertiesAllowsASchemaWhichShouldValidateMapBuilder<br>
6464
builder for `Map<String, ? extends @Nullable Object>`
6565

6666
A class that builds the Map input type
@@ -81,7 +81,7 @@ A class to store validated Map payloads
8181
### Method Summary
8282
| Modifier and Type | Method and Description |
8383
| ----------------- | ---------------------- |
84-
| static [AdditionalpropertiesAllowsASchemaWhichShouldValidateMap](#additionalpropertiesallowsaschemawhichshouldvalidatemap) | of([Map<String, ? extends @Nullable Object>](#additionalpropertiesallowsaschemawhichshouldvalidatemapinput) arg, SchemaConfiguration configuration) |
84+
| static [AdditionalpropertiesAllowsASchemaWhichShouldValidateMap](#additionalpropertiesallowsaschemawhichshouldvalidatemap) | of([Map<String, ? extends @Nullable Object>](#additionalpropertiesallowsaschemawhichshouldvalidatemapbuilder) arg, SchemaConfiguration configuration) |
8585
| @Nullable Object | foo()<br>[optional] |
8686
| @Nullable Object | bar()<br>[optional] |
8787
| boolean | getAdditionalProperty(String name)<br>provides type safety for additional properties |

‎samples/client/3_0_3_unit_test/java/docs/components/schemas/AdditionalpropertiesAreAllowedByDefault.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ A class that contains necessary nested
1111
| Modifier and Type | Class and Description |
1212
| ----------------- | ---------------------- |
1313
| static class | [AdditionalpropertiesAreAllowedByDefault.AdditionalpropertiesAreAllowedByDefault1](#additionalpropertiesareallowedbydefault1)<br> schema class |
14-
| static class | [AdditionalpropertiesAreAllowedByDefault.AdditionalpropertiesAreAllowedByDefaultMapInput](#additionalpropertiesareallowedbydefaultmapinput)<br> builder for Map payloads |
14+
| static class | [AdditionalpropertiesAreAllowedByDefault.AdditionalpropertiesAreAllowedByDefaultMapBuilder](#additionalpropertiesareallowedbydefaultmapbuilder)<br> builder for Map payloads |
1515
| static class | [AdditionalpropertiesAreAllowedByDefault.AdditionalpropertiesAreAllowedByDefaultMap](#additionalpropertiesareallowedbydefaultmap)<br> output class for Map payloads |
1616
| static class | [AdditionalpropertiesAreAllowedByDefault.Bar](#bar)<br> schema class |
1717
| static class | [AdditionalpropertiesAreAllowedByDefault.Foo](#foo)<br> schema class |
@@ -37,11 +37,11 @@ A schema class that validates payloads
3737
| float | validate(float arg, SchemaConfiguration configuration) |
3838
| double | validate(double arg, SchemaConfiguration configuration) |
3939
| boolean | validate(boolean arg, SchemaConfiguration configuration) |
40-
| [AdditionalpropertiesAreAllowedByDefaultMap](#additionalpropertiesareallowedbydefaultmap) | validate([Map<?, ?>](#additionalpropertiesareallowedbydefaultmapinput) arg, SchemaConfiguration configuration) |
40+
| [AdditionalpropertiesAreAllowedByDefaultMap](#additionalpropertiesareallowedbydefaultmap) | validate([Map<?, ?>](#additionalpropertiesareallowedbydefaultmapbuilder) arg, SchemaConfiguration configuration) |
4141
| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
4242
| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
43-
## AdditionalpropertiesAreAllowedByDefaultMapInput
44-
public class AdditionalpropertiesAreAllowedByDefaultMapInput<br>
43+
## AdditionalpropertiesAreAllowedByDefaultMapBuilder
44+
public class AdditionalpropertiesAreAllowedByDefaultMapBuilder<br>
4545
builder for `Map<String, ? extends @Nullable Object>`
4646

4747
A class that builds the Map input type
@@ -62,7 +62,7 @@ A class to store validated Map payloads
6262
### Method Summary
6363
| Modifier and Type | Method and Description |
6464
| ----------------- | ---------------------- |
65-
| static [AdditionalpropertiesAreAllowedByDefaultMap](#additionalpropertiesareallowedbydefaultmap) | of([Map<String, ? extends @Nullable Object>](#additionalpropertiesareallowedbydefaultmapinput) arg, SchemaConfiguration configuration) |
65+
| static [AdditionalpropertiesAreAllowedByDefaultMap](#additionalpropertiesareallowedbydefaultmap) | of([Map<String, ? extends @Nullable Object>](#additionalpropertiesareallowedbydefaultmapbuilder) arg, SchemaConfiguration configuration) |
6666
| @Nullable Object | foo()<br>[optional] |
6767
| @Nullable Object | bar()<br>[optional] |
6868
| Object | getAdditionalProperty(String name)<br>provides type safety for additional properties |

‎samples/client/3_0_3_unit_test/java/docs/components/schemas/AdditionalpropertiesCanExistByItself.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ A class that contains necessary nested
1111
| Modifier and Type | Class and Description |
1212
| ----------------- | ---------------------- |
1313
| static class | [AdditionalpropertiesCanExistByItself.AdditionalpropertiesCanExistByItself1](#additionalpropertiescanexistbyitself1)<br> schema class |
14-
| static class | [AdditionalpropertiesCanExistByItself.AdditionalpropertiesCanExistByItselfMapInput](#additionalpropertiescanexistbyitselfmapinput)<br> builder for Map payloads |
14+
| static class | [AdditionalpropertiesCanExistByItself.AdditionalpropertiesCanExistByItselfMapBuilder](#additionalpropertiescanexistbyitselfmapbuilder)<br> builder for Map payloads |
1515
| static class | [AdditionalpropertiesCanExistByItself.AdditionalpropertiesCanExistByItselfMap](#additionalpropertiescanexistbyitselfmap)<br> output class for Map payloads |
1616
| static class | [AdditionalpropertiesCanExistByItself.AdditionalProperties](#additionalproperties)<br> schema class |
1717

@@ -54,10 +54,10 @@ AdditionalpropertiesCanExistByItself.AdditionalpropertiesCanExistByItselfMap val
5454
### Method Summary
5555
| Modifier and Type | Method and Description |
5656
| ----------------- | ---------------------- |
57-
| [AdditionalpropertiesCanExistByItselfMap](#additionalpropertiescanexistbyitselfmap) | validate([Map<?, ?>](#additionalpropertiescanexistbyitselfmapinput) arg, SchemaConfiguration configuration) |
57+
| [AdditionalpropertiesCanExistByItselfMap](#additionalpropertiescanexistbyitselfmap) | validate([Map<?, ?>](#additionalpropertiescanexistbyitselfmapbuilder) arg, SchemaConfiguration configuration) |
5858
| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
59-
## AdditionalpropertiesCanExistByItselfMapInput
60-
public class AdditionalpropertiesCanExistByItselfMapInput<br>
59+
## AdditionalpropertiesCanExistByItselfMapBuilder
60+
public class AdditionalpropertiesCanExistByItselfMapBuilder<br>
6161
builder for `Map<String, Boolean>`
6262

6363
A class that builds the Map input type
@@ -76,7 +76,7 @@ A class to store validated Map payloads
7676
### Method Summary
7777
| Modifier and Type | Method and Description |
7878
| ----------------- | ---------------------- |
79-
| static [AdditionalpropertiesCanExistByItselfMap](#additionalpropertiescanexistbyitselfmap) | of([Map<String, Boolean>](#additionalpropertiescanexistbyitselfmapinput) arg, SchemaConfiguration configuration) |
79+
| static [AdditionalpropertiesCanExistByItselfMap](#additionalpropertiescanexistbyitselfmap) | of([Map<String, Boolean>](#additionalpropertiescanexistbyitselfmapbuilder) arg, SchemaConfiguration configuration) |
8080
| boolean | getAdditionalProperty(String name)<br>provides type safety for additional properties |
8181

8282
## AdditionalProperties

‎samples/client/3_0_3_unit_test/java/docs/components/schemas/AdditionalpropertiesShouldNotLookInApplicators.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ A class that contains necessary nested
1111
| Modifier and Type | Class and Description |
1212
| ----------------- | ---------------------- |
1313
| static class | [AdditionalpropertiesShouldNotLookInApplicators.AdditionalpropertiesShouldNotLookInApplicators1](#additionalpropertiesshouldnotlookinapplicators1)<br> schema class |
14-
| static class | [AdditionalpropertiesShouldNotLookInApplicators.AdditionalpropertiesShouldNotLookInApplicatorsMapInput](#additionalpropertiesshouldnotlookinapplicatorsmapinput)<br> builder for Map payloads |
14+
| static class | [AdditionalpropertiesShouldNotLookInApplicators.AdditionalpropertiesShouldNotLookInApplicatorsMapBuilder](#additionalpropertiesshouldnotlookinapplicatorsmapbuilder)<br> builder for Map payloads |
1515
| static class | [AdditionalpropertiesShouldNotLookInApplicators.AdditionalpropertiesShouldNotLookInApplicatorsMap](#additionalpropertiesshouldnotlookinapplicatorsmap)<br> output class for Map payloads |
1616
| static class | [AdditionalpropertiesShouldNotLookInApplicators.Schema0](#schema0)<br> schema class |
17-
| static class | [AdditionalpropertiesShouldNotLookInApplicators.Schema0MapInput](#schema0mapinput)<br> builder for Map payloads |
17+
| static class | [AdditionalpropertiesShouldNotLookInApplicators.Schema0MapBuilder](#schema0mapbuilder)<br> builder for Map payloads |
1818
| static class | [AdditionalpropertiesShouldNotLookInApplicators.Schema0Map](#schema0map)<br> output class for Map payloads |
1919
| static class | [AdditionalpropertiesShouldNotLookInApplicators.Foo](#foo)<br> schema class |
2020
| static class | [AdditionalpropertiesShouldNotLookInApplicators.AdditionalProperties](#additionalproperties)<br> schema class |
@@ -41,11 +41,11 @@ A schema class that validates payloads
4141
| float | validate(float arg, SchemaConfiguration configuration) |
4242
| double | validate(double arg, SchemaConfiguration configuration) |
4343
| boolean | validate(boolean arg, SchemaConfiguration configuration) |
44-
| [AdditionalpropertiesShouldNotLookInApplicatorsMap](#additionalpropertiesshouldnotlookinapplicatorsmap) | validate([Map<?, ?>](#additionalpropertiesshouldnotlookinapplicatorsmapinput) arg, SchemaConfiguration configuration) |
44+
| [AdditionalpropertiesShouldNotLookInApplicatorsMap](#additionalpropertiesshouldnotlookinapplicatorsmap) | validate([Map<?, ?>](#additionalpropertiesshouldnotlookinapplicatorsmapbuilder) arg, SchemaConfiguration configuration) |
4545
| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
4646
| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
47-
## AdditionalpropertiesShouldNotLookInApplicatorsMapInput
48-
public class AdditionalpropertiesShouldNotLookInApplicatorsMapInput<br>
47+
## AdditionalpropertiesShouldNotLookInApplicatorsMapBuilder
48+
public class AdditionalpropertiesShouldNotLookInApplicatorsMapBuilder<br>
4949
builder for `Map<String, Boolean>`
5050

5151
A class that builds the Map input type
@@ -64,7 +64,7 @@ A class to store validated Map payloads
6464
### Method Summary
6565
| Modifier and Type | Method and Description |
6666
| ----------------- | ---------------------- |
67-
| static [AdditionalpropertiesShouldNotLookInApplicatorsMap](#additionalpropertiesshouldnotlookinapplicatorsmap) | of([Map<String, Boolean>](#additionalpropertiesshouldnotlookinapplicatorsmapinput) arg, SchemaConfiguration configuration) |
67+
| static [AdditionalpropertiesShouldNotLookInApplicatorsMap](#additionalpropertiesshouldnotlookinapplicatorsmap) | of([Map<String, Boolean>](#additionalpropertiesshouldnotlookinapplicatorsmapbuilder) arg, SchemaConfiguration configuration) |
6868
| boolean | getAdditionalProperty(String name)<br>provides type safety for additional properties |
6969

7070
## Schema0
@@ -88,11 +88,11 @@ A schema class that validates payloads
8888
| float | validate(float arg, SchemaConfiguration configuration) |
8989
| double | validate(double arg, SchemaConfiguration configuration) |
9090
| boolean | validate(boolean arg, SchemaConfiguration configuration) |
91-
| [Schema0Map](#schema0map) | validate([Map<?, ?>](#schema0mapinput) arg, SchemaConfiguration configuration) |
91+
| [Schema0Map](#schema0map) | validate([Map<?, ?>](#schema0mapbuilder) arg, SchemaConfiguration configuration) |
9292
| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
9393
| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
94-
## Schema0MapInput
95-
public class Schema0MapInput<br>
94+
## Schema0MapBuilder
95+
public class Schema0MapBuilder<br>
9696
builder for `Map<String, ? extends @Nullable Object>`
9797

9898
A class that builds the Map input type
@@ -112,7 +112,7 @@ A class to store validated Map payloads
112112
### Method Summary
113113
| Modifier and Type | Method and Description |
114114
| ----------------- | ---------------------- |
115-
| static [Schema0Map](#schema0map) | of([Map<String, ? extends @Nullable Object>](#schema0mapinput) arg, SchemaConfiguration configuration) |
115+
| static [Schema0Map](#schema0map) | of([Map<String, ? extends @Nullable Object>](#schema0mapbuilder) arg, SchemaConfiguration configuration) |
116116
| @Nullable Object | foo()<br>[optional] |
117117
| Object | getAdditionalProperty(String name)<br>provides type safety for additional properties |
118118

‎samples/client/3_0_3_unit_test/java/docs/components/schemas/Allof.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ A class that contains necessary nested
1212
| ----------------- | ---------------------- |
1313
| static class | [Allof.Allof1](#allof1)<br> schema class |
1414
| static class | [Allof.Schema1](#schema1)<br> schema class |
15-
| static class | [Allof.Schema1MapInput](#schema1mapinput)<br> builder for Map payloads |
15+
| static class | [Allof.Schema1MapBuilder](#schema1mapbuilder)<br> builder for Map payloads |
1616
| static class | [Allof.Schema1Map](#schema1map)<br> output class for Map payloads |
1717
| static class | [Allof.Foo](#foo)<br> schema class |
1818
| static class | [Allof.Schema0](#schema0)<br> schema class |
19-
| static class | [Allof.Schema0MapInput](#schema0mapinput)<br> builder for Map payloads |
19+
| static class | [Allof.Schema0MapBuilder](#schema0mapbuilder)<br> builder for Map payloads |
2020
| static class | [Allof.Schema0Map](#schema0map)<br> output class for Map payloads |
2121
| static class | [Allof.Bar](#bar)<br> schema class |
2222

@@ -66,11 +66,11 @@ A schema class that validates payloads
6666
| float | validate(float arg, SchemaConfiguration configuration) |
6767
| double | validate(double arg, SchemaConfiguration configuration) |
6868
| boolean | validate(boolean arg, SchemaConfiguration configuration) |
69-
| [Schema1Map](#schema1map) | validate([Map<?, ?>](#schema1mapinput) arg, SchemaConfiguration configuration) |
69+
| [Schema1Map](#schema1map) | validate([Map<?, ?>](#schema1mapbuilder) arg, SchemaConfiguration configuration) |
7070
| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
7171
| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
72-
## Schema1MapInput
73-
public class Schema1MapInput<br>
72+
## Schema1MapBuilder
73+
public class Schema1MapBuilder<br>
7474
builder for `Map<String, ? extends @Nullable Object>`
7575

7676
A class that builds the Map input type
@@ -90,7 +90,7 @@ A class to store validated Map payloads
9090
### Method Summary
9191
| Modifier and Type | Method and Description |
9292
| ----------------- | ---------------------- |
93-
| static [Schema1Map](#schema1map) | of([Map<String, ? extends @Nullable Object>](#schema1mapinput) arg, SchemaConfiguration configuration) |
93+
| static [Schema1Map](#schema1map) | of([Map<String, ? extends @Nullable Object>](#schema1mapbuilder) arg, SchemaConfiguration configuration) |
9494
| String | foo()<br> |
9595
| Object | getAdditionalProperty(String name)<br>provides type safety for additional properties |
9696

@@ -126,19 +126,19 @@ A schema class that validates payloads
126126
| float | validate(float arg, SchemaConfiguration configuration) |
127127
| double | validate(double arg, SchemaConfiguration configuration) |
128128
| boolean | validate(boolean arg, SchemaConfiguration configuration) |
129-
| [Schema0Map](#schema0map) | validate([Map<?, ?>](#schema0mapinput) arg, SchemaConfiguration configuration) |
129+
| [Schema0Map](#schema0map) | validate([Map<?, ?>](#schema0mapbuilder) arg, SchemaConfiguration configuration) |
130130
| FrozenList<@Nullable Object> | validate(List<?> arg, SchemaConfiguration configuration) |
131131
| @Nullable Object | validate(@Nullable Object arg, SchemaConfiguration configuration) |
132-
## Schema0MapInput
133-
public class Schema0MapInput<br>
132+
## Schema0MapBuilder
133+
public class Schema0MapBuilder<br>
134134
builder for `Map<String, ? extends @Nullable Object>`
135135

136136
A class that builds the Map input type
137137

138138
## Input Map Keys
139139
| Key | Type | Description | Notes |
140140
| --- | ---- | ------------ | ----- |
141-
| **bar** | long | | |
141+
| **bar** | Number | | |
142142
| **anyStringName** | Object | any string name can be used but the value must be the correct type | [optional] |
143143

144144
## Schema0Map
@@ -150,8 +150,8 @@ A class to store validated Map payloads
150150
### Method Summary
151151
| Modifier and Type | Method and Description |
152152
| ----------------- | ---------------------- |
153-
| static [Schema0Map](#schema0map) | of([Map<String, ? extends @Nullable Object>](#schema0mapinput) arg, SchemaConfiguration configuration) |
154-
| long | bar()<br> |
153+
| static [Schema0Map](#schema0map) | of([Map<String, ? extends @Nullable Object>](#schema0mapbuilder) arg, SchemaConfiguration configuration) |
154+
| Number | bar()<br> |
155155
| Object | getAdditionalProperty(String name)<br>provides type safety for additional properties |
156156

157157
## Bar

0 commit comments

Comments
 (0)