Merge branch 'devel'

src/main/java/net/karneim/pojobuilder/model/PropertyM.java

@@ -30,6 +30,10 @@ public String getPropertyName() {
     return propertyName;
   }
 
+  public boolean isField() {
+    return isAccessibleViaFieldAccess();
+  }
+
   public String getWithMethodName() {
     return withMethodName;
   }
@@ -260,4 +264,5 @@ public String toString() {
         + readableViaGetterMethod + ", writableViaFactoryMethodParameter=" + writableViaFactoryMethodParameter
         + ", fieldAccess=" + fieldAccess + "]";
   }
+
 }

src/main/java/net/karneim/pojobuilder/sourcegen/BuilderSourceGenerator.java

@@ -404,12 +404,15 @@ private void emitWithMethodUsingBuilderInterface(TypeM builderType, TypeM selfTy
     String withMethodName = prop.getWithMethodName();
     String pojoTypeStr = writer.compressType(pojoType.getName());
     String parameterTypeStr = prop.getParameterizedBuilderInterfaceType(interfaceType, optional).getGenericType();
+    String propertyLink = prop.isAccessibleViaFieldAccess()
+        ? String.format("{@link %s#%s}", pojoTypeStr, prop.getPropertyName())
+        : prop.getPropertyName();
 
     writer.emitEmptyLine();
-    writer.emitJavadoc("Sets the default builder for the {@link %s#%s} property.\n\n"//
+    writer.emitJavadoc("Sets the default builder for the %s property.\n\n"//
         + "@param builder the default builder\n"//
         + "@return this builder"//
-        , pojoTypeStr, prop.getPropertyName());
+        , propertyLink);
     writer.beginMethod(selfType.getGenericType(), withMethodName, EnumSet.of(PUBLIC), parameterTypeStr, "builder");
     writer.emitStatement("this.%s = builder", prop.getBuilderFieldName());
     if (optional == null) {
@@ -438,11 +441,15 @@ private void emitWithMethod(TypeM builderType, TypeM selfType, TypeM pojoType, P
     } else {
       parameterTypeStr = propertyType.getGenericType();
     }
+    String propertyLink = prop.isAccessibleViaFieldAccess()
+        ? String.format("{@link %s#%s}", pojoTypeStr, prop.getPropertyName())
+        : prop.getPropertyName();
+
     writer.emitEmptyLine();
-    writer.emitJavadoc("Sets the default value for the {@link %s#%s} property.\n\n"//
+    writer.emitJavadoc("Sets the default value for the %s property.\n\n"//
         + "@param value the default value\n"//
         + "@return this builder"//
-        , pojoTypeStr, prop.getPropertyName());
+        , propertyLink);
     writer.beginMethod(selfType.getGenericType(), withMethodName, EnumSet.of(PUBLIC), parameterTypeStr, "value");
     if (optional == null) {
       writer.emitStatement("this.%s = value", valueFieldName);
@@ -468,12 +475,14 @@ private void emitWithOptionalMethod(TypeM builderType, TypeM selfType, TypeM poj
     String pojoTypeStr = writer.compressType(pojoType.getName());
     String optionalParameterTypeStr = prop.getOptionalPropertyType(optional).getGenericType();
     optionalParameterTypeStr = writer.compressType(optionalParameterTypeStr);
-
+    String propertyLink = prop.isAccessibleViaFieldAccess()
+        ? String.format("{@link %s#%s}", pojoTypeStr, prop.getPropertyName())
+        : prop.getPropertyName();
     writer.emitEmptyLine();
-    writer.emitJavadoc("Optionally sets the default value for the {@link %s#%s} property.\n\n"//
+    writer.emitJavadoc("Optionally sets the default value for the %s property.\n\n"//
         + "@param optionalValue the optional default value\n"//
         + "@return this builder"//
-        , pojoTypeStr, prop.getPropertyName());
+        , propertyLink);
     writer.beginMethod(selfType.getGenericType(), withMethodName, EnumSet.of(PUBLIC), optionalParameterTypeStr,
         "optionalValue");
     String condition;

src/test/java/net/karneim/pojobuilder/processor/with/publicfields/AnnotationProcessor_PublicFields_Test.java

@@ -0,0 +1,31 @@
+package net.karneim.pojobuilder.processor.with.publicfields;
+
+import net.karneim.pojobuilder.processor.AnnotationProcessor;
+import net.karneim.pojobuilder.processor.with.ProcessorTestSupport;
+import org.junit.Test;
+
+import static net.karneim.pojobuilder.PbAssertions.assertThat;
+import static net.karneim.pojobuilder.testenv.JavaProject.Compilation;
+
+/**
+ * @feature The {@link AnnotationProcessor} generates builder classes.
+ */
+public class AnnotationProcessor_PublicFields_Test extends ProcessorTestSupport {
+
+  /**
+   * @throws Exception
+   */
+  @Test
+  public void testPublicFields() {
+    // Given:
+    sourceFor(Pojo.class);
+    // When:
+    prj.compile();
+    // Then:
+    assertThat(prj)
+        .generatedSameSourceAs(PojoBuilder.class)
+        .compiled(PojoBuilder.class)
+        .reported(Compilation.Success);
+  }
+
+}

src/testdata/java/net/karneim/pojobuilder/processor/with/builderinterface/AnotherPojoBuilder.java

@@ -26,7 +26,7 @@ public AnotherPojoBuilder() {
   }
 
   /**
-   * Sets the default value for the {@link Pojo#file} property.
+   * Sets the default value for the file property.
    *
    * @param value the default value
    * @return this builder
@@ -38,7 +38,7 @@ public AnotherPojoBuilder withFile(File value) {
   }
 
   /**
-   * Sets the default builder for the {@link Pojo#file} property.
+   * Sets the default builder for the file property.
    *
    * @param builder the default builder
    * @return this builder
@@ -50,7 +50,7 @@ public AnotherPojoBuilder withFile(Builder<? extends File> builder) {
   }
 
   /**
-   * Sets the default value for the {@link Pojo#age} property.
+   * Sets the default value for the age property.
    *
    * @param value the default value
    * @return this builder
@@ -62,7 +62,7 @@ public AnotherPojoBuilder withAge(int value) {
   }
 
   /**
-   * Sets the default builder for the {@link Pojo#age} property.
+   * Sets the default builder for the age property.
    *
    * @param builder the default builder
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/builderinterface/GenericPojoBuilder.java

@@ -46,7 +46,7 @@ public GenericPojoBuilder<P> withName(Builder<? extends String> builder) {
   }
 
   /**
-   * Sets the default value for the {@link GenericPojo#content} property.
+   * Sets the default value for the content property.
    *
    * @param value the default value
    * @return this builder
@@ -58,7 +58,7 @@ public GenericPojoBuilder<P> withContent(P value) {
   }
 
   /**
-   * Sets the default builder for the {@link GenericPojo#content} property.
+   * Sets the default builder for the content property.
    *
    * @param builder the default builder
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/builderinterface/Pojo2Builder.java

@@ -23,7 +23,7 @@ public Pojo2Builder() {
   }
 
   /**
-   * Sets the default value for the {@link Pojo2#file} property.
+   * Sets the default value for the file property.
    *
    * @param value the default value
    * @return this builder
@@ -47,7 +47,7 @@ public Pojo2Builder withName(String value) {
   }
 
   /**
-   * Sets the default value for the {@link Pojo2#age} property.
+   * Sets the default value for the age property.
    *
    * @param value the default value
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/builderinterface/Pojo3Builder.java

@@ -26,7 +26,7 @@ public Pojo3Builder() {
   }
 
   /**
-   * Sets the default value for the {@link Pojo3#file} property.
+   * Sets the default value for the file property.
    *
    * @param value the default value
    * @return this builder
@@ -38,7 +38,7 @@ public Pojo3Builder withFile(File value) {
   }
 
   /**
-   * Sets the default builder for the {@link Pojo3#file} property.
+   * Sets the default builder for the file property.
    *
    * @param builder the default builder
    * @return this builder
@@ -74,7 +74,7 @@ public Pojo3Builder withName(Supplier<? extends String> builder) {
   }
 
   /**
-   * Sets the default value for the {@link Pojo3#age} property.
+   * Sets the default value for the age property.
    *
    * @param value the default value
    * @return this builder
@@ -86,7 +86,7 @@ public Pojo3Builder withAge(int value) {
   }
 
   /**
-   * Sets the default builder for the {@link Pojo3#age} property.
+   * Sets the default builder for the age property.
    *
    * @param builder the default builder
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/builderinterface/PojoBuilder.java

@@ -26,7 +26,7 @@ public PojoBuilder() {
   }
 
   /**
-   * Sets the default value for the {@link Pojo#file} property.
+   * Sets the default value for the file property.
    *
    * @param value the default value
    * @return this builder
@@ -38,7 +38,7 @@ public PojoBuilder withFile(File value) {
   }
 
   /**
-   * Sets the default builder for the {@link Pojo#file} property.
+   * Sets the default builder for the file property.
    *
    * @param builder the default builder
    * @return this builder
@@ -74,7 +74,7 @@ public PojoBuilder withName(Builder<? extends String> builder) {
   }
 
   /**
-   * Sets the default value for the {@link Pojo#age} property.
+   * Sets the default value for the age property.
    *
    * @param value the default value
    * @return this builder
@@ -86,7 +86,7 @@ public PojoBuilder withAge(int value) {
   }
 
   /**
-   * Sets the default builder for the {@link Pojo#age} property.
+   * Sets the default builder for the age property.
    *
    * @param builder the default builder
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/classannotation/Pojo5Builder.java

@@ -18,7 +18,7 @@ public Pojo5Builder() {
   }
 
   /**
-   * Sets the default value for the {@link Pojo5#name} property.
+   * Sets the default value for the name property.
    *
    * @param value the default value
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/constructorannotation/Pojo2Builder.java

@@ -20,7 +20,7 @@ public Pojo2Builder() {
   }
 
   /**
-   * Sets the default value for the {@link Pojo2#firstname} property.
+   * Sets the default value for the firstname property.
    *
    * @param value the default value
    * @return this builder
@@ -32,7 +32,7 @@ public Pojo2Builder withFirstname(String value) {
   }
 
   /**
-   * Sets the default value for the {@link Pojo2#surname} property.
+   * Sets the default value for the surname property.
    *
    * @param value the default value
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/copymethod/AddressBuilder.java

@@ -22,7 +22,7 @@ public AddressBuilder() {
   }
 
   /**
-   * Sets the default value for the {@link Address#street} property.
+   * Sets the default value for the street property.
    *
    * @param value the default value
    * @return this builder
@@ -34,7 +34,7 @@ public AddressBuilder withStreet(String value) {
   }
 
   /**
-   * Sets the default value for the {@link Address#city} property.
+   * Sets the default value for the city property.
    *
    * @param value the default value
    * @return this builder
@@ -46,7 +46,7 @@ public AddressBuilder withCity(String value) {
   }
 
   /**
-   * Sets the default value for the {@link Address#postCode} property.
+   * Sets the default value for the postCode property.
    *
    * @param value the default value
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/copymethod/Pojo2Builder.java

@@ -20,7 +20,7 @@ public Pojo2Builder() {
   }
 
   /**
-   * Sets the default value for the {@link Pojo2#firstname} property.
+   * Sets the default value for the firstname property.
    *
    * @param value the default value
    * @return this builder
@@ -32,7 +32,7 @@ public Pojo2Builder withFirstname(String value) {
   }
 
   /**
-   * Sets the default value for the {@link Pojo2#surname} property.
+   * Sets the default value for the surname property.
    *
    * @param value the default value
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/copymethod/PojoBuilder.java

@@ -22,7 +22,7 @@ public PojoBuilder() {
   }
 
   /**
-   * Sets the default value for the {@link Pojo#firstname} property.
+   * Sets the default value for the firstname property.
    *
    * @param value the default value
    * @return this builder
@@ -34,7 +34,7 @@ public PojoBuilder withFirstname(String value) {
   }
 
   /**
-   * Sets the default value for the {@link Pojo#surname} property.
+   * Sets the default value for the surname property.
    *
    * @param value the default value
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/excludeproperties/Pojo1Builder.java

@@ -48,7 +48,7 @@ public Pojo1Builder withCity(String value) {
   }
 
   /**
-   * Sets the default value for the {@link Pojo1#postCode} property.
+   * Sets the default value for the postCode property.
    *
    * @param value the default value
    * @return this builder
@@ -60,7 +60,7 @@ public Pojo1Builder withPostCode(String value) {
   }
 
   /**
-   * Sets the default value for the {@link Pojo1#url} property.
+   * Sets the default value for the url property.
    *
    * @param value the default value
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/factorymethodannotation/ContainerBuilder.java

@@ -18,7 +18,7 @@ public ContainerBuilder() {
   }
 
   /**
-   * Sets the default value for the {@link Container#content} property.
+   * Sets the default value for the content property.
    *
    * @param value the default value
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/factorymethodannotation/FileContainerBuilder.java

@@ -19,7 +19,7 @@ public FileContainerBuilder() {
   }
 
   /**
-   * Sets the default value for the {@link Container#content} property.
+   * Sets the default value for the content property.
    *
    * @param value the default value
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/factorymethodannotation/GenericListContainerBuilder.java

@@ -19,7 +19,7 @@ public GenericListContainerBuilder() {
   }
 
   /**
-   * Sets the default value for the {@link Container#content} property.
+   * Sets the default value for the content property.
    *
    * @param value the default value
    * @return this builder

src/testdata/java/net/karneim/pojobuilder/processor/with/factorymethodannotation/PairBuilder.java

@@ -20,7 +20,7 @@ public PairBuilder() {
   }
 
   /**
-   * Sets the default value for the {@link Pair#left} property.
+   * Sets the default value for the left property.
    *
    * @param value the default value
    * @return this builder
@@ -32,7 +32,7 @@ public PairBuilder<L, R> withLeft(L value) {
   }
 
   /**
-   * Sets the default value for the {@link Pair#right} property.
+   * Sets the default value for the right property.
    *
    * @param value the default value
    * @return this builder