tiennm99/lombok
1
0 Fork 0
mirror of https://github.com/tiennm99/lombok.git synced 2026-10-19 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use readConfigurationOr

Browse Source
This commit is contained in:
Lars Uffmann committed 2025-09-25 12:54:50 +02:00
1 parent 2a3960babc
commit 7ff6b78361
3 files changed
+9 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/core/lombok/core/configuration/JacksonVersion.java
+5 -1
View File
@@ -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;
}
}
src/core/lombok/eclipse/handlers/HandleJacksonized.java
+2 -2
View File
@@ -148,8 +148,8 @@ public class HandleJacksonized extends EclipseAnnotationHandler<Jacksonized> {
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;
}
src/core/lombok/javac/handlers/HandleJacksonized.java
+2 -2
View File
@@ -174,8 +174,8 @@ public class HandleJacksonized extends JavacAnnotationHandler<Jacksonized> {
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;
}