Update ServiceLoaderProvider API

Signed-off-by: Otavio Santana <otaviopolianasantana@gmail.com>
jakartaee · Jun 21, 2022 · 8151144 · 8151144
1 parent 01f90b3
commit 8151144
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/...ping/mapping-column/src/main/java/jakarta/nosql/mapping/column/ColumnQueryPagination.java b/...ping/mapping-column/src/main/java/jakarta/nosql/mapping/column/ColumnQueryPagination.java
@@ -20,6 +20,7 @@
 import jakarta.nosql.mapping.Pagination;
 import jakarta.nosql.mapping.Page;
 
+import java.util.ServiceLoader;
 import java.util.function.BiFunction;
 
 /**
@@ -52,7 +53,9 @@ public interface ColumnQueryPagination extends ColumnQuery {
      * @throws NullPointerException when there is null parameter
      */
     static ColumnQueryPagination of(ColumnQuery query, Pagination pagination) {
-        return ServiceLoaderProvider.get(ColumnQueryPaginationProvider.class).apply(query, pagination);
+        return ServiceLoaderProvider.get(ColumnQueryPaginationProvider.class,
+                ()-> ServiceLoader.load(ColumnQueryPaginationProvider.class))
+                .apply(query, pagination);
     }
 
     /**

diff --git a/api/mapping/mapping-core/src/main/java/jakarta/nosql/mapping/Pagination.java b/api/mapping/mapping-core/src/main/java/jakarta/nosql/mapping/Pagination.java
@@ -17,6 +17,7 @@
 
 import jakarta.nosql.ServiceLoaderProvider;
 
+import java.util.ServiceLoader;
 import java.util.function.Function;
 
 /**
@@ -74,7 +75,8 @@ public interface Pagination {
      * @throws IllegalArgumentException when page is lesser equals than zero
      */
     static PaginationBuilder page(long page) {
-        return ServiceLoaderProvider.get(PaginationBuilderProvider.class).apply(page);
+        return ServiceLoaderProvider.get(PaginationBuilderProvider.class,
+                ()-> ServiceLoader.load(PaginationBuilderProvider.class)).apply(page);
     }
 
     /**

diff --git a/api/mapping/mapping-core/src/main/java/jakarta/nosql/mapping/Sorts.java b/api/mapping/mapping-core/src/main/java/jakarta/nosql/mapping/Sorts.java
@@ -19,6 +19,7 @@
 import jakarta.nosql.Sort;
 
 import java.util.List;
+import java.util.ServiceLoader;
 import java.util.function.Supplier;
 
 /**
@@ -77,7 +78,9 @@ public interface Sorts {
      * @return a {@link Sorts} instance
      */
     static Sorts sorts() {
-        return ServiceLoaderProvider.get(SortsProvider.class).get();
+        return ServiceLoaderProvider.get(SortsProvider.class,
+                ()-> ServiceLoader.load(SortsProvider.class))
+                .get();
     }
 
     /**

diff --git a/...apping-document/src/main/java/jakarta/nosql/mapping/document/DocumentQueryPagination.java b/...apping-document/src/main/java/jakarta/nosql/mapping/document/DocumentQueryPagination.java
@@ -20,6 +20,7 @@
 import jakarta.nosql.mapping.Pagination;
 import jakarta.nosql.mapping.Page;
 
+import java.util.ServiceLoader;
 import java.util.function.BiFunction;
 
 /**
@@ -51,7 +52,9 @@ public interface DocumentQueryPagination extends DocumentQuery {
      * @throws NullPointerException when there is null parameter
      */
     static DocumentQueryPagination of(DocumentQuery query, Pagination pagination) {
-        return ServiceLoaderProvider.get(DocumentQueryPaginationProvider.class).apply(query, pagination);
+        return ServiceLoaderProvider.get(DocumentQueryPaginationProvider.class,
+                ()-> ServiceLoader.load(DocumentQueryPaginationProvider.class))
+                .apply(query, pagination);
     }