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

Kotlin code improvements, schemas shortened, json schema keyword enum used #437

Merged
merged 10 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ src/main/kotlin/org/openapijsonschematools/client/components/schemas/Uniqueitems
src/main/kotlin/org/openapijsonschematools/client/components/schemas/UriFormat.kt
src/main/kotlin/org/openapijsonschematools/client/components/schemas/UriReferenceFormat.kt
src/main/kotlin/org/openapijsonschematools/client/components/schemas/UriTemplateFormat.kt
src/main/kotlin/org/openapijsonschematools/client/configurations/JsonSchemaKeywordFlags.kt
src/main/kotlin/org/openapijsonschematools/client/configurations/JsonSchemaKeyword.kt
src/main/kotlin/org/openapijsonschematools/client/configurations/SchemaConfiguration.kt
src/main/kotlin/org/openapijsonschematools/client/exceptions/BaseException.kt
src/main/kotlin/org/openapijsonschematools/client/exceptions/InvalidAdditionalPropertyException.kt
Expand Down Expand Up @@ -234,7 +234,7 @@ src/main/kotlin/org/openapijsonschematools/client/schemas/validation/IntegerValu
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/ItemsValidator.kt
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/JsonSchema.kt
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/JsonSchemaFactory.kt
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.kt
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/JsonValue.kt
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/KeywordEntry.kt
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/KeywordValidator.kt
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/LengthValidator.kt
Expand Down Expand Up @@ -283,7 +283,6 @@ src/main/kotlin/org/openapijsonschematools/client/servers/Server.kt
src/main/kotlin/org/openapijsonschematools/client/servers/ServerProvider.kt
src/main/kotlin/org/openapijsonschematools/client/servers/ServerWithVariables.kt
src/main/kotlin/org/openapijsonschematools/client/servers/ServerWithoutVariables.kt
src/test/kotlin/org/openapijsonschematools/client/configurations/JsonSchemaKeywordFlagsTest.kt
src/test/kotlin/org/openapijsonschematools/client/schemas/AnyTypeSchemaTest.kt
src/test/kotlin/org/openapijsonschematools/client/schemas/ArrayTypeSchemaTest.kt
src/test/kotlin/org/openapijsonschematools/client/schemas/BooleanSchemaTest.kt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.AdditionalpropertiesAllowsASchemaWhichShouldValidate

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// Map validation
val validatedPayload: AdditionalpropertiesAllowsASchemaWhichShouldValidate.AdditionalpropertiesAllowsASchemaWhichShouldValidateMap =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.AdditionalpropertiesCanExistByItself

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// Map validation
val validatedPayload: AdditionalpropertiesCanExistByItself.AdditionalpropertiesCanExistByItselfMap =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ A schema class that validates payloads
| Modifier and Type | Field and Description |
| ----------------- | ---------------------- |
| Class<? extends JsonSchema> | additionalProperties = [AdditionalProperties::class.java](#additionalproperties) |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0)<br>;)<br> |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0)<br>)<br> |

### Method Summary
| Modifier and Type | Method and Description |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ A schema class that validates payloads
### Field Summary
| Modifier and Type | Field and Description |
| ----------------- | ---------------------- |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema1::class.java](#schema1)<br>;)<br> |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema1::class.java](#schema1)<br>)<br> |

### Method Summary
| Modifier and Type | Method and Description |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ A schema class that validates payloads
### Field Summary
| Modifier and Type | Field and Description |
| ----------------- | ---------------------- |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema02::class.java](#schema02)<br>;)<br> |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema02::class.java](#schema02)<br>)<br> |
| List<Class<? extends JsonSchema>> | anyOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema01::class.java](#schema01)<br>)<br> |
| List<Class<? extends JsonSchema>> | oneOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0)<br>))<br> |

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ A schema class that validates payloads
### Field Summary
| Modifier and Type | Field and Description |
| ----------------- | ---------------------- |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema1::class.java](#schema1)<br>;)<br> |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema1::class.java](#schema1)<br>)<br> |

### Method Summary
| Modifier and Type | Method and Description |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ A schema class that validates payloads
| ----------------- | ---------------------- |
| Map<String, Class<? extends JsonSchema>> | properties = mapOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;"bar" to [Bar::class.java](#bar))<br>)<br> |
| Set<String> | required = setOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;"bar"<br>)<br> |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema1::class.java](#schema1)<br>;)<br> |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema1::class.java](#schema1)<br>)<br> |

### Method Summary
| Modifier and Type | Method and Description |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ A schema class that validates payloads
### Field Summary
| Modifier and Type | Field and Description |
| ----------------- | ---------------------- |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0)<br>;)<br> |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0)<br>)<br> |

