test: update Cassandra tests using the new api

Signed-off-by: Otavio Santana <[email protected]>

Author: otaviojava

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

@@ -23,8 +23,8 @@
 import org.eclipse.jnosql.mapping.column.ColumnEntityConverter;
 import org.eclipse.jnosql.mapping.column.ColumnFieldValue;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
-import org.eclipse.jnosql.mapping.reflection.FieldMapping;
-import org.eclipse.jnosql.mapping.reflection.GenericFieldMapping;
+import org.eclipse.jnosql.mapping.metadata.FieldMetadata;
+import org.eclipse.jnosql.mapping.metadata.GenericFieldMetadata;
 
 import java.util.Collection;
 import java.util.List;
@@ -56,10 +56,10 @@ protected Converters getConverters() {
     }
 
     @Override
-    protected <T> Consumer<String> feedObject(T instance, List<Column> columns, Map<String, FieldMapping> fieldsGroupByName) {
+    protected <T> Consumer<String> feedObject(T instance, List<Column> columns, Map<String, FieldMetadata> fieldsGroupByName) {
         return k -> {
-            FieldMapping field = fieldsGroupByName.get(k);
-            if (Objects.nonNull(field.nativeField().getAnnotation(UDT.class))) {
+            FieldMetadata field = fieldsGroupByName.get(k);
+            if (field.value(UDT.class).isPresent()) {
                 Optional<Column> column = columns.stream().filter(c -> c.name().equals(k)).findFirst();
                 setUDTField(instance, column, field);
             } else {
@@ -68,37 +68,34 @@ protected <T> Consumer<String> feedObject(T instance, List<Column> columns, Map<
         };
     }
 
-    private <T> void setUDTField(T instance, Optional<Column> column, FieldMapping field) {
+    private <T> void setUDTField(T instance, Optional<Column> column, FieldMetadata field) {
         if (column.isPresent() && org.eclipse.jnosql.databases.cassandra.communication.UDT.class.isInstance(column.get())) {
             org.eclipse.jnosql.databases.cassandra.communication.UDT udt =
                     org.eclipse.jnosql.databases.cassandra.communication.UDT.class.cast(column.get());
             Object columns = udt.get();
             if (StreamSupport.stream(Iterable.class.cast(columns).spliterator(), false)
                     .allMatch(Iterable.class::isInstance)) {
-                GenericFieldMapping genericField = GenericFieldMapping.class.cast(field);
-                Collection collection = genericField.getCollectionInstance();
+                GenericFieldMetadata genericField = GenericFieldMetadata.class.cast(field);
+                Collection collection = genericField.collectionInstance();
                 List<List<Column>> embeddable = (List<List<Column>>) columns;
                 for (List<Column> columnList : embeddable) {
-                    Object element = toEntity(genericField.getElementType(), columnList);
+                    Object element = toEntity(genericField.elementType(), columnList);
                     collection.add(element);
                 }
                 field.write(instance, collection);
             } else {
-                Object value = toEntity(field.nativeField().getType(), (List<Column>) columns);
+                Object value = toEntity(field.type(), (List<Column>) columns);
                 field.write(instance, value);
             }
         }
     }
 
     @Override
-    protected ColumnFieldValue to(FieldMapping field, Object entityInstance) {
+    protected ColumnFieldValue to(FieldMetadata field, Object entityInstance) {
 
         Object value = field.read(entityInstance);
-        UDT annotation = field.nativeField().getAnnotation(UDT.class);
-        if (Objects.isNull(annotation)) {
-            return super.to(field, entityInstance);
-        } else {
-            return new CassandraUDTType(annotation.value(), value, field);
-        }
+        Optional<String> annotation = field.value(UDT.class);
+        return annotation.<ColumnFieldValue>map(v -> new CassandraUDTType(v, value, field))
+                .orElseGet( () -> super.to(field, entityInstance));
     }
 }

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

@@ -18,7 +18,7 @@
 import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.column.ColumnEntityConverter;
 import org.eclipse.jnosql.mapping.column.ColumnFieldValue;
-import org.eclipse.jnosql.mapping.reflection.FieldMapping;
+import org.eclipse.jnosql.mapping.metadata.FieldMetadata;
 import org.eclipse.jnosql.databases.cassandra.communication.UDT;
 
 import java.util.ArrayList;
@@ -34,10 +34,10 @@ class CassandraUDTType implements ColumnFieldValue {
 
     private final Object value;
 
-    private final FieldMapping field;
+    private final FieldMetadata field;
 
 
-    CassandraUDTType(String type, Object value, FieldMapping field) {
+    CassandraUDTType(String type, Object value, FieldMetadata field) {
         this.value = value;
         this.type = type;
         this.field = Objects.requireNonNull(field, "field is required");
@@ -49,7 +49,7 @@ public Object value() {
     }
 
     @Override
-    public FieldMapping field() {
+    public FieldMetadata field() {
         return field;
     }
 

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

@@ -31,6 +31,7 @@
 import org.eclipse.jnosql.databases.cassandra.mapping.model.Movie;
 import org.eclipse.jnosql.databases.cassandra.mapping.model.Worker;
 import org.eclipse.jnosql.mapping.Convert;
+import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate;
 import org.eclipse.jnosql.mapping.column.spi.ColumnExtension;
 import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
@@ -62,7 +63,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnableAutoWeld
-@AddPackages(value = {Convert.class, JNoSQLColumnTemplate.class,
+@AddPackages(value = {Converters.class, JNoSQLColumnTemplate.class,
         CQL.class})
 @AddPackages(MockProducer.class)
 @AddExtensions({EntityMetadataExtension.class,

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

@@ -16,6 +16,7 @@
 
 import jakarta.inject.Inject;
 import org.eclipse.jnosql.mapping.Convert;
+import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate;
 import org.eclipse.jnosql.mapping.column.spi.ColumnExtension;
 import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
@@ -26,7 +27,7 @@
 import org.junit.jupiter.api.Test;
 
 @EnableAutoWeld
-@AddPackages(value = {Convert.class, JNoSQLColumnTemplate.class,
+@AddPackages(value = {Converters.class, JNoSQLColumnTemplate.class,
         CQL.class})
 @AddPackages(MockProducer.class)
 @AddExtensions({EntityMetadataExtension.class,

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

@@ -17,6 +17,7 @@
 import jakarta.inject.Inject;
 import org.eclipse.jnosql.communication.column.ColumnDeleteQuery;
 import org.eclipse.jnosql.mapping.Convert;
+import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate;
 import org.eclipse.jnosql.mapping.column.query.ColumnRepositoryProducer;
 import org.eclipse.jnosql.mapping.column.spi.ColumnExtension;
@@ -40,7 +41,7 @@
 import static org.mockito.Mockito.when;
 
 @EnableAutoWeld
-@AddPackages(value = {Convert.class, JNoSQLColumnTemplate.class,
+@AddPackages(value = {Converters.class, JNoSQLColumnTemplate.class,
         CQL.class})
 @AddPackages(MockProducer.class)
 @AddExtensions({EntityMetadataExtension.class,

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

@@ -55,7 +55,7 @@
 import static org.mockito.Mockito.when;
 
 @EnableAutoWeld
-@AddPackages(value = {Convert.class, ColumnEntityConverter.class,
+@AddPackages(value = {Converters.class, ColumnEntityConverter.class,
         CQL.class})
 @AddPackages(MockProducer.class)
 @AddExtensions({EntityMetadataExtension.class,