DATAMONGO-980 - Use meta annotations from commons for @Score.

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>1.6.0.BUILD-SNAPSHOT</version>
+	<version>1.6.0.DATAMONGO-980-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
@@ -29,7 +29,7 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>1.9.0.BUILD-SNAPSHOT</springdata.commons>
+		<springdata.commons>1.9.0.DATACMNS-534-SNAPSHOT</springdata.commons>
 		<mongo>2.12.1</mongo>
 		<mongo.osgi>2.12.1</mongo.osgi>
 	</properties>

spring-data-mongodb-cross-store/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.6.0.BUILD-SNAPSHOT</version>
+		<version>1.6.0.DATAMONGO-980-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
-			<version>1.6.0.BUILD-SNAPSHOT</version>
+			<version>1.6.0.DATAMONGO-980-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

spring-data-mongodb-distribution/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.6.0.BUILD-SNAPSHOT</version>
+		<version>1.6.0.DATAMONGO-980-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-log4j/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.6.0.BUILD-SNAPSHOT</version>
+		<version>1.6.0.DATAMONGO-980-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.6.0.BUILD-SNAPSHOT</version>
+		<version>1.6.0.DATAMONGO-980-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java

@@ -385,7 +385,7 @@ protected void writeInternal(Object obj, final DBObject dbo, MongoPersistentEnti
 		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
 			public void doWithPersistentProperty(MongoPersistentProperty prop) {
 
-				if (prop.equals(idProperty) || prop.isCalculatedProperty()) {
+				if (prop.equals(idProperty) || !prop.shallBePersisted()) {
 					return;
 				}
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java

@@ -201,13 +201,4 @@ public boolean isLanguageProperty() {
 	public boolean isTextScoreProperty() {
 		return isAnnotationPresent(TextScore.class);
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isCalculatedProperty()
-	 */
-	@Override
-	public boolean isCalculatedProperty() {
-		return isAnnotationPresent(Calculated.class);
-	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentProperty.java

@@ -78,15 +78,6 @@ public interface MongoPersistentProperty extends PersistentProperty<MongoPersist
 	 */
 	boolean isTextScoreProperty();
 
-	/**
-	 * Returns wheter the property is calculated eiter internally or on the server and therefore must not be written when
-	 * saved.
-	 * 
-	 * @return
-	 * @since 1.6
-	 */
-	boolean isCalculatedProperty();
-
 	/**
 	 * Returns the {@link DBRef} if the property is a reference.
 	 * 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/TextScore.java

@@ -21,6 +21,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.springframework.data.annotation.ReadOnlyProperty;
+
 /**
  * {@link TextScore} marks the property to be considered as the on server calculated {@literal textScore} when doing
  * full text search. <br />
@@ -29,7 +31,7 @@
  * @author Christoph Strobl
  * @since 1.6
  */
-@Calculated
+@ReadOnlyProperty
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentPropertyUnitTests.java

@@ -173,7 +173,7 @@ public void shouldDetectTextScoreAsCalculatedProperty() {
 				ClassTypeInformation.from(DocumentWithTextScoreProperty.class));
 
 		MongoPersistentProperty property = getPropertyFor(persistentEntity, "score");
-		assertThat(property.isCalculatedProperty(), is(true));
+		assertThat(property.isReadOnly(), is(true));
 	}
 
 	private MongoPersistentProperty getPropertyFor(Field field) {

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoPersistentEntityTestDummy.java

@@ -214,4 +214,10 @@ public MongoPersistentEntityTestDummy<T> build() {
 	public String getLanguage() {
 		return null;
 	}
+
+	@Override
+	public void doWithWritingProperties(PropertyHandler<MongoPersistentProperty> handler) {
+		doWithProperties(handler);
+	}
+
 }