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

Commit 11e467d

Browse files
spacetherspacether
committed
Regenerates other java samples
1 parent 5405d01 commit 11e467d

File tree

58 files changed

+473
-153
lines changed

Some content is hidden

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

58 files changed

+473
-153
lines changed

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ConstValidator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.checkerframework.checker.nullness.qual.Nullable;
55

66
import java.math.BigDecimal;
7+
import java.util.List;
78
import java.util.Objects;
89

910
public class ConstValidator extends BigDecimalValidator implements KeywordValidator {

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ContainsValidator.java

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package org.openapijsonschematools.client.schemas.validation;
22

33
import org.checkerframework.checker.nullness.qual.Nullable;
4+
import org.openapijsonschematools.client.exceptions.ValidationException;
45

56
import java.util.ArrayList;
67
import java.util.List;
78

89
public class ContainsValidator implements KeywordValidator {
910
public final Class<? extends JsonSchema> contains;
1011

11-
public ItemsValidator(Class<? extends JsonSchema> contains) {
12+
public ContainsValidator(Class<? extends JsonSchema> contains) {
1213
this.contains = contains;
1314
}
1415

@@ -22,16 +23,16 @@ public ItemsValidator(Class<? extends JsonSchema> contains) {
2223
if (!(arg instanceof List)) {
2324
return null;
2425
}
25-
many_path_to_schemas = contains_cls_path_to_schemas[1]
2626
if (containsPathToSchemas.isEmpty()) {
27-
throw new ApiValueError(
28-
"Validation failed for contains keyword in class={} at pathToItem={}. No "
29-
"items validated to the contains schema.".format(cls, validation_metadata.path_to_item)
30-
)
27+
throw new ValidationException(
28+
"Validation failed for contains keyword in class="+schema.getClass()
29+
+ " at pathToItem="+validationMetadata.pathToItem()+". No "
30+
+ "items validated to the contains schema."
31+
);
3132
}
3233
PathToSchemasMap pathToSchemas = new PathToSchemasMap();
3334
for (PathToSchemasMap otherPathToSchema: containsPathToSchemas) {
34-
pathToSchemas.update(other_path_to_schema)
35+
pathToSchemas.update(otherPathToSchema);
3536
}
3637
return pathToSchemas;
3738
}
@@ -55,21 +56,22 @@ public List<PathToSchemasMap> getContainsPathToSchemas(
5556
validationMetadata.validatedPathToSchemas(),
5657
validationMetadata.seenClasses()
5758
);
58-
if (itemValidationMetadata.validationRanEarlier(itemsSchema)) {
59+
JsonSchema containsSchema = JsonSchemaFactory.getInstance(contains);
60+
if (itemValidationMetadata.validationRanEarlier(containsSchema)) {
5961
// todo add_deeper_validated_schemas
6062
containsPathToSchemas.add(thesePathToSchemas);
61-
i +=1;
63+
i += 1;
6264
continue;
6365
}
6466

65-
JsonSchema containsSchema = JsonSchemaFactory.getInstance(contains);
6667
try {
6768
PathToSchemasMap otherPathToSchemas = JsonSchema.validate(
68-
containsSchema, itemValue, itemValidationMetadata)
69-
containsPathToSchemas.append(otherPathToSchemas)
70-
} except (exceptions.OpenApiException ignored) {
69+
containsSchema, itemValue, itemValidationMetadata);
70+
containsPathToSchemas.add(otherPathToSchemas);
71+
} catch (ValidationException ignored) {
7172
;
7273
}
74+
}
7375
return containsPathToSchemas;
7476
}
75-
}
77+
}

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValidator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.checkerframework.checker.nullness.qual.Nullable;
55

66
import java.math.BigDecimal;
7+
import java.util.List;
78
import java.util.Set;
89

