JAVA-2325: Allow "is" prefix for boolean getters in mapped entities

Alexandre Dutra · olim7t · commit 573fcb1cb480 · 2019-07-11T16:39:45.000-07:00
diff --git a/changelog/README.md b/changelog/README.md
@@ -4,6 +4,7 @@
 
 ### 4.2.0 (in progress)
 
+- [bug] JAVA-2325: Allow "is" prefix for boolean getters in mapped entities
 - [improvement] JAVA-2308: Add customWhereClause to `@Delete`
 - [improvement] JAVA-2247: PagingIterable implementations should implement spliterator()
 - [bug] JAVA-2312: Handle UDTs with names that clash with collection types
diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/DefaultEntityFactory.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/DefaultEntityFactory.java
@@ -102,21 +102,38 @@ public EntityDefinition getDefinition(TypeElement classElement) {
           continue;
         }
         ExecutableElement getMethod = (ExecutableElement) child;
-        String getMethodName = getMethod.getSimpleName().toString();
-        if (!getMethodName.startsWith("get") || !getMethod.getParameters().isEmpty()) {
+        if (!getMethod.getParameters().isEmpty()) {
           continue;
         }
         TypeMirror typeMirror = getMethod.getReturnType();
         if (typeMirror.getKind() == TypeKind.VOID) {
           continue;
         }
-        String propertyName = Introspector.decapitalize(getMethodName.substring(3));
+
+        String getMethodName = getMethod.getSimpleName().toString();
+        boolean regularGetterName = getMethodName.startsWith("get");
+        boolean booleanGetterName =
+            getMethodName.startsWith("is")
+                && (typeMirror.getKind() == TypeKind.BOOLEAN
+                    || context.getClassUtils().isSame(typeMirror, Boolean.class));
+        if (!regularGetterName && !booleanGetterName) {
+          continue;
+        }
+
+        String propertyName;
+        String setMethodName;
+        if (regularGetterName) {
+          propertyName = Introspector.decapitalize(getMethodName.substring(3));
+          setMethodName = getMethodName.replaceFirst("get", "set");
+        } else {
+          propertyName = Introspector.decapitalize(getMethodName.substring(2));
+          setMethodName = getMethodName.replaceFirst("is", "set");
+        }
         // skip properties we've already encountered.
         if (encounteredPropertyNames.contains(propertyName)) {
           continue;
         }
 
-        String setMethodName = getMethodName.replaceFirst("get", "set");
         ExecutableElement setMethod = findSetMethod(typeHierarchy, setMethodName, typeMirror);
         if (setMethod == null) {
           continue; // must have both
diff --git a/mapper-processor/src/test/java/com/datastax/oss/driver/internal/mapper/processor/entity/EntityAnnotationTest.java b/mapper-processor/src/test/java/com/datastax/oss/driver/internal/mapper/processor/entity/EntityAnnotationTest.java
@@ -19,6 +19,7 @@
 
 import com.datastax.oss.driver.api.mapper.annotations.Entity;
 import com.datastax.oss.driver.internal.mapper.processor.MapperProcessorTest;
+import com.google.common.truth.StringSubject;
 import com.google.testing.compile.Compilation;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.MethodSpec;
@@ -64,6 +65,41 @@ public void should_work_on_nested_class() {
         .contains("class Foo_BarHelper__MapperGenerated extends EntityHelperBase<Foo.Bar>");
   }
 
+  @Test
+  public void should_detect_boolean_getter() {
+    Compilation compilation =
+        compileWithMapperProcessor(
+            "test",
+            TypeSpec.classBuilder(ClassName.get("test", "Foo"))
+                .addModifiers(Modifier.PUBLIC)
+                .addType(
+                    TypeSpec.classBuilder("Bar")
+                        .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                        .addAnnotation(Entity.class)
+                        // Dummy getter and setter to have at least one mapped property
+                        .addMethod(
+                            MethodSpec.methodBuilder("setBool")
+                                .addParameter(TypeName.BOOLEAN, "bool")
+                                .addModifiers(Modifier.PUBLIC)
+                                .build())
+                        .addMethod(
+                            MethodSpec.methodBuilder("isBool")
+                                .returns(TypeName.BOOLEAN)
+                                .addModifiers(Modifier.PUBLIC)
+                                .addStatement("return true")
+                                .build())
+                        .build())
+                .build());
+    assertThat(compilation).succeededWithoutWarnings();
+    StringSubject contents =
+        assertThat(compilation)
+            .generatedFile(
+                StandardLocation.SOURCE_OUTPUT, "test", "Foo_BarHelper__MapperGenerated.java")
+            .contentsAsUtf8String();
+    contents.contains("target = target.setBoolean(\"bool\", entity.isBool())");
+    contents.contains("returnValue.setBool(source.getBoolean(\"bool\"))");
+  }
+
   @Test
   public void should_fail_on_interface() {
     should_fail_with_expected_error(
