Reject unreadable or unwritable properties.

Alexandre Dutra · olim7t · commit e9da1f1bd52a · 2016-07-22T09:47:08.000-07:00
diff --git a/driver-mapping/src/main/java/com/datastax/driver/mapping/PropertyMapper.java b/driver-mapping/src/main/java/com/datastax/driver/mapping/PropertyMapper.java
@@ -28,6 +28,8 @@
 import java.util.Collection;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkState;
+
 /**
  * Maps a Java bean property to a table column or a UDT field.
  * <p>
@@ -56,9 +58,13 @@ class PropertyMapper {
         getter = ReflectionUtils.findGetter(property);
         setter = ReflectionUtils.findSetter(property);
         annotations = ReflectionUtils.scanPropertyAnnotations(field, property);
+        if (!isTransient()) {
+            checkState(field != null || getter != null, "Property '%s' is not readable", propertyName);
+            checkState(field != null || setter != null, "Property '%s' is not writable", propertyName);
+        }
         columnName = inferColumnName();
         position = inferPosition();
-        javaType = inferJavaType(property);
+        javaType = inferJavaType();
         customCodec = createCustomCodec();
     }
 
@@ -135,15 +141,12 @@ private String inferColumnName() {
     }
 
     @SuppressWarnings("unchecked")
-    private TypeToken<Object> inferJavaType(PropertyDescriptor property) {
+    private TypeToken<Object> inferJavaType() {
         Type type;
         if (getter != null)
             type = getter.getGenericReturnType();
-        else if (field != null)
-            type = field.getGenericType();
         else
-            // this will not work for generic types
-            type = property.getPropertyType();
+            type = field.getGenericType();
         return (TypeToken<Object>) TypeToken.of(type);
     }
 
diff --git a/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperInvalidAnnotationsTest.java b/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperInvalidAnnotationsTest.java
@@ -253,4 +253,36 @@ public void should_not_allow_PartitionKey_with_wrong_order() throws Exception {
         AnnotationParser.parseEntity(Invalid13.class, mappingManager);
     }
 
+    @Table(name = "foo", keyspace = "ks")
+    static class Invalid14 {
+
+        public void setNotReadable(int i) {
+        }
+
+    }
+
+    @Test(groups = "unit", expectedExceptions = IllegalStateException.class,
+            expectedExceptionsMessageRegExp =
+                    "Property 'notReadable' is not readable")
+    public void should_not_allow_unreadable_property() throws Exception {
+        AnnotationParser.parseEntity(Invalid14.class, mappingManager);
+    }
+
+    @Table(name = "foo", keyspace = "ks")
+    static class Invalid15 {
+
+        public int getNotWritable() {
+            return 0;
+        }
+
+    }
+
+    @Test(groups = "unit", expectedExceptions = IllegalStateException.class,
+            expectedExceptionsMessageRegExp =
+                    "Property 'notWritable' is not writable")
+    public void should_not_allow_unwritable_property() throws Exception {
+        AnnotationParser.parseEntity(Invalid15.class, mappingManager);
+    }
+
+
 }
