added validation for ObtainVia

updated inspection tests for builder
updated test lombok library
projectlombok#134

src/main/java/de/plushnikov/intellij/plugin/processor/handler/BuilderHandler.java

@@ -87,6 +87,7 @@ public class BuilderHandler {
  private static final String BUILDER_OBTAIN_VIA_FIELD = "field";
  private static final String BUILDER_OBTAIN_VIA_METHOD = "method";
  private static final String BUILDER_OBTAIN_VIA_STATIC = "isStatic";
+ public static final String BUILDER_OBTAIN_VIA_ANNOTATION = Builder.ObtainVia.class.getName().replace("$", ".");
 
 
  private final ToStringProcessor toStringProcessor;
@@ -119,7 +120,8 @@ public boolean validate(@NotNull PsiClass psiClass, @NotNull PsiAnnotation psiAn
  final String builderClassName = getBuilderClassName(psiClass, psiAnnotation);
  result = validateBuilderClassName(builderClassName, psiAnnotation.getProject(), problemBuilder) &&
  validateExistingBuilderClass(builderClassName, psiClass, problemBuilder) &&
- validateSingular(psiClass, problemBuilder);
+ validateSingular(psiClass, problemBuilder) &&
+ validateObtainViaAnnotations(getBuilderFields(psiClass, Collections.<PsiField>emptySet(), AccessorsInfo.EMPTY), problemBuilder);
  }
  return result;
  }
