closer to jdk-17 changes (#1074)

Author: wind57

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/NormalizedSource.java

@@ -24,7 +24,7 @@
  *
  * @author wind57
  */
-public sealed abstract class NormalizedSource permits NamedSecretNormalizedSource,LabeledSecretNormalizedSource,NamedConfigMapNormalizedSource,LabeledConfigMapNormalizedSource {
+public sealed abstract class NormalizedSource permits NamedSecretNormalizedSource, LabeledSecretNormalizedSource, NamedConfigMapNormalizedSource, LabeledConfigMapNormalizedSource {
 
 	private final String namespace;
 

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigReloadUtil.java

@@ -84,8 +84,8 @@ public static <S extends PropertySource<?>> List<S> findPropertySources(Class<S>
 			else if (sourceClass.isInstance(source)) {
 				managedSources.add(sourceClass.cast(source));
 			}
-			else if (source instanceof BootstrapPropertySource) {
-				PropertySource<?> propertySource = ((BootstrapPropertySource<?>) source).getDelegate();
+			else if (source instanceof BootstrapPropertySource<?> bootstrapPropertySource) {
+				PropertySource<?> propertySource = bootstrapPropertySource.getDelegate();
 				if (sourceClass.isInstance(propertySource)) {
 					sources.add(propertySource);
 				}
@@ -108,14 +108,16 @@ static List<MapPropertySource> locateMapPropertySources(PropertySourceLocator pr
 
 		List<MapPropertySource> result = new ArrayList<>();
 		PropertySource<?> propertySource = propertySourceLocator.locate(environment);
-		if (propertySource instanceof MapPropertySource) {
-			result.add((MapPropertySource) propertySource);
+		if (propertySource instanceof MapPropertySource mapPropertySource) {
+			result.add(mapPropertySource);
 		}
 		else if (propertySource instanceof CompositePropertySource source) {
 
-			List<MapPropertySource> list = source.getPropertySources().stream()
-					.filter(p -> p instanceof MapPropertySource).map(x -> (MapPropertySource) x).toList();
-			result.addAll(list);
+			source.getPropertySources().forEach(x -> {
+				if (x instanceof MapPropertySource mapPropertySource) {
+					result.add(mapPropertySource);
+				}
+			});
 		}
 		else {
 			LOG.debug(() -> "Found property source that cannot be handled: " + propertySource.getClass());

src/checkstyle/checkstyle-suppressions.xml

@@ -15,6 +15,5 @@
 	<suppress files=".*ConfigurationWatcherApplication\.java" checks="HideUtilityClassConstructor"/>
 	<suppress files=".*DiscoveryServerApplication\.java" checks="HideUtilityClassConstructor"/>
 	<suppress files=".*KubernetesConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
-	<suppress files=".*NormalizedSource\.java" checks="WhitespaceAfter" />
 	<suppress files=".*Fabric8ConfigContext\.java" checks="WhitespaceAround" />
 </suppressions>