diff --git a/src/core/lombok/core/configuration/JacksonVersion.java b/src/core/lombok/core/configuration/JacksonVersion.java index 6eb34e58..fc793b17 100644 --- a/src/core/lombok/core/configuration/JacksonVersion.java +++ b/src/core/lombok/core/configuration/JacksonVersion.java @@ -6,7 +6,7 @@ public final class JacksonVersion implements ConfigurationValueType { private final boolean useJackson3; public static final JacksonVersion _2 = new JacksonVersion(true, false); - public static final JacksonVersion _3 = new JacksonVersion(true, false); + public static final JacksonVersion _3 = new JacksonVersion(false, true); public static final JacksonVersion _23 = new JacksonVersion(true, true); public JacksonVersion(boolean useJackson2, boolean useJackson3) { @@ -43,4 +43,8 @@ public final class JacksonVersion implements ConfigurationValueType { public boolean useJackson3() { return useJackson3; } + + public boolean isValid() { + return useJackson2 || useJackson3; + } } diff --git a/src/core/lombok/eclipse/handlers/HandleJacksonized.java b/src/core/lombok/eclipse/handlers/HandleJacksonized.java index 9d249c02..76aee907 100644 --- a/src/core/lombok/eclipse/handlers/HandleJacksonized.java +++ b/src/core/lombok/eclipse/handlers/HandleJacksonized.java @@ -148,8 +148,8 @@ public class HandleJacksonized extends EclipseAnnotationHandler { ClassLiteralAccess builderClassLiteralAccess = new ClassLiteralAccess(td.sourceEnd, builderClassExpression); MemberValuePair builderMvp = new MemberValuePair("builder".toCharArray(), td.sourceStart, td.sourceEnd, builderClassLiteralAccess); - JacksonVersion jacksonVersion = annotationNode.getAst().readConfiguration(ConfigurationKeys.JACKSONIZED_JACKSON_VERSION); - if (! (jacksonVersion.useJackson2() || jacksonVersion.useJackson3())) { + JacksonVersion jacksonVersion = annotationNode.getAst().readConfigurationOr(ConfigurationKeys.JACKSONIZED_JACKSON_VERSION, JacksonVersion._2); + if (! jacksonVersion.isValid()) { annotationNode.addError("Usage: 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 281e5295..37b1aa72 100644 --- a/src/core/lombok/javac/handlers/HandleJacksonized.java +++ b/src/core/lombok/javac/handlers/HandleJacksonized.java @@ -174,8 +174,8 @@ public class HandleJacksonized extends JavacAnnotationHandler { return; } - JacksonVersion jacksonVersion = annotationNode.getAst().readConfiguration(ConfigurationKeys.JACKSONIZED_JACKSON_VERSION); - if (! (jacksonVersion.useJackson2() || jacksonVersion.useJackson3())) { + JacksonVersion jacksonVersion = annotationNode.getAst().readConfigurationOr(ConfigurationKeys.JACKSONIZED_JACKSON_VERSION, JacksonVersion._2); + if (! jacksonVersion.isValid()) { annotationNode.addError("Usage: No valid jackson version selected"); return; }