Skip to content

Commit

Permalink
Prepare for 1.5.0 release. (#30)
Browse files Browse the repository at this point in the history
- updated NoSQL Java SDK version to 5.4.9: updated the way Consistency is used.
 - updated CHANGELOG.md.
 - fix javadoc error and link
  • Loading branch information
cezarfx authored Mar 6, 2023
1 parent eed7758 commit 35b90b4
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 8 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/).

## [1.5.0]
### Added
- Added support for java.util.Map and similar types as mapping types.
- Added support for evaluating SpEl expressions on NosqlTable.tableName annotation.
- Added support for table level default TTL.

### Changed
- Updated documentation links.

## [1.4.1]
### Added
- Add a way to return the library version using NosqlDbFactory.getLibraryVersion().
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.oracle.nosql.sdk</groupId>
<artifactId>spring-data-oracle-nosql</artifactId>
<version>1.4.1</version>
<version>1.5.0</version>

<name>Oracle NoSQL Database SDK for Spring Data</name>
<description>Oracle NoSQL Database SDK for Spring Data</description>
Expand Down Expand Up @@ -45,7 +45,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>MM-dd-HH-mm-ss</maven.build.timestamp.format>

<nosqldriver.version>5.3.4</nosqldriver.version>
<nosqldriver.version>5.4.9</nosqldriver.version>

<spring.springframework.version>5.3.20</spring.springframework.version>
<spring.data.version>2.7.0</spring.data.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,11 @@
* {@link com.oracle.nosql.spring.data.Constants#NOTSET_TABLE_TTL} is used,
* which means no table level TTL. This is applicable only when
* {@link #autoCreateTable} is set to true.
* <p>
*
* @since 1.5.0
* @see oracle.nosql.driver.TimeToLive
* @see <a href="https://docs.oracle.com/en/database/other-databases/nosql-database/22.3/java-driver-table/using-time-live.html#GUID-A768A8F9-309A-4018-8CC3-D2D6B8793C59">Using TTL</a>
* @see <a href="https://docs.oracle.com/en/database/other-databases/nosql-database/22.3/java-driver-table/using-time-live.html">Using TTL</a>
*/

int ttl() default Constants.NOTSET_TABLE_TTL;

enum TtlUnit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,11 @@ public Consistency getConsistency() {
}

public void setConsistency(String consistency) {
this.consistency = Consistency.valueOf(consistency);
if (Consistency.ABSOLUTE.getType().toString().equalsIgnoreCase(consistency)) {
this.consistency = Consistency.ABSOLUTE;
} else {
this.consistency = Consistency.EVENTUAL;
}
}

public Durability getDurability() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ public void setTimeout(int milliseconds) {
*/
@Override
public String getConsistency() {
return entityInformation.getConsistency().name();
return entityInformation.getConsistency().getType().name();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public void setTimeout(int milliseconds) {
*/
@Override
public String getConsistency() {
return entityInformation.getConsistency().name();
return entityInformation.getConsistency().getType().name();
}

/**
Expand Down

0 comments on commit 35b90b4

Please sign in to comment.