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

Commit 3baa4b2

Browse files
spacetherspacether
authored
Java, adjusts validation method names in JsonSchema (#309)
* Updates json schema templates to use updated validateX methods * Updates validate template to use updated helper methods * generated java tests deleted * Samples regen * Samples regen * Samples updated, fixes string and uuid json schema classes * Fixes typo in StringJsonSchema.java * Samples regen with test fixes * Samples + docs updated
1 parent 0047d25 commit 3baa4b2

449 files changed

Lines changed: 2685 additions & 2685 deletions

File tree

Some content is hidden

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

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidate.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected static AdditionalpropertiesAllowsASchemaWhichShouldValidateMap getMapO
7979
return new AdditionalpropertiesAllowsASchemaWhichShouldValidateMap(arg);
8080
}
8181
public static AdditionalpropertiesAllowsASchemaWhichShouldValidateMap validate(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {
82-
return JsonSchema.validate(AdditionalpropertiesAllowsASchemaWhichShouldValidate1.class, arg, configuration);
82+
return JsonSchema.validateMap(AdditionalpropertiesAllowsASchemaWhichShouldValidate1.class, arg, configuration);
8383
}
8484
}
8585
}

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalpropertiesAreAllowedByDefault.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,50 +77,50 @@ protected static AdditionalpropertiesAreAllowedByDefaultMap getMapOutputInstance
7777
return new AdditionalpropertiesAreAllowedByDefaultMap(arg);
7878
}
7979
public static Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException {
80-
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
80+
return JsonSchema.validateVoid(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
8181
}
8282

8383
public static boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException {
84-
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
84+
return JsonSchema.validateBoolean(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
8585
}
8686

8787
public static int validate(int arg, SchemaConfiguration configuration) throws ValidationException {
88-
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
88+
return JsonSchema.validateInt(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
8989
}
9090

9191
public static long validate(long arg, SchemaConfiguration configuration) throws ValidationException {
92-
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
92+
return JsonSchema.validateLong(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
9393
}
9494

9595
public static float validate(float arg, SchemaConfiguration configuration) throws ValidationException {
96-
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
96+
return JsonSchema.validateFloat(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
9797
}
9898

9999
public static double validate(double arg, SchemaConfiguration configuration) throws ValidationException {
100-
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
100+
return JsonSchema.validateDouble(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
101101
}
102102

103103
public static String validate(String arg, SchemaConfiguration configuration) throws ValidationException {
104-
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
104+
return JsonSchema.validateString(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
105105
}
106106

107107
public static String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
108-
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
108+
return JsonSchema.validateZonedDateTime(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
109109
}
110110

111111
public static String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
112-
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
112+
return JsonSchema.validateLocalDate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
113113
}
114114

115115
public static String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
116-
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
116+
return JsonSchema.validateUUID(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
117117
}
118118

119119
public static AdditionalpropertiesAreAllowedByDefaultMap validate(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {
120-
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
120+
return JsonSchema.validateMap(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
121121
}
122122

123123
public static FrozenList<Object> validate(List<Object> arg, SchemaConfiguration configuration) throws ValidationException {
124-
return JsonSchema.validate(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
124+
return JsonSchema.validateList(AdditionalpropertiesAreAllowedByDefault1.class, arg, configuration);
125125
}
126126
}}

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalpropertiesCanExistByItself.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected static AdditionalpropertiesCanExistByItselfMap getMapOutputInstance(Fr
5151
return new AdditionalpropertiesCanExistByItselfMap(arg);
5252
}
5353
public static AdditionalpropertiesCanExistByItselfMap validate(Map<String, Boolean> arg, SchemaConfiguration configuration) throws ValidationException {
54-
return JsonSchema.validate(AdditionalpropertiesCanExistByItself1.class, arg, configuration);
54+
return JsonSchema.validateMap(AdditionalpropertiesCanExistByItself1.class, arg, configuration);
5555
}
5656
}
5757
}

‎samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/components/schemas/AdditionalpropertiesShouldNotLookInApplicators.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -66,51 +66,51 @@ protected static Schema0Map getMapOutputInstance(FrozenMap<String, Object> arg)
6666
return new Schema0Map(arg);
6767
}
6868
public static Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException {
69-
return JsonSchema.validate(Schema0.class, arg, configuration);
69+
return JsonSchema.validateVoid(Schema0.class, arg, configuration);
7070
}
7171

7272
public static boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException {
73-
return JsonSchema.validate(Schema0.class, arg, configuration);
73+
return JsonSchema.validateBoolean(Schema0.class, arg, configuration);
7474
}
7575

7676
public static int validate(int arg, SchemaConfiguration configuration) throws ValidationException {
77-
return JsonSchema.validate(Schema0.class, arg, configuration);
77+
return JsonSchema.validateInt(Schema0.class, arg, configuration);
7878
}
7979

8080
public static long validate(long arg, SchemaConfiguration configuration) throws ValidationException {
81-
return JsonSchema.validate(Schema0.class, arg, configuration);
81+
return JsonSchema.validateLong(Schema0.class, arg, configuration);
8282
}
8383

8484
public static float validate(float arg, SchemaConfiguration configuration) throws ValidationException {
85-
return JsonSchema.validate(Schema0.class, arg, configuration);
85+
return JsonSchema.validateFloat(Schema0.class, arg, configuration);
8686
}
8787

8888
public static double validate(double arg, SchemaConfiguration configuration) throws ValidationException {
89-
return JsonSchema.validate(Schema0.class, arg, configuration);
89+
return JsonSchema.validateDouble(Schema0.class, arg, configuration);
9090
}
9191

9292
public static String validate(String arg, SchemaConfiguration configuration) throws ValidationException {
93-
return JsonSchema.validate(Schema0.class, arg, configuration);
93+
return JsonSchema.validateString(Schema0.class, arg, configuration);
9494
}
9595

9696
public static String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
97-
return JsonSchema.validate(Schema0.class, arg, configuration);
97+
return JsonSchema.validateZonedDateTime(Schema0.class, arg, configuration);
9898
}
9999

100100
public static String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
101-
return JsonSchema.validate(Schema0.class, arg, configuration);
101+
return JsonSchema.validateLocalDate(Schema0.class, arg, configuration);
102102
}
103103

104104
public static String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
105-
return JsonSchema.validate(Schema0.class, arg, configuration);
105+
return JsonSchema.validateUUID(Schema0.class, arg, configuration);
106106
}
107107

108108
public static Schema0Map validate(Map<String, Object> arg, SchemaConfiguration configuration) throws ValidationException {
109-
return JsonSchema.validate(Schema0.class, arg, configuration);
109+
return JsonSchema.validateMap(Schema0.class, arg, configuration);
110110
}
111111

112112
public static FrozenList<Object> validate(List<Object> arg, SchemaConfiguration configuration) throws ValidationException {
113-
return JsonSchema.validate(Schema0.class, arg, configuration);
113+
return JsonSchema.validateList(Schema0.class, arg, configuration);
114114
}
115115
}
116116

