From 55137e101a7c31d3b8e47d483e92a25df4cb6362 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Tue, 27 Aug 2019 02:10:07 +0200 Subject: [PATCH] Java 7: Explicit type can be replaced with <> --- .../binding/collection/AbstractCachingMapDecorator.java | 2 +- .../binding/expression/el/ELExpressionParser.java | 2 +- .../binding/message/DefaultMessageContext.java | 4 ++-- .../faces/model/SelectionTrackingActionListener.java | 2 +- .../TransitionExecutingFlowExecutionExceptionHandler.java | 4 ++-- .../repository/snapshot/SerializedFlowExecutionSnapshot.java | 2 +- .../webflow/security/SecurityFlowExecutionListener.java | 2 +- .../springframework/webflow/validation/ValidationHelper.java | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-binding/src/main/java/org/springframework/binding/collection/AbstractCachingMapDecorator.java b/spring-binding/src/main/java/org/springframework/binding/collection/AbstractCachingMapDecorator.java index 5830d8be..d8041101 100644 --- a/spring-binding/src/main/java/org/springframework/binding/collection/AbstractCachingMapDecorator.java +++ b/spring-binding/src/main/java/org/springframework/binding/collection/AbstractCachingMapDecorator.java @@ -68,7 +68,7 @@ public abstract class AbstractCachingMapDecorator implements Map, Se * @param size the initial cache size */ public AbstractCachingMapDecorator(boolean weak, int size) { - Map internalMap = weak ? new WeakHashMap (size) : new HashMap<>(size); + Map internalMap = weak ? new WeakHashMap<>(size) : new HashMap<>(size); this.targetMap = Collections.synchronizedMap(internalMap); this.synchronize = true; this.weak = weak; diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java index 6ee56c52..e092e3e7 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java @@ -46,7 +46,7 @@ public class ELExpressionParser implements ExpressionParser { private ExpressionFactory expressionFactory; - private Map, ELContextFactory> contextFactories = new HashMap, ELContextFactory>(); + private Map, ELContextFactory> contextFactories = new HashMap<>(); private ConversionService conversionService = new DefaultConversionService(); diff --git a/spring-binding/src/main/java/org/springframework/binding/message/DefaultMessageContext.java b/spring-binding/src/main/java/org/springframework/binding/message/DefaultMessageContext.java index 06301f93..ab438ff0 100644 --- a/spring-binding/src/main/java/org/springframework/binding/message/DefaultMessageContext.java +++ b/spring-binding/src/main/java/org/springframework/binding/message/DefaultMessageContext.java @@ -45,7 +45,7 @@ public class DefaultMessageContext implements StateManageableMessageContext { @SuppressWarnings("serial") private Map> sourceMessages = new AbstractCachingMapDecorator>( - new LinkedHashMap>()) { + new LinkedHashMap<>()) { protected List create(Object source) { return new ArrayList<>(); @@ -130,7 +130,7 @@ public class DefaultMessageContext implements StateManageableMessageContext { // implementing state manageable message context public Serializable createMessagesMemento() { - return new LinkedHashMap>(sourceMessages); + return new LinkedHashMap<>(sourceMessages); } @SuppressWarnings("unchecked") diff --git a/spring-faces/src/main/java/org/springframework/faces/model/SelectionTrackingActionListener.java b/spring-faces/src/main/java/org/springframework/faces/model/SelectionTrackingActionListener.java index 1a19553f..b7b9bb3d 100644 --- a/spring-faces/src/main/java/org/springframework/faces/model/SelectionTrackingActionListener.java +++ b/spring-faces/src/main/java/org/springframework/faces/model/SelectionTrackingActionListener.java @@ -52,7 +52,7 @@ public class SelectionTrackingActionListener implements ActionListener { private final ActionListener delegate; - private final Map, Method> valueMethodCache = new ConcurrentHashMap, Method>(256); + private final Map, Method> valueMethodCache = new ConcurrentHashMap<>(256); public SelectionTrackingActionListener(ActionListener delegate) { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandler.java index b44a8ed7..ae746064 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandler.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandler.java @@ -58,7 +58,7 @@ public class TransitionExecutingFlowExecutionExceptionHandler implements FlowExe /** * The exceptionType to targetStateResolver map. */ - private Map, TargetStateResolver> exceptionTargetStateMappings = new HashMap, TargetStateResolver>(); + private Map, TargetStateResolver> exceptionTargetStateMappings = new HashMap<>(); /** * The list of actions to execute when this handler handles an exception. @@ -190,4 +190,4 @@ public class TransitionExecutingFlowExecutionExceptionHandler implements FlowExe public String toString() { return new ToStringCreator(this).append("exceptionHandlingMappings", exceptionTargetStateMappings).toString(); } -} +} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java index 86dd4e81..5d1b46e6 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java @@ -231,7 +231,7 @@ public class SerializedFlowExecutionSnapshot extends FlowExecutionSnapshot imple private static class ConfigurableObjectInputStream extends ObjectInputStream { /* Temporary workaround for SPR-???? */ - private static final HashMap> PRIMITIVE_CLASSES = new HashMap>(8, 1.0F); + private static final HashMap> PRIMITIVE_CLASSES = new HashMap<>(8, 1.0F); static { PRIMITIVE_CLASSES.put("boolean", boolean.class); PRIMITIVE_CLASSES.put("byte", byte.class); diff --git a/spring-webflow/src/main/java/org/springframework/webflow/security/SecurityFlowExecutionListener.java b/spring-webflow/src/main/java/org/springframework/webflow/security/SecurityFlowExecutionListener.java index 8b7d90d3..51273526 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/security/SecurityFlowExecutionListener.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/security/SecurityFlowExecutionListener.java @@ -107,7 +107,7 @@ public class SecurityFlowExecutionListener implements FlowExecutionListener { } private AbstractAccessDecisionManager createManager(SecurityRule rule) { - List> voters = new ArrayList>(); + List> voters = new ArrayList<>(); voters.add(new RoleVoter()); if (rule.getComparisonType() == SecurityRule.COMPARISON_ANY) { return new AffirmativeBased(voters); diff --git a/spring-webflow/src/main/java/org/springframework/webflow/validation/ValidationHelper.java b/spring-webflow/src/main/java/org/springframework/webflow/validation/ValidationHelper.java index 497775ae..67973519 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/validation/ValidationHelper.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/validation/ValidationHelper.java @@ -357,7 +357,7 @@ public class ValidationHelper { private Method findValidationMethod(Object model, Object validator, String methodName, Class context) { Class modelClass = AopUtils.getTargetClass(model); - List> modelSearchClasses = new ArrayList>(); + List> modelSearchClasses = new ArrayList<>(); while (modelClass != null) { modelSearchClasses.add(modelClass); modelClass = modelClass.getSuperclass();