3.x: Fix code and docs regarding driver name

docs/Makefile

@@ -23,7 +23,7 @@ setupenv:
 
 .PHONY: setup
 setup:
-	$(POETRY) install
+	$(POETRY) install --no-root
 	$(POETRY) update
 	@if [ ! -d "$(SOURCEDIR)" ]; then mkdir -p "$(SOURCEDIR)"; fi
 	cp -RL source/* $(SOURCEDIR)

driver-core/src/main/java/com/datastax/driver/core/Cluster.java

@@ -275,8 +275,8 @@ public static String getDriverVersion() {
    * {@code INFO}.
    */
   public static void logDriverVersion() {
-    Logger core = LoggerFactory.getLogger("com.datastax.driver.core");
-    core.info("DataStax Java driver {} for Apache Cassandra", getDriverVersion());
+    LoggerFactory.getLogger("com.datastax.driver.core")
+        .info("ScyllaDB Java Driver {}", getDriverVersion());
   }
 
   /**

driver-core/src/main/java/com/datastax/driver/core/exceptions/package-info.java

@@ -13,5 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/** Exceptions thrown by the DataStax Java driver for Cassandra. */
+/** Exceptions thrown by the ScyllaDB Java driver. */
 package com.datastax.driver.core.exceptions;

driver-core/src/main/java/com/datastax/driver/core/policies/package-info.java

@@ -13,7 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/**
- * Policies that allow to control some of the behavior of the DataStax Java driver for Cassandra.
- */
+/** Policies that allow to control some of the behavior of the ScyllaDB Java driver. */
 package com.datastax.driver.core.policies;

driver-core/src/test/java/com/datastax/driver/core/StartupOptionTest.java

@@ -18,16 +18,17 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.datastax.driver.core.utils.CassandraVersion;
+import com.datastax.driver.core.utils.ScyllaVersion;
 import org.testng.annotations.Test;
 
-@CassandraVersion("4.0.0")
 public class StartupOptionTest extends CCMTestsSupport {
 
   /**
    * Ensures that when connecting, the driver STARTUP message contains DRIVER_NAME and
    * DRIVER_VERSION configuration in its option map. This should be reflected in the
    * system_views.clients table.
    */
+  @CassandraVersion("4.0.0")
   @Test(groups = "short")
   public void should_send_driver_name_and_version() {
     ResultSet result =
@@ -38,7 +39,21 @@ public void should_send_driver_name_and_version() {
 
     for (Row row : result) {
       assertThat(row.getString("driver_version")).isEqualTo(Cluster.getDriverVersion());
-      assertThat(row.getString("driver_name")).isEqualTo("DataStax Java Driver");
+      assertThat(row.getString("driver_name")).isEqualTo("ScyllaDB Java Driver");
+    }
+  }
+
+  @ScyllaVersion(minOSS = "5.2.0", minEnterprise = "2019.1")
+  @Test(groups = "short")
+  public void should_send_driver_name_and_version_scylla() {
+    ResultSet result = session().execute("select driver_name, driver_version from system.clients");
+
+    // Should be at least 2 connections (1 control connection, 1 pooled connection)
+    assertThat(result.getAvailableWithoutFetching()).isGreaterThanOrEqualTo(2);
+
+    for (Row row : result) {
+      assertThat(row.getString("driver_version")).isEqualTo(Cluster.getDriverVersion());
+      assertThat(row.getString("driver_name")).isEqualTo("ScyllaDB Java Driver");
     }
   }
 }

driver-examples/README.md

@@ -1,10 +1,9 @@
-# DataStax Java Driver for Apache Cassandra - Examples
+# ScyllaDB Java Driver - Examples
 
-This module contains examples of how to use the DataStax Java driver for
-Apache Cassandra.
+This module contains examples of how to use the ScyllaDB Java driver.
 
 ## Usage
 
-Unless otherwise stated, all examples assume that you have a single-node Cassandra 3.0 cluster 
+Unless otherwise stated, all examples assume that you have a single-node ScyllaDB 6.2 cluster 
 listening on localhost:9042.
 

manual/logging/README.md

@@ -2,7 +2,7 @@
 
 ### Setup
 
-DataStax Java driver uses the popular [SLF4J](http://www.slf4j.org) library to emit log messages; 
+The driver uses the popular [SLF4J](http://www.slf4j.org) library to emit log messages; 
 SLF4J has the advantage of providing a logging API that is entirely decoupled from concrete
 implementations, letting client applications free to seamlessly connect SLF4J to their preferred logging backend.
 

manual/tuples/README.md

@@ -14,7 +14,7 @@ CREATE TABLE ks.collect_things (
 
 ### Fetching Tuples from Rows results
 
-The DataStax Java driver exposes a special [`TupleValue`][TupleValue] class to handle such columns. 
+The driver exposes a special [`TupleValue`][TupleValue] class to handle such columns. 
 [`TupleValue`][TupleValue] exposes getters allowing to extract from the tuple all the data types 
 supported by Cassandra:
 

pom.xml

@@ -50,6 +50,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <cassandra.version>3.11.2</cassandra.version>
+        <scylla.version/>
         <java.version>1.8</java.version>
         <log4j.version>1.2.17</log4j.version>
         <slf4j.version>1.7.25</slf4j.version>

upgrade_guide/migrating_from_astyanax/README.md

@@ -1,12 +1,12 @@
 # Migrating from Astyanax
 
 This section is a guide for users previously using *Astyanax* and looking for
-migrating to the *DataStax Java driver*.
+migrating to the *ScyllaDB Java driver*.
 
 See the child pages for more information:
 
 * [Changes at the language level](language_level_changes/)
-* [Migrating Astyanax configurations to DataStax Java driver configurations](configuration/)
+* [Migrating Astyanax configurations to ScyllaDB Java driver configurations](configuration/)
 * [Querying and retrieving results comparisons.](queries_and_results/)
 
 ```{eval-rst}

upgrade_guide/migrating_from_astyanax/configuration/README.md

@@ -15,7 +15,7 @@ Configuring a `Cluster` works with the *Builder* pattern. The `Builder` takes al
 the configurations into account before building the `Cluster`.
 
 Following are some examples of the most important configurations that were 
-possible with *Astyanax* and how to translate them into *DataStax Java driver*
+possible with *Astyanax* and how to translate them into *ScyllaDB Java driver*
 configurations. Please note that the Java driver has been optimized to handle most use
 cases at best and even though the following sections show how to tune some various 
 options, the driver should provide the best performances with the default configurations