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

Commit 4231bf0

Browse files
spacetherspacether
authored
Java, adds SetMaker to allow null into enum (#328)
* Adds and uses setmaker to allow null into enums * Samples regen
1 parent f016ff0 commit 4231bf0

File tree

106 files changed

+227
-119
lines changed

Some content is hidden

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

106 files changed

+227
-119
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ src/main/java/org/openapijsonschematools/client/schemas/MapMaker.java
197197
src/main/java/org/openapijsonschematools/client/schemas/NotAnyTypeJsonSchema.java
198198
src/main/java/org/openapijsonschematools/client/schemas/NullJsonSchema.java
199199
src/main/java/org/openapijsonschematools/client/schemas/NumberJsonSchema.java
200+
src/main/java/org/openapijsonschematools/client/schemas/SetMaker.java
200201
src/main/java/org/openapijsonschematools/client/schemas/StringJsonSchema.java
201202
src/main/java/org/openapijsonschematools/client/schemas/UuidJsonSchema.java
202203
src/main/java/org/openapijsonschematools/client/schemas/validation/AdditionalPropertiesValidator.java

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ int validatedPayload = EnumWith0DoesNotMatchFalse.EnumWith0DoesNotMatchFalse1.va
4545
### Field Summary
4646
| Modifier and Type | Field and Description |
4747
| ----------------- | ---------------------- |
48-
| 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;Integer.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Long.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Float.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Double.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;0)))<br>)); |
48+
| 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;Integer.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Long.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Float.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Double.class<br/>&nbsp;&nbsp;&nbsp;&nbsp;))),<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;0)))<br>)); |
4949

5050
### Method Summary
5151
| Modifier and Type | Method and Description |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ int validatedPayload = EnumWith1DoesNotMatchTrue.EnumWith1DoesNotMatchTrue1.vali
4545
### Field Summary
4646
| Modifier and Type | Field and Description |
4747
| ----------------- | ---------------------- |
48-
| 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;Integer.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Long.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Float.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Double.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;1)))<br>)); |
48+
| 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;Integer.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Long.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Float.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Double.class<br/>&nbsp;&nbsp;&nbsp;&nbsp;))),<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1)))<br>)); |
4949

5050
### Method Summary
5151
| Modifier and Type | Method and Description |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ String validatedPayload = EnumWithEscapedCharacters.EnumWithEscapedCharacters1.v
4545
### Field Summary
4646
| Modifier and Type | Field and Description |
4747
| ----------------- | ---------------------- |
48-
| 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;"foo\nbar",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"foo\rbar"<br>)))<br>)); |
48+
| 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(SetMaker.makeSet(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"foo\nbar",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"foo\rbar"<br>)))<br>)); |
4949

5050
### Method Summary
5151
| Modifier and Type | Method and Description |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ boolean validatedPayload = EnumWithFalseDoesNotMatch0.EnumWithFalseDoesNotMatch0
4545
### Field Summary
4646
| Modifier and Type | Field and Description |
4747
| ----------------- | ---------------------- |
48-
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("type", new TypeValidator(Set.of(Boolean.class))),<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("enum", new EnumValidator(Set.of(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;false)))<br>)); |
48+
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("type", new TypeValidator(Set.of(Boolean.class))),<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;false)))<br>)); |
4949

5050
### Method Summary
5151
| Modifier and Type | Method and Description |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ boolean validatedPayload = EnumWithTrueDoesNotMatch1.EnumWithTrueDoesNotMatch11.
4545
### Field Summary
4646
| Modifier and Type | Field and Description |
4747
| ----------------- | ---------------------- |
48-
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("type", new TypeValidator(Set.of(Boolean.class))),<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("enum", new EnumValidator(Set.of(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;true)))<br>)); |
48+
| static LinkedHashMap<String, KeywordValidator> |keywordToValidator<br/>new LinkedHashMap<>(Map.ofEntries(<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("type", new TypeValidator(Set.of(Boolean.class))),<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;true)))<br>)); |
4949

5050
### Method Summary
5151
| Modifier and Type | Method and Description |

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ String validatedPayload = EnumsInProperties.Bar.validate(
124124
### Field Summary
125125
| Modifier and Type | Field and Description |
126126
| ----------------- | ---------------------- |
127-
| 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;"bar"<br>)))<br>)); |
127+
| 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(SetMaker.makeSet(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"bar"<br>)))<br>)); |
128128

