JAVA-2942: GraphStatement.setConsistencyLevel() is not effective

Author: adutra

changelog/README.md

@@ -4,6 +4,7 @@
 
 ### 4.11.2 (in progress)
 
+- [bug] JAVA-2942: GraphStatement.setConsistencyLevel() is not effective
 - [bug] JAVA-2941: Cannot add a single static column with the alter table API
 - [bug] JAVA-2943: Prevent session leak with wrong keyspace name
 - [bug] JAVA-2938: OverloadedException message is misleading

core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphConversions.java

@@ -179,9 +179,13 @@ static Message createMessageFromGraphStatement(
       }
     }
 
+    ConsistencyLevel consistency = statement.getConsistencyLevel();
     int consistencyLevel =
-        DefaultConsistencyLevel.valueOf(config.getString(DefaultDriverOption.REQUEST_CONSISTENCY))
-            .getProtocolCode();
+        (consistency == null)
+            ? context
+                .getConsistencyLevelRegistry()
+                .nameToCode(config.getString(DefaultDriverOption.REQUEST_CONSISTENCY))
+            : consistency.getProtocolCode();
 
     long timestamp = statement.getTimestamp();
     if (timestamp == Statement.NO_DEFAULT_TIMESTAMP) {

core/src/test/java/com/datastax/dse/driver/internal/core/graph/GraphRequestHandlerTest.java

@@ -137,7 +137,7 @@ public void should_create_query_message_from_fluent_statement(GraphProtocol grap
       throws IOException {
     // initialization
     GraphRequestHandlerTestHarness harness = GraphRequestHandlerTestHarness.builder().build();
-    GraphTraversal traversalTest =
+    GraphTraversal<?, ?> traversalTest =
         DseGraph.g.V().has("person", "name", "marko").has("p1", 1L).has("p2", Uuids.random());
     GraphStatement<?> graphStatement = FluentGraphStatement.newInstance(traversalTest);
 
@@ -171,6 +171,7 @@ public void should_create_query_message_from_batch_statement(GraphProtocol graph
       throws IOException {
     // initialization
     GraphRequestHandlerTestHarness harness = GraphRequestHandlerTestHarness.builder().build();
+    @SuppressWarnings("rawtypes")
     List<GraphTraversal> traversalsTest =
         ImmutableList.of(
             // randomly testing some complex data types. Complete suite of data types test is in
@@ -424,7 +425,7 @@ public void should_return_results_for_statements(GraphProtocol graphProtocol, Ve
         Mockito.spy(new GraphRequestAsyncProcessor(harness.getContext(), graphSupportChecker));
     when(p.getGraphBinaryModule()).thenReturn(module);
 
-    GraphStatement graphStatement =
+    GraphStatement<?> graphStatement =
         ScriptGraphStatement.newInstance("mockQuery").setExecutionProfileName("test-graph");
     GraphResultSet grs =
         new GraphRequestSyncProcessor(p)
@@ -487,7 +488,7 @@ public void should_invoke_request_tracker_and_update_metrics(
     RequestTracker requestTracker = mock(RequestTracker.class);
     when(harness.getContext().getRequestTracker()).thenReturn(requestTracker);
 
-    GraphStatement graphStatement = ScriptGraphStatement.newInstance("mockQuery");
+    GraphStatement<?> graphStatement = ScriptGraphStatement.newInstance("mockQuery");
 
     node1Behavior.setResponseSuccess(defaultDseFrameOf(singleGraphRow(graphProtocol, module)));
 
@@ -549,6 +550,31 @@ public void should_invoke_request_tracker_and_update_metrics(
     verifyNoMoreInteractions(harness.getSession().getMetricUpdater());
   }
 
+  @Test
+  public void should_honor_statement_consistency_level() {
+    // initialization
+    GraphRequestHandlerTestHarness harness = GraphRequestHandlerTestHarness.builder().build();
+    ScriptGraphStatement graphStatement =
+        ScriptGraphStatement.builder("mockScript")
+            .setConsistencyLevel(DefaultConsistencyLevel.THREE)
+            .build();
+
+    GraphBinaryModule module = createGraphBinaryModule(harness.getContext());
+
+    // when
+    DriverExecutionProfile executionProfile =
+        Conversions.resolveExecutionProfile(graphStatement, harness.getContext());
+
+    Message m =
+        GraphConversions.createMessageFromGraphStatement(
+            graphStatement, GRAPH_BINARY_1_0, executionProfile, harness.getContext(), module);
+
+    // checks
+    assertThat(m).isInstanceOf(Query.class);
+    Query q = ((Query) m);
+    assertThat(q.options.consistency).isEqualTo(DefaultConsistencyLevel.THREE.getProtocolCode());
+  }
+
   @DataProvider
   public static Object[][] dseVersionsWithDefaultGraphProtocol() {
     // Default GraphSON sub protocol version differs based on DSE version, so test with a version