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

Upgrade Jakarta Data to version 1.0.0-M3
eclipse · Feb 27, 2024 · b4afe63 · b4afe63
2 parents 08a9a24 + 5786b5f
commit b4afe63
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 36 deletions.
diff --git a/CHANGELOG.adoc b/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
 

diff --git a/.../src/main/java/org/eclipse/jnosql/databases/arangodb/communication/QueryAQLConverter.java b/.../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())

diff --git a/...ngodb/src/main/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBRepository.java b/...ngodb/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> {
 }
diff --git a/...ra/src/main/java/org/eclipse/jnosql/databases/cassandra/communication/CassandraQuery.java b/...ra/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();
     }
 

diff --git a/...dra/src/main/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraRepository.java b/...dra/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> {
 
 }
diff --git a/...rc/main/java/org/eclipse/jnosql/databases/couchbase/communication/DeleteQueryWrapper.java b/...rc/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();
     }
 

diff --git a/...ase/src/main/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseRepository.java b/...ase/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> {
 }
diff --git a/...rc/main/java/org/eclipse/jnosql/databases/couchdb/communication/CouchDBDocumentQuery.java b/...rc/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();
     }
 

diff --git a/...couchdb/src/main/java/org/eclipse/jnosql/databases/couchdb/communication/DeleteQuery.java b/...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();
     }
 

diff --git a/.../org/eclipse/jnosql/databases/elasticsearch/communication/ElasticsearchDocumentQuery.java b/.../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();
     }
 

diff --git a/...ast/src/main/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastRepository.java b/...ast/src/main/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastRepository.java
@@ -15,13 +15,13 @@
 package org.eclipse.jnosql.databases.hazelcast.mapping;
 
 
-import jakarta.data.repository.PageableRepository;
+import org.eclipse.jnosql.mapping.NoSQLRepository;
 
 /**
- * The hazelcast {@link PageableRepository}
+ * The hazelcast {@link NoSQLRepository}
  *
  * @param <T> the entity type
  * @param <K> the id entity type
  */
-public interface HazelcastRepository<T, K> extends PageableRepository<T, K> {
+public interface HazelcastRepository<T, K> extends NoSQLRepository<T, K> {
 }
diff --git a/...ongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookRepository.java b/...ongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/integration/BookRepository.java
@@ -14,9 +14,9 @@
  */
 package org.eclipse.jnosql.databases.mongodb.integration;
 
-import jakarta.data.repository.PageableRepository;
 import jakarta.data.repository.Repository;
+import org.eclipse.jnosql.mapping.NoSQLRepository;
 
 @Repository
-public interface BookRepository extends PageableRepository<Book, String> {
+public interface BookRepository extends NoSQLRepository<Book, String> {
 }
diff --git a/...acle/src/main/java/org/eclipse/jnosql/databases/oracle/mapping/OracleNoSQLRepository.java b/...acle/src/main/java/org/eclipse/jnosql/databases/oracle/mapping/OracleNoSQLRepository.java
@@ -15,10 +15,10 @@
 package org.eclipse.jnosql.databases.oracle.mapping;
 
 
-import jakarta.data.repository.PageableRepository;
+import org.eclipse.jnosql.mapping.NoSQLRepository;
 
 /**
- * The {@code OracleRepository} is an extension of {@link PageableRepository} specific to Oracle NoSQL database.
+ * The {@code OracleRepository} is an extension of {@link NoSQLRepository} specific to Oracle NoSQL database.
  * It provides CRUD (Create, Read, Update, Delete) operations for entities in the Oracle NoSQL database
  * and supports pagination and sorting through its parent interface.
  * <p>
@@ -44,8 +44,8 @@
  * @param <T> the entity type managed by this repository
  * @param <K> the type of the entity's primary key
  *
- * @see PageableRepository
+ * @see NoSQLRepository
  * @see SQL
  */
-public interface OracleNoSQLRepository<T, K> extends PageableRepository<T, K> {
+public interface OracleNoSQLRepository<T, K> extends NoSQLRepository<T, K> {
 }
diff --git a/.../main/java/org/eclipse/jnosql/databases/orientdb/communication/OrientDBDocumentQuery.java b/.../main/java/org/eclipse/jnosql/databases/orientdb/communication/OrientDBDocumentQuery.java
@@ -52,7 +52,7 @@ public Optional<DocumentCondition> condition() {
     }
 
     @Override
-    public List<Sort> sorts() {
+    public List<Sort<?>> sorts() {
         return Collections.emptyList();
     }
 

diff --git a/...src/main/java/org/eclipse/jnosql/databases/orientdb/communication/QueryOSQLConverter.java b/...src/main/java/org/eclipse/jnosql/databases/orientdb/communication/QueryOSQLConverter.java
@@ -150,10 +150,10 @@ private static void appendCondition(StringBuilder query, List<Object> params,
         }
     }
 
-    private static void appendSort(List<Sort> sorts, StringBuilder query) {
+    private static void appendSort(List<Sort<?>> sorts, StringBuilder query) {
         query.append(SORT);
         String separator = SPACE;
-        for (Sort sort : sorts) {
+        for (Sort<?> sort : sorts) {
             query.append(separator)
                     .append(sort.property())
                     .append(SPACE)

diff --git a/...b/src/main/java/org/eclipse/jnosql/databases/orientdb/mapping/OrientDBCrudRepository.java b/...b/src/main/java/org/eclipse/jnosql/databases/orientdb/mapping/OrientDBCrudRepository.java
@@ -15,13 +15,13 @@
 package org.eclipse.jnosql.databases.orientdb.mapping;
 
 
-import jakarta.data.repository.PageableRepository;
+import org.eclipse.jnosql.mapping.NoSQLRepository;
 
 /**
- * The OrientDB {@link PageableRepository}
+ * The OrientDB {@link NoSQLRepository}
  *
  * @param <T>  the entity type
  * @param <K> the entity id type
  */
-public interface OrientDBCrudRepository<T, K> extends PageableRepository<T, K> {
+public interface OrientDBCrudRepository<T, K> extends NoSQLRepository<T, K> {
 }
diff --git a/...db/src/main/java/org/eclipse/jnosql/databases/ravendb/communication/RavenDeleteQuery.java b/...db/src/main/java/org/eclipse/jnosql/databases/ravendb/communication/RavenDeleteQuery.java
@@ -55,7 +55,7 @@ public Optional<DocumentCondition> condition() {
     }
 
     @Override
-    public List<Sort> sorts() {
+    public List<Sort<?>> sorts() {
         return Collections.emptyList();
     }
 

diff --git a/jnosql-solr/src/main/java/org/eclipse/jnosql/databases/solr/mapping/SolrRepository.java b/jnosql-solr/src/main/java/org/eclipse/jnosql/databases/solr/mapping/SolrRepository.java
@@ -15,12 +15,12 @@
 package org.eclipse.jnosql.databases.solr.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 SolrRepository<T, K> extends PageableRepository<T, K> {
+public interface SolrRepository<T, K> extends NoSQLRepository<T, K> {
 }