Polishing

jhoeller · jhoeller · commit 1fd1d8d6291a · 2025-12-04T00:40:02.000+01:00
(cherry picked from commit 07c0213)
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
@@ -585,7 +585,7 @@ public void registerDisposableBean(String beanName, DisposableBean bean) {
 	public void registerContainedBean(String containedBeanName, String containingBeanName) {
 		synchronized (this.containedBeanMap) {
 			Set<String> containedBeans =
-					this.containedBeanMap.computeIfAbsent(containingBeanName, k -> new LinkedHashSet<>(8));
+					this.containedBeanMap.computeIfAbsent(containingBeanName, key -> new LinkedHashSet<>(8));
 			if (!containedBeans.add(containedBeanName)) {
 				return;
 			}
@@ -604,15 +604,15 @@ public void registerDependentBean(String beanName, String dependentBeanName) {
 
 		synchronized (this.dependentBeanMap) {
 			Set<String> dependentBeans =
-					this.dependentBeanMap.computeIfAbsent(canonicalName, k -> new LinkedHashSet<>(8));
+					this.dependentBeanMap.computeIfAbsent(canonicalName, key -> new LinkedHashSet<>(8));
 			if (!dependentBeans.add(dependentBeanName)) {
 				return;
 			}
 		}
 
 		synchronized (this.dependenciesForBeanMap) {
 			Set<String> dependenciesForBean =
-					this.dependenciesForBeanMap.computeIfAbsent(dependentBeanName, k -> new LinkedHashSet<>(8));
+					this.dependenciesForBeanMap.computeIfAbsent(dependentBeanName, key -> new LinkedHashSet<>(8));
 			dependenciesForBean.add(canonicalName);
 		}
 	}
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java
@@ -51,8 +51,7 @@ void setup() {
 		this.cacheManager.createCache(CACHE_NAME_NO_NULL, new MutableConfiguration<>());
 		this.nativeCache = this.cacheManager.getCache(CACHE_NAME);
 		this.cache = new JCacheCache(this.nativeCache);
-		Cache<Object, Object> nativeCacheNoNull =
-				this.cacheManager.getCache(CACHE_NAME_NO_NULL);
+		Cache<Object, Object> nativeCacheNoNull = this.cacheManager.getCache(CACHE_NAME_NO_NULL);
 		this.cacheNoNull = new JCacheCache(nativeCacheNoNull, false);
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java b/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java
@@ -113,7 +113,7 @@ private RootBeanDefinition parseDefinitionSource(Element definition, ParserConte
 			builder.setUnless(getAttributeValue(opElement, "unless", ""));
 			builder.setSync(Boolean.parseBoolean(getAttributeValue(opElement, "sync", "false")));
 
-			Collection<CacheOperation> col = cacheOpMap.computeIfAbsent(nameHolder, k -> new ArrayList<>(2));
+			Collection<CacheOperation> col = cacheOpMap.computeIfAbsent(nameHolder, key -> new ArrayList<>(2));
 			col.add(builder.build());
 		}
 
@@ -136,7 +136,7 @@ private RootBeanDefinition parseDefinitionSource(Element definition, ParserConte
 				builder.setBeforeInvocation(Boolean.parseBoolean(after.trim()));
 			}
 
-			Collection<CacheOperation> col = cacheOpMap.computeIfAbsent(nameHolder, k -> new ArrayList<>(2));
+			Collection<CacheOperation> col = cacheOpMap.computeIfAbsent(nameHolder, key -> new ArrayList<>(2));
 			col.add(builder.build());
 		}
 
@@ -150,7 +150,7 @@ private RootBeanDefinition parseDefinitionSource(Element definition, ParserConte
 					parserContext.getReaderContext(), new CachePutOperation.Builder());
 			builder.setUnless(getAttributeValue(opElement, "unless", ""));
 
-			Collection<CacheOperation> col = cacheOpMap.computeIfAbsent(nameHolder, k -> new ArrayList<>(2));
+			Collection<CacheOperation> col = cacheOpMap.computeIfAbsent(nameHolder, key -> new ArrayList<>(2));
 			col.add(builder.build());
 		}
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
@@ -383,7 +383,7 @@ private void processScheduledAsync(Scheduled scheduled, Method method, Object be
 		try {
 			task = ScheduledAnnotationReactiveSupport.createSubscriptionRunnable(method, bean, scheduled,
 					this.registrar::getObservationRegistry,
-					this.reactiveSubscriptions.computeIfAbsent(bean, k -> new CopyOnWriteArrayList<>()));
+					this.reactiveSubscriptions.computeIfAbsent(bean, key -> new CopyOnWriteArrayList<>()));
 		}
 		catch (IllegalArgumentException ex) {
 			throw new IllegalStateException("Could not create recurring task for @Scheduled method '" +
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/internal/CustomizerRegistry.java b/spring-core/src/main/java/org/springframework/cglib/core/internal/CustomizerRegistry.java
@@ -22,7 +22,7 @@ public void add(KeyFactoryCustomizer customizer) {
         Class<? extends KeyFactoryCustomizer> klass = customizer.getClass();
         for (Class type : customizerTypes) {
             if (type.isAssignableFrom(klass)) {
-                List<KeyFactoryCustomizer> list = customizers.computeIfAbsent(type, k -> new ArrayList<>());
+                List<KeyFactoryCustomizer> list = customizers.computeIfAbsent(type, key -> new ArrayList<>());
                 list.add(customizer);
             }
         }
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java
@@ -112,9 +112,7 @@ final class AnnotationTypeMapping {
 		this.root = (source != null ? source.getRoot() : this);
 		this.distance = (source == null ? 0 : source.getDistance() + 1);
 		this.annotationType = annotationType;
-		this.metaTypes = merge(
-				source != null ? source.getMetaTypes() : null,
-				annotationType);
+		this.metaTypes = merge((source != null ? source.getMetaTypes() : null), annotationType);
 		this.annotation = annotation;
 		this.attributes = AttributeMethods.forAnnotationType(annotationType);
 		this.mirrorSets = new MirrorSets();
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
@@ -894,8 +894,7 @@ public static void registerDefaultValues(AnnotationAttributes attributes) {
 	private static Map<String, DefaultValueHolder> getDefaultValues(
 			Class<? extends Annotation> annotationType) {
 
-		return defaultValuesCache.computeIfAbsent(annotationType,
-				AnnotationUtils::computeDefaultValues);
+		return defaultValuesCache.computeIfAbsent(annotationType, AnnotationUtils::computeDefaultValues);
 	}
 
 	private static Map<String, DefaultValueHolder> computeDefaultValues(
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
@@ -490,7 +490,7 @@ public void add(GenericConverter converter) {
 		}
 
 		private ConvertersForPair getMatchableConverters(ConvertiblePair convertiblePair) {
-			return this.converters.computeIfAbsent(convertiblePair, k -> new ConvertersForPair());
+			return this.converters.computeIfAbsent(convertiblePair, key -> new ConvertersForPair());
 		}
 
 		public void remove(Class<?> sourceType, Class<?> targetType) {
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java b/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java
@@ -323,8 +323,8 @@ public static SpringFactoriesLoader forResourceLocation(String resourceLocation,
 				SpringFactoriesLoader.class.getClassLoader());
 		Map<String, Factories> factoriesCache = cache.computeIfAbsent(
 				resourceClassLoader, key -> new ConcurrentReferenceHashMap<>());
-		Factories factories = factoriesCache.computeIfAbsent(resourceLocation, key ->
-				new Factories(loadFactoriesResource(resourceClassLoader, resourceLocation)));
+		Factories factories = factoriesCache.computeIfAbsent(resourceLocation,
+				key -> new Factories(loadFactoriesResource(resourceClassLoader, resourceLocation)));
 		return new SpringFactoriesLoader(classLoader, factories.byType());
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
@@ -125,7 +125,7 @@ public void bindNamespaceUri(String prefix, String namespaceUri) {
 		else {
 			this.prefixToNamespaceUri.put(prefix, namespaceUri);
 			Set<String> prefixes =
-					this.namespaceUriToPrefixes.computeIfAbsent(namespaceUri, k -> new LinkedHashSet<>());
+					this.namespaceUriToPrefixes.computeIfAbsent(namespaceUri, key -> new LinkedHashSet<>());
 			prefixes.add(prefix);
 		}
 	}
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
@@ -246,7 +246,7 @@ protected Session getSession(Connection con, Integer mode) throws JMSException {
 			return null;
 		}
 
-		Deque<Session> sessionList = this.cachedSessions.computeIfAbsent(mode, k -> new ArrayDeque<>());
+		Deque<Session> sessionList = this.cachedSessions.computeIfAbsent(mode, key -> new ArrayDeque<>());
 		Session session = null;
 		synchronized (sessionList) {
 			if (!sessionList.isEmpty()) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java
@@ -156,7 +156,7 @@ public final void addSession(Session session, @Nullable Connection connection) {
 			this.sessions.add(session);
 			if (connection != null) {
 				Deque<Session> sessions =
-						this.sessionsPerConnection.computeIfAbsent(connection, k -> new ArrayDeque<>());
+						this.sessionsPerConnection.computeIfAbsent(connection, key -> new ArrayDeque<>());
 				sessions.add(session);
 			}
 		}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java
@@ -449,13 +449,13 @@ public String getFirst(String headerName) {
 	 */
 	@Override
 	public void add(String headerName, @Nullable String headerValue) {
-		List<String> headerValues = this.headers.computeIfAbsent(headerName, k -> new ArrayList<>(1));
+		List<String> headerValues = this.headers.computeIfAbsent(headerName, key -> new ArrayList<>(1));
 		headerValues.add(headerValue);
 	}
 
 	@Override
 	public void addAll(String headerName, List<? extends String> headerValues) {
-		List<String> currentValues = this.headers.computeIfAbsent(headerName, k -> new ArrayList<>(1));
+		List<String> currentValues = this.headers.computeIfAbsent(headerName, key -> new ArrayList<>(1));
 		currentValues.addAll(headerValues);
 	}
 
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java
@@ -249,7 +249,7 @@ public void addNativeHeader(String name, @Nullable String value) {
 			nativeHeaders = new LinkedMultiValueMap<>(3);
 			setHeader(NATIVE_HEADERS, nativeHeaders);
 		}
-		List<String> values = nativeHeaders.computeIfAbsent(name, k -> new ArrayList<>(1));
+		List<String> values = nativeHeaders.computeIfAbsent(name, key -> new ArrayList<>(1));
 		values.add(value);
 		setModified(true);
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2CodecSupport.java b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2CodecSupport.java
@@ -139,7 +139,7 @@ public void registerObjectMappersForType(Class<?> clazz, Consumer<Map<MimeType,
 			this.objectMapperRegistrations = new LinkedHashMap<>();
 		}
 		Map<MimeType, ObjectMapper> registrations =
-				this.objectMapperRegistrations.computeIfAbsent(clazz, c -> new LinkedHashMap<>());
+				this.objectMapperRegistrations.computeIfAbsent(clazz, key -> new LinkedHashMap<>());
 		registrar.accept(registrations);
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
@@ -173,7 +173,7 @@ public void registerObjectMappersForType(Class<?> clazz, Consumer<Map<MediaType,
 			this.objectMapperRegistrations = new LinkedHashMap<>();
 		}
 		Map<MediaType, ObjectMapper> registrations =
-				this.objectMapperRegistrations.computeIfAbsent(clazz, c -> new LinkedHashMap<>());
+				this.objectMapperRegistrations.computeIfAbsent(clazz, key -> new LinkedHashMap<>());
 		registrar.accept(registrations);
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
@@ -76,7 +76,6 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
 	@Nullable
 	private Map<String, Object> attributes;
 
-
 	@Nullable
 	private ServerHttpAsyncRequestControl asyncRequestControl;
 
@@ -388,7 +387,6 @@ public Set<String> keySet() {
 					public Iterator<String> iterator() {
 						return servletRequest.getAttributeNames().asIterator();
 					}
-
 					@Override
 					public int size() {
 						return AttributesMap.this.size();
@@ -412,15 +410,13 @@ public Iterator<Object> iterator() {
 							public boolean hasNext() {
 								return e.hasMoreElements();
 							}
-
 							@Override
 							public Object next() {
 								String name = e.nextElement();
 								return servletRequest.getAttribute(name);
 							}
 						};
 					}
-
 					@Override
 					public int size() {
 						return AttributesMap.this.size();
@@ -444,7 +440,6 @@ public Iterator<Entry<String, Object>> iterator() {
 							public boolean hasNext() {
 								return e.hasMoreElements();
 							}
-
 							@Override
 							public Entry<String, Object> next() {
 								String name = e.nextElement();
@@ -453,7 +448,6 @@ public Entry<String, Object> next() {
 							}
 						};
 					}
-
 					@Override
 					public int size() {
 						return AttributesMap.this.size();
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
@@ -385,7 +385,6 @@ public void onAllDataRead() throws IOException {
 			@Override
 			public void onError(Throwable throwable) {
 				RequestBodyPublisher.this.onError(throwable);
-
 			}
 		}
 	}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java
@@ -355,7 +355,7 @@ public List<SyncInvocableHandlerMethod> getInitBinderMethods(HandlerMethod handl
 
 		this.initBinderMethodCache
 				.computeIfAbsent(handlerType,
-						clazz -> MethodIntrospector.selectMethods(handlerType, INIT_BINDER_METHODS))
+						key -> MethodIntrospector.selectMethods(key, INIT_BINDER_METHODS))
 				.forEach(method -> {
 					Object bean = handlerMethod.getBean();
 					result.add(getInitBinderMethod(bean, method));
@@ -388,7 +388,7 @@ public List<InvocableHandlerMethod> getModelAttributeMethods(HandlerMethod handl
 
 		this.modelAttributeMethodCache
 				.computeIfAbsent(handlerType,
-						clazz -> MethodIntrospector.selectMethods(handlerType, MODEL_ATTRIBUTE_METHODS))
+						key -> MethodIntrospector.selectMethods(key, MODEL_ATTRIBUTE_METHODS))
 				.forEach(method -> {
 					Object bean = handlerMethod.getBean();
 					result.add(createAttributeMethod(bean, method));
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java
@@ -126,7 +126,8 @@ protected String extractOperableUrl(HttpServletRequest request) {
 	 * @see #postProcessViewName
 	 */
 	protected String getViewNameForUrlPath(String uri) {
-		return this.viewNameCache.computeIfAbsent(uri, u -> postProcessViewName(extractViewNameFromUrlPath(u)));
+		return this.viewNameCache.computeIfAbsent(uri,
+				key -> postProcessViewName(extractViewNameFromUrlPath(key)));
 	}
 
 	/**
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/SpringConfigurator.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/SpringConfigurator.java
@@ -55,8 +55,7 @@ public class SpringConfigurator extends Configurator {
 
 	private static final Log logger = LogFactory.getLog(SpringConfigurator.class);
 
-	private static final Map<String, Map<Class<?>, String>> cache =
-			new ConcurrentHashMap<>();
+	private static final Map<String, Map<Class<?>, String>> cache = new ConcurrentHashMap<>();
 
 
 	@SuppressWarnings("unchecked")
@@ -101,24 +100,19 @@ public <T> T getEndpointInstance(Class<T> endpointClass) throws InstantiationExc
 	@Nullable
 	private String getBeanNameByType(WebApplicationContext wac, Class<?> endpointClass) {
 		String wacId = wac.getId();
+		Map<Class<?>, String> beanNamesByType = cache.computeIfAbsent(wacId, key -> new ConcurrentHashMap<>());
 
-		Map<Class<?>, String> beanNamesByType = cache.computeIfAbsent(wacId, k -> new ConcurrentHashMap<>());
-
-		if (!beanNamesByType.containsKey(endpointClass)) {
+		String beanName = beanNamesByType.get(endpointClass);
+		if (beanName == null) {
 			String[] names = wac.getBeanNamesForType(endpointClass);
-			if (names.length == 1) {
-				beanNamesByType.put(endpointClass, names[0]);
-			}
-			else {
-				beanNamesByType.put(endpointClass, NO_VALUE);
-				if (names.length > 1) {
-					throw new IllegalStateException("Found multiple @ServerEndpoint's of type [" +
-							endpointClass.getName() + "]: bean names " + Arrays.toString(names));
-				}
+			beanName = (names.length == 1 ? names[0] : NO_VALUE);
+			beanNamesByType.put(endpointClass, beanName);
+			if (names.length > 1) {
+				throw new IllegalStateException("Found multiple @ServerEndpoint's of type [" +
+						endpointClass.getName() + "]: bean names " + Arrays.toString(names));
 			}
 		}
 
-		String beanName = beanNamesByType.get(endpointClass);
 		return (NO_VALUE.equals(beanName) ? null : beanName);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ public void registerDisposableBean(String beanName, DisposableBean bean) {`
`585`	`585`	`public void registerContainedBean(String containedBeanName, String containingBeanName) {`
`586`	`586`	`synchronized (this.containedBeanMap) {`
`587`	`587`	`Set<String> containedBeans =`
`588`		`- this.containedBeanMap.computeIfAbsent(containingBeanName, k -> new LinkedHashSet<>(8));`
	`588`	`+ this.containedBeanMap.computeIfAbsent(containingBeanName, key -> new LinkedHashSet<>(8));`
`589`	`589`	`if (!containedBeans.add(containedBeanName)) {`
`590`	`590`	`return;`
`591`	`591`	`}`
`@@ -604,15 +604,15 @@ public void registerDependentBean(String beanName, String dependentBeanName) {`
`604`	`604`
`605`	`605`	`synchronized (this.dependentBeanMap) {`
`606`	`606`	`Set<String> dependentBeans =`
`607`		`- this.dependentBeanMap.computeIfAbsent(canonicalName, k -> new LinkedHashSet<>(8));`
	`607`	`+ this.dependentBeanMap.computeIfAbsent(canonicalName, key -> new LinkedHashSet<>(8));`
`608`	`608`	`if (!dependentBeans.add(dependentBeanName)) {`
`609`	`609`	`return;`
`610`	`610`	`}`
`611`	`611`	`}`
`612`	`612`
`613`	`613`	`synchronized (this.dependenciesForBeanMap) {`
`614`	`614`	`Set<String> dependenciesForBean =`
`615`		`- this.dependenciesForBeanMap.computeIfAbsent(dependentBeanName, k -> new LinkedHashSet<>(8));`
	`615`	`+ this.dependenciesForBeanMap.computeIfAbsent(dependentBeanName, key -> new LinkedHashSet<>(8));`
`616`	`616`	`dependenciesForBean.add(canonicalName);`
`617`	`617`	`}`
`618`	`618`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@ void setup() {`
`51`	`51`	`this.cacheManager.createCache(CACHE_NAME_NO_NULL, new MutableConfiguration<>());`
`52`	`52`	`this.nativeCache = this.cacheManager.getCache(CACHE_NAME);`
`53`	`53`	`this.cache = new JCacheCache(this.nativeCache);`
`54`		`- Cache<Object, Object> nativeCacheNoNull =`
`55`		`- this.cacheManager.getCache(CACHE_NAME_NO_NULL);`
	`54`	`+ Cache<Object, Object> nativeCacheNoNull = this.cacheManager.getCache(CACHE_NAME_NO_NULL);`
`56`	`55`	`this.cacheNoNull = new JCacheCache(nativeCacheNoNull, false);`
`57`	`56`	`}`
`58`	`57`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ private RootBeanDefinition parseDefinitionSource(Element definition, ParserConte`
`113`	`113`	`builder.setUnless(getAttributeValue(opElement, "unless", ""));`
`114`	`114`	`builder.setSync(Boolean.parseBoolean(getAttributeValue(opElement, "sync", "false")));`
`115`	`115`
`116`		`- Collection<CacheOperation> col = cacheOpMap.computeIfAbsent(nameHolder, k -> new ArrayList<>(2));`
	`116`	`+ Collection<CacheOperation> col = cacheOpMap.computeIfAbsent(nameHolder, key -> new ArrayList<>(2));`
`117`	`117`	`col.add(builder.build());`
`118`	`118`	`}`
`119`	`119`
`@@ -136,7 +136,7 @@ private RootBeanDefinition parseDefinitionSource(Element definition, ParserConte`
`136`	`136`	`builder.setBeforeInvocation(Boolean.parseBoolean(after.trim()));`
`137`	`137`	`}`
`138`	`138`
`139`		`- Collection<CacheOperation> col = cacheOpMap.computeIfAbsent(nameHolder, k -> new ArrayList<>(2));`
	`139`	`+ Collection<CacheOperation> col = cacheOpMap.computeIfAbsent(nameHolder, key -> new ArrayList<>(2));`
`140`	`140`	`col.add(builder.build());`
`141`	`141`	`}`
`142`	`142`
`@@ -150,7 +150,7 @@ private RootBeanDefinition parseDefinitionSource(Element definition, ParserConte`
`150`	`150`	`parserContext.getReaderContext(), new CachePutOperation.Builder());`
`151`	`151`	`builder.setUnless(getAttributeValue(opElement, "unless", ""));`
`152`	`152`
`153`		`- Collection<CacheOperation> col = cacheOpMap.computeIfAbsent(nameHolder, k -> new ArrayList<>(2));`
	`153`	`+ Collection<CacheOperation> col = cacheOpMap.computeIfAbsent(nameHolder, key -> new ArrayList<>(2));`
`154`	`154`	`col.add(builder.build());`
`155`	`155`	`}`
`156`	`156`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ private void processScheduledAsync(Scheduled scheduled, Method method, Object be`
`383`	`383`	`try {`
`384`	`384`	`task = ScheduledAnnotationReactiveSupport.createSubscriptionRunnable(method, bean, scheduled,`
`385`	`385`	`this.registrar::getObservationRegistry,`
`386`		`- this.reactiveSubscriptions.computeIfAbsent(bean, k -> new CopyOnWriteArrayList<>()));`
	`386`	`+ this.reactiveSubscriptions.computeIfAbsent(bean, key -> new CopyOnWriteArrayList<>()));`
`387`	`387`	`}`
`388`	`388`	`catch (IllegalArgumentException ex) {`
`389`	`389`	`throw new IllegalStateException("Could not create recurring task for @Scheduled method '" +`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public void add(KeyFactoryCustomizer customizer) {`
`22`	`22`	`Class<? extends KeyFactoryCustomizer> klass = customizer.getClass();`
`23`	`23`	`for (Class type : customizerTypes) {`
`24`	`24`	`if (type.isAssignableFrom(klass)) {`
`25`		`- List<KeyFactoryCustomizer> list = customizers.computeIfAbsent(type, k -> new ArrayList<>());`
	`25`	`+ List<KeyFactoryCustomizer> list = customizers.computeIfAbsent(type, key -> new ArrayList<>());`
`26`	`26`	`list.add(customizer);`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -894,8 +894,7 @@ public static void registerDefaultValues(AnnotationAttributes attributes) {`
`894`	`894`	`private static Map<String, DefaultValueHolder> getDefaultValues(`
`895`	`895`	`Class<? extends Annotation> annotationType) {`
`896`	`896`
`897`		`- return defaultValuesCache.computeIfAbsent(annotationType,`
`898`		`- AnnotationUtils::computeDefaultValues);`
	`897`	`+ return defaultValuesCache.computeIfAbsent(annotationType, AnnotationUtils::computeDefaultValues);`
`899`	`898`	`}`
`900`	`899`
`901`	`900`	`private static Map<String, DefaultValueHolder> computeDefaultValues(`
Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,7 @@ public void add(GenericConverter converter) {`
`490`	`490`	`}`
`491`	`491`
`492`	`492`	`private ConvertersForPair getMatchableConverters(ConvertiblePair convertiblePair) {`
`493`		`- return this.converters.computeIfAbsent(convertiblePair, k -> new ConvertersForPair());`
	`493`	`+ return this.converters.computeIfAbsent(convertiblePair, key -> new ConvertersForPair());`
`494`	`494`	`}`
`495`	`495`
`496`	`496`	`public void remove(Class<?> sourceType, Class<?> targetType) {`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public void bindNamespaceUri(String prefix, String namespaceUri) {`
`125`	`125`	`else {`
`126`	`126`	`this.prefixToNamespaceUri.put(prefix, namespaceUri);`
`127`	`127`	`Set<String> prefixes =`
`128`		`- this.namespaceUriToPrefixes.computeIfAbsent(namespaceUri, k -> new LinkedHashSet<>());`
	`128`	`+ this.namespaceUriToPrefixes.computeIfAbsent(namespaceUri, key -> new LinkedHashSet<>());`
`129`	`129`	`prefixes.add(prefix);`
`130`	`130`	`}`
`131`	`131`	`}`