Skip to content

Commit cc906f7

Browse files
patch by Mick Semb Wever; reviewed by Henry Hughes for CASSANDRA-18611
1 parent 0178ad8 commit cc906f7

File tree

746 files changed

+5990
-4506
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

746 files changed

+5990
-4506
lines changed

NOTICE.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Apache Cassandra Java Driver
2+
Copyright 2012- The Apache Software Foundation
3+
4+
This product includes software developed by The Apache Software
5+
Foundation (http://www.apache.org/).
6+
7+
JNR project
8+
Copyright (C) 2008-2010 Wayne Meissner
9+
This product includes software developed as part of the JNR project ( https://github.com/jnr/jnr-ffi )s.
10+
see core/src/main/java/com/datastax/oss/driver/internal/core/os/CpuInfo.java
11+
12+
Protocol Buffers
13+
Copyright 2008 Google Inc.
14+
This product includes software developed as part of the Protocol Buffers project ( https://developers.google.com/protocol-buffers/ ).
15+
see core/src/main/java/com/datastax/oss/driver/internal/core/type/util/VIntCoding.java
16+
17+
Guava
18+
Copyright (C) 2007 The Guava Authors
19+
This product includes software developed as part of the Guava project ( https://guava.dev ).
20+
see core/src/main/java/com/datastax/oss/driver/internal/core/util/CountingIterator.java

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
# Datastax Java Driver for Apache Cassandra®
1+
# Java Driver for Apache Cassandra®
22

33
*If you're reading this on github.com, please note that this is the readme
44
for the development version and that some features described here might
55
not yet have been released. You can find the documentation for the latest
6-
version through the [Java driver
6+
version through the [Java Driver
77
docs](http://docs.datastax.com/en/developer/java-driver/3.11/index.html) or via the release tags,
88
[e.g. 3.11.5](https://github.com/datastax/java-driver/tree/3.11.5).*
99

1010
A modern, [feature-rich](manual/) and highly tunable Java client
1111
library for Apache Cassandra (2.1+) and using exclusively Cassandra's binary protocol
12-
and Cassandra Query Language v3. _Use the [DataStax Enterprise Java driver][dse-driver]
12+
and Cassandra Query Language v3. _Use the [DataStax Enterprise Java Driver][dse-driver]
1313
for better compatibility and support for DataStax Enterprise._
1414

1515
**Features:**
@@ -35,7 +35,7 @@ The driver contains the following modules:
3535

3636
- driver-core: the core layer.
3737
- driver-mapping: the object mapper.
38-
- driver-extras: optional features for the Java driver.
38+
- driver-extras: optional features for the Java Driver.
3939
- driver-examples: example applications using the other modules which are
4040
only meant for demonstration purposes.
4141
- driver-tests: tests for the java-driver.
@@ -59,7 +59,7 @@ The driver contains the following modules:
5959

6060
The last release of the driver is available on Maven Central. You can install
6161
it in your application using the following Maven dependency (_if
62-
using DataStax Enterprise, install the [DataStax Enterprise Java driver][dse-driver] instead_):
62+
using DataStax Enterprise, install the [DataStax Enterprise Java Driver][dse-driver] instead_):
6363

6464
```xml
6565
<dependency>
@@ -114,7 +114,7 @@ an [UnsupportedFeatureException](https://github.com/datastax/java-driver/blob/3.
114114

115115
The java driver supports Java JDK versions 6 and above.
116116

117-
If using _DataStax Enterprise_, the [DataStax Enterprise Java driver][dse-driver] provides
117+
If using _DataStax Enterprise_, the [DataStax Enterprise Java Driver][dse-driver] provides
118118
more features and better compatibility.
119119

120120
__Disclaimer__: Some _DataStax/DataStax Enterprise_ products might partially work on
@@ -125,7 +125,7 @@ big-endian systems, but _DataStax_ does not officially support these systems.
125125
If you are upgrading from a previous version of the driver, be sure to have a look at
126126
the [upgrade guide](/upgrade_guide/).
127127

128-
If you are upgrading to _DataStax Enterprise_, use the [DataStax Enterprise Java driver][dse-driver] for more
128+
If you are upgrading to _DataStax Enterprise_, use the [DataStax Enterprise Java Driver][dse-driver] for more
129129
features and better compatibility.
130130

131131
## License

doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Project related configuration options
55
#---------------------------------------------------------------------------
66
DOXYFILE_ENCODING = UTF-8
7-
PROJECT_NAME = "DataStax Java Driver"
7+
PROJECT_NAME = "Java Driver"
88
PROJECT_NUMBER =
99
PROJECT_BRIEF =
1010
PROJECT_LOGO =

driver-core/pom.xml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<!--
22
3-
Copyright DataStax, Inc.
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
410
5-
Licensed under the Apache License, Version 2.0 (the "License");
6-
you may not use this file except in compliance with the License.
7-
You may obtain a copy of the License at
8-
9-
http://www.apache.org/licenses/LICENSE-2.0
11+
http://www.apache.org/licenses/LICENSE-2.0
1012
1113
Unless required by applicable law or agreed to in writing, software
1214
distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,7 +28,7 @@
2628
</parent>
2729

2830
<artifactId>cassandra-driver-core</artifactId>
29-
<name>DataStax Java Driver for Apache Cassandra - Core</name>
31+
<name>Java Driver for Apache Cassandra - Core</name>
3032
<description>
3133
A driver for Apache Cassandra 1.2+ that works exclusively with the Cassandra Query Language version 3
3234
(CQL3) and Cassandra's binary protocol.

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Copyright DataStax, Inc.
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
39
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
911
*
1012
* Unless required by applicable law or agreed to in writing, software
1113
* distributed under the License is distributed on an "AS IS" BASIS,

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Copyright DataStax, Inc.
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
39
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
911
*
1012
* Unless required by applicable law or agreed to in writing, software
1113
* distributed under the License is distributed on an "AS IS" BASIS,

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Copyright DataStax, Inc.
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
39
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
911
*
1012
* Unless required by applicable law or agreed to in writing, software
1113
* distributed under the License is distributed on an "AS IS" BASIS,

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Copyright DataStax, Inc.
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
39
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
911
*
1012
* Unless required by applicable law or agreed to in writing, software
1113
* distributed under the License is distributed on an "AS IS" BASIS,

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Copyright DataStax, Inc.
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
39
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
911
*
1012
* Unless required by applicable law or agreed to in writing, software
1113
* distributed under the License is distributed on an "AS IS" BASIS,

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Copyright DataStax, Inc.
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
39
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
911
*
1012
* Unless required by applicable law or agreed to in writing, software
1113
* distributed under the License is distributed on an "AS IS" BASIS,

0 commit comments

Comments
 (0)