diff --git a/build.gradle b/build.gradle index 8e98d5e06..a77c818a5 100644 --- a/build.gradle +++ b/build.gradle @@ -110,12 +110,10 @@ jacocoTestReport { // Configurations configurations { lombok - lombok_dep } dependencies { lombok group: 'org.projectlombok', name: 'lombok', version: '1.18.2', classifier: 'sources', ext: 'jar' - lombok_dep group: 'org.projectlombok', name: 'lombok', version: '1.16.20', classifier: 'sources', ext: 'jar' testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'org.mockito', name: 'mockito-core', version: '1.+' @@ -149,15 +147,6 @@ copy { into("generated/src") } -copy { - includeEmptyDirs = false - from({ zipTree(configurations.lombok_dep.singleFile) }) { - include 'lombok/experimental/Value.java' - include 'lombok/experimental/Builder.java' - } - into("generated/src") -} - copy { includeEmptyDirs = false from({ zipTree(configurations.lombok.singleFile) }) { diff --git a/src/main/java/de/plushnikov/intellij/plugin/extension/LombokElementFinder.java b/src/main/java/de/plushnikov/intellij/plugin/extension/LombokElementFinder.java index 0d3fb2dd7..c87f76da1 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/extension/LombokElementFinder.java +++ b/src/main/java/de/plushnikov/intellij/plugin/extension/LombokElementFinder.java @@ -36,7 +36,6 @@ JavaFileManager getServiceManager(GlobalSearchScope scope) { @Nullable @Override - @SuppressWarnings("deprecation") public PsiClass findClass(@NotNull String qualifiedName, @NotNull GlobalSearchScope scope) { final int lastDot = qualifiedName.lastIndexOf('.'); if (lastDot < 0) { @@ -51,12 +50,12 @@ public PsiClass findClass(@NotNull String qualifiedName, @NotNull GlobalSearchSc final PsiClass parentClass = getPsiClassAndPreventRecursionCalls(parentName, scope); if (null != parentClass) { - if (PsiAnnotationSearchUtil.isAnnotatedWith(parentClass, Builder.class, lombok.experimental.Builder.class)) { + if (PsiAnnotationSearchUtil.isAnnotatedWith(parentClass, Builder.class)) { return parentClass.findInnerClassByName(shortName, false); } else { final Collection psiMethods = PsiClassUtil.collectClassMethodsIntern(parentClass); for (PsiMethod psiMethod : psiMethods) { - if (PsiAnnotationSearchUtil.isAnnotatedWith(psiMethod, Builder.class, lombok.experimental.Builder.class)) { + if (PsiAnnotationSearchUtil.isAnnotatedWith(psiMethod, Builder.class)) { return parentClass.findInnerClassByName(shortName, false); } } diff --git a/src/main/java/de/plushnikov/intellij/plugin/extension/LombokRenameFieldReferenceProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/extension/LombokRenameFieldReferenceProcessor.java index ada9732df..5428ce5ed 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/extension/LombokRenameFieldReferenceProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/extension/LombokRenameFieldReferenceProcessor.java @@ -68,7 +68,7 @@ public void prepareRenaming(@NotNull PsiElement element, @NotNull String newFiel } } - final PsiAnnotation builderAnnotation = PsiAnnotationSearchUtil.findAnnotation(containingClass, Builder.class, lombok.experimental.Builder.class); + final PsiAnnotation builderAnnotation = PsiAnnotationSearchUtil.findAnnotation(containingClass, Builder.class); if (null != builderAnnotation) { final PsiAnnotation singularAnnotation = PsiAnnotationSearchUtil.findAnnotation(psiField, Singular.class); final BuilderElementHandler handler = SingularHandlerFactory.getHandlerFor(psiField, singularAnnotation); diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/DataProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/DataProcessor.java index 7cb5ae8ee..6a69334b5 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/DataProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/DataProcessor.java @@ -109,7 +109,7 @@ private boolean shouldGenerateRequiredArgsConstructor(@NotNull PsiClass psiClass boolean result = false; // create required constructor only if there are no other constructor annotations if (PsiAnnotationSearchUtil.isNotAnnotatedWith(psiClass, NoArgsConstructor.class, RequiredArgsConstructor.class, AllArgsConstructor.class, - Builder.class, lombok.experimental.Builder.class)) { + Builder.class)) { final Collection definedConstructors = PsiClassUtil.collectClassConstructorIntern(psiClass); filterToleratedElements(definedConstructors); diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/EqualsAndHashCodeProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/EqualsAndHashCodeProcessor.java index 720b5bdc8..26e8a2047 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/EqualsAndHashCodeProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/EqualsAndHashCodeProcessor.java @@ -152,7 +152,6 @@ protected Collection createEqualAndHashCode(@NotNull PsiClass psiClas return result; } - @SuppressWarnings("deprecation") private boolean shouldGenerateCanEqual(@NotNull PsiClass psiClass) { final boolean isNotDirectDescendantOfObject = PsiClassUtil.hasSuperClass(psiClass); if (isNotDirectDescendantOfObject) { @@ -160,7 +159,7 @@ private boolean shouldGenerateCanEqual(@NotNull PsiClass psiClass) { } final boolean isFinal = psiClass.hasModifierProperty(PsiModifier.FINAL) || - (PsiAnnotationSearchUtil.isAnnotatedWith(psiClass, Value.class, lombok.experimental.Value.class) && PsiAnnotationSearchUtil.isNotAnnotatedWith(psiClass, NonFinal.class)); + (PsiAnnotationSearchUtil.isAnnotatedWith(psiClass, Value.class) && PsiAnnotationSearchUtil.isNotAnnotatedWith(psiClass, NonFinal.class)); return !isFinal; } diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/ValueProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/ValueProcessor.java index 2d825ae5c..1b5602078 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/ValueProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/ValueProcessor.java @@ -37,10 +37,9 @@ public class ValueProcessor extends AbstractClassProcessor { private final AllArgsConstructorProcessor allArgsConstructorProcessor; private final NoArgsConstructorProcessor noArgsConstructorProcessor; - @SuppressWarnings({"deprecation", "unchecked"}) public ValueProcessor(GetterProcessor getterProcessor, EqualsAndHashCodeProcessor equalsAndHashCodeProcessor, ToStringProcessor toStringProcessor, AllArgsConstructorProcessor allArgsConstructorProcessor, NoArgsConstructorProcessor noArgsConstructorProcessor) { - super(PsiMethod.class, Value.class, lombok.experimental.Value.class); + super(PsiMethod.class, Value.class); this.getterProcessor = getterProcessor; this.equalsAndHashCodeProcessor = equalsAndHashCodeProcessor; @@ -68,7 +67,7 @@ private boolean validateAnnotationOnRightType(@NotNull PsiClass psiClass, @NotNu return result; } - @SuppressWarnings("deprecation") + @SuppressWarnings({"unchecked"}) protected void generatePsiElements(@NotNull PsiClass psiClass, @NotNull PsiAnnotation psiAnnotation, @NotNull List target) { if (PsiAnnotationSearchUtil.isNotAnnotatedWith(psiClass, Getter.class)) { @@ -82,7 +81,7 @@ protected void generatePsiElements(@NotNull PsiClass psiClass, @NotNull PsiAnnot } // create required constructor only if there are no other constructor annotations if (PsiAnnotationSearchUtil.isNotAnnotatedWith(psiClass, NoArgsConstructor.class, RequiredArgsConstructor.class, AllArgsConstructor.class, - lombok.experimental.Builder.class, lombok.Builder.class)) { + lombok.Builder.class)) { final Collection definedConstructors = PsiClassUtil.collectClassConstructorIntern(psiClass); filterToleratedElements(definedConstructors); // and only if there are no any other constructors! diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/AbstractBuilderPreDefinedInnerClassProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/AbstractBuilderPreDefinedInnerClassProcessor.java index 9262dfdcb..9cb596e40 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/AbstractBuilderPreDefinedInnerClassProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/AbstractBuilderPreDefinedInnerClassProcessor.java @@ -26,6 +26,12 @@ public abstract class AbstractBuilderPreDefinedInnerClassProcessor extends Abstr protected final BuilderHandler builderHandler; + AbstractBuilderPreDefinedInnerClassProcessor(@NotNull BuilderHandler builderHandler, @NotNull Class supportedClass, + @NotNull Class supportedAnnotationClass) { + super(supportedClass, supportedAnnotationClass); + this.builderHandler = builderHandler; + } + AbstractBuilderPreDefinedInnerClassProcessor(@NotNull BuilderHandler builderHandler, @NotNull Class supportedClass, @NotNull Class supportedAnnotationClass, @NotNull Class... equivalentAnnotationClasses) { diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderClassProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderClassProcessor.java index 6833b1f38..02a759bf6 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderClassProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderClassProcessor.java @@ -24,9 +24,8 @@ public class BuilderClassProcessor extends AbstractClassProcessor { private final BuilderHandler builderHandler; - @SuppressWarnings({"deprecation", "unchecked"}) public BuilderClassProcessor(@NotNull BuilderHandler builderHandler) { - super(PsiClass.class, Builder.class, lombok.experimental.Builder.class); + super(PsiClass.class, Builder.class); this.builderHandler = builderHandler; } diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderPreDefinedInnerClassFieldProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderPreDefinedInnerClassFieldProcessor.java index 4ea2817c5..7562864b4 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderPreDefinedInnerClassFieldProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderPreDefinedInnerClassFieldProcessor.java @@ -23,9 +23,8 @@ */ public class BuilderPreDefinedInnerClassFieldProcessor extends AbstractBuilderPreDefinedInnerClassProcessor { - @SuppressWarnings({"deprecation", "unchecked"}) public BuilderPreDefinedInnerClassFieldProcessor(@NotNull BuilderHandler builderHandler) { - super(builderHandler, PsiField.class, Builder.class, lombok.experimental.Builder.class); + super(builderHandler, PsiField.class, Builder.class); } @Override diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderPreDefinedInnerClassMethodProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderPreDefinedInnerClassMethodProcessor.java index a6969bec7..6bfa7c59a 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderPreDefinedInnerClassMethodProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderPreDefinedInnerClassMethodProcessor.java @@ -23,9 +23,8 @@ */ public class BuilderPreDefinedInnerClassMethodProcessor extends AbstractBuilderPreDefinedInnerClassProcessor { - @SuppressWarnings({"deprecation", "unchecked"}) public BuilderPreDefinedInnerClassMethodProcessor(@NotNull BuilderHandler builderHandler) { - super(builderHandler, PsiMethod.class, Builder.class, lombok.experimental.Builder.class); + super(builderHandler, PsiMethod.class, Builder.class); } protected void generatePsiElements(@NotNull PsiClass psiParentClass, @Nullable PsiMethod psiParentMethod, @NotNull PsiClass psiBuilderClass, @NotNull PsiAnnotation psiAnnotation, @NotNull List target) { diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderProcessor.java index e4ff4ae1b..7d3763437 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/builder/BuilderProcessor.java @@ -38,9 +38,8 @@ public class BuilderProcessor extends AbstractClassProcessor { private final BuilderHandler builderHandler; private final AllArgsConstructorProcessor allArgsConstructorProcessor; - @SuppressWarnings({"deprecation", "unchecked"}) public BuilderProcessor(@NotNull AllArgsConstructorProcessor allArgsConstructorProcessor, @NotNull BuilderHandler builderHandler) { - super(PsiMethod.class, Builder.class, lombok.experimental.Builder.class); + super(PsiMethod.class, Builder.class); this.builderHandler = builderHandler; this.allArgsConstructorProcessor = allArgsConstructorProcessor; } diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/constructor/AbstractConstructorClassProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/constructor/AbstractConstructorClassProcessor.java index a50df4d04..f8b969b64 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/constructor/AbstractConstructorClassProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/constructor/AbstractConstructorClassProcessor.java @@ -159,10 +159,9 @@ private PsiMethod findExistedMethod(final Collection definedMethods, } @NotNull - @SuppressWarnings("deprecation") protected Collection getAllNotInitializedAndNotStaticFields(@NotNull PsiClass psiClass) { Collection allNotInitializedNotStaticFields = new ArrayList(); - final boolean classAnnotatedWithValue = PsiAnnotationSearchUtil.isAnnotatedWith(psiClass, Value.class, lombok.experimental.Value.class); + final boolean classAnnotatedWithValue = PsiAnnotationSearchUtil.isAnnotatedWith(psiClass, Value.class); for (PsiField psiField : psiClass.getFields()) { // skip fields named $ boolean addField = !psiField.getName().startsWith(LombokUtils.LOMBOK_INTERN_FIELD_MARKER); @@ -191,10 +190,9 @@ public Collection getAllFields(@NotNull PsiClass psiClass) { } @NotNull - @SuppressWarnings("deprecation") public Collection getRequiredFields(@NotNull PsiClass psiClass) { Collection result = new ArrayList(); - final boolean classAnnotatedWithValue = PsiAnnotationSearchUtil.isAnnotatedWith(psiClass, Value.class, lombok.experimental.Value.class); + final boolean classAnnotatedWithValue = PsiAnnotationSearchUtil.isAnnotatedWith(psiClass, Value.class); for (PsiField psiField : getAllNotInitializedAndNotStaticFields(psiClass)) { final PsiModifierList modifierList = psiField.getModifierList(); diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/field/WitherFieldProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/field/WitherFieldProcessor.java index 617254cb8..ec9241612 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/field/WitherFieldProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/field/WitherFieldProcessor.java @@ -118,10 +118,9 @@ private boolean validIsWitherUnique(@NotNull PsiField psiField, @NotNull final P return true; } - @SuppressWarnings("deprecation") + @SuppressWarnings({"unchecked"}) public boolean validConstructor(@NotNull PsiClass psiClass, @NotNull ProblemBuilder builder) { - if (PsiAnnotationSearchUtil.isAnnotatedWith(psiClass, AllArgsConstructor.class, Value.class, lombok.experimental.Value.class, - Builder.class, lombok.experimental.Builder.class)) { + if (PsiAnnotationSearchUtil.isAnnotatedWith(psiClass, AllArgsConstructor.class, Value.class, Builder.class)) { return true; } diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/handler/BuilderHandler.java b/src/main/java/de/plushnikov/intellij/plugin/processor/handler/BuilderHandler.java index 77d56c514..e3a880048 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/handler/BuilderHandler.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/handler/BuilderHandler.java @@ -53,7 +53,7 @@ public class BuilderHandler { private static final Collection INVALID_ON_BUILDERS = Collections.unmodifiableSet(new HashSet(Arrays.asList( Getter.class.getSimpleName(), Setter.class.getSimpleName(), Wither.class.getSimpleName(), ToString.class.getSimpleName(), EqualsAndHashCode.class.getSimpleName(), RequiredArgsConstructor.class.getSimpleName(), AllArgsConstructor.class.getSimpleName(), NoArgsConstructor.class.getSimpleName(), - Data.class.getSimpleName(), Value.class.getSimpleName(), lombok.experimental.Value.class.getSimpleName(), FieldDefaults.class.getSimpleName()))); + Data.class.getSimpleName(), Value.class.getSimpleName(), FieldDefaults.class.getSimpleName()))); private final ToStringProcessor toStringProcessor; private final NoArgsConstructorProcessor noArgsConstructorProcessor; @@ -315,8 +315,7 @@ private Stream createBuilderInfos(@NotNull PsiAnnotation psiAnnotat result = PsiClassUtil.collectClassFieldsIntern(psiClass).stream().map(BuilderInfo::fromPsiField) .filter(BuilderInfo::useForBuilder); } - return result.map(info -> info.withFluent(isFluentBuilder(psiAnnotation))) - .map(info -> info.withChain(isChainBuilder(psiAnnotation))); + return result; } public List createBuilderInfos(@NotNull PsiAnnotation psiAnnotation, @NotNull PsiClass psiClass, @@ -522,16 +521,4 @@ private void addTypeParameters(PsiClass builderClass, PsiMethod psiMethod, Lombo methodBuilder.withTypeParameter(psiTypeParameter); } } - - // These exist just to support the 'old' lombok.experimental.Builder, which had these properties. lombok.Builder no longer has them. - private static final String ANNOTATION_FLUENT = "fluent"; - private static final String ANNOTATION_CHAIN = "chain"; - - private boolean isFluentBuilder(@NotNull PsiAnnotation psiAnnotation) { - return PsiAnnotationUtil.getBooleanAnnotationValue(psiAnnotation, ANNOTATION_FLUENT, true); - } - - private boolean isChainBuilder(@NotNull PsiAnnotation psiAnnotation) { - return PsiAnnotationUtil.getBooleanAnnotationValue(psiAnnotation, ANNOTATION_CHAIN, true); - } } diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/handler/EqualsAndHashCodeToStringHandler.java b/src/main/java/de/plushnikov/intellij/plugin/processor/handler/EqualsAndHashCodeToStringHandler.java index 7d264ad74..7c4b013d1 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/handler/EqualsAndHashCodeToStringHandler.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/handler/EqualsAndHashCodeToStringHandler.java @@ -220,7 +220,7 @@ private String buildAttributeNameString(boolean doNotUseGetters, @NotNull PsiFie final String getterName = LombokUtils.getGetterName(classField); final boolean hasGetter; - if (PsiAnnotationSearchUtil.isAnnotatedWith(psiClass, Data.class, Value.class, lombok.experimental.Value.class, Getter.class)) { + if (PsiAnnotationSearchUtil.isAnnotatedWith(psiClass, Data.class, Value.class, Getter.class)) { final PsiAnnotation getterLombokAnnotation = PsiAnnotationSearchUtil.findAnnotation(psiClass, Getter.class); hasGetter = null == getterLombokAnnotation || null != LombokProcessorUtil.getMethodModifier(getterLombokAnnotation); } else { diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/method/AbstractMethodProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/method/AbstractMethodProcessor.java index 93cf4fe96..371341b05 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/method/AbstractMethodProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/method/AbstractMethodProcessor.java @@ -27,6 +27,10 @@ */ public abstract class AbstractMethodProcessor extends AbstractProcessor implements MethodProcessor { + AbstractMethodProcessor(@NotNull Class supportedClass, @NotNull Class supportedAnnotationClass) { + super(supportedClass, supportedAnnotationClass); + } + AbstractMethodProcessor(@NotNull Class supportedClass, @NotNull Class supportedAnnotationClass, Class... equivalentAnnotationClasses) { super(supportedClass, supportedAnnotationClass, equivalentAnnotationClasses); } diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/method/BuilderClassMethodProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/method/BuilderClassMethodProcessor.java index d6e97d702..31e7b8690 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/method/BuilderClassMethodProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/method/BuilderClassMethodProcessor.java @@ -24,9 +24,8 @@ public class BuilderClassMethodProcessor extends AbstractMethodProcessor { private final BuilderHandler builderHandler; - @SuppressWarnings({"deprecation", "unchecked"}) public BuilderClassMethodProcessor(@NotNull BuilderHandler builderHandler) { - super(PsiClass.class, Builder.class, lombok.experimental.Builder.class); + super(PsiClass.class, Builder.class); this.builderHandler = builderHandler; } diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/method/BuilderMethodProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/method/BuilderMethodProcessor.java index d6d657294..9ebae848c 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/method/BuilderMethodProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/method/BuilderMethodProcessor.java @@ -24,9 +24,8 @@ public class BuilderMethodProcessor extends AbstractMethodProcessor { private final BuilderHandler builderHandler; - @SuppressWarnings({"deprecation", "unchecked"}) public BuilderMethodProcessor(@NotNull BuilderHandler builderHandler) { - super(PsiMethod.class, Builder.class, lombok.experimental.Builder.class); + super(PsiMethod.class, Builder.class); this.builderHandler = builderHandler; } diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/modifier/ValueModifierProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/modifier/ValueModifierProcessor.java index 0104aa76f..0f372519e 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/processor/modifier/ValueModifierProcessor.java +++ b/src/main/java/de/plushnikov/intellij/plugin/processor/modifier/ValueModifierProcessor.java @@ -30,7 +30,7 @@ public boolean isSupported(@NotNull PsiModifierList modifierList) { PsiClass searchableClass = PsiTreeUtil.getParentOfType(modifierList, PsiClass.class, true); - return null != searchableClass && PsiAnnotationSearchUtil.isAnnotatedWith(searchableClass, lombok.Value.class, lombok.experimental.Value.class); + return null != searchableClass && PsiAnnotationSearchUtil.isAnnotatedWith(searchableClass, lombok.Value.class); } @Override diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java index 068b90d72..7850dc901 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java @@ -37,10 +37,6 @@ public void setUp() throws Exception { doTest(true); } - public void testBuilder$BuilderChainAndFluent() { - doTest(true); - } - public void testBuilder$BuilderWithAccessors() { doTest(true); } diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/ValueTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/ValueTest.java index 5f8338e19..71458598c 100644 --- a/src/test/java/de/plushnikov/intellij/plugin/processor/ValueTest.java +++ b/src/test/java/de/plushnikov/intellij/plugin/processor/ValueTest.java @@ -22,11 +22,7 @@ protected boolean shouldCompareCodeBlocks() { doTest(true); } - public void testValue$ValueExperimental() { - doTest(true); - } - - public void testValue$ValueExperimentalStarImport() { + public void testValue$ValueStarImport() { doTest(true); } diff --git a/testData/after/builder/BuilderChainAndFluent.java b/testData/after/builder/BuilderChainAndFluent.java deleted file mode 100644 index dc6906d32..000000000 --- a/testData/after/builder/BuilderChainAndFluent.java +++ /dev/null @@ -1,50 +0,0 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 - -class BuilderChainAndFluent { - private final int yes; - - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - BuilderChainAndFluent(final int yes) { - this.yes = yes; - } - - - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public static class BuilderChainAndFluentBuilder { - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - private int yes; - - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - BuilderChainAndFluentBuilder() { - } - - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public void setYes(final int yes) { - this.yes = yes; - } - - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public BuilderChainAndFluent build() { - return new BuilderChainAndFluent(yes); - } - - @java.lang.Override - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public java.lang.String toString() { - return "BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes + ")"; - } - } - - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public static BuilderChainAndFluentBuilder builder() { - return new BuilderChainAndFluentBuilder(); - } -} diff --git a/testData/after/builder/BuilderExampleCustomized.java b/testData/after/builder/BuilderExampleCustomized.java index d0cf00389..8386f6dbb 100644 --- a/testData/after/builder/BuilderExampleCustomized.java +++ b/testData/after/builder/BuilderExampleCustomized.java @@ -19,12 +19,14 @@ public static class HelloWorldBuilder { HelloWorldBuilder() { } - public void setName(String name) { + public HelloWorldBuilder name(String name) { this.name = name; + return this; } - public void setAge(int age) { + public HelloWorldBuilder age(int age) { this.age = age; + return this; } public BuilderExampleCustomized execute() { diff --git a/testData/after/value/ValueExperimental.java b/testData/after/value/ValueExperimental.java deleted file mode 100644 index f69f1b67e..000000000 --- a/testData/after/value/ValueExperimental.java +++ /dev/null @@ -1,63 +0,0 @@ -// Generated by delombok at Sat Jun 11 11:12:44 CEST 2016 - -final class ValueExperimental1 { - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public ValueExperimental1() { - } - - @java.lang.Override - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public boolean equals(final java.lang.Object o) { - if (o == this) return true; - if (!(o instanceof ValueExperimental1)) return false; - return true; - } - - @java.lang.Override - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public int hashCode() { - int result = 1; - return result; - } - - @java.lang.Override - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public java.lang.String toString() { - return "ValueExperimental1()"; - } -} - -final class ValueExperimental2 { - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public ValueExperimental2() { - } - - @java.lang.Override - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public boolean equals(final java.lang.Object o) { - if (o == this) return true; - if (!(o instanceof ValueExperimental2)) return false; - return true; - } - - @java.lang.Override - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public int hashCode() { - int result = 1; - return result; - } - - @java.lang.Override - @java.lang.SuppressWarnings("all") - @javax.annotation.Generated("lombok") - public java.lang.String toString() { - return "ValueExperimental2()"; - } -} diff --git a/testData/after/value/ValueExperimentalStarImport.java b/testData/after/value/ValueStarImport.java similarity index 90% rename from testData/after/value/ValueExperimentalStarImport.java rename to testData/after/value/ValueStarImport.java index c044bca19..8686b670f 100644 --- a/testData/after/value/ValueExperimentalStarImport.java +++ b/testData/after/value/ValueStarImport.java @@ -2,10 +2,10 @@ import lombok.experimental.*; -final class ValueExperimentalStarImport { +final class ValueStarImport { @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") - public ValueExperimentalStarImport() { + public ValueStarImport() { } @java.lang.Override diff --git a/testData/before/builder/BuilderChainAndFluent.java b/testData/before/builder/BuilderChainAndFluent.java deleted file mode 100644 index 4d08741bf..000000000 --- a/testData/before/builder/BuilderChainAndFluent.java +++ /dev/null @@ -1,4 +0,0 @@ -@lombok.experimental.Builder(fluent = false, chain = false) -class BuilderChainAndFluent { - private final int yes; -} diff --git a/testData/before/builder/BuilderComplex.java b/testData/before/builder/BuilderComplex.java index 590a27239..c13f5877b 100644 --- a/testData/before/builder/BuilderComplex.java +++ b/testData/before/builder/BuilderComplex.java @@ -1,5 +1,5 @@ import java.util.List; -import lombok.experimental.Builder; +import lombok.Builder; class BuilderComplex { @Builder(buildMethodName = "execute") diff --git a/testData/before/builder/BuilderExample.java b/testData/before/builder/BuilderExample.java index c83447f57..2cbd9911f 100644 --- a/testData/before/builder/BuilderExample.java +++ b/testData/before/builder/BuilderExample.java @@ -1,7 +1,7 @@ -import lombok.experimental.Builder; +import lombok.Builder; @Builder public class BuilderExample { private String name; private int age; -} \ No newline at end of file +} diff --git a/testData/before/builder/BuilderExampleCustomized.java b/testData/before/builder/BuilderExampleCustomized.java index 6c9c861ee..81a2b25db 100644 --- a/testData/before/builder/BuilderExampleCustomized.java +++ b/testData/before/builder/BuilderExampleCustomized.java @@ -1,5 +1,5 @@ -@lombok.experimental.Builder(builderClassName = "HelloWorldBuilder", buildMethodName = "execute", - builderMethodName = "helloWorld", fluent = false, chain = false) +@lombok.Builder(builderClassName = "HelloWorldBuilder", buildMethodName = "execute", + builderMethodName = "helloWorld") public class BuilderExampleCustomized { private String name; private int age; diff --git a/testData/before/builder/BuilderPredefined.java b/testData/before/builder/BuilderPredefined.java index 8fdde2629..da6f4731d 100644 --- a/testData/before/builder/BuilderPredefined.java +++ b/testData/before/builder/BuilderPredefined.java @@ -1,4 +1,4 @@ -@lombok.experimental.Builder +@lombok.Builder public class BuilderPredefined { private String name; private int age; @@ -14,4 +14,4 @@ public void age(int age) { this.age = age; } } -} \ No newline at end of file +} diff --git a/testData/before/value/ValueBuilder.java b/testData/before/value/ValueBuilder.java index c91b53641..ceafabbf2 100644 --- a/testData/before/value/ValueBuilder.java +++ b/testData/before/value/ValueBuilder.java @@ -1,5 +1,5 @@ import lombok.Value; -import lombok.experimental.Builder; +import lombok.Builder; @Value @Builder @@ -12,4 +12,4 @@ public static void main(String[] args) { ValueBuilder builder = new ValueBuilder("1", 2, 3.0); System.out.println(builder); } -} \ No newline at end of file +} diff --git a/testData/before/value/ValueExperimental.java b/testData/before/value/ValueExperimental.java deleted file mode 100644 index 6bae26a0c..000000000 --- a/testData/before/value/ValueExperimental.java +++ /dev/null @@ -1,9 +0,0 @@ -import lombok.experimental.Value; - -@Value -class ValueExperimental1 { -} - -@lombok.experimental.Value -class ValueExperimental2 { -} \ No newline at end of file diff --git a/testData/before/value/ValueExperimentalStarImport.java b/testData/before/value/ValueExperimentalStarImport.java deleted file mode 100644 index 5f18cffea..000000000 --- a/testData/before/value/ValueExperimentalStarImport.java +++ /dev/null @@ -1,5 +0,0 @@ -import lombok.experimental.*; - -@Value -class ValueExperimentalStarImport { -} \ No newline at end of file diff --git a/testData/before/value/ValueStarImport.java b/testData/before/value/ValueStarImport.java new file mode 100644 index 000000000..b5570be5b --- /dev/null +++ b/testData/before/value/ValueStarImport.java @@ -0,0 +1,5 @@ +import lombok.*; + +@Value +class ValueStarImport { +}