From caca6b5742dd65be5d4bf8128aa6ad61657cd03a Mon Sep 17 00:00:00 2001 From: Jeffrey D <11084623+Nephery@users.noreply.github.com> Date: Fri, 12 Jul 2024 11:19:00 -0400 Subject: [PATCH] Make AssertTrue and AssertFalse mutually exclusive Co-authored-by: Carsten Wickner <11309681+CarstenWickner@users.noreply.github.com> --- .../validation/JakartaValidationModule.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/jsonschema-module-jakarta-validation/src/main/java/com/github/victools/jsonschema/module/jakarta/validation/JakartaValidationModule.java b/jsonschema-module-jakarta-validation/src/main/java/com/github/victools/jsonschema/module/jakarta/validation/JakartaValidationModule.java index 5b84c15a..b3b26153 100644 --- a/jsonschema-module-jakarta-validation/src/main/java/com/github/victools/jsonschema/module/jakarta/validation/JakartaValidationModule.java +++ b/jsonschema-module-jakarta-validation/src/main/java/com/github/victools/jsonschema/module/jakarta/validation/JakartaValidationModule.java @@ -512,17 +512,15 @@ protected BigDecimal resolveNumberExclusiveMaximum(MemberScope member) { * @see AssertFalse */ protected List resolveEnum(MemberScope member) { - List values = new ArrayList<>(); - + List values; if (this.getAnnotationFromFieldOrGetter(member, AssertTrue.class, AssertTrue::groups) != null) { - values.add(true); - } - - if (this.getAnnotationFromFieldOrGetter(member, AssertFalse.class, AssertFalse::groups) != null) { - values.add(false); + values = Collections.singletonList(true); + } else if (this.getAnnotationFromFieldOrGetter(member, AssertFalse.class, AssertFalse::groups) != null) { + values = Collections.singletonList(false); + } else { + values = null; } - - return values.isEmpty() ? null : values; + return values; } /**