From 05b8501071b7a7d1a31713c607785b94119767d0 Mon Sep 17 00:00:00 2001 From: Jan Ouwens Date: Sun, 11 Aug 2013 21:13:16 +0200 Subject: Oops: didn't realise the text appeared in multiple places. --- .../EqualsAndHashCodeWithSomeExistingMethods.java.messages | 4 ++-- .../EqualsAndHashCodeWithSomeExistingMethods.java.messages | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/transform/resource/messages-delombok/EqualsAndHashCodeWithSomeExistingMethods.java.messages b/test/transform/resource/messages-delombok/EqualsAndHashCodeWithSomeExistingMethods.java.messages index 9a0b29f3..0b72b14f 100644 --- a/test/transform/resource/messages-delombok/EqualsAndHashCodeWithSomeExistingMethods.java.messages +++ b/test/transform/resource/messages-delombok/EqualsAndHashCodeWithSomeExistingMethods.java.messages @@ -1,2 +1,2 @@ -4:1 Not generating equals: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). -15:1 Not generating equals and hashCode: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). +4:1 Not generating equals: One of equals, hashCode, and canEqual exists. You should either write all of these or none of these (in the latter case, lombok generates them). +15:1 Not generating equals and hashCode: One of equals, hashCode, and canEqual exists. You should either write all of these or none of these (in the latter case, lombok generates them). diff --git a/test/transform/resource/messages-ecj/EqualsAndHashCodeWithSomeExistingMethods.java.messages b/test/transform/resource/messages-ecj/EqualsAndHashCodeWithSomeExistingMethods.java.messages index cf6ebea2..227ca9a6 100644 --- a/test/transform/resource/messages-ecj/EqualsAndHashCodeWithSomeExistingMethods.java.messages +++ b/test/transform/resource/messages-ecj/EqualsAndHashCodeWithSomeExistingMethods.java.messages @@ -1,2 +1,2 @@ -4:57 Not generating equals: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). -15:194 Not generating equals and hashCode: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). +4:57 Not generating equals: One of equals, hashCode, and canEqual exists. You should either write all of these or none of these (in the latter case, lombok generates them). +15:194 Not generating equals and hashCode: One of equals, hashCode, and canEqual exists. You should either write all of these or none of these (in the latter case, lombok generates them). -- cgit From 95cf815285ee736d3bc8119773139cb4fe0c1fb4 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 12 Aug 2013 22:51:13 +0200 Subject: replaced double underscore as new standard way of writing the dummy annotation for onX instead of single underscore, which emits warnings on javac8+. Also made dollars and Xes legal in addition to underscores, in case double underscore disappears later too. --- test/transform/resource/before/Constructors.java | 2 +- test/transform/resource/before/GetterOnMethod.java | 4 ++-- test/transform/resource/before/GetterOnMethodErrors.java | 2 +- test/transform/resource/before/GetterOnMethodErrors2.java | 14 +++++++------- test/transform/resource/before/SetterOnMethodOnParam.java | 4 ++-- .../messages-delombok/GetterOnMethodErrors2.java.messages | 8 ++++---- .../messages-ecj/GetterOnMethodErrors2.java.messages | 8 ++++---- 7 files changed, 21 insertions(+), 21 deletions(-) (limited to 'test') diff --git a/test/transform/resource/before/Constructors.java b/test/transform/resource/before/Constructors.java index 0ab7b7f0..45b3a199 100644 --- a/test/transform/resource/before/Constructors.java +++ b/test/transform/resource/before/Constructors.java @@ -10,7 +10,7 @@ final int x; String name; } -@lombok.RequiredArgsConstructor(onConstructor=@_(@Deprecated)) class RequiredArgsConstructorWithAnnotations { +@lombok.RequiredArgsConstructor(onConstructor=@__(@Deprecated)) class RequiredArgsConstructorWithAnnotations { final int x; String name; } diff --git a/test/transform/resource/before/GetterOnMethod.java b/test/transform/resource/before/GetterOnMethod.java index 558f3f64..3e56a66e 100644 --- a/test/transform/resource/before/GetterOnMethod.java +++ b/test/transform/resource/before/GetterOnMethod.java @@ -1,6 +1,6 @@ class GetterOnMethod { - @lombok.Getter(onMethod=@_(@Deprecated)) int i; - @lombok.Getter(onMethod=@_({@java.lang.Deprecated, @Test})) int j, k; + @lombok.Getter(onMethod=@__(@Deprecated)) int i; + @lombok.Getter(onMethod=@__({@java.lang.Deprecated, @Test})) int j, k; public @interface Test { } diff --git a/test/transform/resource/before/GetterOnMethodErrors.java b/test/transform/resource/before/GetterOnMethodErrors.java index ae5d5b54..ec4704f0 100644 --- a/test/transform/resource/before/GetterOnMethodErrors.java +++ b/test/transform/resource/before/GetterOnMethodErrors.java @@ -1,6 +1,6 @@ class PlaceFillerToMakeSurePositionIsRelevant { } -@lombok.Getter(onMethod=@_(@Deprecated)) +@lombok.Getter(onMethod=@__(@Deprecated)) class GetterOnMethodErrors { private int test; } diff --git a/test/transform/resource/before/GetterOnMethodErrors2.java b/test/transform/resource/before/GetterOnMethodErrors2.java index 423183b9..2fd98c83 100644 --- a/test/transform/resource/before/GetterOnMethodErrors2.java +++ b/test/transform/resource/before/GetterOnMethodErrors2.java @@ -1,12 +1,12 @@ class GetterOnMethodErrors2 { @lombok.Getter(onMethod=@_A_(@Deprecated)) private int bad1; - @lombok.Getter(onMethod=@_(5)) private int bad2; - @lombok.Getter(onMethod=@_({@Deprecated, 5})) private int bad3; - @lombok.Getter(onMethod=@_(bar=@Deprecated)) private int bad4; - @lombok.Getter(onMethod=@_) private int good1; - @lombok.Getter(onMethod=@_()) private int good2; - @lombok.Getter(onMethod=@_(value=@Deprecated)) private int good3; - @lombok.Getter(onMethod=@_(value={@Deprecated, @Test})) private int good4; + @lombok.Getter(onMethod=@__(5)) private int bad2; + @lombok.Getter(onMethod=@__({@Deprecated, 5})) private int bad3; + @lombok.Getter(onMethod=@$(bar=@Deprecated)) private int bad4; + @lombok.Getter(onMethod=@__) private int good1; + @lombok.Getter(onMethod=@X()) private int good2; + @lombok.Getter(onMethod=@__(value=@Deprecated)) private int good3; + @lombok.Getter(onMethod=@xXx$$(value={@Deprecated, @Test})) private int good4; public @interface Test { } } diff --git a/test/transform/resource/before/SetterOnMethodOnParam.java b/test/transform/resource/before/SetterOnMethodOnParam.java index 70f3dc8c..4e042cf4 100644 --- a/test/transform/resource/before/SetterOnMethodOnParam.java +++ b/test/transform/resource/before/SetterOnMethodOnParam.java @@ -1,6 +1,6 @@ class SetterOnMethodOnParam { - @lombok.Setter(onMethod=@_(@Deprecated)) int i; - @lombok.Setter(onMethod=@_({@java.lang.Deprecated, @Test}), onParam=@_(@Test)) int j, k; + @lombok.Setter(onMethod=@__(@Deprecated)) int i; + @lombok.Setter(onMethod=@__({@java.lang.Deprecated, @Test}), onParam=@__(@Test)) int j, k; public @interface Test { } diff --git a/test/transform/resource/messages-delombok/GetterOnMethodErrors2.java.messages b/test/transform/resource/messages-delombok/GetterOnMethodErrors2.java.messages index ead040a5..b5bad45b 100644 --- a/test/transform/resource/messages-delombok/GetterOnMethodErrors2.java.messages +++ b/test/transform/resource/messages-delombok/GetterOnMethodErrors2.java.messages @@ -1,4 +1,4 @@ -2:9 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) -3:9 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) -4:9 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) -5:9 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +2:9 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) +3:9 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) +4:9 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) +5:9 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) diff --git a/test/transform/resource/messages-ecj/GetterOnMethodErrors2.java.messages b/test/transform/resource/messages-ecj/GetterOnMethodErrors2.java.messages index 6b949f41..f87b9f13 100644 --- a/test/transform/resource/messages-ecj/GetterOnMethodErrors2.java.messages +++ b/test/transform/resource/messages-ecj/GetterOnMethodErrors2.java.messages @@ -1,4 +1,4 @@ -2:31 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) -3:93 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) -4:143 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) -5:208 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +2:31 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) +3:93 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) +4:144 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) +5:210 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) -- cgit From b93318da303b36957f3774015090121af778665f Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Wed, 14 Aug 2013 07:05:31 +0200 Subject: * Fixed 553: @XArgsConstructor (and @Builder on a class) did not look at @Accessors to handle field accessors. * various operations on names in javac were really slow; they are faster now. --- .../after-delombok/BuilderWithAccessors.java | 65 ++++++++++++++++++++++ .../after-delombok/ConstructorsWithAccessors.java | 15 +++++ .../resource/after-ecj/BuilderWithAccessors.java | 47 ++++++++++++++++ .../after-ecj/ConstructorsWithAccessors.java | 13 +++++ .../resource/before/BuilderWithAccessors.java | 7 +++ .../resource/before/ConstructorsWithAccessors.java | 6 ++ 6 files changed, 153 insertions(+) create mode 100644 test/transform/resource/after-delombok/BuilderWithAccessors.java create mode 100644 test/transform/resource/after-delombok/ConstructorsWithAccessors.java create mode 100644 test/transform/resource/after-ecj/BuilderWithAccessors.java create mode 100644 test/transform/resource/after-ecj/ConstructorsWithAccessors.java create mode 100644 test/transform/resource/before/BuilderWithAccessors.java create mode 100644 test/transform/resource/before/ConstructorsWithAccessors.java (limited to 'test') diff --git a/test/transform/resource/after-delombok/BuilderWithAccessors.java b/test/transform/resource/after-delombok/BuilderWithAccessors.java new file mode 100644 index 00000000..503c33be --- /dev/null +++ b/test/transform/resource/after-delombok/BuilderWithAccessors.java @@ -0,0 +1,65 @@ +class BuilderWithAccessors { + private final int plower; + private final int pUpper; + private int _foo; + private int __bar; + @java.lang.SuppressWarnings("all") + BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { + this.plower = plower; + this.pUpper = upper; + this._foo = foo; + this.__bar = _bar; + } + @java.lang.SuppressWarnings("all") + public static class BuilderWithAccessorsBuilder { + private int plower; + private int upper; + private int foo; + private int _bar; + + @java.lang.SuppressWarnings("all") + BuilderWithAccessorsBuilder() { + + } + + @java.lang.SuppressWarnings("all") + public BuilderWithAccessorsBuilder plower(final int plower) { + this.plower = plower; + return this; + } + + @java.lang.SuppressWarnings("all") + public BuilderWithAccessorsBuilder upper(final int upper) { + this.upper = upper; + return this; + } + + @java.lang.SuppressWarnings("all") + public BuilderWithAccessorsBuilder foo(final int foo) { + this.foo = foo; + return this; + } + + @java.lang.SuppressWarnings("all") + public BuilderWithAccessorsBuilder _bar(final int _bar) { + this._bar = _bar; + return this; + } + + @java.lang.SuppressWarnings("all") + public BuilderWithAccessors build() { + return new BuilderWithAccessors(plower, upper, foo, _bar); + } + + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")"; + } + } + + @java.lang.SuppressWarnings("all") + public static BuilderWithAccessorsBuilder builder() { + return new BuilderWithAccessorsBuilder(); + } +} \ No newline at end of file diff --git a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java new file mode 100644 index 00000000..9937c7ee --- /dev/null +++ b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java @@ -0,0 +1,15 @@ +class ConstructorsWithAccessors { + int plower; + int pUpper; + int _huh; + int __huh2; + + @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) + @java.lang.SuppressWarnings("all") + public ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { + this.plower = plower; + this.pUpper = upper; + this._huh = huh; + this.__huh2 = _huh2; + } +} diff --git a/test/transform/resource/after-ecj/BuilderWithAccessors.java b/test/transform/resource/after-ecj/BuilderWithAccessors.java new file mode 100644 index 00000000..79776dc4 --- /dev/null +++ b/test/transform/resource/after-ecj/BuilderWithAccessors.java @@ -0,0 +1,47 @@ +@lombok.experimental.Builder @lombok.experimental.Accessors(prefix = {"p", "_"}) class BuilderWithAccessors { + public static @java.lang.SuppressWarnings("all") class BuilderWithAccessorsBuilder { + private int plower; + private int upper; + private int foo; + private int _bar; + @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder() { + super(); + } + public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder plower(final int plower) { + this.plower = plower; + return this; + } + public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder upper(final int upper) { + this.upper = upper; + return this; + } + public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder foo(final int foo) { + this.foo = foo; + return this; + } + public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder _bar(final int _bar) { + this._bar = _bar; + return this; + } + public @java.lang.SuppressWarnings("all") BuilderWithAccessors build() { + return new BuilderWithAccessors(plower, upper, foo, _bar); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + return (((((((("BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower) + ", upper=") + this.upper) + ", foo=") + this.foo) + ", _bar=") + this._bar) + ")"); + } + } + private final int plower; + private final int pUpper; + private int _foo; + private int __bar; + @java.lang.SuppressWarnings("all") BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { + super(); + this.plower = plower; + this.pUpper = upper; + this._foo = foo; + this.__bar = _bar; + } + public static @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder builder() { + return new BuilderWithAccessorsBuilder(); + } +} diff --git a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java new file mode 100644 index 00000000..0df8fbe1 --- /dev/null +++ b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java @@ -0,0 +1,13 @@ +@lombok.AllArgsConstructor @lombok.experimental.Accessors(prefix = {"p", "_"}) class ConstructorsWithAccessors { + int plower; + int pUpper; + int _huh; + int __huh2; + public @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) @java.lang.SuppressWarnings("all") ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) { + super(); + this.plower = plower; + this.pUpper = upper; + this._huh = huh; + this.__huh2 = _huh2; + } +} diff --git a/test/transform/resource/before/BuilderWithAccessors.java b/test/transform/resource/before/BuilderWithAccessors.java new file mode 100644 index 00000000..4f5660a1 --- /dev/null +++ b/test/transform/resource/before/BuilderWithAccessors.java @@ -0,0 +1,7 @@ +@lombok.experimental.Builder @lombok.experimental.Accessors(prefix={"p", "_"}) +class BuilderWithAccessors { + private final int plower; + private final int pUpper; + private int _foo; + private int __bar; +} diff --git a/test/transform/resource/before/ConstructorsWithAccessors.java b/test/transform/resource/before/ConstructorsWithAccessors.java new file mode 100644 index 00000000..d242317d --- /dev/null +++ b/test/transform/resource/before/ConstructorsWithAccessors.java @@ -0,0 +1,6 @@ +@lombok.AllArgsConstructor @lombok.experimental.Accessors(prefix={"p", "_"}) class ConstructorsWithAccessors { + int plower; + int pUpper; + int _huh; + int __huh2; +} -- cgit From bad93ae677622c79883f658a53484d455e36ce9a Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Mon, 19 Aug 2013 23:50:57 +0200 Subject: Only look at the line number for errors and warnings. --- test/core/src/lombok/CompilerMessageMatcher.java | 14 +++++--------- test/core/src/lombok/RunTestsViaEcj.java | 2 +- .../resource/messages-delombok/Accessors.java.messages | 2 +- .../messages-delombok/BuilderInvalidUse.java.messages | 4 ++-- .../ConflictingStaticConstructorNames.java.messages | 2 +- .../EqualsAndHashCodeWithExistingMethods.java.messages | 6 +++--- ...qualsAndHashCodeWithSomeExistingMethods.java.messages | 4 ++-- .../messages-delombok/FieldDefaultsNoop.java.messages | 2 +- .../messages-delombok/GetterAlreadyExists.java.messages | 16 ++++++++-------- .../messages-delombok/GetterBoolean.java.messages | 2 +- .../messages-delombok/GetterLazyInvalid.java.messages | 12 ++++++------ .../messages-delombok/GetterOnMethodErrors.java.messages | 2 +- .../GetterOnMethodErrors2.java.messages | 8 ++++---- .../LoggerSlf4jAlreadyExists.java.messages | 2 +- .../LoggerSlf4jOnNonStaticInnerClass.java.messages | 2 +- .../messages-delombok/LoggerSlf4jOnNonType.java.messages | 2 +- .../messages-delombok/LoggerSlf4jTypes.java.messages | 4 ++-- .../messages-delombok/NonNullOnParameter.java.messages | 2 +- .../messages-delombok/NonNullPlain.java.messages | 2 +- .../messages-delombok/SetterAlreadyExists.java.messages | 14 +++++++------- .../messages-delombok/SetterOnMethod.java.messages | 14 +++++++------- .../messages-delombok/SetterOnParam.java.messages | 14 +++++++------- .../SetterOnParamAndOnMethod.java.messages | 4 ++-- .../messages-delombok/SimpleTypeResolution.java.messages | 2 +- .../SynchronizedNameNoSuchField.java.messages | 2 +- .../SynchronizedNameStaticToInstanceRef.java.messages | 2 +- .../resource/messages-delombok/ValErrors.java.messages | 4 ++-- .../messages-delombok/ValInBasicFor.java.messages | 2 +- .../messages-delombok/WitherAlreadyExists.java.messages | 14 +++++++------- .../messages-delombok/WitherOnStatic.java.messages | 4 ++-- .../messages-delombok/WitherWithDollar.java.messages | 2 +- .../resource/messages-ecj/Accessors.java.messages | 2 +- .../messages-ecj/BuilderInvalidUse.java.messages | 4 ++-- .../ConflictingStaticConstructorNames.java.messages | 2 +- .../EqualsAndHashCodeWithExistingMethods.java.messages | 6 +++--- ...qualsAndHashCodeWithSomeExistingMethods.java.messages | 4 ++-- .../messages-ecj/FieldDefaultsNoop.java.messages | 2 +- .../messages-ecj/GetterAlreadyExists.java.messages | 16 ++++++++-------- .../resource/messages-ecj/GetterBoolean.java.messages | 2 +- .../messages-ecj/GetterLazyInvalid.java.messages | 12 ++++++------ .../messages-ecj/GetterOnMethodErrors.java.messages | 2 +- .../messages-ecj/GetterOnMethodErrors2.java.messages | 8 ++++---- .../messages-ecj/LoggerSlf4jAlreadyExists.java.messages | 2 +- .../LoggerSlf4jOnNonStaticInnerClass.java.messages | 2 +- .../messages-ecj/LoggerSlf4jOnNonType.java.messages | 2 +- .../resource/messages-ecj/LoggerSlf4jTypes.java.messages | 4 ++-- .../messages-ecj/NonNullOnParameter.java.messages | 6 +++--- .../resource/messages-ecj/NonNullPlain.java.messages | 2 +- .../messages-ecj/SetterAlreadyExists.java.messages | 14 +++++++------- .../resource/messages-ecj/SetterOnMethod.java.messages | 4 ++-- .../resource/messages-ecj/SetterOnParam.java.messages | 4 ++-- .../messages-ecj/SimpleTypeResolution.java.messages | 2 +- .../resource/messages-ecj/SynchronizedName.java.messages | 2 +- .../SynchronizedNameNoSuchField.java.messages | 2 +- .../SynchronizedNameStaticToInstanceRef.java.messages | 2 +- .../resource/messages-ecj/ValErrors.java.messages | 4 ++-- .../resource/messages-ecj/ValInBasicFor.java.messages | 8 ++++---- .../resource/messages-ecj/ValRawType.java.messages | 2 +- .../messages-ecj/ValueExperimental.java.messages | 2 +- .../messages-ecj/WitherAlreadyExists.java.messages | 14 +++++++------- .../resource/messages-ecj/WitherOnStatic.java.messages | 4 ++-- .../resource/messages-ecj/WitherWithDollar.java.messages | 2 +- .../messages-idempotent/NonNullOnParameter.java.messages | 2 +- .../messages-idempotent/NonNullPlain.java.messages | 6 +++--- .../SimpleTypeResolution.java.messages | 2 +- .../SynchronizedNameStaticToInstanceRef.java.messages | 2 +- .../resource/messages-idempotent/ValErrors.java.messages | 6 +++--- .../messages-idempotent/ValInBasicFor.java.messages | 2 +- 68 files changed, 164 insertions(+), 168 deletions(-) (limited to 'test') diff --git a/test/core/src/lombok/CompilerMessageMatcher.java b/test/core/src/lombok/CompilerMessageMatcher.java index af12e199..db288749 100644 --- a/test/core/src/lombok/CompilerMessageMatcher.java +++ b/test/core/src/lombok/CompilerMessageMatcher.java @@ -38,30 +38,26 @@ public class CompilerMessageMatcher { /** Line Number (starting at 1) */ private final long line; - /** Position is either column number, OR position in file starting from the first byte. */ - private final long position; private final Collection messageParts; - public CompilerMessageMatcher(long line, long position, String message) { + public CompilerMessageMatcher(long line, String message) { this.line = line; - this.position = position; this.messageParts = Arrays.asList(message.split("\\s+")); } public static CompilerMessageMatcher asCompilerMessageMatcher(CompilerMessage message) { - return new CompilerMessageMatcher(message.getLine(), message.getColumnOrPosition(), message.getMessage()); + return new CompilerMessageMatcher(message.getLine(), message.getMessage()); } @Override public String toString() { StringBuilder parts = new StringBuilder(); for (String part : messageParts) parts.append(part).append(" "); if (parts.length() > 0) parts.setLength(parts.length() - 1); - return String.format("%d:%d %s", line, position, parts); + return String.format("%d %s", line, parts); } public boolean matches(CompilerMessage message) { if (message.getLine() != this.line) return false; - if (message.getColumnOrPosition() != this.position) return false; for (String token : messageParts) { if (!message.getMessage().contains(token)) return false; } @@ -78,12 +74,12 @@ public class CompilerMessageMatcher { return out; } - private static final Pattern PATTERN = Pattern.compile("^(\\d+):(\\d+) (.*)$"); + private static final Pattern PATTERN = Pattern.compile("^(\\d+) (.*)$"); private static CompilerMessageMatcher read(String line) { line = line.trim(); if (line.isEmpty()) return null; Matcher m = PATTERN.matcher(line); if (!m.matches()) throw new IllegalArgumentException("Typo in test file: " + line); - return new CompilerMessageMatcher(Integer.parseInt(m.group(1)), Integer.parseInt(m.group(2)), m.group(3)); + return new CompilerMessageMatcher(Integer.parseInt(m.group(1)), m.group(2)); } } diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java index f7294f1f..586c124a 100644 --- a/test/core/src/lombok/RunTestsViaEcj.java +++ b/test/core/src/lombok/RunTestsViaEcj.java @@ -112,7 +112,7 @@ public class RunTestsViaEcj extends AbstractRunTests { CategorizedProblem[] problems = compilationResult.getAllProblems(); if (problems != null) for (CategorizedProblem p : problems) { - messages.add(new CompilerMessage(p.getSourceLineNumber(), p.getSourceStart(), p.getSourceStart(), p.isError(), p.getMessage())); + messages.add(new CompilerMessage(p.getSourceLineNumber(), p.getSourceStart(), p.isError(), p.getMessage())); } CompilationUnitDeclaration cud = compilationUnit_.get(); diff --git a/test/transform/resource/messages-delombok/Accessors.java.messages b/test/transform/resource/messages-delombok/Accessors.java.messages index 367621bd..265bc745 100644 --- a/test/transform/resource/messages-delombok/Accessors.java.messages +++ b/test/transform/resource/messages-delombok/Accessors.java.messages @@ -1 +1 @@ -19:9 Not generating setter for this field: It does not fit your @Accessors prefix list. \ No newline at end of file +19 Not generating setter for this field: It does not fit your @Accessors prefix list. \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/BuilderInvalidUse.java.messages b/test/transform/resource/messages-delombok/BuilderInvalidUse.java.messages index aeeb0c86..a04b4f9b 100644 --- a/test/transform/resource/messages-delombok/BuilderInvalidUse.java.messages +++ b/test/transform/resource/messages-delombok/BuilderInvalidUse.java.messages @@ -1,2 +1,2 @@ -1:1 @Getter, @Setter, @Wither, @Data, @ToString, @EqualsAndHashCode, @AllArgsConstructor are not allowed on builder classes. -12:1 @Value is not allowed on builder classes. \ No newline at end of file +1 @Getter, @Setter, @Wither, @Data, @ToString, @EqualsAndHashCode, @AllArgsConstructor are not allowed on builder classes. +12 @Value is not allowed on builder classes. \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/ConflictingStaticConstructorNames.java.messages b/test/transform/resource/messages-delombok/ConflictingStaticConstructorNames.java.messages index 06b88c10..4f915bbe 100644 --- a/test/transform/resource/messages-delombok/ConflictingStaticConstructorNames.java.messages +++ b/test/transform/resource/messages-delombok/ConflictingStaticConstructorNames.java.messages @@ -1 +1 @@ -1:1 Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used. +1 Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used. diff --git a/test/transform/resource/messages-delombok/EqualsAndHashCodeWithExistingMethods.java.messages b/test/transform/resource/messages-delombok/EqualsAndHashCodeWithExistingMethods.java.messages index 057a7521..b3490fd0 100644 --- a/test/transform/resource/messages-delombok/EqualsAndHashCodeWithExistingMethods.java.messages +++ b/test/transform/resource/messages-delombok/EqualsAndHashCodeWithExistingMethods.java.messages @@ -1,3 +1,3 @@ -1:1 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). -10:1 Not generating equals and hashCode: A method with one of those names already exists. (Either all or none of these methods will be generated). -19:1 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). +1 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). +10 Not generating equals and hashCode: A method with one of those names already exists. (Either all or none of these methods will be generated). +19 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). diff --git a/test/transform/resource/messages-delombok/EqualsAndHashCodeWithSomeExistingMethods.java.messages b/test/transform/resource/messages-delombok/EqualsAndHashCodeWithSomeExistingMethods.java.messages index 9a0b29f3..f5dfd559 100644 --- a/test/transform/resource/messages-delombok/EqualsAndHashCodeWithSomeExistingMethods.java.messages +++ b/test/transform/resource/messages-delombok/EqualsAndHashCodeWithSomeExistingMethods.java.messages @@ -1,2 +1,2 @@ -4:1 Not generating equals: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). -15:1 Not generating equals and hashCode: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). +4 Not generating equals: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). +15 Not generating equals and hashCode: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). diff --git a/test/transform/resource/messages-delombok/FieldDefaultsNoop.java.messages b/test/transform/resource/messages-delombok/FieldDefaultsNoop.java.messages index ae5dd265..9fac15c4 100644 --- a/test/transform/resource/messages-delombok/FieldDefaultsNoop.java.messages +++ b/test/transform/resource/messages-delombok/FieldDefaultsNoop.java.messages @@ -1 +1 @@ -1:1 This does nothing; provide either level or makeFinal or both. \ No newline at end of file +1 This does nothing; provide either level or makeFinal or both. \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/GetterAlreadyExists.java.messages b/test/transform/resource/messages-delombok/GetterAlreadyExists.java.messages index 7a326742..7d99aa69 100644 --- a/test/transform/resource/messages-delombok/GetterAlreadyExists.java.messages +++ b/test/transform/resource/messages-delombok/GetterAlreadyExists.java.messages @@ -1,8 +1,8 @@ -8:9 Not generating isFoo(): A method with that name already exists -14:9 Not generating isFoo(): A method with that name already exists (getFoo) -32:9 Not generating getFoo(): A method with that name already exists -50:9 Not generating getFoo(): A method with that name already exists -62:9 Not generating isFoo(): A method with that name already exists -68:9 Not generating isFoo(): A method with that name already exists (getFoo) -86:9 Not generating getFoo(): A method with that name already exists -104:9 Not generating getFoo(): A method with that name already exists +8 Not generating isFoo(): A method with that name already exists +14 Not generating isFoo(): A method with that name already exists (getFoo) +32 Not generating getFoo(): A method with that name already exists +50 Not generating getFoo(): A method with that name already exists +62 Not generating isFoo(): A method with that name already exists +68 Not generating isFoo(): A method with that name already exists (getFoo) +86 Not generating getFoo(): A method with that name already exists +104 Not generating getFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-delombok/GetterBoolean.java.messages b/test/transform/resource/messages-delombok/GetterBoolean.java.messages index 91ad3512..ab9d659d 100644 --- a/test/transform/resource/messages-delombok/GetterBoolean.java.messages +++ b/test/transform/resource/messages-delombok/GetterBoolean.java.messages @@ -1 +1 @@ -13:9 Not generating isFoo(): A method with that name already exists (getFoo) \ No newline at end of file +13 Not generating isFoo(): A method with that name already exists (getFoo) \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/GetterLazyInvalid.java.messages b/test/transform/resource/messages-delombok/GetterLazyInvalid.java.messages index 5c72fd56..5cb47108 100644 --- a/test/transform/resource/messages-delombok/GetterLazyInvalid.java.messages +++ b/test/transform/resource/messages-delombok/GetterLazyInvalid.java.messages @@ -1,6 +1,6 @@ -2:9 'lazy' requires the field to be private and final. -6:9 'lazy' requires the field to be private and final. -10:9 'lazy' requires the field to be private and final. -14:9 'lazy' does not work with AccessLevel.NONE. -17:1 'lazy' is not supported for @Getter on a type. -22:9 'lazy' requires field initialization. \ No newline at end of file +2 'lazy' requires the field to be private and final. +6 'lazy' requires the field to be private and final. +10 'lazy' requires the field to be private and final. +14 'lazy' does not work with AccessLevel.NONE. +17 'lazy' is not supported for @Getter on a type. +22 'lazy' requires field initialization. \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/GetterOnMethodErrors.java.messages b/test/transform/resource/messages-delombok/GetterOnMethodErrors.java.messages index 4c82f730..26c30298 100644 --- a/test/transform/resource/messages-delombok/GetterOnMethodErrors.java.messages +++ b/test/transform/resource/messages-delombok/GetterOnMethodErrors.java.messages @@ -1 +1 @@ -3:1 'onMethod' is not supported for @Getter on a type. \ No newline at end of file +3 'onMethod' is not supported for @Getter on a type. \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/GetterOnMethodErrors2.java.messages b/test/transform/resource/messages-delombok/GetterOnMethodErrors2.java.messages index b5bad45b..af1e3b7a 100644 --- a/test/transform/resource/messages-delombok/GetterOnMethodErrors2.java.messages +++ b/test/transform/resource/messages-delombok/GetterOnMethodErrors2.java.messages @@ -1,4 +1,4 @@ -2:9 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) -3:9 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) -4:9 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) -5:9 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) +2 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +3 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +4 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +5 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages index 8aa22226..db5f9891 100644 --- a/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages +++ b/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages @@ -1 +1 @@ -1:1 Field 'log' already exists. +1 Field 'log' already exists. diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages index 570a169b..128a0c62 100644 --- a/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages +++ b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages @@ -1 +1 @@ -2:9 @Log is not legal on non-static inner classes. \ No newline at end of file +2 @Log is not legal on non-static inner classes. \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages index ebc23411..262fbb27 100644 --- a/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages +++ b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages @@ -1 +1 @@ -2:9 @Log is legal only on types. \ No newline at end of file +2 @Log is legal only on types. \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages index a525dd27..08f6bb7b 100644 --- a/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages +++ b/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages @@ -1,2 +1,2 @@ -1:1 @Log is legal only on classes and enums. -4:1 @Log is legal only on classes and enums. \ No newline at end of file +1 @Log is legal only on classes and enums. +4 @Log is legal only on classes and enums. \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/NonNullOnParameter.java.messages b/test/transform/resource/messages-delombok/NonNullOnParameter.java.messages index ac87adcd..042c97f8 100644 --- a/test/transform/resource/messages-delombok/NonNullOnParameter.java.messages +++ b/test/transform/resource/messages-delombok/NonNullOnParameter.java.messages @@ -1 +1 @@ -22:89 @NonNull is meaningless on a primitive. +22 @NonNull is meaningless on a primitive. diff --git a/test/transform/resource/messages-delombok/NonNullPlain.java.messages b/test/transform/resource/messages-delombok/NonNullPlain.java.messages index 67eb8abe..4033f645 100644 --- a/test/transform/resource/messages-delombok/NonNullPlain.java.messages +++ b/test/transform/resource/messages-delombok/NonNullPlain.java.messages @@ -1 +1 @@ -7:9 @NonNull is meaningless on a primitive. \ No newline at end of file +8 @NonNull is meaningless on a primitive. \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages b/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages index 9cece93c..4b1e209b 100644 --- a/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages +++ b/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages @@ -1,7 +1,7 @@ -2:9 Not generating setFoo(): A method with that name already exists -8:9 Not generating setFoo(): A method with that name already exists -14:9 Not generating setFoo(): A method with that name already exists -20:9 Not generating setFoo(): A method with that name already exists -38:9 Not generating setFoo(): A method with that name already exists -44:9 Not generating setFoo(): A method with that name already exists (setIsFoo) -50:9 Not generating setFoo(): A method with that name already exists +2 Not generating setFoo(): A method with that name already exists +8 Not generating setFoo(): A method with that name already exists +14 Not generating setFoo(): A method with that name already exists +20 Not generating setFoo(): A method with that name already exists +38 Not generating setFoo(): A method with that name already exists +44 Not generating setFoo(): A method with that name already exists (setIsFoo) +50 Not generating setFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-delombok/SetterOnMethod.java.messages b/test/transform/resource/messages-delombok/SetterOnMethod.java.messages index 9473d5b3..1be8f1ea 100644 --- a/test/transform/resource/messages-delombok/SetterOnMethod.java.messages +++ b/test/transform/resource/messages-delombok/SetterOnMethod.java.messages @@ -1,7 +1,7 @@ -3:34 incompatible types -4:44 incompatible types -6:26 incompatible types -11:26 incompatible types -14:44 incompatible types -6:1 'onMethod' is not supported for @Setter on a type. -11:1 'onMethod' is not supported for @Setter on a type. +3 incompatible types +4 incompatible types +6 incompatible types +11 incompatible types +14 incompatible types +6 'onMethod' is not supported for @Setter on a type. +11 'onMethod' is not supported for @Setter on a type. diff --git a/test/transform/resource/messages-delombok/SetterOnParam.java.messages b/test/transform/resource/messages-delombok/SetterOnParam.java.messages index b8c69eca..828d9511 100644 --- a/test/transform/resource/messages-delombok/SetterOnParam.java.messages +++ b/test/transform/resource/messages-delombok/SetterOnParam.java.messages @@ -1,7 +1,7 @@ -3:33 incompatible types -4:43 incompatible types -6:25 incompatible types -11:25 incompatible types -14:43 incompatible types -6:1 'onParam' is not supported for @Setter on a type. -11:1 'onParam' is not supported for @Setter on a type. +3 incompatible types +4 incompatible types +6 incompatible types +11 incompatible types +14 incompatible types +6 'onParam' is not supported for @Setter on a type. +11 'onParam' is not supported for @Setter on a type. diff --git a/test/transform/resource/messages-delombok/SetterOnParamAndOnMethod.java.messages b/test/transform/resource/messages-delombok/SetterOnParamAndOnMethod.java.messages index 7324f6f3..86cbd0e6 100644 --- a/test/transform/resource/messages-delombok/SetterOnParamAndOnMethod.java.messages +++ b/test/transform/resource/messages-delombok/SetterOnParamAndOnMethod.java.messages @@ -1,2 +1,2 @@ -2:34 incompatible types -2:54 incompatible types +2 incompatible types +2 incompatible types diff --git a/test/transform/resource/messages-delombok/SimpleTypeResolution.java.messages b/test/transform/resource/messages-delombok/SimpleTypeResolution.java.messages index 7acd35ed..ec74f090 100644 --- a/test/transform/resource/messages-delombok/SimpleTypeResolution.java.messages +++ b/test/transform/resource/messages-delombok/SimpleTypeResolution.java.messages @@ -1 +1 @@ -2:10 cannot find symbol +2 cannot find symbol diff --git a/test/transform/resource/messages-delombok/SynchronizedNameNoSuchField.java.messages b/test/transform/resource/messages-delombok/SynchronizedNameNoSuchField.java.messages index f282d34d..ae351773 100644 --- a/test/transform/resource/messages-delombok/SynchronizedNameNoSuchField.java.messages +++ b/test/transform/resource/messages-delombok/SynchronizedNameNoSuchField.java.messages @@ -1 +1 @@ -5:9 The field write does not exist. +5 The field write does not exist. diff --git a/test/transform/resource/messages-delombok/SynchronizedNameStaticToInstanceRef.java.messages b/test/transform/resource/messages-delombok/SynchronizedNameStaticToInstanceRef.java.messages index 5d6bc958..fe0653c8 100644 --- a/test/transform/resource/messages-delombok/SynchronizedNameStaticToInstanceRef.java.messages +++ b/test/transform/resource/messages-delombok/SynchronizedNameStaticToInstanceRef.java.messages @@ -1 +1 @@ -5:9 non-static variable read cannot be referenced from a static context \ No newline at end of file +5 non-static variable read cannot be referenced from a static context \ No newline at end of file diff --git a/test/transform/resource/messages-delombok/ValErrors.java.messages b/test/transform/resource/messages-delombok/ValErrors.java.messages index 887b8c21..bb33c6de 100644 --- a/test/transform/resource/messages-delombok/ValErrors.java.messages +++ b/test/transform/resource/messages-delombok/ValErrors.java.messages @@ -1,2 +1,2 @@ -5:21 Cannot use 'val' here because initializer expression does not have a representable type: Type cannot be resolved -9:21 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... }) +5 Cannot use 'val' here because initializer expression does not have a representable type: Type cannot be resolved +9 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... }) diff --git a/test/transform/resource/messages-delombok/ValInBasicFor.java.messages b/test/transform/resource/messages-delombok/ValInBasicFor.java.messages index 9bca1be6..7166b550 100644 --- a/test/transform/resource/messages-delombok/ValInBasicFor.java.messages +++ b/test/transform/resource/messages-delombok/ValInBasicFor.java.messages @@ -1 +1 @@ -6:53 'val' is not allowed in old-style for loops +6 'val' is not allowed in old-style for loops diff --git a/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages b/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages index b68f6398..d5e30e28 100644 --- a/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages +++ b/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages @@ -1,7 +1,7 @@ -2:9 Not generating withFoo(): A method with that name already exists -12:9 Not generating withFoo(): A method with that name already exists -22:9 Not generating withFoo(): A method with that name already exists -32:9 Not generating withFoo(): A method with that name already exists -62:9 Not generating withFoo(): A method with that name already exists -72:9 Not generating withFoo(): A method with that name already exists (withIsFoo) -82:9 Not generating withFoo(): A method with that name already exists +2 Not generating withFoo(): A method with that name already exists +12 Not generating withFoo(): A method with that name already exists +22 Not generating withFoo(): A method with that name already exists +32 Not generating withFoo(): A method with that name already exists +62 Not generating withFoo(): A method with that name already exists +72 Not generating withFoo(): A method with that name already exists (withIsFoo) +82 Not generating withFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-delombok/WitherOnStatic.java.messages b/test/transform/resource/messages-delombok/WitherOnStatic.java.messages index 9dd69e75..3af59fa1 100644 --- a/test/transform/resource/messages-delombok/WitherOnStatic.java.messages +++ b/test/transform/resource/messages-delombok/WitherOnStatic.java.messages @@ -1,2 +1,2 @@ -2:9 Not generating wither for this field: Withers cannot be generated for static fields. -3:9 Not generating wither for this field: Withers cannot be generated for static fields. +2 Not generating wither for this field: Withers cannot be generated for static fields. +3 Not generating wither for this field: Withers cannot be generated for static fields. diff --git a/test/transform/resource/messages-delombok/WitherWithDollar.java.messages b/test/transform/resource/messages-delombok/WitherWithDollar.java.messages index 74eeabba..84603868 100644 --- a/test/transform/resource/messages-delombok/WitherWithDollar.java.messages +++ b/test/transform/resource/messages-delombok/WitherWithDollar.java.messages @@ -1 +1 @@ -2:9 Not generating wither for this field: Withers cannot be generated for fields starting with $. +2 Not generating wither for this field: Withers cannot be generated for fields starting with $. diff --git a/test/transform/resource/messages-ecj/Accessors.java.messages b/test/transform/resource/messages-ecj/Accessors.java.messages index 3e6bbd69..c955f664 100644 --- a/test/transform/resource/messages-ecj/Accessors.java.messages +++ b/test/transform/resource/messages-ecj/Accessors.java.messages @@ -1 +1 @@ -19:530 Not generating setter for this field: It does not fit your @Accessors prefix list. +19 Not generating setter for this field: It does not fit your @Accessors prefix list. diff --git a/test/transform/resource/messages-ecj/BuilderInvalidUse.java.messages b/test/transform/resource/messages-ecj/BuilderInvalidUse.java.messages index 8ffc6e26..84942101 100644 --- a/test/transform/resource/messages-ecj/BuilderInvalidUse.java.messages +++ b/test/transform/resource/messages-ecj/BuilderInvalidUse.java.messages @@ -1,2 +1,2 @@ -1:0 @Getter, @Setter, @FieldDefaults, @Wither, @Data, @ToString, @EqualsAndHashCode, @AllArgsConstructor are not allowed on builder classes. -12:331 @Value is not allowed on builder classes. \ No newline at end of file +1 @Getter, @Setter, @FieldDefaults, @Wither, @Data, @ToString, @EqualsAndHashCode, @AllArgsConstructor are not allowed on builder classes. +12 @Value is not allowed on builder classes. \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages b/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages index 50f2e97f..4f915bbe 100644 --- a/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages +++ b/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages @@ -1 +1 @@ -1:0 Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used. +1 Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used. diff --git a/test/transform/resource/messages-ecj/EqualsAndHashCodeWithExistingMethods.java.messages b/test/transform/resource/messages-ecj/EqualsAndHashCodeWithExistingMethods.java.messages index db144316..b3490fd0 100644 --- a/test/transform/resource/messages-ecj/EqualsAndHashCodeWithExistingMethods.java.messages +++ b/test/transform/resource/messages-ecj/EqualsAndHashCodeWithExistingMethods.java.messages @@ -1,3 +1,3 @@ -1:0 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). -10:125 Not generating equals and hashCode: A method with one of those names already exists. (Either all or none of these methods will be generated). -19:274 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). +1 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). +10 Not generating equals and hashCode: A method with one of those names already exists. (Either all or none of these methods will be generated). +19 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). diff --git a/test/transform/resource/messages-ecj/EqualsAndHashCodeWithSomeExistingMethods.java.messages b/test/transform/resource/messages-ecj/EqualsAndHashCodeWithSomeExistingMethods.java.messages index cf6ebea2..f5dfd559 100644 --- a/test/transform/resource/messages-ecj/EqualsAndHashCodeWithSomeExistingMethods.java.messages +++ b/test/transform/resource/messages-ecj/EqualsAndHashCodeWithSomeExistingMethods.java.messages @@ -1,2 +1,2 @@ -4:57 Not generating equals: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). -15:194 Not generating equals and hashCode: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). +4 Not generating equals: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). +15 Not generating equals and hashCode: One of equals, hashCode, and canEqual exists. You should either write all of these are none of these (in the latter case, lombok generates them). diff --git a/test/transform/resource/messages-ecj/FieldDefaultsNoop.java.messages b/test/transform/resource/messages-ecj/FieldDefaultsNoop.java.messages index 5903679b..9fac15c4 100644 --- a/test/transform/resource/messages-ecj/FieldDefaultsNoop.java.messages +++ b/test/transform/resource/messages-ecj/FieldDefaultsNoop.java.messages @@ -1 +1 @@ -1:0 This does nothing; provide either level or makeFinal or both. \ No newline at end of file +1 This does nothing; provide either level or makeFinal or both. \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/GetterAlreadyExists.java.messages b/test/transform/resource/messages-ecj/GetterAlreadyExists.java.messages index ae62a1fb..7d99aa69 100644 --- a/test/transform/resource/messages-ecj/GetterAlreadyExists.java.messages +++ b/test/transform/resource/messages-ecj/GetterAlreadyExists.java.messages @@ -1,8 +1,8 @@ -8:102 Not generating isFoo(): A method with that name already exists -14:186 Not generating isFoo(): A method with that name already exists (getFoo) -32:436 Not generating getFoo(): A method with that name already exists -50:688 Not generating getFoo(): A method with that name already exists -62:868 Not generating isFoo(): A method with that name already exists -68:961 Not generating isFoo(): A method with that name already exists (getFoo) -86:1240 Not generating getFoo(): A method with that name already exists -104:1510 Not generating getFoo(): A method with that name already exists +8 Not generating isFoo(): A method with that name already exists +14 Not generating isFoo(): A method with that name already exists (getFoo) +32 Not generating getFoo(): A method with that name already exists +50 Not generating getFoo(): A method with that name already exists +62 Not generating isFoo(): A method with that name already exists +68 Not generating isFoo(): A method with that name already exists (getFoo) +86 Not generating getFoo(): A method with that name already exists +104 Not generating getFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-ecj/GetterBoolean.java.messages b/test/transform/resource/messages-ecj/GetterBoolean.java.messages index 8ae086f6..8ebf0a31 100644 --- a/test/transform/resource/messages-ecj/GetterBoolean.java.messages +++ b/test/transform/resource/messages-ecj/GetterBoolean.java.messages @@ -1 +1 @@ -13:220 Not generating isFoo(): A method with that name already exists (getFoo) +13 Not generating isFoo(): A method with that name already exists (getFoo) diff --git a/test/transform/resource/messages-ecj/GetterLazyInvalid.java.messages b/test/transform/resource/messages-ecj/GetterLazyInvalid.java.messages index 9ecf0fc0..b18843e6 100644 --- a/test/transform/resource/messages-ecj/GetterLazyInvalid.java.messages +++ b/test/transform/resource/messages-ecj/GetterLazyInvalid.java.messages @@ -1,6 +1,6 @@ -2:35 'lazy' requires the field to be private and final. -6:132 'lazy' requires the field to be private and final. -10:232 'lazy' requires the field to be private and final. -14:315 'lazy' does not work with AccessLevel.NONE. -17:412 'lazy' is not supported for @Getter on a type. -22:544 'lazy' requires field initialization. +2 'lazy' requires the field to be private and final. +6 'lazy' requires the field to be private and final. +10 'lazy' requires the field to be private and final. +14 'lazy' does not work with AccessLevel.NONE. +17 'lazy' is not supported for @Getter on a type. +22 'lazy' requires field initialization. diff --git a/test/transform/resource/messages-ecj/GetterOnMethodErrors.java.messages b/test/transform/resource/messages-ecj/GetterOnMethodErrors.java.messages index 804e8a3c..26c30298 100644 --- a/test/transform/resource/messages-ecj/GetterOnMethodErrors.java.messages +++ b/test/transform/resource/messages-ecj/GetterOnMethodErrors.java.messages @@ -1 +1 @@ -3:50 'onMethod' is not supported for @Getter on a type. \ No newline at end of file +3 'onMethod' is not supported for @Getter on a type. \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/GetterOnMethodErrors2.java.messages b/test/transform/resource/messages-ecj/GetterOnMethodErrors2.java.messages index f87b9f13..af1e3b7a 100644 --- a/test/transform/resource/messages-ecj/GetterOnMethodErrors2.java.messages +++ b/test/transform/resource/messages-ecj/GetterOnMethodErrors2.java.messages @@ -1,4 +1,4 @@ -2:31 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) -3:93 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) -4:144 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) -5:210 The correct format is @Getter(onMethod=@__({@SomeAnnotation, @SomeOtherAnnotation})) +2 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +3 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +4 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) +5 The correct format is @Getter(onMethod=@_({@SomeAnnotation, @SomeOtherAnnotation})) diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages index 859e29d8..db5f9891 100644 --- a/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages +++ b/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages @@ -1 +1 @@ -1:0 Field 'log' already exists. +1 Field 'log' already exists. diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages index 570a169b..128a0c62 100644 --- a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages +++ b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages @@ -1 +1 @@ -2:9 @Log is not legal on non-static inner classes. \ No newline at end of file +2 @Log is not legal on non-static inner classes. \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages index b6848135..81e9b718 100644 --- a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages +++ b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages @@ -1 +1 @@ -2:30 The annotation @Slf4j is disallowed for this location +2 The annotation @Slf4j is disallowed for this location diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages index b9f8b63f..949886d5 100644 --- a/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages +++ b/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages @@ -1,2 +1,2 @@ -1:0 @Slf4j is legal only on classes and enums. -4:67 @Slf4j is legal only on classes and enums. +1 @Slf4j is legal only on classes and enums. +4 @Slf4j is legal only on classes and enums. diff --git a/test/transform/resource/messages-ecj/NonNullOnParameter.java.messages b/test/transform/resource/messages-ecj/NonNullOnParameter.java.messages index 1539929b..4b7d18b3 100644 --- a/test/transform/resource/messages-ecj/NonNullOnParameter.java.messages +++ b/test/transform/resource/messages-ecj/NonNullOnParameter.java.messages @@ -1,3 +1,3 @@ -15:460 Dead code -22:683 @NonNull is meaningless on a primitive. -28:823 Dead code \ No newline at end of file +15 Dead code +22 @NonNull is meaningless on a primitive. +28 Dead code \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/NonNullPlain.java.messages b/test/transform/resource/messages-ecj/NonNullPlain.java.messages index 96eed252..1c33c701 100644 --- a/test/transform/resource/messages-ecj/NonNullPlain.java.messages +++ b/test/transform/resource/messages-ecj/NonNullPlain.java.messages @@ -1 +1 @@ -7:116 @NonNull is meaningless on a primitive. \ No newline at end of file +7 @NonNull is meaningless on a primitive. \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages b/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages index 5fc0a365..4b1e209b 100644 --- a/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages +++ b/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages @@ -1,7 +1,7 @@ -2:17 Not generating setFoo(): A method with that name already exists -8:96 Not generating setFoo(): A method with that name already exists -14:174 Not generating setFoo(): A method with that name already exists -20:252 Not generating setFoo(): A method with that name already exists -38:480 Not generating setFoo(): A method with that name already exists -44:570 Not generating setFoo(): A method with that name already exists (setIsFoo) -50:653 Not generating setFoo(): A method with that name already exists +2 Not generating setFoo(): A method with that name already exists +8 Not generating setFoo(): A method with that name already exists +14 Not generating setFoo(): A method with that name already exists +20 Not generating setFoo(): A method with that name already exists +38 Not generating setFoo(): A method with that name already exists +44 Not generating setFoo(): A method with that name already exists (setIsFoo) +50 Not generating setFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-ecj/SetterOnMethod.java.messages b/test/transform/resource/messages-ecj/SetterOnMethod.java.messages index ecfa3f69..8e7ff7f8 100644 --- a/test/transform/resource/messages-ecj/SetterOnMethod.java.messages +++ b/test/transform/resource/messages-ecj/SetterOnMethod.java.messages @@ -1,2 +1,2 @@ -6:0 'onMethod' is not supported for @Setter on a type. -11:0 'onMethod' is not supported for @Setter on a type. \ No newline at end of file +6 'onMethod' is not supported for @Setter on a type. +11 'onMethod' is not supported for @Setter on a type. \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/SetterOnParam.java.messages b/test/transform/resource/messages-ecj/SetterOnParam.java.messages index 7d0c4a1e..dbab4caa 100644 --- a/test/transform/resource/messages-ecj/SetterOnParam.java.messages +++ b/test/transform/resource/messages-ecj/SetterOnParam.java.messages @@ -1,2 +1,2 @@ -6:0 'onParam' is not supported for @Setter on a type. -11:0 'onParam' is not supported for @Setter on a type. \ No newline at end of file +6 'onParam' is not supported for @Setter on a type. +11 'onParam' is not supported for @Setter on a type. \ No newline at end of file diff --git a/test/transform/resource/messages-ecj/SimpleTypeResolution.java.messages b/test/transform/resource/messages-ecj/SimpleTypeResolution.java.messages index eb33b0df..87edc6c2 100644 --- a/test/transform/resource/messages-ecj/SimpleTypeResolution.java.messages +++ b/test/transform/resource/messages-ecj/SimpleTypeResolution.java.messages @@ -1 +1 @@ -2:35 Getter cannot be resolved to a type +2 Getter cannot be resolved to a type diff --git a/test/transform/resource/messages-ecj/SynchronizedName.java.messages b/test/transform/resource/messages-ecj/SynchronizedName.java.messages index 0ad3be0a..5322f9d2 100644 --- a/test/transform/resource/messages-ecj/SynchronizedName.java.messages +++ b/test/transform/resource/messages-ecj/SynchronizedName.java.messages @@ -1 +1 @@ -8:185 The static field SynchronizedName.READ should be accessed in a static way +8 The static field SynchronizedName.READ should be accessed in a static way diff --git a/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages b/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages index b07f020c..ae351773 100644 --- a/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages +++ b/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages @@ -1 +1 @@ -5:120 The field write does not exist. +5 The field write does not exist. diff --git a/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages b/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages index 834877ef..98b9c948 100644 --- a/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages +++ b/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages @@ -1 +1 @@ -5:127 Cannot make a static reference to the non-static field SynchronizedNameStaticToInstanceRef.read +5 Cannot make a static reference to the non-static field SynchronizedNameStaticToInstanceRef.read diff --git a/test/transform/resource/messages-ecj/ValErrors.java.messages b/test/transform/resource/messages-ecj/ValErrors.java.messages index fda58094..6d5