Merge pull request apache#555 from datastax/java833

olim7t · olim7t · commit ce32b1175bbd · 2016-02-23T17:42:21.000+01:00
JAVA-833: Improve message when a nested type can't be serialized.
diff --git a/changelog/README.md b/changelog/README.md
@@ -11,6 +11,7 @@
 - [improvement] JAVA-1030: Log token to replica map computation times.
 - [bug] JAVA-1039: Minor bugs in Event Debouncer.
 - [improvement] JAVA-843: Disable frozen checks in mapper.
+- [improvement] JAVA-833: Improve message when a nested type can't be serialized.
 
 Merged from 2.0 branch:
 
diff --git a/driver-core/src/main/java/com/datastax/driver/core/DataType.java b/driver-core/src/main/java/com/datastax/driver/core/DataType.java
@@ -713,12 +713,11 @@ public static ByteBuffer serializeValue(Object value, ProtocolVersion protocolVe
         if (value == null)
             return null;
 
-        DataType dt = TypeCodec.getDataTypeFor(value);
-        if (dt == null)
-            throw new IllegalArgumentException(String.format("Value of type %s does not correspond to any CQL3 type", value.getClass()));
-
         try {
+            DataType dt = TypeCodec.getDataTypeFor(value);
             return dt.serialize(value, protocolVersion);
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException(String.format("Could not serialize value of type %s", value.getClass()), e);
         } catch (InvalidTypeException e) {
             // In theory we couldn't get that if getDataTypeFor does his job correctly,
             // but there is no point in sending an exception that the user won't expect if we're
diff --git a/driver-core/src/main/java/com/datastax/driver/core/SimpleStatement.java b/driver-core/src/main/java/com/datastax/driver/core/SimpleStatement.java
@@ -96,7 +96,7 @@ private static ByteBuffer[] convert(Object[] values, ProtocolVersion protocolVer
                 serializedValues[i] = DataType.serializeValue(value, protocolVersion);
             } catch (IllegalArgumentException e) {
                 // Catch and rethrow to provide a more helpful error message (one that include which value is bad)
-                throw new IllegalArgumentException(String.format("Value %d of type %s does not correspond to any CQL3 type", i, value.getClass()));
+                throw new IllegalArgumentException(String.format("Could not serialize value %d of type %s", i, value.getClass()), e.getCause());
             }
         }
         return serializedValues;
diff --git a/driver-core/src/main/java/com/datastax/driver/core/TypeCodec.java b/driver-core/src/main/java/com/datastax/driver/core/TypeCodec.java
@@ -159,7 +159,7 @@ static TupleCodec tupleOf(TupleType type) {
     }
 
     /* This is ugly, but not sure how we can do much better/faster
-     * Returns null if it's doesn't correspond to a known type.
+     * Throws IllegalArgumentException if it's doesn't correspond to a known type.
      *
      * Also, note that this only a dataType that is fit for the value,
      * but for instance, for a UUID, this will return DataType.uuid() but
@@ -187,7 +187,7 @@ static DataType getDataTypeFor(Object value) {
                 return DataType.decimal();
             if (value instanceof BigInteger)
                 return DataType.varint();
-            return null;
+            throw new IllegalArgumentException("Type " + value.getClass().getName() + " does not correspond to any CQL type");
         }
 
         if (value instanceof String)
@@ -210,27 +210,25 @@ static DataType getDataTypeFor(Object value) {
             if (l.isEmpty())
                 return DataType.list(DataType.blob());
             DataType eltType = getDataTypeFor(l.get(0));
-            return eltType == null ? null : DataType.list(eltType);
+            return DataType.list(eltType);
         }
 
         if (value instanceof Set) {
             Set<?> s = (Set<?>) value;
             if (s.isEmpty())
                 return DataType.set(DataType.blob());
             DataType eltType = getDataTypeFor(s.iterator().next());
-            return eltType == null ? null : DataType.set(eltType);
+            return DataType.set(eltType);
         }
 
         if (value instanceof Map) {
             Map<?, ?> m = (Map<?, ?>) value;
             if (m.isEmpty())
                 return DataType.map(DataType.blob(), DataType.blob());
             Map.Entry<?, ?> e = m.entrySet().iterator().next();
-            DataType keyType = getDataTypeFor(e.getKey());
-            DataType valueType = getDataTypeFor(e.getValue());
-            return keyType == null || valueType == null
-                    ? null
-                    : DataType.map(keyType, valueType);
+            return DataType.map(
+                    getDataTypeFor(e.getKey()),
+                    getDataTypeFor(e.getValue()));
         }
 
         if (value instanceof UDTValue) {
@@ -241,7 +239,7 @@ static DataType getDataTypeFor(Object value) {
             return ((TupleValue) value).getType();
         }
 
-        return null;
+        throw new IllegalArgumentException("Type " + value.getClass().getName() + " does not correspond to any CQL type");
     }
 
     private static ByteBuffer pack(List<ByteBuffer> buffers, int elements, ProtocolVersion version) {

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ private static ByteBuffer[] convert(Object[] values, ProtocolVersion protocolVer`
`96`	`96`	`serializedValues[i] = DataType.serializeValue(value, protocolVersion);`
`97`	`97`	`} catch (IllegalArgumentException e) {`
`98`	`98`	`// Catch and rethrow to provide a more helpful error message (one that include which value is bad)`
`99`		`- throw new IllegalArgumentException(String.format("Value %d of type %s does not correspond to any CQL3 type", i, value.getClass()));`
	`99`	`+ throw new IllegalArgumentException(String.format("Could not serialize value %d of type %s", i, value.getClass()), e.getCause());`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`return serializedValues;`