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

Commit 36a7ccf

Browse files
authored
Java, adds 303 unit test client json schema tests (#307)
* Adds test files * Improves test templates * Fixes handling on null character in enums * Fixes validate method for anytype with map + max + min length validation logic * Changes from List.of to Arrays.asList to allow nulls in at initialization * Adjusts numeric formatting to only apply for known formats * Adds not validator to java and templates * java 303 sample regen * Adds Integer type ton IntJsonSchema * Fixes not validator * Adds getMapOutputInstance to anytype schemas * Improves list validate and getListOutputInstance method generation * Allows float and double into intjsonschema * Gets NotAnyTypeJsonSchema working * Fixes keywords generation, fixes java test testPropertiesDefinedInAllofAreNotExaminedFails * Adds and uses MapBuilder to allow null entries into maps * Fixes two java enum tests by inserting float values into enum when integer values are defined * Fixes multipleOf validator * Adjusts pattern processing to remve leading and traling / * Stops adding float values of int in enum, enum validator handles int in float use case * Samples regen
1 parent 8579ac8 commit 36a7ccf

545 files changed

Lines changed: 9894 additions & 617 deletions

File tree

Some content is hidden

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ src/main/java/org/openapijsonschematools/schemas/Int64JsonSchema.java
193193
src/main/java/org/openapijsonschematools/schemas/IntJsonSchema.java
194194
src/main/java/org/openapijsonschematools/schemas/ListJsonSchema.java
195195
src/main/java/org/openapijsonschematools/schemas/MapJsonSchema.java
196+
src/main/java/org/openapijsonschematools/schemas/MapMaker.java
196197
src/main/java/org/openapijsonschematools/schemas/NotAnyTypeJsonSchema.java
197198
src/main/java/org/openapijsonschematools/schemas/NullJsonSchema.java
198199
src/main/java/org/openapijsonschematools/schemas/NumberJsonSchema.java
@@ -222,6 +223,7 @@ src/main/java/org/openapijsonschematools/schemas/validation/MinLengthValidator.j
222223
src/main/java/org/openapijsonschematools/schemas/validation/MinPropertiesValidator.java
223224
src/main/java/org/openapijsonschematools/schemas/validation/MinimumValidator.java
224225
src/main/java/org/openapijsonschematools/schemas/validation/MultipleOfValidator.java
226+
src/main/java/org/openapijsonschematools/schemas/validation/NotValidator.java
225227
src/main/java/org/openapijsonschematools/schemas/validation/OneOfValidator.java
226228
src/main/java/org/openapijsonschematools/schemas/validation/PathToSchemasMap.java
227229
src/main/java/org/openapijsonschematools/schemas/validation/PatternValidator.java

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ A schema class that validates payloads
2222
### Field Summary
2323
| Modifier and Type | Field and Description |
2424
| ----------------- | ---------------------- |
25+
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("additionalProperties", new AdditionalPropertiesValidator([AdditionalProperties.class](#additionalproperties))),<br>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("allOf", new AllOfValidator(List.of(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[Schema0.class](#schema0)<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
2526

2627
### Method Summary
2728
| Modifier and Type | Method and Description |

samples/client/3_0_3_unit_test/java/docs/components/schemas/Not.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ A schema class that validates payloads
1818
### Field Summary
1919
| Modifier and Type | Field and Description |
2020
| ----------------- | ---------------------- |
21+
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("not", new NotValidator([Not2.class](#not2)))<br>)); |
2122

2223
### Method Summary
2324
| Modifier and Type | Method and Description |

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ A schema class that validates payloads
2020
### Field Summary
2121
| Modifier and Type | Field and Description |
2222
| ----------------- | ---------------------- |
23+
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("not", new NotValidator([Not.class](#not)))<br>)); |
2324

2425
### Method Summary
2526
| Modifier and Type | Method and Description |

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
@@ -17,7 +17,7 @@ A schema class that validates payloads
1717
### Field Summary
1818
| Modifier and Type | Field and Description |
1919
| ----------------- | ---------------------- |
20-
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("type", new TypeValidator(Set.of(<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;String.class<br/>&nbsp;&nbsp;&nbsp;&nbsp;))),<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("enum", new EnumValidator(Set.of(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"hello\x00there"<br>)))<br>)); |
20+
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("type", new TypeValidator(Set.of(<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;String.class<br/>&nbsp;&nbsp;&nbsp;&nbsp;))),<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("enum", new EnumValidator(Set.of(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"hello\0there"<br>)))<br>)); |
2121

2222
### Method Summary
2323
| Modifier and Type | Method and Description |

samples/client/3_0_3_unit_test/java/docs/components/schemas/PatternIsNotAnchored.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ A schema class that validates payloads
1717
### Field Summary
1818
| Modifier and Type | Field and Description |
1919
| ----------------- | ---------------------- |
20-
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"/a+/"<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
20+
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"a+"<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
2121

2222
### Method Summary
2323
| Modifier and Type | Method and Description |

samples/client/3_0_3_unit_test/java/docs/components/schemas/PatternValidation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ A schema class that validates payloads
1717
### Field Summary
1818
| Modifier and Type | Field and Description |
1919
| ----------------- | ---------------------- |
20-
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"/^a*$/"<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
20+
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"^a*$"<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
2121

2222
### Method Summary
2323
| Modifier and Type | Method and Description |

samples/client/3_0_3_unit_test/java/docs/components/schemas/RefInNot.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ A schema class that validates payloads
1717
### Field Summary
1818
| Modifier and Type | Field and Description |
1919
| ----------------- | ---------------------- |
20+
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("not", new NotValidator([PropertyNamedRefThatIsNotAReference.PropertyNamedRefThatIsNotAReference1.class](../../components/schemas/PropertyNamedRefThatIsNotAReference.md#propertynamedrefthatisnotareference1))<br>)); |
2021

2122
### Method Summary
2223
| Modifier and Type | Method and Description |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ public static class AdditionalpropertiesAllowsASchemaWhichShouldValidate1 extend
7373
new PropertyEntry("bar", Bar.class)
7474
))),
7575
new KeywordEntry("additionalProperties", new AdditionalPropertiesValidator(AdditionalProperties.class))
76-
7776
));
77+
7878
protected static AdditionalpropertiesAllowsASchemaWhichShouldValidateMap getMapOutputInstance(FrozenMap<String, Object> arg) {
7979
return new AdditionalpropertiesAllowsASchemaWhichShouldValidateMap(arg);
8080
}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ public static class AdditionalpropertiesAreAllowedByDefault1 extends JsonSchema
7272
new PropertyEntry("bar", Bar.class)
7373
)))
7474
));
75+
76+
protected static AdditionalpropertiesAreAllowedByDefaultMap getMapOutputInstance(FrozenMap<String, Object> arg) {
77+
return new AdditionalpropertiesAreAllowedByDefaultMap(arg);
78+
}
7579
public static Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException {
7680
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
7781
}
@@ -112,11 +116,11 @@ public static String validate(UUID arg, SchemaConfiguration configuration) throw
112116
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
113117
}
114118

115-
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {
119+
public static AdditionalpropertiesAreAllowedByDefaultMap validate(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {
116120
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
117121
}
118122

119-
public static <U extends FrozenList> U validate(List<Object> arg, SchemaConfiguration configuration) throws ValidationException {
123+
public static FrozenList<Object> validate(List<Object> arg, SchemaConfiguration configuration) throws ValidationException {
120124
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
121125
}
122126
}}

0 commit comments

Comments
 (0)