Skip to content

Commit 2202725

Browse files
committed
Prepare release 4.9.0
- Add package-info.java for each package - Improve Javadoc in optionset package - Bump version
1 parent be8e146 commit 2202725

File tree

10 files changed

+96
-18
lines changed

10 files changed

+96
-18
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to
55
[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## Unreleased
7+
## [4.9.0] - 2023-04-15
88
### Added
99
- Add non-JDBC standard [JSON support](https://cassandra.apache.org/doc/latest/cassandra/cql/json.html) with the
1010
methods `getObjectFromJson(int | String, Class)` and `getObjectFromJson(Class)` in `CassandraResultSet` and
@@ -121,6 +121,7 @@ For this version, the changelog lists the main changes comparatively to the late
121121
- Fix logs in `CassandraConnection` constructor.
122122

123123
[original project]: https://github.com/adejanovski/cassandra-jdbc-wrapper/
124+
[4.9.0]: https://github.com/ing-bank/cassandra-jdbc-wrapper/compare/v4.8.0...v4.9.0
124125
[4.8.0]: https://github.com/ing-bank/cassandra-jdbc-wrapper/compare/v4.7.0...v4.8.0
125126
[4.7.0]: https://github.com/ing-bank/cassandra-jdbc-wrapper/compare/v4.6.0...v4.7.0
126127
[4.6.0]: https://github.com/ing-bank/cassandra-jdbc-wrapper/compare/v4.5.0...v4.6.0

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.ing.data</groupId>
77
<artifactId>cassandra-jdbc-wrapper</artifactId>
8-
<version>4.8.0</version>
8+
<version>4.9.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>Cassandra JDBC Wrapper</name>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
*
3+
* Licensed under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License.
5+
* You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software
10+
* distributed under the License is distributed on an "AS IS" BASIS,
11+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* See the License for the specific language governing permissions and
13+
* limitations under the License.
14+
*/
15+
16+
/**
17+
* This package contains the codec classes to handle conversions between CQL types and Java types.
18+
*/
19+
package com.ing.data.cassandra.jdbc.codec;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
*
3+
* Licensed under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License.
5+
* You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software
10+
* distributed under the License is distributed on an "AS IS" BASIS,
11+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* See the License for the specific language governing permissions and
13+
* limitations under the License.
14+
*/
15+
16+
/**
17+
* This package contains the classes used to manage serialization and deserialization for JSON support.
18+
*/
19+
package com.ing.data.cassandra.jdbc.json;

src/main/java/com/ing/data/cassandra/jdbc/optionset/AbstractOptionSet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public abstract class AbstractOptionSet implements OptionSet {
2626

2727
@Override
2828
public CassandraConnection getConnection() {
29-
return connection;
29+
return this.connection;
3030
}
3131

3232
public void setConnection(final CassandraConnection connection) {

src/main/java/com/ing/data/cassandra/jdbc/optionset/Default.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323
import java.sql.Statement;
2424

2525
/**
26-
* Default Option set.
26+
* Default option set implementing the methods of {@code OptionSet} accordingly to the JDBC API standard.
2727
*/
28-
2928
public class Default extends AbstractOptionSet {
3029
private static final Logger LOG = LoggerFactory.getLogger(AbstractOptionSet.class);
3130

@@ -50,4 +49,5 @@ public String getCatalog() {
5049
public int getSQLUpdateResponse() {
5150
return 0;
5251
}
52+
5353
}

src/main/java/com/ing/data/cassandra/jdbc/optionset/Liquibase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
package com.ing.data.cassandra.jdbc.optionset;
1717

1818
/**
19-
* Option Set for liquibase compatibility and flavour of JDBC.
19+
* Option set implementation for Liquibase compatibility and flavour of JDBC.
2020
*/
2121
public class Liquibase extends AbstractOptionSet {
2222

23-
2423
@Override
2524
public String getCatalog() {
2625
return null;
@@ -30,4 +29,5 @@ public String getCatalog() {
3029
public int getSQLUpdateResponse() {
3130
return -1;
3231
}
32+
3333
}

src/main/java/com/ing/data/cassandra/jdbc/optionset/OptionSet.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,36 @@
1818
import com.ing.data.cassandra.jdbc.CassandraConnection;
1919

2020
/**
21-
* Option Set for compliance mode.
21+
* Option set for compliance mode.
2222
* Different use cases require one or more adjustments to the wrapper, to be compatible.
23-
* Thus, OptionSet would provide convenience to set for different flavours.
24-
*
23+
* Thus, {@code OptionSet} would provide convenience to set for different flavours (for example Liquibase expect some
24+
* methods return values different of the JDBC standard implementation).
2525
*/
2626
public interface OptionSet {
2727
/**
28-
* There is no Catalog concept in cassandra. Different flavour requires different response.
28+
* There is no catalog concept in Cassandra. Different flavour requires different response.
2929
*
30-
* @return Catalog
30+
* @return The current catalog name or {@code null} if there is none.
3131
*/
3232
String getCatalog();
3333

3434
/**
35-
* There is no updateCount available in Datastax Java driver, different flavour requires different response.
35+
* There is no {@code updateCount} available in Datastax Java driver, different flavour requires different response.
3636
*
37-
* @return Predefined update response
37+
* @return A predefined update response.
3838
*/
3939
int getSQLUpdateResponse();
4040

4141
/**
42-
* Set referenced connection. See @{@link AbstractOptionSet}
43-
* @param connection Connection to set
42+
* Set referenced connection. See @{@link AbstractOptionSet}.
43+
* @param connection Connection to set.
4444
*/
4545
void setConnection(CassandraConnection connection);
4646

4747
/**
48-
* Get referenced connection. See @{@link AbstractOptionSet}
48+
* Get referenced connection. See @{@link AbstractOptionSet}.
4949
*
50-
* @return referenced connection
50+
* @return the referenced connection.
5151
*/
5252
CassandraConnection getConnection();
5353
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
*
3+
* Licensed under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License.
5+
* You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software
10+
* distributed under the License is distributed on an "AS IS" BASIS,
11+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* See the License for the specific language governing permissions and
13+
* limitations under the License.
14+
*/
15+
16+
/**
17+
* This package contains the classes relative to the compliance modes used to adapt some behaviours of the wrapper
18+
* to different needs (standard JDBC API, Liquibase, ...).
19+
*/
20+
package com.ing.data.cassandra.jdbc.optionset;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
*
3+
* Licensed under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License.
5+
* You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software
10+
* distributed under the License is distributed on an "AS IS" BASIS,
11+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* See the License for the specific language governing permissions and
13+
* limitations under the License.
14+
*/
15+
16+
/**
17+
* Implementation of JDBC API for Cassandra databases by wrapping the DataStax Java Driver for Apache Cassandra.
18+
*/
19+
package com.ing.data.cassandra.jdbc;

0 commit comments

Comments
 (0)