From 9fea1365acb35093ca4f858f307ca2d338f3c85b Mon Sep 17 00:00:00 2001
From: Peter-Josef Meisch <pj.meisch@sothawo.com>
Date: Sat, 4 Jan 2020 22:19:01 +0100
Subject: [PATCH] DATAES-718 - Deprecate @Score and scoreProperty.

original PR: #374
---
 .../data/elasticsearch/annotations/Score.java              | 7 ++++++-
 .../core/mapping/ElasticsearchPersistentEntity.java        | 4 ++++
 .../core/mapping/ElasticsearchPersistentProperty.java      | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/elasticsearch/annotations/Score.java b/src/main/java/org/springframework/data/elasticsearch/annotations/Score.java
index 1696626c6..f5cd57a21 100644
--- a/src/main/java/org/springframework/data/elasticsearch/annotations/Score.java
+++ b/src/main/java/org/springframework/data/elasticsearch/annotations/Score.java
@@ -8,16 +8,21 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import org.springframework.data.annotation.ReadOnlyProperty;
+import org.springframework.data.elasticsearch.core.SearchHit;
 
 /**
  * Specifies that this field is used for storing the document score.
  * 
  * @author Sascha Woo
+ * @author Peter-Josef Meisch
  * @since 3.1
+ * @deprecated since 4.0, use {@link SearchHit#getScore()} instead
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 @Documented
 @Inherited
 @ReadOnlyProperty
-public @interface Score {}
+@Deprecated
+public @interface Score {
+}
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentEntity.java b/src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentEntity.java
index 8b08f321b..6d2ab20cd 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentEntity.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentEntity.java
@@ -63,7 +63,9 @@ public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, El
 	 *
 	 * @return false when {@link ElasticsearchPersistentEntity} does not define a score property.
 	 * @since 3.1
+	 * @deprecated since 4.0
 	 */
+	@Deprecated
 	boolean hasScoreProperty();
 
 	/**
@@ -73,7 +75,9 @@ public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, El
 	 * @return the score {@link ElasticsearchPersistentProperty} of the {@link PersistentEntity} or {@literal null} if not
 	 *         defined.
 	 * @since 3.1
+	 * @deprecated since 4.0
 	 */
 	@Nullable
+	@Deprecated
 	ElasticsearchPersistentProperty getScoreProperty();
 }
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentProperty.java b/src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentProperty.java
index b442bbf8d..b65115784 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentProperty.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentProperty.java
@@ -16,6 +16,7 @@
 package org.springframework.data.elasticsearch.core.mapping;
 
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.elasticsearch.core.SearchHit;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.lang.Nullable;
 
@@ -46,7 +47,9 @@ public interface ElasticsearchPersistentProperty extends PersistentProperty<Elas
 	 *
 	 * @return
 	 * @since 3.1
+	 * @deprecated since 4.0, use {@link SearchHit#getScore()} instead
 	 */
+	@Deprecated
 	boolean isScoreProperty();
 
 	/**