DATACMNS-469 - Removed deprecations.

src/main/java/org/springframework/data/mapping/PersistentProperty.java

@@ -147,13 +147,6 @@ public interface PersistentProperty<P extends PersistentProperty<P>> {
 	 */
 	boolean isTransient();
 
-	/**
-	 * @return
-	 * @deprecated use {@link #isWritable()} instead, will be removed in 1.9 RC1.
-	 */
-	@Deprecated
-	boolean shallBePersisted();
-
 	/**
 	 * Returns whether the current property is writable, i.e. if the value held for it shall be written to the data store.
 	 * 

src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java

@@ -77,6 +77,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getOwner()
 	 */
+	@Override
 	public PersistentEntity<?, P> getOwner() {
 		return owner;
 	}
@@ -85,6 +86,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getName()
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -93,6 +95,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getType()
 	 */
+	@Override
 	public Class<?> getType() {
 		return information.getType();
 	}
@@ -101,6 +104,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getRawType()
 	 */
+	@Override
 	public Class<?> getRawType() {
 		return this.rawType;
 	}
@@ -109,6 +113,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getTypeInformation()
 	 */
+	@Override
 	public TypeInformation<?> getTypeInformation() {
 		return information;
 	}
@@ -117,6 +122,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getPersistentEntityType()
 	 */
+	@Override
 	public Iterable<? extends TypeInformation<?>> getPersistentEntityType() {
 
 		List<TypeInformation<?>> result = new ArrayList<TypeInformation<?>>();
@@ -142,6 +148,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getGetter()
 	 */
+	@Override
 	public Method getGetter() {
 
 		if (propertyDescriptor == null) {
@@ -161,6 +168,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getSetter()
 	 */
+	@Override
 	public Method getSetter() {
 
 		if (propertyDescriptor == null) {
@@ -180,6 +188,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getField()
 	 */
+	@Override
 	public Field getField() {
 		return field;
 	}
@@ -188,6 +197,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getSpelExpression()
 	 */
+	@Override
 	public String getSpelExpression() {
 		return null;
 	}
@@ -196,19 +206,11 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#isTransient()
 	 */
+	@Override
 	public boolean isTransient() {
 		return false;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.PersistentProperty#shallBePersisted()
-	 */
-	@Override
-	public boolean shallBePersisted() {
-		return isWritable();
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#isWritable()
@@ -222,6 +224,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#isAssociation()
 	 */
+	@Override
 	public boolean isAssociation() {
 		return field == null ? false : AnnotationUtils.getAnnotation(field, Reference.class) != null;
 	}
@@ -230,6 +233,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getAssociation()
 	 */
+	@Override
 	public Association<P> getAssociation() {
 		return association;
 	}
@@ -238,6 +242,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#isCollectionLike()
 	 */
+	@Override
 	public boolean isCollectionLike() {
 		return information.isCollectionLike();
 	}
@@ -246,6 +251,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#isMap()
 	 */
+	@Override
 	public boolean isMap() {
 		return Map.class.isAssignableFrom(getType());
 	}
@@ -254,6 +260,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#isArray()
 	 */
+	@Override
 	public boolean isArray() {
 		return getType().isArray();
 	}
@@ -262,6 +269,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#isEntity()
 	 */
+	@Override
 	public boolean isEntity() {
 
 		TypeInformation<?> actualType = information.getActualType();
@@ -273,6 +281,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getComponentType()
 	 */
+	@Override
 	public Class<?> getComponentType() {
 
 		if (!isMap() && !isCollectionLike()) {
@@ -287,6 +296,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getMapValueType()
 	 */
+	@Override
 	public Class<?> getMapValueType() {
 		return isMap() ? information.getMapValueType().getType() : null;
 	}

src/main/java/org/springframework/data/mapping/model/MappingInstantiationException.java

@@ -37,18 +37,6 @@ public class MappingInstantiationException extends RuntimeException {
 	private final Constructor<?> constructor;
 	private final List<Object> constructorArguments;
 
-	/**
-	 * Creates a {@link MappingInstantiationException} using the given message and cause.
-	 * 
-	 * @deprecated use {@link #MappingInstantiationException(PersistentEntity, List, String, Exception)} instead.
-	 * @param message
-	 * @param cause
-	 */
-	@Deprecated
-	public MappingInstantiationException(String message, Exception cause) {
-		this(null, null, message, cause);
-	}
-
 	/**
 	 * Creates a new {@link MappingInstantiationException} for the given {@link PersistentEntity}, constructor arguments
 	 * and the causing exception.