From b4165990e40c0d0ad478a926eee3db3543399e16 Mon Sep 17 00:00:00 2001 From: JNGDSOFT Date: Sun, 25 May 2025 20:59:44 -0500 Subject: [PATCH 1/5] Annotation and its handler were created --- src/core/lombok/GSet.java | 12 ++++++++++++ src/core/lombok/javac/handlers/HandleGSet.java | 5 +++++ 2 files changed, 17 insertions(+) create mode 100644 src/core/lombok/GSet.java create mode 100644 src/core/lombok/javac/handlers/HandleGSet.java diff --git a/src/core/lombok/GSet.java b/src/core/lombok/GSet.java new file mode 100644 index 000000000..54f5d215a --- /dev/null +++ b/src/core/lombok/GSet.java @@ -0,0 +1,12 @@ +package lombok; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.FIELD, ElementType.TYPE}) +@Retention(RetentionPolicy.SOURCE) +public @interface GSet { + +} diff --git a/src/core/lombok/javac/handlers/HandleGSet.java b/src/core/lombok/javac/handlers/HandleGSet.java new file mode 100644 index 000000000..c91a6619e --- /dev/null +++ b/src/core/lombok/javac/handlers/HandleGSet.java @@ -0,0 +1,5 @@ +package lombok.javac.handlers; + +public class HandleGSet { + +} From 27f96e466e9372556019a6e70b4ae30f6ef5e0a5 Mon Sep 17 00:00:00 2001 From: JNGDSOFT Date: Sun, 25 May 2025 22:18:52 -0500 Subject: [PATCH 2/5] Configuration key was added, handleGSet is on process --- src/core/lombok/ConfigurationKeys.java | 11 +++- .../lombok/javac/handlers/HandleGSet.java | 65 ++++++++++++++++++- 2 files changed, 73 insertions(+), 3 deletions(-) diff --git a/src/core/lombok/ConfigurationKeys.java b/src/core/lombok/ConfigurationKeys.java index ce31bddf7..75e159b9c 100644 --- a/src/core/lombok/ConfigurationKeys.java +++ b/src/core/lombok/ConfigurationKeys.java @@ -205,7 +205,16 @@ private ConfigurationKeys() {} * If set, any usage of {@code @Data} results in a warning / error. */ public static final ConfigurationKey DATA_FLAG_USAGE = new ConfigurationKey("lombok.data.flagUsage", "Emit a warning or error if @Data is used.") {}; - + + // ----- GSet ----- + + /** + * lombok configuration: {@code lombok.gset.flagUsage} = {@code WARNING} | {@code ERROR}. + * + * If set, any usage of {@code @GSet} results in a warning / error. + */ + public static final ConfigurationKey GSET_FLAG_USAGE = new ConfigurationKey("lombok.gset.flagUsage", "Emit a warning or error if @GSet is used.") {}; + // ----- Value ----- /** diff --git a/src/core/lombok/javac/handlers/HandleGSet.java b/src/core/lombok/javac/handlers/HandleGSet.java index c91a6619e..94195ebda 100644 --- a/src/core/lombok/javac/handlers/HandleGSet.java +++ b/src/core/lombok/javac/handlers/HandleGSet.java @@ -1,5 +1,66 @@ +/* + * Copyright (C) 2009-2025 The Project Lombok Authors. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +import static lombok.core.handlers.HandlerUtil.*; +import static lombok.javac.handlers.JavacHandlerUtil.*; +import lombok.AccessLevel; +import lombok.ConfigurationKeys; +import lombok.Data; +import lombok.core.AnnotationValues; +import lombok.javac.JavacAnnotationHandler; +import lombok.javac.JavacNode; +import lombok.javac.handlers.HandleConstructor.SkipIfConstructorExists; +import lombok.spi.Provides; + +import com.sun.tools.javac.tree.JCTree.JCAnnotation; +import com.sun.tools.javac.util.List; + package lombok.javac.handlers; -public class HandleGSet { - +/** + * Handles the {@code lombok.GSet} annotation for javac. + */ +public class HandleGSet extends JavacAnnotationHandler{ + + private HandleGetter handleGetter = new HandleGetter(); + private HandleSetter handleSetter = new HandleSetter(); + + + @Override + public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode){ + handleFlagUsage(annotationNode, ConfigurationKeys.DATA_FLAG_USAGE, "@Data"); + + deleteAnnotationIfNeccessary(annotationNode, Data.class); + JavacNode typeNode = annotationNode.up(); + + if (!isClass(typeNode)) { + annotationNode.addError("@Data is only supported on a class."); + return; + } + + String staticConstructorName = annotation.getInstance().staticConstructor(); + + // TODO move this to the end OR move it to the top in eclipse. + handleGetter.generateGetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true, List.nil()); + handleSetter.generateSetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true, List.nil(), List.nil()); + } } From 20165f0ad7479d11a9f04e8d28fdc603a5a6f706 Mon Sep 17 00:00:00 2001 From: JNGDSOFT Date: Tue, 27 May 2025 23:59:01 -0500 Subject: [PATCH 3/5] corrections on HandleGSet --- src/core/lombok/javac/handlers/HandleGSet.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/core/lombok/javac/handlers/HandleGSet.java b/src/core/lombok/javac/handlers/HandleGSet.java index 94195ebda..cc94b08c0 100644 --- a/src/core/lombok/javac/handlers/HandleGSet.java +++ b/src/core/lombok/javac/handlers/HandleGSet.java @@ -19,6 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +package lombok.javac.handlers; import static lombok.core.handlers.HandlerUtil.*; import static lombok.javac.handlers.JavacHandlerUtil.*; @@ -34,11 +35,10 @@ import com.sun.tools.javac.tree.JCTree.JCAnnotation; import com.sun.tools.javac.util.List; -package lombok.javac.handlers; - /** * Handles the {@code lombok.GSet} annotation for javac. */ +@Provides public class HandleGSet extends JavacAnnotationHandler{ private HandleGetter handleGetter = new HandleGetter(); @@ -47,19 +47,18 @@ public class HandleGSet extends JavacAnnotationHandler{ @Override public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode){ - handleFlagUsage(annotationNode, ConfigurationKeys.DATA_FLAG_USAGE, "@Data"); + handleFlagUsage(annotationNode, ConfigurationKeys.GSET_FLAG_USAGE, "@GSet"); deleteAnnotationIfNeccessary(annotationNode, Data.class); JavacNode typeNode = annotationNode.up(); if (!isClass(typeNode)) { - annotationNode.addError("@Data is only supported on a class."); + annotationNode.addError("@GSet is only supported on a class."); return; } String staticConstructorName = annotation.getInstance().staticConstructor(); - // TODO move this to the end OR move it to the top in eclipse. handleGetter.generateGetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true, List.nil()); handleSetter.generateSetterForType(typeNode, annotationNode, AccessLevel.PUBLIC, true, List.nil(), List.nil()); } From a388f8c700c525f7d206f79f9cd76ad3604e0c79 Mon Sep 17 00:00:00 2001 From: JNGDSOFT Date: Wed, 28 May 2025 00:16:12 -0500 Subject: [PATCH 4/5] other corrections made --- src/core/lombok/GSet.java | 6 ++---- src/core/lombok/javac/handlers/HandleGSet.java | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/core/lombok/GSet.java b/src/core/lombok/GSet.java index 54f5d215a..2bb679c03 100644 --- a/src/core/lombok/GSet.java +++ b/src/core/lombok/GSet.java @@ -5,8 +5,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -@Target({ElementType.FIELD, ElementType.TYPE}) +@Target({ElementType.TYPE}) @Retention(RetentionPolicy.SOURCE) -public @interface GSet { - -} +public @interface GSet { } diff --git a/src/core/lombok/javac/handlers/HandleGSet.java b/src/core/lombok/javac/handlers/HandleGSet.java index cc94b08c0..f29a84c78 100644 --- a/src/core/lombok/javac/handlers/HandleGSet.java +++ b/src/core/lombok/javac/handlers/HandleGSet.java @@ -25,11 +25,10 @@ import static lombok.javac.handlers.JavacHandlerUtil.*; import lombok.AccessLevel; import lombok.ConfigurationKeys; -import lombok.Data; +import lombok.GSet; import lombok.core.AnnotationValues; import lombok.javac.JavacAnnotationHandler; import lombok.javac.JavacNode; -import lombok.javac.handlers.HandleConstructor.SkipIfConstructorExists; import lombok.spi.Provides; import com.sun.tools.javac.tree.JCTree.JCAnnotation; @@ -46,10 +45,10 @@ public class HandleGSet extends JavacAnnotationHandler{ @Override - public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode){ + public void handle(AnnotationValues annotation, JCAnnotation ast, JavacNode annotationNode){ handleFlagUsage(annotationNode, ConfigurationKeys.GSET_FLAG_USAGE, "@GSet"); - deleteAnnotationIfNeccessary(annotationNode, Data.class); + deleteAnnotationIfNeccessary(annotationNode, GSet.class); JavacNode typeNode = annotationNode.up(); if (!isClass(typeNode)) { From fc8f5c05a98e91b4d14b6df3e67f8e93844c5d0e Mon Sep 17 00:00:00 2001 From: JNGDSOFT Date: Wed, 28 May 2025 01:00:29 -0500 Subject: [PATCH 5/5] comments were added --- src/core/lombok/GSet.java | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/core/lombok/GSet.java b/src/core/lombok/GSet.java index 2bb679c03..46ff6a65a 100644 --- a/src/core/lombok/GSet.java +++ b/src/core/lombok/GSet.java @@ -1,3 +1,25 @@ +/* + * Copyright (C) 2009-2017 The Project Lombok Authors. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + package lombok; import java.lang.annotation.ElementType; @@ -5,6 +27,11 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/* + * Replaces the need to use both Getter and Setter annotations together + * + * This annotation can be applied directly to a class + */ @Target({ElementType.TYPE}) @Retention(RetentionPolicy.SOURCE) public @interface GSet { }