Merge pull request #266 from eclipse/jakarta-upgrade-m3

Upgrade Jakarta Data to version 1.0.0-M3

Author: otaviojava

CHANGELOG.adoc

@@ -16,6 +16,7 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 - Update Jedis driver to 5.1.0
 - Update Solr driver to 9.5.0
 - Update Testcontainer to 1.19.6
+- Upgrade Jakarta Data to version 1.0.0-M3
 
 == [1.1.0] - 2023-02-05
 

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/QueryAQLConverter.java

@@ -76,7 +76,7 @@ public static AQLQueryResult select(DocumentQuery query) throws NullPointerExcep
 
     private static AQLQueryResult convert(String documentCollection,
                                           DocumentCondition documentCondition,
-                                          List<Sort> sorts,
+                                          List<Sort<?>> sorts,
                                           long firstResult,
                                           long maxResult,
                                           String conclusion, boolean delete) {
@@ -107,10 +107,10 @@ private static AQLQueryResult convert(String documentCollection,
         return new AQLQueryResult(aql.toString(), params);
     }
 
-    private static void sort(List<Sort> sorts, StringBuilder aql, char entity) {
+    private static void sort(List<Sort<?>> sorts, StringBuilder aql, char entity) {
         aql.append(SORT);
         String separator = SEPARATOR;
-        for (Sort sort : sorts) {
+        for (Sort<?> sort : sorts) {
             aql.append(separator)
                     .append(entity).append('.')
                     .append(sort.property())

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBRepository.java

@@ -15,13 +15,13 @@
 package org.eclipse.jnosql.databases.arangodb.mapping;
 
 
-import jakarta.data.repository.PageableRepository;
+import org.eclipse.jnosql.mapping.NoSQLRepository;
 
 
 /**
- * The arangodb {@link PageableRepository}
+ * The arangodb {@link NoSQLRepository}
  * @param <T> the entity type
  * @param <K> the id entity type
  */
-public interface ArangoDBRepository<T, K> extends PageableRepository<T, K> {
+public interface ArangoDBRepository<T, K> extends NoSQLRepository<T, K> {
 }

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

@@ -107,7 +107,7 @@ public Optional<ColumnCondition> condition() {
     }
 
     @Override
-    public List<Sort> sorts() {
+    public List<Sort<?>> sorts() {
         return query.sorts();
     }
 

jnosql-cassandra/src/main/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraRepository.java

@@ -15,14 +15,14 @@
 package org.eclipse.jnosql.databases.cassandra.mapping;
 
 
-import jakarta.data.repository.PageableRepository;
+import org.eclipse.jnosql.mapping.NoSQLRepository;
 
 /**
- * The Cassandra {@link PageableRepository}
+ * The Cassandra {@link NoSQLRepository}
  *
  * @param <T> the entity type
  * @param <K> the id entity type
  */
-public interface CassandraRepository<T, K> extends PageableRepository<T, K> {
+public interface CassandraRepository<T, K> extends NoSQLRepository<T, K> {
 
 }

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

@@ -52,7 +52,7 @@ public Optional<DocumentCondition> condition() {
     }
 
     @Override
-    public List<Sort> sorts() {
+    public List<Sort<?>> sorts() {
         return Collections.emptyList();
     }
 

jnosql-couchbase/src/main/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseRepository.java

@@ -15,12 +15,12 @@
 package org.eclipse.jnosql.databases.couchbase.mapping;
 
 
-import jakarta.data.repository.PageableRepository;
+import org.eclipse.jnosql.mapping.NoSQLRepository;
 
 /**
- * The couchbase {@link PageableRepository}
+ * The couchbase {@link NoSQLRepository}
  * @param <T> the entity type
  * @param <K> the entity id type
  */
-public interface CouchbaseRepository<T, K> extends PageableRepository<T, K> {
+public interface CouchbaseRepository<T, K> extends NoSQLRepository<T, K> {
 }

jnosql-couchdb/src/main/java/org/eclipse/jnosql/databases/couchdb/communication/CouchDBDocumentQuery.java

@@ -80,7 +80,7 @@ public Optional<DocumentCondition> condition() {
     }
 
     @Override
-    public List<Sort> sorts() {
+    public List<Sort<?>> sorts() {
         return query.sorts();
     }
 

jnosql-couchdb/src/main/java/org/eclipse/jnosql/databases/couchdb/communication/DeleteQuery.java

@@ -57,7 +57,7 @@ public Optional<DocumentCondition> condition() {
     }
 
     @Override
-    public List<Sort> sorts() {
+    public List<Sort<?>> sorts() {
         return Collections.emptyList();
     }
 

jnosql-elasticsearch/src/main/java/org/eclipse/jnosql/databases/elasticsearch/communication/ElasticsearchDocumentQuery.java

@@ -52,7 +52,7 @@ public Optional<DocumentCondition> condition() {
     }
 
     @Override
-    public List<Sort> sorts() {
+    public List<Sort<?>> sorts() {
         return Collections.emptyList();
     }