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

Commit 262d435

Browse files
spacetherspacether
authored
Java adds security to ApiClient (#384)
* Adds securityInfo * Adds two security requirement object classes * Adds one file per security requirement object definition in java * Updates security requirement object classnames * Updates sro constructors * CodegenServers renamed to CodegenList so it can be used for sercurityrequirementsobjects also * Adds classes to store security info, partial implementation * Updates SecurityInfo template * Updates security info class to have a constrctor where all securities can be null * Fixes the class names of security requirement objects which are empty * Makes MapBuilder generic * Changes MapBuilder property from schema to property * Adds builders to CodegenList * Fixes type errors in java client * security builders added in java layer * Adds setters in SecurityInfo classes that will be used in builders * Sample regen * Updates python generation of security inti files * Samples regen for security client * Fixes python petstore security files * Removes toSecurityRequirementObjectFilename * Fixes toSecurityFilename for python * Fixes python servers init files * Adds SecurityInfo to ApiConfiguration * Samples and docs regnerated * Java component tests regen to eliminate removed MapMaker references * Samples updated
1 parent e745c0d commit 262d435

File tree

532 files changed

+4832
-1944
lines changed

Some content is hidden

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

532 files changed

+4832
-1944
lines changed

‎docs/generators/java.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
224224
|ComponentParameters|✗|OAS3
225225
|ComponentRequestBodies|✗|OAS3
226226
|ComponentHeaders|✗|OAS3
227-
|ComponentSecuritySchemes|✗|OAS3
227+
|ComponentSecuritySchemes|✓|OAS3
228228
|ComponentLinks|✗|OAS3
229229
|ComponentCallbacks|✗|OAS3
230230
|ComponentPathItems|✗|OAS3
@@ -238,7 +238,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
238238
|Paths|✗|OAS2,OAS3
239239
|Webhooks|✗|OAS3
240240
|Components|✓|OAS3
241-
|Security|✗|OAS2,OAS3
241+
|Security|✓|OAS2,OAS3
242242
|Tags|✗|OAS2,OAS3
243243
|ExternalDocs|✗|OAS2,OAS3
244244

@@ -249,6 +249,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
249249
|Responses_RangedResponseCodes|✗|OAS3
250250
|Responses_Default|✗|OAS3
251251
|Responses_RedirectionResponse|✗|OAS3
252+
|Security|✓|OAS2,OAS3
253+
|Servers|✓|OAS3
252254

253255
### Parameter Feature
254256
| Name | Supported | Defined By |

‎docs/generators/python.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
207207
|Responses_RangedResponseCodes|✓|OAS3
208208
|Responses_Default|✓|OAS3
209209
|Responses_RedirectionResponse|✓|OAS3
210+
|Security|✓|OAS2,OAS3
211+
|Servers|✓|OAS3
210212

211213
### Parameter Feature
212214
| Name | Supported | Defined By |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,13 @@ src/main/java/org/openapijsonschematools/client/exceptions/InvalidTypeException.
185185
src/main/java/org/openapijsonschematools/client/exceptions/UnsetPropertyException.java
186186
src/main/java/org/openapijsonschematools/client/exceptions/ValidationException.java
187187
src/main/java/org/openapijsonschematools/client/schemas/AnyTypeJsonSchema.java
188-
src/main/java/org/openapijsonschematools/client/schemas/BaseBuilder.java
189188
src/main/java/org/openapijsonschematools/client/schemas/BooleanJsonSchema.java
190189
src/main/java/org/openapijsonschematools/client/schemas/DateJsonSchema.java
191190
src/main/java/org/openapijsonschematools/client/schemas/DateTimeJsonSchema.java
192191
src/main/java/org/openapijsonschematools/client/schemas/DecimalJsonSchema.java
193192
src/main/java/org/openapijsonschematools/client/schemas/DoubleJsonSchema.java
194193
src/main/java/org/openapijsonschematools/client/schemas/FloatJsonSchema.java
194+
src/main/java/org/openapijsonschematools/client/schemas/GenericBuilder.java
195195
src/main/java/org/openapijsonschematools/client/schemas/Int32JsonSchema.java
196196
src/main/java/org/openapijsonschematools/client/schemas/Int64JsonSchema.java
197197
src/main/java/org/openapijsonschematools/client/schemas/IntJsonSchema.java

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
1616
import org.openapijsonschematools.client.exceptions.ValidationException;
1717
import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema;
18-
import org.openapijsonschematools.client.schemas.BaseBuilder;
1918
import org.openapijsonschematools.client.schemas.BooleanJsonSchema;
19+
import org.openapijsonschematools.client.schemas.GenericBuilder;
2020
import org.openapijsonschematools.client.schemas.validation.FrozenMap;
2121
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
2222
import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
@@ -225,7 +225,7 @@ default T additionalProperty(String key, boolean value) throws InvalidAdditional
225225
}
226226
}
227227

