Use diamond operator where it can be used

Does not modify compatibility packages to keep to closer to Vaadin 7.7

Change-Id: Ic9c4944eb90218290545a04ecd7455eb63910012

99 files changed, 263 insertions, 263 deletions

diff --git a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
index 2221f045b2..db7900fd15 100644
--- a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
+++ b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
@@ -249,20 +249,20 @@ public class ApplicationConfiguration implements EntryPoint {
 
     private HashMap<Integer, String> unknownComponents;
 
-    private Map<Integer, Class<? extends ServerConnector>> classes = new HashMap<Integer, Class<? extends ServerConnector>>();
+    private Map<Integer, Class<? extends ServerConnector>> classes = new HashMap<>();
 
     private boolean widgetsetVersionSent = false;
     private static boolean moduleLoaded = false;
 
     static// TODO consider to make this hashmap per application
-    LinkedList<Command> callbacks = new LinkedList<Command>();
+    LinkedList<Command> callbacks = new LinkedList<>();
 
     private static int dependenciesLoading;
 
-    private static ArrayList<ApplicationConnection> runningApplications = new ArrayList<ApplicationConnection>();
+    private static ArrayList<ApplicationConnection> runningApplications = new ArrayList<>();
 
-    private Map<Integer, Integer> componentInheritanceMap = new HashMap<Integer, Integer>();
-    private Map<Integer, String> tagToServerSideClassName = new HashMap<Integer, String>();
+    private Map<Integer, Integer> componentInheritanceMap = new HashMap<>();
+    private Map<Integer, String> tagToServerSideClassName = new HashMap<>();
 
     /**
      * Checks whether path info in requests to the server-side service should be
@@ -528,7 +528,7 @@ public class ApplicationConfiguration implements EntryPoint {
             if (type == null) {
                 type = UnknownComponentConnector.class;
                 if (unknownComponents == null) {
-                    unknownComponents = new HashMap<Integer, String>();
+                    unknownComponents = new HashMap<>();
                 }
                 unknownComponents.put(tag, getServerSideClassNameForTag(tag));
             }
@@ -572,7 +572,7 @@ public class ApplicationConfiguration implements EntryPoint {
      * @return Integer array of tags pointing to this classname
      */
     public Integer[] getTagsForServerSideClassName(String classname) {
-        List<Integer> tags = new ArrayList<Integer>();
+        List<Integer> tags = new ArrayList<>();
 
         for (Map.Entry<Integer, String> entry : tagToServerSideClassName
                 .entrySet()) {
diff --git a/client/src/main/java/com/vaadin/client/ApplicationConnection.java b/client/src/main/java/com/vaadin/client/ApplicationConnection.java
index 8bc6a7460f..1fe1f83cb1 100644
--- a/client/src/main/java/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/main/java/com/vaadin/client/ApplicationConnection.java
@@ -117,7 +117,7 @@ public class ApplicationConnection implements HasHandlers {
      */
     public static final String UIDL_REFRESH_TOKEN = "Vaadin-Refresh";
 
-    private final HashMap<String, String> resourcesMap = new HashMap<String, String>();
+    private final HashMap<String, String> resourcesMap = new HashMap<>();
 
     private WidgetSet widgetSet;
 
@@ -159,7 +159,7 @@ public class ApplicationConnection implements HasHandlers {
     public static class RequestStartingEvent
             extends ApplicationConnectionEvent {
 
-        public static Type<CommunicationHandler> TYPE = new Type<CommunicationHandler>();
+        public static Type<CommunicationHandler> TYPE = new Type<>();
 
         public RequestStartingEvent(ApplicationConnection connection) {
             super(connection);
@@ -179,7 +179,7 @@ public class ApplicationConnection implements HasHandlers {
     public static class ResponseHandlingEndedEvent
             extends ApplicationConnectionEvent {
 
-        public static Type<CommunicationHandler> TYPE = new Type<CommunicationHandler>();
+        public static Type<CommunicationHandler> TYPE = new Type<>();
 
         public ResponseHandlingEndedEvent(ApplicationConnection connection) {
             super(connection);
@@ -218,7 +218,7 @@ public class ApplicationConnection implements HasHandlers {
             super(connection);
         }
 
-        public static Type<CommunicationHandler> TYPE = new Type<CommunicationHandler>();
+        public static Type<CommunicationHandler> TYPE = new Type<>();
 
         @Override
         public Type<CommunicationHandler> getAssociatedType() {
@@ -246,7 +246,7 @@ public class ApplicationConnection implements HasHandlers {
     public static class ApplicationStoppedEvent
             extends GwtEvent<ApplicationStoppedHandler> {
 
-        public static Type<ApplicationStoppedHandler> TYPE = new Type<ApplicationStoppedHandler>();
+        public static Type<ApplicationStoppedHandler> TYPE = new Type<>();
 
         @Override
         public Type<ApplicationStoppedHandler> getAssociatedType() {
diff --git a/client/src/main/java/com/vaadin/client/ComponentDetail.java b/client/src/main/java/com/vaadin/client/ComponentDetail.java
index 43874a1922..ebdcc4414c 100644
--- a/client/src/main/java/com/vaadin/client/ComponentDetail.java
+++ b/client/src/main/java/com/vaadin/client/ComponentDetail.java
@@ -61,7 +61,7 @@ class ComponentDetail {
             additionalTooltips.remove(key);
         } else {
             if (additionalTooltips == null) {
-                additionalTooltips = new HashMap<Object, TooltipInfo>();
+                additionalTooltips = new HashMap<>();
             }
             additionalTooltips.put(key, tooltip);
         }
diff --git a/client/src/main/java/com/vaadin/client/ComponentDetailMap.java b/client/src/main/java/com/vaadin/client/ComponentDetailMap.java
index bed3ae9387..f95c1c1a83 100644
--- a/client/src/main/java/com/vaadin/client/ComponentDetailMap.java
+++ b/client/src/main/java/com/vaadin/client/ComponentDetailMap.java
@@ -80,7 +80,7 @@ final class ComponentDetailMap extends JavaScriptObject {
     }-*/;
 
     final Collection<ComponentDetail> values() {
-        ArrayList<ComponentDetail> list = new ArrayList<ComponentDetail>();
+        ArrayList<ComponentDetail> list = new ArrayList<>();
         fillWithValues(list);
         return list;
     }
diff --git a/client/src/main/java/com/vaadin/client/ConnectorHierarchyChangeEvent.java b/client/src/main/java/com/vaadin/client/ConnectorHierarchyChangeEvent.java
index f63a509161..516cd808b5 100644
--- a/client/src/main/java/com/vaadin/client/ConnectorHierarchyChangeEvent.java
+++ b/client/src/main/java/com/vaadin/client/ConnectorHierarchyChangeEvent.java
@@ -39,7 +39,7 @@ public class ConnectorHierarchyChangeEvent
     /**
      * Type of this event, used by the event bus.
      */
-    public static final Type<ConnectorHierarchyChangeHandler> TYPE = new Type<ConnectorHierarchyChangeHandler>();
+    public static final Type<ConnectorHierarchyChangeHandler> TYPE = new Type<>();
 
     List<ComponentConnector> oldChildren;
 
diff --git a/client/src/main/java/com/vaadin/client/ConnectorMap.java b/client/src/main/java/com/vaadin/client/ConnectorMap.java
index 8ac9fe5c8f..ab31f0c1cb 100644
--- a/client/src/main/java/com/vaadin/client/ConnectorMap.java
+++ b/client/src/main/java/com/vaadin/client/ConnectorMap.java
@@ -217,7 +217,7 @@ public class ConnectorMap {
      */
     @Deprecated
     public ComponentConnector[] getComponentConnectors() {
-        ArrayList<ComponentConnector> result = new ArrayList<ComponentConnector>();
+        ArrayList<ComponentConnector> result = new ArrayList<>();
 
         JsArrayObject<ServerConnector> connectors = getConnectorsAsJsArray();
         int size = connectors.size();
@@ -267,7 +267,7 @@ public class ConnectorMap {
     @Deprecated
     public Collection<? extends ServerConnector> getConnectors() {
         Collection<ComponentDetail> values = idToComponentDetail.values();
-        ArrayList<ServerConnector> arrayList = new ArrayList<ServerConnector>(
+        ArrayList<ServerConnector> arrayList = new ArrayList<>(
                 values.size());
         for (ComponentDetail componentDetail : values) {
             arrayList.add(componentDetail.getConnector());
diff --git a/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java b/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java
index 04d316a4e9..4a6e474a59 100644
--- a/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java
+++ b/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java
@@ -45,9 +45,9 @@ public class JavaScriptConnectorHelper {
             .createObject();
     private final JavaScriptObject rpcMap = JavaScriptObject.createObject();
 
-    private final Map<String, JavaScriptObject> rpcObjects = new HashMap<String, JavaScriptObject>();
-    private final Map<String, Set<String>> rpcMethods = new HashMap<String, Set<String>>();
-    private final Map<Element, Map<JavaScriptObject, ElementResizeListener>> resizeListeners = new HashMap<Element, Map<JavaScriptObject, ElementResizeListener>>();
+    private final Map<String, JavaScriptObject> rpcObjects = new HashMap<>();
+    private final Map<String, Set<String>> rpcMethods = new HashMap<>();
+    private final Map<Element, Map<JavaScriptObject, ElementResizeListener>> resizeListeners = new HashMap<>();
 
     private JavaScriptObject connectorWrapper;
     private int tag;
@@ -120,7 +120,7 @@ public class JavaScriptConnectorHelper {
                     JavaScriptObject wildcardRpcObject = rpcObjects.get("");
                     Set<String> interfaces = rpcMethods.get(method);
                     if (interfaces == null) {
-                        interfaces = new HashSet<String>();
+                        interfaces = new HashSet<>();
                         rpcMethods.put(method, interfaces);
                         attachRpcMethod(wildcardRpcObject, null, method);
                     }
@@ -155,7 +155,7 @@ public class JavaScriptConnectorHelper {
     protected boolean initJavaScript() {
         ApplicationConfiguration conf = connector.getConnection()
                 .getConfiguration();
-        ArrayList<String> attemptedNames = new ArrayList<String>();
+        ArrayList<String> attemptedNames = new ArrayList<>();
         Integer tag = Integer.valueOf(this.tag);
         while (tag != null) {
             String serverSideClassName = conf.getServerSideClassNameForTag(tag);
@@ -260,7 +260,7 @@ public class JavaScriptConnectorHelper {
         Map<JavaScriptObject, ElementResizeListener> elementListeners = resizeListeners
                 .get(element);
         if (elementListeners == null) {
-            elementListeners = new HashMap<JavaScriptObject, ElementResizeListener>();
+            elementListeners = new HashMap<>();
             resizeListeners.put(element, elementListeners);
         }
 
diff --git a/client/src/main/java/com/vaadin/client/LayoutManager.java b/client/src/main/java/com/vaadin/client/LayoutManager.java
index 48a5ae10e5..841eead561 100644
--- a/client/src/main/java/com/vaadin/client/LayoutManager.java
+++ b/client/src/main/java/com/vaadin/client/LayoutManager.java
@@ -46,7 +46,7 @@ public class LayoutManager {
     private static final boolean debugLogging = false;
 
     private ApplicationConnection connection;
-    private final Set<Element> measuredNonConnectorElements = new HashSet<Element>();
+    private final Set<Element> measuredNonConnectorElements = new HashSet<>();
     private final MeasuredSize nullSize = new MeasuredSize();
 
     private LayoutDependencyTree currentDependencyTree;
@@ -58,8 +58,8 @@ public class LayoutManager {
 
     private FastStringSet pendingOverflowFixes = FastStringSet.create();
 
-    private final Map<Element, Collection<ElementResizeListener>> elementResizeListeners = new HashMap<Element, Collection<ElementResizeListener>>();
-    private final Set<Element> listenersToFire = new HashSet<Element>();
+    private final Map<Element, Collection<ElementResizeListener>> elementResizeListeners = new HashMap<>();
+    private final Set<Element> listenersToFire = new HashSet<>();
 
     private boolean layoutPending = false;
     private Timer layoutTimer = new Timer() {
@@ -618,7 +618,7 @@ public class LayoutManager {
         int pendingOverflowCount = pendingOverflowConnectorsIds.length();
         ConnectorMap connectorMap = ConnectorMap.get(connection);
         if (pendingOverflowCount > 0) {
-            HashMap<Element, String> originalOverflows = new HashMap<Element, String>();
+            HashMap<Element, String> originalOverflows = new HashMap<>();
 
             FastStringSet delayedOverflowFixes = FastStringSet.create();
 
@@ -1724,7 +1724,7 @@ public class LayoutManager {
         Collection<ElementResizeListener> listeners = elementResizeListeners
                 .get(element);
         if (listeners == null) {
-            listeners = new HashSet<ElementResizeListener>();
+            listeners = new HashSet<>();
             elementResizeListeners.put(element, listeners);
             ensureMeasured(element);
         }
diff --git a/client/src/main/java/com/vaadin/client/LocaleService.java b/client/src/main/java/com/vaadin/client/LocaleService.java
index 661c885c9f..01fbeb4d2c 100644
--- a/client/src/main/java/com/vaadin/client/LocaleService.java
+++ b/client/src/main/java/com/vaadin/client/LocaleService.java
@@ -33,7 +33,7 @@ import com.vaadin.shared.ui.ui.UIState.LocaleData;
  */
 public class LocaleService {
 
-    private static Map<String, LocaleData> cache = new HashMap<String, LocaleData>();
+    private static Map<String, LocaleData> cache = new HashMap<>();
 
     private static String defaultLocale;
 
diff --git a/client/src/main/java/com/vaadin/client/Profiler.java b/client/src/main/java/com/vaadin/client/Profiler.java
index 223f19b1b0..290ec8a4a9 100644
--- a/client/src/main/java/com/vaadin/client/Profiler.java
+++ b/client/src/main/java/com/vaadin/client/Profiler.java
@@ -89,7 +89,7 @@ public class Profiler {
      */
     public static class Node {
         private final String name;
-        private final LinkedHashMap<String, Node> children = new LinkedHashMap<String, Node>();
+        private final LinkedHashMap<String, Node> children = new LinkedHashMap<>();
         private double time = 0;
         private int count = 0;
         private double enterTime = 0;
@@ -462,7 +462,7 @@ public class Profiler {
             return;
         }
 
-        LinkedList<Node> stack = new LinkedList<Node>();
+        LinkedList<Node> stack = new LinkedList<>();
         Node rootNode = new Node(null);
         stack.add(rootNode);
         JsArray<GwtStatsEvent> gwtStatsEvents = getGwtStatsEvents();
@@ -472,7 +472,7 @@ public class Profiler {
             return;
         }
 
-        Set<Node> extendedTimeNodes = new HashSet<Node>();
+        Set<Node> extendedTimeNodes = new HashSet<>();
         for (int i = 0; i < gwtStatsEvents.length(); i++) {
             GwtStatsEvent gwtStatsEvent = gwtStatsEvents.get(i);
             String eventName = gwtStatsEvent.getEventName();
@@ -540,10 +540,10 @@ public class Profiler {
             return;
         }
 
-        Map<String, Node> totals = new HashMap<String, Node>();
+        Map<String, Node> totals = new HashMap<>();
         rootNode.sumUpTotals(totals);
 
-        ArrayList<Node> totalList = new ArrayList<Node>(totals.values());
+        ArrayList<Node> totalList = new ArrayList<>(totals.values());
         Collections.sort(totalList, new Comparator<Node>() {
             @Override
             public int compare(Node o1, Node o2) {
@@ -584,7 +584,7 @@ public class Profiler {
                     "domContentLoadedEventStart", "domContentLoadedEventEnd",
                     "domComplete", "loadEventStart", "loadEventEnd" };
 
-            LinkedHashMap<String, Double> timings = new LinkedHashMap<String, Double>();
+            LinkedHashMap<String, Double> timings = new LinkedHashMap<>();
 
             for (String key : keys) {
                 double value = getPerformanceTiming(key);
diff --git a/client/src/main/java/com/vaadin/client/ResourceLoader.java b/client/src/main/java/com/vaadin/client/ResourceLoader.java
index 72274c8d42..37f6f51a4c 100644
--- a/client/src/main/java/com/vaadin/client/ResourceLoader.java
+++ b/client/src/main/java/com/vaadin/client/ResourceLoader.java
@@ -142,11 +142,11 @@ public class ResourceLoader {
 
     private ApplicationConnection connection;
 
-    private final Set<String> loadedResources = new HashSet<String>();
-    private final Set<String> preloadedResources = new HashSet<String>();
+    private final Set<String> loadedResources = new HashSet<>();
+    private final Set<String> preloadedResources = new HashSet<>();
 
-    private final Map<String, Collection<ResourceLoadListener>> loadListeners = new HashMap<String, Collection<ResourceLoadListener>>();
-    private final Map<String, Collection<ResourceLoadListener>> preloadListeners = new HashMap<String, Collection<ResourceLoadListener>>();
+    private final Map<String, Collection<ResourceLoadListener>> loadListeners = new HashMap<>();
+    private final Map<String, Collection<ResourceLoadListener>> preloadListeners = new HashMap<>();
 
     private final Element head;
 
@@ -555,7 +555,7 @@ public class ResourceLoader {
             Map<String, Collection<ResourceLoadListener>> listenerMap) {
         Collection<ResourceLoadListener> listeners = listenerMap.get(url);
         if (listeners == null) {
-            listeners = new HashSet<ResourceLoader.ResourceLoadListener>();
+            listeners = new HashSet<>();
             listeners.add(listener);
             listenerMap.put(url, listeners);
             return true;
diff --git a/client/src/main/java/com/vaadin/client/UIDL.java b/client/src/main/java/com/vaadin/client/UIDL.java
index dd546eb4bb..165f0c6b05 100644
--- a/client/src/main/java/com/vaadin/client/UIDL.java
+++ b/client/src/main/java/com/vaadin/client/UIDL.java
@@ -121,7 +121,7 @@ public final class UIDL extends JavaScriptObject {
      */
     public Set<String> getVariableNames() {
         if (!hasVariables()) {
-            return new HashSet<String>();
+            return new HashSet<>();
         } else {
             Set<String> keySet = var().getKeySet();
             return keySet;
@@ -453,7 +453,7 @@ public final class UIDL extends JavaScriptObject {
      * @return the value of the variable
      */
     public Set<String> getStringArrayVariableAsSet(final String name) {
-        final HashSet<String> s = new HashSet<String>();
+        final HashSet<String> s = new HashSet<>();
         JsArrayString a = var().getJSStringArray(name);
         for (int i = 0; i < a.length(); i++) {
             s.add(a.get(i));
diff --git a/client/src/main/java/com/vaadin/client/Util.java b/client/src/main/java/com/vaadin/client/Util.java
index 7d7a6483e3..553911b7b8 100644
--- a/client/src/main/java/com/vaadin/client/Util.java
+++ b/client/src/main/java/com/vaadin/client/Util.java
@@ -777,7 +777,7 @@ public class Util {
         try {
             getLogger().info("RPC invocations to be sent to the server:");
             String curId = null;
-            ArrayList<MethodInvocation> invocations = new ArrayList<MethodInvocation>();
+            ArrayList<MethodInvocation> invocations = new ArrayList<>();
             for (MethodInvocation methodInvocation : methodInvocations) {
                 String id = methodInvocation.getConnectorId();
 
diff --git a/client/src/main/java/com/vaadin/client/ValueMap.java b/client/src/main/java/com/vaadin/client/ValueMap.java
index ebc387a486..119e169e82 100644
--- a/client/src/main/java/com/vaadin/client/ValueMap.java
+++ b/client/src/main/java/com/vaadin/client/ValueMap.java
@@ -62,7 +62,7 @@ public final class ValueMap extends JavaScriptObject {
     }-*/;
 
     public Set<String> getKeySet() {
-        final HashSet<String> attrs = new HashSet<String>();
+        final HashSet<String> attrs = new HashSet<>();
         JsArrayString attributeNamesArray = getKeyArray();
         for (int i = 0; i < attributeNamesArray.length(); i++) {
             attrs.add(attributeNamesArray.get(i));
diff --git a/client/src/main/java/com/vaadin/client/WidgetMap.java b/client/src/main/java/com/vaadin/client/WidgetMap.java
index 6e002b6fc2..5a2fb06a69 100644
--- a/client/src/main/java/com/vaadin/client/WidgetMap.java
+++ b/client/src/main/java/com/vaadin/client/WidgetMap.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
  */
 abstract class WidgetMap {
 
-    protected static HashMap<Class<? extends ServerConnector>, WidgetInstantiator> instmap = new HashMap<Class<? extends ServerConnector>, WidgetInstantiator>();
+    protected static HashMap<Class<? extends ServerConnector>, WidgetInstantiator> instmap = new HashMap<>();
 
     /**
      * Create a new instance of a connector based on its type.
diff --git a/client/src/main/java/com/vaadin/client/WidgetUtil.java b/client/src/main/java/com/vaadin/client/WidgetUtil.java
index 8ba678e429..5a679e897d 100644
--- a/client/src/main/java/com/vaadin/client/WidgetUtil.java
+++ b/client/src/main/java/com/vaadin/client/WidgetUtil.java
@@ -1387,7 +1387,7 @@ public class WidgetUtil {
         /*
          * Map the size units with their type.
          */
-        private static Map<String, Unit> type2Unit = new HashMap<String, Style.Unit>();
+        private static Map<String, Unit> type2Unit = new HashMap<>();
         static {
             for (Unit unit : Unit.values()) {
                 type2Unit.put(unit.getType(), unit);
diff --git a/client/src/main/java/com/vaadin/client/communication/JsonDecoder.java b/client/src/main/java/com/vaadin/client/communication/JsonDecoder.java
index 4de251a411..9a0eb60983 100644
--- a/client/src/main/java/com/vaadin/client/communication/JsonDecoder.java
+++ b/client/src/main/java/com/vaadin/client/communication/JsonDecoder.java
@@ -203,7 +203,7 @@ public class JsonDecoder {
         if (jsonMap.getType() == JsonType.ARRAY) {
             JsonArray array = (JsonArray) jsonMap;
             if (array.length() == 0) {
-                return new HashMap<Object, Object>();
+                return new HashMap<>();
             }
         }
 
@@ -228,7 +228,7 @@ public class JsonDecoder {
     private static Map<Object, Object> decodeObjectMap(Type keyType,
             Type valueType, JsonArray jsonValue,
             ApplicationConnection connection) {
-        Map<Object, Object> map = new HashMap<Object, Object>();
+        Map<Object, Object> map = new HashMap<>();
 
         JsonArray keys = jsonValue.get(0);
         JsonArray values = jsonValue.get(1);
@@ -249,7 +249,7 @@ public class JsonDecoder {
 
     private static Map<Object, Object> decodeConnectorMap(Type valueType,
             JsonObject jsonMap, ApplicationConnection connection) {
-        Map<Object, Object> map = new HashMap<Object, Object>();
+        Map<Object, Object> map = new HashMap<>();
 
         ConnectorMap connectorMap = ConnectorMap.get(connection);
 
@@ -264,7 +264,7 @@ public class JsonDecoder {
 
     private static Map<Object, Object> decodeStringMap(Type valueType,
             JsonObject jsonMap, ApplicationConnection connection) {
-        Map<Object, Object> map = new HashMap<Object, Object>();
+        Map<Object, Object> map = new HashMap<>();
 
         for (String key : jsonMap.keys()) {
             Object value = decodeValue(valueType, jsonMap.get(key), null,
@@ -277,7 +277,7 @@ public class JsonDecoder {
 
     private static List<Object> decodeList(Type type, JsonArray jsonArray,
             ApplicationConnection connection) {
-        List<Object> tokens = new ArrayList<Object>();
+        List<Object> tokens = new ArrayList<>();
         decodeIntoCollection(type.getParameterTypes()[0], jsonArray, connection,
                 tokens);
         return tokens;
@@ -285,7 +285,7 @@ public class JsonDecoder {
 
     private static Set<Object> decodeSet(Type type, JsonArray jsonArray,
             ApplicationConnection connection) {
-        Set<Object> tokens = new HashSet<Object>();
+        Set<Object> tokens = new HashSet<>();
         decodeIntoCollection(type.getParameterTypes()[0], jsonArray, connection,
                 tokens);
         return tokens;
diff --git a/client/src/main/java/com/vaadin/client/communication/MessageHandler.java b/client/src/main/java/com/vaadin/client/communication/MessageHandler.java
index f3c84c39c3..a8e22ea53b 100644
--- a/client/src/main/java/com/vaadin/client/communication/MessageHandler.java
+++ b/client/src/main/java/com/vaadin/client/communication/MessageHandler.java
@@ -123,12 +123,12 @@ public class MessageHandler {
      * If responseHandlingLocks contains any objects, response handling is
      * suspended until the collection is empty or a timeout has occurred.
      */
-    private Set<Object> responseHandlingLocks = new HashSet<Object>();
+    private Set<Object> responseHandlingLocks = new HashSet<>();
 
     /**
      * Contains all UIDL messages received while response handling is suspended
      */
-    private List<PendingUIDLMessage> pendingUIDLMessages = new ArrayList<PendingUIDLMessage>();
+    private List<PendingUIDLMessage> pendingUIDLMessages = new ArrayList<>();
 
     // will hold the CSRF token once received
     private String csrfToken = ApplicationConstants.CSRF_TOKEN_DEFAULT_VALUE;
@@ -1227,8 +1227,8 @@ public class MessageHandler {
                     Profiler.enter(
                             "updateConnectorHierarchy find new connectors");
 
-                    List<ServerConnector> newChildren = new ArrayList<ServerConnector>();
-                    List<ComponentConnector> newComponents = new ArrayList<ComponentConnector>();
+                    List<ServerConnector> newChildren = new ArrayList<>();
+                    List<ComponentConnector> newComponents = new ArrayList<>();
                     for (int connectorIndex = 0; connectorIndex < childConnectorSize; connectorIndex++) {
                         String childConnectorId = childConnectorIds
                                 .get(connectorIndex);
diff --git a/client/src/main/java/com/vaadin/client/communication/ServerRpcQueue.java b/client/src/main/java/com/vaadin/client/communication/ServerRpcQueue.java
index dfea30eb86..35d6f48565 100644
--- a/client/src/main/java/com/vaadin/client/communication/ServerRpcQueue.java
+++ b/client/src/main/java/com/vaadin/client/communication/ServerRpcQueue.java
@@ -53,7 +53,7 @@ public class ServerRpcQueue {
      * invocation. Without lastonly, an incremental id based on
      * {@link #lastInvocationTag} is used to get unique values.
      */
-    private LinkedHashMap<String, MethodInvocation> pendingInvocations = new LinkedHashMap<String, MethodInvocation>();
+    private LinkedHashMap<String, MethodInvocation> pendingInvocations = new LinkedHashMap<>();
 
     private int lastInvocationTag = 0;
 
diff --git a/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java b/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java
index c5872866a9..0795d69b32 100644
--- a/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java
+++ b/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java
@@ -38,7 +38,7 @@ public class StateChangeEvent
     /**
      * Type of this event, used by the event bus.
      */
-    public static final Type<StateChangeHandler> TYPE = new Type<StateChangeHandler>();
+    public static final Type<StateChangeHandler> TYPE = new Type<>();
 
     /**
      * Used to cache a FastStringSet representation of the properties that have
@@ -158,7 +158,7 @@ public class StateChangeEvent
     public Set<String> getChangedProperties() {
         if (changedPropertiesSet == null) {
             Profiler.enter("StateChangeEvent.getChangedProperties populate");
-            changedPropertiesSet = new HashSet<String>();
+            changedPropertiesSet = new HashSet<>();
             getChangedPropertiesFastSet().addAllTo(changedPropertiesSet);
             Profiler.leave("StateChangeEvent.getChangedProperties populate");
         }
diff --git a/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java b/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java
index 9f34c3468b..2e56918ab3 100644
--- a/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java
+++ b/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java
@@ -242,7 +242,7 @@ public class LegacyLocatorStrategy implements LocatorStrategy {
     @Override
     public List<Element> getElementsByPath(String path) {
         // This type of search is not supported in LegacyLocator
-        List<Element> array = new ArrayList<Element>();
+        List<Element> array = new ArrayList<>();
         Element e = getElementByPath(path);
         if (e != null) {
             array.add(e);
@@ -257,7 +257,7 @@ public class LegacyLocatorStrategy implements LocatorStrategy {
     public List<Element> getElementsByPathStartingAt(String path,
             Element root) {
         // This type of search is not supported in LegacyLocator
-        List<Element> array = new ArrayList<Element>();
+        List<Element> array = new ArrayList<>();
         Element e = getElementByPathStartingAt(path, root);
         if (e != null) {
             array.add(e);
@@ -647,7 +647,7 @@ public class LegacyLocatorStrategy implements LocatorStrategy {
                 if (widgetClassName.equals("VWindow")) {
                     List<WindowConnector> windows = client.getUIConnector()
                             .getSubWindows();
-                    List<VWindow> windowWidgets = new ArrayList<VWindow>(
+                    List<VWindow> windowWidgets = new ArrayList<>(
                             windows.size());
                     for (WindowConnector wc : windows) {
                         windowWidgets.add(wc.getWidget());
diff --git a/client/src/main/java/com/vaadin/client/componentlocator/SelectorPredicate.java b/client/src/main/java/com/vaadin/client/componentlocator/SelectorPredicate.java
index f76a0bc34c..f01c693c4c 100644
--- a/client/src/main/java/com/vaadin/client/componentlocator/SelectorPredicate.java
+++ b/client/src/main/java/com/vaadin/client/componentlocator/SelectorPredicate.java
@@ -38,7 +38,7 @@ public class SelectorPredicate {
         if (path.startsWith("(")) {
             return extractPredicates(path.substring(path.lastIndexOf(')')));
         }
-        return new ArrayList<SelectorPredicate>();
+        return new ArrayList<>();
     }
 
     /**
@@ -49,7 +49,7 @@ public class SelectorPredicate {
      * @return a List of Predicate objects
      */
     public static List<SelectorPredicate> extractPredicates(String path) {
-        List<SelectorPredicate> predicates = new ArrayList<SelectorPredicate>();
+        List<SelectorPredicate> predicates = new ArrayList<>();
 
         String predicateStr = extractPredicateString(path);
         if (null == predicateStr || predicateStr.length() == 0) {
@@ -114,7 +114,7 @@ public class SelectorPredicate {
      * @return List of predicate strings
      */
     private static List<String> readPredicatesFromString(String predicateStr) {
-        List<String> predicates = new ArrayList<String>();
+        List<String> predicates = new ArrayList<>();
         int prevIdx = 0;
         int idx = LocatorUtil.indexOfIgnoringQuoted(predicateStr, ',', prevIdx);
 
diff --git a/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java b/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
index 3e1387b314..3ba6284cf2 100644
--- a/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
+++ b/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
@@ -98,7 +98,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
 
         List<ConnectorPath> hierarchy = getConnectorHierarchyForElement(
                 targetElement);
-        List<String> path = new ArrayList<String>();
+        List<String> path = new ArrayList<>();
 
         // Assemble longname path components back-to-forth with useful
         // predicates - first try ID, then caption.
@@ -182,7 +182,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
      */
     private List<String> generateQueries(List<String> components) {
         // Prepare to loop through all the elements.
-        List<String> paths = new ArrayList<String>();
+        List<String> paths = new ArrayList<>();
         int compIdx = 0;
         String basePath = components.get(compIdx).replace("com.vaadin.ui.", "");
         // Add a basic search for the first element (eg. //Button)
@@ -243,7 +243,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
     private List<ConnectorPath> getConnectorHierarchyForElement(Element elem) {
         Element e = elem;
         ComponentConnector c = Util.findPaintable(client, e);
-        List<ConnectorPath> connectorHierarchy = new ArrayList<ConnectorPath>();
+        List<ConnectorPath> connectorHierarchy = new ArrayList<>();
 
         while (c != null) {
 
@@ -281,7 +281,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
             path = path.substring(1, path.lastIndexOf(')'));
         }
 
-        List<Element> elements = new ArrayList<Element>();
+        List<Element> elements = new ArrayList<>();
         if (LocatorUtil.isNotificationElement(path)) {
 
             for (VNotification n : findNotificationsByPath(path)) {
@@ -385,7 +385,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
      */
     private List<VNotification> findNotificationsByPath(String path) {
 
-        List<VNotification> notifications = new ArrayList<VNotification>();
+        List<VNotification> notifications = new ArrayList<>();
         for (Widget w : RootPanel.get()) {
             if (w instanceof VNotification) {
                 notifications.add((VNotification) w);
@@ -431,7 +431,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
             connectors = Arrays.asList(root);
         }
 
-        List<Element> output = new ArrayList<Element>();
+        List<Element> output = new ArrayList<>();
         if (null != connectors && !connectors.isEmpty()) {
             for (ComponentConnector connector : connectors) {
                 if (!actualRoot
@@ -474,7 +474,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
 
         String[] fragments = splitFirstFragmentFromTheRest(path);
 
-        List<ComponentConnector> connectors = new ArrayList<ComponentConnector>();
+        List<ComponentConnector> connectors = new ArrayList<>();
         for (ComponentConnector parent : parents) {
             connectors.addAll(filterMatches(
                     collectPotentialMatches(parent, fragments[0],
@@ -557,7 +557,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
     private List<ComponentConnector> collectPotentialMatches(
             ComponentConnector parent, String pathFragment,
             boolean collectRecursively) {
-        ArrayList<ComponentConnector> potentialMatches = new ArrayList<ComponentConnector>();
+        ArrayList<ComponentConnector> potentialMatches = new ArrayList<>();
         String widgetName = getWidgetName(pathFragment);
         // Special case when searching for UIElement.
         if (LocatorUtil.isUIElement(pathFragment)) {
@@ -585,7 +585,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
 
     private List<String> getIDsForConnector(ComponentConnector connector) {
         Class<?> connectorClass = connector.getClass();
-        List<String> ids = new ArrayList<String>();
+        List<String> ids = new ArrayList<>();
 
         TypeDataStore.get().findIdentifiersFor(connectorClass).addAllTo(ids);
 
@@ -732,7 +732,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
      */
     private final <T> List<T> eliminateDuplicates(List<T> list) {
 
-        LinkedHashSet<T> set = new LinkedHashSet<T>(list);
+        LinkedHashSet<T> set = new LinkedHashSet<>(list);
         list.clear();
         list.addAll(set);
         return list;
diff --git a/client/src/main/java/com/vaadin/client/connectors/data/DataCommunicatorConnector.java b/client/src/main/java/com/vaadin/client/connectors/data/DataCommunicatorConnector.java
index b2b3372764..d3e381f0c3 100644
--- a/client/src/main/java/com/vaadin/client/connectors/data/DataCommunicatorConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/data/DataCommunicatorConnector.java
@@ -48,7 +48,7 @@ public class DataCommunicatorConnector extends AbstractExtensionConnector {
      */
     public class VaadinDataSource extends AbstractRemoteDataSource<JsonObject> {
 
-        private Set<String> droppedKeys = new HashSet<String>();
+        private Set<String> droppedKeys = new HashSet<>();
 
         protected VaadinDataSource() {
             registerRpc(DataCommunicatorClientRpc.class,
@@ -61,7 +61,7 @@ public class DataCommunicatorConnector extends AbstractExtensionConnector {
 
                         @Override
                         public void setData(int firstIndex, JsonArray data) {
-                            ArrayList<JsonObject> rows = new ArrayList<JsonObject>(
+                            ArrayList<JsonObject> rows = new ArrayList<>(
                                     data.length());
                             for (int i = 0; i < data.length(); i++) {
                                 JsonObject rowObject = data.getObject(i);
diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/GridConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/GridConnector.java
index 9f2b8971c1..2259f47647 100644
--- a/client/src/main/java/com/vaadin/client/connectors/grid/GridConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/grid/GridConnector.java
@@ -66,7 +66,7 @@ public class GridConnector extends AbstractListingConnector
     protected void init() {
         super.init();
 
-        new ClickSelectHandler<JsonObject>(getWidget());
+        new ClickSelectHandler<>(getWidget());
         getWidget().addSortHandler(this::handleSortEvent);
 
         layout();
diff --git a/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java
index 71568cac7a..9cc32998b2 100644
--- a/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java
+++ b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java
@@ -178,8 +178,8 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> {
 
     private Range cached = Range.between(0, 0);
 
-    private final HashMap<Integer, T> indexToRowMap = new HashMap<Integer, T>();
-    private final HashMap<Object, Integer> keyToIndexMap = new HashMap<Object, Integer>();
+    private final HashMap<Integer, T> indexToRowMap = new HashMap<>();
+    private final HashMap<Object, Integer> keyToIndexMap = new HashMap<>();
 
     private Set<DataChangeHandler> dataChangeHandlers = new LinkedHashSet<>();
 
@@ -193,8 +193,8 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> {
         }
     };
 
-    private Map<Object, Integer> pinnedCounts = new HashMap<Object, Integer>();
-    private Map<Object, RowHandleImpl> pinnedRows = new HashMap<Object, RowHandleImpl>();
+    private Map<Object, Integer> pinnedCounts = new HashMap<>();
+    private Map<Object, RowHandleImpl> pinnedRows = new HashMap<>();
 
     // Size not yet known
     private int size = -1;
@@ -374,7 +374,7 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> {
         if (range.isEmpty()) {
             return;
         }
-        currentRequestCallback = new RequestRowsCallback<T>(this, range);
+        currentRequestCallback = new RequestRowsCallback<>(this, range);
         requestRows(range.getStart(), range.length(), currentRequestCallback);
     }
 
diff --git a/client/src/main/java/com/vaadin/client/debug/internal/AnalyzeLayoutsPanel.java b/client/src/main/java/com/vaadin/client/debug/internal/AnalyzeLayoutsPanel.java
index a33f7f8ceb..a1bcae5524 100644
--- a/client/src/main/java/com/vaadin/client/debug/internal/AnalyzeLayoutsPanel.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/AnalyzeLayoutsPanel.java
@@ -49,7 +49,7 @@ import com.vaadin.client.ValueMap;
  */
 public class AnalyzeLayoutsPanel extends FlowPanel {
 
-    private List<SelectConnectorListener> listeners = new ArrayList<SelectConnectorListener>();
+    private List<SelectConnectorListener> listeners = new ArrayList<>();
 
     public void update() {
         clear();
@@ -79,8 +79,8 @@ public class AnalyzeLayoutsPanel extends FlowPanel {
             add(new Label("Layouts analyzed, no top level problems"));
         }
 
-        Set<ComponentConnector> zeroHeightComponents = new HashSet<ComponentConnector>();
-        Set<ComponentConnector> zeroWidthComponents = new HashSet<ComponentConnector>();
+        Set<ComponentConnector> zeroHeightComponents = new HashSet<>();
+        Set<ComponentConnector> zeroWidthComponents = new HashSet<>();
         findZeroSizeComponents(zeroHeightComponents, zeroWidthComponents,
                 ac.getUIConnector());
         if (zeroHeightComponents.size() > 0 || zeroWidthComponents.size() > 0) {
@@ -106,7 +106,7 @@ public class AnalyzeLayoutsPanel extends FlowPanel {
             Set<ComponentConnector> zeroSized, ApplicationConnection ac) {
 
         // keep track of already highlighted parents
-        HashSet<String> parents = new HashSet<String>();
+        HashSet<String> parents = new HashSet<>();
 
         for (final ComponentConnector connector : zeroSized) {
             final ServerConnector parent = connector.getParent();
diff --git a/client/src/main/java/com/vaadin/client/debug/internal/ConnectorInfoPanel.java b/client/src/main/java/com/vaadin/client/debug/internal/ConnectorInfoPanel.java
index c724b95b4e..89d50a39b3 100644
--- a/client/src/main/java/com/vaadin/client/debug/internal/ConnectorInfoPanel.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/ConnectorInfoPanel.java
@@ -48,7 +48,7 @@ public class ConnectorInfoPanel extends FlowPanel {
     public void update(ServerConnector connector) {
         SharedState state = connector.getState();
 
-        Set<String> ignoreProperties = new HashSet<String>();
+        Set<String> ignoreProperties = new HashSet<>();
         ignoreProperties.add("id");
 
         String html = getRowHTML("Id", connector.getConnectorId());
diff --git a/client/src/main/java/com/vaadin/client/debug/internal/HierarchyPanel.java b/client/src/main/java/com/vaadin/client/debug/internal/HierarchyPanel.java
index d3322b64a5..e70da1188c 100644
--- a/client/src/main/java/com/vaadin/client/debug/internal/HierarchyPanel.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/HierarchyPanel.java
@@ -45,7 +45,7 @@ import com.vaadin.client.Util;
 public class HierarchyPanel extends FlowPanel {
 
     // TODO separate click listeners for simple selection and doubleclick
-    private List<SelectConnectorListener> listeners = new ArrayList<SelectConnectorListener>();
+    private List<SelectConnectorListener> listeners = new ArrayList<>();
 
     public void update() {
         // Try to keep track of currently open nodes and reopen them
diff --git a/client/src/main/java/com/vaadin/client/debug/internal/Highlight.java b/client/src/main/java/com/vaadin/client/debug/internal/Highlight.java
index 502949d4c8..7601a39289 100644
--- a/client/src/main/java/com/vaadin/client/debug/internal/Highlight.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/Highlight.java
@@ -180,7 +180,7 @@ public class Highlight {
     static Element show(Element element, String color) {
         if (element != null) {
             if (highlights == null) {
-                highlights = new HashSet<Element>();
+                highlights = new HashSet<>();
             }
 
             Element highlight = DOM.createDiv();
diff --git a/client/src/main/java/com/vaadin/client/debug/internal/OptimizedWidgetsetPanel.java b/client/src/main/java/com/vaadin/client/debug/internal/OptimizedWidgetsetPanel.java
index 5db2611b18..807b6e65bb 100644
--- a/client/src/main/java/com/vaadin/client/debug/internal/OptimizedWidgetsetPanel.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/OptimizedWidgetsetPanel.java
@@ -76,7 +76,7 @@ public class OptimizedWidgetsetPanel extends FlowPanel {
     private Set<String> getUsedConnectorNames(
             ApplicationConfiguration configuration) {
         int tag = 0;
-        Set<String> usedConnectors = new HashSet<String>();
+        Set<String> usedConnectors = new HashSet<>();
         while (true) {
             String serverSideClass = configuration
                     .getServerSideClassNameForTag(tag);
diff --git a/client/src/main/java/com/vaadin/client/debug/internal/SelectorPath.java b/client/src/main/java/com/vaadin/client/debug/internal/SelectorPath.java
index 3291e64973..be6bd231e8 100644
--- a/client/src/main/java/com/vaadin/client/debug/internal/SelectorPath.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/SelectorPath.java
@@ -38,8 +38,8 @@ public class SelectorPath {
     private final String path;
     private final Element element;
     private final ComponentLocator locator;
-    private static Map<String, Integer> counter = new HashMap<String, Integer>();
-    private static Map<String, String> legacyNames = new HashMap<String, String>();
+    private static Map<String, Integer> counter = new HashMap<>();
+    private static Map<String, String> legacyNames = new HashMap<>();
 
     static {
         legacyNames.put("FilterSelect", "ComboBox");
diff --git a/client/src/main/java/com/vaadin/client/debug/internal/TestBenchSection.java b/client/src/main/java/com/vaadin/client/debug/internal/TestBenchSection.java
index 644fde4f0c..e838c417ba 100644
--- a/client/src/main/java/com/vaadin/client/debug/internal/TestBenchSection.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/TestBenchSection.java
@@ -94,7 +94,7 @@ public class TestBenchSection implements Section {
 
     private final FlowPanel selectorPanel = new FlowPanel();
     // map from full path to SelectorWidget to enable reuse of old selectors
-    private Map<SelectorPath, SelectorWidget> selectorWidgets = new HashMap<SelectorPath, SelectorWidget>();
+    private Map<SelectorPath, SelectorWidget> selectorWidgets = new HashMap<>();
 
     private final FlowPanel controls = new FlowPanel();
 
diff --git a/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java b/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java
index 12ff06dd8b..3abc848187 100644
--- a/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java
@@ -133,7 +133,7 @@ public final class VDebugWindow extends VOverlay {
     protected SimplePanel content = new SimplePanel();
 
     // sections
-    protected ArrayList<Section> sections = new ArrayList<Section>();
+    protected ArrayList<Section> sections = new ArrayList<>();
 
     // handles resize/move
     protected HandlerRegistration mouseDownHandler = null;
diff --git a/client/src/main/java/com/vaadin/client/event/InputEvent.java b/client/src/main/java/com/vaadin/client/event/InputEvent.java
index 762c916741..b8e14dc756 100644
--- a/client/src/main/java/com/vaadin/client/event/InputEvent.java
+++ b/client/src/main/java/com/vaadin/client/event/InputEvent.java
@@ -28,7 +28,7 @@ public class InputEvent extends DomEvent<InputHandler> {
      * Event type for InputEvent. Represents the meta-data associated with this
      * event.
      */
-    private static final Type<InputHandler> TYPE = new Type<InputHandler>(
+    private static final Type<InputHandler> TYPE = new Type<>(
             "input", new InputEvent());
 
     protected InputEvent() {
diff --git a/client/src/main/java/com/vaadin/client/event/PointerCancelEvent.java b/client/src/main/java/com/vaadin/client/event/PointerCancelEvent.java
index ba11b88831..921b030f60 100644
--- a/client/src/main/java/com/vaadin/client/event/PointerCancelEvent.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerCancelEvent.java
@@ -28,7 +28,7 @@ public class PointerCancelEvent extends PointerEvent<PointerCancelHandler> {
      * Event type for PointerCancelEvent. Represents the meta-data associated
      * with this event.
      */
-    private static final Type<PointerCancelHandler> TYPE = new Type<PointerCancelHandler>(
+    private static final Type<PointerCancelHandler> TYPE = new Type<>(
             EventType.PointerCancel.getNativeEventName(),
             new PointerCancelEvent());
 
diff --git a/client/src/main/java/com/vaadin/client/event/PointerDownEvent.java b/client/src/main/java/com/vaadin/client/event/PointerDownEvent.java
index ae8fb1f6b7..77c146cf4b 100644
--- a/client/src/main/java/com/vaadin/client/event/PointerDownEvent.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerDownEvent.java
@@ -28,7 +28,7 @@ public class PointerDownEvent extends PointerEvent<PointerDownHandler> {
      * Event type for PointerDownEvent. Represents the meta-data associated with
      * this event.
      */
-    private static final Type<PointerDownHandler> TYPE = new Type<PointerDownHandler>(
+    private static final Type<PointerDownHandler> TYPE = new Type<>(
             EventType.PointerDown.getNativeEventName(), new PointerDownEvent());
 
     /**
diff --git a/client/src/main/java/com/vaadin/client/event/PointerMoveEvent.java b/client/src/main/java/com/vaadin/client/event/PointerMoveEvent.java
index c957ef9e7f..b58bf66e19 100644
--- a/client/src/main/java/com/vaadin/client/event/PointerMoveEvent.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerMoveEvent.java
@@ -28,7 +28,7 @@ public class PointerMoveEvent extends PointerEvent<PointerMoveHandler> {
      * Event type for PointerMoveEvent. Represents the meta-data associated with
      * this event.
      */
-    private static final Type<PointerMoveHandler> TYPE = new Type<PointerMoveHandler>(
+    private static final Type<PointerMoveHandler> TYPE = new Type<>(
             EventType.PointerMove.getNativeEventName(), new PointerMoveEvent());
 
     /**
diff --git a/client/src/main/java/com/vaadin/client/event/PointerUpEvent.java b/client/src/main/java/com/vaadin/client/event/PointerUpEvent.java
index 67d64c70e8..52588c83ed 100644
--- a/client/src/main/java/com/vaadin/client/event/PointerUpEvent.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerUpEvent.java
@@ -28,7 +28,7 @@ public class PointerUpEvent extends PointerEvent<PointerUpHandler> {
      * Event type for PointerUpEvent. Represents the meta-data associated with
      * this event.
      */
-    private static final Type<PointerUpHandler> TYPE = new Type<PointerUpHandler>(
+    private static final Type<PointerUpHandler> TYPE = new Type<>(
             EventType.PointerUp.getNativeEventName(), new PointerUpEvent());
 
     /**
diff --git a/client/src/main/java/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java b/client/src/main/java/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java
index 9c415f5c5d..d303a549be 100644
--- a/client/src/main/java/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java
+++ b/client/src/main/java/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java
@@ -34,7 +34,7 @@ import com.vaadin.ui.JavaScript;
 
 @Connect(JavaScript.class)
 public class JavaScriptManagerConnector extends AbstractExtensionConnector {
-    private Set<String> currentNames = new HashSet<String>();
+    private Set<String> currentNames = new HashSet<>();
 
     @Override
     protected void init() {
@@ -59,7 +59,7 @@ public class JavaScriptManagerConnector extends AbstractExtensionConnector {
             removeCallback(name);
         }
 
-        currentNames = new HashSet<String>(newNames);
+        currentNames = new HashSet<>(newNames);
         for (String name : newNames) {
             addCallback(name);
         }
diff --git a/client/src/main/java/com/vaadin/client/metadata/AsyncBundleLoader.java b/client/src/main/java/com/vaadin/client/metadata/AsyncBundleLoader.java
index e9aebbd583..7217a291f8 100644
--- a/client/src/main/java/com/vaadin/client/metadata/AsyncBundleLoader.java
+++ b/client/src/main/java/com/vaadin/client/metadata/AsyncBundleLoader.java
@@ -30,7 +30,7 @@ public abstract class AsyncBundleLoader {
 
     private Throwable error = null;
 
-    private List<BundleLoadCallback> callbacks = new ArrayList<BundleLoadCallback>();
+    private List<BundleLoadCallback> callbacks = new ArrayList<>();
 
     private final String packageName;
 
diff --git a/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java b/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java
index b6e1cc37fc..91e85305ca 100644
--- a/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java
+++ b/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java
@@ -143,7 +143,7 @@ public abstract class ConnectorBundleLoader {
 
     public abstract void init();
 
-    protected List<CValUiInfo> cvals = new ArrayList<CValUiInfo>();
+    protected List<CValUiInfo> cvals = new ArrayList<>();
 
     public void cval(String typeName) {
         if (!cvals.isEmpty()) {
diff --git a/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java b/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java
index 35e73082e1..f8d6475ed7 100644
--- a/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java
+++ b/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java
@@ -260,7 +260,7 @@ public class TypeDataStore {
             throws NoDataException {
         JsArrayObject<Property> propertiesArray = getPropertiesAsArray(type);
         int size = propertiesArray.size();
-        ArrayList<Property> properties = new ArrayList<Property>(size);
+        ArrayList<Property> properties = new ArrayList<>(size);
         for (int i = 0; i < size; i++) {
             properties.add(propertiesArray.get(i));
         }
diff --git a/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java
index 4fbc39b1d8..95eff8ba5e 100644
--- a/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java
+++ b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java
@@ -152,7 +152,7 @@ public abstract class ClickableRenderer<T, W extends Widget>
                 return null;
             }
             Cell cell = container.getCell(e);
-            EventCellReference<T> cellReference = new EventCellReference<T>(
+            EventCellReference<T> cellReference = new EventCellReference<>(
                     grid);
             // FIXME: Section is currently always body. Might be useful for the
             // future to have an actual check.
diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java
index 77b9e4d07d..552e4eb424 100644
--- a/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java
@@ -306,7 +306,7 @@ public abstract class AbstractConnector
         if (handlers != null) {
             Profiler.enter("AbstractConnector.onStateChanged @OnStateChange");
 
-            HashSet<OnStateChangeMethod> invokedMethods = new HashSet<OnStateChangeMethod>();
+            HashSet<OnStateChangeMethod> invokedMethods = new HashSet<>();
 
             JsArrayString propertyNames = handlers.getKeys();
             for (int i = 0; i < propertyNames.length(); i++) {
diff --git a/client/src/main/java/com/vaadin/client/ui/ShortcutActionHandler.java b/client/src/main/java/com/vaadin/client/ui/ShortcutActionHandler.java
index b3838d54f0..703df0b96d 100644
--- a/client/src/main/java/com/vaadin/client/ui/ShortcutActionHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/ShortcutActionHandler.java
@@ -58,7 +58,7 @@ public class ShortcutActionHandler {
         ShortcutActionHandler getShortcutActionHandler();
     }
 
-    private final ArrayList<ShortcutAction> actions = new ArrayList<ShortcutAction>();
+    private final ArrayList<ShortcutAction> actions = new ArrayList<>();
     private ApplicationConnection client;
     private String paintableId;
 
diff --git a/client/src/main/java/com/vaadin/client/ui/TouchScrollDelegate.java b/client/src/main/java/com/vaadin/client/ui/TouchScrollDelegate.java
index 3eeffebaf8..7b22442474 100644
--- a/client/src/main/java/com/vaadin/client/ui/TouchScrollDelegate.java
+++ b/client/src/main/java/com/vaadin/client/ui/TouchScrollDelegate.java
@@ -419,7 +419,7 @@ public class TouchScrollDelegate implements NativePreviewHandler {
 
     public static ArrayList<Element> getElements(Element scrolledElement2) {
         NodeList<Node> childNodes = scrolledElement2.getChildNodes();
-        ArrayList<Element> l = new ArrayList<Element>();
+        ArrayList<Element> l = new ArrayList<>();
         for (int i = 0; i < childNodes.getLength(); i++) {
             Node item = childNodes.getItem(i);
             if (item.getNodeType() == Node.ELEMENT_NODE) {
@@ -707,7 +707,7 @@ public class TouchScrollDelegate implements NativePreviewHandler {
     }
 
     public void setElements(Element[] elements) {
-        scrollableElements = new HashSet<Element>(Arrays.asList(elements));
+        scrollableElements = new HashSet<>(Arrays.asList(elements));
     }
 
     /**
diff --git a/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java b/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java
index ee0ba7e6ff..837b185f35 100644
--- a/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java
@@ -736,7 +736,7 @@ public abstract class VAbstractSplitPanel extends ComplexPanel {
         public static class SplitterMoveEvent
                 extends GwtEvent<SplitterMoveHandler> {
 
-            public static final Type<SplitterMoveHandler> TYPE = new Type<SplitterMoveHandler>();
+            public static final Type<SplitterMoveHandler> TYPE = new Type<>();
 
             private Widget splitPanel;
 
diff --git a/client/src/main/java/com/vaadin/client/ui/VAccordion.java b/client/src/main/java/com/vaadin/client/ui/VAccordion.java
index f726eea594..73f48639f3 100644
--- a/client/src/main/java/com/vaadin/client/ui/VAccordion.java
+++ b/client/src/main/java/com/vaadin/client/ui/VAccordion.java
@@ -42,7 +42,7 @@ public class VAccordion extends VTabsheetBase {
 
     public static final String CLASSNAME = AccordionState.PRIMARY_STYLE_NAME;
 
-    private Set<Widget> widgets = new HashSet<Widget>();
+    private Set<Widget> widgets = new HashSet<>();
 
     private StackItem openTab;
 
diff --git a/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java b/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java
index 82140a12fe..fa42637b55 100644
--- a/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java
@@ -50,13 +50,13 @@ public class VCustomLayout extends ComplexPanel {
     public static final String CLASSNAME = "v-customlayout";
 
     /** Location-name to containing element in DOM map */
-    private final HashMap<String, Element> locationToElement = new HashMap<String, Element>();
+    private final HashMap<String, Element> locationToElement = new HashMap<>();
 
     /** Location-name to contained widget map */
-    final HashMap<String, Widget> locationToWidget = new HashMap<String, Widget>();
+    final HashMap<String, Widget> locationToWidget = new HashMap<>();
 
     /** Widget to captionwrapper map */
-    private final HashMap<Widget, VCaptionWrapper> childWidgetToCaptionWrapper = new HashMap<Widget, VCaptionWrapper>();
+    private final HashMap<Widget, VCaptionWrapper> childWidgetToCaptionWrapper = new HashMap<>();
 
     /**
      * Unexecuted scripts loaded from the template.
diff --git a/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java
index 615a5da2f5..2b70569234 100644
--- a/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java
+++ b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java
@@ -477,10 +477,10 @@ public class VDragAndDropWrapper extends VCustomComponent
     }
 
     /** For internal use only. May be removed or replaced in the future. */
-    public List<Integer> fileIds = new ArrayList<Integer>();
+    public List<Integer> fileIds = new ArrayList<>();
 
     /** For internal use only. May be removed or replaced in the future. */
-    public List<VHtml5File> files = new ArrayList<VHtml5File>();
+    public List<VHtml5File> files = new ArrayList<>();
 
     private void queueFilePost(final int fileId, final VHtml5File file) {
         fileIds.add(fileId);
diff --git a/client/src/main/java/com/vaadin/client/ui/VEmbedded.java b/client/src/main/java/com/vaadin/client/ui/VEmbedded.java
index ddd2f85d5f..45037f72a8 100644
--- a/client/src/main/java/com/vaadin/client/ui/VEmbedded.java
+++ b/client/src/main/java/com/vaadin/client/ui/VEmbedded.java
@@ -206,7 +206,7 @@ public class VEmbedded extends HTML {
      * @return
      */
     public static Map<String, String> getParameters(UIDL uidl) {
-        Map<String, String> parameters = new HashMap<String, String>();
+        Map<String, String> parameters = new HashMap<>();
 
         Iterator<Object> childIterator = uidl.getChildIterator();
         while (childIterator.hasNext()) {
diff --git a/client/src/main/java/com/vaadin/client/ui/VFlash.java b/client/src/main/java/com/vaadin/client/ui/VFlash.java
index 4817552bae..650d4a05fc 100644
--- a/client/src/main/java/com/vaadin/client/ui/VFlash.java
+++ b/client/src/main/java/com/vaadin/client/ui/VFlash.java
@@ -32,7 +32,7 @@ public class VFlash extends HTML {
     protected String codetype;
     protected String standby;
     protected String archive;
-    protected Map<String, String> embedParams = new HashMap<String, String>();
+    protected Map<String, String> embedParams = new HashMap<>();
     protected boolean needsRebuild = false;
     protected String width;
     protected String height;
@@ -131,7 +131,7 @@ public class VFlash extends HTML {
         }
 
         if (!embedParams.equals(params)) {
-            embedParams = new HashMap<String, String>(params);
+            embedParams = new HashMap<>(params);
             needsRebuild = true;
         }
     }
diff --git a/client/src/main/java/com/vaadin/client/ui/VFormLayout.java b/client/src/main/java/com/vaadin/client/ui/VFormLayout.java
index 013fcbbc68..18d7d76d74 100644
--- a/client/src/main/java/com/vaadin/client/ui/VFormLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/VFormLayout.java
@@ -68,7 +68,7 @@ public class VFormLayout extends SimplePanel {
      */
     private String[] getStylesFromState(AbstractComponentState state,
             boolean enabled) {
-        List<String> styles = new ArrayList<String>();
+        List<String> styles = new ArrayList<>();
         if (ComponentStateUtil.hasStyles(state)) {
             for (String name : state.styles) {
                 styles.add(name);
@@ -88,8 +88,8 @@ public class VFormLayout extends SimplePanel {
         private static final int COLUMN_ERRORFLAG = 1;
         public static final int COLUMN_WIDGET = 2;
 
-        private HashMap<Widget, Caption> widgetToCaption = new HashMap<Widget, Caption>();
-        private HashMap<Widget, ErrorFlag> widgetToError = new HashMap<Widget, ErrorFlag>();
+        private HashMap<Widget, Caption> widgetToCaption = new HashMap<>();
+        private HashMap<Widget, ErrorFlag> widgetToError = new HashMap<>();
 
         public VFormLayoutTable() {
             DOM.setElementProperty(getElement(), "cellPadding", "0");
diff --git a/client/src/main/java/com/vaadin/client/ui/VGridLayout.java b/client/src/main/java/com/vaadin/client/ui/VGridLayout.java
index 2d084f8ca0..f34c7eabde 100644
--- a/client/src/main/java/com/vaadin/client/ui/VGridLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/VGridLayout.java
@@ -52,7 +52,7 @@ public class VGridLayout extends ComplexPanel {
     public ApplicationConnection client;
 
     /** For internal use only. May be removed or replaced in the future. */
-    public HashMap<Widget, Cell> widgetToCell = new HashMap<Widget, Cell>();
+    public HashMap<Widget, Cell> widgetToCell = new HashMap<>();
 
     /** For internal use only. May be removed or replaced in the future. */
     public int[] columnWidths;
@@ -586,12 +586,12 @@ public class VGridLayout extends ComplexPanel {
         }
     }
 
-    private LinkedList<SpanList> colSpans = new LinkedList<SpanList>();
-    private LinkedList<SpanList> rowSpans = new LinkedList<SpanList>();
+    private LinkedList<SpanList> colSpans = new LinkedList<>();
+    private LinkedList<SpanList> rowSpans = new LinkedList<>();
 
     private class SpanList {
         final int span;
-        List<Cell> cells = new LinkedList<Cell>();
+        List<Cell> cells = new LinkedList<>();
 
         public SpanList(int span) {
             this.span = span;
diff --git a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
index f5e83d8550..d08301ec93 100644
--- a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
+++ b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
@@ -138,7 +138,7 @@ public class VMenuBar extends SimpleFocusablePanel
 
     public VMenuBar(boolean subMenu, VMenuBar parentMenu) {
 
-        items = new ArrayList<CustomMenuItem>();
+        items = new ArrayList<>();
         popup = null;
         visibleChildMenu = null;
         this.subMenu = subMenu;
@@ -928,7 +928,7 @@ public class VMenuBar extends SimpleFocusablePanel
             }
 
             String currentStyles = super.getStyleName();
-            List<String> customStyles = new ArrayList<String>();
+            List<String> customStyles = new ArrayList<>();
             for (String style : currentStyles.split(" ")) {
                 if (!style.isEmpty() && !style.startsWith(primaryStyleName)) {
                     customStyles.add(style);
@@ -1594,7 +1594,7 @@ public class VMenuBar extends SimpleFocusablePanel
 
             return item.getElement();
         } else {
-            Queue<CustomMenuItem> submenuItems = new LinkedList<CustomMenuItem>();
+            Queue<CustomMenuItem> submenuItems = new LinkedList<>();
             for (CustomMenuItem item : getItems()) {
                 if (isItemNamed(item, subPart)) {
                     return item.getElement();
diff --git a/client/src/main/java/com/vaadin/client/ui/VNotification.java b/client/src/main/java/com/vaadin/client/ui/VNotification.java
index 1b530fe237..6042ff11d6 100644
--- a/client/src/main/java/com/vaadin/client/ui/VNotification.java
+++ b/client/src/main/java/com/vaadin/client/ui/VNotification.java
@@ -81,7 +81,7 @@ public class VNotification extends VOverlay {
     private static final int Z_INDEX_BASE = 20000;
     public static final String STYLE_SYSTEM = "system";
 
-    private static final ArrayList<VNotification> notifications = new ArrayList<VNotification>();
+    private static final ArrayList<VNotification> notifications = new ArrayList<>();
 
     private boolean infiniteDelay = false;
     private int hideDelay = 0;
@@ -464,7 +464,7 @@ public class VNotification extends VOverlay {
 
     public void addEventListener(EventListener listener) {
         if (listeners == null) {
-            listeners = new ArrayList<EventListener>();
+            listeners = new ArrayList<>();
         }
         listeners.add(listener);
     }
diff --git a/client/src/main/java/com/vaadin/client/ui/VPopupView.java b/client/src/main/java/com/vaadin/client/ui/VPopupView.java
index e8499a96c1..296cde28bc 100644
--- a/client/src/main/java/com/vaadin/client/ui/VPopupView.java
+++ b/client/src/main/java/com/vaadin/client/ui/VPopupView.java
@@ -240,7 +240,7 @@ public class VPopupView extends HTML
 
         private boolean hasHadMouseOver = false;
         private boolean hideOnMouseOut = true;
-        private final Set<Element> activeChildren = new HashSet<Element>();
+        private final Set<Element> activeChildren = new HashSet<>();
 
         private ShortcutActionHandler shortcutActionHandler;
 
diff --git a/client/src/main/java/com/vaadin/client/ui/VTabsheetBase.java b/client/src/main/java/com/vaadin/client/ui/VTabsheetBase.java
index 4ec65e889b..d52362afcc 100644
--- a/client/src/main/java/com/vaadin/client/ui/VTabsheetBase.java
+++ b/client/src/main/java/com/vaadin/client/ui/VTabsheetBase.java
@@ -35,9 +35,9 @@ public abstract class VTabsheetBase extends ComplexPanel implements HasEnabled {
     protected ApplicationConnection client;
 
     /** For internal use only. May be removed or replaced in the future. */
-    protected final ArrayList<String> tabKeys = new ArrayList<String>();
+    protected final ArrayList<String> tabKeys = new ArrayList<>();
     /** For internal use only. May be removed or replaced in the future. */
-    protected Set<String> disabledTabKeys = new HashSet<String>();
+    protected Set<String> disabledTabKeys = new HashSet<>();
 
     /** For internal use only. May be removed or replaced in the future. */
     protected int activeTabIndex = 0;
diff --git a/client/src/main/java/com/vaadin/client/ui/VWindow.java b/client/src/main/java/com/vaadin/client/ui/VWindow.java
index c3d9e7eddf..e9767a6bac 100644
--- a/client/src/main/java/com/vaadin/client/ui/VWindow.java
+++ b/client/src/main/java/com/vaadin/client/ui/VWindow.java
@@ -77,7 +77,7 @@ import com.vaadin.shared.ui.window.WindowRole;
 public class VWindow extends VOverlay implements ShortcutActionHandlerOwner,
         ScrollHandler, KeyDownHandler, FocusHandler, BlurHandler, Focusable {
 
-    private static ArrayList<VWindow> windowOrder = new ArrayList<VWindow>();
+    private static ArrayList<VWindow> windowOrder = new ArrayList<>();
 
     private static boolean orderingDefered;
 
diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VDragEvent.java b/client/src/main/java/com/vaadin/client/ui/dd/VDragEvent.java
index 211d5ab322..7d281186c4 100644
--- a/client/src/main/java/com/vaadin/client/ui/dd/VDragEvent.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VDragEvent.java
@@ -52,7 +52,7 @@ public class VDragEvent {
 
     private int id;
 
-    private HashMap<String, Object> dropDetails = new HashMap<String, Object>();
+    private HashMap<String, Object> dropDetails = new HashMap<>();
 
     private Element elementOver;
 
diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VLazyInitItemIdentifiers.java b/client/src/main/java/com/vaadin/client/ui/dd/VLazyInitItemIdentifiers.java
index 5f25f935ce..646853bca1 100644
--- a/client/src/main/java/com/vaadin/client/ui/dd/VLazyInitItemIdentifiers.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VLazyInitItemIdentifiers.java
@@ -48,7 +48,7 @@ public class VLazyInitItemIdentifiers extends VAcceptCriterion {
 
                 @Override
                 public void handleResponse(boolean accepted, UIDL response) {
-                    hashSet = new HashSet<String>();
+                    hashSet = new HashSet<>();
                     String[] stringArrayAttribute = response
                             .getStringArrayAttribute("allowedIds");
                     for (int i = 0; i < stringArrayAttribute.length; i++) {
diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VTransferable.java b/client/src/main/java/com/vaadin/client/ui/dd/VTransferable.java
index 098811bb46..804d9c1bcb 100644
--- a/client/src/main/java/com/vaadin/client/ui/dd/VTransferable.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VTransferable.java
@@ -30,7 +30,7 @@ public class VTransferable {
 
     private ComponentConnector component;
 
-    private final Map<String, Object> variables = new HashMap<String, Object>();
+    private final Map<String, Object> variables = new HashMap<>();
 
     /**
      * Returns the component from which the transferable is created (eg. a tree
diff --git a/client/src/main/java/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java b/client/src/main/java/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java
index 25908910cb..038d58afd0 100644
--- a/client/src/main/java/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java
@@ -63,7 +63,7 @@ public class DragAndDropWrapperConnector extends CustomComponentConnector
                     String receiverUrl = uidl.getStringVariable(fileId);
                     fileId = fileId.substring(4);
                     if (getWidget().fileIdToReceiver == null) {
-                        getWidget().fileIdToReceiver = new HashMap<String, String>();
+                        getWidget().fileIdToReceiver = new HashMap<>();
                     }
                     if ("".equals(receiverUrl)) {
                         Integer id = Integer.parseInt(fileId);
diff --git a/client/src/main/java/com/vaadin/client/ui/formlayout/FormLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/formlayout/FormLayoutConnector.java
index eccec23877..ba1d79c776 100644
--- a/client/src/main/java/com/vaadin/client/ui/formlayout/FormLayoutConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/formlayout/FormLayoutConnector.java
@@ -121,7 +121,7 @@ public class FormLayoutConnector extends AbstractLayoutConnector
                 targetWidth = Math.max(0, targetWidth);
 
                 if (oldMaxWidths == null) {
-                    oldMaxWidths = new HashMap<ComponentConnector, String>();
+                    oldMaxWidths = new HashMap<>();
                 }
 
                 for (ComponentConnector child : getChildComponents()) {
diff --git a/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java b/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java
index e80a6ee77f..03c7693979 100644
--- a/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java
+++ b/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java
@@ -725,7 +725,7 @@ public class LayoutDependencyTree {
     public Collection<ComponentConnector> getMeasureTargets() {
         JsArrayString targetIds = getMeasureTargetsJsArray();
         int length = targetIds.length();
-        ArrayList<ComponentConnector> targets = new ArrayList<ComponentConnector>(
+        ArrayList<ComponentConnector> targets = new ArrayList<>(
                 length);
         ConnectorMap connectorMap = ConnectorMap.get(connection);
 
diff --git a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBar.java b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBar.java
index d410a07305..61ecb051d9 100644
--- a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBar.java
+++ b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBar.java
@@ -76,7 +76,7 @@ public class MenuBar extends Widget implements PopupListener {
     private final Element table;
     private final Element outer;
 
-    private final ArrayList<MenuItem> items = new ArrayList<MenuItem>();
+    private final ArrayList<MenuItem> items = new ArrayList<>();
     private MenuBar parentMenu;
     private PopupPanel popup;
     private MenuItem selectedItem;
diff --git a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java
index 6977ec7d61..cc8e3872ad 100644
--- a/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java
@@ -102,8 +102,8 @@ public class MenuBarConnector extends AbstractComponentConnector
 
         UIDL uidlItems = uidl.getChildUIDL(1);
         Iterator<Object> itr = uidlItems.getChildIterator();
-        Stack<Iterator<Object>> iteratorStack = new Stack<Iterator<Object>>();
-        Stack<VMenuBar> menuStack = new Stack<VMenuBar>();
+        Stack<Iterator<Object>> iteratorStack = new Stack<>();
+        Stack<VMenuBar> menuStack = new Stack<>();
         VMenuBar currentMenu = getWidget();
 
         while (itr.hasNext()) {
diff --git a/client/src/main/java/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java b/client/src/main/java/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java
index 8a98f95e0c..1148ab90ad 100644
--- a/client/src/main/java/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java
@@ -47,7 +47,7 @@ public class VAbstractOrderedLayout extends FlowPanel {
 
     protected boolean definedHeight = false;
 
-    private Map<Widget, Slot> widgetToSlot = new HashMap<Widget, Slot>();
+    private Map<Widget, Slot> widgetToSlot = new HashMap<>();
 
     private Element expandWrapper;
 
diff --git a/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java b/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java
index 1ee6e9b9f7..f0b42f76d9 100644
--- a/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java
@@ -40,7 +40,7 @@ public class PopupViewConnector extends AbstractHasComponentsConnector
 
     private boolean centerAfterLayout = false;
 
-    private final List<HandlerRegistration> handlerRegistration = new ArrayList<HandlerRegistration>();
+    private final List<HandlerRegistration> handlerRegistration = new ArrayList<>();
 
     @Override
     protected void init() {
diff --git a/client/src/main/java/com/vaadin/client/ui/popupview/VisibilityChangeEvent.java b/client/src/main/java/com/vaadin/client/ui/popupview/VisibilityChangeEvent.java
index 896ba82130..06380eef28 100644
--- a/client/src/main/java/com/vaadin/client/ui/popupview/VisibilityChangeEvent.java
+++ b/client/src/main/java/com/vaadin/client/ui/popupview/VisibilityChangeEvent.java
@@ -38,7 +38,7 @@ public class VisibilityChangeEvent extends GwtEvent<VisibilityChangeHandler> {
 
     public static Type<VisibilityChangeHandler> getType() {
         if (TYPE == null) {
-            TYPE = new Type<VisibilityChangeHandler>();
+            TYPE = new Type<>();
         }
         return TYPE;
     }
diff --git a/client/src/main/java/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java b/client/src/main/java/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java
index fe9c119829..ec6b86880b 100644
--- a/client/src/main/java/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java
@@ -133,7 +133,7 @@ public abstract class AbstractSplitPanelConnector extends
         if (ComponentStateUtil.hasStyles(getState())) {
             getWidget().componentStyleNames = getState().styles;
         } else {
-            getWidget().componentStyleNames = new LinkedList<String>();
+            getWidget().componentStyleNames = new LinkedList<>();
         }
 
         // Splitter updates
diff --git a/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java b/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
index a5301abdf1..1bd721787c 100644
--- a/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
@@ -56,7 +56,7 @@ public abstract class TabsheetBaseConnector
         getWidget().setEnabled(isEnabled());
 
         // Widgets in the TabSheet before update
-        ArrayList<Widget> oldWidgets = new ArrayList<Widget>();
+        ArrayList<Widget> oldWidgets = new ArrayList<>();
         for (Iterator<Widget> iterator = getWidget()
                 .getWidgetIterator(); iterator.hasNext();) {
             oldWidgets.add(iterator.next());
diff --git a/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java b/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java
index 7c0df8761d..26f99bfb94 100644
--- a/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java
@@ -625,7 +625,7 @@ public class UIConnector extends AbstractSingleComponentContainerConnector
      * @return
      */
     public List<WindowConnector> getSubWindows() {
-        ArrayList<WindowConnector> windows = new ArrayList<WindowConnector>();
+        ArrayList<WindowConnector> windows = new ArrayList<>();
         for (ComponentConnector child : getChildComponents()) {
             if (child instanceof WindowConnector) {
                 windows.add((WindowConnector) child);
diff --git a/client/src/main/java/com/vaadin/client/ui/window/WindowMoveEvent.java b/client/src/main/java/com/vaadin/client/ui/window/WindowMoveEvent.java
index f5602f673e..c105b91a6c 100644
--- a/client/src/main/java/com/vaadin/client/ui/window/WindowMoveEvent.java
+++ b/client/src/main/java/com/vaadin/client/ui/window/WindowMoveEvent.java
@@ -25,7 +25,7 @@ import com.google.gwt.event.shared.GwtEvent;
  */
 public class WindowMoveEvent extends GwtEvent<WindowMoveHandler> {
 
-    private static final Type<WindowMoveHandler> TYPE = new Type<WindowMoveHandler>();
+    private static final Type<WindowMoveHandler> TYPE = new Type<>();
 
     private final int newX;
     private final int newY;
diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java
index a8bcf4d809..0105560a00 100644
--- a/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java
@@ -71,7 +71,7 @@ public class FlyweightRow implements Row {
 
         private CellIterator(final Collection<FlyweightCell> cells,
                 final boolean attached) {
-            this.cells = new ArrayList<FlyweightCell>(cells);
+            this.cells = new ArrayList<>(cells);
             cellsAttached = attached;
         }
 
@@ -142,7 +142,7 @@ public class FlyweightRow implements Row {
     private int row;
     private TableRowElement element;
     private double[] columnWidths = null;
-    private final List<FlyweightCell> cells = new ArrayList<FlyweightCell>();
+    private final List<FlyweightCell> cells = new ArrayList<>();
 
     public void setup(final TableRowElement e, final int row,
             double[] columnWidths) {
diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java b/client/src/main/java/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java
index a36b591fd0..0bd2ed0b9c 100644
--- a/client/src/main/java/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java
@@ -30,7 +30,7 @@ public class RowVisibilityChangeEvent
     /**
      * The type of this event.
      */
-    public static final Type<RowVisibilityChangeHandler> TYPE = new Type<RowVisibilityChangeHandler>();
+    public static final Type<RowVisibilityChangeHandler> TYPE = new Type<>();
 
     private final Range visibleRows;
 
diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/events/RowHeightChangedEvent.java b/client/src/main/java/com/vaadin/client/widget/escalator/events/RowHeightChangedEvent.java
index d6657b08d3..846b0ce723 100644
--- a/client/src/main/java/com/vaadin/client/widget/escalator/events/RowHeightChangedEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/events/RowHeightChangedEvent.java
@@ -29,7 +29,7 @@ public class RowHeightChangedEvent extends GwtEvent<RowHeightChangedHandler> {
     /**
      * Handler type.
      */
-    public final static Type<RowHeightChangedHandler> TYPE = new Type<RowHeightChangedHandler>();
+    public final static Type<RowHeightChangedHandler> TYPE = new Type<>();
 
     public static final Type<RowHeightChangedHandler> getType() {
         return TYPE;
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/DataAvailableEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/DataAvailableEvent.java
index 8441a16bc5..b1ed8757d2 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/DataAvailableEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/DataAvailableEvent.java
@@ -27,7 +27,7 @@ import com.vaadin.shared.Range;
 public class DataAvailableEvent extends GwtEvent<DataAvailableHandler> {
 
     private Range rowsAvailable;
-    public static final Type<DataAvailableHandler> TYPE = new Type<DataAvailableHandler>();
+    public static final Type<DataAvailableHandler> TYPE = new Type<>();
 
     public DataAvailableEvent(Range rowsAvailable) {
         this.rowsAvailable = rowsAvailable;
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/EventCellReference.java b/client/src/main/java/com/vaadin/client/widget/grid/EventCellReference.java
index 3fb266586b..a77f4ec86a 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/EventCellReference.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/EventCellReference.java
@@ -38,7 +38,7 @@ public class EventCellReference<T> extends CellReference<T> {
     private TableCellElement element;
 
     public EventCellReference(Grid<T> grid) {
-        super(new RowReference<T>(grid));
+        super(new RowReference<>(grid));
     }
 
     /**
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListDataSource.java b/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListDataSource.java
index 584e765127..b5b6f42f3a 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListDataSource.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListDataSource.java
@@ -344,7 +344,7 @@ public class ListDataSource<T> implements DataSource<T> {
         if (datasource == null) {
             throw new IllegalArgumentException("datasource cannot be null");
         }
-        ds = new ArrayList<T>(datasource);
+        ds = new ArrayList<>(datasource);
         wrapper = new ListWrapper();
     }
 
@@ -358,9 +358,9 @@ public class ListDataSource<T> implements DataSource<T> {
      */
     public ListDataSource(T... rows) {
         if (rows == null) {
-            ds = new ArrayList<T>();
+            ds = new ArrayList<>();
         } else {
-            ds = new ArrayList<T>(Arrays.asList(rows));
+            ds = new ArrayList<>(Arrays.asList(rows));
         }
         wrapper = new ListWrapper();
     }
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListSorter.java b/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListSorter.java
index ad68e94b87..14cb2e6523 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListSorter.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListSorter.java
@@ -50,7 +50,7 @@ public class ListSorter<T> {
         }
 
         this.grid = grid;
-        comparators = new HashMap<Grid.Column<?, T>, Comparator<?>>();
+        comparators = new HashMap<>();
 
         sortHandlerRegistration = grid.addSortHandler(new SortHandler<T>() {
             @Override
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnReorderEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnReorderEvent.java
index d1e5e6fb99..72c0eb5878 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnReorderEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnReorderEvent.java
@@ -31,7 +31,7 @@ public class ColumnReorderEvent<T> extends GwtEvent<ColumnReorderHandler<T>> {
     /**
      * Handler type.
      */
-    private final static Type<ColumnReorderHandler<?>> TYPE = new Type<ColumnReorderHandler<?>>();
+    private final static Type<ColumnReorderHandler<?>> TYPE = new Type<>();
 
     public static final Type<ColumnReorderHandler<?>> getType() {
         return TYPE;
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnResizeEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnResizeEvent.java
index bedec89519..abd369b175 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnResizeEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnResizeEvent.java
@@ -32,7 +32,7 @@ public class ColumnResizeEvent<T> extends GwtEvent<ColumnResizeHandler<T>> {
     /**
      * Handler type.
      */
-    private final static Type<ColumnResizeHandler<?>> TYPE = new Type<ColumnResizeHandler<?>>();
+    private final static Type<ColumnResizeHandler<?>> TYPE = new Type<>();
 
     private Column<?, T> column;
 
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java
index 7033c4c24b..5c7b88cc91 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java
@@ -31,7 +31,7 @@ import com.vaadin.client.widgets.Grid.Column;
 public class ColumnVisibilityChangeEvent<T>
         extends GwtEvent<ColumnVisibilityChangeHandler<T>> {
 
-    private final static Type<ColumnVisibilityChangeHandler<?>> TYPE = new Type<ColumnVisibilityChangeHandler<?>>();
+    private final static Type<ColumnVisibilityChangeHandler<?>> TYPE = new Type<>();
 
     public static final Type<ColumnVisibilityChangeHandler<?>> getType() {
         return TYPE;
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/GridEnabledEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/GridEnabledEvent.java
index bb31a4d6a0..86c8e66af2 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/events/GridEnabledEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/GridEnabledEvent.java
@@ -27,7 +27,7 @@ public class GridEnabledEvent extends GwtEvent<GridEnabledHandler> {
     /**
      * The type of this event
      */
-    public static final Type<GridEnabledHandler> TYPE = new Type<GridEnabledHandler>();
+    public static final Type<GridEnabledHandler> TYPE = new Type<>();
     private final boolean enabled;
 
     public GridEnabledEvent(boolean enabled) {
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/ScrollEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ScrollEvent.java
index 37e1125bb4..97cae2f890 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/events/ScrollEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ScrollEvent.java
@@ -26,7 +26,7 @@ import com.google.gwt.event.shared.GwtEvent;
 public class ScrollEvent extends GwtEvent<ScrollHandler> {
 
     /** The type of this event */
-    public static final Type<ScrollHandler> TYPE = new Type<ScrollHandler>();
+    public static final Type<ScrollHandler> TYPE = new Type<>();
 
     @Override
     public Type<ScrollHandler> getAssociatedType() {
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/SelectAllEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/SelectAllEvent.java
index 09885064ae..a21adfd2a8 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/events/SelectAllEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/SelectAllEvent.java
@@ -30,7 +30,7 @@ public class SelectAllEvent<T> extends GwtEvent<SelectAllHandler<T>> {
     /**
      * Handler type.
      */
-    private final static Type<SelectAllHandler<?>> TYPE = new Type<SelectAllHandler<?>>();;
+    private final static Type<SelectAllHandler<?>> TYPE = new Type<>();;
 
     private SelectionModel.Multi<T> selectionModel;
 
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java
index 293a0a62d4..2ae8b0579d 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java
@@ -639,7 +639,7 @@ public class MultiSelectionRenderer<T>
 
     @Override
     public Collection<String> getConsumedEvents() {
-        final HashSet<String> events = new HashSet<String>();
+        final HashSet<String> events = new HashSet<>();
 
         /*
          * this column's first interest is only to attach a NativePreventHandler
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionEvent.java
index 9d016d2634..8219b8998c 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionEvent.java
@@ -32,7 +32,7 @@ import com.vaadin.client.widgets.Grid;
 @SuppressWarnings("rawtypes")
 public class SelectionEvent<T> extends GwtEvent<SelectionHandler> {
 
-    private static final Type<SelectionHandler> eventType = new Type<SelectionHandler>();
+    private static final Type<SelectionHandler> eventType = new Type<>();
 
     private final Grid<T> grid;
     private final List<T> added;
@@ -92,13 +92,13 @@ public class SelectionEvent<T> extends GwtEvent<SelectionHandler> {
         this.batched = batched;
 
         if (added != null) {
-            this.added = new ArrayList<T>(added);
+            this.added = new ArrayList<>(added);
         } else {
             this.added = Collections.emptyList();
         }
 
         if (removed != null) {
-            this.removed = new ArrayList<T>(removed);
+            this.removed = new ArrayList<>(removed);
         } else {
             this.removed = Collections.emptyList();
         }
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelMulti.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelMulti.java
index 213bd24b67..3c395560a7 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelMulti.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelMulti.java
@@ -40,8 +40,8 @@ public class SelectionModelMulti<T> extends AbstractRowHandleSelectionModel<T>
     private Grid<T> grid;
 
     private boolean batchStarted = false;
-    private final LinkedHashSet<RowHandle<T>> selectionBatch = new LinkedHashSet<RowHandle<T>>();
-    private final LinkedHashSet<RowHandle<T>> deselectionBatch = new LinkedHashSet<RowHandle<T>>();
+    private final LinkedHashSet<RowHandle<T>> selectionBatch = new LinkedHashSet<>();
+    private final LinkedHashSet<RowHandle<T>> deselectionBatch = new LinkedHashSet<>();
 
     /* Event handling for selection with space key */
     private SpaceSelectHandler<T> spaceSelectHandler;
@@ -49,7 +49,7 @@ public class SelectionModelMulti<T> extends AbstractRowHandleSelectionModel<T>
     public SelectionModelMulti() {
         grid = null;
         renderer = null;
-        selectedRows = new LinkedHashSet<RowHandle<T>>();
+        selectedRows = new LinkedHashSet<>();
     }
 
     @Override
@@ -74,8 +74,8 @@ public class SelectionModelMulti<T> extends AbstractRowHandleSelectionModel<T>
 
         this.grid = grid;
         if (this.grid != null) {
-            spaceSelectHandler = new SpaceSelectHandler<T>(grid);
-            this.renderer = new MultiSelectionRenderer<T>(grid);
+            spaceSelectHandler = new SpaceSelectHandler<>(grid);
+            this.renderer = new MultiSelectionRenderer<>(grid);
         } else {
             spaceSelectHandler.removeHandler();
             spaceSelectHandler = null;
@@ -107,7 +107,7 @@ public class SelectionModelMulti<T> extends AbstractRowHandleSelectionModel<T>
             @SuppressWarnings("unchecked")
             final LinkedHashSet<RowHandle<T>> selectedRowsClone = (LinkedHashSet<RowHandle<T>>) selectedRows
                     .clone();
-            SelectionEvent<T> event = new SelectionEvent<T>(grid, null,
+            SelectionEvent<T> event = new SelectionEvent<>(grid, null,
                     getSelectedRows(), isBeingBatchSelected());
             selectedRows.clear();
 
@@ -129,7 +129,7 @@ public class SelectionModelMulti<T> extends AbstractRowHandleSelectionModel<T>
             throw new IllegalArgumentException("Rows cannot be null");
         }
 
-        Set<T> added = new LinkedHashSet<T>();
+        Set<T> added = new LinkedHashSet<>();
 
         for (T row : rows) {
             RowHandle<T> handle = grid.getDataSource().getHandle(row);
@@ -139,7 +139,7 @@ public class SelectionModelMulti<T> extends AbstractRowHandleSelectionModel<T>
         }
 
         if (added.size() > 0) {
-            grid.fireEvent(new SelectionEvent<T>(grid, added, null,
+            grid.fireEvent(new SelectionEvent<>(grid, added, null,
                     isBeingBatchSelected()));
 
             return true;
@@ -153,7 +153,7 @@ public class SelectionModelMulti<T> extends AbstractRowHandleSelectionModel<T>
             throw new IllegalArgumentException("Rows cannot be null");
         }
 
-        Set<T> removed = new LinkedHashSet<T>();
+        Set<T> removed = new LinkedHashSet<>();
 
         for (T row : rows) {
             RowHandle<T> handle = grid.getDataSource().getHandle(row);
@@ -163,7 +163,7 @@ public class SelectionModelMulti<T> extends AbstractRowHandleSelectionModel<T>
         }
 
         if (removed.size() > 0) {
-            grid.fireEvent(new SelectionEvent<T>(grid, null, removed,
+            grid.fireEvent(new SelectionEvent<>(grid, null, removed,
                     isBeingBatchSelected()));
             return true;
         }
@@ -206,7 +206,7 @@ public class SelectionModelMulti<T> extends AbstractRowHandleSelectionModel<T>
 
     @Override
     public Collection<T> getSelectedRows() {
-        Set<T> selected = new LinkedHashSet<T>();
+        Set<T> selected = new LinkedHashSet<>();
         for (RowHandle<T> handle : selectedRows) {
             selected.add(handle.getRow());
         }
@@ -244,7 +244,7 @@ public class SelectionModelMulti<T> extends AbstractRowHandleSelectionModel<T>
         }
         deselectionBatch.clear();
 
-        grid.fireEvent(new SelectionEvent<T>(grid, added, removed,
+        grid.fireEvent(new SelectionEvent<>(grid, added, removed,
                 isBeingBatchSelected()));
     }
 
@@ -264,7 +264,7 @@ public class SelectionModelMulti<T> extends AbstractRowHandleSelectionModel<T>
     }
 
     private ArrayList<T> rowHandlesToRows(Collection<RowHandle<T>> rowHandles) {
-        ArrayList<T> rows = new ArrayList<T>(rowHandles.size());
+        ArrayList<T> rows = new ArrayList<>(rowHandles.size());
         for (RowHandle<T> handle : rowHandles) {
             rows.add(handle.getRow());
         }
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelSingle.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelSingle.java
index 1e4d4538a8..1214e3f72b 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelSingle.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelSingle.java
@@ -66,8 +66,8 @@ public class SelectionModelSingle<T> extends AbstractRowHandleSelectionModel<T>
 
         this.grid = grid;
         if (this.grid != null) {
-            spaceSelectHandler = new SpaceSelectHandler<T>(grid);
-            clickSelectHandler = new ClickSelectHandler<T>(grid);
+            spaceSelectHandler = new SpaceSelectHandler<>(grid);
+            clickSelectHandler = new ClickSelectHandler<>(grid);
             updateHandlerDeselectAllowed();
         } else {
             spaceSelectHandler.removeHandler();
@@ -86,7 +86,7 @@ public class SelectionModelSingle<T> extends AbstractRowHandleSelectionModel<T>
 
         T removed = getSelectedRow();
         if (selectByHandle(grid.getDataSource().getHandle(row))) {
-            grid.fireEvent(new SelectionEvent<T>(grid, row, removed, false));
+            grid.fireEvent(new SelectionEvent<>(grid, row, removed, false));
 
             return true;
         }
@@ -102,7 +102,7 @@ public class SelectionModelSingle<T> extends AbstractRowHandleSelectionModel<T>
 
         if (isSelected(row)) {
             deselectByHandle(selectedRow);
-            grid.fireEvent(new SelectionEvent<T>(grid, null, row, false));
+            grid.fireEvent(new SelectionEvent<>(grid, null, row, false));
             return true;
         }
 
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/sort/Sort.java b/client/src/main/java/com/vaadin/client/widget/grid/sort/Sort.java
index cc42c61851..043bcfa4c7 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/sort/Sort.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/sort/Sort.java
@@ -141,7 +141,7 @@ public class Sort {
      */
     public List<SortOrder> build() {
 
-        List<SortOrder> order = new ArrayList<SortOrder>(count);
+        List<SortOrder> order = new ArrayList<>(count);
 
         Sort s = this;
         for (int i = count - 1; i >= 0; --i) {
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/sort/SortEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/sort/SortEvent.java
index 6ccb88c134..660b635eb6 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/sort/SortEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/sort/SortEvent.java
@@ -29,7 +29,7 @@ import com.vaadin.client.widgets.Grid;
  */
 public class SortEvent<T> extends GwtEvent<SortHandler<?>> {
 
-    private static final Type<SortHandler<?>> TYPE = new Type<SortHandler<?>>();
+    private static final Type<SortHandler<?>> TYPE = new Type<>();
 
     private final Grid<T> grid;
     private final List<SortOrder> order;
diff --git a/client/src/main/java/com/vaadin/client/widgets/Escalator.java b/client/src/main/java/com/vaadin/client/widgets/Escalator.java
index 35978b7cb0..564496e00a 100644
--- a/client/src/main/java/com/vaadin/client/widgets/Escalator.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Escalator.java
@@ -388,7 +388,7 @@ public class Escalator extends Widget
 
             // The object to deal with one direction scrolling
             private class Movement {
-                final List<Double> speeds = new ArrayList<Double>();
+                final List<Double> speeds = new ArrayList<>();
                 final ScrollbarBundle scroll;
                 double position, offset, velocity, prevPos, prevTime, delta;
                 boolean run, vertical;
@@ -1277,7 +1277,7 @@ public class Escalator extends Widget
                      * potentially need to set the widths for the cells for the
                      * first time.
                      */
-                    Map<Integer, Double> colWidths = new HashMap<Integer, Double>();
+                    Map<Integer, Double> colWidths = new HashMap<>();
                     for (int i = 0; i < getColumnConfiguration()
                             .getColumnCount(); i++) {
                         Double width = Double.valueOf(
@@ -1307,7 +1307,7 @@ public class Escalator extends Widget
                 final int visualIndex, final int numberOfRows) {
             assert isAttached() : "Can't paint rows if Escalator is not attached";
 
-            final List<TableRowElement> addedRows = new ArrayList<TableRowElement>();
+            final List<TableRowElement> addedRows = new ArrayList<>();
 
             if (numberOfRows < 1) {
                 return addedRows;
@@ -2325,7 +2325,7 @@ public class Escalator extends Widget
          *
          * @see #sortDomElements()
          */
-        private final LinkedList<TableRowElement> visualRowOrder = new LinkedList<TableRowElement>();
+        private final LinkedList<TableRowElement> visualRowOrder = new LinkedList<>();
 
         /**
          * The logical index of the topmost row.
@@ -2792,7 +2792,7 @@ public class Escalator extends Widget
                  * it's faster to just move idx[9] to the beginning.
                  */
 
-                final List<TableRowElement> removedRows = new ArrayList<TableRowElement>(
+                final List<TableRowElement> removedRows = new ArrayList<>(
                         visualSourceRange.length());
                 for (int i = 0; i < visualSourceRange.length(); i++) {
                     final TableRowElement tr = visualRowOrder
@@ -3756,7 +3756,7 @@ public class Escalator extends Widget
              * the first child.
              */
 
-            List<TableRowElement> orderedBodyRows = new ArrayList<TableRowElement>(
+            List<TableRowElement> orderedBodyRows = new ArrayList<>(
                     visualRowOrder);
             Map<Integer, SpacerContainer.SpacerImpl> spacers = body.spacerContainer
                     .getSpacers();
@@ -4011,7 +4011,7 @@ public class Escalator extends Widget
             }
         }
 
-        private final List<Column> columns = new ArrayList<Column>();
+        private final List<Column> columns = new ArrayList<>();
         private int frozenColumns = 0;
 
         /*
@@ -4209,7 +4209,7 @@ public class Escalator extends Widget
             if (header.getRowCount() > 0 || body.getRowCount() > 0
                     || footer.getRowCount() > 0) {
 
-                Map<Integer, Double> colWidths = new HashMap<Integer, Double>();
+                Map<Integer, Double> colWidths = new HashMap<>();
                 Double width = Double.valueOf(Column.DEFAULT_COLUMN_WIDTH_PX);
                 for (int i = index; i < index + numberOfColumns; i++) {
                     Integer col = Integer.valueOf(i);
@@ -4747,7 +4747,7 @@ public class Escalator extends Widget
             }
         }
 
-        private final TreeMap<Integer, SpacerImpl> rowIndexToSpacer = new TreeMap<Integer, SpacerImpl>();
+        private final TreeMap<Integer, SpacerImpl> rowIndexToSpacer = new TreeMap<>();
 
         private SpacerUpdater spacerUpdater = SpacerUpdater.NULL;
 
@@ -4885,7 +4885,7 @@ public class Escalator extends Widget
         }
 
         public Map<Integer, SpacerImpl> getSpacers() {
-            return new HashMap<Integer, SpacerImpl>(rowIndexToSpacer);
+            return new HashMap<>(rowIndexToSpacer);
         }
 
         /**
@@ -4908,7 +4908,7 @@ public class Escalator extends Widget
         @SuppressWarnings("boxing")
         public Collection<SpacerImpl> getSpacersForRowAndAfter(
                 int logicalRowIndex) {
-            return new ArrayList<SpacerImpl>(
+            return new ArrayList<>(
                     rowIndexToSpacer.tailMap(logicalRowIndex, true).values());
         }
 
@@ -4936,7 +4936,7 @@ public class Escalator extends Widget
         public Collection<SpacerImpl> getSpacersAfterPx(final double px,
                 final SpacerInclusionStrategy strategy) {
 
-            ArrayList<SpacerImpl> spacers = new ArrayList<SpacerImpl>(
+            ArrayList<SpacerImpl> spacers = new ArrayList<>(
                     rowIndexToSpacer.values());
 
             for (int i = 0; i < spacers.size(); i++) {
@@ -5344,8 +5344,8 @@ public class Escalator extends Widget
         /**
          * A map containing cached values of an element's current top position.
          */
-        private final Map<Element, Double> elementTopPositionMap = new HashMap<Element, Double>();
-        private final Map<Element, Double> elementLeftPositionMap = new HashMap<Element, Double>();
+        private final Map<Element, Double> elementTopPositionMap = new HashMap<>();
+        private final Map<Element, Double> elementLeftPositionMap = new HashMap<>();
 
         public void set(final Element e, final double x, final double y) {
             assert e != null : "Element was null";
diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java
index 85c6d48942..92dc0d7043 100644
--- a/client/src/main/java/com/vaadin/client/widgets/Grid.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java
@@ -441,14 +441,14 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
          */
         public abstract static class StaticRow<CELLTYPE extends StaticCell> {
 
-            private Map<Column<?, ?>, CELLTYPE> cells = new HashMap<Column<?, ?>, CELLTYPE>();
+            private Map<Column<?, ?>, CELLTYPE> cells = new HashMap<>();
 
             private StaticSection<?> section;
 
             /**
              * Map from set of spanned columns to cell meta data.
              */
-            private Map<Set<Column<?, ?>>, CELLTYPE> cellGroups = new HashMap<Set<Column<?, ?>>, CELLTYPE>();
+            private Map<Set<Column<?, ?>>, CELLTYPE> cellGroups = new HashMap<>();
 
             /**
              * A custom style name for the row or null if none is set.
@@ -496,7 +496,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
                             "You can't merge less than 2 columns together.");
                 }
 
-                HashSet<Column<?, ?>> columnGroup = new HashSet<Column<?, ?>>();
+                HashSet<Column<?, ?>> columnGroup = new HashSet<>();
                 // NOTE: this doesn't care about hidden columns, those are
                 // filtered in calculateColspans()
                 for (Column<?, ?> column : columns) {
@@ -590,7 +590,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
             private boolean checkMergedCellIsContinuous(
                     Set<Column<?, ?>> mergedCell) {
                 // no matter if hidden or not, just check for continuous order
-                final List<Column<?, ?>> columnOrder = new ArrayList<Column<?, ?>>(
+                final List<Column<?, ?>> columnOrder = new ArrayList<>(
                         section.grid.getColumns());
 
                 if (!columnOrder.containsAll(mergedCell)) {
@@ -660,7 +660,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
              */
             void detach() {
                 // Avoid calling detach twice for a merged cell
-                HashSet<CELLTYPE> cells = new HashSet<CELLTYPE>();
+                HashSet<CELLTYPE> cells = new HashSet<>();
                 for (Column<?, ?> column : getSection().grid.getColumns()) {
                     cells.add(getCell(column));
                 }
@@ -672,7 +672,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
 
         private Grid<?> grid;
 
-        private List<ROWTYPE> rows = new ArrayList<ROWTYPE>();
+        private List<ROWTYPE> rows = new ArrayList<>();
 
         private boolean visible = true;
 
@@ -1336,8 +1336,8 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
         // Should only be added to the DOM when there's a message to show
         private DivElement message = DivElement.as(DOM.createDiv());
 
-        private Map<Column<?, T>, Widget> columnToWidget = new HashMap<Column<?, T>, Widget>();
-        private List<HandlerRegistration> focusHandlers = new ArrayList<HandlerRegistration>();
+        private Map<Column<?, T>, Widget> columnToWidget = new HashMap<>();
+        private List<HandlerRegistration> focusHandlers = new ArrayList<>();
 
         private boolean enabled = false;
         private State state = State.INACTIVE;
@@ -1432,7 +1432,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
         };
 
         /** A set of all the columns that display an error flag. */
-        private final Set<Column<?, T>> columnErrors = new HashSet<Grid.Column<?, T>>();
+        private final Set<Column<?, T>> columnErrors = new HashSet<>();
         private boolean buffered = true;
 
         /** Original position of editor */
@@ -1628,7 +1628,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
                 throw new IllegalStateException(
                         "Cannot cancel edit: editor is not in edit mode");
             }
-            handler.cancel(new EditorRequestImpl<T>(grid, rowIndex,
+            handler.cancel(new EditorRequestImpl<>(grid, rowIndex,
                     focusedColumnIndex, null));
             doCancel();
         }
@@ -1674,7 +1674,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
             state = State.SAVING;
             setButtonsEnabled(false);
             saveTimeout.schedule(SAVE_TIMEOUT_MS);
-            EditorRequest<T> request = new EditorRequestImpl<T>(grid, rowIndex,
+            EditorRequest<T> request = new EditorRequestImpl<>(grid, rowIndex,
                     focusedColumnIndex, saveRequestCallback);
             handler.save(request);
             updateSelectionCheckboxesAsNeeded(true);
@@ -1738,7 +1738,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
             if (state == State.ACTIVATING) {
                 state = State.BINDING;
                 bindTimeout.schedule(BIND_TIMEOUT_MS);
-                EditorRequest<T> request = new EditorRequestImpl<T>(grid,
+                EditorRequest<T> request = new EditorRequestImpl<>(grid,
                         rowIndex, columnIndex, bindRequestCallback);
                 handler.bind(request);
                 grid.getEscalator().setScrollLocked(Direction.VERTICAL,
@@ -2269,7 +2269,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
             extends KeyEvent<HANDLER> {
 
         private Grid<?> grid;
-        private final Type<HANDLER> associatedType = new Type<HANDLER>(
+        private final Type<HANDLER> associatedType = new Type<>(
                 getBrowserEventType(), this);
         private final CellReference<?> targetCell;
 
@@ -2329,7 +2329,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
 
         private Grid<?> grid;
         private final CellReference<?> targetCell;
-        private final Type<HANDLER> associatedType = new Type<HANDLER>(
+        private final Type<HANDLER> associatedType = new Type<>(
                 getBrowserEventType(), this);
 
         public AbstractGridMouseEvent(Grid<?> grid,
@@ -2407,7 +2407,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
      */
     private static final double DETAILS_ROW_INITIAL_HEIGHT = 50;
 
-    private EventCellReference<T> eventCell = new EventCellReference<T>(this);
+    private EventCellReference<T> eventCell = new EventCellReference<>(this);
     private GridKeyDownEvent keyDown = new GridKeyDownEvent(this, eventCell);
     private GridKeyUpEvent keyUp = new GridKeyUpEvent(this, eventCell);
     private GridKeyPressEvent keyPress = new GridKeyPressEvent(this, eventCell);
@@ -2881,7 +2881,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
                             public void onValueChange(
                                     ValueChangeEvent<Boolean> event) {
                                 if (event.getValue()) {
-                                    fireEvent(new SelectAllEvent<T>(model));
+                                    fireEvent(new SelectAllEvent<>(model));
                                     selected = true;
                                 } else {
                                     model.deselectAll();
@@ -3231,7 +3231,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
 
             /* Step 1: Apply all column widths as they are. */
 
-            Map<Integer, Double> selfWidths = new LinkedHashMap<Integer, Double>();
+            Map<Integer, Double> selfWidths = new LinkedHashMap<>();
             List<Column<?, T>> columns = getVisibleColumns();
             for (int index = 0; index < columns.size(); index++) {
                 selfWidths.put(index, columns.get(index).getWidth());
@@ -3245,7 +3245,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
              * violated, fix it.
              */
 
-            Map<Integer, Double> constrainedWidths = new LinkedHashMap<Integer, Double>();
+            Map<Integer, Double> constrainedWidths = new LinkedHashMap<>();
             for (int index = 0; index < columns.size(); index++) {
                 Column<?, T> column = columns.get(index);
 
@@ -3270,9 +3270,9 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
             boolean defaultExpandRatios = true;
             int totalRatios = 0;
             double reservedPixels = 0;
-            final Set<Column<?, T>> columnsToExpand = new HashSet<Column<?, T>>();
-            List<Column<?, T>> nonFixedColumns = new ArrayList<Column<?, T>>();
-            Map<Integer, Double> columnSizes = new HashMap<Integer, Double>();
+            final Set<Column<?, T>> columnsToExpand = new HashSet<>();
+            List<Column<?, T>> nonFixedColumns = new ArrayList<>();
+            Map<Integer, Double> columnSizes = new HashMap<>();
             final List<Column<?, T>> visibleColumns = getVisibleColumns();
 
             /*
@@ -3535,7 +3535,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
 
         private static final String STRIPE_CLASSNAME = "stripe";
 
-        private final Map<Element, Widget> elementToWidgetMap = new HashMap<Element, Widget>();
+        private final Map<Element, Widget> elementToWidgetMap = new HashMap<>();
 
         @Override
         public void init(Spacer spacer) {
@@ -3917,7 +3917,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
     private final class ColumnHider {
 
         /** Map from columns to their hiding toggles, component might change */
-        private HashMap<Column<?, T>, MenuItem> columnToHidingToggleMap = new HashMap<Grid.Column<?, T>, MenuItem>();
+        private HashMap<Column<?, T>, MenuItem> columnToHidingToggleMap = new HashMap<>();
 
         /**
          * When column is being hidden with a toggle, do not refresh toggles for
@@ -4016,7 +4016,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
     /**
      * List of columns in the grid. Order defines the visible order.
      */
-    private List<Column<?, T>> columns = new ArrayList<Column<?, T>>();
+    private List<Column<?, T>> columns = new ArrayList<>();
 
     /**
      * The datasource currently in use. <em>Note:</em> it is <code>null</code>
@@ -4040,7 +4040,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
      * Current sort order. The (private) sort() method reads this list to
      * determine the order in which to present rows.
      */
-    private List<SortOrder> sortOrder = new ArrayList<SortOrder>();
+    private List<SortOrder> sortOrder = new ArrayList<>();
 
     private Renderer<Boolean> selectColumnRenderer = null;
 
@@ -4098,7 +4098,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
     private DetailsGenerator detailsGenerator = DetailsGenerator.NULL;
     private GridSpacerUpdater gridSpacerUpdater = new GridSpacerUpdater();
     /** A set keeping track of the indices of all currently open details */
-    private Set<Integer> visibleDetails = new HashSet<Integer>();
+    private Set<Integer> visibleDetails = new HashSet<>();
 
     private boolean columnReorderingAllowed;
 
@@ -4148,7 +4148,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
          * Map of possible drop positions for the column and the corresponding
          * column index.
          */
-        private final TreeMap<Double, Integer> possibleDropPositions = new TreeMap<Double, Integer>();
+        private final TreeMap<Double, Integer> possibleDropPositions = new TreeMap<>();
         /**
          * Makes sure that drag cancel doesn't cause anything unwanted like sort
          */
@@ -4347,7 +4347,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
                     && latestColumnDropIndex != (draggedColumnIndex
                             + colspan)) {
                 List<Column<?, T>> columns = getColumns();
-                List<Column<?, T>> reordered = new ArrayList<Column<?, T>>();
+                List<Column<?, T>> reordered = new ArrayList<>();
                 if (draggedColumnIndex < latestColumnDropIndex) {
                     reordered.addAll(columns.subList(0, draggedColumnIndex));
                     reordered.addAll(
@@ -4475,8 +4475,8 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
             int leftBound = -1;
             int rightBound = getColumnCount() + 1;
 
-            final HashSet<Integer> unavailableColumnDropIndices = new HashSet<Integer>();
-            final List<StaticRow<?>> rows = new ArrayList<StaticRow<?>>();
+            final HashSet<Integer> unavailableColumnDropIndices = new HashSet<>();
+            final List<StaticRow<?>> rows = new ArrayList<>();
             rows.addAll(header.getRows());
             rows.addAll(footer.getRows());
             for (StaticRow<?> row : rows) {
@@ -5062,7 +5062,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
                 grid.header.updateColSpans();
                 grid.footer.updateColSpans();
                 scheduleColumnWidthRecalculator();
-                this.grid.fireEvent(new ColumnVisibilityChangeEvent<T>(this,
+                this.grid.fireEvent(new ColumnVisibilityChangeEvent<>(this,
                         hidden, userOriginated));
             }
         }
@@ -5725,7 +5725,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
 
                                         if (c.getWidth() < 0) {
                                             c.setWidth(c.getWidthActual());
-                                            fireEvent(new ColumnResizeEvent<T>(
+                                            fireEvent(new ColumnResizeEvent<>(
                                                     c));
                                         }
                                     }
@@ -5736,7 +5736,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
 
                                 @Override
                                 public void onComplete() {
-                                    fireEvent(new ColumnResizeEvent<T>(col));
+                                    fireEvent(new ColumnResizeEvent<>(col));
 
                                     WidgetUtil.setTextSelectionEnabled(
                                             getElement(), true);
@@ -5818,7 +5818,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
                 escalator.getColumnConfiguration().setColumnWidth(colIndex,
                         minWidth);
 
-                fireEvent(new ColumnResizeEvent<T>(column));
+                fireEvent(new ColumnResizeEvent<>(column));
             }
         }
 
@@ -6228,7 +6228,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
         column.reapplyWidth();
 
         // Sink all renderer events
-        Set<String> events = new HashSet<String>();
+        Set<String> events = new HashSet<>();
         events.addAll(getConsumedEventsForRenderer(column.getRenderer()));
 
         if (column.isHidable()) {
@@ -6321,7 +6321,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
      */
     public List<Column<?, T>> getColumns() {
         return Collections
-                .unmodifiableList(new ArrayList<Column<?, T>>(columns));
+                .unmodifiableList(new ArrayList<>(columns));
     }
 
     /**
@@ -6333,7 +6333,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
      * @return A unmodifiable list of the currently visible columns in the grid
      */
     public List<Column<?, T>> getVisibleColumns() {
-        ArrayList<Column<?, T>> visible = new ArrayList<Column<?, T>>();
+        ArrayList<Column<?, T>> visible = new ArrayList<>();
         for (Column<?, T> c : columns) {
             if (!c.isHidden()) {
                 visible.add(c);
@@ -6748,7 +6748,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
                         int oldSize = body.getRowCount();
 
                         // Hide all details.
-                        Set<Integer> oldDetails = new HashSet<Integer>(
+                        Set<Integer> oldDetails = new HashSet<>(
                                 visibleDetails);
                         for (int i : oldDetails) {
                             setDetailsVisible(i, false);
@@ -7122,7 +7122,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
     }
 
     private Set<String> getConsumedEventsForRenderer(Renderer<?> renderer) {
-        Set<String> events = new HashSet<String>();
+        Set<String> events = new HashSet<>();
         if (renderer instanceof ComplexRenderer) {
             Collection<String> consumedEvents = ((ComplexRenderer<?>) renderer)
                     .getConsumedEvents();
@@ -7294,7 +7294,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
             w = editor.getWidget(getColumn(editor.focusedColumnIndex));
         }
 
-        EditorDomEvent<T> editorEvent = new EditorDomEvent<T>(event,
+        EditorDomEvent<T> editorEvent = new EditorDomEvent<>(event,
                 getEventCell(), w);
 
         return getEditor().getEventHandler().handleEvent(editorEvent);
@@ -7365,8 +7365,8 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
     private Point rowEventTouchStartingPoint;
     private CellStyleGenerator<T> cellStyleGenerator;
     private RowStyleGenerator<T> rowStyleGenerator;
-    private RowReference<T> rowReference = new RowReference<T>(this);
-    private CellReference<T> cellReference = new CellReference<T>(rowReference);
+    private RowReference<T> rowReference = new RowReference<>(this);
+    private CellReference<T> cellReference = new CellReference<>(rowReference);
     private RendererCellReference rendererCellReference = new RendererCellReference(
             (RowReference<Object>) rowReference);
 
@@ -8187,7 +8187,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
      */
     private void sort(boolean userOriginated) {
         refreshHeader();
-        fireEvent(new SortEvent<T>(this,
+        fireEvent(new SortEvent<>(this,
                 Collections.unmodifiableList(sortOrder), userOriginated));
     }
 
@@ -8269,7 +8269,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
         // Trigger ComplexRenderer.destroy for old content
         conf.removeColumns(0, conf.getColumnCount());
 
-        List<Column<?, T>> newOrder = new ArrayList<Column<?, T>>();
+        List<Column<?, T>> newOrder = new ArrayList<>();
         if (selectionColumn != null) {
             newOrder.add(selectionColumn);
         }
@@ -8547,7 +8547,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
 
     @Override
     protected void onDetach() {
-        Set<Integer> details = new HashSet<Integer>(visibleDetails);
+        Set<Integer> details = new HashSet<>(visibleDetails);
         for (int row : details) {
             setDetailsVisible(row, false);
         }
@@ -8957,7 +8957,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
         if (container != null) {
             Cell cell = container.getCell(element);
             if (cell != null) {
-                EventCellReference<T> cellRef = new EventCellReference<T>(this);
+                EventCellReference<T> cellRef = new EventCellReference<>(this);
                 cellRef.set(cell, getSectionFromContainer(container));
                 return cellRef;
             }
diff --git a/client/src/main/java/com/vaadin/client/widgets/Overlay.java b/client/src/main/java/com/vaadin/client/widgets/Overlay.java
index 0b1d317a05..e6ce34b8a7 100644
--- a/client/src/main/java/com/vaadin/client/widgets/Overlay.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Overlay.java
@@ -175,7 +175,7 @@ public class Overlay extends PopupPanel {
      */
     private static final int POPUP_PANEL_ANIMATION_DURATION = 200;
 
-    private List<Command> runOnClose = new ArrayList<Command>();
+    private List<Command> runOnClose = new ArrayList<>();
 
     public Overlay() {
         super();
diff --git a/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java b/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java
index 912abc412a..1329b7fdc9 100755
--- a/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java
+++ b/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java
@@ -12,7 +12,7 @@ public class DateTimeServiceTest {
 
     final long MILLISECONDS_PER_DAY = 24 * 3600 * 1000;
 
-    static Map<Date, Integer> isoWeekNumbers = new HashMap<Date, Integer>();
+    static Map<Date, Integer> isoWeekNumbers = new HashMap<>();
     static {
         isoWeekNumbers.put(getDate(2005, 02, 02), 5);
 
diff --git a/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java b/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java
index b3a4f24ebb..7d9bf530ce 100644
--- a/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java
+++ b/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java
@@ -32,7 +32,7 @@ public class ListDataSourceTest {
     @Test
     public void testDataSourceConstruction() throws Exception {
 
-        ListDataSource<Integer> ds = new ListDataSource<Integer>(0, 1, 2, 3);
+        ListDataSource<Integer> ds = new ListDataSource<>(0, 1, 2, 3);
 
         assertEquals(4, ds.size());
         assertEquals(0, (int) ds.getRow(0));
@@ -40,7 +40,7 @@ public class ListDataSourceTest {
         assertEquals(2, (int) ds.getRow(2));
         assertEquals(3, (int) ds.getRow(3));
 
-        ds = new ListDataSource<Integer>(Arrays.asList(0, 1, 2, 3));
+        ds = new ListDataSource<>(Arrays.asList(0, 1, 2, 3));
 
         assertEquals(4, ds.size());
         assertEquals(0, (int) ds.getRow(0));
@@ -52,7 +52,7 @@ public class ListDataSourceTest {
     @Test
     public void testListAddOperation() throws Exception {
 
-        ListDataSource<Integer> ds = new ListDataSource<Integer>(0, 1, 2, 3);
+        ListDataSource<Integer> ds = new ListDataSource<>(0, 1, 2, 3);
 
         DataChangeHandler handler = EasyMock
                 .createNiceMock(DataChangeHandler.class);
@@ -76,7 +76,7 @@ public class ListDataSourceTest {
     @Test
     public void testListAddAllOperation() throws Exception {
 
-        ListDataSource<Integer> ds = new ListDataSource<Integer>(0, 1, 2, 3);
+        ListDataSource<Integer> ds = new ListDataSource<>(0, 1, 2, 3);
 
         DataChangeHandler handler = EasyMock
                 .createNiceMock(DataChangeHandler.class);
@@ -102,7 +102,7 @@ public class ListDataSourceTest {
     @Test
     public void testListRemoveOperation() throws Exception {
 
-        ListDataSource<Integer> ds = new ListDataSource<Integer>(0, 1, 2, 3);
+        ListDataSource<Integer> ds = new ListDataSource<>(0, 1, 2, 3);
 
         DataChangeHandler handler = EasyMock
                 .createNiceMock(DataChangeHandler.class);
@@ -124,7 +124,7 @@ public class ListDataSourceTest {
     @Test
     public void testListRemoveAllOperation() throws Exception {
 
-        ListDataSource<Integer> ds = new ListDataSource<Integer>(0, 1, 2, 3);
+        ListDataSource<Integer> ds = new ListDataSource<>(0, 1, 2, 3);
 
         DataChangeHandler handler = EasyMock
                 .createNiceMock(DataChangeHandler.class);
@@ -144,7 +144,7 @@ public class ListDataSourceTest {
     @Test
     public void testListClearOperation() throws Exception {
 
-        ListDataSource<Integer> ds = new ListDataSource<Integer>(0, 1, 2, 3);
+        ListDataSource<Integer> ds = new ListDataSource<>(0, 1, 2, 3);
 
         DataChangeHandler handler = EasyMock
                 .createNiceMock(DataChangeHandler.class);
@@ -162,19 +162,19 @@ public class ListDataSourceTest {
 
     @Test(expected = IllegalStateException.class)
     public void testFetchingNonExistantItem() {
-        ListDataSource<Integer> ds = new ListDataSource<Integer>(0, 1, 2, 3);
+        ListDataSource<Integer> ds = new ListDataSource<>(0, 1, 2, 3);
         ds.ensureAvailability(5, 1);
     }
 
     @Test(expected = UnsupportedOperationException.class)
     public void testUnsupportedIteratorRemove() {
-        ListDataSource<Integer> ds = new ListDataSource<Integer>(0, 1, 2, 3);
+        ListDataSource<Integer> ds = new ListDataSource<>(0, 1, 2, 3);
         ds.asList().iterator().remove();
     }
 
     @Test
     public void sortColumn() {
-        ListDataSource<Integer> ds = new ListDataSource<Integer>(3, 4, 2, 3, 1);
+        ListDataSource<Integer> ds = new ListDataSource<>(3, 4, 2, 3, 1);
 
         // TODO Should be simplified to sort(). No point in providing these
         // trivial comparators.