Skip to content

Commit

Permalink
refact: update metadata api
Browse files Browse the repository at this point in the history
Signed-off-by: Otavio Santana <otaviopolianasantana@gmail.com>
  • Loading branch information
otaviojava committed Jul 30, 2023
1 parent b1a2c43 commit e126fcd
Show file tree
Hide file tree
Showing 34 changed files with 54 additions and 53 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.eclipse.jnosql.mapping.reflection.FieldMetadata;
import org.eclipse.jnosql.mapping.reflection.FieldValue;
import org.eclipse.jnosql.mapping.reflection.InheritanceMetadata;
import org.eclipse.jnosql.mapping.reflection.MappingType;
import org.eclipse.jnosql.mapping.metadata.MappingType;
import org.eclipse.jnosql.mapping.reflection.ParameterMetaData;

import java.util.Collections;
Expand All @@ -36,8 +36,8 @@
import java.util.function.Predicate;

import static java.util.Objects.requireNonNull;
import static org.eclipse.jnosql.mapping.reflection.MappingType.EMBEDDED;
import static org.eclipse.jnosql.mapping.reflection.MappingType.ENTITY;
import static org.eclipse.jnosql.mapping.metadata.MappingType.EMBEDDED;
import static org.eclipse.jnosql.mapping.metadata.MappingType.ENTITY;


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.eclipse.jnosql.communication.column.Column;
import org.eclipse.jnosql.mapping.Converters;
import org.eclipse.jnosql.mapping.reflection.FieldMetadata;
import org.eclipse.jnosql.mapping.reflection.MappingType;
import org.eclipse.jnosql.mapping.metadata.MappingType;
import org.eclipse.jnosql.mapping.reflection.FieldValue;
import org.eclipse.jnosql.mapping.reflection.DefaultFieldValue;
import org.eclipse.jnosql.mapping.reflection.GenericFieldMetadata;
Expand All @@ -27,10 +27,10 @@
import java.util.List;
import java.util.Optional;

import static org.eclipse.jnosql.mapping.reflection.MappingType.COLLECTION;
import static org.eclipse.jnosql.mapping.metadata.MappingType.COLLECTION;

import static org.eclipse.jnosql.mapping.reflection.MappingType.EMBEDDED;
import static org.eclipse.jnosql.mapping.reflection.MappingType.ENTITY;
import static org.eclipse.jnosql.mapping.metadata.MappingType.EMBEDDED;
import static org.eclipse.jnosql.mapping.metadata.MappingType.ENTITY;
import static java.util.Collections.singletonList;

