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

Commit cc176d1

Browse files
spacetherspacether
authored
Java client, misc improvements (#411)
* Fixes docRoot in response docs * Adjusts rsponse content shema doc docRoot * Adds builder for ServerInfo * Samples regen with server info builders * Adds missing import in operation code sample, fixes server info docs for methods * Uses a TreeSet for allServers and fixes typos in ApiConfiguration * Stops generation of operation servers if they were already generated * Adds and uses security ondex builder * Keyword builder added, samples updated * python petstore doc regen with server fix * Sample regen with python operation servers fix * Fixes python server index info * Fixes server index initialization in python api config * Fixes get server key prefixes in api_configuration python files * Fixes api config security info for python * Fixes python api configuration detection of security with no items * Fixes security usage in python operation files
1 parent 291c589 commit cc176d1

File tree

1,650 files changed

+6903
-5343
lines changed

Some content is hidden

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

1,650 files changed

+6903
-5343
lines changed

‎samples/client/3_0_3_unit_test/java/docs/RootServerInfo.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ public class RootServerInfo
55

66
A class that provides a server, and any needed server info classes
77
- a class that is a ServerProvider
8+
- a builder for the ServerProvider
89
- an enum class that stores server index values
910

1011
## Nested Class Summary
1112
| Modifier and Type | Class and Description |
1213
| ----------------- | --------------------- |
1314
| static class | [RootServerInfo.RootServerInfo1](#rootserverinfo1)<br>class that stores a server index |
15+
| static class | [RootServerInfo.RootServerInfoBuilder](#rootserverinfobuilder)<br>class that stores a server index |
1416
| enum | [RootServerInfo.ServerIndex](#serverindex)<br>class that stores a server index |
1517

1618
## RootServerInfo1
@@ -21,7 +23,6 @@ A class that stores servers and allows one to be returned with a ServerIndex ins
2123
### Constructor Summary
2224
| Constructor and Description |
2325
| --------------------------- |
24-
| RootServerInfo1()<br>Creates an instance using default server variable values |
2526
| RootServerInfo1(@Nullable [Server0](servers/Server0.md) server0)<br>Creates an instance using passed in servers |
2627

2728
### Field Summary
@@ -34,6 +35,21 @@ A class that stores servers and allows one to be returned with a ServerIndex ins
3435
| ----------------- | ---------------------- |
3536
| Server | getServer([ServerIndex](#serverindex) serverIndex) |
3637

38+
## RootServerInfoBuilder
39+
40+
a builder for [RootServerInfo1](#rootserverinfo1)
41+
42+
### Constructor Summary
43+
| Constructor and Description |
44+
| --------------------------- |
45+
| RootServerInfoBuilder()<br>Creates an instance |
46+
47+
### Method Summary
48+
| Modifier and Type | Method and Description |
49+
| ----------------- | ---------------------- |
50+
| [RootServerInfoBuilder](#rootserverinfobuilder) | server0([Server0](servers/Server0.md) server0)<br>sets the server |
51+
| [RootServerInfo1](#rootserverinfo1) | build() |
52+
3753
## ServerIndex
3854
enum ServerIndex<br>
3955

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ import java.util.Arrays;
8181
import java.util.List;
8282
import java.util.AbstractMap;
8383
84-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
84+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
8585
8686
// Map validation
8787
AdditionalpropertiesAllowsASchemaWhichShouldValidate.AdditionalpropertiesAllowsASchemaWhichShouldValidateMap validatedPayload =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import java.util.Arrays;
6565
import java.util.List;
6666
import java.util.AbstractMap;
6767
68-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
68+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
6969
7070
// Map validation
7171
AdditionalpropertiesCanExistByItself.AdditionalpropertiesCanExistByItselfMap validatedPayload =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ import java.util.Arrays;
7474
import java.util.List;
7575
import java.util.AbstractMap;
7676
77-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
77+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
7878
7979
// String validation
8080
String validatedPayload = AnyofWithBaseSchema.AnyofWithBaseSchema1.validate(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ import java.util.Arrays;
7070
import java.util.List;
7171
import java.util.AbstractMap;
7272
73-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
73+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
7474
7575
// List validation
7676
ArrayTypeMatchesArrays.ArrayTypeMatchesArraysList validatedPayload =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ import java.util.Arrays;
6363
import java.util.List;
6464
import java.util.AbstractMap;
6565
66-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
66+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
6767
6868
// int validation
6969
int validatedPayload = EnumWith0DoesNotMatchFalse.EnumWith0DoesNotMatchFalse1.validate(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ import java.util.Arrays;
6363
import java.util.List;
6464
import java.util.AbstractMap;
6565
66-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
66+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
6767
6868
// int validation
6969
int validatedPayload = EnumWith1DoesNotMatchTrue.EnumWith1DoesNotMatchTrue1.validate(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ import java.util.Arrays;
6060
import java.util.List;
6161
import java.util.AbstractMap;
6262
63-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
63+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
6464
6565
// String validation
6666
String validatedPayload = EnumWithEscapedCharacters.EnumWithEscapedCharacters1.validate(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ import java.util.Arrays;
6060
import java.util.List;
6161
import java.util.AbstractMap;
6262
63-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
63+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
6464
6565
// boolean validation
6666
boolean validatedPayload = EnumWithFalseDoesNotMatch0.EnumWithFalseDoesNotMatch01.validate(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ import java.util.Arrays;
6060
import java.util.List;
6161
import java.util.AbstractMap;
6262
63-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
63+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
6464
6565
// boolean validation
6666
boolean validatedPayload = EnumWithTrueDoesNotMatch1.EnumWithTrueDoesNotMatch11.validate(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ import java.util.Arrays;
7171
import java.util.List;
7272
import java.util.AbstractMap;
7373
74-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
74+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
7575
7676
// Map validation
7777
EnumsInProperties.EnumsInPropertiesMap validatedPayload =
@@ -203,7 +203,7 @@ import java.util.Arrays;
203203
import java.util.List;
204204
import java.util.AbstractMap;
205205
206-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
206+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
207207
208208
// String validation
209209
String validatedPayload = EnumsInProperties.Bar.validate(
@@ -282,7 +282,7 @@ import java.util.Arrays;
282282
import java.util.List;
283283
import java.util.AbstractMap;
284284
285-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
285+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
286286
287287
// String validation
288288
String validatedPayload = EnumsInProperties.Foo.validate(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import java.util.Arrays;
5858
import java.util.List;
5959
import java.util.AbstractMap;
6060
61-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
61+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
6262
6363
// int validation
6464
int validatedPayload = InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf1.validate(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ import java.util.Arrays;
256256
import java.util.List;
257257
import java.util.AbstractMap;
258258
259-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
259+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
260260
261261
// String validation
262262
String validatedPayload = InvalidStringValueForDefault.Bar.validate(

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ import java.util.Arrays;
8080
import java.util.List;
8181
import java.util.AbstractMap;
8282
83-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
83+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
8484
8585
// List validation
8686
NestedItems.NestedItemsList validatedPayload =
@@ -187,7 +187,7 @@ import java.util.Arrays;
187187
import java.util.List;
188188
import java.util.AbstractMap;
189189
190-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
190+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
191191
192192
// List validation
193193
NestedItems.ItemsList2 validatedPayload =
@@ -292,7 +292,7 @@ import java.util.Arrays;
292292
import java.util.List;
293293
import java.util.AbstractMap;
294294
295-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
295+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
296296
297297
// List validation
298298
NestedItems.ItemsList1 validatedPayload =
@@ -395,7 +395,7 @@ import java.util.Arrays;
395395
import java.util.List;
396396
import java.util.AbstractMap;
397397
398-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
398+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
399399
400400
// List validation
401401
NestedItems.ItemsList validatedPayload =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ import java.util.Arrays;
220220
import java.util.List;
221221
import java.util.AbstractMap;
222222
223-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
223+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
224224
225225
// Map validation
226226
NotMoreComplexSchema.NotMap validatedPayload =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ import java.util.Arrays;
6060
import java.util.List;
6161
import java.util.AbstractMap;
6262
63-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
63+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
6464
6565
// String validation
6666
String validatedPayload = NulCharactersInStrings.NulCharactersInStrings1.validate(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ import java.util.Arrays;
7474
import java.util.List;
7575
import java.util.AbstractMap;
7676
77-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
77+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
7878
7979
// String validation
8080
String validatedPayload = OneofWithBaseSchema.OneofWithBaseSchema1.validate(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import java.util.Arrays;
6262
import java.util.List;
6363
import java.util.AbstractMap;
6464
65-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
65+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
6666
6767
// Map validation
6868
RefInAdditionalproperties.RefInAdditionalpropertiesMap validatedPayload =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import java.util.Arrays;
6262
import java.util.List;
6363
import java.util.AbstractMap;
6464
65-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
65+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
6666
6767
// List validation
6868
RefInItems.RefInItemsList validatedPayload =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ import java.util.Arrays;
6363
import java.util.List;
6464
import java.util.AbstractMap;
6565
66-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
66+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
6767
6868
// int validation
6969
int validatedPayload = SimpleEnumValidation.SimpleEnumValidation1.validate(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import java.util.Arrays;
6565
import java.util.List;
6666
import java.util.AbstractMap;
6767
68-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
68+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
6969
7070
// Map validation
7171
TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingMap validatedPayload =
@@ -178,7 +178,7 @@ import java.util.Arrays;
178178
import java.util.List;
179179
import java.util.AbstractMap;
180180
181-
static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone());
181+
static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
182182
183183
// int validation
184184
int validatedPayload = TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.Alpha.validate(

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/RootServerInfo.java

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@
99

1010
public class RootServerInfo {
1111
public static class RootServerInfo1 implements ServerProvider<ServerIndex> {
12-
public final Server0 server0;
12+
private final Server0 server0;
1313

14-
public RootServerInfo1() {
15-
server0 = new Server0();
16-
}
17-
18-
public RootServerInfo1(
14+
RootServerInfo1(
1915
@Nullable Server0 server0
2016
) {
2117
this.server0 = Objects.requireNonNullElseGet(server0, Server0::new);
@@ -27,6 +23,23 @@ public Server getServer(ServerIndex serverIndex) {
2723
}
2824
}
2925

26+
public static class RootServerInfoBuilder {
27+
private @Nullable Server0 server0;
28+
29+
public RootServerInfoBuilder() {}
30+
31+
public RootServerInfoBuilder server0(Server0 server0) {
32+
this.server0 = server0;
33+
return this;
34+
}
35+
36+
public RootServerInfo1 build() {
37+
return new RootServerInfo1(
38+
server0
39+
);
40+
}
41+
}
42+
3043
public enum ServerIndex {
3144
SERVER_0
3245
}

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public AdditionalpropertiesAllowsASchemaWhichShouldValidateMap validate(Map<?, ?
320320
Set<List<Object>> pathSet = new HashSet<>();
321321
List<Object> pathToItem = List.of("args[0");
322322
Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
323-
SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(JsonSchemaKeywordFlags.ofNone()));
323+
SchemaConfiguration usedConfiguration = Objects.requireNonNullElseGet(configuration, () -> new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build()));
324324
ValidationMetadata validationMetadata = new ValidationMetadata(pathToItem, usedConfiguration, new PathToSchemasMap(), new LinkedHashSet<>());
325325
PathToSchemasMap pathToSchemasMap = getPathToSchemas(this, castArg, validationMetadata, pathSet);
326326
return getNewInstance(castArg, validationMetadata.pathToItem(), pathToSchemasMap);

0 commit comments

Comments
 (0)