From 5767628efeb66644827f89861425ff173803b9ad Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Sat, 18 Jan 2014 20:26:08 +0100 Subject: [configuration] Moved ALL ConfigurationKey constants into 'ConfigurationKeys'; that bug where fields in annotation defs causes issues is too endemic to try and work around these. --- src/core/lombok/experimental/Accessors.java | 10 ---------- src/core/lombok/experimental/Builder.java | 10 ---------- src/core/lombok/experimental/ExtensionMethod.java | 10 ---------- src/core/lombok/experimental/FieldDefaults.java | 9 --------- src/core/lombok/experimental/Wither.java | 9 --------- 5 files changed, 48 deletions(-) (limited to 'src/core/lombok/experimental') diff --git a/src/core/lombok/experimental/Accessors.java b/src/core/lombok/experimental/Accessors.java index a74cbb91..c2a0ca16 100644 --- a/src/core/lombok/experimental/Accessors.java +++ b/src/core/lombok/experimental/Accessors.java @@ -26,9 +26,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import lombok.core.FlagUsageType; -import lombok.core.configuration.ConfigurationKey; - /** * A container for settings for the generation of getters and setters. *

@@ -40,13 +37,6 @@ import lombok.core.configuration.ConfigurationKey; @Target({ElementType.TYPE, ElementType.FIELD}) @Retention(RetentionPolicy.SOURCE) public @interface Accessors { - /** - * lombok configuration: {@code lombok.Accessors.flagUsage} = {@code WARNING} | {@code ERROR}. - * - * If set, any usage of {@code @Accessors} results in a warning / error. - */ - ConfigurationKey FLAG_USAGE = new ConfigurationKey("lombok.Accessors.flagUsage") {}; - /** * If true, accessors will be named after the field and not include a get or set * prefix. If true and chain is omitted, chain defaults to true. diff --git a/src/core/lombok/experimental/Builder.java b/src/core/lombok/experimental/Builder.java index 56675dd1..1300e7d3 100644 --- a/src/core/lombok/experimental/Builder.java +++ b/src/core/lombok/experimental/Builder.java @@ -27,9 +27,6 @@ import static java.lang.annotation.RetentionPolicy.*; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import lombok.core.FlagUsageType; -import lombok.core.configuration.ConfigurationKey; - /** * The builder annotation creates a so-called 'builder' aspect to the class that is annotated or the class * that contains a member which is annotated with {@code @Builder}. @@ -110,13 +107,6 @@ import lombok.core.configuration.ConfigurationKey; @Target({TYPE, METHOD, CONSTRUCTOR}) @Retention(SOURCE) public @interface Builder { - /** - * lombok configuration: {@code lombok.Builder.flagUsage} = {@code WARNING} | {@code ERROR}. - * - * If set, any usage of {@code @Builder} results in a warning / error. - */ - ConfigurationKey FLAG_USAGE = new ConfigurationKey("lombok.Builder.flagUsage") {}; - /** Name of the static method that creates a new builder instance. Default: {@code builder}. */ String builderMethodName() default "builder"; diff --git a/src/core/lombok/experimental/ExtensionMethod.java b/src/core/lombok/experimental/ExtensionMethod.java index 483ede33..7de8a136 100644 --- a/src/core/lombok/experimental/ExtensionMethod.java +++ b/src/core/lombok/experimental/ExtensionMethod.java @@ -26,9 +26,6 @@ import static java.lang.annotation.RetentionPolicy.*; import java.lang.annotation.*; -import lombok.core.FlagUsageType; -import lombok.core.configuration.ConfigurationKey; - /** * Extension methods enable you to "add" methods to existing types without creating a new derived type, recompiling, or * otherwise modifying the original type. Extension methods are a special kind of static method, but they are called as @@ -63,13 +60,6 @@ import lombok.core.configuration.ConfigurationKey; @Target(TYPE) @Retention(SOURCE) public @interface ExtensionMethod { - /** - * lombok configuration: {@code lombok.ExtensionMethod.flagUsage} = {@code WARNING} | {@code ERROR}. - * - * If set, any usage of {@code @ExtensionMethod} results in a warning / error. - */ - ConfigurationKey FLAG_USAGE = new ConfigurationKey("lombok.ExtensionMethod.flagUsage") {}; - /** All types whose static methods will be exposed as extension methods. */ Class[] value(); diff --git a/src/core/lombok/experimental/FieldDefaults.java b/src/core/lombok/experimental/FieldDefaults.java index 9a17efbc..1c621f3c 100644 --- a/src/core/lombok/experimental/FieldDefaults.java +++ b/src/core/lombok/experimental/FieldDefaults.java @@ -27,8 +27,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import lombok.AccessLevel; -import lombok.core.FlagUsageType; -import lombok.core.configuration.ConfigurationKey; /** * Adds modifiers to each field in the type with this annotation. @@ -43,13 +41,6 @@ import lombok.core.configuration.ConfigurationKey; @Target(ElementType.TYPE) @Retention(RetentionPolicy.SOURCE) public @interface FieldDefaults { - /** - * lombok configuration: {@code lombok.FieldDefaults.flagUsage} = {@code WARNING} | {@code ERROR}. - * - * If set, any usage of {@code @FieldDefaults} results in a warning / error. - */ - ConfigurationKey FLAG_USAGE = new ConfigurationKey("lombok.FieldDefaults.flagUsage") {}; - AccessLevel level() default AccessLevel.NONE; boolean makeFinal() default false; } diff --git a/src/core/lombok/experimental/Wither.java b/src/core/lombok/experimental/Wither.java index 259e0c5e..f667cb1f 100644 --- a/src/core/lombok/experimental/Wither.java +++ b/src/core/lombok/experimental/Wither.java @@ -27,8 +27,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import lombok.AccessLevel; -import lombok.core.FlagUsageType; -import lombok.core.configuration.ConfigurationKey; /** * Put on any field to make lombok build a 'wither' - a withX method which produces a clone of this object (except for 1 field which gets a new value). @@ -56,13 +54,6 @@ import lombok.core.configuration.ConfigurationKey; @Target({ElementType.FIELD, ElementType.TYPE}) @Retention(RetentionPolicy.SOURCE) public @interface Wither { - /** - * lombok configuration: {@code lombok.Wither.flagUsage} = {@code WARNING} | {@code ERROR}. - * - * If set, any usage of {@code @Value} results in a warning / error. - */ - ConfigurationKey FLAG_USAGE = new ConfigurationKey("lombok.Wither.flagUsage") {}; - /** * If you want your wither to be non-public, you can specify an alternate access level here. */ -- cgit