Use pattern matching instead of type casting.

junghoon-vans · web-flow · commit ba446845e3c7 · 2023-10-17T18:06:48.000+02:00
Original Pull Request #2742 Closes #2741
diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/DocumentAdapters.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/DocumentAdapters.java
@@ -115,8 +115,8 @@ public static SearchDocument from(Hit<?> hit, JsonpMapper jsonpMapper) {
 		if (source == null) {
 			document = Document.from(hitFieldsAsMap);
 		} else {
-			if (source instanceof EntityAsMap) {
-				document = Document.from((EntityAsMap) source);
+			if (source instanceof EntityAsMap entityAsMap) {
+				document = Document.from(entityAsMap);
 			} else if (source instanceof JsonData jsonData) {
 				document = Document.from(jsonData.to(EntityAsMap.class));
 			} else {
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java
@@ -143,8 +143,8 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
 			setEntityCallbacks(EntityCallbacks.create(applicationContext));
 		}
 
-		if (elasticsearchConverter instanceof ApplicationContextAware) {
-			((ApplicationContextAware) elasticsearchConverter).setApplicationContext(applicationContext);
+		if (elasticsearchConverter instanceof ApplicationContextAware contextAware) {
+			contextAware.setApplicationContext(applicationContext);
 		}
 	}
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/SearchHitMapping.java b/src/main/java/org/springframework/data/elasticsearch/core/SearchHitMapping.java
@@ -229,8 +229,8 @@ private SearchHits<?> mapInnerDocuments(SearchHits<SearchDocument> searchHits, C
 				});
 
 				String scrollId = null;
-				if (searchHits instanceof SearchHitsImpl) {
-					scrollId = ((SearchHitsImpl<?>) searchHits).getScrollId();
+				if (searchHits instanceof SearchHitsImpl<?> searchHitsImpl) {
+					scrollId = searchHitsImpl.getScrollId();
 				}
 
 				return new SearchHitsImpl<>(searchHits.getTotalHits(), //
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchDateConverter.java b/src/main/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchDateConverter.java
@@ -323,9 +323,9 @@ public String format(TemporalAccessor accessor) {
 			try {
 				return dateTimeFormatter.format(accessor);
 			} catch (Exception e) {
-				if (accessor instanceof Instant) {
+				if (accessor instanceof Instant instant) {
 					// as alternatives try to format a ZonedDateTime or LocalDateTime
-					return dateTimeFormatter.format(ZonedDateTime.ofInstant((Instant) accessor, ZoneId.of("UTC")));
+					return dateTimeFormatter.format(ZonedDateTime.ofInstant(instant, ZoneId.of("UTC")));
 				} else {
 					throw e;
 				}
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/convert/GeoConverters.java b/src/main/java/org/springframework/data/elasticsearch/core/convert/GeoConverters.java
@@ -141,20 +141,20 @@ public enum GeoJsonToMapConverter implements Converter<GeoJson<? extends Iterabl
 
 		@Override
 		public Map<String, Object> convert(GeoJson<? extends Iterable<?>> source) {
-			if (source instanceof GeoJsonPoint) {
-				return GeoJsonPointToMapConverter.INSTANCE.convert((GeoJsonPoint) source);
-			} else if (source instanceof GeoJsonMultiPoint) {
-				return GeoJsonMultiPointToMapConverter.INSTANCE.convert((GeoJsonMultiPoint) source);
-			} else if (source instanceof GeoJsonLineString) {
-				return GeoJsonLineStringToMapConverter.INSTANCE.convert((GeoJsonLineString) source);
-			} else if (source instanceof GeoJsonMultiLineString) {
-				return GeoJsonMultiLineStringToMapConverter.INSTANCE.convert((GeoJsonMultiLineString) source);
-			} else if (source instanceof GeoJsonPolygon) {
-				return GeoJsonPolygonToMapConverter.INSTANCE.convert((GeoJsonPolygon) source);
-			} else if (source instanceof GeoJsonMultiPolygon) {
-				return GeoJsonMultiPolygonToMapConverter.INSTANCE.convert((GeoJsonMultiPolygon) source);
-			} else if (source instanceof GeoJsonGeometryCollection) {
-				return GeoJsonGeometryCollectionToMapConverter.INSTANCE.convert((GeoJsonGeometryCollection) source);
+			if (source instanceof GeoJsonPoint geoJsonPoint) {
+				return GeoJsonPointToMapConverter.INSTANCE.convert(geoJsonPoint);
+			} else if (source instanceof GeoJsonMultiPoint geoJsonMultiPoint) {
+				return GeoJsonMultiPointToMapConverter.INSTANCE.convert(geoJsonMultiPoint);
+			} else if (source instanceof GeoJsonLineString geoJsonLineString) {
+				return GeoJsonLineStringToMapConverter.INSTANCE.convert(geoJsonLineString);
+			} else if (source instanceof GeoJsonMultiLineString geoJsonMultiLineString) {
+				return GeoJsonMultiLineStringToMapConverter.INSTANCE.convert(geoJsonMultiLineString);
+			} else if (source instanceof GeoJsonPolygon geoJsonPolygon) {
+				return GeoJsonPolygonToMapConverter.INSTANCE.convert(geoJsonPolygon);
+			} else if (source instanceof GeoJsonMultiPolygon geoJsonMultiPolygon) {
+				return GeoJsonMultiPolygonToMapConverter.INSTANCE.convert(geoJsonMultiPolygon);
+			} else if (source instanceof GeoJsonGeometryCollection geoJsonGeometryCollection) {
+				return GeoJsonGeometryCollectionToMapConverter.INSTANCE.convert(geoJsonGeometryCollection);
 			} else {
 				throw new IllegalArgumentException("unknown GeoJson class " + source.getClass().getSimpleName());
 			}
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java b/src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java
@@ -116,8 +116,8 @@ public MappingElasticsearchConverter(
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 
-		if (mappingContext instanceof ApplicationContextAware) {
-			((ApplicationContextAware) mappingContext).setApplicationContext(applicationContext);
+		if (mappingContext instanceof ApplicationContextAware contextAware) {
+			contextAware.setApplicationContext(applicationContext);
 		}
 	}
 
@@ -1186,8 +1186,8 @@ protected Map<String, Object> createMap(Map<?, ?> map, ElasticsearchPersistentPr
 		 */
 		private static Collection<?> asCollection(Object source) {
 
-			if (source instanceof Collection) {
-				return (Collection<?>) source;
+			if (source instanceof Collection<?> collection) {
+				return collection;
 			}
 
 			return source.getClass().isArray() ? CollectionUtils.arrayToList(source) : Collections.singleton(source);
@@ -1201,9 +1201,9 @@ public void updateQuery(Query query, @Nullable Class<?> domainClass) {
 
 		Assert.notNull(query, "query must not be null");
 
-		if (query instanceof BaseQuery) {
+		if (query instanceof BaseQuery baseQuery) {
 
-			if (((BaseQuery) query).queryIsUpdatedByConverter()) {
+			if (baseQuery.queryIsUpdatedByConverter()) {
 				return;
 			}
 		}
@@ -1214,12 +1214,12 @@ public void updateQuery(Query query, @Nullable Class<?> domainClass) {
 
 		updatePropertiesInFieldsAndSourceFilter(query, domainClass);
 
-		if (query instanceof CriteriaQuery) {
-			updatePropertiesInCriteriaQuery((CriteriaQuery) query, domainClass);
+		if (query instanceof CriteriaQuery criteriaQuery) {
+			updatePropertiesInCriteriaQuery(criteriaQuery, domainClass);
 		}
 
-		if (query instanceof BaseQuery) {
-			((BaseQuery) query).setQueryIsUpdatedByConverter(true);
+		if (query instanceof BaseQuery baseQuery) {
+			baseQuery.setQueryIsUpdatedByConverter(true);
 		}
 	}
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/index/MappingBuilder.java b/src/main/java/org/springframework/data/elasticsearch/core/index/MappingBuilder.java
@@ -194,8 +194,8 @@ private void writeTypeHintMapping(ObjectNode propertiesNode) throws IOException
 			if (writeTypeHints) {
 				String typeHintProperty = null;
 
-				if (elasticsearchConverter instanceof MappingElasticsearchConverter) {
-					typeHintProperty = ((MappingElasticsearchConverter) elasticsearchConverter).getTypeMapper().getTypeKey();
+				if (elasticsearchConverter instanceof MappingElasticsearchConverter mappingElasticsearchConverter) {
+					typeHintProperty = mappingElasticsearchConverter.getTypeMapper().getTypeKey();
 				}
 
 				if (typeHintProperty == null) {
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/index/MappingParameters.java b/src/main/java/org/springframework/data/elasticsearch/core/index/MappingParameters.java
@@ -125,10 +125,10 @@ public static MappingParameters from(Annotation annotation) {
 
 		Assert.notNull(annotation, "annotation must not be null!");
 
-		if (annotation instanceof Field) {
-			return new MappingParameters((Field) annotation);
-		} else if (annotation instanceof InnerField) {
-			return new MappingParameters((InnerField) annotation);
+		if (annotation instanceof Field field) {
+			return new MappingParameters(field);
+		} else if (annotation instanceof InnerField innerField) {
+			return new MappingParameters(innerField);
 		} else {
 			throw new IllegalArgumentException("annotation must be an instance of @Field or @InnerField");
 		}
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentProperty.java b/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentProperty.java
@@ -344,8 +344,8 @@ public String getFieldName() {
 	private FieldNamingStrategy getFieldNamingStrategy() {
 		PersistentEntity<?, ElasticsearchPersistentProperty> owner = getOwner();
 
-		if (owner instanceof ElasticsearchPersistentEntity) {
-			return ((ElasticsearchPersistentEntity<?>) owner).getFieldNamingStrategy();
+		if (owner instanceof ElasticsearchPersistentEntity<?> persistentEntity) {
+			return persistentEntity.getFieldNamingStrategy();
 		}
 
 		return DEFAULT_FIELD_NAMING_STRATEGY;
diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java b/src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java
@@ -386,8 +386,8 @@ public void deleteAll(@Nullable RefreshPolicy refreshPolicy) {
 	private void doRefresh() {
 		RefreshPolicy refreshPolicy = null;
 
-		if (operations instanceof AbstractElasticsearchTemplate) {
-			refreshPolicy = ((AbstractElasticsearchTemplate) operations).getRefreshPolicy();
+		if (operations instanceof AbstractElasticsearchTemplate template) {
+			refreshPolicy = template.getRefreshPolicy();
 		}
 
 		if (refreshPolicy == null) {

Original file line number	Diff line number	Diff line change
`@@ -143,8 +143,8 @@ public void setApplicationContext(ApplicationContext applicationContext) throws`
`143`	`143`	`setEntityCallbacks(EntityCallbacks.create(applicationContext));`
`144`	`144`	`}`
`145`	`145`
`146`		`- if (elasticsearchConverter instanceof ApplicationContextAware) {`
`147`		`- ((ApplicationContextAware) elasticsearchConverter).setApplicationContext(applicationContext);`
	`146`	`+ if (elasticsearchConverter instanceof ApplicationContextAware contextAware) {`
	`147`	`+ contextAware.setApplicationContext(applicationContext);`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -229,8 +229,8 @@ private SearchHits<?> mapInnerDocuments(SearchHits<SearchDocument> searchHits, C`
`229`	`229`	`});`
`230`	`230`
`231`	`231`	`String scrollId = null;`
`232`		`- if (searchHits instanceof SearchHitsImpl) {`
`233`		`- scrollId = ((SearchHitsImpl<?>) searchHits).getScrollId();`
	`232`	`+ if (searchHits instanceof SearchHitsImpl<?> searchHitsImpl) {`
	`233`	`+ scrollId = searchHitsImpl.getScrollId();`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`return new SearchHitsImpl<>(searchHits.getTotalHits(), //`
Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,8 @@ public MappingElasticsearchConverter(`
`116`	`116`	`@Override`
`117`	`117`	`public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {`
`118`	`118`
`119`		`- if (mappingContext instanceof ApplicationContextAware) {`
`120`		`- ((ApplicationContextAware) mappingContext).setApplicationContext(applicationContext);`
	`119`	`+ if (mappingContext instanceof ApplicationContextAware contextAware) {`
	`120`	`+ contextAware.setApplicationContext(applicationContext);`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`@@ -1186,8 +1186,8 @@ protected Map<String, Object> createMap(Map<?, ?> map, ElasticsearchPersistentPr`
`1186`	`1186`	`*/`
`1187`	`1187`	`private static Collection<?> asCollection(Object source) {`
`1188`	`1188`
`1189`		`- if (source instanceof Collection) {`
`1190`		`- return (Collection<?>) source;`
	`1189`	`+ if (source instanceof Collection<?> collection) {`
	`1190`	`+ return collection;`
`1191`	`1191`	`}`
`1192`	`1192`
`1193`	`1193`	`return source.getClass().isArray() ? CollectionUtils.arrayToList(source) : Collections.singleton(source);`
`@@ -1201,9 +1201,9 @@ public void updateQuery(Query query, @Nullable Class<?> domainClass) {`
`1201`	`1201`
`1202`	`1202`	`Assert.notNull(query, "query must not be null");`
`1203`	`1203`
`1204`		`- if (query instanceof BaseQuery) {`
	`1204`	`+ if (query instanceof BaseQuery baseQuery) {`
`1205`	`1205`
`1206`		`- if (((BaseQuery) query).queryIsUpdatedByConverter()) {`
	`1206`	`+ if (baseQuery.queryIsUpdatedByConverter()) {`
`1207`	`1207`	`return;`
`1208`	`1208`	`}`
`1209`	`1209`	`}`
`@@ -1214,12 +1214,12 @@ public void updateQuery(Query query, @Nullable Class<?> domainClass) {`
`1214`	`1214`
`1215`	`1215`	`updatePropertiesInFieldsAndSourceFilter(query, domainClass);`
`1216`	`1216`
`1217`		`- if (query instanceof CriteriaQuery) {`
`1218`		`- updatePropertiesInCriteriaQuery((CriteriaQuery) query, domainClass);`
	`1217`	`+ if (query instanceof CriteriaQuery criteriaQuery) {`
	`1218`	`+ updatePropertiesInCriteriaQuery(criteriaQuery, domainClass);`
`1219`	`1219`	`}`
`1220`	`1220`
`1221`		`- if (query instanceof BaseQuery) {`
`1222`		`- ((BaseQuery) query).setQueryIsUpdatedByConverter(true);`
	`1221`	`+ if (query instanceof BaseQuery baseQuery) {`
	`1222`	`+ baseQuery.setQueryIsUpdatedByConverter(true);`
`1223`	`1223`	`}`
`1224`	`1224`	`}`
`1225`	`1225`
Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,8 @@ private void writeTypeHintMapping(ObjectNode propertiesNode) throws IOException`
`194`	`194`	`if (writeTypeHints) {`
`195`	`195`	`String typeHintProperty = null;`
`196`	`196`
`197`		`- if (elasticsearchConverter instanceof MappingElasticsearchConverter) {`
`198`		`- typeHintProperty = ((MappingElasticsearchConverter) elasticsearchConverter).getTypeMapper().getTypeKey();`
	`197`	`+ if (elasticsearchConverter instanceof MappingElasticsearchConverter mappingElasticsearchConverter) {`
	`198`	`+ typeHintProperty = mappingElasticsearchConverter.getTypeMapper().getTypeKey();`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`if (typeHintProperty == null) {`
Original file line number	Diff line number	Diff line change
`@@ -344,8 +344,8 @@ public String getFieldName() {`
`344`	`344`	`private FieldNamingStrategy getFieldNamingStrategy() {`
`345`	`345`	`PersistentEntity<?, ElasticsearchPersistentProperty> owner = getOwner();`
`346`	`346`
`347`		`- if (owner instanceof ElasticsearchPersistentEntity) {`
`348`		`- return ((ElasticsearchPersistentEntity<?>) owner).getFieldNamingStrategy();`
	`347`	`+ if (owner instanceof ElasticsearchPersistentEntity<?> persistentEntity) {`
	`348`	`+ return persistentEntity.getFieldNamingStrategy();`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`return DEFAULT_FIELD_NAMING_STRATEGY;`
Original file line number	Diff line number	Diff line change
`@@ -386,8 +386,8 @@ public void deleteAll(@Nullable RefreshPolicy refreshPolicy) {`
`386`	`386`	`private void doRefresh() {`
`387`	`387`	`RefreshPolicy refreshPolicy = null;`
`388`	`388`
`389`		`- if (operations instanceof AbstractElasticsearchTemplate) {`
`390`		`- refreshPolicy = ((AbstractElasticsearchTemplate) operations).getRefreshPolicy();`
	`389`	`+ if (operations instanceof AbstractElasticsearchTemplate template) {`
	`390`	`+ refreshPolicy = template.getRefreshPolicy();`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`if (refreshPolicy == null) {`