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

Java, adds and uses exception types #298

Merged
spacether merged 5 commits into from
Nov 25, 2023
Merged

Java, adds and uses exception types #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d93c81d
Adds exceptions
spacether Nov 25, 2023
cbc7d0d
Marks throws in json schema classes
spacether Nov 25, 2023
e845199
Adds and uses InvalidTypeException
spacether Nov 25, 2023
56c923d
Adds throws to all autogen validate methods
spacether Nov 25, 2023
ff7c06e
Adds throws to of method of array and object output types
spacether Nov 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions samples/client/petstore/java/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,11 @@ src/main/java/org/openapijsonschematools/components/schemas/Whale.java
src/main/java/org/openapijsonschematools/components/schemas/Zebra.java
src/main/java/org/openapijsonschematools/configurations/JsonSchemaKeywordFlags.java
src/main/java/org/openapijsonschematools/configurations/SchemaConfiguration.java
src/main/java/org/openapijsonschematools/exceptions/BaseException.java
src/main/java/org/openapijsonschematools/exceptions/InvalidAdditionalPropertyException.java
src/main/java/org/openapijsonschematools/exceptions/InvalidTypeException.java
src/main/java/org/openapijsonschematools/exceptions/UnsetPropertyException.java
src/main/java/org/openapijsonschematools/exceptions/ValidationException.java
src/main/java/org/openapijsonschematools/paths/anotherfakedummy/patch/responses/response200/content/applicationjson/Schema.java
src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/HeaderParameters.java
src/main/java/org/openapijsonschematools/paths/commonparamsubdir/delete/PathParameters.java
Expand Down
5 changes: 3 additions & 2 deletions ...apijsonschematools/components/requestbodies/userarray/content/applicationjson/Schema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.Set;
import org.openapijsonschematools.components.schemas.User;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.exceptions.ValidationException;
import org.openapijsonschematools.schemas.validation.FrozenList;
import org.openapijsonschematools.schemas.validation.ItemsValidator;
import org.openapijsonschematools.schemas.validation.JsonSchema;
Expand All @@ -22,7 +23,7 @@ public static class SchemaList extends FrozenList<User.UserMap> {

super(m);
}
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) {
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) throws ValidationException {


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

return new SchemaList(arg);
}
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) {
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) throws ValidationException {


return JsonSchema.validate(Schema1.class, arg, configuration);
Expand Down
5 changes: 3 additions & 2 deletions .../main/java/org/openapijsonschematools/components/responses/headerswithnobody/Headers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Set;
import org.openapijsonschematools.components.responses.headerswithnobody.headers.location.LocationSchema;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.exceptions.ValidationException;
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.validation.AdditionalPropertiesValidator;
Expand Down Expand Up @@ -33,7 +34,7 @@ public static class HeadersMap extends FrozenMap<String, String> {
public static final Set<String> optionalKeys = Set.of(
"location"
);
public static HeadersMap of(Map<String, String> arg, SchemaConfiguration configuration) {
public static HeadersMap of(Map<String, String> arg, SchemaConfiguration configuration) throws ValidationException {

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

return new HeadersMap(arg);
}
public static HeadersMap validate(Map<String, String> arg, SchemaConfiguration configuration) {
public static HeadersMap validate(Map<String, String> arg, SchemaConfiguration configuration) throws ValidationException {

return JsonSchema.validate(Headers1.class, arg, configuration);
}
Expand Down
5 changes: 3 additions & 2 deletions ...s/components/responses/successfulxmlandjsonarrayofpet/content/applicationjson/Schema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.openapijsonschematools.components.schemas.Pet;
import org.openapijsonschematools.components.schemas.RefPet;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.exceptions.ValidationException;
import org.openapijsonschematools.schemas.validation.FrozenList;
import org.openapijsonschematools.schemas.validation.ItemsValidator;
import org.openapijsonschematools.schemas.validation.JsonSchema;
Expand All @@ -23,7 +24,7 @@ public static class SchemaList extends FrozenList<Pet.PetMap> {

super(m);
}
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) {
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) throws ValidationException {


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

return new SchemaList(arg);
}
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) {
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) throws ValidationException {


return JsonSchema.validate(Schema1.class, arg, configuration);
Expand Down
5 changes: 3 additions & 2 deletions ...ls/components/responses/successfulxmlandjsonarrayofpet/content/applicationxml/Schema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.Set;
import org.openapijsonschematools.components.schemas.Pet;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.exceptions.ValidationException;
import org.openapijsonschematools.schemas.validation.FrozenList;
import org.openapijsonschematools.schemas.validation.ItemsValidator;
import org.openapijsonschematools.schemas.validation.JsonSchema;
Expand All @@ -22,7 +23,7 @@ public static class SchemaList extends FrozenList<Pet.PetMap> {

super(m);
}
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) {
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) throws ValidationException {


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

return new SchemaList(arg);
}
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) {
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) throws ValidationException {


return JsonSchema.validate(Schema1.class, arg, configuration);
Expand Down
5 changes: 3 additions & 2 deletions ...rg/openapijsonschematools/components/responses/successinlinecontentandheader/Headers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Set;
import org.openapijsonschematools.components.responses.successinlinecontentandheader.headers.someheader.SomeHeaderSchema;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.exceptions.ValidationException;
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.validation.AdditionalPropertiesValidator;
Expand Down Expand Up @@ -33,7 +34,7 @@ public static class HeadersMap extends FrozenMap<String, String> {
public static final Set<String> optionalKeys = Set.of(
"someHeader"
);
public static HeadersMap of(Map<String, String> arg, SchemaConfiguration configuration) {
public static HeadersMap of(Map<String, String> arg, SchemaConfiguration configuration) throws ValidationException {

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

return new HeadersMap(arg);
}
public static HeadersMap validate(Map<String, String> arg, SchemaConfiguration configuration) {
public static HeadersMap validate(Map<String, String> arg, SchemaConfiguration configuration) throws ValidationException {

return JsonSchema.validate(Headers1.class, arg, configuration);
}
Expand Down
5 changes: 3 additions & 2 deletions ...ls/components/responses/successinlinecontentandheader/content/applicationjson/Schema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.Map;
import java.util.Set;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.exceptions.ValidationException;
import org.openapijsonschematools.schemas.Int32JsonSchema;
import org.openapijsonschematools.schemas.validation.AdditionalPropertiesValidator;
import org.openapijsonschematools.schemas.validation.FrozenMap;
Expand All @@ -26,7 +27,7 @@ public static class SchemaMap extends FrozenMap<String, Integer> {
}
public static final Set<String> requiredKeys = Set.of();
public static final Set<String> optionalKeys = Set.of();
public static SchemaMap of(Map<String, Integer> arg, SchemaConfiguration configuration) {
public static SchemaMap of(Map<String, Integer> arg, SchemaConfiguration configuration) throws ValidationException {

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

return new SchemaMap(arg);
}
public static SchemaMap validate(Map<String, Integer> arg, SchemaConfiguration configuration) {
public static SchemaMap validate(Map<String, Integer> arg, SchemaConfiguration configuration) throws ValidationException {

return JsonSchema.validate(Schema1.class, arg, configuration);
}
Expand Down
5 changes: 3 additions & 2 deletions ...a/org/openapijsonschematools/components/responses/successwithjsonapiresponse/Headers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.openapijsonschematools.components.headers.stringheader.StringHeaderSchema;
import org.openapijsonschematools.components.schemas.StringWithValidation;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.exceptions.ValidationException;
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.validation.AdditionalPropertiesValidator;
Expand Down Expand Up @@ -42,7 +43,7 @@ public static class HeadersMap extends FrozenMap<String, Object> {
public static final Set<String> optionalKeys = Set.of(
"numberHeader"
);
public static HeadersMap of(Map<String, Object> arg, SchemaConfiguration configuration) {
public static HeadersMap of(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {

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

return new HeadersMap(arg);
}
public static HeadersMap validate(Map<String, Object> arg, SchemaConfiguration configuration) {
public static HeadersMap validate(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {

return JsonSchema.validate(Headers1.class, arg, configuration);
}
Expand Down
5 changes: 3 additions & 2 deletions ...java/src/main/java/org/openapijsonschematools/components/schemas/AbstractStepMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.Map;
import java.util.Set;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.exceptions.ValidationException;
import org.openapijsonschematools.schemas.StringJsonSchema;
import org.openapijsonschematools.schemas.validation.FrozenMap;
import org.openapijsonschematools.schemas.validation.JsonSchema;
Expand Down Expand Up @@ -32,7 +33,7 @@ public static class AbstractStepMessageMap extends FrozenMap<String, Object> {
"sequenceNumber"
);
public static final Set<String> optionalKeys = Set.of();
public static AbstractStepMessageMap of(Map<String, Object> arg, SchemaConfiguration configuration) {
public static AbstractStepMessageMap of(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {

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

return new AbstractStepMessageMap(arg);
}
public static AbstractStepMessageMap validate(Map<String, Object> arg, SchemaConfiguration configuration) {
public static AbstractStepMessageMap validate(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {

return JsonSchema.validate(AbstractStepMessage1.class, arg, configuration);
}
Expand Down
Loading