Skip to content

Commit e5ae4d2

Browse files
msmygitmsmygit
authored
Rebrand Apollo to Astra (apache#1455)
Co-authored-by: Madhavan Sridharan <madhavan.sridharan@datastax.com>
1 parent e68bd4f commit e5ae4d2

5 files changed

Lines changed: 38 additions & 33 deletions

File tree

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ documentation for latest version through [DataStax Docs] or via the release tags
88
[4.7.0](https://github.com/datastax/java-driver/tree/4.7.0).*
99

1010
A modern, feature-rich and highly tunable Java client library for [Apache Cassandra®] \(2.1+) and
11-
[DataStax Enterprise] \(4.7+), and [DataStax Apollo], using exclusively Cassandra's binary protocol
11+
[DataStax Enterprise] \(4.7+), and [DataStax Astra], using exclusively Cassandra's binary protocol
1212
and Cassandra Query Language (CQL) v3.
1313

1414
[DataStax Docs]: http://docs.datastax.com/en/developer/java-driver/
1515
[Apache Cassandra®]: http://cassandra.apache.org/
1616
[DataStax Enterprise]: https://www.datastax.com/products/datastax-enterprise
17-
[DataStax Apollo]: https://www.datastax.com/constellation/datastax-apollo
17+
[DataStax Astra]: https://www.datastax.com/products/datastax-astra
1818

1919
## Getting the driver
2020

@@ -52,7 +52,7 @@ builder](manual/query_builder/), [mapper](manual/mapper)).
5252
## Compatibility
5353

5454
The driver is compatible with Apache Cassandra® 2.1 and higher, DataStax Enterprise 4.7 and
55-
higher, and DataStax Apollo.
55+
higher, and DataStax Astra.
5656

5757
It requires Java 8 or higher.
5858

