feat: handle booleans more gracefully

.github/workflows/maven.yml

@@ -29,6 +29,10 @@ jobs:
           java-version:  ${{ matrix.java }}
           distribution: 'temurin'
           cache: maven
-      - name: Build with Maven
-        if: ${{ matrix.java }} == 11
-        run: mvn -B -ntp verify -Dtest=\!RecordsTest.java --file pom.xml
+      - name: Build with Java 11
+        if: ${{ matrix.java == 11 }}
+        run: mvn -B -ntp verify -Dtest=\!RecordsTest.java --file pom.xml
+
+      - name: Build with Java higher than 11
+        if: ${{ matrix.java > 11 }}
+        run: mvn -B -ntp verify --file pom.xml

annotations/pom.xml

@@ -32,4 +32,4 @@
 		</dependency>
 	</dependencies>
 
-</project>
+</project>

pom.xml

@@ -18,6 +18,10 @@
 			<name>Jonas Geiregat</name>
 			<email>[email protected]</email>
 		</developer>
+		<developer>
+			<name>Joran Van Belle</name>
+			<email>[email protected]</email>
+		</developer>
 	</developers>
 
 	<licenses>
@@ -293,4 +297,4 @@
 		</repository>
 	</distributionManagement>
 
-</project>
+</project>

processor/src/main/java/io/jonasg/bob/definitions/TypeDefinition.java

@@ -1,5 +1,6 @@
 package io.jonasg.bob.definitions;
 
+import javax.lang.model.type.TypeKind;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -58,19 +59,28 @@ public List<SetterMethodDefinition> getSetterMethods() {
 		for (FieldDefinition field : fields) {
 			String name = field.name().substring(0, 1).toUpperCase() + field.name().substring(1);
 			methodsWithOneParam.stream()
-					.filter(m -> m.name().equals(field.name()))
+					.filter(m -> m.name().equals(field.name()) ||
+							isABooleanField(field, m))
 					.findFirst()
 					.map(m -> new SetterMethodDefinition(m.name(), field, m.parameters().get(0)))
 					.ifPresent(setters::add);
 			methodsWithOneParam.stream()
-					.filter(m -> m.name().equals(String.format("set%s", name)))
+					.filter(m -> m.name().equals(String.format("set%s", name))
+							|| (m.name().equals(String.format("set%s", name.substring(2)))
+									&& field.type().getKind().equals(TypeKind.BOOLEAN)))
 					.findFirst()
 					.map(m -> new SetterMethodDefinition(m.name(), field, m.parameters().get(0)))
 					.ifPresent(setters::add);
 		}
 		return setters;
 	}
 
+	private boolean isABooleanField(FieldDefinition field, MethodDefinition m) {
+		return field.name().startsWith("is")
+				&& m.name().equalsIgnoreCase(field.name().substring(2))
+				&& field.type().getKind().equals(TypeKind.BOOLEAN);
+	}
+
 	public boolean containsSetterMethods() {
 		return !getSetterMethods().isEmpty();
 	}

processor/src/test/java/io/jonasg/bob/BobTests.java

@@ -67,6 +67,26 @@ void allConstructorParamsAreBuildableIfHavingMatchingField() {
 				.executeTest();
 	}
 
+	@Test
+	void booleanFieldHasOherNameThanSetter() {
+		Cute.blackBoxTest()
+				.given()
+				.processors(List.of(BuildableProcessor.class))
+				.andSourceFiles(
+						"/tests/BooleanFieldHasOtherNameThanSetter/BooleanFieldHasOtherNameThanSetter.java")
+				.whenCompiled()
+				.thenExpectThat()
+				.compilationSucceeds()
+				.andThat()
+				.generatedSourceFile(
+						"io.jonasg.bob.test.BooleanFieldHasOtherNameThanSetterBuilder")
+				.matches(
+						CuteApi.ExpectedFileObjectMatcherKind.BINARY,
+						JavaFileObjectUtils.readFromResource(
+								"/tests/BooleanFieldHasOtherNameThanSetter/Expected_BooleanFieldHasOtherNameThanSetter.java"))
+				.executeTest();
+	}
+
 	@Test
 	void defaultValuesForParamsWithNoneMatchingField() {
 		Cute.blackBoxTest()

processor/src/test/resources/tests/BooleanFieldHasOtherNameThanSetter/BooleanFieldHasOtherNameThanSetter.java

@@ -0,0 +1,21 @@
+package io.jonasg.bob.test;
+
+import io.jonasg.bob.Buildable;
+
+@Buildable
+public class BooleanFieldHasOtherNameThanSetter {
+    private String firstName;
+
+    private String lastName;
+
+    private boolean isHappy;
+
+    public BooleanFieldHasOtherNameThanSetter(String firstName, String lastName) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    public void setHappy(boolean ishappy) {
+        this.isHappy = ishappy;
+    }
+}

processor/src/test/resources/tests/BooleanFieldHasOtherNameThanSetter/Expected_BooleanFieldHasOtherNameThanSetter.java

@@ -0,0 +1,35 @@
+package io.jonasg.bob.test;
+
+import java.lang.String;
+
+public final class BooleanFieldHasOtherNameThanSetterBuilder {
+  private String firstName;
+
+  private String lastName;
+
+  private boolean isHappy;
+
+  public BooleanFieldHasOtherNameThanSetterBuilder() {
+  }
+
+  public BooleanFieldHasOtherNameThanSetterBuilder firstName(String firstName) {
+    this.firstName = firstName;
+    return this;
+  }
+
+  public BooleanFieldHasOtherNameThanSetterBuilder lastName(String lastName) {
+    this.lastName = lastName;
+    return this;
+  }
+
+  public BooleanFieldHasOtherNameThanSetterBuilder isHappy(boolean isHappy) {
+    this.isHappy = isHappy;
+    return this;
+  }
+
+  public BooleanFieldHasOtherNameThanSetter build() {
+    var instance = new BooleanFieldHasOtherNameThanSetter(firstName, lastName);
+    instance.setHappy(this.isHappy);
+    return instance;
+  }
+}