Skip to content

Commit 3ea9d37

Browse files
larsgreferrwinch
larsgrefer
authored and
rwinch
committed
Cleanup explicit type arguments
1 parent c5b5cc5 commit 3ea9d37

File tree

50 files changed

+68
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+68
-68
lines changed

‎config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
5555
extends AbstractSecurityBuilder<O> {
5656
private final Log logger = LogFactory.getLog(getClass());
5757

58-
private final LinkedHashMap<Class<? extends SecurityConfigurer<O, B>>, List<SecurityConfigurer<O, B>>> configurers = new LinkedHashMap<Class<? extends SecurityConfigurer<O, B>>, List<SecurityConfigurer<O, B>>>();
59-
private final List<SecurityConfigurer<O, B>> configurersAddedInInitializing = new ArrayList<SecurityConfigurer<O, B>>();
58+
private final LinkedHashMap<Class<? extends SecurityConfigurer<O, B>>, List<SecurityConfigurer<O, B>>> configurers = new LinkedHashMap<>();
59+
private final List<SecurityConfigurer<O, B>> configurersAddedInInitializing = new ArrayList<>();
6060

61-
private final Map<Class<? extends Object>, Object> sharedObjects = new HashMap<Class<? extends Object>, Object>();
61+
private final Map<Class<? extends Object>, Object> sharedObjects = new HashMap<>();
6262

6363
private final boolean allowConfigurersOfSameType;
6464

@@ -199,7 +199,7 @@ private <C extends SecurityConfigurer<O, B>> void add(C configurer) throws Excep
199199
List<SecurityConfigurer<O, B>> configs = allowConfigurersOfSameType ? this.configurers
200200
.get(clazz) : null;
201201
if (configs == null) {
202-
configs = new ArrayList<SecurityConfigurer<O, B>>(1);
202+
configs = new ArrayList<>(1);
203203
}
204204
configs.add(configurer);
205205
this.configurers.put(clazz, configs);
@@ -386,7 +386,7 @@ private void configure() throws Exception {
386386
}
387387

388388
private Collection<SecurityConfigurer<O, B>> getConfigurers() {
389-
List<SecurityConfigurer<O, B>> result = new ArrayList<SecurityConfigurer<O, B>>();
389+
List<SecurityConfigurer<O, B>> result = new ArrayList<>();
390390
for (List<SecurityConfigurer<O, B>> configs : this.configurers.values()) {
391391
result.addAll(configs);
392392
}

‎config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void setBuilder(B builder) {
111111
*/
112112
private static final class CompositeObjectPostProcessor implements
113113
ObjectPostProcessor<Object> {
114-
private List<ObjectPostProcessor<? extends Object>> postProcessors = new ArrayList<ObjectPostProcessor<?>>();
114+
private List<ObjectPostProcessor<? extends Object>> postProcessors = new ArrayList<>();
115115

116116
@SuppressWarnings({ "rawtypes", "unchecked" })
117117
public Object postProcess(Object object) {

‎config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ protected RunAsManager runAsManager() {
241241
* @return the {@link AccessDecisionManager} to use
242242
*/
243243
protected AccessDecisionManager accessDecisionManager() {
244-
List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<AccessDecisionVoter<? extends Object>>();
244+
List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<>();
245245
ExpressionBasedPreInvocationAdvice expressionAdvice = new ExpressionBasedPreInvocationAdvice();
246246
expressionAdvice.setExpressionHandler(getExpressionHandler());
247247
if (prePostEnabled()) {

‎config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public final class WebSecurity extends
8383

8484
private final List<RequestMatcher> ignoredRequests = new ArrayList<>();
8585

86-
private final List<SecurityBuilder<? extends SecurityFilterChain>> securityFilterChainBuilders = new ArrayList<SecurityBuilder<? extends SecurityFilterChain>>();
86+
private final List<SecurityBuilder<? extends SecurityFilterChain>> securityFilterChainBuilders = new ArrayList<>();
8787

8888
private IgnoredRequestConfigurer ignoredRequestRegistry;
8989

‎config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ public AutowiredWebSecurityConfigurersIgnoreParents(
4848

4949
@SuppressWarnings({ "rawtypes", "unchecked" })
5050
public List<SecurityConfigurer<Filter, WebSecurity>> getWebSecurityConfigurers() {
51-
List<SecurityConfigurer<Filter, WebSecurity>> webSecurityConfigurers = new ArrayList<SecurityConfigurer<Filter, WebSecurity>>();
51+
List<SecurityConfigurer<Filter, WebSecurity>> webSecurityConfigurers = new ArrayList<>();
5252
Map<String, WebSecurityConfigurer> beansOfType = beanFactory
5353
.getBeansOfType(WebSecurityConfigurer.class);
5454
for (Entry<String, WebSecurityConfigurer> entry : beansOfType.entrySet()) {
5555
webSecurityConfigurers.add(entry.getValue());
5656
}
5757
return webSecurityConfigurers;
5858
}
59-
}
59+
}

‎config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ public void setAuthenticationConfiguration(
415415
* @return the shared Objects
416416
*/
417417
private Map<Class<? extends Object>, Object> createSharedObjects() {
418-
Map<Class<? extends Object>, Object> sharedObjects = new HashMap<Class<? extends Object>, Object>();
418+
Map<Class<? extends Object>, Object> sharedObjects = new HashMap<>();
419419
sharedObjects.putAll(localConfigureAuthenticationBldr.getSharedObjects());
420420
sharedObjects.put(UserDetailsService.class, userDetailsService());
421421
sharedObjects.put(ApplicationContext.class, context);

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ final LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> createRequestMa
114114
+ ". Try completing it with something like requestUrls().<something>.hasRole('USER')");
115115
}
116116

117-
LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
117+
LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<>();
118118
for (UrlMapping mapping : getUrlMappings()) {
119119
RequestMatcher matcher = mapping.getRequestMatcher();
120120
Collection<ConfigAttribute> configAttrs = mapping.getConfigAttrs();

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
public final class ChannelSecurityConfigurer<H extends HttpSecurityBuilder<H>> extends
8181
AbstractHttpConfigurer<ChannelSecurityConfigurer<H>, H> {
8282
private ChannelProcessingFilter channelFilter = new ChannelProcessingFilter();
83-
private LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
83+
private LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<>();
8484
private List<ChannelProcessor> channelProcessors;
8585

8686
private final ChannelRequestMatcherRegistry REGISTRY;
@@ -240,4 +240,4 @@ public ChannelRequestMatcherRegistry requires(String attribute) {
240240
return addAttribute(attribute, requestMatchers);
241241
}
242242
}
243-
}
243+
}

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ private AccessDeniedHandler createAccessDeniedHandler(H http) {
284284

285285
InvalidSessionAccessDeniedHandler invalidSessionDeniedHandler = new InvalidSessionAccessDeniedHandler(
286286
invalidSessionStrategy);
287-
LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler> handlers = new LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler>();
287+
LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler> handlers = new LinkedHashMap<>();
288288
handlers.put(MissingCsrfTokenException.class, invalidSessionDeniedHandler);
289289
return new DelegatingAccessDeniedHandler(handlers, defaultAccessDeniedHandler);
290290
}

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ private void interceptUrl(Iterable<? extends RequestMatcher> requestMatchers,
184184
@Override
185185
@SuppressWarnings("rawtypes")
186186
final List<AccessDecisionVoter<? extends Object>> getDecisionVoters(H http) {
187-
List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<AccessDecisionVoter<? extends Object>>();
187+
List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<>();
188188
WebExpressionVoter expressionVoter = new WebExpressionVoter();
189189
expressionVoter.setExpressionHandler(getExpressionHandler(http));
190190
decisionVoters.add(expressionVoter);

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public H and() {
173173
@Override
174174
@SuppressWarnings("rawtypes")
175175
final List<AccessDecisionVoter<? extends Object>> getDecisionVoters(H http) {
176-
List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<AccessDecisionVoter<? extends Object>>();
176+
List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<>();
177177
decisionVoters.add(new RoleVoter());
178178
decisionVoters.add(new AuthenticatedVoter());
179179
return decisionVoters;

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ private ConsumerManager getConsumerManager() {
321321
* @return the {@link AxFetchListFactory} to use
322322
*/
323323
private AxFetchListFactory attributesToFetchFactory() {
324-
Map<String, List<OpenIDAttribute>> identityToAttrs = new HashMap<String, List<OpenIDAttribute>>();
324+
Map<String, List<OpenIDAttribute>> identityToAttrs = new HashMap<>();
325325
for (AttributeExchangeConfigurer conf : this.attributeExchangeConfigurers) {
326326
identityToAttrs.put(conf.identifier, conf.getAttributes());
327327
}

‎config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public MessageSecurityMetadataSourceRegistry expressionHandler(SecurityExpressio
233233
* @return the {@link MessageSecurityMetadataSource} to use
234234
*/
235235
protected MessageSecurityMetadataSource createMetadataSource() {
236-
LinkedHashMap<MessageMatcher<?>, String> matcherToExpression = new LinkedHashMap<MessageMatcher<?>, String>();
236+
LinkedHashMap<MessageMatcher<?>, String> matcherToExpression = new LinkedHashMap<>();
237237
for (Map.Entry<MatcherBuilder, String> entry : this.matcherToExpression
238238
.entrySet()) {
239239
matcherToExpression.put(entry.getKey().build(), entry.getValue());

‎config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public ChannelSecurityInterceptor inboundChannelSecurity(MessageSecurityMetadata
159159
MessageExpressionVoter<Object> voter = new MessageExpressionVoter<>();
160160
voter.setExpressionHandler(getMessageExpressionHandler());
161161

162-
List<AccessDecisionVoter<? extends Object>> voters = new ArrayList<AccessDecisionVoter<? extends Object>>();
162+
List<AccessDecisionVoter<? extends Object>> voters = new ArrayList<>();
163163
voters.add(voter);
164164

165165
AffirmativeBased manager = new AffirmativeBased(voters);

‎config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class PasswordEncoderParser {
4343
private static final Map<String, Class<?>> ENCODER_CLASSES;
4444

4545
static {
46-
ENCODER_CLASSES = new HashMap<String, Class<?>>();
46+
ENCODER_CLASSES = new HashMap<>();
4747
ENCODER_CLASSES.put(OPT_HASH_BCRYPT, BCryptPasswordEncoder.class);
4848
}
4949

‎config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ void createOpenIDLoginFilter(BeanReference sessionStrategy, BeanReference authMa
261261
.rootBeanDefinition(OPEN_ID_CONSUMER_CLASS);
262262
BeanDefinitionBuilder axFactory = BeanDefinitionBuilder
263263
.rootBeanDefinition(OPEN_ID_ATTRIBUTE_FACTORY_CLASS);
264-
ManagedMap<String, ManagedList<BeanDefinition>> axMap = new ManagedMap<String, ManagedList<BeanDefinition>>();
264+
ManagedMap<String, ManagedList<BeanDefinition>> axMap = new ManagedMap<>();
265265

266266
for (Element attrExElt : attrExElts) {
267267
String identifierMatch = attrExElt.getAttribute("identifier-match");

‎config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ private BeanMetadataElement createAccessDeniedHandler(
144144
if (invalidSessionStrategy == null) {
145145
return defaultDeniedHandler;
146146
}
147-
ManagedMap<Class<? extends AccessDeniedException>, BeanDefinition> handlers = new ManagedMap<Class<? extends AccessDeniedException>, BeanDefinition>();
147+
ManagedMap<Class<? extends AccessDeniedException>, BeanDefinition> handlers = new ManagedMap<>();
148148
BeanDefinitionBuilder invalidSessionHandlerBldr = BeanDefinitionBuilder
149149
.rootBeanDefinition(InvalidSessionAccessDeniedHandler.class);
150150
invalidSessionHandlerBldr.addConstructorArgValue(invalidSessionStrategy);

‎config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ private void registerProtectPointcutPostProcessor(ParserContext parserContext,
381381

382382
private Map<String, List<ConfigAttribute>> parseProtectPointcuts(
383383
ParserContext parserContext, List<Element> protectPointcutElts) {
384-
Map<String, List<ConfigAttribute>> pointcutMap = new LinkedHashMap<String, List<ConfigAttribute>>();
384+
Map<String, List<ConfigAttribute>> pointcutMap = new LinkedHashMap<>();
385385

386386
for (Element childElt : protectPointcutElts) {
387387
String accessConfig = childElt.getAttribute(ATT_ACCESS);

‎config/src/main/java/org/springframework/security/config/method/MethodSecurityMetadataSourceBeanDefinitionParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class MethodSecurityMetadataSourceBeanDefinitionParser extends
4444
public AbstractBeanDefinition parseInternal(Element elt, ParserContext pc) {
4545
// Parse the included methods
4646
List<Element> methods = DomUtils.getChildElementsByTagName(elt, Elements.PROTECT);
47-
Map<String, List<ConfigAttribute>> mappings = new LinkedHashMap<String, List<ConfigAttribute>>();
47+
Map<String, List<ConfigAttribute>> mappings = new LinkedHashMap<>();
4848

4949
for (Element protectmethodElt : methods) {
5050
String[] tokens = StringUtils

‎config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor {
6262
private static final Log logger = LogFactory
6363
.getLog(ProtectPointcutPostProcessor.class);
6464

65-
private final Map<String, List<ConfigAttribute>> pointcutMap = new LinkedHashMap<String, List<ConfigAttribute>>();
65+
private final Map<String, List<ConfigAttribute>> pointcutMap = new LinkedHashMap<>();
6666
private final MapBasedMethodSecurityMetadataSource mapBasedMethodSecurityMetadataSource;
6767
private final Set<PointcutExpression> pointCutExpressions = new LinkedHashSet<>();
6868
private final PointcutParser parser;

‎config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,8 @@ public void init(AuthenticationManagerBuilder auth) throws Exception {
368368
}
369369

370370
static class MockBeanPostProcessor implements BeanPostProcessor {
371-
Map<String, Object> beforeInit = new HashMap<String, Object>();
372-
Map<String, Object> afterInit = new HashMap<String, Object>();
371+
Map<String, Object> beforeInit = new HashMap<>();
372+
Map<String, Object> afterInit = new HashMap<>();
373373

374374
@Override
375375
public Object postProcessBeforeInitialization(Object bean, String beanName) throws

‎core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ private Set<GrantedAuthority> getRolesReachableInOneOrMoreSteps(
176176
* will become a key that references a set of the reachable lower roles.
177177
*/
178178
private void buildRolesReachableInOneStepMap() {
179-
this.rolesReachableInOneStepMap = new HashMap<GrantedAuthority, Set<GrantedAuthority>>();
179+
this.rolesReachableInOneStepMap = new HashMap<>();
180180
try (BufferedReader bufferedReader = new BufferedReader(
181181
new StringReader(this.roleHierarchyStringRepresentation))) {
182182
for (String readLine; (readLine = bufferedReader.readLine()) != null;) {
@@ -187,7 +187,7 @@ private void buildRolesReachableInOneStepMap() {
187187
GrantedAuthority lowerRole = new SimpleGrantedAuthority(roles[i].replaceAll("^\\s+|\\s+$", ""));
188188
Set<GrantedAuthority> rolesReachableInOneStepSet;
189189
if (!this.rolesReachableInOneStepMap.containsKey(higherRole)) {
190-
rolesReachableInOneStepSet = new HashSet<GrantedAuthority>();
190+
rolesReachableInOneStepSet = new HashSet<>();
191191
this.rolesReachableInOneStepMap.put(higherRole, rolesReachableInOneStepSet);
192192
} else {
193193
rolesReachableInOneStepSet = this.rolesReachableInOneStepMap.get(higherRole);

‎core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public final class DelegatingMethodSecurityMetadataSource extends
4242
.emptyList();
4343

4444
private final List<MethodSecurityMetadataSource> methodSecurityMetadataSources;
45-
private final Map<DefaultCacheKey, Collection<ConfigAttribute>> attributeCache = new HashMap<DefaultCacheKey, Collection<ConfigAttribute>>();
45+
private final Map<DefaultCacheKey, Collection<ConfigAttribute>> attributeCache = new HashMap<>();
4646

4747
// ~ Constructor
4848
// ====================================================================================================

‎core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class DefaultAuthenticationEventPublisher implements AuthenticationEventP
6363
private final Log logger = LogFactory.getLog(getClass());
6464

6565
private ApplicationEventPublisher applicationEventPublisher;
66-
private final HashMap<String, Constructor<? extends AbstractAuthenticationEvent>> exceptionMappings = new HashMap<String, Constructor<? extends AbstractAuthenticationEvent>>();
66+
private final HashMap<String, Constructor<? extends AbstractAuthenticationEvent>> exceptionMappings = new HashMap<>();
6767

6868
public DefaultAuthenticationEventPublisher() {
6969
this(null);

‎core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ private <T> Collection<Callable<T>> createTasks(Collection<Callable<T>> tasks) {
131131
if (tasks == null) {
132132
return null;
133133
}
134-
List<Callable<T>> results = new ArrayList<Callable<T>>(tasks.size());
134+
List<Callable<T>> results = new ArrayList<>(tasks.size());
135135
for (Callable<T> task : tasks) {
136136
results.add(wrap(task));
137137
}
@@ -141,4 +141,4 @@ private <T> Collection<Callable<T>> createTasks(Collection<Callable<T>> tasks) {
141141
private ExecutorService getDelegate() {
142142
return (ExecutorService) getDelegateExecutor();
143143
}
144-
}
144+
}

‎core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void setAttributes2grantedAuthoritiesMap(
8888
* @return the processed Map
8989
*/
9090
private Map<String, Collection<GrantedAuthority>> preProcessMap(Map<?, ?> orgMap) {
91-
Map<String, Collection<GrantedAuthority>> result = new HashMap<String, Collection<GrantedAuthority>>(
91+
Map<String, Collection<GrantedAuthority>> result = new HashMap<>(
9292
orgMap.size());
9393

9494
for (Map.Entry<?, ?> entry : orgMap.entrySet()) {

‎core/src/main/java/org/springframework/security/jackson2/UnmodifiableListDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class UnmodifiableListDeserializer extends JsonDeserializer<List> {
4343
public List deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
4444
ObjectMapper mapper = (ObjectMapper) jp.getCodec();
4545
JsonNode node = mapper.readTree(jp);
46-
List<Object> result = new ArrayList<Object>();
46+
List<Object> result = new ArrayList<>();
4747
if (node != null) {
4848
if (node instanceof ArrayNode) {
4949
ArrayNode arrayNode = (ArrayNode) node;

‎core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyUtilsTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void roleHierarchyFromMapWhenMapValidThenConvertsCorrectly() throws Excep
3939
"ROLE_C > ROLE_D" + EOL;
4040
// @formatter:on
4141

42-
Map<String, List<String>> roleHierarchyMap = new TreeMap<String, List<String>>();
42+
Map<String, List<String>> roleHierarchyMap = new TreeMap<>();
4343
roleHierarchyMap.put("ROLE_A", asList("ROLE_B", "ROLE_C"));
4444
roleHierarchyMap.put("ROLE_B", asList("ROLE_D"));
4545
roleHierarchyMap.put("ROLE_C", asList("ROLE_D"));
@@ -61,31 +61,31 @@ public void roleHierarchyFromMapWhenMapEmptyThenThrowsIllegalArgumentException()
6161

6262
@Test(expected = IllegalArgumentException.class)
6363
public void roleHierarchyFromMapWhenRoleNullThenThrowsIllegalArgumentException() throws Exception {
64-
Map<String, List<String>> roleHierarchyMap = new HashMap<String, List<String>>();
64+
Map<String, List<String>> roleHierarchyMap = new HashMap<>();
6565
roleHierarchyMap.put(null, asList("ROLE_B", "ROLE_C"));
6666

6767
RoleHierarchyUtils.roleHierarchyFromMap(roleHierarchyMap);
6868
}
6969

7070
@Test(expected = IllegalArgumentException.class)
7171
public void roleHierarchyFromMapWhenRoleEmptyThenThrowsIllegalArgumentException() throws Exception {
72-
Map<String, List<String>> roleHierarchyMap = new HashMap<String, List<String>>();
72+
Map<String, List<String>> roleHierarchyMap = new HashMap<>();
7373
roleHierarchyMap.put("", asList("ROLE_B", "ROLE_C"));
7474

7575
RoleHierarchyUtils.roleHierarchyFromMap(roleHierarchyMap);
7676
}
7777

7878
@Test(expected = IllegalArgumentException.class)
7979
public void roleHierarchyFromMapWhenImpliedRolesNullThenThrowsIllegalArgumentException() throws Exception {
80-
Map<String, List<String>> roleHierarchyMap = new HashMap<String, List<String>>();
80+
Map<String, List<String>> roleHierarchyMap = new HashMap<>();
8181
roleHierarchyMap.put("ROLE_A", null);
8282

8383
RoleHierarchyUtils.roleHierarchyFromMap(roleHierarchyMap);
8484
}
8585

8686
@Test(expected = IllegalArgumentException.class)
8787
public void roleHierarchyFromMapWhenImpliedRolesEmptyThenThrowsIllegalArgumentException() throws Exception {
88-
Map<String, List<String>> roleHierarchyMap = new HashMap<String, List<String>>();
88+
Map<String, List<String>> roleHierarchyMap = new HashMap<>();
8989
roleHierarchyMap.put("ROLE_A", Collections.<String>emptyList());
9090

9191
RoleHierarchyUtils.roleHierarchyFromMap(roleHierarchyMap);

‎core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private ConsensusBased makeDecisionManager() {
113113
RoleVoter roleVoter = new RoleVoter();
114114
DenyVoter denyForSureVoter = new DenyVoter();
115115
DenyAgainVoter denyAgainForSureVoter = new DenyAgainVoter();
116-
List<AccessDecisionVoter<? extends Object>> voters = new Vector<AccessDecisionVoter<? extends Object>>();
116+
List<AccessDecisionVoter<? extends Object>> voters = new Vector<>();
117117
voters.add(roleVoter);
118118
voters.add(denyForSureVoter);
119119
voters.add(denyAgainForSureVoter);

0 commit comments

Comments
 (0)