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 index e6787517077..a7946021b69 100644 --- 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 class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements public void registerContainedBean(String containedBeanName, String containingBeanName) { synchronized (this.containedBeanMap) { Set containedBeans = - this.containedBeanMap.computeIfAbsent(containingBeanName, k -> new LinkedHashSet<>(8)); + this.containedBeanMap.computeIfAbsent(containingBeanName, key -> new LinkedHashSet<>(8)); if (!containedBeans.add(containedBeanName)) { return; } @@ -604,7 +604,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements synchronized (this.dependentBeanMap) { Set dependentBeans = - this.dependentBeanMap.computeIfAbsent(canonicalName, k -> new LinkedHashSet<>(8)); + this.dependentBeanMap.computeIfAbsent(canonicalName, key -> new LinkedHashSet<>(8)); if (!dependentBeans.add(dependentBeanName)) { return; } @@ -612,7 +612,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements synchronized (this.dependenciesForBeanMap) { Set 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 index 2117752e658..1a54bd8a384 100644 --- 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 @@ class JCacheEhCacheApiTests extends AbstractValueAdaptingCacheTests this.cacheManager.createCache(CACHE_NAME_NO_NULL, new MutableConfiguration<>()); this.nativeCache = this.cacheManager.getCache(CACHE_NAME); this.cache = new JCacheCache(this.nativeCache); - Cache nativeCacheNoNull = - this.cacheManager.getCache(CACHE_NAME_NO_NULL); + Cache 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 index 846fb52d3bd..d32edd2dff6 100644 --- 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 @@ class CacheAdviceParser extends AbstractSingleBeanDefinitionParser { builder.setUnless(getAttributeValue(opElement, "unless", "")); builder.setSync(Boolean.parseBoolean(getAttributeValue(opElement, "sync", "false"))); - Collection col = cacheOpMap.computeIfAbsent(nameHolder, k -> new ArrayList<>(2)); + Collection col = cacheOpMap.computeIfAbsent(nameHolder, key -> new ArrayList<>(2)); col.add(builder.build()); } @@ -136,7 +136,7 @@ class CacheAdviceParser extends AbstractSingleBeanDefinitionParser { builder.setBeforeInvocation(Boolean.parseBoolean(after.trim())); } - Collection col = cacheOpMap.computeIfAbsent(nameHolder, k -> new ArrayList<>(2)); + Collection col = cacheOpMap.computeIfAbsent(nameHolder, key -> new ArrayList<>(2)); col.add(builder.build()); } @@ -150,7 +150,7 @@ class CacheAdviceParser extends AbstractSingleBeanDefinitionParser { parserContext.getReaderContext(), new CachePutOperation.Builder()); builder.setUnless(getAttributeValue(opElement, "unless", "")); - Collection col = cacheOpMap.computeIfAbsent(nameHolder, k -> new ArrayList<>(2)); + Collection 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 index d92ebbc72f4..d8f2c7d1caa 100644 --- 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 @@ public class ScheduledAnnotationBeanPostProcessor 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 index bba568fff7b..7fb875b20e1 100644 --- 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 class CustomizerRegistry { Class klass = customizer.getClass(); for (Class type : customizerTypes) { if (type.isAssignableFrom(klass)) { - List list = customizers.computeIfAbsent(type, k -> new ArrayList<>()); + List 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 index fdb6cd9d339..ba7892aea15 100644 --- 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 index e84fa228336..5e4dc658d70 100644 --- 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 abstract class AnnotationUtils { private static Map getDefaultValues( Class annotationType) { - return defaultValuesCache.computeIfAbsent(annotationType, - AnnotationUtils::computeDefaultValues); + return defaultValuesCache.computeIfAbsent(annotationType, AnnotationUtils::computeDefaultValues); } private static Map 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 index 7262ca0dd9d..321bbad53bd 100644 --- 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 class GenericConversionService implements ConfigurableConversionService { } 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 index 6d855b305b5..c98ff8e2a2b 100644 --- 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 class SpringFactoriesLoader { SpringFactoriesLoader.class.getClassLoader()); Map 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 index d62ebb7cbba..fdb95b47efe 100644 --- 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 class SimpleNamespaceContext implements NamespaceContext { else { this.prefixToNamespaceUri.put(prefix, namespaceUri); Set 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 index 2d3121a6a79..b720db8a2d8 100644 --- 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 @@ public class CachingConnectionFactory extends SingleConnectionFactory { return null; } - Deque sessionList = this.cachedSessions.computeIfAbsent(mode, k -> new ArrayDeque<>()); + Deque 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 index 5ab161c5609..40da96720a4 100644 --- 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 class JmsResourceHolder extends ResourceHolderSupport { this.sessions.add(session); if (connection != null) { Deque 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 index 88177df056b..0ccf397b991 100644 --- 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 class StompHeaders implements MultiValueMap, Serializable */ @Override public void add(String headerName, @Nullable String headerValue) { - List headerValues = this.headers.computeIfAbsent(headerName, k -> new ArrayList<>(1)); + List headerValues = this.headers.computeIfAbsent(headerName, key -> new ArrayList<>(1)); headerValues.add(headerValue); } @Override public void addAll(String headerName, List headerValues) { - List currentValues = this.headers.computeIfAbsent(headerName, k -> new ArrayList<>(1)); + List 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 index 8c29f3fc64b..b1dbd1791fb 100644 --- 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 class NativeMessageHeaderAccessor extends MessageHeaderAccessor { nativeHeaders = new LinkedMultiValueMap<>(3); setHeader(NATIVE_HEADERS, nativeHeaders); } - List values = nativeHeaders.computeIfAbsent(name, k -> new ArrayList<>(1)); + List 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 index ea0e909fcea..e1a925f2628 100644 --- 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 abstract class Jackson2CodecSupport { this.objectMapperRegistrations = new LinkedHashMap<>(); } Map 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 index 3cd35d3aebc..eb5371b412c 100644 --- 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 abstract class AbstractJackson2HttpMessageConverter extends AbstractGener this.objectMapperRegistrations = new LinkedHashMap<>(); } Map 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 index 0cb338fa9c9..314d6af0a1c 100644 --- 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 attributes; - @Nullable private ServerHttpAsyncRequestControl asyncRequestControl; @@ -388,7 +387,6 @@ public class ServletServerHttpRequest implements ServerHttpRequest { public Iterator iterator() { return servletRequest.getAttributeNames().asIterator(); } - @Override public int size() { return AttributesMap.this.size(); @@ -412,7 +410,6 @@ public class ServletServerHttpRequest implements ServerHttpRequest { public boolean hasNext() { return e.hasMoreElements(); } - @Override public Object next() { String name = e.nextElement(); @@ -420,7 +417,6 @@ public class ServletServerHttpRequest implements ServerHttpRequest { } }; } - @Override public int size() { return AttributesMap.this.size(); @@ -444,7 +440,6 @@ public class ServletServerHttpRequest implements ServerHttpRequest { public boolean hasNext() { return e.hasMoreElements(); } - @Override public Entry next() { String name = e.nextElement(); @@ -453,7 +448,6 @@ public class ServletServerHttpRequest implements ServerHttpRequest { } }; } - @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 index 83b0b74dffc..0d135df92ab 100644 --- 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 @@ class ServletServerHttpRequest extends AbstractServerHttpRequest { @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 index 72282d0f587..ac9f1908d5c 100644 --- 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 @@ class ControllerMethodResolver { 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 @@ class ControllerMethodResolver { 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 index 06bf3b4176b..f14dee9f67b 100644 --- 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 @@ public class UrlFilenameViewController extends AbstractUrlViewController { * @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 index 4a63a690a93..7bdcbda1eda 100644 --- 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>> cache = - new ConcurrentHashMap<>(); + private static final Map, String>> cache = new ConcurrentHashMap<>(); @SuppressWarnings("unchecked") @@ -101,24 +100,19 @@ public class SpringConfigurator extends Configurator { @Nullable private String getBeanNameByType(WebApplicationContext wac, Class endpointClass) { String wacId = wac.getId(); + Map, String> beanNamesByType = cache.computeIfAbsent(wacId, key -> new ConcurrentHashMap<>()); - Map, 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); }