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

Commit 5a44e50

Browse files
spacetherspacether
authored
Kotlin code improvements, schemas shortened, json schema keyword enum used (#437)
* Adds and uses JsonValue * Reverts java changes * Further reversion * Kotlin tests fixed * Removes JsonSchemaInfo from kotlin * Kotlin 310 regen * 303 sample regen * Samples regen * Fixes defaultFalue method * Samples regen
1 parent c68d117 commit 5a44e50

File tree

705 files changed

+4723
-7908
lines changed

Some content is hidden

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

705 files changed

+4723
-7908
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ src/main/kotlin/org/openapijsonschematools/client/components/schemas/Uniqueitems
179179
src/main/kotlin/org/openapijsonschematools/client/components/schemas/UriFormat.kt
180180
src/main/kotlin/org/openapijsonschematools/client/components/schemas/UriReferenceFormat.kt
181181
src/main/kotlin/org/openapijsonschematools/client/components/schemas/UriTemplateFormat.kt
182-
src/main/kotlin/org/openapijsonschematools/client/configurations/JsonSchemaKeywordFlags.kt
182+
src/main/kotlin/org/openapijsonschematools/client/configurations/JsonSchemaKeyword.kt
183183
src/main/kotlin/org/openapijsonschematools/client/configurations/SchemaConfiguration.kt
184184
src/main/kotlin/org/openapijsonschematools/client/exceptions/BaseException.kt
185185
src/main/kotlin/org/openapijsonschematools/client/exceptions/InvalidAdditionalPropertyException.kt
@@ -234,7 +234,7 @@ src/main/kotlin/org/openapijsonschematools/client/schemas/validation/IntegerValu
234234
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/ItemsValidator.kt
235235
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/JsonSchema.kt
236236
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/JsonSchemaFactory.kt
237-
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/JsonSchemaInfo.kt
237+
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/JsonValue.kt
238238
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/KeywordEntry.kt
239239
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/KeywordValidator.kt
240240
src/main/kotlin/org/openapijsonschematools/client/schemas/validation/LengthValidator.kt
@@ -283,7 +283,6 @@ src/main/kotlin/org/openapijsonschematools/client/servers/Server.kt
283283
src/main/kotlin/org/openapijsonschematools/client/servers/ServerProvider.kt
284284
src/main/kotlin/org/openapijsonschematools/client/servers/ServerWithVariables.kt
285285
src/main/kotlin/org/openapijsonschematools/client/servers/ServerWithoutVariables.kt
286-
src/test/kotlin/org/openapijsonschematools/client/configurations/JsonSchemaKeywordFlagsTest.kt
287286
src/test/kotlin/org/openapijsonschematools/client/schemas/AnyTypeSchemaTest.kt
288287
src/test/kotlin/org/openapijsonschematools/client/schemas/ArrayTypeSchemaTest.kt
289288
src/test/kotlin/org/openapijsonschematools/client/schemas/BooleanSchemaTest.kt

‎samples/client/3_0_3_unit_test/kotlin/docs/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidate.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,13 @@ A schema class that validates payloads
6969

7070
### Code Sample
7171
```
72-
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
7372
import org.openapijsonschematools.client.configurations.SchemaConfiguration
7473
import org.openapijsonschematools.client.exceptions.ValidationException
75-
import org.openapijsonschematools.client.schemas.validation.MapUtils
7674
import org.openapijsonschematools.client.schemas.validation.FrozenList
7775
import org.openapijsonschematools.client.schemas.validation.FrozenMap
7876
import org.openapijsonschematools.client.components.schemas.AdditionalpropertiesAllowsASchemaWhichShouldValidate
7977
80-
val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
78+
val configuration = SchemaConfiguration()
8179
8280
// Map validation
8381
val validatedPayload: AdditionalpropertiesAllowsASchemaWhichShouldValidate.AdditionalpropertiesAllowsASchemaWhichShouldValidateMap =

‎samples/client/3_0_3_unit_test/kotlin/docs/components/schemas/AdditionalpropertiesCanExistByItself.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,13 @@ A schema class that validates payloads
5353

5454
### Code Sample
5555
```
56-
import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
5756
import org.openapijsonschematools.client.configurations.SchemaConfiguration
5857
import org.openapijsonschematools.client.exceptions.ValidationException
59-
import org.openapijsonschematools.client.schemas.validation.MapUtils
6058
import org.openapijsonschematools.client.schemas.validation.FrozenList
6159
import org.openapijsonschematools.client.schemas.validation.FrozenMap
6260
import org.openapijsonschematools.client.components.schemas.AdditionalpropertiesCanExistByItself
6361
64-
val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
62+
val configuration = SchemaConfiguration()
6563
6664
// Map validation
6765
val validatedPayload: AdditionalpropertiesCanExistByItself.AdditionalpropertiesCanExistByItselfMap =

‎samples/client/3_0_3_unit_test/kotlin/docs/components/schemas/AdditionalpropertiesShouldNotLookInApplicators.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ A schema class that validates payloads
168168
| Modifier and Type | Field and Description |
169169
| ----------------- | ---------------------- |
170170
| Class<? extends JsonSchema> | additionalProperties = [AdditionalProperties::class.java](#additionalproperties) |
171-
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0)<br>;)<br> |
171+
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0)<br>)<br> |
172172

