Merge pull request apache#637 from datastax/java1095

olim7t · olim7t · commit c19f7a98cdd5 · 2016-04-26T15:26:03.000+02:00
JAVA-1095: Check protocol version for custom payload before sending the query.
diff --git a/changelog/README.md b/changelog/README.md
@@ -14,6 +14,7 @@
 - [bug] JAVA-1140: Use same connection to check for schema agreement after a DDL query.
 - [improvement] JAVA-1113: Support Cassandra 3.4 LIKE operator in QueryBuilder.
 - [improvement] JAVA-1086: Support Cassandra 3.2 CAST function in QueryBuilder.
+- [bug] JAVA-1095: Check protocol version for custom payload before sending the query.
 
 Merged from 2.1 branch:
 
diff --git a/driver-core/src/main/java/com/datastax/driver/core/SessionManager.java b/driver-core/src/main/java/com/datastax/driver/core/SessionManager.java
@@ -502,6 +502,9 @@ Message.Request makeRequestMessage(Statement statement, ByteBuffer pagingState)
         } else if (serialConsistency == null)
             serialConsistency = configuration().getQueryOptions().getSerialConsistencyLevel();
 
+        if (statement.getOutgoingPayload() != null && protocolVersion.compareTo(ProtocolVersion.V4) < 0)
+            throw new UnsupportedFeatureException(protocolVersion, "Custom payloads are only supported since native protocol V4");
+
         long defaultTimestamp = Long.MIN_VALUE;
         if (protocolVersion.compareTo(ProtocolVersion.V3) >= 0) {
             defaultTimestamp = statement.getDefaultTimestamp();
diff --git a/driver-core/src/test/java/com/datastax/driver/core/CustomPayloadTest.java b/driver-core/src/test/java/com/datastax/driver/core/CustomPayloadTest.java
@@ -15,13 +15,10 @@
  */
 package com.datastax.driver.core;
 
-import com.datastax.driver.core.exceptions.NoHostAvailableException;
 import com.datastax.driver.core.exceptions.UnsupportedFeatureException;
 import com.datastax.driver.core.utils.CassandraVersion;
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import org.apache.log4j.Logger;
-import org.assertj.core.api.iterable.Extractor;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -246,17 +243,9 @@ public void should_throw_ufe_when_protocol_version_lesser_than_4() throws Except
             statement.setOutgoingPayload(payload1);
             v3session.execute(statement);
             fail("Should not send custom payloads with protocol V3");
-        } catch (NoHostAvailableException nhae) {
-            assertThat(nhae.getErrors().values())
-                    .extracting(new Extractor<Throwable, Throwable>() {
-                        @Override
-                        public Throwable extract(Throwable input) {
-                            return Throwables.getRootCause(input);
-                        }
-                    })
-                    .hasOnlyElementsOfType(UnsupportedFeatureException.class)
-                    .extracting("message")
-                    .containsOnly("Unsupported feature with the native protocol V3 (which is currently in use): Custom payloads are only supported since native protocol V4");
+        } catch (UnsupportedFeatureException e) {
+            assertThat(e.getMessage()).isEqualTo(
+                    "Unsupported feature with the native protocol V3 (which is currently in use): Custom payloads are only supported since native protocol V4");
         }
     }
 