final class DefaultColumnFieldValue implements ColumnFieldValue {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.eclipse.jnosql.mapping.reflection.EntityMetadata;
import org.eclipse.jnosql.mapping.reflection.FieldMetadata;
import org.eclipse.jnosql.mapping.reflection.GenericFieldMetadata;
import org.eclipse.jnosql.mapping.reflection.MappingType;
import org.eclipse.jnosql.mapping.metadata.MappingType;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
*
* Otavio Santana
*/
package org.eclipse.jnosql.mapping.reflection;
package org.eclipse.jnosql.mapping.metadata;

import org.eclipse.jnosql.mapping.reflection.GenericFieldMetadata;

import java.util.Collection;
import java.util.function.Predicate;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* Otavio Santana
*/
package org.eclipse.jnosql.mapping.reflection;
package org.eclipse.jnosql.mapping.metadata;

import jakarta.nosql.Entity;
import org.eclipse.jnosql.mapping.Embeddable;
Expand All @@ -28,20 +28,6 @@
public enum MappingType {
EMBEDDED, MAP, COLLECTION, DEFAULT, ENTITY;

/**
* select you the kind of annotation on field and then define a enum type, follow the sequences:
* <ul>
* <li>Collection</li>
* <li>Map</li>
* <li>embedded</li>
* </ul>.
*
* @param field - the field with annotation
* @return the type
*/
static MappingType of(Field field) {
return MappingType.of(field.getType());
}

/**
* select you the kind of annotation on field and then define a enum type, follow the sequences:
Expand All @@ -51,14 +37,10 @@ static MappingType of(Field field) {
* <li>embedded</li>
* </ul>.
*
* @param parameter - the parameter with annotation
* @param type - the type
* @return the type
*/
static MappingType of(Parameter parameter) {
return MappingType.of(parameter.getType());
}

private static MappingType of(Class<?> type) {
public static MappingType of(Class<?> type) {
if (Collection.class.isAssignableFrom(type)) {
return MappingType.COLLECTION;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import org.eclipse.jnosql.communication.Value;
import org.eclipse.jnosql.mapping.AttributeConverter;
import org.eclipse.jnosql.mapping.metadata.MappingType;

import java.lang.reflect.Field;
import java.util.Objects;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.eclipse.jnosql.mapping.Convert;
import org.eclipse.jnosql.mapping.metadata.MappingType;

import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
Expand Down Expand Up @@ -171,7 +172,7 @@ private String appendPrefix(String prefix, String field) {


private FieldMetadata to(Field field) {
MappingType mappingType = MappingType.of(field);
MappingType mappingType = MappingType.of(field.getType());
reflections.makeAccessible(field);
Convert convert = field.getAnnotation(Convert.class);
boolean id = reflections.isIdField(field);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@


import org.eclipse.jnosql.mapping.AttributeConverter;
import org.eclipse.jnosql.mapping.metadata.MappingType;

import java.lang.reflect.Field;
import java.util.Objects;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package org.eclipse.jnosql.mapping.reflection;

import org.eclipse.jnosql.mapping.AttributeConverter;
import org.eclipse.jnosql.mapping.metadata.MappingType;

import java.util.Objects;
import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
*/
package org.eclipse.jnosql.mapping.reflection;

import org.eclipse.jnosql.mapping.metadata.MappingType;

import java.lang.reflect.Field;
import java.util.Objects;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import org.eclipse.jnosql.communication.TypeSupplier;
import org.eclipse.jnosql.mapping.AttributeConverter;
import org.eclipse.jnosql.mapping.metadata.MappingType;

import java.lang.reflect.Field;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import jakarta.nosql.Id;
import org.eclipse.jnosql.communication.Value;
import org.eclipse.jnosql.mapping.AttributeConverter;
import org.eclipse.jnosql.mapping.metadata.MappingType;

import java.util.Optional;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import org.eclipse.jnosql.communication.Value;
import org.eclipse.jnosql.mapping.AttributeConverter;
import org.eclipse.jnosql.mapping.Embeddable;
import org.eclipse.jnosql.mapping.metadata.CollectionSupplier;
import org.eclipse.jnosql.mapping.metadata.MappingType;

import java.lang.reflect.Field;
import java.lang.reflect.ParameterizedType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

import org.eclipse.jnosql.communication.TypeSupplier;
import org.eclipse.jnosql.mapping.AttributeConverter;
import org.eclipse.jnosql.mapping.metadata.CollectionSupplier;
import org.eclipse.jnosql.mapping.metadata.MappingType;

import java.lang.reflect.ParameterizedType;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import jakarta.nosql.Column;
import jakarta.nosql.Id;
import org.eclipse.jnosql.mapping.AttributeConverter;
import org.eclipse.jnosql.mapping.metadata.MappingType;

import java.util.Optional;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import jakarta.nosql.Column;
import jakarta.nosql.Id;
import org.eclipse.jnosql.mapping.Convert;
import org.eclipse.jnosql.mapping.metadata.MappingType;

import java.lang.reflect.Parameter;
import java.util.Objects;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
package org.eclipse.jnosql.mapping.reflection.collection;

import org.eclipse.jnosql.mapping.reflection.CollectionSupplier;
import org.eclipse.jnosql.mapping.metadata.CollectionSupplier;

import java.util.Deque;
import java.util.LinkedList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
package org.eclipse.jnosql.mapping.reflection.collection;

import org.eclipse.jnosql.mapping.reflection.CollectionSupplier;
import org.eclipse.jnosql.mapping.metadata.CollectionSupplier;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
package org.eclipse.jnosql.mapping.reflection.collection;

import org.eclipse.jnosql.mapping.reflection.CollectionSupplier;
import org.eclipse.jnosql.mapping.metadata.CollectionSupplier;

import java.util.HashSet;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
package org.eclipse.jnosql.mapping.reflection.collection;

import org.eclipse.jnosql.mapping.reflection.CollectionSupplier;
import org.eclipse.jnosql.mapping.metadata.CollectionSupplier;

import java.util.NavigableSet;
import java.util.SortedSet;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import jakarta.inject.Inject;
import org.eclipse.jnosql.mapping.Convert;
import org.eclipse.jnosql.mapping.VetedConverter;
import org.eclipse.jnosql.mapping.metadata.MappingType;
import org.eclipse.jnosql.mapping.test.entities.Actor;
import org.eclipse.jnosql.mapping.test.entities.Director;
import org.eclipse.jnosql.mapping.test.entities.Machine;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
import java.util.List;
import java.util.Map;

import static org.eclipse.jnosql.mapping.reflection.MappingType.COLLECTION;
import static org.eclipse.jnosql.mapping.reflection.MappingType.DEFAULT;
import static org.eclipse.jnosql.mapping.reflection.MappingType.EMBEDDED;
import static org.eclipse.jnosql.mapping.reflection.MappingType.MAP;
import static org.eclipse.jnosql.mapping.metadata.MappingType.COLLECTION;
import static org.eclipse.jnosql.mapping.metadata.MappingType.DEFAULT;
import static org.eclipse.jnosql.mapping.metadata.MappingType.EMBEDDED;
import static org.eclipse.jnosql.mapping.metadata.MappingType.MAP;
import static org.junit.jupiter.api.Assertions.assertEquals;

@EnableAutoWeld
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import jakarta.nosql.Column;
import org.eclipse.jnosql.mapping.Embeddable;
import org.eclipse.jnosql.mapping.metadata.MappingType;
import org.eclipse.jnosql.mapping.test.entities.Actor;
import org.eclipse.jnosql.mapping.test.entities.Address;
import org.eclipse.jnosql.mapping.test.entities.Movie;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.eclipse.jnosql.communication.TypeSupplier;
import org.eclipse.jnosql.mapping.AttributeConverter;
import jakarta.nosql.Column;
import org.eclipse.jnosql.mapping.metadata.MappingType;
import org.eclipse.jnosql.mapping.test.entities.Animal;
import org.eclipse.jnosql.mapping.test.entities.Money;
import org.eclipse.jnosql.mapping.test.entities.MoneyConverter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
package org.eclipse.jnosql.mapping.reflection.collection;

import org.eclipse.jnosql.mapping.reflection.CollectionSupplier;
import org.eclipse.jnosql.mapping.metadata.CollectionSupplier;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
package org.eclipse.jnosql.mapping.reflection.collection;

import org.eclipse.jnosql.mapping.reflection.CollectionSupplier;
import org.eclipse.jnosql.mapping.metadata.CollectionSupplier;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
package org.eclipse.jnosql.mapping.reflection.collection;

import org.eclipse.jnosql.mapping.reflection.CollectionSupplier;
import org.eclipse.jnosql.mapping.metadata.CollectionSupplier;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
package org.eclipse.jnosql.mapping.reflection.collection;

import org.eclipse.jnosql.mapping.reflection.CollectionSupplier;
import org.eclipse.jnosql.mapping.metadata.CollectionSupplier;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.eclipse.jnosql.mapping.AttributeConverter;
import org.eclipse.jnosql.mapping.Converters;
import org.eclipse.jnosql.mapping.reflection.FieldMetadata;
import org.eclipse.jnosql.mapping.reflection.MappingType;
import org.eclipse.jnosql.mapping.metadata.MappingType;
import org.eclipse.jnosql.mapping.reflection.FieldValue;
import org.eclipse.jnosql.mapping.reflection.DefaultFieldValue;
import org.eclipse.jnosql.mapping.reflection.GenericFieldMetadata;
Expand All @@ -27,9 +27,9 @@
import java.util.List;
import java.util.Optional;

import static org.eclipse.jnosql.mapping.reflection.MappingType.COLLECTION;
import static org.eclipse.jnosql.mapping.reflection.MappingType.EMBEDDED;
import static org.eclipse.jnosql.mapping.reflection.MappingType.ENTITY;
import static org.eclipse.jnosql.mapping.metadata.MappingType.COLLECTION;
import static org.eclipse.jnosql.mapping.metadata.MappingType.EMBEDDED;
import static org.eclipse.jnosql.mapping.metadata.MappingType.ENTITY;
import static java.util.Collections.singletonList;

final class DefaultDocumentFieldValue implements DocumentFieldValue {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.eclipse.jnosql.mapping.reflection.FieldMetadata;
import org.eclipse.jnosql.mapping.reflection.FieldValue;
import org.eclipse.jnosql.mapping.reflection.InheritanceMetadata;
import org.eclipse.jnosql.mapping.reflection.MappingType;
import org.eclipse.jnosql.mapping.metadata.MappingType;
import org.eclipse.jnosql.mapping.reflection.ParameterMetaData;

import java.util.Collections;
Expand All @@ -36,8 +36,8 @@
import java.util.function.Predicate;

import static java.util.Objects.requireNonNull;
import static org.eclipse.jnosql.mapping.reflection.MappingType.EMBEDDED;
import static org.eclipse.jnosql.mapping.reflection.MappingType.ENTITY;
import static org.eclipse.jnosql.mapping.metadata.MappingType.EMBEDDED;
import static org.eclipse.jnosql.mapping.metadata.MappingType.ENTITY;

/**
* This interface represents the converter between an entity and the {@link DocumentEntity}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.eclipse.jnosql.mapping.reflection.EntityMetadata;
import org.eclipse.jnosql.mapping.reflection.FieldMetadata;
import org.eclipse.jnosql.mapping.reflection.GenericFieldMetadata;
import org.eclipse.jnosql.mapping.reflection.MappingType;
import org.eclipse.jnosql.mapping.metadata.MappingType;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import java.util.function.Predicate;
import java.util.function.Supplier;

import static org.eclipse.jnosql.mapping.reflection.MappingType.EMBEDDED;
import static org.eclipse.jnosql.mapping.metadata.MappingType.EMBEDDED;

final class EntityConverterByField<T> implements Supplier<T> {
private final List<Property<?>> elements;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.util.Optional;

import static java.util.Collections.singletonList;
import static org.eclipse.jnosql.mapping.reflection.MappingType.EMBEDDED;
import static org.eclipse.jnosql.mapping.metadata.MappingType.EMBEDDED;

final class FieldGraph {

Expand Down

0 comments on commit e126fcd

Please sign in to comment.