feat: update reflection mode

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

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/...cast/src/main/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastExtension.java b/...cast/src/main/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastExtension.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;
@@ -29,7 +29,7 @@ public class HazelcastExtension implements Extension {
 
 
     void onAfterBeanDiscovery(@Observes final AfterBeanDiscovery afterBeanDiscovery) {
-        ClassScanner scanner = ClassScanner.INSTANCE;
+        ClassScanner scanner = ClassScanner.load();
         Set<Class<?>> crudTypes = scanner.repositories(HazelcastRepository.class);
         LOGGER.info("Starting the onAfterBeanDiscovery with elements number: " + crudTypes.size());
         crudTypes.forEach(type -> afterBeanDiscovery.addBean(new HazelcastRepositoryBean(type)));

diff --git a/.../org/eclipse/jnosql/databases/hazelcast/integration/HazelcastTemplateIntegrationTest.java b/.../org/eclipse/jnosql/databases/hazelcast/integration/HazelcastTemplateIntegrationTest.java
@@ -17,12 +17,12 @@
 
 import jakarta.inject.Inject;
 import org.eclipse.jnosql.databases.hazelcast.mapping.HazelcastTemplate;
-import org.eclipse.jnosql.mapping.Convert;
 import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.config.MappingConfigurations;
 import org.eclipse.jnosql.mapping.keyvalue.KeyValueEntityConverter;
 import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension;
-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;
@@ -37,6 +37,7 @@
 @AddPackages(value = {Converters.class, KeyValueEntityConverter.class})
 @AddPackages(Book.class)
 @AddPackages(HazelcastTemplate.class)
+@AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class,
         KeyValueExtension.class})
 class HazelcastTemplateIntegrationTest {

diff --git a/...a/org/eclipse/jnosql/databases/hazelcast/integration/KeyValueTemplateIntegrationTest.java b/...a/org/eclipse/jnosql/databases/hazelcast/integration/KeyValueTemplateIntegrationTest.java
@@ -18,12 +18,12 @@
 import jakarta.inject.Inject;
 import jakarta.nosql.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.databases.hazelcast.mapping.HazelcastTemplate;
-import org.eclipse.jnosql.mapping.Convert;
 import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.config.MappingConfigurations;
 import org.eclipse.jnosql.mapping.keyvalue.KeyValueEntityConverter;
 import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension;
-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;
@@ -37,6 +37,7 @@
 @EnableAutoWeld
 @AddPackages(value = {Converters.class, KeyValueEntityConverter.class})
 @AddPackages(Book.class)
+@AddPackages(Reflections.class)
 @AddPackages(HazelcastTemplate.class)
 @AddExtensions({EntityMetadataExtension.class,
         KeyValueExtension.class})

diff --git a/...est/java/org/eclipse/jnosql/databases/hazelcast/mapping/DefaultHazelcastTemplateTest.java b/...est/java/org/eclipse/jnosql/databases/hazelcast/mapping/DefaultHazelcastTemplateTest.java
@@ -15,11 +15,11 @@
 package org.eclipse.jnosql.databases.hazelcast.mapping;
 
 import jakarta.inject.Inject;
-import org.eclipse.jnosql.mapping.Convert;
 import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.keyvalue.AbstractKeyValueTemplate;
 import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension;
-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;
@@ -35,6 +35,7 @@
 @EnableAutoWeld
 @AddPackages(value = {Converters.class, AbstractKeyValueTemplate.class, Query.class})
 @AddPackages(MockProducer.class)
+@AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class,
         KeyValueExtension.class, HazelcastExtension.class})
 public class DefaultHazelcastTemplateTest {

diff --git a/.../src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastExtensionTest.java b/.../src/test/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastExtensionTest.java
@@ -15,11 +15,11 @@
 package org.eclipse.jnosql.databases.hazelcast.mapping;
 
 import jakarta.inject.Inject;
-import org.eclipse.jnosql.mapping.Convert;
 import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.keyvalue.AbstractKeyValueTemplate;
 import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension;
-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;
@@ -29,6 +29,7 @@
 @EnableAutoWeld
 @AddPackages(value = {Converters.class, AbstractKeyValueTemplate.class, Query.class})
 @AddPackages(MockProducer.class)
+@AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class,
         KeyValueExtension.class, HazelcastExtension.class})
 public class HazelcastExtensionTest {

diff --git a/...est/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastRepositoryProxyTest.java b/...est/java/org/eclipse/jnosql/databases/hazelcast/mapping/HazelcastRepositoryProxyTest.java
@@ -15,11 +15,11 @@
 package org.eclipse.jnosql.databases.hazelcast.mapping;
 
 import jakarta.data.repository.PageableRepository;
-import org.eclipse.jnosql.mapping.Convert;
 import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.keyvalue.AbstractKeyValueTemplate;
 import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension;
-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;
@@ -49,6 +49,7 @@
 @EnableAutoWeld
 @AddPackages(value = {Converters.class, AbstractKeyValueTemplate.class, Query.class})
 @AddPackages(MockProducer.class)
+@AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class,
         KeyValueExtension.class, HazelcastExtension.class})
 @ExtendWith(MockitoExtension.class)