@@ -148,50 +148,50 @@ protected static AdditionalpropertiesShouldNotLookInApplicatorsMap getMapOutputI
148148
return new AdditionalpropertiesShouldNotLookInApplicatorsMap(arg);
149149
}
150150
public static Void validate(Void arg, SchemaConfiguration configuration) throws ValidationException {
151-
return JsonSchema.validate(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
151+
return JsonSchema.validateVoid(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
152152
}
153153

154154
public static boolean validate(boolean arg, SchemaConfiguration configuration) throws ValidationException {
155-
return JsonSchema.validate(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
155+
return JsonSchema.validateBoolean(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
156156
}
157157

158158
public static int validate(int arg, SchemaConfiguration configuration) throws ValidationException {
159-
return JsonSchema.validate(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
159+
return JsonSchema.validateInt(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
160160
}
161161

162162
public static long validate(long arg, SchemaConfiguration configuration) throws ValidationException {
163-
return JsonSchema.validate(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
163+
return JsonSchema.validateLong(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
164164
}
165165

166166
public static float validate(float arg, SchemaConfiguration configuration) throws ValidationException {
167-
return JsonSchema.validate(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
167+
return JsonSchema.validateFloat(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
168168
}
169169

170170
public static double validate(double arg, SchemaConfiguration configuration) throws ValidationException {
171-
return JsonSchema.validate(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
171+
return JsonSchema.validateDouble(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
172172
}
173173

174174
public static String validate(String arg, SchemaConfiguration configuration) throws ValidationException {
175-
return JsonSchema.validate(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
175+
return JsonSchema.validateString(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
176176
}
177177

178178
public static String validate(ZonedDateTime arg, SchemaConfiguration configuration) throws ValidationException {
179-
return JsonSchema.validate(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
179+
return JsonSchema.validateZonedDateTime(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
180180
}
181181

182182
public static String validate(LocalDate arg, SchemaConfiguration configuration) throws ValidationException {
183-
return JsonSchema.validate(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
183+
return JsonSchema.validateLocalDate(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
184184
}
185185

186186
public static String validate(UUID arg, SchemaConfiguration configuration) throws ValidationException {
187-
return JsonSchema.validate(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
187+
return JsonSchema.validateUUID(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
188188
}
189189

190190
public static AdditionalpropertiesShouldNotLookInApplicatorsMap validate(Map<String, Boolean> arg, SchemaConfiguration configuration) throws ValidationException {
191-
return JsonSchema.validate(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
191+
return JsonSchema.validateMap(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
192192
}
193193

194194
public static FrozenList<Object> validate(List<Object> arg, SchemaConfiguration configuration) throws ValidationException {
195-
return JsonSchema.validate(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
195+
return JsonSchema.validateList(AdditionalpropertiesShouldNotLookInApplicators1.class, arg, configuration);
196196
}
197197
}}

0 commit comments

Comments
 (0)