From 3dd5ad38da467dc7084367fb9aceda2e7cff7938 Mon Sep 17 00:00:00 2001 From: Lars Uffmann Date: Sat, 27 Sep 2025 09:15:52 +0200 Subject: [PATCH] Improove messages and error handling. --- src/core/lombok/core/configuration/JacksonVersion.java | 6 +++--- src/core/lombok/eclipse/handlers/HandleJacksonized.java | 4 ++-- src/core/lombok/javac/handlers/HandleJacksonized.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/lombok/core/configuration/JacksonVersion.java b/src/core/lombok/core/configuration/JacksonVersion.java index fc793b17..7f1e9e4c 100644 --- a/src/core/lombok/core/configuration/JacksonVersion.java +++ b/src/core/lombok/core/configuration/JacksonVersion.java @@ -15,7 +15,7 @@ public final class JacksonVersion implements ConfigurationValueType { } public static String exampleValue() { - return "2"; + return "2, 3 or 2_3"; } public static String description() { @@ -31,8 +31,8 @@ public final class JacksonVersion implements ConfigurationValueType { return _3; } else if ("2_3".equals(value.trim())) { return _23; - } else{ - throw new IllegalArgumentException("Unsupported Jackson version selector. Supported values: 2, 3 or 2_3 "); + } else { + throw new IllegalArgumentException("Unsupported Jackson version selector."); } } diff --git a/src/core/lombok/eclipse/handlers/HandleJacksonized.java b/src/core/lombok/eclipse/handlers/HandleJacksonized.java index 76aee907..dec1a666 100644 --- a/src/core/lombok/eclipse/handlers/HandleJacksonized.java +++ b/src/core/lombok/eclipse/handlers/HandleJacksonized.java @@ -149,8 +149,8 @@ public class HandleJacksonized extends EclipseAnnotationHandler { MemberValuePair builderMvp = new MemberValuePair("builder".toCharArray(), td.sourceStart, td.sourceEnd, builderClassLiteralAccess); JacksonVersion jacksonVersion = annotationNode.getAst().readConfigurationOr(ConfigurationKeys.JACKSONIZED_JACKSON_VERSION, JacksonVersion._2); - if (! jacksonVersion.isValid()) { - annotationNode.addError("Usage: No valid jackson version selected"); + if (jacksonVersion == null || !jacksonVersion.isValid()) { + annotationNode.addError("No valid jackson version selected."); return; } diff --git a/src/core/lombok/javac/handlers/HandleJacksonized.java b/src/core/lombok/javac/handlers/HandleJacksonized.java index 37b1aa72..e33a9283 100644 --- a/src/core/lombok/javac/handlers/HandleJacksonized.java +++ b/src/core/lombok/javac/handlers/HandleJacksonized.java @@ -175,8 +175,8 @@ public class HandleJacksonized extends JavacAnnotationHandler { } JacksonVersion jacksonVersion = annotationNode.getAst().readConfigurationOr(ConfigurationKeys.JACKSONIZED_JACKSON_VERSION, JacksonVersion._2); - if (! jacksonVersion.isValid()) { - annotationNode.addError("Usage: No valid jackson version selected"); + if (jacksonVersion == null || !jacksonVersion.isValid()) { + annotationNode.addError("No valid jackson version selected."); return; } if (jacksonVersion.useJackson2()) {