228-
public static class AdditionalpropertiesAllowsASchemaWhichShouldValidateMapBuilder implements BaseBuilder<@Nullable Object>, SetterForFoo<AdditionalpropertiesAllowsASchemaWhichShouldValidateMapBuilder>, SetterForBar<AdditionalpropertiesAllowsASchemaWhichShouldValidateMapBuilder>, SetterForAdditionalProperties<AdditionalpropertiesAllowsASchemaWhichShouldValidateMapBuilder> {
228+
public static class AdditionalpropertiesAllowsASchemaWhichShouldValidateMapBuilder implements GenericBuilder<Map<String, @Nullable Object>>, SetterForFoo<AdditionalpropertiesAllowsASchemaWhichShouldValidateMapBuilder>, SetterForBar<AdditionalpropertiesAllowsASchemaWhichShouldValidateMapBuilder>, SetterForAdditionalProperties<AdditionalpropertiesAllowsASchemaWhichShouldValidateMapBuilder> {
229229
private final Map<String, @Nullable Object> instance;
230230
private static final Set<String> knownKeys = Set.of(
231231
"foo",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
1919
import org.openapijsonschematools.client.exceptions.ValidationException;
2020
import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema;
21-
import org.openapijsonschematools.client.schemas.BaseBuilder;
21+
import org.openapijsonschematools.client.schemas.GenericBuilder;
2222
import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter;
2323
import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator;
2424
import org.openapijsonschematools.client.schemas.validation.FrozenList;
@@ -206,7 +206,7 @@ default T bar(Map<String, ?> value) {
206206
}
207207
}
208208

209-
public static class AdditionalpropertiesAreAllowedByDefaultMapBuilder extends UnsetAddPropsSetter<AdditionalpropertiesAreAllowedByDefaultMapBuilder> implements BaseBuilder<@Nullable Object>, SetterForFoo<AdditionalpropertiesAreAllowedByDefaultMapBuilder>, SetterForBar<AdditionalpropertiesAreAllowedByDefaultMapBuilder> {
209+
public static class AdditionalpropertiesAreAllowedByDefaultMapBuilder extends UnsetAddPropsSetter<AdditionalpropertiesAreAllowedByDefaultMapBuilder> implements GenericBuilder<Map<String, @Nullable Object>>, SetterForFoo<AdditionalpropertiesAreAllowedByDefaultMapBuilder>, SetterForBar<AdditionalpropertiesAreAllowedByDefaultMapBuilder> {
210210
private final Map<String, @Nullable Object> instance;
211211
private static final Set<String> knownKeys = Set.of(
212212
"foo",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import org.openapijsonschematools.client.exceptions.InvalidTypeException;
1515
import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
1616
import org.openapijsonschematools.client.exceptions.ValidationException;
17-
import org.openapijsonschematools.client.schemas.BaseBuilder;
1817
import org.openapijsonschematools.client.schemas.BooleanJsonSchema;
18+
import org.openapijsonschematools.client.schemas.GenericBuilder;
1919
import org.openapijsonschematools.client.schemas.validation.FrozenMap;
2020
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
2121
import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
@@ -72,7 +72,7 @@ default T additionalProperty(String key, boolean value) throws InvalidAdditional
7272
}
7373
}
7474

75-
public static class AdditionalpropertiesCanExistByItselfMapBuilder implements BaseBuilder<Boolean>, SetterForAdditionalProperties<AdditionalpropertiesCanExistByItselfMapBuilder> {
75+
public static class AdditionalpropertiesCanExistByItselfMapBuilder implements GenericBuilder<Map<String, Boolean>>, SetterForAdditionalProperties<AdditionalpropertiesCanExistByItselfMapBuilder> {
7676
private final Map<String, Boolean> instance;
7777
private static final Set<String> knownKeys = Set.of();
7878
public Set<String> getKnownKeys() {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
1919
import org.openapijsonschematools.client.exceptions.ValidationException;
2020
import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema;
21-
import org.openapijsonschematools.client.schemas.BaseBuilder;
2221
import org.openapijsonschematools.client.schemas.BooleanJsonSchema;
22+
import org.openapijsonschematools.client.schemas.GenericBuilder;
2323
import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter;
2424
import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator;
2525
import org.openapijsonschematools.client.schemas.validation.FrozenList;
@@ -144,7 +144,7 @@ default T foo(Map<String, ?> value) {
144144
}
145145
}
146146

147-
public static class Schema0MapBuilder extends UnsetAddPropsSetter<Schema0MapBuilder> implements BaseBuilder<@Nullable Object>, SetterForFoo<Schema0MapBuilder> {
147+
public static class Schema0MapBuilder extends UnsetAddPropsSetter<Schema0MapBuilder> implements GenericBuilder<Map<String, @Nullable Object>>, SetterForFoo<Schema0MapBuilder> {
148148
private final Map<String, @Nullable Object> instance;
149149
private static final Set<String> knownKeys = Set.of(
150150
"foo"
@@ -400,7 +400,7 @@ default T additionalProperty(String key, boolean value) throws InvalidAdditional
400400
}
401401
}
402402

403-
public static class AdditionalpropertiesShouldNotLookInApplicatorsMapBuilder implements BaseBuilder<Boolean>, SetterForAdditionalProperties<AdditionalpropertiesShouldNotLookInApplicatorsMapBuilder> {
403+
public static class AdditionalpropertiesShouldNotLookInApplicatorsMapBuilder implements GenericBuilder<Map<String, Boolean>>, SetterForAdditionalProperties<AdditionalpropertiesShouldNotLookInApplicatorsMapBuilder> {
404404
private final Map<String, Boolean> instance;
405405
private static final Set<String> knownKeys = Set.of();
406406
public Set<String> getKnownKeys() {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.openapijsonschematools.client.exceptions.InvalidTypeException;
1818
import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
1919
import org.openapijsonschematools.client.exceptions.ValidationException;
20-
import org.openapijsonschematools.client.schemas.BaseBuilder;
20+
import org.openapijsonschematools.client.schemas.GenericBuilder;
2121
import org.openapijsonschematools.client.schemas.IntJsonSchema;
2222
import org.openapijsonschematools.client.schemas.StringJsonSchema;
2323
import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter;
@@ -106,7 +106,7 @@ default T bar(double value) {
106106
}
107107
}
108108

109-
public static class Schema0Map0Builder extends UnsetAddPropsSetter<Schema0Map0Builder> implements BaseBuilder<@Nullable Object> {
109+
public static class Schema0Map0Builder extends UnsetAddPropsSetter<Schema0Map0Builder> implements GenericBuilder<Map<String, @Nullable Object>> {
110110
private final Map<String, @Nullable Object> instance;
111111
private static final Set<String> knownKeys = Set.of(
112112
"bar"
@@ -391,7 +391,7 @@ default T foo(String value) {
391391
}
392392
}
393393

394-
public static class Schema1Map0Builder extends UnsetAddPropsSetter<Schema1Map0Builder> implements BaseBuilder<@Nullable Object> {
394+
public static class Schema1Map0Builder extends UnsetAddPropsSetter<Schema1Map0Builder> implements GenericBuilder<Map<String, @Nullable Object>> {
395395
private final Map<String, @Nullable Object> instance;
396396
private static final Set<String> knownKeys = Set.of(
397397
"foo"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.openapijsonschematools.client.exceptions.InvalidTypeException;
1818
import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
1919
import org.openapijsonschematools.client.exceptions.ValidationException;
20-
import org.openapijsonschematools.client.schemas.BaseBuilder;
20+
import org.openapijsonschematools.client.schemas.GenericBuilder;
2121
import org.openapijsonschematools.client.schemas.IntJsonSchema;
2222
import org.openapijsonschematools.client.schemas.NullJsonSchema;
2323
import org.openapijsonschematools.client.schemas.StringJsonSchema;
@@ -89,7 +89,7 @@ default T foo(String value) {
8989
}
9090
}
9191

92-
public static class Schema0Map0Builder extends UnsetAddPropsSetter<Schema0Map0Builder> implements BaseBuilder<@Nullable Object> {
92+
public static class Schema0Map0Builder extends UnsetAddPropsSetter<Schema0Map0Builder> implements GenericBuilder<Map<String, @Nullable Object>> {
9393
private final Map<String, @Nullable Object> instance;
9494
private static final Set<String> knownKeys = Set.of(
9595
"foo"
@@ -374,7 +374,7 @@ default T baz(Void value) {
374374
}
375375
}
376376

377-
public static class Schema1Map0Builder extends UnsetAddPropsSetter<Schema1Map0Builder> implements BaseBuilder<@Nullable Object> {
377+
public static class Schema1Map0Builder extends UnsetAddPropsSetter<Schema1Map0Builder> implements GenericBuilder<Map<String, @Nullable Object>> {
378378
private final Map<String, @Nullable Object> instance;
379379
private static final Set<String> knownKeys = Set.of(
380380
"baz"
@@ -677,7 +677,7 @@ default T bar(double value) {
677677
}
678678
}
679679

680-
public static class AllofWithBaseSchemaMap0Builder extends UnsetAddPropsSetter<AllofWithBaseSchemaMap0Builder> implements BaseBuilder<@Nullable Object> {
680+
public static class AllofWithBaseSchemaMap0Builder extends UnsetAddPropsSetter<AllofWithBaseSchemaMap0Builder> implements GenericBuilder<Map<String, @Nullable Object>> {
681681
private final Map<String, @Nullable Object> instance;
682682
private static final Set<String> knownKeys = Set.of(
683683
"bar"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.openapijsonschematools.client.exceptions.InvalidTypeException;
1818
import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
1919
import org.openapijsonschematools.client.exceptions.ValidationException;
20-
import org.openapijsonschematools.client.schemas.BaseBuilder;
20+
import org.openapijsonschematools.client.schemas.GenericBuilder;
2121
import org.openapijsonschematools.client.schemas.IntJsonSchema;
2222
import org.openapijsonschematools.client.schemas.StringJsonSchema;
2323
import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter;
@@ -106,7 +106,7 @@ default T bar(double value) {
106106
}
107107
}
108108

109-
public static class Schema0Map0Builder extends UnsetAddPropsSetter<Schema0Map0Builder> implements BaseBuilder<@Nullable Object> {
109+
public static class Schema0Map0Builder extends UnsetAddPropsSetter<Schema0Map0Builder> implements GenericBuilder<Map<String, @Nullable Object>> {
110110
private final Map<String, @Nullable Object> instance;
111111
private static final Set<String> knownKeys = Set.of(
112112
"bar"
@@ -391,7 +391,7 @@ default T foo(String value) {
391391
}
392392
}
393393

394-
public static class Schema1Map0Builder extends UnsetAddPropsSetter<Schema1Map0Builder> implements BaseBuilder<@Nullable Object> {
394+
public static class Schema1Map0Builder extends UnsetAddPropsSetter<Schema1Map0Builder> implements GenericBuilder<Map<String, @Nullable Object>> {
395395
private final Map<String, @Nullable Object> instance;
396396
private static final Set<String> knownKeys = Set.of(
397397
"foo"

0 commit comments

Comments
 (0)