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

Commit d067a4e

Browse files
spacetherspacether
committed
Adjusts anytype and map imports more
1 parent 0d15286 commit d067a4e

File tree

55 files changed

+441
-32
lines changed

Some content is hidden

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

55 files changed

+441
-32
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
import java.util.LinkedHashSet;
66
import java.util.Set;
7-
import java.util.AbstractMap;
8-
import java.util.LinkedHashMap;
97
import java.util.Map;
108
import org.openapijsonschematools.schemas.FrozenMap;
119
import org.openapijsonschematools.schemas.Int32JsonSchema;

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44

55
import java.util.LinkedHashSet;
66
import java.util.Set;
7-
import java.util.AbstractMap;
8-
import java.util.LinkedHashMap;
7+
import java.time.LocalDate;
8+
import java.time.ZonedDateTime;
9+
import java.util.List;
910
import java.util.Map;
11+
import java.util.UUID;
1012
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
13+
import org.openapijsonschematools.schemas.FrozenList;
1114
import org.openapijsonschematools.schemas.FrozenMap;
1215

1316
public class AdditionalPropertiesValidator {
@@ -65,6 +68,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
6568
return JsonSchema.validate(AdditionalProperties1.class, arg, configuration);
6669
}
6770

71+
public static String validate(UUID arg, SchemaConfiguration configuration) {
72+
return JsonSchema.validate(AdditionalProperties1.class, arg, configuration);
73+
}
74+
6875
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
6976
return JsonSchema.validate(AdditionalProperties1.class, arg, configuration);
7077
}
@@ -122,6 +129,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
122129
return JsonSchema.validate(AdditionalProperties2.class, arg, configuration);
123130
}
124131

132+
public static String validate(UUID arg, SchemaConfiguration configuration) {
133+
return JsonSchema.validate(AdditionalProperties2.class, arg, configuration);
134+
}
135+
125136
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
126137
return JsonSchema.validate(AdditionalProperties2.class, arg, configuration);
127138
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
import java.util.LinkedHashSet;
66
import java.util.Set;
7-
import java.util.AbstractMap;
8-
import java.util.LinkedHashMap;
97
import java.util.List;
108
import java.util.Map;
119
import org.openapijsonschematools.schemas.FrozenList;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
import java.util.LinkedHashSet;
66
import java.util.Set;
7-
import java.util.AbstractMap;
8-
import java.util.LinkedHashMap;
97
import java.util.Map;
108
import org.openapijsonschematools.schemas.FrozenMap;
119
import org.openapijsonschematools.schemas.IntJsonSchema;

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44

55
import java.util.LinkedHashSet;
66
import java.util.Set;
7+
import java.time.LocalDate;
8+
import java.time.ZonedDateTime;
79
import java.util.AbstractMap;
810
import java.util.LinkedHashMap;
11+
import java.util.List;
912
import java.util.Map;
13+
import java.util.UUID;
14+
import org.openapijsonschematools.schemas.FrozenList;
1015
import org.openapijsonschematools.schemas.FrozenMap;
1116

1217
public class AnyTypeAndFormat {
@@ -51,6 +56,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
5156
return JsonSchema.validate(UuidSchema.class, arg, configuration);
5257
}
5358

59+
public static String validate(UUID arg, SchemaConfiguration configuration) {
60+
return JsonSchema.validate(UuidSchema.class, arg, configuration);
61+
}
62+
5463
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
5564
return JsonSchema.validate(UuidSchema.class, arg, configuration);
5665
}
@@ -98,6 +107,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
98107
return JsonSchema.validate(Date.class, arg, configuration);
99108
}
100109

110+
public static String validate(UUID arg, SchemaConfiguration configuration) {
111+
return JsonSchema.validate(Date.class, arg, configuration);
112+
}
113+
101114
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
102115
return JsonSchema.validate(Date.class, arg, configuration);
103116
}
@@ -145,6 +158,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
145158
return JsonSchema.validate(Datetime.class, arg, configuration);
146159
}
147160

161+
public static String validate(UUID arg, SchemaConfiguration configuration) {
162+
return JsonSchema.validate(Datetime.class, arg, configuration);
163+
}
164+
148165
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
149166
return JsonSchema.validate(Datetime.class, arg, configuration);
150167
}
@@ -192,6 +209,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
192209
return JsonSchema.validate(NumberSchema.class, arg, configuration);
193210
}
194211

212+
public static String validate(UUID arg, SchemaConfiguration configuration) {
213+
return JsonSchema.validate(NumberSchema.class, arg, configuration);
214+
}
215+
195216
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
196217
return JsonSchema.validate(NumberSchema.class, arg, configuration);
197218
}
@@ -239,6 +260,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
239260
return JsonSchema.validate(Binary.class, arg, configuration);
240261
}
241262

263+
public static String validate(UUID arg, SchemaConfiguration configuration) {
264+
return JsonSchema.validate(Binary.class, arg, configuration);
265+
}
266+
242267
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
243268
return JsonSchema.validate(Binary.class, arg, configuration);
244269
}
@@ -286,6 +311,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
286311
return JsonSchema.validate(Int32.class, arg, configuration);
287312
}
288313