‎core/src/main/java/com/datastax/oss/driver/internal/core/channel/ChannelFactory.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ public class ChannelFactory {
6060

6161
private static final Logger LOG = LoggerFactory.getLogger(ChannelFactory.class);
6262

63-
/** A value for {@link #productType} that indicates that we are connected to Datastax Cloud. */
63+
/**
64+
* A value for {@link #productType} that indicates that we are connected to DataStax Cloud. This
65+
* value matches the one defined at DSE DB server side at {@code ProductType.java}.
66+
*/
6467
private static final String DATASTAX_CLOUD_PRODUCT_TYPE = "DATASTAX_APOLLO";
6568

6669
private static final AtomicBoolean LOGGED_ORPHAN_WARNING = new AtomicBoolean();

examples/src/main/java/com/datastax/oss/driver/examples/apollo/ApolloReadCassandraVersion.java renamed to examples/src/main/java/com/datastax/oss/driver/examples/astra/AstraReadCassandraVersion.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,38 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.datastax.oss.driver.examples.apollo;
16+
package com.datastax.oss.driver.examples.astra;
1717

1818
import com.datastax.oss.driver.api.core.CqlSession;
1919
import com.datastax.oss.driver.api.core.cql.ResultSet;
2020
import com.datastax.oss.driver.api.core.cql.Row;
2121
import java.nio.file.Paths;
2222

2323
/**
24-
* Connects to a DataStax Apollo cluster and extracts basic information from it.
24+
* Connects to a DataStax Astra cluster and extracts basic information from it.
2525
*
2626
* <p>Preconditions:
2727
*
2828
* <ul>
29-
* <li>A DataStax Apollo cluster is running and accessible.
30-
* <li>A DataStax Apollo secure connect bundle for the running cluster.
29+
* <li>A DataStax Astra cluster is running and accessible.
30+
* <li>A DataStax Astra secure connect bundle for the running cluster.
3131
* </ul>
3232
*
3333
* <p>Side effects: none.
3434
*
3535
* @see <a
36-
* href="https://helpdocs.datastax.com/gcp/dscloud/apollo/dscloudGettingStarted.html#dscloudCreateCluster">
37-
* Creating an Apollo Database</a>
38-
* @see <a href="https://helpdocs.datastax.com/gcp/dscloud/apollo/dscloudShareClusterDetails.html">
39-
* Providing access to Apollo databases</a>
40-
* @see <a href="https://helpdocs.datastax.com/gcp/dscloud/apollo/dscloudObtainingCredentials.html">
41-
* Obtaining Apollo secure connect bundle</a>
42-
* @see <a href="https://docs.datastax.com/en/developer/java-driver/4.3">Java driver online
36+
* href="https://docs.datastax.com/en/astra/gcp/doc/dscloud/astra/dscloudGettingStarted.html#dscloudCreateCluster">
37+
* Creating an Astra Database (GCP)</a>
38+
* @see <a
39+
* href="https://docs.datastax.com/en/astra/gcp/doc/dscloud/astra/dscloudShareClusterDetails.html">
40+
* Providing access to Astra databases (GCP)</a>
41+
* @see <a
42+
* href="https://docs.datastax.com/en/astra/gcp/doc/dscloud/astra/dscloudObtainingCredentials.html">
43+
* Obtaining Astra secure connect bundle (GCP)</a>
44+
* @see <a href="https://docs.datastax.com/en/developer/java-driver/latest">Java driver online
4345
* manual</a>
4446
*/
45-
public class ApolloReadCassandraVersion {
47+
public class AstraReadCassandraVersion {
4648

4749
public static void main(String[] args) {
4850

@@ -52,7 +54,7 @@ public static void main(String[] args) {
5254
CqlSession.builder()
5355
// Change the path here to the secure connect bundle location (see javadocs above)
5456
.withCloudSecureConnectBundle(Paths.get("/path/to/secure-connect-database_name.zip"))
55-
// Change the user_name and password here for the Apollo instance
57+
// Change the user_name and password here for the Astra instance
5658
.withAuthCredentials("user_name", "fakePasswordForTests")
5759
// Uncomment the next line to use a specific keyspace
5860
// .withKeyspace("keyspace_name")

‎manual/cloud/README.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
## Connecting to Apollo (Cloud)
1+
## Connecting to Astra (Cloud)
22

3-
Using the DataStax Java Driver to connect to a DataStax Apollo database is almost identical to using
3+
Using the DataStax Java Driver to connect to a DataStax Astra database is almost identical to using
44
the driver to connect to any normal Apache Cassandra® database. The only differences are in how the
55
driver is configured in an application and that you will need to obtain a *secure connect bundle*.
66

77
### Prerequisites
88

99
1. [Download][Download Maven] and [install][Install Maven] Maven.
10-
2. Create an Apollo database on [GCP][Create an Apollo database - GCP] or
11-
[AWS][Create an Apollo database - AWS]; alternatively, have a team member provide access to their
12-
Apollo database (instructions for [GCP][Access an Apollo database - GCP] and
13-
[AWS][Access an Apollo database - AWS]) to obtain database connection details.
10+
2. Create an Astra database on [GCP][Create an Astra database - GCP] or
11+
[AWS][Create an Astra database - AWS]; alternatively, have a team member provide access to their
12+
Astra database (instructions for [GCP][Access an Astra database - GCP] and
13+
[AWS][Access an Astra database - AWS]) to obtain database connection details.
1414
3. Download the secure connect bundle (instructions for
1515
[GCP][Download the secure connect bundle - GCP] and
1616
[AWS][Download the secure connect bundle - AWS]), that contains connection information such as
@@ -54,10 +54,10 @@ public class Main {
5454
}
5555
```
5656

57-
The path to the secure connect bundle for your Apollo database is specified with
57+
The path to the secure connect bundle for your Astra database is specified with
5858
`withCloudSecureConnectBundle()`. The authentication credentials must be specified separately with
5959
`withAuthCredentials()`, and match the username and password that were configured when creating the
60-
Apollo database.
60+
Astra database.
6161

6262
Note the following:
6363

@@ -108,7 +108,7 @@ public class Main {
108108

109109
public static void main(String[] args) {
110110
// Create the CqlSession object; it will read the configuration file and pick the right
111-
// values to connect to the Apollo database.
111+
// values to connect to the Astra database.
112112
try (CqlSession session = CqlSession.builder().build()) {
113113

114114
ResultSet rs = session.execute("select release_version from system.local");
@@ -125,11 +125,11 @@ public class Main {
125125

126126
[Download Maven]: https://maven.apache.org/download.cgi
127127
[Install Maven]: https://maven.apache.org/install.html
128-
[Create an Apollo database - GCP]: https://helpdocs.datastax.com/gcp/dscloud/apollo/dscloudGettingStarted.html#dscloudCreateCluster
129-
[Create an Apollo database - AWS]: https://helpdocs.datastax.com/aws/dscloud/apollo/dscloudGettingStarted.html#dscloudCreateCluster
130-
[Access an Apollo database - GCP]: https://helpdocs.datastax.com/gcp/dscloud/apollo/dscloudShareClusterDetails.html
131-
[Access an Apollo database - AWS]: https://helpdocs.datastax.com/aws/dscloud/apollo/dscloudShareClusterDetails.html
132-
[Download the secure connect bundle - GCP]: https://helpdocs.datastax.com/gcp/dscloud/apollo/dscloudObtainingCredentials.html
133-
[Download the secure connect bundle - AWS]: https://helpdocs.datastax.com/aws/dscloud/apollo/dscloudObtainingCredentials.html
128+
[Create an Astra database - GCP]: https://docs.datastax.com/en/astra/gcp/doc/dscloud/astra/dscloudGettingStarted.html#dscloudCreateCluster
129+
[Create an Astra database - AWS]: https://docs.datastax.com/en/astra/aws/doc/dscloud/astra/dscloudGettingStarted.html#dscloudCreateCluster
130+
[Access an Astra database - GCP]: https://docs.datastax.com/en/astra/gcp/doc/dscloud/astra/dscloudShareClusterDetails.html
131+
[Access an Astra database - AWS]: https://docs.datastax.com/en/astra/aws/doc/dscloud/astra/dscloudShareClusterDetails.html
132+
[Download the secure connect bundle - GCP]: https://docs.datastax.com/en/astra/gcp/doc/dscloud/astra/dscloudObtainingCredentials.html
133+
[Download the secure connect bundle - AWS]: https://docs.datastax.com/en/astra/aws/doc/dscloud/astra/dscloudObtainingCredentials.html
134134
[minimal project structure]: ../core/integration/#minimal-project-structure
135135
[driver documentation]: ../core/configuration/

‎manual/core/integration/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ If all of these metrics are disabled, you can remove the dependency:
449449

450450
[Jackson](https://github.com/FasterXML/jackson) is used:
451451

452-
* when connecting to [Datastax Apollo](../../cloud/);
452+
* when connecting to [Datastax Astra](../../cloud/);
453453
* when Insights monitoring is enabled.
454454

455455
If you don't use either of those features, you can safely exclude the dependency:

0 commit comments

Comments
 (0)