Skip to content

Commit 2c15b37

Browse files
authored
Prepare 2.1.0 (#126)
* Bump dependencies and remove Aerospike client deprecated features (predicate expressions). * Set version to 2.1.0. Update versions compatibility table.
1 parent 519087f commit 2c15b37

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ The documentation for this project can be found on [javadoc.io](https://www.java
4545

4646
| Java Object Mapper Version | Aerospike Client | Aerospike Reactor Client
4747
| :----------- | :----------- | :-----------
48+
| 2.1.x | 6.1.x | 6.1.x
4849
| 2.0.x | 5.1.x | 5.1.x
4950
| 1.2.x, 1.3.x, 1.4.x | 5.1.x | 5.0.x
5051
| 1.1.x | 5.0.x |

pom.xml

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

66
<groupId>com.aerospike</groupId>
77
<artifactId>java-object-mapper</artifactId>
8-
<version>2.0.4</version>
8+
<version>2.1.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>Aerospike Object Mapper</name>
@@ -25,17 +25,17 @@
2525
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
2626
<maven.javadoc.plugin.version>3.3.0</maven.javadoc.plugin.version>
2727
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
28-
<maven.compiler.plugin.version>3.10.0</maven.compiler.plugin.version>
29-
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
28+
<maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
29+
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
3030
<javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
31-
<aerospike-client.version>5.1.11</aerospike-client.version>
32-
<aerospike-reactor.version>5.1.11</aerospike-reactor.version>
31+
<aerospike-client.version>6.1.2</aerospike-client.version>
32+
<aerospike-reactor.version>6.1.2</aerospike-reactor.version>
3333
<commons-lang3.version>3.12.0</commons-lang3.version>
34-
<jackson-dataformat-yaml.version>2.13.1</jackson-dataformat-yaml.version>
35-
<lombok.version>1.18.22</lombok.version>
36-
<reactor-test.version>3.4.15</reactor-test.version>
34+
<jackson-dataformat-yaml.version>2.13.4</jackson-dataformat-yaml.version>
35+
<lombok.version>1.18.24</lombok.version>
36+
<reactor-test.version>3.4.23</reactor-test.version>
3737
<blockhound.version>1.0.6.RELEASE</blockhound.version>
38-
<junit-jupiter.version>5.8.2</junit-jupiter.version>
38+
<junit-jupiter.version>5.9.1</junit-jupiter.version>
3939
</properties>
4040

4141
<licenses>

src/main/java/com/aerospike/mapper/tools/AeroMapper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,9 @@ public <T> T[] read(BatchPolicy batchPolicy, @NotNull Class<T> clazz, @NotNull O
325325
return readBatch(batchPolicy, clazz, keys, entry, operations);
326326
}
327327

328-
@SuppressWarnings({"deprecation", "unchecked"})
328+
@SuppressWarnings({"unchecked"})
329329
private <T> T read(Policy readPolicy, @NotNull Class<T> clazz, @NotNull Key key, @NotNull ClassCacheEntry<T> entry, boolean resolveDependencies) {
330-
if (readPolicy == null || (readPolicy.filterExp == null && readPolicy.predExp == null)) {
330+
if (readPolicy == null || readPolicy.filterExp == null) {
331331
Object objectForKey = LoadedObjectResolver.get(key);
332332
if (objectForKey != null) {
333333
return (T) objectForKey;

0 commit comments

Comments
 (0)