129129
### Method Summary
130130
| Modifier and Type | Method and Description |
@@ -162,7 +162,7 @@ String validatedPayload = EnumsInProperties.Foo.validate(
162162
### Field Summary
163163
| Modifier and Type | Field and Description |
164164
| ----------------- | ---------------------- |
165-
| 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;"foo"<br>)))<br>)); |
165+
| 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(SetMaker.makeSet(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"foo"<br>)))<br>)); |
166166

167167
### Method Summary
168168
| Modifier and Type | Method and Description |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ String validatedPayload = NulCharactersInStrings.NulCharactersInStrings1.validat
4545
### Field Summary
4646
| Modifier and Type | Field and Description |
4747
| ----------------- | ---------------------- |
48-
| 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>)); |
48+
| 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(SetMaker.makeSet(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"hello\0there"<br>)))<br>)); |
4949

5050
### Method Summary
5151
| Modifier and Type | Method and Description |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ int validatedPayload = SimpleEnumValidation.SimpleEnumValidation1.validate(
4545
### Field Summary
4646
| Modifier and Type | Field and Description |
4747
| ----------------- | ---------------------- |
48-
| 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;Integer.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Long.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Float.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Double.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;1,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;3)))<br>)); |
48+
| 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;Integer.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Long.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Float.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Double.class<br/>&nbsp;&nbsp;&nbsp;&nbsp;))),<br/>&nbsp;&nbsp;&nbsp;&nbsp;new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;3)))<br>)); |
4949

