Use Range class from spring-data-commons.

Original Pull Request #2137
Closes #2098

Author: sothawo

src/main/java/org/springframework/data/elasticsearch/core/Range.java

@@ -25,7 +25,9 @@
  *
  * @author Sascha Woo
  * @since 4.3
+ * @deprecated use {org.springframework.data.domain.Range} instead.
  */
+@Deprecated(since = "5.0", forRemoval = true)
 public class Range<T> {
 
 	private final static Range<?> UNBOUNDED = Range.of(Bound.unbounded(), Bound.UNBOUNDED);
@@ -58,7 +60,7 @@ public static <T> Range<T> closed(T from, T to) {
 	 * @param <T>
 	 * @param value must not be {@literal null}.
 	 * @return
-	 * @see Range#closed(Object, Object) 
+	 * @see Range#closed(Object, Object)
 	 */
 	public static <T> Range<T> just(T value) {
 		return Range.closed(value, value);
@@ -231,8 +233,8 @@ public String toString() {
 	}
 
 	/**
-	 * Value object representing a boundary. A boundary can either be {@link #unbounded() unbounded}, {@link #inclusive(Object)} 
-	 * including its value} or {@link #exclusive(Object)}  its value}.
+	 * Value object representing a boundary. A boundary can either be {@link #unbounded() unbounded},
+	 * {@link #inclusive(Object)} including its value} or {@link #exclusive(Object)} its value}.
 	 */
 	public static final class Bound<T> {
 

src/main/java/org/springframework/data/elasticsearch/core/convert/AbstractRangePropertyValueConverter.java

@@ -18,7 +18,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.springframework.data.elasticsearch.core.Range;
+import org.springframework.data.domain.Range;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.util.Assert;
 
@@ -44,6 +44,7 @@ public Object read(Object value) {
 		Assert.isInstanceOf(Map.class, value, "value must be instance of Map.");
 
 		try {
+			// noinspection unchecked
 			Map<String, Object> source = (Map<String, Object>) value;
 			Range.Bound<T> lowerBound;
 			Range.Bound<T> upperBound;
@@ -82,12 +83,13 @@ public Object write(Object value) {
 		}
 
 		try {
+			// noinspection unchecked
 			Range<T> range = (Range<T>) value;
 			Range.Bound<T> lowerBound = range.getLowerBound();
 			Range.Bound<T> upperBound = range.getUpperBound();
 			Map<String, Object> target = new LinkedHashMap<>();
 
-			if (lowerBound.isBounded()) {
+			if (lowerBound.getValue().isPresent()) {
 				String lowerBoundValue = format(lowerBound.getValue().get());
 				if (lowerBound.isInclusive()) {
 					target.put(GTE_FIELD, lowerBoundValue);
@@ -96,7 +98,7 @@ public Object write(Object value) {
 				}
 			}
 
-			if (upperBound.isBounded()) {
+			if (upperBound.getValue().isPresent()) {
 				String upperBoundValue = format(upperBound.getValue().get());
 				if (upperBound.isInclusive()) {
 					target.put(LTE_FIELD, upperBoundValue);

src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentProperty.java

@@ -24,14 +24,14 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeanUtils;
+import org.springframework.data.domain.Range;
 import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.annotations.GeoPointField;
 import org.springframework.data.elasticsearch.annotations.GeoShapeField;
 import org.springframework.data.elasticsearch.annotations.MultiField;
 import org.springframework.data.elasticsearch.annotations.ValueConverter;
-import org.springframework.data.elasticsearch.core.Range;
 import org.springframework.data.elasticsearch.core.convert.DatePropertyValueConverter;
 import org.springframework.data.elasticsearch.core.convert.DateRangePropertyValueConverter;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchDateConverter;

src/test/java/org/springframework/data/elasticsearch/core/RangeUnitTests.java

@@ -26,6 +26,7 @@
  * @author Sascha Woo
  * @since 4.3
  */
+@Deprecated(since = "5.0", forRemoval = true)
 public class RangeUnitTests {
 
 	@Test

src/test/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverterUnitTests.java

@@ -48,12 +48,12 @@
 import org.springframework.data.annotation.TypeAlias;
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.convert.WritingConverter;
+import org.springframework.data.domain.Range;
 import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.annotations.GeoPointField;
 import org.springframework.data.elasticsearch.annotations.ValueConverter;
-import org.springframework.data.elasticsearch.core.Range;
 import org.springframework.data.elasticsearch.core.document.Document;
 import org.springframework.data.elasticsearch.core.geo.GeoJsonEntity;
 import org.springframework.data.elasticsearch.core.geo.GeoJsonGeometryCollection;

src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderUnitTests.java

@@ -40,9 +40,9 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Transient;
+import org.springframework.data.domain.Range;
 import org.springframework.data.elasticsearch.annotations.*;
 import org.springframework.data.elasticsearch.core.MappingContextBaseTests;
-import org.springframework.data.elasticsearch.core.Range;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm;
@@ -167,7 +167,7 @@ void shouldBuildMappingsForGeoTypes() throws JSONException {
 				"      \"coerce\": true\n" + //
 				"    }\n" + //
 				"  }\n" + //
-				"}\n}"; //
+				"}\n"; //
 
 		// when
 		String mapping;