Skip to content

Commit 1626026

Browse files
michaelsembwevermichaelsembwever
committed
patch by Mick Semb Wever; reviewed by Henry Hughes for CASSANDRA-18611
1 parent 06947df commit 1626026

File tree

1,907 files changed

+15235
-11430
lines changed

Some content is hidden

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

1,907 files changed

+15235
-11430
lines changed

‎NOTICE.txt

+20
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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# DataStax Java Driver for Apache Cassandra®
1+
# Java Driver for Apache Cassandra®
22

33
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.datastax.oss/java-driver-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.datastax.oss/java-driver-core)
44

@@ -66,22 +66,22 @@ offering. See the dedicated [manual page](manual/cloud/) for more details.
6666

6767
## Migrating from previous versions
6868

69-
Java driver 4 is **not binary compatible** with previous versions. However, most of the concepts
69+
Java Driver 4 is **not binary compatible** with previous versions. However, most of the concepts
7070
remain unchanged, and the new API will look very familiar to 2.x and 3.x users.
7171

7272
See the [upgrade guide](upgrade_guide/) for details.
7373

7474
## Error Handling
7575

76-
See the [Cassandra error handling done right blog](https://www.datastax.com/blog/cassandra-error-handling-done-right) for error handling with the DataStax Java Driver for Apache Cassandra™.
76+
See the [Cassandra error handling done right blog](https://www.datastax.com/blog/cassandra-error-handling-done-right) for error handling with the Java Driver for Apache Cassandra™.
7777

7878
## Useful links
7979

8080
* [Manual](manual/)
8181
* [API docs]
8282
* Bug tracking: [JIRA]
8383
* [Mailing list]
84-
* Twitter: [@dsJavaDriver] tweets Java driver releases and important announcements (low frequency).
84+
* Twitter: [@dsJavaDriver] tweets Java Driver releases and important announcements (low frequency).
8585
[@DataStaxEng] has more news, including other drivers, Cassandra, and DSE.
8686
* [Changelog]
8787
* [FAQ]

‎bom/pom.xml

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright DataStax, Inc.
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
511
6-
Licensed under the Apache License, Version 2.0 (the "License");
7-
you may not use this file except in compliance with the License.
8-
You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
12+
http://www.apache.org/licenses/LICENSE-2.0
1113
1214
Unless required by applicable law or agreed to in writing, software
1315
distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,7 +27,7 @@
2527
</parent>
2628
<artifactId>java-driver-bom</artifactId>
2729
<packaging>pom</packaging>
28-
<name>DataStax Java driver for Apache Cassandra(R) - Bill Of Materials</name>
30+
<name>Apache Cassandra Java Driver - Bill Of Materials</name>
2931
<dependencyManagement>
3032
<dependencies>
3133
<dependency>

‎core-shaded/pom.xml

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright DataStax, Inc.
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
511
6-
Licensed under the Apache License, Version 2.0 (the "License");
7-
you may not use this file except in compliance with the License.
8-
You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
12+
http://www.apache.org/licenses/LICENSE-2.0
1113
1214
Unless required by applicable law or agreed to in writing, software
1315
distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +26,7 @@
2426
<version>4.17.1-SNAPSHOT</version>
2527
</parent>
2628
<artifactId>java-driver-core-shaded</artifactId>
27-
<name>DataStax Java driver for Apache Cassandra(R) - core with shaded deps</name>
29+
<name>Apache Cassandra Java Driver - core with shaded deps</name>
2830
<dependencyManagement>
2931
<dependencies>
3032
<dependency>

‎core-shaded/src/assembly/shaded-jar.xml

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright DataStax, Inc.
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
511
6-
Licensed under the Apache License, Version 2.0 (the "License");
7-
you may not use this file except in compliance with the License.
8-
You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
12+
http://www.apache.org/licenses/LICENSE-2.0
1113
1214
Unless required by applicable law or agreed to in writing, software
1315
distributed under the License is distributed on an "AS IS" BASIS,

‎core/pom.xml

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright DataStax, Inc.
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
511
6-
Licensed under the Apache License, Version 2.0 (the "License");
7-
you may not use this file except in compliance with the License.
8-
You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
12+
http://www.apache.org/licenses/LICENSE-2.0
1113
1214
Unless required by applicable law or agreed to in writing, software
1315
distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,7 +27,7 @@
2527
</parent>
2628
<artifactId>java-driver-core</artifactId>
2729
<packaging>bundle</packaging>
28-
<name>DataStax Java driver for Apache Cassandra(R) - core</name>
30+
<name>Apache Cassandra Java Driver - core</name>
2931
<dependencyManagement>
3032
<dependencies>
3133
<dependency>

‎core/src/main/java/com/datastax/dse/driver/api/core/DseProtocolVersion.java

+8-6
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,

‎core/src/main/java/com/datastax/dse/driver/api/core/DseSession.java

+8-6
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,

‎core/src/main/java/com/datastax/dse/driver/api/core/DseSessionBuilder.java

+8-6
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,

‎core/src/main/java/com/datastax/dse/driver/api/core/auth/BaseDseAuthenticator.java

+8-6
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,

‎core/src/main/java/com/datastax/dse/driver/api/core/auth/DseGssApiAuthProviderBase.java

+8-6
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,

‎core/src/main/java/com/datastax/dse/driver/api/core/auth/DsePlainTextAuthProviderBase.java

+8-6
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,

‎core/src/main/java/com/datastax/dse/driver/api/core/auth/ProgrammaticDseGssApiAuthProvider.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Copyright DataStax, Inc.
3-
*
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
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
9+
*
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,

‎core/src/main/java/com/datastax/dse/driver/api/core/auth/ProxyAuthentication.java

+8-6
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,

‎core/src/main/java/com/datastax/dse/driver/api/core/config/DseDriverConfigLoader.java

+8-6
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,

‎core/src/main/java/com/datastax/dse/driver/api/core/config/DseDriverOption.java

+8-6
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,

‎core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousAsyncResultSet.java

+8-6
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)