Merge pull request #251 from eclipse/update-api

Update API make it ready for Java 17/21

Author: otaviojava

jnosql-cassandra/src/main/java/org/eclipse/jnosql/databases/cassandra/communication/CassandraConverter.java

@@ -58,19 +58,17 @@ public static ColumnEntity toDocumentEntity(Row row) {
     private static Column getColumn(ColumnDefinition definition, Object result) {
 
         final DataType type = definition.getType();
-        switch (type.getProtocolCode()) {
-            case ProtocolConstants.DataType.UDT:
-                return Column.class.cast(result);
-            case ProtocolConstants.DataType.LIST:
-            case ProtocolConstants.DataType.SET:
+        return switch (type.getProtocolCode()) {
+            case ProtocolConstants.DataType.UDT -> Column.class.cast(result);
+            case ProtocolConstants.DataType.LIST, ProtocolConstants.DataType.SET -> {
                 if (isUDTIterable(result)) {
-                    return UDT.builder(getUserType(result)).withName(definition.getName().asInternal())
+                    yield UDT.builder(getUserType(result)).withName(definition.getName().asInternal())
                             .addUDTs(getColumns(definition, result)).build();
                 }
-                return Column.of(definition.getName().asInternal(), Value.of(result));
-            default:
-                return Column.of(definition.getName().asInternal(), Value.of(result));
-        }
+                yield Column.of(definition.getName().asInternal(), Value.of(result));
+            }
+            default -> Column.of(definition.getName().asInternal(), Value.of(result));
+        };
     }
 
     static Object get(ColumnDefinition definition, Row row) {

jnosql-cassandra/src/main/java/org/eclipse/jnosql/databases/cassandra/communication/DefaultUDT.java

@@ -77,10 +77,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof UDT)) {
+        if (!(o instanceof UDT udt)) {
             return false;
         }
-        UDT udt = (UDT) o;
         return Objects.equals(name, udt.name()) &&
                 Objects.equals(userType, udt.getUserType()) &&
                 Objects.equals(columns, udt.get());

jnosql-cassandra/src/main/java/org/eclipse/jnosql/databases/cassandra/communication/IterableUDT.java

@@ -75,10 +75,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof UDT)) {
+        if (!(o instanceof UDT udt)) {
             return false;
         }
-        UDT udt = (UDT) o;
         return Objects.equals(name, udt.name()) &&
                 Objects.equals(userType, udt.getUserType()) &&
                 Objects.equals(columns, udt.get());

jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/Address.java

@@ -47,8 +47,7 @@ public void setStreet(String street) {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (!(o instanceof Address)) return false;
-        Address address = (Address) o;
+        if (!(o instanceof Address address)) return false;
         return Objects.equals(city, address.city) &&
                 Objects.equals(street, address.street);
     }

jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/model/Money.java

@@ -18,24 +18,7 @@
 import java.math.BigDecimal;
 import java.util.Objects;
 
-public class Money {
-
-    private final String currency;
-
-    private final BigDecimal value;
-
-    public Money(String currency, BigDecimal value) {
-        this.currency = currency;
-        this.value = value;
-    }
-
-    public String getCurrency() {
-        return currency;
-    }
-
-    public BigDecimal getValue() {
-        return value;
-    }
+public record Money(String currency, BigDecimal value) {
 
     @Override
     public boolean equals(Object o) {

jnosql-couchbase/src/main/java/org/eclipse/jnosql/databases/couchbase/communication/DefaultCouchbaseDocumentManager.java

@@ -162,7 +162,7 @@ public Stream<DocumentEntity> select(final DocumentQuery query) throws NullPoint
             List<JsonObject> jsons = new ArrayList<>();
             if (n1QLQuery.hasIds()) {
                 Collection collection = bucket.collection(query.name());
-                for (String id : n1QLQuery.getIds()) {
+                for (String id : n1QLQuery.ids()) {
                     try {
                         GetResult result = collection.get(id);
                         jsons.add(result.contentAsObject());
@@ -175,10 +175,10 @@ public Stream<DocumentEntity> select(final DocumentQuery query) throws NullPoint
             if (!n1QLQuery.hasOnlyIds()) {
                 QueryResult result;
                 if (n1QLQuery.hasParameter()) {
-                    result = cluster.query(n1QLQuery.getQuery());
+                    result = cluster.query(n1QLQuery.query());
                 } else {
-                    result = cluster.query(n1QLQuery.getQuery(), QueryOptions
-                            .queryOptions().parameters(n1QLQuery.getParams()));
+                    result = cluster.query(n1QLQuery.query(), QueryOptions
+                            .queryOptions().parameters(n1QLQuery.params()));
                 }
                 jsons.addAll(result.rowsAsObject());
             }
@@ -194,7 +194,7 @@ public long count(String documentCollection) {
                     .select("COUNT(*)").from(documentCollection).build();
             N1QLQuery n1QLQuery = N1QLBuilder
                     .of(countQuery, database, bucket.defaultScope().name()).get();
-            QueryResult query = cluster.query(n1QLQuery.getQuery());
+            QueryResult query = cluster.query(n1QLQuery.query());
             List<JsonObject> result = query.rowsAsObject();
             var count = result.stream().findFirst()
                     .map(data -> data.getNumber("$1"))

jnosql-couchbase/src/main/java/org/eclipse/jnosql/databases/couchbase/communication/N1QLQuery.java

@@ -18,31 +18,11 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 
-final class N1QLQuery {
+record N1QLQuery(String query, JsonObject params, List<String> ids) {
 
-    private final String query;
-
-    private final JsonObject params;
-
-    private final List<String> ids;
-
-    N1QLQuery(String query, JsonObject params, List<String> ids) {
-        this.query = query;
-        this.params = params;
-        this.ids = ids;
-    }
-
-    public String getQuery() {
-        return query;
-    }
-
-    public JsonObject getParams() {
-        return params;
-    }
-
-    public List<String> getIds() {
+    @Override
+    public List<String> ids() {
         return Collections.unmodifiableList(ids);
     }
 
@@ -58,24 +38,6 @@ public boolean hasIds() {
         return !this.ids.isEmpty();
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        N1QLQuery n1QLQuery = (N1QLQuery) o;
-        return Objects.equals(query, n1QLQuery.query) && Objects.equals(params, n1QLQuery.params)
-                && Objects.equals(ids, n1QLQuery.ids);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(query, params, ids);
-    }
-
     @Override
     public String toString() {
         return "N1QLQuery{" +

jnosql-database-commons/src/test/java/org/eclipse/jnosql/communication/driver/User.java

@@ -36,10 +36,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof User)) {
+        if (!(o instanceof User user)) {
             return false;
         }
-        User user = (User) o;
         return Objects.equals(name, user.name) &&
                 Objects.equals(age, user.age);
     }

jnosql-dynamodb/src/main/java/org/eclipse/jnosql/databases/dynamodb/communication/DynamoDBBuilderASync.java

@@ -53,8 +53,8 @@ public void profile(String profile) {
 
     public DynamoDbAsyncClient build() {
 
-        boolean accessKey = awsAccessKey != null && !awsAccessKey.equals("");
-        boolean secretAccess = awsSecretAccess != null && !awsSecretAccess.equals("");
+        boolean accessKey = awsAccessKey != null && !awsAccessKey.isEmpty();
+        boolean secretAccess = awsSecretAccess != null && !awsSecretAccess.isEmpty();
 
         if (accessKey && secretAccess) {
 

jnosql-dynamodb/src/main/java/org/eclipse/jnosql/databases/dynamodb/communication/DynamoDBBuilderSync.java

@@ -53,8 +53,8 @@ public void profile(String profile) {
 
     public DynamoDbClient build() {
 
-        boolean accessKey = awsAccessKey != null && !awsAccessKey.equals("");
-        boolean secretAccess = awsSecretAccess != null && !awsSecretAccess.equals("");
+        boolean accessKey = awsAccessKey != null && !awsAccessKey.isEmpty();
+        boolean secretAccess = awsSecretAccess != null && !awsSecretAccess.isEmpty();
 
 
         if (accessKey && secretAccess) {