Merge pull request #3009 from Rawi01/field-defaults-record

Skip records for field defaults via config
This commit is contained in:
Reinier Zwitserloot authored and GitHub committed 2021-10-22 10:35:39 +02:00
commit 82592b84bf
5 files changed
+24

No files matched your search

@@ -160,6 +160,8 @@ public class HandleFieldDefaults extends EclipseASTAdapter {
boolean defaultToFinal = makeFinalIsExplicit ? false : Boolean.TRUE.equals(typeNode.getAst().readConfiguration(ConfigurationKeys.FIELD_DEFAULTS_FINAL_EVERYWHERE));
if (!defaultToPrivate && !defaultToFinal && fieldDefaults == null) return;
// Do not apply field defaults to records if set using the the config system
if (fieldDefaults == null && !isClassOrEnum(typeNode)) return;
AccessLevel fdAccessLevel = (fieldDefaults != null && levelIsExplicit) ? fd.level() : defaultToPrivate ? AccessLevel.PRIVATE : null;
boolean fdToFinal = (fieldDefaults != null && makeFinalIsExplicit) ? fd.makeFinal() : defaultToFinal;
@@ -140,6 +140,8 @@ public class HandleFieldDefaults extends JavacASTAdapter {
boolean defaultToFinal = makeFinalIsExplicit ? false : Boolean.TRUE.equals(typeNode.getAst().readConfiguration(ConfigurationKeys.FIELD_DEFAULTS_FINAL_EVERYWHERE));
if (!defaultToPrivate && !defaultToFinal && fieldDefaults == null) return;
// Do not apply field defaults to records if set using the the config system
if (fieldDefaults == null && !isClassOrEnum(typeNode)) return;
AccessLevel fdAccessLevel = (fieldDefaults != null && levelIsExplicit) ? fd.level() : defaultToPrivate ? AccessLevel.PRIVATE : null;
boolean fdToFinal = (fieldDefaults != null && makeFinalIsExplicit) ? fd.makeFinal() : defaultToFinal;
@@ -0,0 +1,3 @@
// version 14:
public record FieldDefaultsViaConfigOnRecord(String a, String b) {
}
@@ -0,0 +1,10 @@
// version 14:
public record FieldDefaultsViaConfigOnRecord(String a, String b) {
/* Implicit */ private final String a;
/* Implicit */ private final String b;
public FieldDefaultsViaConfigOnRecord(String a, String b) {
super();
.a = a;
.b = b;
}
}
@@ -0,0 +1,7 @@
// version 14:
//CONF: lombok.fieldDefaults.defaultFinal = true
//CONF: lombok.fieldDefaults.defaultPrivate = true
//unchanged
public record FieldDefaultsViaConfigOnRecord(String a, String b) {
}