### Method Summary
| Modifier and Type | Method and Description |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ A schema class that validates payloads
### Field Summary
| Modifier and Type | Field and Description |
| ----------------- | ---------------------- |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema1::class.java](#schema1)<br>;)<br> |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema1::class.java](#schema1)<br>)<br> |

### Method Summary
| Modifier and Type | Method and Description |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ A schema class that validates payloads
### Field Summary
| Modifier and Type | Field and Description |
| ----------------- | ---------------------- |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema1::class.java](#schema1)<br>;)<br> |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema1::class.java](#schema1)<br>)<br> |

### Method Summary
| Modifier and Type | Method and Description |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ A schema class that validates payloads
### Field Summary
| Modifier and Type | Field and Description |
| ----------------- | ---------------------- |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema1::class.java](#schema1)<br>;)<br> |
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0),<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema1::class.java](#schema1)<br>)<br> |

### Method Summary
| Modifier and Type | Method and Description |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.AnyofWithBaseSchema

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// String validation
val validatedPayload: String = AnyofWithBaseSchema.AnyofWithBaseSchema1.validate(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.ArrayTypeMatchesArrays

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// List validation
val validatedPayload: ArrayTypeMatchesArrays.ArrayTypeMatchesArraysList =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.EnumWith0DoesNotMatchFalse

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// int validation
val validatedPayload: Int = EnumWith0DoesNotMatchFalse.EnumWith0DoesNotMatchFalse1.validate(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.EnumWith1DoesNotMatchTrue

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// int validation
val validatedPayload: Int = EnumWith1DoesNotMatchTrue.EnumWith1DoesNotMatchTrue1.validate(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.EnumWithEscapedCharacters

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// String validation
val validatedPayload: String = EnumWithEscapedCharacters.EnumWithEscapedCharacters1.validate(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.EnumWithFalseDoesNotMatch0

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// boolean validation
val validatedPayload: Boolean = EnumWithFalseDoesNotMatch0.EnumWithFalseDoesNotMatch01.validate(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.EnumWithTrueDoesNotMatch1

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// boolean validation
val validatedPayload: Boolean = EnumWithTrueDoesNotMatch1.EnumWithTrueDoesNotMatch11.validate(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.EnumsInProperties

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// Map validation
val validatedPayload: EnumsInProperties.EnumsInPropertiesMap =
Expand Down Expand Up @@ -187,15 +185,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.EnumsInProperties

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// String validation
val validatedPayload: String = EnumsInProperties.Bar.validate(
Expand Down Expand Up @@ -262,15 +258,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.EnumsInProperties

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// String validation
val validatedPayload: String = EnumsInProperties.Foo.validate(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// int validation
val validatedPayload: Int = InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf1.validate(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,15 +244,13 @@ A schema class that validates payloads

### Code Sample
```
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
import org.openapijsonschematools.client.configurations.SchemaConfiguration
import org.openapijsonschematools.client.exceptions.ValidationException
import org.openapijsonschematools.client.schemas.validation.MapUtils
import org.openapijsonschematools.client.schemas.validation.FrozenList
import org.openapijsonschematools.client.schemas.validation.FrozenMap
import org.openapijsonschematools.client.components.schemas.InvalidStringValueForDefault

val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
val configuration = SchemaConfiguration()

// String validation
val validatedPayload: String = InvalidStringValueForDefault.Bar.validate(
Expand All @@ -266,7 +264,7 @@ val validatedPayload: String = InvalidStringValueForDefault.Bar.validate(
| ----------------- | ---------------------- |
| Set<Class<?>> | type = setOf(<br/>&nbsp;&nbsp;&nbsp;&nbsp;String::class.java<br/>)<br/> |
| Int | minLength = 4 |
| Any? | defaultValue = "bad" |
| Any? | defaultValue = JsonValue.of("bad") |

### Method Summary
| Modifier and Type | Method and Description |
Expand Down
Loading