From b9ab895743011637441679008b0cbfbfcc6dc01c Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 26 Jul 2016 21:26:31 +0200 Subject: [PATCH] Inferred generics for newSetFromMap arrangements Issue: SPR-13188 --- .../autoproxy/AbstractAutoProxyCreator.java | 2 +- .../java/org/springframework/beans/BeanUtils.java | 2 +- .../beans/CachedIntrospectionResults.java | 2 +- .../AutowiredAnnotationBeanPostProcessor.java | 12 ++++-------- .../RequiredAnnotationBeanPostProcessor.java | 3 +-- .../factory/config/PropertyOverrideConfigurer.java | 4 ++-- .../beans/factory/support/AbstractBeanFactory.java | 6 ++---- .../support/DefaultSingletonBeanRegistry.java | 4 ++-- .../context/event/EventListenerMethodProcessor.java | 3 +-- .../ScheduledAnnotationBeanPostProcessor.java | 6 ++---- .../springframework/core/DecoratingClassLoader.java | 6 ++---- .../jdbc/core/StatementCreatorUtils.java | 2 +- .../JmsListenerAnnotationBeanPostProcessor.java | 6 +++--- .../method/annotation/SessionAttributesHandler.java | 3 +-- 14 files changed, 24 insertions(+), 37 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java index ea83f8768b..03d4328c1c 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java @@ -129,7 +129,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport private BeanFactory beanFactory; private final Set targetSourcedBeans = - Collections.newSetFromMap(new ConcurrentHashMap(16)); + Collections.newSetFromMap(new ConcurrentHashMap<>(16)); private final Set earlyProxyReferences = Collections.newSetFromMap(new ConcurrentHashMap<>(16)); diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java index 384b8a6935..aacf3e2b65 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java @@ -58,7 +58,7 @@ public abstract class BeanUtils { private static final Log logger = LogFactory.getLog(BeanUtils.class); private static final Set> unknownEditorTypes = - Collections.newSetFromMap(new ConcurrentReferenceHashMap, Boolean>(64)); + Collections.newSetFromMap(new ConcurrentReferenceHashMap<>(64)); /** diff --git a/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java b/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java index fc1d75f5fa..cbff644296 100644 --- a/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java +++ b/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java @@ -107,7 +107,7 @@ public class CachedIntrospectionResults { * accept classes from, even if the classes do not qualify as cache-safe. */ static final Set acceptedClassLoaders = - Collections.newSetFromMap(new ConcurrentHashMap(16)); + Collections.newSetFromMap(new ConcurrentHashMap<>(16)); /** * Map keyed by Class containing CachedIntrospectionResults, strongly held. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java index 1fb74097f1..55bcd6728d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java @@ -119,8 +119,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean protected final Log logger = LogFactory.getLog(getClass()); - private final Set> autowiredAnnotationTypes = - new LinkedHashSet<>(); + private final Set> autowiredAnnotationTypes = new LinkedHashSet<>(); private String requiredParameterName = "required"; @@ -130,14 +129,11 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean private ConfigurableListableBeanFactory beanFactory; - private final Set lookupMethodsChecked = - Collections.newSetFromMap(new ConcurrentHashMap(256)); + private final Set lookupMethodsChecked = Collections.newSetFromMap(new ConcurrentHashMap<>(256)); - private final Map, Constructor[]> candidateConstructorsCache = - new ConcurrentHashMap<>(256); + private final Map, Constructor[]> candidateConstructorsCache = new ConcurrentHashMap<>(256); - private final Map injectionMetadataCache = - new ConcurrentHashMap<>(256); + private final Map injectionMetadataCache = new ConcurrentHashMap<>(256); /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java index e0f3f81f75..e024deb6e0 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java @@ -93,8 +93,7 @@ public class RequiredAnnotationBeanPostProcessor extends InstantiationAwareBeanP /** * Cache for validated bean names, skipping re-validation for the same bean */ - private final Set validatedBeanNames = - Collections.newSetFromMap(new ConcurrentHashMap(64)); + private final Set validatedBeanNames = Collections.newSetFromMap(new ConcurrentHashMap<>(64)); /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java index 0acd5139ed..0d2f275eae 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,7 +74,7 @@ public class PropertyOverrideConfigurer extends PropertyResourceConfigurer { /** * Contains names of beans that have overrides */ - private final Set beanNames = Collections.newSetFromMap(new ConcurrentHashMap(16)); + private final Set beanNames = Collections.newSetFromMap(new ConcurrentHashMap<>(16)); /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java index 82870c2c2b..4443e017b1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java @@ -160,12 +160,10 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp private SecurityContextProvider securityContextProvider; /** Map from bean name to merged RootBeanDefinition */ - private final Map mergedBeanDefinitions = - new ConcurrentHashMap<>(256); + private final Map mergedBeanDefinitions = new ConcurrentHashMap<>(256); /** Names of beans that have already been created at least once */ - private final Set alreadyCreated = - Collections.newSetFromMap(new ConcurrentHashMap(256)); + private final Set alreadyCreated = Collections.newSetFromMap(new ConcurrentHashMap<>(256)); /** Names of beans that are currently in creation */ private final ThreadLocal prototypesCurrentlyInCreation = 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 b6e9375fe5..152a40c679 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 @@ -96,11 +96,11 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements /** Names of beans that are currently in creation */ private final Set singletonsCurrentlyInCreation = - Collections.newSetFromMap(new ConcurrentHashMap(16)); + Collections.newSetFromMap(new ConcurrentHashMap<>(16)); /** Names of beans currently excluded from in creation checks */ private final Set inCreationCheckExclusions = - Collections.newSetFromMap(new ConcurrentHashMap(16)); + Collections.newSetFromMap(new ConcurrentHashMap<>(16)); /** List of suppressed Exceptions, available for associating related causes */ private Set suppressedExceptions; diff --git a/spring-context/src/main/java/org/springframework/context/event/EventListenerMethodProcessor.java b/spring-context/src/main/java/org/springframework/context/event/EventListenerMethodProcessor.java index 6ef4a7672d..e291866991 100644 --- a/spring-context/src/main/java/org/springframework/context/event/EventListenerMethodProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/event/EventListenerMethodProcessor.java @@ -60,8 +60,7 @@ public class EventListenerMethodProcessor implements SmartInitializingSingleton, private final EventExpressionEvaluator evaluator = new EventExpressionEvaluator(); - private final Set> nonAnnotatedClasses = - Collections.newSetFromMap(new ConcurrentHashMap, Boolean>(64)); + private final Set> nonAnnotatedClasses = Collections.newSetFromMap(new ConcurrentHashMap<>(64)); @Override 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 4dec286bb4..e650d6d5a0 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 @@ -109,11 +109,9 @@ public class ScheduledAnnotationBeanPostProcessor implements DestructionAwareBea private final ScheduledTaskRegistrar registrar = new ScheduledTaskRegistrar(); - private final Set> nonAnnotatedClasses = - Collections.newSetFromMap(new ConcurrentHashMap, Boolean>(64)); + private final Set> nonAnnotatedClasses = Collections.newSetFromMap(new ConcurrentHashMap<>(64)); - private final Map> scheduledTasks = - new ConcurrentHashMap<>(16); + private final Map> scheduledTasks = new ConcurrentHashMap<>(16); @Override diff --git a/spring-core/src/main/java/org/springframework/core/DecoratingClassLoader.java b/spring-core/src/main/java/org/springframework/core/DecoratingClassLoader.java index 1b3815fd64..4736ff109d 100644 --- a/spring-core/src/main/java/org/springframework/core/DecoratingClassLoader.java +++ b/spring-core/src/main/java/org/springframework/core/DecoratingClassLoader.java @@ -38,11 +38,9 @@ public abstract class DecoratingClassLoader extends ClassLoader { } - private final Set excludedPackages = - Collections.newSetFromMap(new ConcurrentHashMap(8)); + private final Set excludedPackages = Collections.newSetFromMap(new ConcurrentHashMap<>(8)); - private final Set excludedClasses = - Collections.newSetFromMap(new ConcurrentHashMap(8)); + private final Set excludedClasses = Collections.newSetFromMap(new ConcurrentHashMap<>(8)); /** diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java index 689fc270ad..1877301eb2 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java @@ -82,7 +82,7 @@ public abstract class StatementCreatorUtils { static final boolean shouldIgnoreGetParameterType = SpringProperties.getFlag(IGNORE_GETPARAMETERTYPE_PROPERTY_NAME); static final Set driversWithNoSupportForGetParameterType = - Collections.newSetFromMap(new ConcurrentHashMap(1)); + Collections.newSetFromMap(new ConcurrentHashMap<>(1)); private static final Log logger = LogFactory.getLog(StatementCreatorUtils.class); diff --git a/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessor.java b/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessor.java index dad78130df..d4caa9db09 100644 --- a/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessor.java +++ b/spring-jms/src/main/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessor.java @@ -99,14 +99,14 @@ public class JmsListenerAnnotationBeanPostProcessor private StringValueResolver embeddedValueResolver; - private final MessageHandlerMethodFactoryAdapter messageHandlerMethodFactory = new MessageHandlerMethodFactoryAdapter(); + private final MessageHandlerMethodFactoryAdapter messageHandlerMethodFactory = + new MessageHandlerMethodFactoryAdapter(); private final JmsListenerEndpointRegistrar registrar = new JmsListenerEndpointRegistrar(); private final AtomicInteger counter = new AtomicInteger(); - private final Set> nonAnnotatedClasses = - Collections.newSetFromMap(new ConcurrentHashMap, Boolean>(64)); + private final Set> nonAnnotatedClasses = Collections.newSetFromMap(new ConcurrentHashMap<>(64)); @Override diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/SessionAttributesHandler.java b/spring-web/src/main/java/org/springframework/web/method/annotation/SessionAttributesHandler.java index aa54a71fb0..d5a5607c9e 100644 --- a/spring-web/src/main/java/org/springframework/web/method/annotation/SessionAttributesHandler.java +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/SessionAttributesHandler.java @@ -51,8 +51,7 @@ public class SessionAttributesHandler { private final Set> attributeTypes = new HashSet<>(); - private final Set knownAttributeNames = - Collections.newSetFromMap(new ConcurrentHashMap(4)); + private final Set knownAttributeNames = Collections.newSetFromMap(new ConcurrentHashMap<>(4)); private final SessionAttributeStore sessionAttributeStore;