5050
### Method Summary
5151
| Modifier and Type | Method and Description |

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Set;
55
import org.openapijsonschematools.client.configurations.SchemaConfiguration;
66
import org.openapijsonschematools.client.exceptions.ValidationException;
7+
import org.openapijsonschematools.client.schemas.SetMaker;
78
import org.openapijsonschematools.client.schemas.validation.EnumValidator;
89
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
910
import org.openapijsonschematools.client.schemas.validation.JsonSchemaFactory;
@@ -30,7 +31,7 @@ public EnumWith0DoesNotMatchFalse1() {
3031
Float.class,
3132
Double.class
3233
))),
33-
new KeywordEntry("enum", new EnumValidator(Set.of(
34+
new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(
3435
0
3536
)))
3637
)));

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Set;
55
import org.openapijsonschematools.client.configurations.SchemaConfiguration;
66
import org.openapijsonschematools.client.exceptions.ValidationException;
7+
import org.openapijsonschematools.client.schemas.SetMaker;
78
import org.openapijsonschematools.client.schemas.validation.EnumValidator;
89
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
910
import org.openapijsonschematools.client.schemas.validation.JsonSchemaFactory;
@@ -30,7 +31,7 @@ public EnumWith1DoesNotMatchTrue1() {
3031
Float.class,
3132
Double.class
3233
))),
33-
new KeywordEntry("enum", new EnumValidator(Set.of(
34+
new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(
3435
1
3536
)))
3637
)));

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Set;
55
import org.openapijsonschematools.client.configurations.SchemaConfiguration;
66
import org.openapijsonschematools.client.exceptions.ValidationException;
7+
import org.openapijsonschematools.client.schemas.SetMaker;
78
import org.openapijsonschematools.client.schemas.validation.EnumValidator;
89
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
910
import org.openapijsonschematools.client.schemas.validation.JsonSchemaFactory;
@@ -27,7 +28,7 @@ public EnumWithEscapedCharacters1() {
2728
new KeywordEntry("type", new TypeValidator(Set.of(
2829
String.class
2930
))),
30-
new KeywordEntry("enum", new EnumValidator(Set.of(
31+
new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(
3132
"foo\nbar",
3233
"foo\rbar"
3334
)))

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Set;
55
import org.openapijsonschematools.client.configurations.SchemaConfiguration;
66
import org.openapijsonschematools.client.exceptions.ValidationException;
7+
import org.openapijsonschematools.client.schemas.SetMaker;
78
import org.openapijsonschematools.client.schemas.validation.EnumValidator;
89
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
910
import org.openapijsonschematools.client.schemas.validation.JsonSchemaFactory;
@@ -25,7 +26,7 @@ public static class EnumWithFalseDoesNotMatch01 extends JsonSchema {
2526
public EnumWithFalseDoesNotMatch01() {
2627
super(new LinkedHashMap<>(Map.ofEntries(
2728
new KeywordEntry("type", new TypeValidator(Set.of(Boolean.class))),
28-
new KeywordEntry("enum", new EnumValidator(Set.of(
29+
new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(
2930
false
3031
)))
3132
)));

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Set;
55
import org.openapijsonschematools.client.configurations.SchemaConfiguration;
66
import org.openapijsonschematools.client.exceptions.ValidationException;
7+
import org.openapijsonschematools.client.schemas.SetMaker;
78
import org.openapijsonschematools.client.schemas.validation.EnumValidator;
89
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
910
import org.openapijsonschematools.client.schemas.validation.JsonSchemaFactory;
@@ -25,7 +26,7 @@ public static class EnumWithTrueDoesNotMatch11 extends JsonSchema {
2526
public EnumWithTrueDoesNotMatch11() {
2627
super(new LinkedHashMap<>(Map.ofEntries(
2728
new KeywordEntry("type", new TypeValidator(Set.of(Boolean.class))),
28-
new KeywordEntry("enum", new EnumValidator(Set.of(
29+
new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(
2930
true
3031
)))
3132
)));

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Set;
55
import org.openapijsonschematools.client.configurations.SchemaConfiguration;
66
import org.openapijsonschematools.client.exceptions.ValidationException;
7+
import org.openapijsonschematools.client.schemas.SetMaker;
78
import org.openapijsonschematools.client.schemas.validation.EnumValidator;
89
import org.openapijsonschematools.client.schemas.validation.FrozenList;
910
import org.openapijsonschematools.client.schemas.validation.FrozenMap;
@@ -26,7 +27,7 @@ public Foo() {
2627
new KeywordEntry("type", new TypeValidator(Set.of(
2728
String.class
2829
))),
29-
new KeywordEntry("enum", new EnumValidator(Set.of(
30+
new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(
3031
"foo"
3132
)))
3233
)));
@@ -42,7 +43,7 @@ public Bar() {
4243
new KeywordEntry("type", new TypeValidator(Set.of(
4344
String.class
4445
))),
45-
new KeywordEntry("enum", new EnumValidator(Set.of(
46+
new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(
4647
"bar"
4748
)))
4849
)));

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Set;
55
import org.openapijsonschematools.client.configurations.SchemaConfiguration;
66
import org.openapijsonschematools.client.exceptions.ValidationException;
7+
import org.openapijsonschematools.client.schemas.SetMaker;
78
import org.openapijsonschematools.client.schemas.validation.EnumValidator;
89
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
910
import org.openapijsonschematools.client.schemas.validation.JsonSchemaFactory;
@@ -27,7 +28,7 @@ public NulCharactersInStrings1() {
2728
new KeywordEntry("type", new TypeValidator(Set.of(
2829
String.class
2930
))),
30-
new KeywordEntry("enum", new EnumValidator(Set.of(
31+
new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(
3132
"hello\0there"
3233
)))
3334
)));

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Set;
55
import org.openapijsonschematools.client.configurations.SchemaConfiguration;
66
import org.openapijsonschematools.client.exceptions.ValidationException;
7+
import org.openapijsonschematools.client.schemas.SetMaker;
78
import org.openapijsonschematools.client.schemas.validation.EnumValidator;
89
import org.openapijsonschematools.client.schemas.validation.JsonSchema;
910
import org.openapijsonschematools.client.schemas.validation.JsonSchemaFactory;
@@ -30,7 +31,7 @@ public SimpleEnumValidation1() {
3031
Float.class,
3132
Double.class
3233
))),
33-
new KeywordEntry("enum", new EnumValidator(Set.of(
34+
new KeywordEntry("enum", new EnumValidator(SetMaker.makeSet(
3435
1,
3536
2,
3637
3

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
/**
77
* A builder for maps that allows in null values
8-
* Schema tests need this
9-
* Future schema doc code samples will need it
8+
* Schema tests + doc code samples need it
109
*/
1110
public class MapMaker {
1211
@SafeVarargs

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

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package org.openapijsonschematools.client.schemas;
2+
3+
import java.util.HashSet;
4+
import java.util.Set;
5+
6+
/**
7+
* A builder for maps that allows in null values
8+
* Schema tests + doc code samples need it
9+
*/
10+
public class SetMaker {
11+
@SafeVarargs
12+
@SuppressWarnings("varargs")
13+
public static <E> Set<E> makeSet(E... items) {
14+
Set<E> set = new HashSet<>();
15+
for (E item : items) {
16+
set.add(item);
17+
}
18+
return set;
19+
}
20+
}

0 commit comments

Comments
 (0)