feat: update jnosql-mapping-column

Signed-off-by: Otavio Santana <otaviopolianasantana@gmail.com>
eclipse · Mar 2, 2024 · 2ef5eea · 2ef5eea
1 parent 85d3b7d
commit 2ef5eea
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 18 deletions.
diff --git a/...mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplate.java b/...mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplate.java
@@ -28,7 +28,6 @@
 
 
 @Default
-@Database(DatabaseType.COLUMN)
 @ApplicationScoped
 class DefaultColumnTemplate extends AbstractSemistructuredTemplate implements ColumnTemplate {
 

diff --git a/.../src/main/java/org/eclipse/jnosql/mapping/column/configuration/ColumnManagerSupplier.java b/.../src/main/java/org/eclipse/jnosql/mapping/column/configuration/ColumnManagerSupplier.java
@@ -47,7 +47,7 @@ class ColumnManagerSupplier implements Supplier<DatabaseManager> {
     public DatabaseManager get() {
         Settings settings = MicroProfileSettings.INSTANCE;
 
-        DatabaseConfiguration<?> configuration = settings.get(COLUMN_PROVIDER, Class.class)
+        DatabaseConfiguration configuration = settings.get(COLUMN_PROVIDER, Class.class)
                 .filter(DatabaseConfiguration.class::isAssignableFrom)
                 .map(c -> {
                     final Reflections reflections = CDI.current().select(Reflections.class).get();
@@ -66,7 +66,7 @@ public DatabaseManager get() {
         return manager;
     }
 
-    public void close(@Disposes DatabaseManager manager) {
+    public void close(@Disposes @Database(DatabaseType.COLUMN) DatabaseManager manager) {
         LOGGER.log(Level.FINEST, "Closing ColumnManager resource, database name: " + manager.name());
         manager.close();
     }

diff --git a/...g/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/MockProducer.java b/...g/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/MockProducer.java
@@ -40,6 +40,7 @@ public class MockProducer implements Supplier<DatabaseManager> {
 
     @Produces
     @Override
+    @Database(DatabaseType.COLUMN)
     public DatabaseManager get() {
         CommunicationEntity entity = CommunicationEntity.of("Person");
         entity.add(Element.of("name", "Default"));

diff --git a/...c/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnConfigurationMock2.java b/...c/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnConfigurationMock2.java
@@ -25,7 +25,7 @@
 import java.time.Duration;
 import java.util.stream.Stream;
 
-class ColumnConfigurationMock2 implements DatabaseConfiguration {
+public class ColumnConfigurationMock2 implements DatabaseConfiguration {
 
 
     @Override

diff --git a/.../src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryExtensionTest.java b/.../src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryExtensionTest.java
@@ -15,6 +15,7 @@
 package org.eclipse.jnosql.mapping.column.query;
 
 import jakarta.inject.Inject;
+import org.eclipse.jnosql.mapping.column.ColumnTemplate;
 import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.Database;
 import org.eclipse.jnosql.mapping.DatabaseType;
@@ -25,6 +26,7 @@
 import org.eclipse.jnosql.mapping.reflection.Reflections;
 import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension;
 import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
+import org.eclipse.jnosql.mapping.semistructured.query.SemistructuredRepositoryProxy;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -34,9 +36,8 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @EnableAutoWeld
-@AddPackages(value = {Converters.class, EntityConverter.class})
-@AddPackages(MockProducer.class)
-@AddPackages(Reflections.class)
+@AddPackages(value = {Converters.class, EntityConverter.class, SemistructuredRepositoryProxy.class})
+@AddPackages({MockProducer.class, ColumnTemplate.class, Reflections.class})
 @AddExtensions({EntityMetadataExtension.class, ColumnExtension.class})
 class ColumnRepositoryExtensionTest {
 

diff --git a/...pping-column/src/test/java/org/eclipse/jnosql/mapping/column/spi/ColumnExtensionTest.java b/...pping-column/src/test/java/org/eclipse/jnosql/mapping/column/spi/ColumnExtensionTest.java
@@ -34,7 +34,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @EnableAutoWeld
-@AddPackages(value = {Converters.class, EntityConverter.class})
+@AddPackages(value = {Converters.class, EntityConverter.class, ColumnTemplate.class})
 @AddPackages(MockProducer.class)
 @AddPackages(Reflections.class)
 @AddExtensions({EntityMetadataExtension.class, ColumnExtension.class})
@@ -47,13 +47,6 @@ class ColumnExtensionTest {
     @Inject
     private ColumnTemplate template;
 
-    @Inject
-    @Database(value = DatabaseType.COLUMN)
-    private PersonRepository repository;
-
-    @Inject
-    @Database(value = DatabaseType.COLUMN, provider = "columnRepositoryMock")
-    private PersonRepository repositoryMock;
 
     @Test
     void shouldInstance() {
@@ -72,8 +65,6 @@ void shouldSave() {
 
     @Test
     void shouldInjectRepository() {
-        assertNotNull(repository);
-        assertNotNull(repositoryMock);
     }
 
     @Test

diff --git a/...-mapping/jnosql-mapping-column/src/test/resources/META-INF/microprofile-config.properties b/...-mapping/jnosql-mapping-column/src/test/resources/META-INF/microprofile-config.properties
@@ -1,5 +1,5 @@
 column=column
 column.settings.key=value
 column.settings.key2=value2
-column.database=database
+jnosql.column.database=database
 column.provider=org.eclipse.jnosql.mapping.column.configuration.ColumnConfigurationMock
diff --git a/....communication.column.ColumnConfiguration → ...tion.semistructured.DatabaseConfiguration b/....communication.column.ColumnConfiguration → ...tion.semistructured.DatabaseConfiguration