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

Commit 0047d25

Browse files
authored
Java, tests java clients in CI (#308)
* Updates ci files * Changes testJavaClientSamples to use docker image * Fixes pattern typo, adds java version to workflow name * Samples regen with java regex escaping fix * Fixes docs for schema pattern info in java
1 parent 36a7ccf commit 0047d25

14 files changed

Lines changed: 57 additions & 27 deletions

File tree

.circleci/config.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,17 @@ jobs:
146146
- checkout
147147
- command_docker_build_and_test:
148148
jobId: "testPythonClientSamples"
149+
testJava17ClientSamples:
150+
docker:
151+
- image: cimg/openjdk:17.0.9
152+
working_directory: ~/OpenAPITools/openapi-json-schema-generator
153+
shell: /bin/bash --login
154+
environment:
155+
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
156+
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
157+
steps:
158+
- command_build_and_test:
159+
jobId: "testJava17ClientSamples"
149160
workflows:
150161
version: 2
151162
build:
@@ -154,3 +165,4 @@ workflows:
154165
- mvnCleanInstall
155166
- testPython38ClientSamples
156167
- testPython39ClientSamples
168+
- testJava17ClientSamples

.circleci/parallel.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ elif [ "$JOB_ID" = "testPythonClientSamples" ]; then
2525
(cd samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python && make test)
2626
(cd samples/client/openapi_features/security/python && make test)
2727

28+
elif [ "$JOB_ID" = "testJava17ClientSamples" ]; then
29+
echo "Running job $JOB_ID ..."
30+
java -version
31+
32+
(cd samples/client/petstore/java && mvn test)
33+
(cd samples/client/3_0_3_unit_test/java && mvn test)
34+
2835
else
2936
echo "Running job $JOB_ID"
3037

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ src/main/java/org/openapijsonschematools/schemas/validation/ItemsValidator.java
214214
src/main/java/org/openapijsonschematools/schemas/validation/JsonSchema.java
215215
src/main/java/org/openapijsonschematools/schemas/validation/KeywordEntry.java
216216
src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java
217+
src/main/java/org/openapijsonschematools/schemas/validation/LengthValidator.java
217218
src/main/java/org/openapijsonschematools/schemas/validation/MaxItemsValidator.java
218219
src/main/java/org/openapijsonschematools/schemas/validation/MaxLengthValidator.java
219220
src/main/java/org/openapijsonschematools/schemas/validation/MaxPropertiesValidator.java

samples/client/petstore/java/.openapi-generator/FILES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -678,6 +678,7 @@ src/main/java/org/openapijsonschematools/schemas/validation/ItemsValidator.java
678678
src/main/java/org/openapijsonschematools/schemas/validation/JsonSchema.java
679679
src/main/java/org/openapijsonschematools/schemas/validation/KeywordEntry.java
680680
src/main/java/org/openapijsonschematools/schemas/validation/KeywordValidator.java
681+
src/main/java/org/openapijsonschematools/schemas/validation/LengthValidator.java
681682
src/main/java/org/openapijsonschematools/schemas/validation/MaxItemsValidator.java
682683
src/main/java/org/openapijsonschematools/schemas/validation/MaxLengthValidator.java
683684
src/main/java/org/openapijsonschematools/schemas/validation/MaxPropertiesValidator.java

samples/client/petstore/java/docs/components/schemas/Apple.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ A schema class that validates payloads
6060
### Field Summary
6161
| Modifier and Type | Field and Description |
6262
| ----------------- | ---------------------- |
63-
| 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("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"^[A-Z\s]*$",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Pattern.CASE_INSENSITIVE,<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
63+
| 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("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"^[A-Z\\s]*$",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Pattern.CASE_INSENSITIVE<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
6464

6565
### Method Summary
6666
| Modifier and Type | Method and Description |
@@ -75,7 +75,7 @@ A schema class that validates payloads
7575
### Field Summary
7676
| Modifier and Type | Field and Description |
7777
| ----------------- | ---------------------- |
78-
| 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("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"^[a-zA-Z\s]*$"<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
78+
| 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("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"^[a-zA-Z\\s]*$"<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
7979

8080
### Method Summary
8181
| Modifier and Type | Method and Description |

samples/client/petstore/java/docs/components/schemas/FormatTest.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ A string starting with &#x27;image_&#x27; (case insensitive) and one to three di
125125
### Field Summary
126126
| Modifier and Type | Field and Description |
127127
| ----------------- | ---------------------- |
128-
| 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("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"^image_\d{1,3}$",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Pattern.CASE_INSENSITIVE,<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
128+
| 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("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"^image_\\d{1,3}$",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Pattern.CASE_INSENSITIVE<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
129129

130130
### Method Summary
131131
| Modifier and Type | Method and Description |
@@ -143,7 +143,7 @@ A string that is a 10 digit number. Can have leading zeros.
143143
### Field Summary
144144
| Modifier and Type | Field and Description |
145145
| ----------------- | ---------------------- |
146-
| 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("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"^\d{10}$"<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
146+
| 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("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"^\\d{10}$"<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
147147

148148
### Method Summary
149149
| Modifier and Type | Method and Description |
@@ -225,7 +225,7 @@ A schema class that validates payloads
225225
### Field Summary
226226
| Modifier and Type | Field and Description |
227227
| ----------------- | ---------------------- |
228-
| 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("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"[a-z]",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Pattern.CASE_INSENSITIVE,<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
228+
| 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("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"[a-z]",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Pattern.CASE_INSENSITIVE<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
229229

230230
### Method Summary
231231
| Modifier and Type | Method and Description |

samples/client/petstore/java/docs/paths/fake/post/requestbody/content/applicationxwwwformurlencoded/Schema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ None
191191
### Field Summary
192192
| Modifier and Type | Field and Description |
193193
| ----------------- | ---------------------- |
194-
| 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("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"[a-z]",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Pattern.CASE_INSENSITIVE,<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
194+
| 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("pattern", new PatternValidator(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"[a-z]",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Pattern.CASE_INSENSITIVE<br>&nbsp;&nbsp;&nbsp;&nbsp;)))<br>)); |
195195

196196
### Method Summary
197197
| Modifier and Type | Method and Description |

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/Apple.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static class Cultivar extends JsonSchema {
2525
String.class
2626
))),
2727
new KeywordEntry("pattern", new PatternValidator(Pattern.compile(
28-
"^[a-zA-Z\s]*$"
28+
"^[a-zA-Z\\s]*$"
2929
)))
3030
));
3131
public static String validate(String arg, SchemaConfiguration configuration) throws ValidationException {
@@ -39,8 +39,8 @@ public static class Origin extends JsonSchema {
3939
String.class
4040
))),
4141
new KeywordEntry("pattern", new PatternValidator(Pattern.compile(
42-
"^[A-Z\s]*$",
43-
Pattern.CASE_INSENSITIVE,
42+
"^[A-Z\\s]*$",
43+
Pattern.CASE_INSENSITIVE
4444
)))
4545
));
4646
public static String validate(String arg, SchemaConfiguration configuration) throws ValidationException {

samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/schemas/FormatTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public static class StringSchema extends JsonSchema {
207207
))),
208208
new KeywordEntry("pattern", new PatternValidator(Pattern.compile(
209209
"[a-z]",
210-
Pattern.CASE_INSENSITIVE,
210+
Pattern.CASE_INSENSITIVE
211211
)))
212212
));
213213
public static String validate(String arg, SchemaConfiguration configuration) throws ValidationException {
@@ -255,7 +255,7 @@ public static class PatternWithDigits extends JsonSchema {
255255
String.class
256256
))),
257257
new KeywordEntry("pattern", new PatternValidator(Pattern.compile(
258-
"^\d{10}$"
258+
"^\\d{10}$"
259259
)))
260260
));
261261
public static String validate(String arg, SchemaConfiguration configuration) throws ValidationException {
@@ -269,8 +269,8 @@ public static class PatternWithDigitsAndDelimiter extends JsonSchema {
269269
String.class
270270
))),
271271
new KeywordEntry("pattern", new PatternValidator(Pattern.compile(
272-
"^image_\d{1,3}$",
273-
Pattern.CASE_INSENSITIVE,
272+
"^image_\\d{1,3}$",
273+
Pattern.CASE_INSENSITIVE
274274
)))
275275
));
276276
public static String validate(String arg, SchemaConfiguration configuration) throws ValidationException {

samples/client/petstore/java/src/main/java/org/openapijsonschematools/paths/fake/post/requestbody/content/applicationxwwwformurlencoded/Schema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public static class StringSchema extends JsonSchema {
156156
))),
157157
new KeywordEntry("pattern", new PatternValidator(Pattern.compile(
158158
"[a-z]",
159-
Pattern.CASE_INSENSITIVE,
159+
Pattern.CASE_INSENSITIVE
160160
)))
161161
));
162162
public static String validate(String arg, SchemaConfiguration configuration) throws ValidationException {

0 commit comments

Comments
 (0)