314+
public static String validate(UUID arg, SchemaConfiguration configuration) {
315+
return JsonSchema.validate(Int32.class, arg, configuration);
316+
}
317+
289318
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
290319
return JsonSchema.validate(Int32.class, arg, configuration);
291320
}
@@ -333,6 +362,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
333362
return JsonSchema.validate(Int64.class, arg, configuration);
334363
}
335364

365+
public static String validate(UUID arg, SchemaConfiguration configuration) {
366+
return JsonSchema.validate(Int64.class, arg, configuration);
367+
}
368+
336369
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
337370
return JsonSchema.validate(Int64.class, arg, configuration);
338371
}
@@ -380,6 +413,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
380413
return JsonSchema.validate(DoubleSchema.class, arg, configuration);
381414
}
382415

416+
public static String validate(UUID arg, SchemaConfiguration configuration) {
417+
return JsonSchema.validate(DoubleSchema.class, arg, configuration);
418+
}
419+
383420
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
384421
return JsonSchema.validate(DoubleSchema.class, arg, configuration);
385422
}
@@ -427,6 +464,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
427464
return JsonSchema.validate(FloatSchema.class, arg, configuration);
428465
}
429466

467+
public static String validate(UUID arg, SchemaConfiguration configuration) {
468+
return JsonSchema.validate(FloatSchema.class, arg, configuration);
469+
}
470+
430471
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
431472
return JsonSchema.validate(FloatSchema.class, arg, configuration);
432473
}

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44

55
import java.util.LinkedHashSet;
66
import java.util.Set;
7+
import java.time.LocalDate;
8+
import java.time.ZonedDateTime;
9+
import java.util.List;
10+
import java.util.Map;
11+
import java.util.UUID;
12+
import org.openapijsonschematools.schemas.FrozenList;
13+
import org.openapijsonschematools.schemas.FrozenMap;
714
import org.openapijsonschematools.schemas.StringJsonSchema;
815

916
public class AnyTypeNotString {
@@ -56,6 +63,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
5663
return JsonSchema.validate(AnyTypeNotString1.class, arg, configuration);
5764
}
5865

66+
public static String validate(UUID arg, SchemaConfiguration configuration) {
67+
return JsonSchema.validate(AnyTypeNotString1.class, arg, configuration);
68+
}
69+
5970
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
6071
return JsonSchema.validate(AnyTypeNotString1.class, arg, configuration);
6172
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@
44

55
import java.util.LinkedHashSet;
66
import java.util.Set;
7+
import java.time.LocalDate;
8+
import java.time.ZonedDateTime;
79
import java.util.AbstractMap;
810
import java.util.LinkedHashMap;
11+
import java.util.List;
912
import java.util.Map;
13+
import java.util.UUID;
1014
import org.openapijsonschematools.schemas.BooleanJsonSchema;
15+
import org.openapijsonschematools.schemas.FrozenList;
1116
import org.openapijsonschematools.schemas.FrozenMap;
1217

1318
public class Cat {
@@ -73,6 +78,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
7378
return JsonSchema.validate(Cat1.class, arg, configuration);
7479
}
7580

81+
public static String validate(UUID arg, SchemaConfiguration configuration) {
82+
return JsonSchema.validate(Cat1.class, arg, configuration);
83+
}
84+
7685
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
7786
return JsonSchema.validate(Cat1.class, arg, configuration);
7887
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44

55
import java.util.LinkedHashSet;
66
import java.util.Set;
7+
import java.time.LocalDate;
8+
import java.time.ZonedDateTime;
79
import java.util.AbstractMap;
810
import java.util.LinkedHashMap;
11+
import java.util.List;
912
import java.util.Map;
13+
import java.util.UUID;
14+
import org.openapijsonschematools.schemas.FrozenList;
1015
import org.openapijsonschematools.schemas.FrozenMap;
1116
import org.openapijsonschematools.schemas.StringJsonSchema;
1217

@@ -73,6 +78,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
7378
return JsonSchema.validate(ChildCat1.class, arg, configuration);
7479
}
7580

81+
public static String validate(UUID arg, SchemaConfiguration configuration) {
82+
return JsonSchema.validate(ChildCat1.class, arg, configuration);
83+
}
84+
7685
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
7786
return JsonSchema.validate(ChildCat1.class, arg, configuration);
7887
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44

55
import java.util.LinkedHashSet;
66
import java.util.Set;
7+
import java.time.LocalDate;
8+
import java.time.ZonedDateTime;
9+
import java.util.AbstractMap;
10+
import java.util.LinkedHashMap;
11+
import java.util.List;
12+
import java.util.Map;
13+
import java.util.UUID;
14+
import org.openapijsonschematools.schemas.FrozenList;
15+
import org.openapijsonschematools.schemas.FrozenMap;
716
import org.openapijsonschematools.schemas.StringJsonSchema;
817

918
public class ClassModel {
@@ -61,6 +70,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
6170
return JsonSchema.validate(ClassModel1.class, arg, configuration);
6271
}
6372

