Merge pull request #234 from eclipse/update-api

Update based on 417

Author: otaviojava

README.adoc

@@ -60,7 +60,7 @@ Please note that you can establish properties using the https://microprofile.io/
 |The com.arangodb.Protocol as String
 
 |`jnosql.arangodb.connections.max`
-|The maximum number of connections the built in connection pool will open per host.
+|The maximum number of connections the built-in connection pool will open per host.
 
 |`jnosql.arangodb.acquire.host.list`
 |Set hosts split by comma

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/mapping/DefaultArangoDBTemplate.java

@@ -25,7 +25,8 @@
 import org.eclipse.jnosql.mapping.document.AbstractDocumentTemplate;
 import org.eclipse.jnosql.mapping.document.DocumentEntityConverter;
 import org.eclipse.jnosql.mapping.document.DocumentEventPersistManager;
-import org.eclipse.jnosql.mapping.reflection.EntitiesMetadata;
+import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
+
 
 import java.util.Map;
 import java.util.stream.Stream;

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBDocumentRepositoryProxyTest.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.document.DocumentEntityConverter;
 import org.eclipse.jnosql.mapping.document.query.DocumentRepositoryProducer;
 import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
@@ -43,7 +44,7 @@
 
 
 @EnableAutoWeld
-@AddPackages(value = {Convert.class, DocumentEntityConverter.class, AQL.class})
+@AddPackages(value = {Converters.class, DocumentEntityConverter.class, AQL.class})
 @AddPackages(MockProducer.class)
 @AddExtensions({EntityMetadataExtension.class, KeyValueExtension.class,
         DocumentExtension.class, ArangoDBExtension.class})

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

@@ -25,7 +25,7 @@
 import org.eclipse.jnosql.mapping.document.DocumentEventPersistManager;
 import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
 import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension;
-import org.eclipse.jnosql.mapping.reflection.EntitiesMetadata;
+import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 import org.eclipse.jnosql.mapping.reflection.EntityMetadataExtension;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
@@ -43,7 +43,7 @@
 
 
 @EnableAutoWeld
-@AddPackages(value = {Convert.class, DocumentEntityConverter.class, AQL.class})
+@AddPackages(value = {Converters.class, DocumentEntityConverter.class, AQL.class})
 @AddPackages(MockProducer.class)
 @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class, ArangoDBExtension.class})
 @ExtendWith(MockitoExtension.class)

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

@@ -22,14 +22,13 @@
 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.EntitiesMetadata;
-import org.eclipse.jnosql.mapping.reflection.FieldMapping;
-import org.eclipse.jnosql.mapping.reflection.GenericFieldMapping;
+import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
+import org.eclipse.jnosql.mapping.metadata.FieldMetadata;
+import org.eclipse.jnosql.mapping.metadata.GenericFieldMetadata;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.StreamSupport;
@@ -56,10 +55,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 +67,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/main/java/org/eclipse/jnosql/databases/cassandra/mapping/DefaultCassandraTemplate.java

@@ -31,7 +31,7 @@
 import org.eclipse.jnosql.mapping.column.AbstractColumnTemplate;
 import org.eclipse.jnosql.mapping.column.ColumnEntityConverter;
 import org.eclipse.jnosql.mapping.column.ColumnEventPersistManager;
-import org.eclipse.jnosql.mapping.reflection.EntitiesMetadata;
+import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 
 import java.time.Duration;
 import java.util.Map;

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,