@@ -152,7 +154,7 @@ private boolean validateSingular(@NotNull PsiClass psiClass, @NotNull ProblemBui
  private boolean validateBuilderClassName(@NotNull String builderClassName, @NotNull Project project, @NotNull ProblemBuilder builder) {
  final PsiNameHelper psiNameHelper = PsiNameHelper.getInstance(project);
  if (!psiNameHelper.isIdentifier(builderClassName)) {
- builder.addError("%s ist not a valid identifier", builderClassName);
+ builder.addError("%s is not a valid identifier", builderClassName);
  return false;
  }
  return true;
@@ -184,7 +186,30 @@ public boolean validate(@NotNull PsiMethod psiMethod, @NotNull PsiAnnotation psi
  if (result) {
  final String builderClassName = getBuilderClassName(psiClass, psiAnnotation, psiMethod);
  result = validateBuilderClassName(builderClassName, psiAnnotation.getProject(), problemBuilder) &&
- validateExistingBuilderClass(builderClassName, psiClass, problemBuilder);
+ validateExistingBuilderClass(builderClassName, psiClass, problemBuilder) &&
+ validateObtainViaAnnotations(getBuilderParameters(psiMethod, Collections.<PsiField>emptySet()), problemBuilder);
+ }
+ return result;
+ }
+
+ private boolean validateObtainViaAnnotations(@NotNull Collection<? extends PsiVariable> psiVaraibles, @NotNull ProblemBuilder problemBuilder) {
+ boolean result = true;
+ for (PsiVariable psiVariable : psiVaraibles) {
+ final PsiAnnotation obtainViaAnnotation = PsiAnnotationSearchUtil.findAnnotation(psiVariable, BUILDER_OBTAIN_VIA_ANNOTATION);
+ if (null != obtainViaAnnotation) {
+ final String viaFieldName = PsiAnnotationUtil.getStringAnnotationValue(obtainViaAnnotation, BUILDER_OBTAIN_VIA_FIELD);
+ final String viaMethodName = PsiAnnotationUtil.getStringAnnotationValue(obtainViaAnnotation, BUILDER_OBTAIN_VIA_METHOD);
+ final boolean viaStaticCall = PsiAnnotationUtil.getBooleanAnnotationValue(obtainViaAnnotation, BUILDER_OBTAIN_VIA_STATIC, false);
+
+ if (StringUtils.isEmpty(viaFieldName) == StringUtils.isEmpty(viaMethodName)) {
+ problemBuilder.addError("The syntax is either @ObtainVia(field = \"fieldName\") or @ObtainVia(method = \"methodName\").");
+ result = false;
+ }
+ if (StringUtils.isEmpty(viaMethodName) && viaStaticCall) {
+ problemBuilder.addError("@ObtainVia(isStatic = true) is not valid unless 'method' has been set.");
+ result = false;
+ }
+ }
  }
  return result;
  }
@@ -330,7 +355,7 @@ private PsiCodeBlock createToBuilderMethodCodeBlock(@NotNull PsiClass psiClass,
  methodCalls.append(accessorsInfo.removePrefix(psiVariable.getName()));
  methodCalls.append('(');
 
- final PsiAnnotation obtainViaAnnotation = PsiAnnotationSearchUtil.findAnnotation(psiVariable, Builder.ObtainVia.class.getName().replace("$", "."));
+ final PsiAnnotation obtainViaAnnotation = PsiAnnotationSearchUtil.findAnnotation(psiVariable, BUILDER_OBTAIN_VIA_ANNOTATION);
  if (null != obtainViaAnnotation) {
  final String viaFieldName = PsiAnnotationUtil.getStringAnnotationValue(obtainViaAnnotation, BUILDER_OBTAIN_VIA_FIELD);
  final String viaMethodName = PsiAnnotationUtil.getStringAnnotationValue(obtainViaAnnotation, BUILDER_OBTAIN_VIA_METHOD);

src/test/java/de/plushnikov/intellij/plugin/InspectionTest.java

@@ -50,14 +50,6 @@ public void testIssue37() throws Exception {
  doTest();
  }
 
- public void testBuilderRightType() throws Exception {
- doTest();
- }
-
- public void testBuilderInvalidIdentifier() throws Exception {
- doTest();
- }
-
  public void testDelegateConcreteType() throws Exception {
  doTest();
  }

src/test/java/de/plushnikov/intellij/plugin/inspection/BuilderInspectionTest.java

@@ -0,0 +1,37 @@
+package de.plushnikov.intellij.plugin.inspection;
+
+import com.intellij.codeInspection.InspectionProfileEntry;
+
+public class BuilderInspectionTest extends LombokInspectionTest {
+
+ @Override
+ protected String getTestDataPath() {
+ return TEST_DATA_INSPECTION_DIRECTORY + "/builder";
+ }
+
+ @Override
+ protected InspectionProfileEntry getInspection() {
+ return new LombokInspection();
+ }
+
+ public void testBuilderInvalidIdentifier() throws Exception {
+ doTest();
+ }
+
+ public void testBuilderRightType() throws Exception {
+ doTest();
+ }
+
+ public void testBuilderInvalidUse() throws Exception {
+ doTest();
+ }
+
+ public void testBuilderObtainVia() throws Exception {
+ doTest();
+ }
+
+ public void testBuilderDefaultsWarnings() throws Exception {
+ //TODO implement test after adding support for Builder.Default
+ doTest();
+ }
+}

testData/inspection/builder/BuilderDefaultsWarnings.java

@@ -0,0 +1,15 @@
+@lombok.Builder
+public class BuilderDefaultsWarnings {
+ long x = System.currentTimeMillis();
+ final int y = 5;
+ @lombok.Builder.Default int z;
+ @lombok.Builder.Default @lombok.Singular java.util.List<String> items;
+}
+
+class NoBuilderButHasDefaults {
+ @lombok.Builder.Default private final long z = 5;
+
+ @lombok.Builder
+ public NoBuilderButHasDefaults() {
+ }
+}

testData/inspection/builder/BuilderInvalidIdentifier.java

@@ -0,0 +1,4 @@
+<error descr="invalid^identifier is not a valid identifier">@lombok.Builder(builderClassName = "invalid^identifier")</error>
+public class BuilderInvalidIdentifier {
+ private String field;
+}

testData/inspection/builder/BuilderInvalidUse.java

@@ -0,0 +1,19 @@
+//skip compare content
+<error descr="Lombok annotations are not allowed on builder class.">@lombok.Builder</error>
+class BuilderInvalidUse {
+ private int something;
+
+ @lombok.Getter @lombok.Setter @lombok.experimental.FieldDefaults(makeFinal = true) @lombok.experimental.Wither @lombok.Data @lombok.ToString @lombok.EqualsAndHashCode
+ @lombok.AllArgsConstructor
+ public static class BuilderInvalidUseBuilder {
+
+ }
+}
+
+<error descr="Lombok annotations are not allowed on builder class.">@lombok.Builder</error>
+class AlsoInvalid {
+ @lombok.Value
+ public static class AlsoInvalidBuilder {
+
+ }
+}

testData/inspection/builder/BuilderObtainVia.java

@@ -0,0 +1,39 @@
+<error descr="The syntax is either @ObtainVia(field = \"fieldName\") or @ObtainVia(method = \"methodName\").">@lombok.Builder</error>
+class BuilderObtainVia {
+
+ private String field1;
+
+ @lombok.Builder.ObtainVia
+ private String field2;
+
+ public String someMethod() {
+ return "someValue";
+ }
+}
+
+<error descr="The syntax is either @ObtainVia(field = \"fieldName\") or @ObtainVia(method = \"methodName\").">@lombok.Builder</error>
+class BuilderObtainViaFieldAndMethod {
+
+ private String field1;
+
+ @lombok.Builder.ObtainVia(field = "field1", method = "someMethod")
+ private String field2;
+
+ public String someMethod() {
+ return "someValue";
+ }
+}
+
+<error descr="@ObtainVia(isStatic = true) is not valid unless 'method' has been set.">@lombok.Builder</error>
+class BuilderObtainViaFieldStatic {
+
+ private static String field1;
+
+ @lombok.Builder.ObtainVia(field = "field1", isStatic=true)
+ private String field2;
+
+ public String someMethod() {
+ return "someValue";
+ }
+}
+

testData/inspection/builderRightType/src/Test.java → testData/inspection/builder/BuilderRightType.java

@@ -1,12 +1,12 @@
-@lombok.Builder
+<error descr="@lombok.Builder can be used on classes only">@lombok.Builder</error>
 enum BuilderEnumError {
 }
 
-@lombok.Builder
+<error descr="@lombok.Builder can be used on classes only">@lombok.Builder</error>
 interface BuilderInterfaceError {
 }
 
-@lombok.Builder
+<error descr="@lombok.Builder can be used on classes only">@lombok.Builder</error>
 @interface BuilderAnnotationError {
 }
 
@@ -36,16 +36,16 @@ public void makeMe(int x) {
  System.out.println(x);
  }
 }
-import lombok.ToString;
-@lombok.Builder
+
+<error descr="Lombok annotations are not allowed on builder class.">@lombok.Builder</error>
 class BuilderWithPredefinedClassAnnotation {
  private int x;
  private Float y;
  private String z;
 
- @ToString
+ @lombok.ToString
  static class BuilderWithPredefinedClassAnnotationBuilder {
  private int x;
  }
 
-}
+}