Skip to content

Commit 566a68d

Browse files
otaviojavaotaviojava
authored
Merge pull request #236 from eclipse/reflection-module
Update the API based on the Metadata core updates
2 parents dd2cc12 + b6e8c7c commit 566a68d

File tree

48 files changed

+138
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+138
-83
lines changed

‎jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBExtension.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 ArangoDBExtension implements Extension {
2828

2929
void onAfterBeanDiscovery(@Observes final AfterBeanDiscovery afterBeanDiscovery) {
3030

31-
ClassScanner scanner = ClassScanner.INSTANCE;
31+
ClassScanner scanner = ClassScanner.load();
3232
Set<Class<?>> crudTypes = scanner.repositories(ArangoDBRepository.class);
3333

3434
LOGGER.info("Starting the onAfterBeanDiscovery with elements number: " + crudTypes.size());

‎jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBTemplateIntegrationTest.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.config.MappingConfigurations;
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(ArangoDBTemplate.class)
4445
@AddExtensions({EntityMetadataExtension.class,
4546
DocumentExtension.class})
47+
@AddPackages(Reflections.class)
4648
@EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
4749
class ArangoDBTemplateIntegrationTest {
4850

‎jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/TemplateIntegrationTest.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.config.MappingConfigurations;
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;
@@ -42,6 +43,7 @@
4243
@AddPackages(Book.class)
4344
@AddExtensions({EntityMetadataExtension.class,
4445
DocumentExtension.class})
46+
@AddPackages(Reflections.class)
4547
@EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
4648
class TemplateIntegrationTest {
4749

‎jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBDocumentRepositoryProxyTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
package org.eclipse.jnosql.databases.arangodb.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.query.DocumentRepositoryProducer;
2221
import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
2322
import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension;
24-
import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
23+
import org.eclipse.jnosql.mapping.reflection.Reflections;
24+
import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
2525
import org.jboss.weld.junit5.auto.AddExtensions;
2626
import org.jboss.weld.junit5.auto.AddPackages;
2727
import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -46,6 +46,7 @@
4646
@EnableAutoWeld
4747
@AddPackages(value = {Converters.class, DocumentEntityConverter.class, AQL.class})
4848
@AddPackages(MockProducer.class)
49+
@AddPackages(Reflections.class)
4950
@AddExtensions({EntityMetadataExtension.class, KeyValueExtension.class,
5051
DocumentExtension.class, ArangoDBExtension.class})
5152
public class ArangoDBDocumentRepositoryProxyTest {

‎jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBExtensionTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
import org.eclipse.jnosql.mapping.Convert;
1919
import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
2020
import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension;
21-
import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
21+
import org.eclipse.jnosql.mapping.reflection.Reflections;
22+
import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
2223
import org.jboss.weld.junit5.auto.AddExtensions;
2324
import org.jboss.weld.junit5.auto.AddPackages;
2425
import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -30,6 +31,7 @@
3031
@EnableAutoWeld
3132
@AddPackages(value = {Convert.class})
3233
@AddPackages(MockProducer.class)
34+
@AddPackages(Reflections.class)
3335
@AddExtensions({EntityMetadataExtension.class, KeyValueExtension.class,
3436
DocumentExtension.class, ArangoDBExtension.class})
3537
@ExtendWith(MockitoExtension.class)

‎jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/DefaultArangoDBTemplateTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@
1919
import org.eclipse.jnosql.databases.arangodb.communication.ArangoDBDocumentManager;
2020
import org.eclipse.jnosql.communication.document.Document;
2121
import org.eclipse.jnosql.communication.document.DocumentEntity;
22-
import org.eclipse.jnosql.mapping.Convert;
2322
import org.eclipse.jnosql.mapping.Converters;
2423
import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
2524
import org.eclipse.jnosql.mapping.document.DocumentEventPersistManager;
2625
import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
27-
import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension;
2826
import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
29-
import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
27+
import org.eclipse.jnosql.mapping.reflection.Reflections;
28+
import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
3029
import org.jboss.weld.junit5.auto.AddExtensions;
3130
import org.jboss.weld.junit5.auto.AddPackages;
3231
import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -47,6 +46,7 @@
4746
@AddPackages(MockProducer.class)
4847
@AddExtensions({EntityMetadataExtension.class, DocumentExtension.class, ArangoDBExtension.class})
4948
@ExtendWith(MockitoExtension.class)
49+
@AddPackages(Reflections.class)
5050
public class DefaultArangoDBTemplateTest {
5151

5252
@Inject

‎jnosql-cassandra/src/main/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraExtension.java‎

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

2323
import java.util.Set;
2424
import java.util.logging.Logger;
@@ -29,7 +29,7 @@ public class CassandraExtension implements Extension {
2929

3030
void onAfterBeanDiscovery(@Observes final AfterBeanDiscovery afterBeanDiscovery) {
3131

32-
ClassScanner scanner = ClassScanner.INSTANCE;
32+
ClassScanner scanner = ClassScanner.load();
3333
Set<Class<?>> crudTypes = scanner.repositories(CassandraRepository.class);
3434

3535
LOGGER.info("Starting the onAfterBeanDiscovery with elements number: " + crudTypes.size());

‎jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/CassandraTemplateIntegrationTest.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.column.ColumnEntityConverter;
2525
import org.eclipse.jnosql.mapping.column.spi.ColumnExtension;
2626
import org.eclipse.jnosql.mapping.config.MappingConfigurations;
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;
@@ -46,6 +47,7 @@
4647
@AddPackages(CassandraTemplate.class)
4748
@AddExtensions({EntityMetadataExtension.class,
4849
ColumnExtension.class})
50+
@AddPackages(Reflections.class)
4951
@EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
5052
class CassandraTemplateIntegrationTest {
5153

‎jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/integration/TemplateIntegrationTest.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.column.ColumnEntityConverter;
2525
import org.eclipse.jnosql.mapping.column.spi.ColumnExtension;
2626
import org.eclipse.jnosql.mapping.config.MappingConfigurations;
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;
@@ -45,6 +46,7 @@
4546
@AddPackages(Book.class)
4647
@AddExtensions({EntityMetadataExtension.class,
4748
ColumnExtension.class})
49+
@AddPackages(Reflections.class)
4850
@EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
4951
class TemplateIntegrationTest {
5052

‎jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraColumnEntityConverterTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
import org.eclipse.jnosql.databases.cassandra.mapping.model.Money;
3131
import org.eclipse.jnosql.databases.cassandra.mapping.model.Movie;
3232
import org.eclipse.jnosql.databases.cassandra.mapping.model.Worker;
33-
import org.eclipse.jnosql.mapping.Convert;
3433
import org.eclipse.jnosql.mapping.Converters;
3534
import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate;
3635
import org.eclipse.jnosql.mapping.column.spi.ColumnExtension;
37-
import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
36+
import org.eclipse.jnosql.mapping.reflection.Reflections;
37+
import org.eclipse.jnosql.mapping.spi.EntityMetadataExtension;
3838
import org.jboss.weld.junit5.auto.AddExtensions;
3939
import org.jboss.weld.junit5.auto.AddPackages;
4040
import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -66,6 +66,7 @@
6666
@AddPackages(value = {Converters.class, JNoSQLColumnTemplate.class,
6767
CQL.class})
6868
@AddPackages(MockProducer.class)
69+
@AddPackages(Reflections.class)
6970
@AddExtensions({EntityMetadataExtension.class,
7071
ColumnExtension.class, CassandraExtension.class})
7172
public class CassandraColumnEntityConverterTest {

0 commit comments

Comments
 (0)