feat: update couchbase api

Signed-off-by: Otavio Santana <otaviopolianasantana@gmail.com>
eclipse · Aug 9, 2023 · cef4da0 · cef4da0
1 parent df849c0
commit cef4da0
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 11 deletions.
diff --git a/...base/src/main/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseExtension.java b/...base/src/main/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseExtension.java
@@ -17,7 +17,7 @@
 import jakarta.enterprise.event.Observes;
 import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
 import jakarta.enterprise.inject.spi.Extension;
-import org.eclipse.jnosql.mapping.reflection.ClassScanner;
+import org.eclipse.jnosql.mapping.metadata.ClassScanner;
 
 import java.util.Set;
 import java.util.logging.Logger;
@@ -28,7 +28,7 @@ public class CouchbaseExtension implements Extension {
 
 
     void onAfterBeanDiscovery(@Observes final AfterBeanDiscovery afterBeanDiscovery) {
-        ClassScanner scanner = ClassScanner.INSTANCE;
+        ClassScanner scanner = ClassScanner.load();
         Set<Class<?>> crudTypes = scanner.repositories(CouchbaseRepository.class);
         LOGGER.info("Starting the onAfterBeanDiscovery with elements number: " + crudTypes.size());
 

diff --git a/...se/jnosql/databases/couchbase/integration/CouchbaseDocumentRepositoryIntegrationTest.java b/...se/jnosql/databases/couchbase/integration/CouchbaseDocumentRepositoryIntegrationTest.java
@@ -24,7 +24,8 @@
 import org.eclipse.jnosql.mapping.Convert;
 import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
 import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
-import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
+import org.eclipse.jnosql.mapping.reflection.Reflections;
+import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -47,6 +48,7 @@
 @AddPackages(value = {Convert.class, DocumentEntityConverter.class})
 @AddPackages(Book.class)
 @AddPackages(CouchbaseTemplate.class)
+@AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class,
         DocumentExtension.class,
         CouchbaseExtension.class})

diff --git a/.../org/eclipse/jnosql/databases/couchbase/integration/CouchbaseTemplateIntegrationTest.java b/.../org/eclipse/jnosql/databases/couchbase/integration/CouchbaseTemplateIntegrationTest.java
@@ -23,7 +23,8 @@
 import org.eclipse.jnosql.mapping.Convert;
 import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
 import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
-import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
+import org.eclipse.jnosql.mapping.reflection.Reflections;
+import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -48,6 +49,7 @@
 @AddPackages(CouchbaseTemplate.class)
 @AddExtensions({EntityMetadataExtension.class,
         DocumentExtension.class})
+@AddPackages(Reflections.class)
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 class CouchbaseTemplateIntegrationTest {
 

diff --git a/...a/org/eclipse/jnosql/databases/couchbase/integration/DocumentTemplateIntegrationTest.java b/...a/org/eclipse/jnosql/databases/couchbase/integration/DocumentTemplateIntegrationTest.java
@@ -21,7 +21,8 @@
 import org.eclipse.jnosql.mapping.Convert;
 import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
 import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
-import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
+import org.eclipse.jnosql.mapping.reflection.Reflections;
+import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -40,6 +41,7 @@
 @EnableAutoWeld
 @AddPackages(value = {Convert.class, DocumentEntityConverter.class})
 @AddPackages(Book.class)
+@AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class,
         DocumentExtension.class})
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)

diff --git a/...test/java/org/eclipse/jnosql/databases/couchbase/integration/TemplateIntegrationTest.java b/...test/java/org/eclipse/jnosql/databases/couchbase/integration/TemplateIntegrationTest.java
@@ -22,7 +22,8 @@
 import org.eclipse.jnosql.mapping.Convert;
 import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
 import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
-import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
+import org.eclipse.jnosql.mapping.reflection.Reflections;
+import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -43,6 +44,7 @@
 @AddPackages(Book.class)
 @AddExtensions({EntityMetadataExtension.class,
         DocumentExtension.class})
+@AddPackages(Reflections.class)
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 class TemplateIntegrationTest {
 

diff --git a/.../org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseDocumentRepositoryProxyTest.java b/.../org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseDocumentRepositoryProxyTest.java
@@ -21,7 +21,8 @@
 import org.eclipse.jnosql.mapping.document.query.DocumentRepositoryProducer;
 import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
 import org.eclipse.jnosql.mapping.keyvalue.AbstractKeyValueTemplate;
-import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
+import org.eclipse.jnosql.mapping.reflection.Reflections;
+import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -44,6 +45,7 @@
 @AddPackages(value = {Converters.class, AbstractKeyValueTemplate.class,
         DocumentEntityConverter.class, N1QL.class})
 @AddPackages(MockProducer.class)
+@AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class,
         DocumentExtension.class, CouchbaseExtension.class})
 public class CouchbaseDocumentRepositoryProxyTest {

diff --git a/.../src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseExtensionTest.java b/.../src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseExtensionTest.java
@@ -15,12 +15,12 @@
 package org.eclipse.jnosql.databases.couchbase.mapping;
 
 import jakarta.inject.Inject;
-import org.eclipse.jnosql.mapping.Convert;
 import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
 import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
 import org.eclipse.jnosql.mapping.keyvalue.AbstractKeyValueTemplate;
-import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
+import org.eclipse.jnosql.mapping.reflection.Reflections;
+import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -33,6 +33,7 @@
 @AddPackages(MockProducer.class)
 @AddExtensions({EntityMetadataExtension.class,
         DocumentExtension.class, CouchbaseExtension.class})
+@AddPackages(Reflections.class)
 public class CouchbaseExtensionTest {
     @Inject
     private PersonRepository repository;

diff --git a/...est/java/org/eclipse/jnosql/databases/couchbase/mapping/DefaultCouchbaseTemplateTest.java b/...est/java/org/eclipse/jnosql/databases/couchbase/mapping/DefaultCouchbaseTemplateTest.java
@@ -20,14 +20,14 @@
 import org.eclipse.jnosql.databases.couchbase.communication.CouchbaseDocumentManager;
 import org.eclipse.jnosql.communication.document.Document;
 import org.eclipse.jnosql.communication.document.DocumentEntity;
-import org.eclipse.jnosql.mapping.Convert;
 import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
 import org.eclipse.jnosql.mapping.document.DocumentEventPersistManager;
 import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
 import org.eclipse.jnosql.mapping.keyvalue.AbstractKeyValueTemplate;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
-import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
+import org.eclipse.jnosql.mapping.reflection.Reflections;
+import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -42,6 +42,7 @@
 @AddPackages(value = {Converters.class, AbstractKeyValueTemplate.class,
         DocumentEntityConverter.class, N1QL.class})
 @AddPackages(MockProducer.class)
+@AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class,
         DocumentExtension.class, CouchbaseExtension.class})
 public class DefaultCouchbaseTemplateTest {