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

Commit bccd702

Browse files
spacetherspacether
authored
Java, adds and uses exception types (#298)
* Adds exceptions * Marks throws in json schema classes * Adds and uses InvalidTypeException * Adds throws to all autogen validate methods * Adds throws to of method of array and object output types
1 parent 2551e95 commit bccd702

File tree

300 files changed

+1823
-1439
lines changed

Some content is hidden

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

300 files changed

+1823
-1439
lines changed

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

+5
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,11 @@ src/main/java/org/openapijsonschematools/components/schemas/Whale.java
161161
src/main/java/org/openapijsonschematools/components/schemas/Zebra.java
162162
src/main/java/org/openapijsonschematools/configurations/JsonSchemaKeywordFlags.java
163163
src/main/java/org/openapijsonschematools/configurations/SchemaConfiguration.java
164+
src/main/java/org/openapijsonschematools/exceptions/BaseException.java
165+
src/main/java/org/openapijsonschematools/exceptions/InvalidAdditionalPropertyException.java
166+
src/main/java/org/openapijsonschematools/exceptions/InvalidTypeException.java
167+
src/main/java/org/openapijsonschematools/exceptions/UnsetPropertyException.java
168+
src/main/java/org/openapijsonschematools/exceptions/ValidationException.java
164169
src/main/java/org/openapijsonschematools/paths/anotherfakedummy/patch/responses/response200/content/applicationjson/Schema.java
165170
src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/HeaderParameters.java
166171
src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/PathParameters.java

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/requestbodies/userarray/content/applicationjson/Schema.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Set;
66
import org.openapijsonschematools.components.schemas.User;
77
import org.openapijsonschematools.configurations.SchemaConfiguration;
8+
import org.openapijsonschematools.exceptions.ValidationException;
89
import org.openapijsonschematools.schemas.validation.FrozenList;
910
import org.openapijsonschematools.schemas.validation.ItemsValidator;
1011
import org.openapijsonschematools.schemas.validation.JsonSchema;
@@ -22,7 +23,7 @@ public static class SchemaList extends FrozenList<User.UserMap> {
2223

2324
super(m);
2425
}
25-
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) {
26+
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) throws ValidationException {
2627

2728

2829
return Schema1.validate(arg, configuration);
@@ -39,7 +40,7 @@ protected static SchemaList getListOutputInstance(FrozenList<User.UserMap> arg)
3940

4041
return new SchemaList(arg);
4142
}
42-
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) {
43+
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) throws ValidationException {
4344

4445

4546
return JsonSchema.validate(Schema1.class, arg, configuration);

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/headerswithnobody/Headers.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Set;
55
import org.openapijsonschematools.components.responses.headerswithnobody.headers.location.LocationSchema;
66
import org.openapijsonschematools.configurations.SchemaConfiguration;
7+
import org.openapijsonschematools.exceptions.ValidationException;
78
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
89
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
910
import org.openapijsonschematools.schemas.validation.AdditionalPropertiesValidator;
@@ -33,7 +34,7 @@ public static class HeadersMap extends FrozenMap<String, String> {
3334
public static final Set<String> optionalKeys = Set.of(
3435
"location"
3536
);
36-
public static HeadersMap of(Map<String, String> arg, SchemaConfiguration configuration) {
37+
public static HeadersMap of(Map<String, String> arg, SchemaConfiguration configuration) throws ValidationException {
3738

3839
return Headers1.validate(arg, configuration);
3940
}
@@ -58,7 +59,7 @@ protected static HeadersMap getMapOutputInstance(FrozenMap<String, String> arg)
5859

5960
return new HeadersMap(arg);
6061
}
61-
public static HeadersMap validate(Map<String, String> arg, SchemaConfiguration configuration) {
62+
public static HeadersMap validate(Map<String, String> arg, SchemaConfiguration configuration) throws ValidationException {
6263

6364
return JsonSchema.validate(Headers1.class, arg, configuration);
6465
}

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successfulxmlandjsonarrayofpet/content/applicationjson/Schema.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.openapijsonschematools.components.schemas.Pet;
77
import org.openapijsonschematools.components.schemas.RefPet;
88
import org.openapijsonschematools.configurations.SchemaConfiguration;
9+
import org.openapijsonschematools.exceptions.ValidationException;
910
import org.openapijsonschematools.schemas.validation.FrozenList;
1011
import org.openapijsonschematools.schemas.validation.ItemsValidator;
1112
import org.openapijsonschematools.schemas.validation.JsonSchema;
@@ -23,7 +24,7 @@ public static class SchemaList extends FrozenList<Pet.PetMap> {
2324

2425
super(m);
2526
}
26-
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) {
27+
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) throws ValidationException {
2728

2829

2930
return Schema1.validate(arg, configuration);
@@ -40,7 +41,7 @@ protected static SchemaList getListOutputInstance(FrozenList<Pet.PetMap> arg) {
4041

4142
return new SchemaList(arg);
4243
}
43-
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) {
44+
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) throws ValidationException {
4445

4546

4647
return JsonSchema.validate(Schema1.class, arg, configuration);

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successfulxmlandjsonarrayofpet/content/applicationxml/Schema.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Set;
66
import org.openapijsonschematools.components.schemas.Pet;
77
import org.openapijsonschematools.configurations.SchemaConfiguration;
8+
import org.openapijsonschematools.exceptions.ValidationException;
89
import org.openapijsonschematools.schemas.validation.FrozenList;
910
import org.openapijsonschematools.schemas.validation.ItemsValidator;
1011
import org.openapijsonschematools.schemas.validation.JsonSchema;
@@ -22,7 +23,7 @@ public static class SchemaList extends FrozenList<Pet.PetMap> {
2223

2324
super(m);
2425
}
25-
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) {
26+
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) throws ValidationException {
2627

2728

2829
return Schema1.validate(arg, configuration);
@@ -39,7 +40,7 @@ protected static SchemaList getListOutputInstance(FrozenList<Pet.PetMap> arg) {
3940

4041
return new SchemaList(arg);
4142
}
42-
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) {
43+
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) throws ValidationException {
4344

4445

4546
return JsonSchema.validate(Schema1.class, arg, configuration);

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/Headers.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Set;
55
import org.openapijsonschematools.components.responses.successinlinecontentandheader.headers.someheader.SomeHeaderSchema;
66
import org.openapijsonschematools.configurations.SchemaConfiguration;
7+
import org.openapijsonschematools.exceptions.ValidationException;
78
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
89
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
910
import org.openapijsonschematools.schemas.validation.AdditionalPropertiesValidator;
@@ -33,7 +34,7 @@ public static class HeadersMap extends FrozenMap<String, String> {
3334
public static final Set<String> optionalKeys = Set.of(
3435
"someHeader"
3536
);
36-
public static HeadersMap of(Map<String, String> arg, SchemaConfiguration configuration) {
37+
public static HeadersMap of(Map<String, String> arg, SchemaConfiguration configuration) throws ValidationException {
3738

3839
return Headers1.validate(arg, configuration);
3940
}
@@ -58,7 +59,7 @@ protected static HeadersMap getMapOutputInstance(FrozenMap<String, String> arg)
5859

5960
return new HeadersMap(arg);
6061
}
61-
public static HeadersMap validate(Map<String, String> arg, SchemaConfiguration configuration) {
62+
public static HeadersMap validate(Map<String, String> arg, SchemaConfiguration configuration) throws ValidationException {
6263

6364
return JsonSchema.validate(Headers1.class, arg, configuration);
6465
}

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.Map;
44
import java.util.Set;
55
import org.openapijsonschematools.configurations.SchemaConfiguration;
6+
import org.openapijsonschematools.exceptions.ValidationException;
67
import org.openapijsonschematools.schemas.Int32JsonSchema;
78
import org.openapijsonschematools.schemas.validation.AdditionalPropertiesValidator;
89
import org.openapijsonschematools.schemas.validation.FrozenMap;
@@ -26,7 +27,7 @@ public static class SchemaMap extends FrozenMap<String, Integer> {
2627
}
2728
public static final Set<String> requiredKeys = Set.of();
2829
public static final Set<String> optionalKeys = Set.of();
29-
public static SchemaMap of(Map<String, Integer> arg, SchemaConfiguration configuration) {
30+
public static SchemaMap of(Map<String, Integer> arg, SchemaConfiguration configuration) throws ValidationException {
3031

3132
return Schema1.validate(arg, configuration);
3233
}
@@ -47,7 +48,7 @@ protected static SchemaMap getMapOutputInstance(FrozenMap<String, Integer> arg)
4748

4849
return new SchemaMap(arg);
4950
}
50-
public static SchemaMap validate(Map<String, Integer> arg, SchemaConfiguration configuration) {
51+
public static SchemaMap validate(Map<String, Integer> arg, SchemaConfiguration configuration) throws ValidationException {
5152

5253
return JsonSchema.validate(Schema1.class, arg, configuration);
5354
}

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/components/responses/successwithjsonapiresponse/Headers.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.openapijsonschematools.components.headers.stringheader.StringHeaderSchema;
88
import org.openapijsonschematools.components.schemas.StringWithValidation;
99
import org.openapijsonschematools.configurations.SchemaConfiguration;
10+
import org.openapijsonschematools.exceptions.ValidationException;
1011
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
1112
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
1213
import org.openapijsonschematools.schemas.validation.AdditionalPropertiesValidator;
@@ -42,7 +43,7 @@ public static class HeadersMap extends FrozenMap<String, Object> {
4243
public static final Set<String> optionalKeys = Set.of(
4344
"numberHeader"
4445
);
45-
public static HeadersMap of(Map<String, Object> arg, SchemaConfiguration configuration) {
46+
public static HeadersMap of(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {
4647

4748
return Headers1.validate(arg, configuration);
4849
}
@@ -90,7 +91,7 @@ protected static HeadersMap getMapOutputInstance(FrozenMap<String, Object> arg)
9091

9192
return new HeadersMap(arg);
9293
}
93-
public static HeadersMap validate(Map<String, Object> arg, SchemaConfiguration configuration) {
94+
public static HeadersMap validate(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {
9495

9596
return JsonSchema.validate(Headers1.class, arg, configuration);
9697
}

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.Map;
44
import java.util.Set;
55
import org.openapijsonschematools.configurations.SchemaConfiguration;
6+
import org.openapijsonschematools.exceptions.ValidationException;
67
import org.openapijsonschematools.schemas.StringJsonSchema;
78
import org.openapijsonschematools.schemas.validation.FrozenMap;
89
import org.openapijsonschematools.schemas.validation.JsonSchema;
@@ -32,7 +33,7 @@ public static class AbstractStepMessageMap extends FrozenMap<String, Object> {
3233
"sequenceNumber"
3334
);
3435
public static final Set<String> optionalKeys = Set.of();
35-
public static AbstractStepMessageMap of(Map<String, Object> arg, SchemaConfiguration configuration) {
36+
public static AbstractStepMessageMap of(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {
3637

3738
return AbstractStepMessage1.validate(arg, configuration);
3839
}
@@ -82,7 +83,7 @@ protected static AbstractStepMessageMap getMapOutputInstance(FrozenMap<String, O
8283

8384
return new AbstractStepMessageMap(arg);
8485
}
85-
public static AbstractStepMessageMap validate(Map<String, Object> arg, SchemaConfiguration configuration) {
86+
public static AbstractStepMessageMap validate(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {
8687

8788
return JsonSchema.validate(AbstractStepMessage1.class, arg, configuration);
8889
}

0 commit comments

Comments
 (0)