Use pattern matching instead of type casting.

Author: junghoon-vans

src/main/java/org/springframework/data/elasticsearch/client/elc/CriteriaFilterProcessor.java

@@ -50,6 +50,7 @@
  * filter.
  *
  * @author Peter-Josef Meisch
+ * @author Junghoon Ban
  * @since 4.4
  */
 class CriteriaFilterProcessor {
@@ -169,7 +170,7 @@ private static ObjectBuilder<GeoDistanceQuery> withinQuery(String fieldName, Obj
 		Assert.isTrue(values[1] instanceof String || values[1] instanceof Distance,
 				"Second element of a geo distance filter must be a text or a Distance");
 
-		String dist = (values[1] instanceof Distance) ? extractDistanceString((Distance) values[1]) : (String) values[1];
+		String dist = (values[1] instanceof Distance distance) ? extractDistanceString(distance) : (String) values[1];
 
 		return QueryBuilders.geoDistance() //
 				.field(fieldName) //
@@ -178,8 +179,8 @@ private static ObjectBuilder<GeoDistanceQuery> withinQuery(String fieldName, Obj
 				.location(location -> {
 					if (values[0]instanceof GeoPoint loc) {
 						location.latlon(latlon -> latlon.lat(loc.getLat()).lon(loc.getLon()));
-					} else if (values[0] instanceof Point) {
-						GeoPoint loc = GeoPoint.fromPoint((Point) values[0]);
+					} else if (values[0] instanceof Point point) {
+						GeoPoint loc = GeoPoint.fromPoint(point);
 						location.latlon(latlon -> latlon.lat(loc.getLat()).lon(loc.getLon()));
 					} else {
 						String loc = (String) values[0];
@@ -220,8 +221,8 @@ private static void oneParameterBBox(GeoBoundingBoxQuery.Builder queryBuilder, O
 				"single-element of boundedBy filter must be type of GeoBox or Box");
 
 		GeoBox geoBBox;
-		if (value instanceof Box) {
-			geoBBox = GeoBox.fromBox((Box) value);
+		if (value instanceof Box box) {
+			geoBBox = GeoBox.fromBox(box);
 		} else {
 			geoBBox = (GeoBox) value;
 		}

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchExceptionTranslator.java

@@ -40,6 +40,7 @@
  * appropriate: any other exception may have resulted from user code, and should not be translated.
  *
  * @author Peter-Josef Meisch
+ * @author Junghoon Ban
  * @since 4.4
  */
 public class ElasticsearchExceptionTranslator implements PersistenceExceptionTranslator {
@@ -59,7 +60,7 @@ public ElasticsearchExceptionTranslator(JsonpMapper jsonpMapper) {
 	 */
 	public RuntimeException translateException(Throwable throwable) {
 
-		RuntimeException runtimeException = throwable instanceof RuntimeException ? (RuntimeException) throwable
+		RuntimeException runtimeException = throwable instanceof RuntimeException ex ? ex
 				: new RuntimeException(throwable.getMessage(), throwable);
 		RuntimeException potentiallyTranslatedException = translateExceptionIfPossible(runtimeException);
 

src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java

@@ -79,6 +79,7 @@
  *
  * @author Peter-Josef Meisch
  * @author Illia Ulianov
+ * @author Junghoon Ban
  * @since 4.4
  */
 public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearchTemplate {
@@ -645,7 +646,7 @@ public <T> Publisher<T> execute(ReactiveElasticsearchTemplate.ClientCallback<Pub
 	 */
 	private RuntimeException translateException(Throwable throwable) {
 
-		RuntimeException runtimeException = throwable instanceof RuntimeException ? (RuntimeException) throwable
+		RuntimeException runtimeException = throwable instanceof RuntimeException ex ? ex
 				: new RuntimeException(throwable.getMessage(), throwable);
 		RuntimeException potentiallyTranslatedException = exceptionTranslator
 				.translateExceptionIfPossible(runtimeException);

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

@@ -80,6 +80,7 @@
  * @author Marc Vanbrabant
  * @author Anton Naydenov
  * @author vdisk
+ * @author Junghoon Ban
  * @since 3.2
  */
 public class MappingElasticsearchConverter
@@ -503,16 +504,16 @@ TypeInformation<?> getCollectionComponentType(TypeInformation<?> type) {
 		private Object propertyConverterRead(ElasticsearchPersistentProperty property, Object source) {
 			PropertyValueConverter propertyValueConverter = Objects.requireNonNull(property.getPropertyValueConverter());
 
-			if (source instanceof String[]) {
+			if (source instanceof String[] strings) {
 				// convert to a List
-				source = Arrays.asList((String[]) source);
+				source = Arrays.asList(strings);
 			}
 
-			if (source instanceof List) {
-				source = ((List<?>) source).stream().map(it -> convertOnRead(propertyValueConverter, it))
+			if (source instanceof List<?> list) {
+				source = list.stream().map(it -> convertOnRead(propertyValueConverter, it))
 						.collect(Collectors.toList());
-			} else if (source instanceof Set) {
-				source = ((Set<?>) source).stream().map(it -> convertOnRead(propertyValueConverter, it))
+			} else if (source instanceof Set<?> set) {
+				source = set.stream().map(it -> convertOnRead(propertyValueConverter, it))
 						.collect(Collectors.toSet());
 			} else {
 				source = convertOnRead(propertyValueConverter, source);

src/main/java/org/springframework/data/elasticsearch/repository/query/parser/ElasticsearchQueryCreator.java

@@ -44,6 +44,7 @@
  * @author Franck Marchand
  * @author Artur Konczak
  * @author Peter-Josef Meisch
+ * @author Junghoon Ban
  */
 public class ElasticsearchQueryCreator extends AbstractQueryCreator<CriteriaQuery, CriteriaQuery> {
 
@@ -154,37 +155,37 @@ private Criteria from(Part part, Criteria criteria, Iterator<?> parameters) {
 					secondParameter = parameters.next();
 				}
 
-				if (firstParameter instanceof GeoPoint && secondParameter instanceof String)
-					return criteria.within((GeoPoint) firstParameter, (String) secondParameter);
+				if (firstParameter instanceof GeoPoint geoPoint && secondParameter instanceof String string)
+					return criteria.within(geoPoint, string);
 
-				if (firstParameter instanceof Point && secondParameter instanceof Distance)
-					return criteria.within((Point) firstParameter, (Distance) secondParameter);
+				if (firstParameter instanceof Point point && secondParameter instanceof Distance distance)
+					return criteria.within(point, distance);
 
-				if (firstParameter instanceof String && secondParameter instanceof String)
-					return criteria.within((String) firstParameter, (String) secondParameter);
+				if (firstParameter instanceof String firstString && secondParameter instanceof String secondString)
+					return criteria.within(firstString, secondString);
 			}
 			case NEAR: {
 				Object firstParameter = parameters.next();
 
-				if (firstParameter instanceof GeoBox) {
-					return criteria.boundedBy((GeoBox) firstParameter);
+				if (firstParameter instanceof GeoBox geoBox) {
+					return criteria.boundedBy(geoBox);
 				}
 
-				if (firstParameter instanceof Box) {
-					return criteria.boundedBy(GeoBox.fromBox((Box) firstParameter));
+				if (firstParameter instanceof Box box) {
+					return criteria.boundedBy(GeoBox.fromBox(box));
 				}
 
 				Object secondParameter = parameters.next();
 
 				// "near" query can be the same query as the "within" query
-				if (firstParameter instanceof GeoPoint && secondParameter instanceof String)
-					return criteria.within((GeoPoint) firstParameter, (String) secondParameter);
+				if (firstParameter instanceof GeoPoint geoPoint && secondParameter instanceof String string)
+					return criteria.within(geoPoint, string);
 
-				if (firstParameter instanceof Point && secondParameter instanceof Distance)
-					return criteria.within((Point) firstParameter, (Distance) secondParameter);
+				if (firstParameter instanceof Point point && secondParameter instanceof Distance distance)
+					return criteria.within(point, distance);
 
-				if (firstParameter instanceof String && secondParameter instanceof String)
-					return criteria.within((String) firstParameter, (String) secondParameter);
+				if (firstParameter instanceof String firstString && secondParameter instanceof String secondString)
+					return criteria.within(firstString, secondString);
 			}
 			case EXISTS:
 			case IS_NOT_NULL: