From fa0ada7a29ed316ed61257f8aa8004382a6c9651 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Wed, 16 Nov 2022 21:46:06 +0000 Subject: [PATCH] Update the api Signed-off-by: Otavio Santana --- ...ilyManagerSupplier.java => ColumnManagerSupplier.java} | 2 +- .../communication/driver/column/ColumnManagerTest.java | 8 ++++---- .../driver-tck-column/src/main/java/module-info.java | 3 ++- ...nManagerSupplier.java => DocumentManagerSupplier.java} | 2 +- .../driver/document/DocumentManagerTest.java | 8 ++++---- .../driver-tck-document/src/main/java/module-info.java | 3 ++- 6 files changed, 14 insertions(+), 12 deletions(-) rename tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/{ColumnFamilyManagerSupplier.java => ColumnManagerSupplier.java} (91%) rename tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/{DocumentCollectionManagerSupplier.java => DocumentManagerSupplier.java} (90%) diff --git a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnFamilyManagerSupplier.java b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnManagerSupplier.java similarity index 91% rename from tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnFamilyManagerSupplier.java rename to tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnManagerSupplier.java index 8cb94c267..2296c83c0 100644 --- a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnFamilyManagerSupplier.java +++ b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnManagerSupplier.java @@ -19,5 +19,5 @@ import java.util.function.Supplier; -public interface ColumnFamilyManagerSupplier extends Supplier { +public interface ColumnManagerSupplier extends Supplier { } diff --git a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnManagerTest.java b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnManagerTest.java index 634803349..0fdb28694 100644 --- a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnManagerTest.java +++ b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnManagerTest.java @@ -47,7 +47,7 @@ public class ColumnManagerTest { @BeforeEach public void setUp() { Module module = ColumnManagerTest.class.getModule(); - module.addUses(ColumnFamilyManagerSupplier.class); + module.addUses(ColumnManagerSupplier.class); } @ParameterizedTest @ColumnSource("column.properties") @@ -314,9 +314,9 @@ private ColumnManager getManager(ColumnArgument argument) { } private ColumnManager getManager() { - final ColumnFamilyManagerSupplier supplier = ServiceLoaderProvider - .get(ColumnFamilyManagerSupplier.class, - ()-> ServiceLoader.load(ColumnFamilyManagerSupplier.class)); + final ColumnManagerSupplier supplier = ServiceLoaderProvider + .get(ColumnManagerSupplier.class, + ()-> ServiceLoader.load(ColumnManagerSupplier.class)); return supplier.get(); } diff --git a/tck/driver-tck/driver-tck-column/src/main/java/module-info.java b/tck/driver-tck/driver-tck-column/src/main/java/module-info.java index d9b63c360..9e281eee2 100644 --- a/tck/driver-tck/driver-tck-column/src/main/java/module-info.java +++ b/tck/driver-tck/driver-tck-column/src/main/java/module-info.java @@ -1,3 +1,4 @@ + /* * Copyright (c) 2022 Contributors to the Eclipse Foundation * @@ -19,5 +20,5 @@ requires java.logging; requires jakarta.nosql.communication.core; exports jakarta.nosql.tck.communication.driver.column; - uses jakarta.nosql.tck.communication.driver.column.ColumnFamilyManagerSupplier; + uses jakarta.nosql.tck.communication.driver.column.ColumnManagerSupplier; } \ No newline at end of file diff --git a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentCollectionManagerSupplier.java b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentManagerSupplier.java similarity index 90% rename from tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentCollectionManagerSupplier.java rename to tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentManagerSupplier.java index 932421772..9b9f298a4 100644 --- a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentCollectionManagerSupplier.java +++ b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentManagerSupplier.java @@ -19,5 +19,5 @@ import java.util.function.Supplier; -public interface DocumentCollectionManagerSupplier extends Supplier { +public interface DocumentManagerSupplier extends Supplier { } diff --git a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentManagerTest.java b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentManagerTest.java index 90e09e79e..376573e34 100644 --- a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentManagerTest.java +++ b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentManagerTest.java @@ -47,7 +47,7 @@ public class DocumentManagerTest { @BeforeEach public void setUp() { Module module = DocumentManagerTest.class.getModule(); - module.addUses(DocumentCollectionManagerSupplier.class); + module.addUses(DocumentManagerSupplier.class); } @ParameterizedTest @DocumentSource("document.properties") @@ -315,9 +315,9 @@ private DocumentManager getManager(DocumentArgument argument) { } private DocumentManager getManager() { - final DocumentCollectionManagerSupplier supplier = ServiceLoaderProvider - .get(DocumentCollectionManagerSupplier.class, - ()-> ServiceLoader.load(DocumentCollectionManagerSupplier.class)); + final DocumentManagerSupplier supplier = ServiceLoaderProvider + .get(DocumentManagerSupplier.class, + ()-> ServiceLoader.load(DocumentManagerSupplier.class)); return supplier.get(); } diff --git a/tck/driver-tck/driver-tck-document/src/main/java/module-info.java b/tck/driver-tck/driver-tck-document/src/main/java/module-info.java index 2fec6bf1e..86d85d117 100644 --- a/tck/driver-tck/driver-tck-document/src/main/java/module-info.java +++ b/tck/driver-tck/driver-tck-document/src/main/java/module-info.java @@ -1,3 +1,4 @@ + /* * Copyright (c) 2022 Contributors to the Eclipse Foundation * @@ -20,5 +21,5 @@ requires java.logging; requires jakarta.nosql.communication.core; exports jakarta.nosql.tck.communication.driver.document; - uses jakarta.nosql.tck.communication.driver.document.DocumentCollectionManagerSupplier; + uses jakarta.nosql.tck.communication.driver.document.DocumentManagerSupplier; } \ No newline at end of file