Skip to content

Commit cef4da0

Browse files
committed
feat: update couchbase api
Signed-off-by: Otavio Santana <[email protected]>
1 parent df849c0 commit cef4da0

File tree

8 files changed

+23
-11
lines changed

8 files changed

+23
-11
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import jakarta.enterprise.event.Observes;
1818
import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
1919
import jakarta.enterprise.inject.spi.Extension;
20-
import org.eclipse.jnosql.mapping.reflection.ClassScanner;
20+
import org.eclipse.jnosql.mapping.metadata.ClassScanner;
2121

2222
import java.util.Set;
2323
import java.util.logging.Logger;
@@ -28,7 +28,7 @@ public class CouchbaseExtension implements Extension {
2828

2929

3030
void onAfterBeanDiscovery(@Observes final AfterBeanDiscovery afterBeanDiscovery) {
31-
ClassScanner scanner = ClassScanner.INSTANCE;
31+
ClassScanner scanner = ClassScanner.load();
3232
Set<Class<?>> crudTypes = scanner.repositories(CouchbaseRepository.class);
3333
LOGGER.info("Starting the onAfterBeanDiscovery with elements number: " + crudTypes.size());
3434

jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/CouchbaseDocumentRepositoryIntegrationTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
import org.eclipse.jnosql.mapping.Convert;
2525
import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
2626
import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
27-
import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
27+
import org.eclipse.jnosql.mapping.reflection.Reflections;
28+
import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
2829
import org.jboss.weld.junit5.auto.AddExtensions;
2930
import org.jboss.weld.junit5.auto.AddPackages;
3031
import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -47,6 +48,7 @@
4748
@AddPackages(value = {Convert.class, DocumentEntityConverter.class})
4849
@AddPackages(Book.class)
4950
@AddPackages(CouchbaseTemplate.class)
51+
@AddPackages(Reflections.class)
5052
@AddExtensions({EntityMetadataExtension.class,
5153
DocumentExtension.class,
5254
CouchbaseExtension.class})

jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/CouchbaseTemplateIntegrationTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
import org.eclipse.jnosql.mapping.Convert;
2424
import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
2525
import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
26-
import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
26+
import org.eclipse.jnosql.mapping.reflection.Reflections;
27+
import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
2728
import org.jboss.weld.junit5.auto.AddExtensions;
2829
import org.jboss.weld.junit5.auto.AddPackages;
2930
import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -48,6 +49,7 @@
4849
@AddPackages(CouchbaseTemplate.class)
4950
@AddExtensions({EntityMetadataExtension.class,
5051
DocumentExtension.class})
52+
@AddPackages(Reflections.class)
5153
@EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
5254
class CouchbaseTemplateIntegrationTest {
5355

jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/DocumentTemplateIntegrationTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
import org.eclipse.jnosql.mapping.Convert;
2222
import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
2323
import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
24-
import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
24+
import org.eclipse.jnosql.mapping.reflection.Reflections;
25+
import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
2526
import org.jboss.weld.junit5.auto.AddExtensions;
2627
import org.jboss.weld.junit5.auto.AddPackages;
2728
import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -40,6 +41,7 @@
4041
@EnableAutoWeld
4142
@AddPackages(value = {Convert.class, DocumentEntityConverter.class})
4243
@AddPackages(Book.class)
44+
@AddPackages(Reflections.class)
4345
@AddExtensions({EntityMetadataExtension.class,
4446
DocumentExtension.class})
4547
@EnabledIfSystemProperty(named = NAMED, matches = MATCHES)

jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/integration/TemplateIntegrationTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
import org.eclipse.jnosql.mapping.Convert;
2323
import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
2424
import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
25-
import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
25+
import org.eclipse.jnosql.mapping.reflection.Reflections;
26+
import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
2627
import org.jboss.weld.junit5.auto.AddExtensions;
2728
import org.jboss.weld.junit5.auto.AddPackages;
2829
import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -43,6 +44,7 @@
4344
@AddPackages(Book.class)
4445
@AddExtensions({EntityMetadataExtension.class,
4546
DocumentExtension.class})
47+
@AddPackages(Reflections.class)
4648
@EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
4749
class TemplateIntegrationTest {
4850

jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseDocumentRepositoryProxyTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
import org.eclipse.jnosql.mapping.document.query.DocumentRepositoryProducer;
2222
import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
2323
import org.eclipse.jnosql.mapping.keyvalue.AbstractKeyValueTemplate;
24-
import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
24+
import org.eclipse.jnosql.mapping.reflection.Reflections;
25+
import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
2526
import org.jboss.weld.junit5.auto.AddExtensions;
2627
import org.jboss.weld.junit5.auto.AddPackages;
2728
import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -44,6 +45,7 @@
4445
@AddPackages(value = {Converters.class, AbstractKeyValueTemplate.class,
4546
DocumentEntityConverter.class, N1QL.class})
4647
@AddPackages(MockProducer.class)
48+
@AddPackages(Reflections.class)
4749
@AddExtensions({EntityMetadataExtension.class,
4850
DocumentExtension.class, CouchbaseExtension.class})
4951
public class CouchbaseDocumentRepositoryProxyTest {

jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/CouchbaseExtensionTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
package org.eclipse.jnosql.databases.couchbase.mapping;
1616

1717
import jakarta.inject.Inject;
18-
import org.eclipse.jnosql.mapping.Convert;
1918
import org.eclipse.jnosql.mapping.Converters;
2019
import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
2120
import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
2221
import org.eclipse.jnosql.mapping.keyvalue.AbstractKeyValueTemplate;
23-
import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
22+
import org.eclipse.jnosql.mapping.reflection.Reflections;
23+
import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
2424
import org.jboss.weld.junit5.auto.AddExtensions;
2525
import org.jboss.weld.junit5.auto.AddPackages;
2626
import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -33,6 +33,7 @@
3333
@AddPackages(MockProducer.class)
3434
@AddExtensions({EntityMetadataExtension.class,
3535
DocumentExtension.class, CouchbaseExtension.class})
36+
@AddPackages(Reflections.class)
3637
public class CouchbaseExtensionTest {
3738
@Inject
3839
private PersonRepository repository;

jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/mapping/DefaultCouchbaseTemplateTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
import org.eclipse.jnosql.databases.couchbase.communication.CouchbaseDocumentManager;
2121
import org.eclipse.jnosql.communication.document.Document;
2222
import org.eclipse.jnosql.communication.document.DocumentEntity;
23-
import org.eclipse.jnosql.mapping.Convert;
2423
import org.eclipse.jnosql.mapping.Converters;
2524
import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
2625
import org.eclipse.jnosql.mapping.document.DocumentEventPersistManager;
2726
import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
2827
import org.eclipse.jnosql.mapping.keyvalue.AbstractKeyValueTemplate;
2928
import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
30-
import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
29+
import org.eclipse.jnosql.mapping.reflection.Reflections;
30+
import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
3131
import org.jboss.weld.junit5.auto.AddExtensions;
3232
import org.jboss.weld.junit5.auto.AddPackages;
3333
import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -42,6 +42,7 @@
4242
@AddPackages(value = {Converters.class, AbstractKeyValueTemplate.class,
4343
DocumentEntityConverter.class, N1QL.class})
4444
@AddPackages(MockProducer.class)
45+
@AddPackages(Reflections.class)
4546
@AddExtensions({EntityMetadataExtension.class,
4647
DocumentExtension.class, CouchbaseExtension.class})
4748
public class DefaultCouchbaseTemplateTest {

0 commit comments

Comments
 (0)