diff options
Diffstat (limited to 'test')
69 files changed, 129 insertions, 92 deletions
diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java index 2e89f99b..afba8c7f 100644 --- a/test/core/src/lombok/RunTestsViaEcj.java +++ b/test/core/src/lombok/RunTestsViaEcj.java @@ -156,7 +156,12 @@ public class RunTestsViaEcj extends AbstractRunTests { CompilationUnitDeclaration cud = compilationUnit_.get(); if (cud == null) result.append("---- No CompilationUnit provided by ecj ----"); - else result.append(cud.toString()); + else { + String output = cud.toString(); + // starting somewhere around ecj16, the print code is a bit too cavalier with printing modifiers. + output = output.replace("non-sealed @val", "@val"); + result.append(output); + } if (eclipseAvailable()) { EclipseDomConversion.toDomAst(cud, sourceArray); diff --git a/test/transform/resource/after-delombok/BuilderSimpleOnRecord.java b/test/transform/resource/after-delombok/BuilderSimpleOnRecord.java index aa35cf23..acb6f20a 100644 --- a/test/transform/resource/after-delombok/BuilderSimpleOnRecord.java +++ b/test/transform/resource/after-delombok/BuilderSimpleOnRecord.java @@ -1,6 +1,6 @@ // version 14: import java.util.List; -record BuilderSimpleOnRecord<T>(List<T> l, String a) { +public record BuilderSimpleOnRecord<T>(List<T> l, String a) { @java.lang.SuppressWarnings("all") protected static class BuilderSimpleOnRecordBuilder<T> { @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderSingularOnRecord.java b/test/transform/resource/after-delombok/BuilderSingularOnRecord.java index 41a976cd..0aaa12cd 100644 --- a/test/transform/resource/after-delombok/BuilderSingularOnRecord.java +++ b/test/transform/resource/after-delombok/BuilderSingularOnRecord.java @@ -1,7 +1,7 @@ // version 14: import java.util.Collection; import java.util.List; -record BuilderSingularOnRecord<T>(List<T> children, Collection<? extends Number> scarves, @SuppressWarnings("all") List rawList) { +public record BuilderSingularOnRecord<T>(List<T> children, Collection<? extends Number> scarves, @SuppressWarnings("all") List rawList) { @java.lang.SuppressWarnings("all") public static class BuilderSingularOnRecordBuilder<T> { @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/ConstructorsOnRecord.java b/test/transform/resource/after-delombok/ConstructorsOnRecord.java index 3d091bd5..1861fd22 100644 --- a/test/transform/resource/after-delombok/ConstructorsOnRecord.java +++ b/test/transform/resource/after-delombok/ConstructorsOnRecord.java @@ -1,3 +1,3 @@ // version 14: -record ConstructorsOnRecord(String a, String b) { +public record ConstructorsOnRecord(String a, String b) { } diff --git a/test/transform/resource/after-delombok/DataOnRecord.java b/test/transform/resource/after-delombok/DataOnRecord.java index 7fde94f9..e24c7fc2 100644 --- a/test/transform/resource/after-delombok/DataOnRecord.java +++ b/test/transform/resource/after-delombok/DataOnRecord.java @@ -1,3 +1,3 @@ // version 14: -record DataOnRecord(String a, String b) { +public record DataOnRecord(String a, String b) { } diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeOnRecord.java b/test/transform/resource/after-delombok/EqualsAndHashCodeOnRecord.java index 93213d80..c251a584 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeOnRecord.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeOnRecord.java @@ -1,3 +1,3 @@ // version 14: -record EqualsAndHashCodeOnRecord(String a, String b) { +public record EqualsAndHashCodeOnRecord(String a, String b) { } diff --git a/test/transform/resource/after-delombok/FieldDefaultsOnRecord.java b/test/transform/resource/after-delombok/FieldDefaultsOnRecord.java index a7b37d9f..fd5f0f95 100644 --- a/test/transform/resource/after-delombok/FieldDefaultsOnRecord.java +++ b/test/transform/resource/after-delombok/FieldDefaultsOnRecord.java @@ -1,3 +1,3 @@ // version 14: -record FieldDefaultsOnRecord(String a, String b) { +public record FieldDefaultsOnRecord(String a, String b) { } diff --git a/test/transform/resource/after-delombok/FieldNameConstantsOnRecord.java b/test/transform/resource/after-delombok/FieldNameConstantsOnRecord.java index 8f29cc96..ffaab75e 100644 --- a/test/transform/resource/after-delombok/FieldNameConstantsOnRecord.java +++ b/test/transform/resource/after-delombok/FieldNameConstantsOnRecord.java @@ -1,5 +1,5 @@ // version 14: -record FieldNameConstantsOnRecord(String iAmADvdPlayer, int $skipMe, int andMe, String butPrintMePlease) { +public record FieldNameConstantsOnRecord(String iAmADvdPlayer, int $skipMe, int andMe, String butPrintMePlease) { static double skipMeToo; @java.lang.SuppressWarnings("all") static final class Fields { diff --git a/test/transform/resource/after-delombok/GetterOnRecord.java b/test/transform/resource/after-delombok/GetterOnRecord.java index 5b7c5058..6318a6cc 100644 --- a/test/transform/resource/after-delombok/GetterOnRecord.java +++ b/test/transform/resource/after-delombok/GetterOnRecord.java @@ -1,3 +1,3 @@ // version 14: -record GetterOnRecord(String a, String b) { +public record GetterOnRecord(String a, String b) { } diff --git a/test/transform/resource/after-delombok/LoggerConfigOnRecord.java b/test/transform/resource/after-delombok/LoggerConfigOnRecord.java index 2ef0bffd..58d3fad0 100644 --- a/test/transform/resource/after-delombok/LoggerConfigOnRecord.java +++ b/test/transform/resource/after-delombok/LoggerConfigOnRecord.java @@ -1,3 +1,3 @@ // version 14: -record LoggerConfigOnRecord(String a, String b) { +public record LoggerConfigOnRecord(String a, String b) { } diff --git a/test/transform/resource/after-delombok/LoggerSlf4jOnRecord.java b/test/transform/resource/after-delombok/LoggerSlf4jOnRecord.java index caa2ce2c..831ac357 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4jOnRecord.java +++ b/test/transform/resource/after-delombok/LoggerSlf4jOnRecord.java @@ -1,5 +1,5 @@ // version 16: the SuppressWarnings is not emitted in java14/15 to work around a javac bug. -record LoggerSlf4jOnRecord(String a, String b) { +public record LoggerSlf4jOnRecord(String a, String b) { @java.lang.SuppressWarnings("all") private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOnRecord.class); } diff --git a/test/transform/resource/after-delombok/NonNullExistingConstructorOnRecord.java b/test/transform/resource/after-delombok/NonNullExistingConstructorOnRecord.java index 15e0aa66..45364815 100644 --- a/test/transform/resource/after-delombok/NonNullExistingConstructorOnRecord.java +++ b/test/transform/resource/after-delombok/NonNullExistingConstructorOnRecord.java @@ -1,14 +1,14 @@ -// version 14: +// version 16: import lombok.NonNull; -record NonNullOnRecord(@NonNull String a, @NonNull String b) { - public NonNullOnRecord(@NonNull String b) { +public record NonNullExistingConstructorOnRecord(@NonNull String a, @NonNull String b) { + public NonNullExistingConstructorOnRecord(@NonNull String b) { this("default", b); if (b == null) { throw new java.lang.NullPointerException("b is marked non-null but is null"); } } @java.lang.SuppressWarnings("all") - public NonNullOnRecord { + public NonNullExistingConstructorOnRecord { if (a == null) { throw new java.lang.NullPointerException("a is marked non-null but is null"); } diff --git a/test/transform/resource/after-delombok/NonNullOnRecord.java b/test/transform/resource/after-delombok/NonNullOnRecord.java index 7acfab36..465c30db 100644 --- a/test/transform/resource/after-delombok/NonNullOnRecord.java +++ b/test/transform/resource/after-delombok/NonNullOnRecord.java @@ -1,6 +1,6 @@ -// version 14: +// version 16: import lombok.NonNull; -record NonNullOnRecord(@NonNull String a, @NonNull String b) { +public record NonNullOnRecord(@NonNull String a, @NonNull String b) { @java.lang.SuppressWarnings("all") public NonNullOnRecord { if (a == null) { diff --git a/test/transform/resource/after-delombok/NonNullOnRecord2.java b/test/transform/resource/after-delombok/NonNullOnRecord2.java index a166190c..d3021350 100644 --- a/test/transform/resource/after-delombok/NonNullOnRecord2.java +++ b/test/transform/resource/after-delombok/NonNullOnRecord2.java @@ -1,4 +1,4 @@ -// version 14: +// version 16: import lombok.NonNull; record NonNullOnRecord2(@NonNull String a) { public NonNullOnRecord2 { diff --git a/test/transform/resource/after-delombok/NonNullOnRecord3.java b/test/transform/resource/after-delombok/NonNullOnRecord3.java index b1ecf6c0..62b385bc 100644 --- a/test/transform/resource/after-delombok/NonNullOnRecord3.java +++ b/test/transform/resource/after-delombok/NonNullOnRecord3.java @@ -1,6 +1,6 @@ // version 14: import lombok.NonNull; -record NonNullOnRecord3(@NonNull String a) { +public record NonNullOnRecord3(@NonNull String a) { public NonNullOnRecord3(String a) { this.a = a; } diff --git a/test/transform/resource/after-delombok/SetterOnRecord.java b/test/transform/resource/after-delombok/SetterOnRecord.java index 31665588..a6be2d8c 100644 --- a/test/transform/resource/after-delombok/SetterOnRecord.java +++ b/test/transform/resource/after-delombok/SetterOnRecord.java @@ -1,3 +1,3 @@ // version 14: -record SetterOnRecord(String a, String b) { +public record SetterOnRecord(String a, String b) { } diff --git a/test/transform/resource/after-delombok/SynchronizedInRecord.java b/test/transform/resource/after-delombok/SynchronizedInRecord.java index 67ca868a..32e7daee 100644 --- a/test/transform/resource/after-delombok/SynchronizedInRecord.java +++ b/test/transform/resource/after-delombok/SynchronizedInRecord.java @@ -1,5 +1,5 @@ // version 14: -record SynchronizedInRecord(String a, String b) { +public record SynchronizedInRecord(String a, String b) { public void foo() { String foo = "bar"; } diff --git a/test/transform/resource/after-delombok/ToStringOnRecord.java b/test/transform/resource/after-delombok/ToStringOnRecord.java index f18508d7..6d6d4edf 100644 --- a/test/transform/resource/after-delombok/ToStringOnRecord.java +++ b/test/transform/resource/after-delombok/ToStringOnRecord.java @@ -1,3 +1,3 @@ // version 14: -record ToStringOnRecord(String a, String b) { +public record ToStringOnRecord(String a, String b) { } diff --git a/test/transform/resource/after-delombok/UtilityClassOnRecord.java b/test/transform/resource/after-delombok/UtilityClassOnRecord.java index c6ee509a..3606b452 100644 --- a/test/transform/resource/after-delombok/UtilityClassOnRecord.java +++ b/test/transform/resource/after-delombok/UtilityClassOnRecord.java @@ -1,3 +1,3 @@ // version 14: -record UtilityClassOnRecord(String a, String b) { +public record UtilityClassOnRecord(String a, String b) { } diff --git a/test/transform/resource/after-delombok/ValueOnRecord.java b/test/transform/resource/after-delombok/ValueOnRecord.java index 4f845c20..daf92236 100644 --- a/test/transform/resource/after-delombok/ValueOnRecord.java +++ b/test/transform/resource/after-delombok/ValueOnRecord.java @@ -1,3 +1,3 @@ // version 14: -record ValueOnRecord(String a, String b) { +public record ValueOnRecord(String a, String b) { } diff --git a/test/transform/resource/after-delombok/WithByOnRecord.java b/test/transform/resource/after-delombok/WithByOnRecord.java index 6df5c9c4..4d1ccd01 100644 --- a/test/transform/resource/after-delombok/WithByOnRecord.java +++ b/test/transform/resource/after-delombok/WithByOnRecord.java @@ -1,5 +1,5 @@ // version 14: -record WithByOnRecord(String a, String b) { +public record WithByOnRecord(String a, String b) { @java.lang.SuppressWarnings("all") public WithByOnRecord withABy(final java.util.function.Function<? super String, ? extends String> transformer) { return new WithByOnRecord(transformer.apply(this.a), this.b); diff --git a/test/transform/resource/after-delombok/WithByOnRecordComponent.java b/test/transform/resource/after-delombok/WithByOnRecordComponent.java index 91dd7b38..851c5560 100644 --- a/test/transform/resource/after-delombok/WithByOnRecordComponent.java +++ b/test/transform/resource/after-delombok/WithByOnRecordComponent.java @@ -1,5 +1,5 @@ // version 14: -record WithByOnRecordComponent(String a, String b) { +public record WithByOnRecordComponent(String a, String b) { @java.lang.SuppressWarnings("all") public WithByOnRecordComponent withABy(final java.util.function.Function<? super String, ? extends String> transformer) { return new WithByOnRecordComponent(transformer.apply(this.a), this.b); diff --git a/test/transform/resource/after-delombok/WithOnRecord.java b/test/transform/resource/after-delombok/WithOnRecord.java index e981cc20..5c2f0a8f 100644 --- a/test/transform/resource/after-delombok/WithOnRecord.java +++ b/test/transform/resource/after-delombok/WithOnRecord.java @@ -1,5 +1,5 @@ // version 14: -record WithOnRecord(String a, String b) { +public record WithOnRecord(String a, String b) { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ diff --git a/test/transform/resource/after-delombok/WithOnRecordComponent.java b/test/transform/resource/after-delombok/WithOnRecordComponent.java index 5bc72f34..217da88a 100644 --- a/test/transform/resource/after-delombok/WithOnRecordComponent.java +++ b/test/transform/resource/after-delombok/WithOnRecordComponent.java @@ -1,5 +1,5 @@ // version 14: -record WithOnRecordComponent(String a, String b) { +public record WithOnRecordComponent(String a, String b) { /** * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). */ diff --git a/test/transform/resource/after-ecj/BuilderSimpleOnRecord.java b/test/transform/resource/after-ecj/BuilderSimpleOnRecord.java index f7e3fff1..f866cd35 100644 --- a/test/transform/resource/after-ecj/BuilderSimpleOnRecord.java +++ b/test/transform/resource/after-ecj/BuilderSimpleOnRecord.java @@ -1,16 +1,22 @@ // version 14: import java.util.List; -@lombok.Builder(access = lombok.AccessLevel.PROTECTED) record BuilderSimpleOnRecord(List l, String a)<T> { +public @lombok.Builder(access = lombok.AccessLevel.PROTECTED) record BuilderSimpleOnRecord(List l, String a)<T> { protected static @java.lang.SuppressWarnings("all") class BuilderSimpleOnRecordBuilder<T> { private @java.lang.SuppressWarnings("all") List<T> l; private @java.lang.SuppressWarnings("all") String a; @java.lang.SuppressWarnings("all") BuilderSimpleOnRecordBuilder() { super(); } + /** + * @return {@code this}. + */ public @java.lang.SuppressWarnings("all") BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder<T> l(final List<T> l) { this.l = l; return this; } + /** + * @return {@code this}. + */ public @java.lang.SuppressWarnings("all") BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder<T> a(final String a) { this.a = a; return this; diff --git a/test/transform/resource/after-ecj/BuilderSingularOnRecord.java b/test/transform/resource/after-ecj/BuilderSingularOnRecord.java index 3d16d326..2db38515 100644 --- a/test/transform/resource/after-ecj/BuilderSingularOnRecord.java +++ b/test/transform/resource/after-ecj/BuilderSingularOnRecord.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; import lombok.Builder; import lombok.Singular; -@Builder record BuilderSingularOnRecord(List children, Collection scarves, List rawList)<T> { +public @Builder record BuilderSingularOnRecord(List children, Collection scarves, List rawList)<T> { public static @java.lang.SuppressWarnings("all") class BuilderSingularOnRecordBuilder<T> { private @java.lang.SuppressWarnings("all") java.util.ArrayList<T> children; private @java.lang.SuppressWarnings("all") java.util.ArrayList<Number> scarves; diff --git a/test/transform/resource/after-ecj/ConstructorsOnRecord.java b/test/transform/resource/after-ecj/ConstructorsOnRecord.java index ce01737c..f1d4feb4 100644 --- a/test/transform/resource/after-ecj/ConstructorsOnRecord.java +++ b/test/transform/resource/after-ecj/ConstructorsOnRecord.java @@ -2,7 +2,7 @@ import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; import lombok.RequiredArgsConstructor; -@AllArgsConstructor @RequiredArgsConstructor @NoArgsConstructor record ConstructorsOnRecord(String a, String b) { +public @AllArgsConstructor @RequiredArgsConstructor @NoArgsConstructor record ConstructorsOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public ConstructorsOnRecord(String a, String b) { diff --git a/test/transform/resource/after-ecj/DataOnRecord.java b/test/transform/resource/after-ecj/DataOnRecord.java index c9bd19f0..64ee28a2 100644 --- a/test/transform/resource/after-ecj/DataOnRecord.java +++ b/test/transform/resource/after-ecj/DataOnRecord.java @@ -1,6 +1,6 @@ // version 14: import lombok.Data; -@Data record DataOnRecord(String a, String b) { +public @Data record DataOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public DataOnRecord(String a, String b) { diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeOnRecord.java b/test/transform/resource/after-ecj/EqualsAndHashCodeOnRecord.java index 043f1233..583191e6 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeOnRecord.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeOnRecord.java @@ -1,6 +1,6 @@ // version 14: import lombok.EqualsAndHashCode; -@EqualsAndHashCode record EqualsAndHashCodeOnRecord(String a, String b) { +public @EqualsAndHashCode record EqualsAndHashCodeOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public EqualsAndHashCodeOnRecord(String a, String b) { diff --git a/test/transform/resource/after-ecj/FieldDefaultsOnRecord.java b/test/transform/resource/after-ecj/FieldDefaultsOnRecord.java index 54795ef6..cc1a23b3 100644 --- a/test/transform/resource/after-ecj/FieldDefaultsOnRecord.java +++ b/test/transform/resource/after-ecj/FieldDefaultsOnRecord.java @@ -1,5 +1,5 @@ // version 14: -@lombok.experimental.FieldDefaults(makeFinal = true) record FieldDefaultsOnRecord(String a, String b) { +public @lombok.experimental.FieldDefaults(makeFinal = true) record FieldDefaultsOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public FieldDefaultsOnRecord(String a, String b) { diff --git a/test/transform/resource/after-ecj/FieldNameConstantsOnRecord.java b/test/transform/resource/after-ecj/FieldNameConstantsOnRecord.java index 6499ed4a..5d3b01da 100644 --- a/test/transform/resource/after-ecj/FieldNameConstantsOnRecord.java +++ b/test/transform/resource/after-ecj/FieldNameConstantsOnRecord.java @@ -1,7 +1,7 @@ // version 14: import lombok.experimental.FieldNameConstants; import lombok.AccessLevel; -@FieldNameConstants(level = AccessLevel.PACKAGE) record FieldNameConstantsOnRecord(String iAmADvdPlayer, int $skipMe, int andMe, String butPrintMePlease) { +public @FieldNameConstants(level = AccessLevel.PACKAGE) record FieldNameConstantsOnRecord(String iAmADvdPlayer, int $skipMe, int andMe, String butPrintMePlease) { static final @java.lang.SuppressWarnings("all") class Fields { public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer"; public static final java.lang.String butPrintMePlease = "butPrintMePlease"; diff --git a/test/transform/resource/after-ecj/GetterOnRecord.java b/test/transform/resource/after-ecj/GetterOnRecord.java index f694ef8b..8ce516bf 100644 --- a/test/transform/resource/after-ecj/GetterOnRecord.java +++ b/test/transform/resource/after-ecj/GetterOnRecord.java @@ -1,6 +1,6 @@ // version 14: import lombok.Getter; -@Getter record GetterOnRecord(String a, String b) { +public @Getter record GetterOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public GetterOnRecord(String a, String b) { diff --git a/test/transform/resource/after-ecj/LoggerConfigOnRecord.java b/test/transform/resource/after-ecj/LoggerConfigOnRecord.java index c97b7925..3e12cbff 100644 --- a/test/transform/resource/after-ecj/LoggerConfigOnRecord.java +++ b/test/transform/resource/after-ecj/LoggerConfigOnRecord.java @@ -1,6 +1,6 @@ // version 14: import lombok.extern.slf4j.Slf4j; -@Slf4j record LoggerConfigOnRecord(String a, String b) { +public @Slf4j record LoggerConfigOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public LoggerConfigOnRecord(String a, String b) { diff --git a/test/transform/resource/after-ecj/LoggerSlf4jOnRecord.java b/test/transform/resource/after-ecj/LoggerSlf4jOnRecord.java index 20a84d0d..673f83a3 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jOnRecord.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jOnRecord.java @@ -1,6 +1,6 @@ // version 14: import lombok.extern.slf4j.Slf4j; -@Slf4j record LoggerSlf4jOnRecord(org log, String a) { +public @Slf4j record LoggerSlf4jOnRecord(org log, String a) { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOnRecord.class); /* Implicit */ private final String a; /* Implicit */ private final String b; diff --git a/test/transform/resource/after-ecj/NonNullExistingConstructorOnRecord.java b/test/transform/resource/after-ecj/NonNullExistingConstructorOnRecord.java index dbf2abe8..6f351854 100644 --- a/test/transform/resource/after-ecj/NonNullExistingConstructorOnRecord.java +++ b/test/transform/resource/after-ecj/NonNullExistingConstructorOnRecord.java @@ -1,21 +1,16 @@ // version 14: import lombok.NonNull; -record NonNullOnRecord(String a, String b) { +public record NonNullExistingConstructorOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; - public NonNullOnRecord(String a, String b) { - super(); - .a = a; - .b = b; - } - public NonNullOnRecord(@NonNull String b) { + public NonNullExistingConstructorOnRecord(@NonNull String b) { this("default", b); if ((b == null)) { throw new java.lang.NullPointerException("b is marked non-null but is null"); } } - public @java.lang.SuppressWarnings("all") NonNullOnRecord(final String a, final String b) { + public @java.lang.SuppressWarnings("all") NonNullExistingConstructorOnRecord(@NonNull String a, @NonNull String b) { super(); if ((a == null)) { diff --git a/test/transform/resource/after-ecj/NonNullOnRecord.java b/test/transform/resource/after-ecj/NonNullOnRecord.java index c8efdbe6..d80e243b 100644 --- a/test/transform/resource/after-ecj/NonNullOnRecord.java +++ b/test/transform/resource/after-ecj/NonNullOnRecord.java @@ -1,21 +1,9 @@ // version 14: import lombok.NonNull; -record NonNullOnRecord(String a, String b) { +public record NonNullOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; - public NonNullOnRecord(String a, String b) { - super(); - .a = a; - .b = b; - } - public void method(@NonNull String param) { - if ((param == null)) - { - throw new java.lang.NullPointerException("param is marked non-null but is null"); - } - String asd = "a"; - } - public @java.lang.SuppressWarnings("all") NonNullOnRecord(final String a, final String b) { + public @java.lang.SuppressWarnings("all") NonNullOnRecord(@NonNull String a, @NonNull String b) { super(); if ((a == null)) { diff --git a/test/transform/resource/after-ecj/NonNullOnRecord2.java b/test/transform/resource/after-ecj/NonNullOnRecord2.java new file mode 100644 index 00000000..5820d453 --- /dev/null +++ b/test/transform/resource/after-ecj/NonNullOnRecord2.java @@ -0,0 +1,14 @@ +// version 14: +import lombok.NonNull; +record NonNullOnRecord2(String a) { +/* Implicit */ private final String a; + public NonNullOnRecord2(@NonNull String a) { + super(); + if ((a == null)) + { + throw new java.lang.NullPointerException("a is marked non-null but is null"); + } + System.out.println("Hello"); + this.a = a; + } +} diff --git a/test/transform/resource/after-ecj/NonNullOnRecord3.java b/test/transform/resource/after-ecj/NonNullOnRecord3.java new file mode 100644 index 00000000..44c00098 --- /dev/null +++ b/test/transform/resource/after-ecj/NonNullOnRecord3.java @@ -0,0 +1,20 @@ +// version 14: +import lombok.NonNull; +public record NonNullOnRecord3(String a) { +/* Implicit */ private final String a; + public NonNullOnRecord3(String a) { + super(); + .a = a; + } + public NonNullOnRecord3(String a) { + super(); + this.a = a; + } + public void method(@NonNull String param) { + if ((param == null)) + { + throw new java.lang.NullPointerException("param is marked non-null but is null"); + } + String asd = "a"; + } +} diff --git a/test/transform/resource/after-ecj/SetterOnRecord.java b/test/transform/resource/after-ecj/SetterOnRecord.java index d0103759..e65eb1bd 100644 --- a/test/transform/resource/after-ecj/SetterOnRecord.java +++ b/test/transform/resource/after-ecj/SetterOnRecord.java @@ -1,6 +1,6 @@ // version 14: import lombok.Setter; -@Setter record SetterOnRecord(String a, String b) { +public @Setter record SetterOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public SetterOnRecord(String a, String b) { diff --git a/test/transform/resource/after-ecj/SynchronizedInRecord.java b/test/transform/resource/after-ecj/SynchronizedInRecord.java index f90a85e2..b4dc3770 100644 --- a/test/transform/resource/after-ecj/SynchronizedInRecord.java +++ b/test/transform/resource/after-ecj/SynchronizedInRecord.java @@ -1,5 +1,5 @@ import lombok.Synchronized; -record SynchronizedInRecord(java $lock, String a) { +public record SynchronizedInRecord(java $lock, String a) { private final java.lang.Object $lock = new java.lang.Object[0]; /* Implicit */ private final String a; /* Implicit */ private final String b; diff --git a/test/transform/resource/after-ecj/ToStringOnRecord.java b/test/transform/resource/after-ecj/ToStringOnRecord.java index 68caa235..9ca18e8c 100644 --- a/test/transform/resource/after-ecj/ToStringOnRecord.java +++ b/test/transform/resource/after-ecj/ToStringOnRecord.java @@ -1,6 +1,6 @@ // version 14: import lombok.ToString; -@ToString record ToStringOnRecord(String a, String b) { +public @ToString record ToStringOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public ToStringOnRecord(String a, String b) { diff --git a/test/transform/resource/after-ecj/UtilityClassOnRecord.java b/test/transform/resource/after-ecj/UtilityClassOnRecord.java index 0c0c138f..8ffa8909 100644 --- a/test/transform/resource/after-ecj/UtilityClassOnRecord.java +++ b/test/transform/resource/after-ecj/UtilityClassOnRecord.java @@ -1,6 +1,6 @@ // version 14: import lombok.experimental.UtilityClass; -@UtilityClass record UtilityClassOnRecord(String a, String b) { +public @UtilityClass record UtilityClassOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public UtilityClassOnRecord(String a, String b) { diff --git a/test/transform/resource/after-ecj/ValueOnRecord.java b/test/transform/resource/after-ecj/ValueOnRecord.java index f1623ed3..47535305 100644 --- a/test/transform/resource/after-ecj/ValueOnRecord.java +++ b/test/transform/resource/after-ecj/ValueOnRecord.java @@ -1,6 +1,6 @@ // version 14: import lombok.Value; -@Value record ValueOnRecord(String a, String b) { +public @Value record ValueOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public ValueOnRecord(String a, String b) { diff --git a/test/transform/resource/after-ecj/WithByOnRecord.java b/test/transform/resource/after-ecj/WithByOnRecord.java index 8f179407..161382d9 100644 --- a/test/transform/resource/after-ecj/WithByOnRecord.java +++ b/test/transform/resource/after-ecj/WithByOnRecord.java @@ -1,6 +1,6 @@ // version 14: import lombok.experimental.WithBy; -@WithBy record WithByOnRecord(String a, String b) { +public @WithBy record WithByOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public WithByOnRecord(String a, String b) { diff --git a/test/transform/resource/after-ecj/WithByOnRecordComponent.java b/test/transform/resource/after-ecj/WithByOnRecordComponent.java index 5ee14810..efc62161 100644 --- a/test/transform/resource/after-ecj/WithByOnRecordComponent.java +++ b/test/transform/resource/after-ecj/WithByOnRecordComponent.java @@ -1,6 +1,6 @@ // version 14: import lombok.experimental.WithBy; -record WithByOnRecordComponent(String a, String b) { +public record WithByOnRecordComponent(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public WithByOnRecordComponent( String a, String b) { diff --git a/test/transform/resource/after-ecj/WithOnRecord.java b/test/transform/resource/after-ecj/WithOnRecord.java index 2b24147a..d62bbfab 100644 --- a/test/transform/resource/after-ecj/WithOnRecord.java +++ b/test/transform/resource/after-ecj/WithOnRecord.java @@ -1,6 +1,6 @@ // version 14: import lombok.With; -@With record WithOnRecord(String a, String b) { +public @With record WithOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public WithOnRecord(String a, String b) { @@ -8,9 +8,15 @@ import lombok.With; .a = a; .b = b; } + /** + * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). + */ public @java.lang.SuppressWarnings("all") WithOnRecord withA(final String a) { return ((this.a == a) ? this : new WithOnRecord(a, this.b)); } + /** + * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). + */ public @java.lang.SuppressWarnings("all") WithOnRecord withB(final String b) { return ((this.b == b) ? this : new WithOnRecord(this.a, b)); } diff --git a/test/transform/resource/after-ecj/WithOnRecordComponent.java b/test/transform/resource/after-ecj/WithOnRecordComponent.java index d1a602a6..a141fa46 100644 --- a/test/transform/resource/after-ecj/WithOnRecordComponent.java +++ b/test/transform/resource/after-ecj/WithOnRecordComponent.java @@ -1,6 +1,6 @@ // version 14: import lombok.With; -record WithOnRecordComponent(String a, String b) { +public record WithOnRecordComponent(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; public WithOnRecordComponent( String a, String b) { @@ -8,6 +8,9 @@ record WithOnRecordComponent(String a, String b) { .a = a; .b = b; } + /** + * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). + */ public @java.lang.SuppressWarnings("all") WithOnRecordComponent withA(final String a) { return ((this.a == a) ? this : new WithOnRecordComponent(a, this.b)); } diff --git a/test/transform/resource/before/BuilderSimpleOnRecord.java b/test/transform/resource/before/BuilderSimpleOnRecord.java index 7968db64..fdf681e7 100644 --- a/test/transform/resource/before/BuilderSimpleOnRecord.java +++ b/test/transform/resource/before/BuilderSimpleOnRecord.java @@ -3,5 +3,5 @@ import java.util.List; @lombok.Builder(access = lombok.AccessLevel.PROTECTED) -record BuilderSimpleOnRecord<T>(List<T> l, String a) { +public record BuilderSimpleOnRecord<T>(List<T> l, String a) { } diff --git a/test/transform/resource/before/BuilderSingularOnRecord.java b/test/transform/resource/before/BuilderSingularOnRecord.java index 0ffd80be..c34fdabd 100644 --- a/test/transform/resource/before/BuilderSingularOnRecord.java +++ b/test/transform/resource/before/BuilderSingularOnRecord.java @@ -7,5 +7,5 @@ import lombok.Builder; import lombok.Singular; @Builder -record BuilderSingularOnRecord<T>(@Singular List<T> children, @Singular Collection<? extends Number> scarves, @SuppressWarnings("all") @Singular("rawList") List rawList) { +public record BuilderSingularOnRecord<T>(@Singular List<T> children, @Singular Collection<? extends Number> scarves, @SuppressWarnings("all") @Singular("rawList") List rawList) { }
\ No newline at end of file diff --git a/test/transform/resource/before/ConstructorsOnRecord.java b/test/transform/resource/before/ConstructorsOnRecord.java index d45495c8..003fc533 100644 --- a/test/transform/resource/before/ConstructorsOnRecord.java +++ b/test/transform/resource/before/ConstructorsOnRecord.java @@ -7,5 +7,5 @@ import lombok.RequiredArgsConstructor; @AllArgsConstructor @RequiredArgsConstructor @NoArgsConstructor -record ConstructorsOnRecord(String a, String b) { +public record ConstructorsOnRecord(String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/DataOnRecord.java b/test/transform/resource/before/DataOnRecord.java index ed32c337..caf14d52 100644 --- a/test/transform/resource/before/DataOnRecord.java +++ b/test/transform/resource/before/DataOnRecord.java @@ -3,5 +3,5 @@ import lombok.Data; @Data -record DataOnRecord(String a, String b) { +public record DataOnRecord(String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/EqualsAndHashCodeOnRecord.java b/test/transform/resource/before/EqualsAndHashCodeOnRecord.java index 5c295b3d..84b808bb 100644 --- a/test/transform/resource/before/EqualsAndHashCodeOnRecord.java +++ b/test/transform/resource/before/EqualsAndHashCodeOnRecord.java @@ -3,5 +3,5 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode -record EqualsAndHashCodeOnRecord(String a, String b) { +public record EqualsAndHashCodeOnRecord(String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/FieldDefaultsOnRecord.java b/test/transform/resource/before/FieldDefaultsOnRecord.java index cf74508d..94089b41 100644 --- a/test/transform/resource/before/FieldDefaultsOnRecord.java +++ b/test/transform/resource/before/FieldDefaultsOnRecord.java @@ -1,5 +1,5 @@ // version 14: @lombok.experimental.FieldDefaults(makeFinal = true) -record FieldDefaultsOnRecord(String a, String b) { +public record FieldDefaultsOnRecord(String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/FieldNameConstantsOnRecord.java b/test/transform/resource/before/FieldNameConstantsOnRecord.java index 0905e082..876bb853 100644 --- a/test/transform/resource/before/FieldNameConstantsOnRecord.java +++ b/test/transform/resource/before/FieldNameConstantsOnRecord.java @@ -4,6 +4,6 @@ import lombok.experimental.FieldNameConstants; import lombok.AccessLevel; @FieldNameConstants(level = AccessLevel.PACKAGE) -record FieldNameConstantsOnRecord(String iAmADvdPlayer, int $skipMe, @FieldNameConstants.Exclude int andMe, String butPrintMePlease) { +public record FieldNameConstantsOnRecord(String iAmADvdPlayer, int $skipMe, @FieldNameConstants.Exclude int andMe, String butPrintMePlease) { static double skipMeToo; }
\ No newline at end of file diff --git a/test/transform/resource/before/GetterOnRecord.java b/test/transform/resource/before/GetterOnRecord.java index 5a56a6d4..0addbfc6 100644 --- a/test/transform/resource/before/GetterOnRecord.java +++ b/test/transform/resource/before/GetterOnRecord.java @@ -3,5 +3,5 @@ import lombok.Getter; @Getter -record GetterOnRecord(String a, String b) { +public record GetterOnRecord(String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/LoggerConfigOnRecord.java b/test/transform/resource/before/LoggerConfigOnRecord.java index c5f5a05a..b30392b3 100644 --- a/test/transform/resource/before/LoggerConfigOnRecord.java +++ b/test/transform/resource/before/LoggerConfigOnRecord.java @@ -4,5 +4,5 @@ import lombok.extern.slf4j.Slf4j; @Slf4j -record LoggerConfigOnRecord(String a, String b) { +public record LoggerConfigOnRecord(String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/LoggerSlf4jOnRecord.java b/test/transform/resource/before/LoggerSlf4jOnRecord.java index f3402742..26359fd6 100644 --- a/test/transform/resource/before/LoggerSlf4jOnRecord.java +++ b/test/transform/resource/before/LoggerSlf4jOnRecord.java @@ -3,5 +3,5 @@ import lombok.extern.slf4j.Slf4j; @Slf4j -record LoggerSlf4jOnRecord(String a, String b) { +public record LoggerSlf4jOnRecord(String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/NonNullExistingConstructorOnRecord.java b/test/transform/resource/before/NonNullExistingConstructorOnRecord.java index 1faf7d69..6a00e2c4 100644 --- a/test/transform/resource/before/NonNullExistingConstructorOnRecord.java +++ b/test/transform/resource/before/NonNullExistingConstructorOnRecord.java @@ -2,8 +2,8 @@ import lombok.NonNull; -record NonNullOnRecord(@NonNull String a, @NonNull String b) { - public NonNullOnRecord(@NonNull String b) { +public record NonNullExistingConstructorOnRecord(@NonNull String a, @NonNull String b) { + public NonNullExistingConstructorOnRecord(@NonNull String b) { this("default", b); } }
\ No newline at end of file diff --git a/test/transform/resource/before/NonNullOnRecord.java b/test/transform/resource/before/NonNullOnRecord.java index 56a96433..ba6121a6 100644 --- a/test/transform/resource/before/NonNullOnRecord.java +++ b/test/transform/resource/before/NonNullOnRecord.java @@ -2,5 +2,5 @@ import lombok.NonNull; -record NonNullOnRecord(@NonNull String a, @NonNull String b) { +public record NonNullOnRecord(@NonNull String a, @NonNull String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/NonNullOnRecord3.java b/test/transform/resource/before/NonNullOnRecord3.java index 88870192..24198002 100644 --- a/test/transform/resource/before/NonNullOnRecord3.java +++ b/test/transform/resource/before/NonNullOnRecord3.java @@ -2,7 +2,7 @@ import lombok.NonNull; -record NonNullOnRecord3(@NonNull String a) { +public record NonNullOnRecord3(@NonNull String a) { public NonNullOnRecord3(String a) { this.a = a; } diff --git a/test/transform/resource/before/SetterOnRecord.java b/test/transform/resource/before/SetterOnRecord.java index c91e06cd..97e1a966 100644 --- a/test/transform/resource/before/SetterOnRecord.java +++ b/test/transform/resource/before/SetterOnRecord.java @@ -3,5 +3,5 @@ import lombok.Setter; @Setter -record SetterOnRecord(String a, String b) { +public record SetterOnRecord(String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/SynchronizedInRecord.java b/test/transform/resource/before/SynchronizedInRecord.java index 99f87543..0569fd5e 100644 --- a/test/transform/resource/before/SynchronizedInRecord.java +++ b/test/transform/resource/before/SynchronizedInRecord.java @@ -2,7 +2,7 @@ import lombok.Synchronized; -record SynchronizedInRecord(String a, String b) { +public record SynchronizedInRecord(String a, String b) { @Synchronized public void foo() { String foo = "bar"; diff --git a/test/transform/resource/before/ToStringOnRecord.java b/test/transform/resource/before/ToStringOnRecord.java index 279c6f6c..2d3ae039 100644 --- a/test/transform/resource/before/ToStringOnRecord.java +++ b/test/transform/resource/before/ToStringOnRecord.java @@ -3,5 +3,5 @@ import lombok.ToString; @ToString -record ToStringOnRecord(String a, String b) { +public record ToStringOnRecord(String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/UtilityClassOnRecord.java b/test/transform/resource/before/UtilityClassOnRecord.java index 1e3ebb38..4d73a166 100644 --- a/test/transform/resource/before/UtilityClassOnRecord.java +++ b/test/transform/resource/before/UtilityClassOnRecord.java @@ -3,5 +3,5 @@ import lombok.experimental.UtilityClass; @UtilityClass -record UtilityClassOnRecord(String a, String b) { +public record UtilityClassOnRecord(String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/ValueOnRecord.java b/test/transform/resource/before/ValueOnRecord.java index e1e49595..64f685be 100644 --- a/test/transform/resource/before/ValueOnRecord.java +++ b/test/transform/resource/before/ValueOnRecord.java @@ -3,5 +3,5 @@ import lombok.Value; @Value -record ValueOnRecord(String a, String b) { +public record ValueOnRecord(String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/WithByOnRecord.java b/test/transform/resource/before/WithByOnRecord.java index 6c7b8e2d..8558d9a7 100644 --- a/test/transform/resource/before/WithByOnRecord.java +++ b/test/transform/resource/before/WithByOnRecord.java @@ -3,5 +3,5 @@ import lombok.experimental.WithBy; @WithBy -record WithByOnRecord(String a, String b) { +public record WithByOnRecord(String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/WithByOnRecordComponent.java b/test/transform/resource/before/WithByOnRecordComponent.java index 7e0f0f19..48bd66ca 100644 --- a/test/transform/resource/before/WithByOnRecordComponent.java +++ b/test/transform/resource/before/WithByOnRecordComponent.java @@ -2,5 +2,5 @@ import lombok.experimental.WithBy; -record WithByOnRecordComponent(@WithBy String a, String b) { +public record WithByOnRecordComponent(@WithBy String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/WithOnRecord.java b/test/transform/resource/before/WithOnRecord.java index 211da3c8..99e77630 100644 --- a/test/transform/resource/before/WithOnRecord.java +++ b/test/transform/resource/before/WithOnRecord.java @@ -3,5 +3,5 @@ import lombok.With; @With -record WithOnRecord(String a, String b) { +public record WithOnRecord(String a, String b) { }
\ No newline at end of file diff --git a/test/transform/resource/before/WithOnRecordComponent.java b/test/transform/resource/before/WithOnRecordComponent.java index 6f827851..d8461b8b 100644 --- a/test/transform/resource/before/WithOnRecordComponent.java +++ b/test/transform/resource/before/WithOnRecordComponent.java @@ -2,5 +2,5 @@ import lombok.With; -record WithOnRecordComponent(@With String a, String b) { +public record WithOnRecordComponent(@With String a, String b) { }
\ No newline at end of file |