Make collections returned by Row immutable.

Sylvain Lebresne · Sylvain Lebresne · commit cf08c31efe84 · 2013-11-05T11:25:36.000+01:00
JAVA-205 #fixes
diff --git a/driver-core/CHANGELOG.rst b/driver-core/CHANGELOG.rst
@@ -5,6 +5,7 @@ CHANGELOG
 ------
 
 - [new] OSGi bundle (JAVA-142)
+- [improvement] Make collections returned by Row immutable (JAVA-205)
 - [bug] Don't retain unused PreparedStatement in memory (JAVA-201)
 - [bug] Add missing clustering order info in TableMetadata
 
diff --git a/driver-core/src/main/java/com/datastax/driver/core/Row.java b/driver-core/src/main/java/com/datastax/driver/core/Row.java
@@ -567,7 +567,7 @@ public InetAddress getInet(String name) {
      * @return the value of the {@code i}th column in this row as a list of
      * {@code elementsClass} objects. If the value is NULL, an empty list is
      * returned (note that Cassandra makes no difference between an empty list
-     * and column of type list that is not set).
+     * and column of type list that is not set). The returned list is immutable.
      *
      * @throws IndexOutOfBoundsException if {@code i < 0 || i >= this.columns().size()}.
      * @throws InvalidTypeException if column {@code i} is not a list or if its
@@ -588,7 +588,7 @@ public <T> List<T> getList(int i, Class<T> elementsClass) {
             return Collections.<T>emptyList();
 
         // TODO: we could avoid the getCodec call if we kept a reference to the original message.
-        return Codec.<List<T>>getCodec(type).compose(value);
+        return Collections.unmodifiableList(Codec.<List<T>>getCodec(type).compose(value));
     }
 
     /**
@@ -599,7 +599,7 @@ public <T> List<T> getList(int i, Class<T> elementsClass) {
      * @return the value of the {@code i}th column in this row as a list of
      * {@code elementsClass} objects. If the value is NULL, an empty list is
      * returned (note that Cassandra makes no difference between an empty list
-     * and column of type list that is not set).
+     * and column of type list that is not set). The returned list is immutable.
      *
      * @throws IllegalArgumentException if {@code name} is not part of the
      * ResultSet this row is part of, i.e. if {@code !this.columns().names().contains(name)}.
@@ -618,7 +618,7 @@ public <T> List<T> getList(String name, Class<T> elementsClass) {
      * @return the value of the {@code i}th column in this row as a set of
      * {@code elementsClass} objects. If the value is NULL, an empty set is
      * returned (note that Cassandra makes no difference between an empty set
-     * and column of type set that is not set).
+     * and column of type set that is not set). The returned set is immutable.
      *
      * @throws IndexOutOfBoundsException if {@code i < 0 || i >= this.columns().size()}.
      * @throws InvalidTypeException if column {@code i} is not a set or if its
@@ -638,7 +638,7 @@ public <T> Set<T> getSet(int i, Class<T> elementsClass) {
         if (value == null)
             return Collections.<T>emptySet();
 
-        return Codec.<Set<T>>getCodec(type).compose(value);
+        return Collections.unmodifiableSet(Codec.<Set<T>>getCodec(type).compose(value));
     }
 
     /**
@@ -649,7 +649,7 @@ public <T> Set<T> getSet(int i, Class<T> elementsClass) {
      * @return the value of the {@code i}th column in this row as a set of
      * {@code elementsClass} objects. If the value is NULL, an empty set is
      * returned (note that Cassandra makes no difference between an empty set
-     * and column of type set that is not set).
+     * and column of type set that is not set). The returned set is immutable.
      *
      * @throws IllegalArgumentException if {@code name} is not part of the
      * ResultSet this row is part of, i.e. if {@code !this.columns().names().contains(name)}.
@@ -669,7 +669,8 @@ public <T> Set<T> getSet(String name, Class<T> elementsClass) {
      * @return the value of the {@code i}th column in this row as a map of
      * {@code keysClass} to {@code valuesClass} objects. If the value is NULL,
      * an empty map is returned (note that Cassandra makes no difference
-     * between an empty map and column of type map that is not set).
+     * between an empty map and column of type map that is not set). The
+     * returned map is immutable.
      *
      * @throws IndexOutOfBoundsException if {@code i < 0 || i >= this.columns().size()}.
      * @throws InvalidTypeException if column {@code i} is not a map, if its
@@ -691,7 +692,7 @@ public <K, V> Map<K, V> getMap(int i, Class<K> keysClass, Class<V> valuesClass)
         if (value == null)
             return Collections.<K, V>emptyMap();
 
-        return Codec.<Map<K, V>>getCodec(type).compose(value);
+        return Collections.unmodifiableMap(Codec.<Map<K, V>>getCodec(type).compose(value));
     }
 
     /**
@@ -703,7 +704,8 @@ public <K, V> Map<K, V> getMap(int i, Class<K> keysClass, Class<V> valuesClass)
      * @return the value of the {@code i}th column in this row as a map of
      * {@code keysClass} to {@code valuesClass} objects. If the value is NULL,
      * an empty map is returned (note that Cassandra makes no difference
-     * between an empty map and column of type map that is not set).
+     * between an empty map and column of type map that is not set). The
+     * returned map is immutable.
      *
      * @throws IllegalArgumentException if {@code name} is not part of the
      * ResultSet this row is part of, i.e. if {@code !this.columns().names().contains(name)}.