173173
### Method Summary
174174
| Modifier and Type | Method and Description |

‎samples/client/3_0_3_unit_test/kotlin/docs/components/schemas/Allof.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ A schema class that validates payloads
170170
### Field Summary
171171
| Modifier and Type | Field and Description |
172172
| ----------------- | ---------------------- |
173-
| 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> |
173+
| 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> |
174174

175175
### Method Summary
176176
| Modifier and Type | Method and Description |

‎samples/client/3_0_3_unit_test/kotlin/docs/components/schemas/AllofCombinedWithAnyofOneof.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ A schema class that validates payloads
166166
### Field Summary
167167
| Modifier and Type | Field and Description |
168168
| ----------------- | ---------------------- |
169-
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema02::class.java](#schema02)<br>;)<br> |
169+
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema02::class.java](#schema02)<br>)<br> |
170170
| List<Class<? extends JsonSchema>> | anyOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema01::class.java](#schema01)<br>)<br> |
171171
| List<Class<? extends JsonSchema>> | oneOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0)<br>))<br> |
172172

‎samples/client/3_0_3_unit_test/kotlin/docs/components/schemas/AllofSimpleTypes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ A schema class that validates payloads
158158
### Field Summary
159159
| Modifier and Type | Field and Description |
160160
| ----------------- | ---------------------- |
161-
| 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> |
161+
| 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> |
162162

163163
### Method Summary
164164
| Modifier and Type | Method and Description |

‎samples/client/3_0_3_unit_test/kotlin/docs/components/schemas/AllofWithBaseSchema.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ A schema class that validates payloads
177177
| ----------------- | ---------------------- |
178178
| Map<String, Class<? extends JsonSchema>> | properties = mapOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;"bar" to [Bar::class.java](#bar))<br>)<br> |
179179
| Set<String> | required = setOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;"bar"<br>)<br> |
180-
| 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> |
180+
| 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> |
181181

182182
### Method Summary
183183
| Modifier and Type | Method and Description |

‎samples/client/3_0_3_unit_test/kotlin/docs/components/schemas/AllofWithOneEmptySchema.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ A schema class that validates payloads
150150
### Field Summary
151151
| Modifier and Type | Field and Description |
152152
| ----------------- | ---------------------- |
153-
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0)<br>;)<br> |
153+
| List<Class<? extends JsonSchema>> | allOf = listOf(<br>&nbsp;&nbsp;&nbsp;&nbsp;[Schema0::class.java](#schema0)<br>)<br> |
154154

155155
### Method Summary
156156
| Modifier and Type | Method and Description |

‎samples/client/3_0_3_unit_test/kotlin/docs/components/schemas/AllofWithTheFirstEmptySchema.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ A schema class that validates payloads
153153
### Field Summary
154154
| Modifier and Type | Field and Description |
155155
| ----------------- | ---------------------- |
156-
| 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> |
156+
| 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> |
157157

158158
### Method Summary
159159
| Modifier and Type | Method and Description |

0 commit comments

Comments
 (0)