diff --git a/src/core/lombok/core/configuration/JacksonVersion.java b/src/core/lombok/core/configuration/JacksonVersion.java index 7f1e9e4c..2b1efe71 100644 --- a/src/core/lombok/core/configuration/JacksonVersion.java +++ b/src/core/lombok/core/configuration/JacksonVersion.java @@ -5,13 +5,12 @@ public final class JacksonVersion implements ConfigurationValueType { private final boolean useJackson2; private final boolean useJackson3; - public static final JacksonVersion _2 = new JacksonVersion(true, false); - public static final JacksonVersion _3 = new JacksonVersion(false, true); - public static final JacksonVersion _23 = new JacksonVersion(true, true); + private static final JacksonVersion _2 = new JacksonVersion(true, false); + private static final JacksonVersion _3 = new JacksonVersion(false, true); + private static final JacksonVersion _23 = new JacksonVersion(true, true); - public JacksonVersion(boolean useJackson2, boolean useJackson3) { - this.useJackson2 = useJackson2; - this.useJackson3 = useJackson3; + public static final JacksonVersion getDefault() { + return _2; } public static String exampleValue() { @@ -24,7 +23,7 @@ public final class JacksonVersion implements ConfigurationValueType { public static JacksonVersion valueOf(String value) { if (value == null || value.isEmpty()) { - return _2; + return getDefault(); } else if ("2".equals(value.trim())) { return _2; } else if ("3".equals(value.trim())) { @@ -36,6 +35,11 @@ public final class JacksonVersion implements ConfigurationValueType { } } + private JacksonVersion(boolean useJackson2, boolean useJackson3) { + this.useJackson2 = useJackson2; + this.useJackson3 = useJackson3; + } + public boolean useJackson2() { return useJackson2; } diff --git a/src/core/lombok/eclipse/handlers/HandleJacksonized.java b/src/core/lombok/eclipse/handlers/HandleJacksonized.java index dec1a666..ab43f0a7 100644 --- a/src/core/lombok/eclipse/handlers/HandleJacksonized.java +++ b/src/core/lombok/eclipse/handlers/HandleJacksonized.java @@ -148,7 +148,7 @@ 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().readConfigurationOr(ConfigurationKeys.JACKSONIZED_JACKSON_VERSION, JacksonVersion._2); + JacksonVersion jacksonVersion = annotationNode.getAst().readConfigurationOr(ConfigurationKeys.JACKSONIZED_JACKSON_VERSION, JacksonVersion.getDefault()); 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 e33a9283..b0270619 100644 --- a/src/core/lombok/javac/handlers/HandleJacksonized.java +++ b/src/core/lombok/javac/handlers/HandleJacksonized.java @@ -174,7 +174,7 @@ public class HandleJacksonized extends JavacAnnotationHandler { return; } - JacksonVersion jacksonVersion = annotationNode.getAst().readConfigurationOr(ConfigurationKeys.JACKSONIZED_JACKSON_VERSION, JacksonVersion._2); + JacksonVersion jacksonVersion = annotationNode.getAst().readConfigurationOr(ConfigurationKeys.JACKSONIZED_JACKSON_VERSION, JacksonVersion.getDefault()); if (jacksonVersion == null || !jacksonVersion.isValid()) { annotationNode.addError("No valid jackson version selected."); return;