73+
public static String validate(UUID arg, SchemaConfiguration configuration) {
74+
return JsonSchema.validate(ClassModel1.class, arg, configuration);
75+
}
76+
6477
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
6578
return JsonSchema.validate(ClassModel1.class, arg, configuration);
6679
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
import java.time.ZonedDateTime;
99
import java.util.AbstractMap;
1010
import java.util.LinkedHashMap;
11+
import java.util.List;
1112
import java.util.Map;
1213
import java.util.UUID;
14+
import org.openapijsonschematools.schemas.FrozenList;
1315
import org.openapijsonschematools.schemas.FrozenMap;
1416
import org.openapijsonschematools.schemas.StringJsonSchema;
1517

@@ -82,6 +84,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
8284
return JsonSchema.validate(ComplexQuadrilateral1.class, arg, configuration);
8385
}
8486

87+
public static String validate(UUID arg, SchemaConfiguration configuration) {
88+
return JsonSchema.validate(ComplexQuadrilateral1.class, arg, configuration);
89+
}
90+
8591
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
8692
return JsonSchema.validate(ComplexQuadrilateral1.class, arg, configuration);
8793
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,19 @@
44

55
import java.util.LinkedHashSet;
66
import java.util.Set;
7+
import java.time.LocalDate;
8+
import java.time.ZonedDateTime;
79
import java.util.List;
10+
import java.util.Map;
11+
import java.util.UUID;
812
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
913
import org.openapijsonschematools.schemas.BooleanJsonSchema;
1014
import org.openapijsonschematools.schemas.DateJsonSchema;
1115
import org.openapijsonschematools.schemas.DateTimeJsonSchema;
1216
import org.openapijsonschematools.schemas.DoubleJsonSchema;
1317
import org.openapijsonschematools.schemas.FloatJsonSchema;
1418
import org.openapijsonschematools.schemas.FrozenList;
19+
import org.openapijsonschematools.schemas.FrozenMap;
1520
import org.openapijsonschematools.schemas.Int32JsonSchema;
1621
import org.openapijsonschematools.schemas.Int64JsonSchema;
1722
import org.openapijsonschematools.schemas.IntJsonSchema;
@@ -127,6 +132,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
127132
return JsonSchema.validate(ComposedAnyOfDifferentTypesNoValidations1.class, arg, configuration);
128133
}
129134

135+
public static String validate(UUID arg, SchemaConfiguration configuration) {
136+
return JsonSchema.validate(ComposedAnyOfDifferentTypesNoValidations1.class, arg, configuration);
137+
}
138+
130139
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
131140
return JsonSchema.validate(ComposedAnyOfDifferentTypesNoValidations1.class, arg, configuration);
132141
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
import java.util.LinkedHashSet;
66
import java.util.Set;
7-
import java.util.AbstractMap;
8-
import java.util.LinkedHashMap;
97
import java.util.Map;
108
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
119
import org.openapijsonschematools.schemas.FrozenMap;

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
import java.util.LinkedHashSet;
66
import java.util.Set;
7+
import java.time.LocalDate;
78
import java.time.ZonedDateTime;
8-
import java.util.AbstractMap;
9-
import java.util.LinkedHashMap;
109
import java.util.List;
1110
import java.util.Map;
11+
import java.util.UUID;
1212
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
1313
import org.openapijsonschematools.schemas.DateJsonSchema;
1414
import org.openapijsonschematools.schemas.FrozenList;
@@ -103,6 +103,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
103103
return JsonSchema.validate(ComposedOneOfDifferentTypes1.class, arg, configuration);
104104
}
105105

106+
public static String validate(UUID arg, SchemaConfiguration configuration) {
107+
return JsonSchema.validate(ComposedOneOfDifferentTypes1.class, arg, configuration);
108+
}
109+
106110
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
107111
return JsonSchema.validate(ComposedOneOfDifferentTypes1.class, arg, configuration);
108112
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44

55
import java.util.LinkedHashSet;
66
import java.util.Set;
7+
import java.time.LocalDate;
8+
import java.time.ZonedDateTime;
79
import java.util.AbstractMap;
810
import java.util.LinkedHashMap;
11+
import java.util.List;
912
import java.util.Map;
13+
import java.util.UUID;
14+
import org.openapijsonschematools.schemas.FrozenList;
1015
import org.openapijsonschematools.schemas.FrozenMap;
1116
import org.openapijsonschematools.schemas.StringJsonSchema;
1217

@@ -73,6 +78,10 @@ public static String validate(LocalDate arg, SchemaConfiguration configuration)
7378
return JsonSchema.validate(Dog1.class, arg, configuration);
7479
}
7580

81+
public static String validate(UUID arg, SchemaConfiguration configuration) {
82+
return JsonSchema.validate(Dog1.class, arg, configuration);
83+
}
84+
7685
public static <T extends FrozenMap> T validate(Map<String, Object> arg, SchemaConfiguration configuration) {
7786
return JsonSchema.validate(Dog1.class, arg, configuration);
7887
}

0 commit comments

Comments
 (0)