JAVA-542: Handle void return types in accessors.

Alexandre Dutra · Alexandre Dutra · commit 2d611618145f · 2015-06-15T09:47:14.000+02:00
diff --git a/changelog/README.md b/changelog/README.md
@@ -4,6 +4,7 @@
 
 - [improvement] Make NativeColumnType a top-level class (JAVA-715)
 - [improvement] Unify "Target" enum for schema elements (JAVA-782)
+- [bug] Handle void return types in accessors (JAVA-542)
 
 
 ### 2.1.6
diff --git a/driver-mapping/src/main/java/com/datastax/driver/mapping/MethodMapper.java b/driver-mapping/src/main/java/com/datastax/driver/mapping/MethodMapper.java
@@ -67,7 +67,7 @@ public void prepare(MappingManager manager, PreparedStatement ps) {
         // TODO: we should also validate the types of the parameters...
 
         Class<?> returnType = method.getReturnType();
-        if (Void.class.isAssignableFrom(returnType) || ResultSet.class.isAssignableFrom(returnType))
+        if (Void.TYPE.isAssignableFrom(returnType) || ResultSet.class.isAssignableFrom(returnType))
             return;
 
         if (Statement.class.isAssignableFrom(returnType)) {
diff --git a/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperAccessorTest.java b/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperAccessorTest.java
@@ -79,6 +79,15 @@ public void should_allow_null_argument_in_accessor_when_set_by_index() {
         assertThat(row.getString("v")).isNull();
     }
 
+    @Test(groups = "short")
+    public void should_allow_void_return_type_in_accessor() {
+        VoidAccessor accessor = new MappingManager(session).createAccessor(VoidAccessor.class);
+        accessor.insert(1, "bar");
+        Row row = session.execute("select * from foo where k = 1").one();
+        assertThat(row.getInt("k")).isEqualTo(1);
+        assertThat(row.getString("v")).isEqualTo("bar");
+    }
+
     @Accessor
     public interface SystemAccessor {
         @Query("select release_version from system.local")
@@ -96,4 +105,11 @@ public interface FooBindMarkerAccessor {
         @Query("insert into foo (k, v) values (?, ?)")
         ResultSet insert(int k, String v);
     }
+
+    @Accessor
+    public interface VoidAccessor {
+        @Query("insert into foo (k, v) values (:k, :v)")
+        void insert(@Param("k") int k, @Param("v") String v);
+    }
+
 }
