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

Commit 1a7800b

Browse files
spacetherspacether
authored
Java, renames schema validators (#337)
* Renames boolean and list validators * Renames null and map schema validators * All schemas renamed in templates and java generator * Samples regen
1 parent 83c52cc commit 1a7800b

File tree

383 files changed

+1552
-1552
lines changed

Some content is hidden

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

383 files changed

+1552
-1552
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ src/main/java/org/openapijsonschematools/client/schemas/UuidJsonSchema.java
203203
src/main/java/org/openapijsonschematools/client/schemas/validation/AdditionalPropertiesValidator.java
204204
src/main/java/org/openapijsonschematools/client/schemas/validation/AllOfValidator.java
205205
src/main/java/org/openapijsonschematools/client/schemas/validation/AnyOfValidator.java
206+
src/main/java/org/openapijsonschematools/client/schemas/validation/BooleanSchemaValidator.java
206207
src/main/java/org/openapijsonschematools/client/schemas/validation/CustomIsoparser.java
207208
src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValidator.java
208209
src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMaximumValidator.java
@@ -218,6 +219,8 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchemaInf
218219
src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordEntry.java
219220
src/main/java/org/openapijsonschematools/client/schemas/validation/KeywordValidator.java
220221
src/main/java/org/openapijsonschematools/client/schemas/validation/LengthValidator.java
222+
src/main/java/org/openapijsonschematools/client/schemas/validation/ListSchemaValidator.java
223+
src/main/java/org/openapijsonschematools/client/schemas/validation/MapSchemaValidator.java
221224
src/main/java/org/openapijsonschematools/client/schemas/validation/MaxItemsValidator.java
222225
src/main/java/org/openapijsonschematools/client/schemas/validation/MaxLengthValidator.java
223226
src/main/java/org/openapijsonschematools/client/schemas/validation/MaxPropertiesValidator.java
@@ -228,18 +231,15 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/MinProperties
228231
src/main/java/org/openapijsonschematools/client/schemas/validation/MinimumValidator.java
229232
src/main/java/org/openapijsonschematools/client/schemas/validation/MultipleOfValidator.java
230233
src/main/java/org/openapijsonschematools/client/schemas/validation/NotValidator.java
234+
src/main/java/org/openapijsonschematools/client/schemas/validation/NullSchemaValidator.java
235+
src/main/java/org/openapijsonschematools/client/schemas/validation/NumberSchemaValidator.java
231236
src/main/java/org/openapijsonschematools/client/schemas/validation/OneOfValidator.java
232237
src/main/java/org/openapijsonschematools/client/schemas/validation/PathToSchemasMap.java
233238
src/main/java/org/openapijsonschematools/client/schemas/validation/PatternValidator.java
234239
src/main/java/org/openapijsonschematools/client/schemas/validation/PropertiesValidator.java
235240
src/main/java/org/openapijsonschematools/client/schemas/validation/PropertyEntry.java
236241
src/main/java/org/openapijsonschematools/client/schemas/validation/RequiredValidator.java
237-
src/main/java/org/openapijsonschematools/client/schemas/validation/SchemaBooleanValidator.java
238-
src/main/java/org/openapijsonschematools/client/schemas/validation/SchemaListValidator.java
239-
src/main/java/org/openapijsonschematools/client/schemas/validation/SchemaMapValidator.java
240-
src/main/java/org/openapijsonschematools/client/schemas/validation/SchemaNullValidator.java
241-
src/main/java/org/openapijsonschematools/client/schemas/validation/SchemaNumberValidator.java
242-
src/main/java/org/openapijsonschematools/client/schemas/validation/SchemaStringValidator.java
242+
src/main/java/org/openapijsonschematools/client/schemas/validation/StringSchemaValidator.java
243243
src/main/java/org/openapijsonschematools/client/schemas/validation/TypeValidator.java
244244
src/main/java/org/openapijsonschematools/client/schemas/validation/UniqueItemsValidator.java
245245
src/main/java/org/openapijsonschematools/client/schemas/validation/UnsetAnyTypeJsonSchema.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
@@ -17,9 +17,9 @@
1717
import org.openapijsonschematools.client.schemas.validation.FrozenMap;
1818
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
1919
import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
20+
import org.openapijsonschematools.client.schemas.validation.MapSchemaValidator;
2021
import org.openapijsonschematools.client.schemas.validation.PathToSchemasMap;
2122
import org.openapijsonschematools.client.schemas.validation.PropertyEntry;
22-
import org.openapijsonschematools.client.schemas.validation.SchemaMapValidator;
2323
import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
2424

2525
public class AdditionalpropertiesAllowsASchemaWhichShouldValidate {
@@ -70,7 +70,7 @@ public static class AdditionalpropertiesAllowsASchemaWhichShouldValidateMapInput
7070
}
7171

7272

73-
public static class AdditionalpropertiesAllowsASchemaWhichShouldValidate1 extends JsonSchema implements SchemaMapValidator<Object, Object, AdditionalpropertiesAllowsASchemaWhichShouldValidateMap> {
73+
public static class AdditionalpropertiesAllowsASchemaWhichShouldValidate1 extends JsonSchema implements MapSchemaValidator<Object, Object, AdditionalpropertiesAllowsASchemaWhichShouldValidateMap> {
7474
/*
7575
NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
7676
Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
import org.openapijsonschematools.client.exceptions.InvalidTypeException;
1616
import org.openapijsonschematools.client.exceptions.ValidationException;
1717
import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema;
18+
import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator;
1819
import org.openapijsonschematools.client.schemas.validation.FrozenList;
1920
import org.openapijsonschematools.client.schemas.validation.FrozenMap;
2021
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
2122
import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
23+
import org.openapijsonschematools.client.schemas.validation.ListSchemaValidator;
24+
import org.openapijsonschematools.client.schemas.validation.MapSchemaValidator;
25+
import org.openapijsonschematools.client.schemas.validation.NullSchemaValidator;
26+
import org.openapijsonschematools.client.schemas.validation.NumberSchemaValidator;
2227
import org.openapijsonschematools.client.schemas.validation.PathToSchemasMap;
2328
import org.openapijsonschematools.client.schemas.validation.PropertyEntry;
24-
import org.openapijsonschematools.client.schemas.validation.SchemaBooleanValidator;
25-
import org.openapijsonschematools.client.schemas.validation.SchemaListValidator;
26-
import org.openapijsonschematools.client.schemas.validation.SchemaMapValidator;
27-
import org.openapijsonschematools.client.schemas.validation.SchemaNullValidator;
28-
import org.openapijsonschematools.client.schemas.validation.SchemaNumberValidator;
29-
import org.openapijsonschematools.client.schemas.validation.SchemaStringValidator;
29+
import org.openapijsonschematools.client.schemas.validation.StringSchemaValidator;
3030
import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
3131

3232
public class AdditionalpropertiesAreAllowedByDefault {
@@ -75,7 +75,7 @@ public static class AdditionalpropertiesAreAllowedByDefaultMapInput {
7575
}
7676

7777

78-
public static class AdditionalpropertiesAreAllowedByDefault1 extends JsonSchema implements SchemaNullValidator, SchemaBooleanValidator, SchemaNumberValidator, SchemaStringValidator, SchemaListValidator<Object, Object, FrozenList<Object>>, SchemaMapValidator<Object, Object, AdditionalpropertiesAreAllowedByDefaultMap> {
78+
public static class AdditionalpropertiesAreAllowedByDefault1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<Object, Object, FrozenList<Object>>, MapSchemaValidator<Object, Object, AdditionalpropertiesAreAllowedByDefaultMap> {
7979
/*
8080
NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
8181
Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator

‎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
@@ -16,8 +16,8 @@
1616
import org.openapijsonschematools.client.schemas.validation.FrozenMap;
1717
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
1818
import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
19+
import org.openapijsonschematools.client.schemas.validation.MapSchemaValidator;
1920
import org.openapijsonschematools.client.schemas.validation.PathToSchemasMap;
20-
import org.openapijsonschematools.client.schemas.validation.SchemaMapValidator;
2121
import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
2222

2323
public class AdditionalpropertiesCanExistByItself {
@@ -47,7 +47,7 @@ public static class AdditionalpropertiesCanExistByItselfMapInput {
4747
}
4848

4949

50-
public static class AdditionalpropertiesCanExistByItself1 extends JsonSchema implements SchemaMapValidator<Boolean, Boolean, AdditionalpropertiesCanExistByItselfMap> {
50+
public static class AdditionalpropertiesCanExistByItself1 extends JsonSchema implements MapSchemaValidator<Boolean, Boolean, AdditionalpropertiesCanExistByItselfMap> {
5151
/*
5252
NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
5353
Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema;
1818
import org.openapijsonschematools.client.schemas.BooleanJsonSchema;
1919
import org.openapijsonschematools.client.schemas.validation.AdditionalPropertiesValidator;
20+
import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator;
2021
import org.openapijsonschematools.client.schemas.validation.FrozenList;
2122
import org.openapijsonschematools.client.schemas.validation.FrozenMap;
2223
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
2324
import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
25+
import org.openapijsonschematools.client.schemas.validation.ListSchemaValidator;
26+
import org.openapijsonschematools.client.schemas.validation.MapSchemaValidator;
27+
import org.openapijsonschematools.client.schemas.validation.NullSchemaValidator;
28+
import org.openapijsonschematools.client.schemas.validation.NumberSchemaValidator;
2429
import org.openapijsonschematools.client.schemas.validation.PathToSchemasMap;
2530
import org.openapijsonschematools.client.schemas.validation.PropertyEntry;
26-
import org.openapijsonschematools.client.schemas.validation.SchemaBooleanValidator;
27-
import org.openapijsonschematools.client.schemas.validation.SchemaListValidator;
28-
import org.openapijsonschematools.client.schemas.validation.SchemaMapValidator;
29-
import org.openapijsonschematools.client.schemas.validation.SchemaNullValidator;
30-
import org.openapijsonschematools.client.schemas.validation.SchemaNumberValidator;
31-
import org.openapijsonschematools.client.schemas.validation.SchemaStringValidator;
31+
import org.openapijsonschematools.client.schemas.validation.StringSchemaValidator;
3232
import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
3333

3434
public class AdditionalpropertiesShouldNotLookInApplicators {
@@ -70,7 +70,7 @@ public static class Schema0MapInput {
7070
}
7171

7272

73-
public static class Schema0 extends JsonSchema implements SchemaNullValidator, SchemaBooleanValidator, SchemaNumberValidator, SchemaStringValidator, SchemaListValidator<Object, Object, FrozenList<Object>>, SchemaMapValidator<Object, Object, Schema0Map> {
73+
public static class Schema0 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<Object, Object, FrozenList<Object>>, MapSchemaValidator<Object, Object, Schema0Map> {
7474
private static Schema0 instance;
7575

7676
protected Schema0() {
@@ -316,7 +316,7 @@ public static class AdditionalpropertiesShouldNotLookInApplicatorsMapInput {
316316
}
317317

318318

319-
public static class AdditionalpropertiesShouldNotLookInApplicators1 extends JsonSchema implements SchemaNullValidator, SchemaBooleanValidator, SchemaNumberValidator, SchemaStringValidator, SchemaListValidator<Object, Object, FrozenList<Object>>, SchemaMapValidator<Boolean, Boolean, AdditionalpropertiesShouldNotLookInApplicatorsMap> {
319+
public static class AdditionalpropertiesShouldNotLookInApplicators1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<Object, Object, FrozenList<Object>>, MapSchemaValidator<Boolean, Boolean, AdditionalpropertiesShouldNotLookInApplicatorsMap> {
320320
/*
321321
NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
322322
Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
import org.openapijsonschematools.client.exceptions.ValidationException;
1717
import org.openapijsonschematools.client.schemas.IntJsonSchema;
1818
import org.openapijsonschematools.client.schemas.StringJsonSchema;
19+
import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator;
1920
import org.openapijsonschematools.client.schemas.validation.FrozenList;
2021
import org.openapijsonschematools.client.schemas.validation.FrozenMap;
2122
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
2223
import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
24+
import org.openapijsonschematools.client.schemas.validation.ListSchemaValidator;
25+
import org.openapijsonschematools.client.schemas.validation.MapSchemaValidator;
26+
import org.openapijsonschematools.client.schemas.validation.NullSchemaValidator;
27+
import org.openapijsonschematools.client.schemas.validation.NumberSchemaValidator;
2328
import org.openapijsonschematools.client.schemas.validation.PathToSchemasMap;
2429
import org.openapijsonschematools.client.schemas.validation.PropertyEntry;
25-
import org.openapijsonschematools.client.schemas.validation.SchemaBooleanValidator;
26-
import org.openapijsonschematools.client.schemas.validation.SchemaListValidator;
27-
import org.openapijsonschematools.client.schemas.validation.SchemaMapValidator;
28-
import org.openapijsonschematools.client.schemas.validation.SchemaNullValidator;
29-
import org.openapijsonschematools.client.schemas.validation.SchemaNumberValidator;
30-
import org.openapijsonschematools.client.schemas.validation.SchemaStringValidator;
30+
import org.openapijsonschematools.client.schemas.validation.StringSchemaValidator;
3131
import org.openapijsonschematools.client.schemas.validation.ValidationMetadata;
3232

3333
public class Allof {
@@ -64,7 +64,7 @@ public static class Schema0MapInput {
6464
}
6565

6666

67-
public static class Schema0 extends JsonSchema implements SchemaNullValidator, SchemaBooleanValidator, SchemaNumberValidator, SchemaStringValidator, SchemaListValidator<Object, Object, FrozenList<Object>>, SchemaMapValidator<Object, Object, Schema0Map> {
67+
public static class Schema0 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<Object, Object, FrozenList<Object>>, MapSchemaValidator<Object, Object, Schema0Map> {
6868
private static Schema0 instance;
6969

7070
protected Schema0() {
@@ -323,7 +323,7 @@ public static class Schema1MapInput {
323323
}
324324

325325

326-
public static class Schema1 extends JsonSchema implements SchemaNullValidator, SchemaBooleanValidator, SchemaNumberValidator, SchemaStringValidator, SchemaListValidator<Object, Object, FrozenList<Object>>, SchemaMapValidator<Object, Object, Schema1Map> {
326+
public static class Schema1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<Object, Object, FrozenList<Object>>, MapSchemaValidator<Object, Object, Schema1Map> {
327327
private static Schema1 instance;
328328

329329
protected Schema1() {
@@ -552,7 +552,7 @@ public Object getNewInstance(Object arg, List<Object> pathToItem, PathToSchemasM
552552
}
553553
}
554554

555-
public static class Allof1 extends JsonSchema implements SchemaNullValidator, SchemaBooleanValidator, SchemaNumberValidator, SchemaStringValidator, SchemaListValidator<Object, Object, FrozenList<Object>>, SchemaMapValidator<Object, Object, FrozenMap<Object>> {
555+
public static class Allof1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<Object, Object, FrozenList<Object>>, MapSchemaValidator<Object, Object, FrozenMap<Object>> {
556556
/*
557557
NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
558558
Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator

0 commit comments

Comments
 (0)