aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/core/lombok/eclipse/EclipseNode.java9
-rw-r--r--src/core/lombok/javac/JavacNode.java8
-rw-r--r--test/core/src/lombok/LombokTestSource.java4
-rw-r--r--test/transform/resource/after-delombok/BuilderNestedInEnum.java70
-rw-r--r--test/transform/resource/after-ecj/BuilderNestedInEnum.java68
-rw-r--r--test/transform/resource/before/BuilderNestedInEnum.java12
-rw-r--r--website/templates/features/Value.html2
-rw-r--r--website/templates/features/experimental/FieldNameConstants.html2
-rw-r--r--website/usageExamples/ValueExample_pre.jpage4
9 files changed, 169 insertions, 10 deletions
diff --git a/src/core/lombok/eclipse/EclipseNode.java b/src/core/lombok/eclipse/EclipseNode.java
index 4f86f0a5..4950aeef 100644
--- a/src/core/lombok/eclipse/EclipseNode.java
+++ b/src/core/lombok/eclipse/EclipseNode.java
@@ -215,13 +215,16 @@ public class EclipseNode extends lombok.core.LombokNode<EclipseAST, EclipseNode,
@Override public boolean isStatic() {
if (node instanceof TypeDeclaration) {
+ TypeDeclaration t = (TypeDeclaration) node;
+ int f = t.modifiers;
+ if (((ClassFileConstants.AccInterface | ClassFileConstants.AccEnum) & f) != 0) return true;
+
EclipseNode directUp = directUp();
if (directUp == null || directUp.getKind() == Kind.COMPILATION_UNIT) return true;
if (!(directUp.get() instanceof TypeDeclaration)) return false;
TypeDeclaration p = (TypeDeclaration) directUp.get();
- int f = p.modifiers;
- if ((ClassFileConstants.AccInterface & f) != 0) return true;
- if ((ClassFileConstants.AccEnum & f) != 0) return true;
+ f = p.modifiers;
+ if (((ClassFileConstants.AccInterface | ClassFileConstants.AccEnum) & f) != 0) return true;
}
if (node instanceof FieldDeclaration) {
diff --git a/src/core/lombok/javac/JavacNode.java b/src/core/lombok/javac/JavacNode.java
index 035f7c53..fca0d0d1 100644
--- a/src/core/lombok/javac/JavacNode.java
+++ b/src/core/lombok/javac/JavacNode.java
@@ -286,13 +286,15 @@ public class JavacNode extends lombok.core.LombokNode<JavacAST, JavacNode, JCTre
@Override public boolean isStatic() {
if (node instanceof JCClassDecl) {
+ JCClassDecl t = (JCClassDecl) node;
+ long f = t.mods.flags;
+ if (((Flags.INTERFACE | Flags.ENUM) & f) != 0) return true;
JavacNode directUp = directUp();
if (directUp == null || directUp.getKind() == Kind.COMPILATION_UNIT) return true;
if (!(directUp.get() instanceof JCClassDecl)) return false;
JCClassDecl p = (JCClassDecl) directUp.get();
- long f = p.mods.flags;
- if ((Flags.INTERFACE & f) != 0) return true;
- if ((Flags.ENUM & f) != 0) return true;
+ f = p.mods.flags;
+ if (((Flags.INTERFACE | Flags.ENUM) & f) != 0) return true;
}
if (node instanceof JCVariableDecl) {
diff --git a/test/core/src/lombok/LombokTestSource.java b/test/core/src/lombok/LombokTestSource.java
index 0326dee9..27ffc31a 100644
--- a/test/core/src/lombok/LombokTestSource.java
+++ b/test/core/src/lombok/LombokTestSource.java
@@ -161,6 +161,7 @@ public class LombokTestSource {
private static final Pattern UNCHANGED_PATTERN = Pattern.compile("^\\s*unchanged\\s*(?:[-:].*)?$", Pattern.CASE_INSENSITIVE);
private static final Pattern SKIP_COMPARE_CONTENT_PATTERN = Pattern.compile("^\\s*skip[- ]?compare[- ]?contents?\\s*(?:[-:].*)?$", Pattern.CASE_INSENSITIVE);
private static final Pattern SKIP_IDEMPOTENT_PATTERN = Pattern.compile("^\\s*skip[- ]?idempotent\\s*(?:[-:].*)?$", Pattern.CASE_INSENSITIVE);
+ private static final Pattern ISSUE_REF_PATTERN = Pattern.compile("^\\s*issue #?\\d+(:?\\s+.*)?$", Pattern.CASE_INSENSITIVE);
private LombokTestSource(File file, String content, List<CompilerMessageMatcher> messages, List<String> directives) {
this.file = file;
@@ -200,6 +201,9 @@ public class LombokTestSource {
skipIdempotent = true;
continue;
}
+ if (ISSUE_REF_PATTERN.matcher(directive).matches()) {
+ continue;
+ }
if (lc.startsWith("platform ")) {
String platformDesc = lc.substring("platform ".length());
diff --git a/test/transform/resource/after-delombok/BuilderNestedInEnum.java b/test/transform/resource/after-delombok/BuilderNestedInEnum.java
new file mode 100644
index 00000000..26dc2a06
--- /dev/null
+++ b/test/transform/resource/after-delombok/BuilderNestedInEnum.java
@@ -0,0 +1,70 @@
+class BuilderNestedInEnum {
+ public enum TestEnum {
+ FOO, BAR;
+ public static final class TestBuilder {
+ private final String field;
+ @java.lang.SuppressWarnings("all")
+ TestBuilder(final String field) {
+ this.field = field;
+ }
+ @java.lang.SuppressWarnings("all")
+ public static class TestBuilderBuilder {
+ @java.lang.SuppressWarnings("all")
+ private String field;
+ @java.lang.SuppressWarnings("all")
+ TestBuilderBuilder() {
+ }
+ /**
+ * @return {@code this}.
+ */
+ @java.lang.SuppressWarnings("all")
+ public BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder field(final String field) {
+ this.field = field;
+ return this;
+ }
+ @java.lang.SuppressWarnings("all")
+ public BuilderNestedInEnum.TestEnum.TestBuilder build() {
+ return new BuilderNestedInEnum.TestEnum.TestBuilder(this.field);
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public java.lang.String toString() {
+ return "BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(field=" + this.field + ")";
+ }
+ }
+ @java.lang.SuppressWarnings("all")
+ public static BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder builder() {
+ return new BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder();
+ }
+ @java.lang.SuppressWarnings("all")
+ public String getField() {
+ return this.field;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public boolean equals(final java.lang.Object o) {
+ if (o == this) return true;
+ if (!(o instanceof BuilderNestedInEnum.TestEnum.TestBuilder)) return false;
+ final BuilderNestedInEnum.TestEnum.TestBuilder other = (BuilderNestedInEnum.TestEnum.TestBuilder) o;
+ final java.lang.Object this$field = this.getField();
+ final java.lang.Object other$field = other.getField();
+ if (this$field == null ? other$field != null : !this$field.equals(other$field)) return false;
+ return true;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ final java.lang.Object $field = this.getField();
+ result = result * PRIME + ($field == null ? 43 : $field.hashCode());
+ return result;
+ }
+ @java.lang.Override
+ @java.lang.SuppressWarnings("all")
+ public java.lang.String toString() {
+ return "BuilderNestedInEnum.TestEnum.TestBuilder(field=" + this.getField() + ")";
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderNestedInEnum.java b/test/transform/resource/after-ecj/BuilderNestedInEnum.java
new file mode 100644
index 00000000..b3fb54f3
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderNestedInEnum.java
@@ -0,0 +1,68 @@
+class BuilderNestedInEnum {
+ public enum TestEnum {
+ public static final @lombok.Builder @lombok.Value class TestBuilder {
+ public static @java.lang.SuppressWarnings("all") class TestBuilderBuilder {
+ private @java.lang.SuppressWarnings("all") String field;
+ @java.lang.SuppressWarnings("all") TestBuilderBuilder() {
+ super();
+ }
+ /**
+ * @return {@code this}.
+ */
+ public @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder field(final String field) {
+ this.field = field;
+ return this;
+ }
+ public @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder build() {
+ return new BuilderNestedInEnum.TestEnum.TestBuilder(this.field);
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+ return (("BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder(field=" + this.field) + ")");
+ }
+ }
+ private final String field;
+ @java.lang.SuppressWarnings("all") TestBuilder(final String field) {
+ super();
+ this.field = field;
+ }
+ public static @java.lang.SuppressWarnings("all") BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder builder() {
+ return new BuilderNestedInEnum.TestEnum.TestBuilder.TestBuilderBuilder();
+ }
+ public @java.lang.SuppressWarnings("all") String getField() {
+ return this.field;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+ if ((o == this))
+ return true;
+ if ((! (o instanceof BuilderNestedInEnum.TestEnum.TestBuilder)))
+ return false;
+ final BuilderNestedInEnum.TestEnum.TestBuilder other = (BuilderNestedInEnum.TestEnum.TestBuilder) o;
+ final java.lang.Object this$field = this.getField();
+ final java.lang.Object other$field = other.getField();
+ if (((this$field == null) ? (other$field != null) : (! this$field.equals(other$field))))
+ return false;
+ return true;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ final java.lang.Object $field = this.getField();
+ result = ((result * PRIME) + (($field == null) ? 43 : $field.hashCode()));
+ return result;
+ }
+ public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+ return (("BuilderNestedInEnum.TestEnum.TestBuilder(field=" + this.getField()) + ")");
+ }
+ }
+ FOO(),
+ BAR(),
+ <clinit>() {
+ }
+ public TestEnum() {
+ super();
+ }
+ }
+ BuilderNestedInEnum() {
+ super();
+ }
+} \ No newline at end of file
diff --git a/test/transform/resource/before/BuilderNestedInEnum.java b/test/transform/resource/before/BuilderNestedInEnum.java
new file mode 100644
index 00000000..99348002
--- /dev/null
+++ b/test/transform/resource/before/BuilderNestedInEnum.java
@@ -0,0 +1,12 @@
+// issue #3014: Builder check if its on a non-static inner class and errors if it is. But it was erroring here even though it is on a static inner class.
+class BuilderNestedInEnum {
+ public enum TestEnum {
+ FOO, BAR;
+
+ @lombok.Builder
+ @lombok.Value
+ public static class TestBuilder {
+ String field;
+ }
+ }
+} \ No newline at end of file
diff --git a/website/templates/features/Value.html b/website/templates/features/Value.html
index c41b6b10..e128383f 100644
--- a/website/templates/features/Value.html
+++ b/website/templates/features/Value.html
@@ -5,7 +5,7 @@
<p>
<code>@Value</code> was introduced as experimental feature in lombok v0.11.4.
</p><p>
- <code>@Value</code> no longer implies <code>@Wither</code> since lombok v0.11.8.
+ <code>@Value</code> no longer implies <code>@With</code> since lombok v0.11.8.
</p><p>
<code>@Value</code> promoted to the main <code>lombok</code> package since lombok v0.12.0.
</p>
diff --git a/website/templates/features/experimental/FieldNameConstants.html b/website/templates/features/experimental/FieldNameConstants.html
index e88b7670..06fa23b5 100644
--- a/website/templates/features/experimental/FieldNameConstants.html
+++ b/website/templates/features/experimental/FieldNameConstants.html
@@ -24,7 +24,7 @@
<p>
The <code>@FieldNameConstants</code> annotation generates an inner type which contains 1 constant for each field in your class; either string constants (fields marked <code>public static final</code>, of type <code>java.lang.String</code>) or if you prefer, an enum type with 1 value for each field - write <code>@FieldNameConstants(asEnum = true)</code> for the enum variant. <code>@FieldNameConstants</code> is useful for various marshalling and serialization frameworks. The constant field (whether enum value or string constant) always has the exact same name as the field, capitalization and all, unless you set the <code>lombok.fieldNameConstants.uppercase = true</code> option in your <code>lombok.config</code> file; in that case lombok will try to <code>UPPER_CASE</code> the name.
</p><p>
- The generated inner type is by default called <code>Fields</code> and is <code>public</code>. You can modify this via <code>@FieldNameConstants(innerTypeName = "FieldNames", access = AccessLevel.PACKAGE)</code> for example. The default inner type name can also be modified via configuration key <code>lombok.fieldNameConstants.innerTypeName</code>. The generated fields are always <code>public</code>.
+ The generated inner type is by default called <code>Fields</code> and is <code>public</code>. You can modify this via <code>@FieldNameConstants(innerTypeName = "FieldNames", level = AccessLevel.PACKAGE)</code> for example. The default inner type name can also be modified via configuration key <code>lombok.fieldNameConstants.innerTypeName</code>. The generated fields are always <code>public</code>.
</p><p>
Must be applied to classes (or enums, though you'd rarely want to do that). By default includes all non-transient, non-static fields. You can use <code>@FieldNameConstants.Include</code> in fields + <code>@FieldNameConstants(onlyExplicitlyIncluded = true)</code>, or <code>@FieldNameConstants.Exclude</code> for more fine-grained control.
</p>
diff --git a/website/usageExamples/ValueExample_pre.jpage b/website/usageExamples/ValueExample_pre.jpage
index d9550c25..27b28eb7 100644
--- a/website/usageExamples/ValueExample_pre.jpage
+++ b/website/usageExamples/ValueExample_pre.jpage
@@ -1,12 +1,12 @@
import lombok.AccessLevel;
import lombok.experimental.NonFinal;
import lombok.experimental.Value;
-import lombok.experimental.Wither;
+import lombok.experimental.With;
import lombok.ToString;
@Value public class ValueExample {
String name;
- @Wither(AccessLevel.PACKAGE) @NonFinal int age;
+ @With(AccessLevel.PACKAGE) @NonFinal int age;
double score;
protected String[] tags;
generated by cgit (git 2.46.0) at 2025-03-02 18:31:12 +0000