910
public class EnumValidator extends BigDecimalValidator implements KeywordValidator {

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMaximumValidator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.openapijsonschematools.client.exceptions.ValidationException;
44
import org.checkerframework.checker.nullness.qual.Nullable;
55

6+
import java.util.List;
67

78
public class ExclusiveMaximumValidator implements KeywordValidator {
89
public final Number exclusiveMaximum;

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/ExclusiveMinimumValidator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.openapijsonschematools.client.exceptions.ValidationException;
44
import org.checkerframework.checker.nullness.qual.Nullable;
55

6+
import java.util.List;
67

78
public class ExclusiveMinimumValidator implements KeywordValidator {
89
public final Number exclusiveMinimum;

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/FormatValidator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.math.BigDecimal;
77
import java.math.BigInteger;
88
import java.time.format.DateTimeParseException;
9+
import java.util.List;
910
import java.util.UUID;
1011

1112
public class FormatValidator implements KeywordValidator {

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ public static PathToSchemasMap validate(
242242
LinkedHashSet<String> disabledKeywords = validationMetadata.configuration().disabledKeywordFlags().getKeywords();
243243
PathToSchemasMap pathToSchemas = new PathToSchemasMap();
244244
LinkedHashMap<String, KeywordValidator> thisKeywordToValidator = jsonSchema.keywordToValidator;
245-
List<PathToSchemasMap> containsPathToSchemas = new ArrayList();
245+
List<PathToSchemasMap> containsPathToSchemas = new ArrayList<>();
246246
KeywordValidator containsValidator = thisKeywordToValidator.get("contains");
247247
if (containsValidator != null) {
248248
containsPathToSchemas = containsValidator.getContainsPathToSchemas(arg, validationMetadata);

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MaxLengthValidator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import org.openapijsonschematools.client.exceptions.ValidationException;
44
import org.checkerframework.checker.nullness.qual.Nullable;
55

6+
import java.util.List;
7+
68
public class MaxLengthValidator extends LengthValidator implements KeywordValidator {
79
public final int maxLength;
810

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MaxPropertiesValidator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.openapijsonschematools.client.exceptions.ValidationException;
44
import org.checkerframework.checker.nullness.qual.Nullable;
55

6+
import java.util.List;
67
import java.util.Map;
78

89
public class MaxPropertiesValidator implements KeywordValidator {

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MaximumValidator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.openapijsonschematools.client.exceptions.ValidationException;
44
import org.checkerframework.checker.nullness.qual.Nullable;
55

6+
import java.util.List;
67

78
public class MaximumValidator implements KeywordValidator {
89
public final Number maximum;

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MinLengthValidator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import org.openapijsonschematools.client.exceptions.ValidationException;
44
import org.checkerframework.checker.nullness.qual.Nullable;
55

6+
import java.util.List;
7+
68
public class MinLengthValidator extends LengthValidator implements KeywordValidator {
79
public final int minLength;
810

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MinPropertiesValidator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.openapijsonschematools.client.exceptions.ValidationException;
44
import org.checkerframework.checker.nullness.qual.Nullable;
55

6+
import java.util.List;
67
import java.util.Map;
78

89
public class MinPropertiesValidator implements KeywordValidator {

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MinimumValidator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.openapijsonschematools.client.exceptions.ValidationException;
44
import org.checkerframework.checker.nullness.qual.Nullable;
55

6+
import java.util.List;
67

78
public class MinimumValidator implements KeywordValidator {
89
public final Number minimum;

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/MultipleOfValidator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.openapijsonschematools.client.exceptions.ValidationException;
44
import org.checkerframework.checker.nullness.qual.Nullable;
55

6+
import java.util.List;
67
import java.math.BigDecimal;
78

89
public class MultipleOfValidator extends BigDecimalValidator implements KeywordValidator {

‎samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/PatternValidator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.openapijsonschematools.client.exceptions.ValidationException;
44
import org.checkerframework.checker.nullness.qual.Nullable;
55

6+
import java.util.List;
67
import java.util.regex.Pattern;
78

89
public class PatternValidator implements KeywordValidator {

‎samples/client/3_1_0_unit_test/java/src/test/java/org/openapijsonschematools/client/schemas/validation/AdditionalPropertiesValidatorTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ public void testCorrectPropertySucceeds() {
7777
PathToSchemasMap pathToSchemas = validator.validate(
7878
ObjectWithPropsSchema.getInstance(),
7979
arg,
80-
validationMetadata
80+
validationMetadata,
81+
new ArrayList<>()
8182
);
8283
if (pathToSchemas == null) {
8384
throw new RuntimeException("Invalid null value for pathToSchemas for this test case");
@@ -106,7 +107,8 @@ public void testNotApplicableTypeReturnsNull() {
106107
PathToSchemasMap pathToSchemas = validator.validate(
107108
MapJsonSchema.getInstance(),
108109
1,
109-
validationMetadata
110+
validationMetadata,
111+
new ArrayList<>()
110112
);
111113
assertNull(pathToSchemas);
112114
}
@@ -128,7 +130,8 @@ public void testIncorrectPropertyValueFails() {
128130
Assert.assertThrows(ValidationException.class, () -> validator.validate(
129131
ObjectWithPropsSchema.getInstance(),
130132
arg,
131-
validationMetadata
133+
validationMetadata,
134+
new ArrayList<>()
132135
));
133136
}
134137
}

0 commit comments

Comments
 (0)