diff --git a/src/main/java/org/springframework/data/gemfire/mapping/GemfireMappingContext.java b/src/main/java/org/springframework/data/gemfire/mapping/GemfireMappingContext.java index 3aec796d..63e43ebf 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/GemfireMappingContext.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/GemfireMappingContext.java @@ -16,9 +16,6 @@ package org.springframework.data.gemfire.mapping; -import java.beans.PropertyDescriptor; -import java.lang.reflect.Field; - import org.springframework.data.gemfire.mapping.model.GemfireSimpleTypeHolder; import org.springframework.data.mapping.context.AbstractMappingContext; import org.springframework.data.mapping.model.MutablePersistentEntity; @@ -67,14 +64,4 @@ public class GemfireMappingContext extends AbstractMappingContext owner, SimpleTypeHolder simpleTypeHolder) { - - return new GemfirePersistentProperty(field, propertyDescriptor, owner, simpleTypeHolder); - } } diff --git a/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentProperty.java b/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentProperty.java index 6f6b7e93..08f33975 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentProperty.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/GemfirePersistentProperty.java @@ -16,15 +16,11 @@ package org.springframework.data.gemfire.mapping; -import static org.springframework.data.gemfire.util.CollectionUtils.asSet; +import static org.springframework.data.gemfire.util.CollectionUtils.*; -import java.beans.PropertyDescriptor; -import java.lang.reflect.Field; -import java.util.Optional; import java.util.Set; import org.springframework.data.annotation.Id; -import org.springframework.data.gemfire.mapping.model.GemfireSimpleTypeHolder; import org.springframework.data.mapping.Association; import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.PersistentProperty; @@ -41,41 +37,6 @@ public class GemfirePersistentProperty extends AnnotationBasedPersistentProperty protected static final Set SUPPORTED_IDENTIFIER_NAMES = asSet("id"); - /* (non-Javadoc) */ - private static Property newProperty(Field field, PropertyDescriptor propertyDescriptor) { - return Optional.ofNullable(field) - .map((theField) -> Property.of(theField, Optional.ofNullable(propertyDescriptor))) - .orElseGet(() -> Property.of(propertyDescriptor)); - } - - /* (non-Javadoc) */ - private static SimpleTypeHolder resolveSimpleTypeHolder(SimpleTypeHolder source) { - return (source instanceof GemfireSimpleTypeHolder ? source - : (source != null ? new GemfireSimpleTypeHolder(source) : new GemfireSimpleTypeHolder())); - } - - /** - * Constructs an instance of {@link GemfirePersistentProperty} initialized with entity persistent property - * information (meta-data). - * - * @param field {@link GemfirePersistentEntity entity} {@link Field} for the persistent property. - * @param propertyDescriptor {@link PropertyDescriptor} for the {@link GemfirePersistentEntity entity's} - * persistent property. - * @param owner {@link GemfirePersistentEntity entity} owning the persistent property. - * @param simpleTypeHolder {@link SimpleTypeHolder} used to handle primitive types. - * @see #GemfirePersistentProperty(Property, PersistentEntity, SimpleTypeHolder) - * @see #newProperty(Field, PropertyDescriptor) - * @see org.springframework.data.mapping.PersistentEntity - * @see org.springframework.data.mapping.PersistentProperty - * @see org.springframework.data.mapping.model.SimpleTypeHolder - * @see java.beans.PropertyDescriptor - * @see java.lang.reflect.Field - */ - public GemfirePersistentProperty(Field field, PropertyDescriptor propertyDescriptor, - PersistentEntity owner, SimpleTypeHolder simpleTypeHolder) { - - this(newProperty(field, propertyDescriptor), owner, resolveSimpleTypeHolder(simpleTypeHolder)); - } /** * Constructs an instance of {@link GemfirePersistentProperty} initialized with entity persistent property @@ -92,7 +53,6 @@ public class GemfirePersistentProperty extends AnnotationBasedPersistentProperty */ public GemfirePersistentProperty(Property property, PersistentEntity owner, SimpleTypeHolder simpleTypeHolder) { - super(property, owner, simpleTypeHolder); }