Mark all server compatibility classes deprecated (#144).

Change-Id: Iba0a35d5ea9a97b0020f506f610630471c59748b

52 files changed, 281 insertions, 107 deletions

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java
index 73ce2f3a99..180c1f15b8 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java
@@ -48,8 +48,8 @@ import com.vaadin.v7.data.Validator;
 import com.vaadin.v7.data.Validator.InvalidValueException;
 import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.data.util.converter.Converter.ConversionException;
-import com.vaadin.v7.shared.AbstractFieldState;
 import com.vaadin.v7.data.util.converter.ConverterUtil;
+import com.vaadin.v7.shared.AbstractFieldState;
 
 /**
  * <p>
@@ -1185,6 +1185,7 @@ public abstract class AbstractField<T> extends AbstractComponent
      * @author Vaadin Ltd.
      * @since 3.0
      */
+    @Deprecated
     public static class ReadOnlyStatusChangeEvent extends Component.Event
             implements Property.ReadOnlyStatusChangeEvent, Serializable {
 
@@ -1588,6 +1589,7 @@ public abstract class AbstractField<T> extends AbstractComponent
      * invoked.
      *
      */
+    @Deprecated
     public static class FocusShortcut extends ShortcutListener {
         protected Focusable focusable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
index c7e90afb4c..55962df2cf 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
@@ -79,12 +79,14 @@ import com.vaadin.v7.shared.ui.select.AbstractSelectState;
  * @since 5.0
  */
 @SuppressWarnings("serial")
+@Deprecated
 // TODO currently cannot specify type more precisely in case of multi-select
 public abstract class AbstractSelect extends AbstractField<Object> implements
         Container, Container.Viewer, Container.PropertySetChangeListener,
         Container.PropertySetChangeNotifier, Container.ItemSetChangeNotifier,
         Container.ItemSetChangeListener, LegacyComponent {
 
+    @Deprecated
     public enum ItemCaptionMode {
         /**
          * Item caption mode: Item's ID converted to a String using
@@ -182,6 +184,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      * caption. <code>FilteringMode.CONTAINS</code> (1) matches anywhere in the
      * caption.
      */
+    @Deprecated
     public interface Filtering extends Serializable {
 
         /**
@@ -230,17 +233,17 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     /**
      * Keymapper used to map key values.
      */
-    protected KeyMapper<Object> itemIdMapper = new KeyMapper<Object>();
+    protected KeyMapper<Object> itemIdMapper = new KeyMapper<>();
 
     /**
      * Item icons.
      */
-    private final HashMap<Object, Resource> itemIcons = new HashMap<Object, Resource>();
+    private final HashMap<Object, Resource> itemIcons = new HashMap<>();
 
     /**
      * Item captions.
      */
-    private final HashMap<Object, String> itemCaptions = new HashMap<Object, String>();
+    private final HashMap<Object, String> itemCaptions = new HashMap<>();
 
     /**
      * Item caption mode.
@@ -469,7 +472,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
                 // TODO Optimize by adding repaintNotNeeded when applicable
 
                 // Converts the key-array to id-set
-                final LinkedList<Object> acceptedSelections = new LinkedList<Object>();
+                final LinkedList<Object> acceptedSelections = new LinkedList<>();
                 for (int i = 0; i < clientSideSelectedKeys.length; i++) {
                     final Object id = itemIdMapper
                             .get(clientSideSelectedKeys[i]);
@@ -501,9 +504,9 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
                     @SuppressWarnings("unchecked")
                     Set<Object> newsel = (Set<Object>) getValue();
                     if (newsel == null) {
-                        newsel = new LinkedHashSet<Object>();
+                        newsel = new LinkedHashSet<>();
                     } else {
-                        newsel = new LinkedHashSet<Object>(newsel);
+                        newsel = new LinkedHashSet<>(newsel);
                     }
                     newsel.removeAll(visibleNotSelected);
                     newsel.addAll(acceptedSelections);
@@ -570,6 +573,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
         return newItemHandler;
     }
 
+    @Deprecated
     public interface NewItemHandler extends Serializable {
         void addNewItem(String newItemCaption);
     }
@@ -584,6 +588,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      * like database inserts.
      *
      */
+    @Deprecated
     public class DefaultNewItemHandler implements NewItemHandler {
         @Override
         public void addNewItem(String newItemCaption) {
@@ -653,14 +658,14 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
 
             // If the return value is not a set
             if (retValue == null) {
-                return new HashSet<Object>();
+                return new HashSet<>();
             }
             if (retValue instanceof Set) {
                 return Collections.unmodifiableSet((Set<?>) retValue);
             } else if (retValue instanceof Collection) {
                 return new HashSet<Object>((Collection<?>) retValue);
             } else {
-                final Set<Object> s = new HashSet<Object>();
+                final Set<Object> s = new HashSet<>();
                 if (items.containsId(retValue)) {
                     s.add(retValue);
                 }
@@ -720,7 +725,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
             ConversionException, InvalidValueException {
         if (isMultiSelect()) {
             if (newFieldValue == null) {
-                super.setValue(new LinkedHashSet<Object>(), repaintIsNotNeeded,
+                super.setValue(new LinkedHashSet<>(), repaintIsNotNeeded,
                         ignoreReadOnly);
             } else if (Collection.class
                     .isAssignableFrom(newFieldValue.getClass())) {
@@ -978,7 +983,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
 
         if (isMultiSelect()) {
             Collection<Object> valueAsCollection = (Collection<Object>) value;
-            List<Object> newSelection = new ArrayList<Object>(
+            List<Object> newSelection = new ArrayList<>(
                     valueAsCollection.size());
             for (Object subValue : valueAsCollection) {
                 if (containsId(subValue)) {
@@ -1129,7 +1134,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
 
             // Convert the value type
             if (multiSelect) {
-                final Set<Object> s = new HashSet<Object>();
+                final Set<Object> s = new HashSet<>();
                 if (oldValue != null) {
                     s.add(oldValue);
                 }
@@ -1534,7 +1539,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
             setValue(itemId);
         } else if (!isSelected(itemId) && itemId != null
                 && items.containsId(itemId)) {
-            final Set<Object> s = new HashSet<Object>((Set<?>) getValue());
+            final Set<Object> s = new HashSet<>((Set<?>) getValue());
             s.add(itemId);
             setValue(s);
         }
@@ -1552,7 +1557,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     public void unselect(Object itemId) {
         if (isSelected(itemId)) {
             if (isMultiSelect()) {
-                final Set<Object> s = new HashSet<Object>((Set<?>) getValue());
+                final Set<Object> s = new HashSet<>((Set<?>) getValue());
                 s.remove(itemId);
                 setValue(s);
             } else {
@@ -1581,7 +1586,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     public void addPropertySetChangeListener(
             Container.PropertySetChangeListener listener) {
         if (propertySetEventListeners == null) {
-            propertySetEventListeners = new LinkedHashSet<Container.PropertySetChangeListener>();
+            propertySetEventListeners = new LinkedHashSet<>();
         }
         propertySetEventListeners.add(listener);
     }
@@ -1631,7 +1636,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     public void addItemSetChangeListener(
             Container.ItemSetChangeListener listener) {
         if (itemSetEventListeners == null) {
-            itemSetEventListeners = new LinkedHashSet<Container.ItemSetChangeListener>();
+            itemSetEventListeners = new LinkedHashSet<>();
         }
         itemSetEventListeners.add(listener);
     }
@@ -1912,12 +1917,13 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      * NOTE: singleton, use getCaptionChangeListener().
      *
      */
+    @Deprecated
     protected class CaptionChangeListener implements
             Item.PropertySetChangeListener, Property.ValueChangeListener {
 
         // TODO clean this up - type is either Item.PropertySetChangeNotifier or
         // Property.ValueChangeNotifier
-        HashSet<Object> captionChangeNotifiers = new HashSet<Object>();
+        HashSet<Object> captionChangeNotifiers = new HashSet<>();
 
         public void addNotifierForItem(Object itemId) {
             switch (getItemCaptionMode()) {
@@ -2008,6 +2014,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      *
      * @since 6.3
      */
+    @Deprecated
     public static class TargetItemIs extends AbstractItemSetCriterion {
 
         /**
@@ -2042,7 +2049,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      */
     private static abstract class AbstractItemSetCriterion
             extends ClientSideCriterion {
-        protected final Collection<Object> itemIds = new HashSet<Object>();
+        protected final Collection<Object> itemIds = new HashSet<>();
         protected AbstractSelect select;
 
         public AbstractItemSetCriterion(AbstractSelect select,
@@ -2076,6 +2083,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      *
      * @since 6.3
      */
+    @Deprecated
     public static class AcceptItem extends AbstractItemSetCriterion {
 
         /**
@@ -2115,6 +2123,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      *
      * @since 6.3
      */
+    @Deprecated
     public class AbstractSelectTargetDetails extends TargetDetailsImpl {
 
         /**
@@ -2166,6 +2175,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      * This accept criterion is currently usable in Tree and Table
      * implementations.
      */
+    @Deprecated
     public static class VerticalLocationIs extends TargetDetailIs {
         public static VerticalLocationIs TOP = new VerticalLocationIs(
                 VerticalDropLocation.TOP);
@@ -2184,6 +2194,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      * or Table.setItemDescriptionGenerator to generate mouse over descriptions
      * ("tooltips") for the rows and cells in Table or for the items in Tree.
      */
+    @Deprecated
     public interface ItemDescriptionGenerator extends Serializable {
 
         /**
@@ -2213,7 +2224,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     }
 
     protected void readItems(Element design, DesignContext context) {
-        Set<String> selected = new HashSet<String>();
+        Set<String> selected = new HashSet<>();
         for (Element child : design.children()) {
             readItem(child, selected, context);
         }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java
index d4d17cd7b4..d2b4665bda 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java
@@ -503,6 +503,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
     /**
      * Different modes how the TextField can trigger {@link TextChangeEvent}s.
      */
+    @Deprecated
     public enum TextChangeEventMode {
 
         /**
@@ -593,6 +594,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements
         return textChangeEventTimeout;
     }
 
+    @Deprecated
     public static class TextChangeEventImpl extends TextChangeEvent {
         private String curText;
         private int cursorPosition;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java
index cb0ce7d220..d8ffd0b1e8 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java
@@ -118,6 +118,7 @@ import com.vaadin.v7.ui.components.calendar.handler.BasicWeekClickHandler;
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class Calendar extends AbstractComponent
         implements CalendarComponentEvents.NavigationNotifier,
         CalendarComponentEvents.EventMoveNotifier,
@@ -129,6 +130,7 @@ public class Calendar extends AbstractComponent
     /**
      * Calendar can use either 12 hours clock or 24 hours clock.
      */
+    @Deprecated
     public enum TimeFormat {
 
         Format12H(), Format24H();
@@ -289,7 +291,7 @@ public class Calendar extends AbstractComponent
     public Calendar(String caption, CalendarEventProvider eventProvider) {
         registerRpc(rpc);
         setCaption(caption);
-        handlers = new HashMap<String, EventListener>();
+        handlers = new HashMap<>();
         setDefaultHandlers();
         currentCalendar.setTime(new Date());
         setEventProvider(eventProvider);
@@ -452,7 +454,7 @@ public class Calendar extends AbstractComponent
         currentCalendar.setTime(firstDateToShow);
         events = getEventProvider().getEvents(firstDateToShow, lastDateToShow);
 
-        List<CalendarState.Event> calendarStateEvents = new ArrayList<CalendarState.Event>();
+        List<CalendarState.Event> calendarStateEvents = new ArrayList<>();
         if (events != null) {
             for (int i = 0; i < events.size(); i++) {
                 CalendarEvent e = events.get(i);
@@ -532,9 +534,9 @@ public class Calendar extends AbstractComponent
         DateFormat weeklyCaptionFormatter = getWeeklyCaptionFormatter();
         weeklyCaptionFormatter.setTimeZone(currentCalendar.getTimeZone());
 
-        Map<CalendarDateRange, Set<Action>> actionMap = new HashMap<CalendarDateRange, Set<Action>>();
+        Map<CalendarDateRange, Set<Action>> actionMap = new HashMap<>();
 
-        List<CalendarState.Day> days = new ArrayList<CalendarState.Day>();
+        List<CalendarState.Day> days = new ArrayList<>();
 
         // Send all dates to client from server. This
         // approach was taken because gwt doesn't
@@ -621,7 +623,7 @@ public class Calendar extends AbstractComponent
                     getTimeZone());
             Action[] actions = actionHandler.getActions(range, this);
             if (actions != null) {
-                Set<Action> actionSet = new LinkedHashSet<Action>(
+                Set<Action> actionSet = new LinkedHashSet<>(
                         Arrays.asList(actions));
                 actionMap.put(range, actionSet);
             }
@@ -634,8 +636,7 @@ public class Calendar extends AbstractComponent
                 getTimeZone());
         Action[] actions = actionHandler.getActions(range, this);
         if (actions != null) {
-            Set<Action> actionSet = new LinkedHashSet<Action>(
-                    Arrays.asList(actions));
+            Set<Action> actionSet = new LinkedHashSet<>(Arrays.asList(actions));
             actionMap.put(range, actionSet);
         }
     }
@@ -646,7 +647,7 @@ public class Calendar extends AbstractComponent
             return null;
         }
 
-        List<CalendarState.Action> calendarActions = new ArrayList<CalendarState.Action>();
+        List<CalendarState.Action> calendarActions = new ArrayList<>();
 
         SimpleDateFormat formatter = new SimpleDateFormat(
                 DateConstants.ACTION_DATE_FORMAT_PATTERN);
@@ -1486,7 +1487,7 @@ public class Calendar extends AbstractComponent
     @Override
     public TargetDetails translateDropTargetDetails(
             Map<String, Object> clientVariables) {
-        Map<String, Object> serverVariables = new HashMap<String, Object>();
+        Map<String, Object> serverVariables = new HashMap<>();
 
         if (clientVariables.containsKey("dropSlotIndex")) {
             int slotIndex = (Integer) clientVariables.get("dropSlotIndex");
@@ -1689,8 +1690,8 @@ public class Calendar extends AbstractComponent
     public void addActionHandler(Handler actionHandler) {
         if (actionHandler != null) {
             if (actionHandlers == null) {
-                actionHandlers = new LinkedList<Action.Handler>();
-                actionMapper = new KeyMapper<Action>();
+                actionHandlers = new LinkedList<>();
+                actionMapper = new KeyMapper<>();
             }
             if (!actionHandlers.contains(actionHandler)) {
                 actionHandlers.add(actionHandler);
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java
index 5de6fa3d4b..779acb10ea 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/CheckBox.java
@@ -33,6 +33,7 @@ import com.vaadin.v7.data.Property;
 import com.vaadin.v7.shared.ui.checkbox.CheckBoxServerRpc;
 import com.vaadin.v7.shared.ui.checkbox.CheckBoxState;
 
+@Deprecated
 public class CheckBox extends AbstractField<Boolean> {
 
     private CheckBoxServerRpc rpc = new CheckBoxServerRpc() {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java
index 5b96672be7..a0af67359e 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java
@@ -49,6 +49,7 @@ import com.vaadin.v7.shared.ui.combobox.FilteringMode;
  *
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class ComboBox extends AbstractSelect
         implements AbstractSelect.Filtering, FieldEvents.BlurNotifier,
         FieldEvents.FocusNotifier {
@@ -61,6 +62,7 @@ public class ComboBox extends AbstractSelect
      * @since 7.5.6
      * @see ComboBox#setItemStyleGenerator(ItemStyleGenerator)
      */
+    @Deprecated
     public interface ItemStyleGenerator extends Serializable {
 
         /**
@@ -300,7 +302,7 @@ public class ComboBox extends AbstractSelect
             final boolean paintNullSelection = needNullSelectOption
                     && currentPage == 0 && !nullFilteredOut;
 
-            List<ComboBoxItem> items = new ArrayList<ComboBoxItem>();
+            List<ComboBoxItem> items = new ArrayList<>();
 
             if (paintNullSelection) {
                 ComboBoxItem item = new ComboBoxItem();
@@ -700,7 +702,7 @@ public class ComboBox extends AbstractSelect
     protected List<?> getFilteredOptions() {
         if (!isFilteringNeeded()) {
             prevfilterstring = null;
-            filteredOptions = new LinkedList<Object>(getItemIds());
+            filteredOptions = new LinkedList<>(getItemIds());
             return filteredOptions;
         }
 
@@ -717,7 +719,7 @@ public class ComboBox extends AbstractSelect
         }
         prevfilterstring = filterstring;
 
-        filteredOptions = new LinkedList<Object>();
+        filteredOptions = new LinkedList<>();
         for (final Iterator<?> it = items.iterator(); it.hasNext();) {
             final Object itemId = it.next();
             String caption = getItemCaption(itemId);
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/CustomField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/CustomField.java
index f55b3307a3..989bef22ec 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/CustomField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/CustomField.java
@@ -45,6 +45,7 @@ import com.vaadin.v7.data.Property;
  *
  * @since 7.0
  */
+@Deprecated
 public abstract class CustomField<T> extends AbstractField<T>
         implements HasComponents {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java
index 14318cea8d..4ee2ee4648 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java
@@ -67,6 +67,7 @@ import com.vaadin.v7.shared.ui.datefield.TextualDateFieldState;
  * @since 3.0
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class DateField extends AbstractField<Date> implements
         FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, LegacyComponent {
 
@@ -1005,6 +1006,7 @@ public class DateField extends AbstractField<Date> implements
         return timeZone;
     }
 
+    @Deprecated
     public static class UnparsableDateString
             extends Validator.InvalidValueException {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java
index da6441f48f..93ea91a9bb 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java
@@ -33,6 +33,7 @@ import com.vaadin.v7.data.Property;
  * factories.
  * 
  */
+@Deprecated
 public class DefaultFieldFactory
         implements FormFieldFactory, TableFieldFactory {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
index 90fa058ec2..f89cf5544b 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
@@ -184,6 +184,7 @@ import elemental.json.JsonValue;
  * @since 7.4
  * @author Vaadin Ltd
  */
+@Deprecated
 public class Grid extends AbstractFocusable implements SelectionNotifier,
         SortNotifier, SelectiveRenderer, ItemClickNotifier {
 
@@ -192,6 +193,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      *
      * @since 7.5.0
      */
+    @Deprecated
     public interface ColumnVisibilityChangeListener extends Serializable {
         /**
          * Called when a column has become hidden or unhidden.
@@ -206,6 +208,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      *
      * @since 7.5.0
      */
+    @Deprecated
     public static class ColumnVisibilityChangeEvent extends Component.Event {
 
         private final Column column;
@@ -272,6 +275,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * @author Vaadin Ltd
      * @see DetailsGenerator#NULL
      */
+    @Deprecated
     public interface DetailsGenerator extends Serializable {
 
         /** A details generator that provides no details */
@@ -309,6 +313,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      *
      * @since 7.6.1
      */
+    @Deprecated
     public final static class DetailComponentManager
             extends AbstractGridExtension implements DataGenerator {
 
@@ -560,6 +565,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Aims to fields of suitable type and with suitable size for use in the
      * editor row.
      */
+    @Deprecated
     public static class EditorFieldFactory
             extends DefaultFieldGroupFieldFactory {
         private static final EditorFieldFactory INSTANCE = new EditorFieldFactory();
@@ -611,6 +617,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Error handler for the editor
      */
+    @Deprecated
     public interface EditorErrorHandler extends Serializable {
 
         /**
@@ -627,6 +634,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      *
      * @since 7.6
      */
+    @Deprecated
     public static class GridContextClickEvent extends ContextClickEvent {
 
         private final Object itemId;
@@ -692,6 +700,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * An event which is fired when saving the editor fails
      */
+    @Deprecated
     public static class CommitErrorEvent extends Component.Event {
 
         private CommitException cause;
@@ -775,6 +784,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      *
      * @since 7.5.0
      */
+    @Deprecated
     public interface ColumnReorderListener extends Serializable {
 
         /**
@@ -791,6 +801,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      *
      * @since 7.5.0
      */
+    @Deprecated
     public static class ColumnReorderEvent extends Component.Event {
 
         private final boolean userOriginated;
@@ -825,6 +836,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      *
      * @since 7.6
      */
+    @Deprecated
     public interface ColumnResizeListener extends Serializable {
 
         /**
@@ -842,6 +854,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      *
      * @since 7.6
      */
+    @Deprecated
     public static class ColumnResizeEvent extends Component.Event {
 
         private final Column column;
@@ -886,6 +899,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Interface for an editor event listener
      */
+    @Deprecated
     public interface EditorListener extends Serializable {
 
         public static final Method EDITOR_OPEN_METHOD = ReflectTools.findMethod(
@@ -925,6 +939,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Base class for editor related events
      */
+    @Deprecated
     public static abstract class EditorEvent extends Component.Event {
 
         private Object itemID;
@@ -946,6 +961,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * This event gets fired when an editor is opened
      */
+    @Deprecated
     public static class EditorOpenEvent extends EditorEvent {
 
         public EditorOpenEvent(Grid source, Object itemID) {
@@ -957,6 +973,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * This event gets fired when an editor is opened while another row is being
      * edited (i.e. editor focus moves elsewhere)
      */
+    @Deprecated
     public static class EditorMoveEvent extends EditorEvent {
 
         public EditorMoveEvent(Grid source, Object itemID) {
@@ -968,6 +985,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * This event gets fired when an editor is dismissed or closed by other
      * means.
      */
+    @Deprecated
     public static class EditorCloseEvent extends EditorEvent {
 
         public EditorCloseEvent(Grid source, Object itemID) {
@@ -979,6 +997,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Default error handler for the editor
      *
      */
+    @Deprecated
     public class DefaultEditorErrorHandler implements EditorErrorHandler {
 
         @Override
@@ -1045,6 +1064,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * @see Grid#setSelectionMode(SelectionMode)
      * @see Grid#setSelectionModel(SelectionModel)
      */
+    @Deprecated
     public enum SelectionMode {
         /** A SelectionMode that maps to {@link SingleSelectionModel} */
         SINGLE {
@@ -1078,6 +1098,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * The server-side interface that controls Grid's selection state.
      * SelectionModel should extend {@link AbstractGridExtension}.
      */
+    @Deprecated
     public interface SelectionModel extends Serializable, Extension {
         /**
          * Checks whether an item is selected or not.
@@ -1127,6 +1148,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * something is forbidden to do in e.g. the user interface, it must also
          * be forbidden to do in the server-side and client-side APIs.
          */
+        @Deprecated
         public interface Multi extends SelectionModel {
 
             /**
@@ -1257,6 +1279,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * something is forbidden to do in e.g. the user interface, it must also
          * be forbidden to do in the server-side and client-side APIs.
          */
+        @Deprecated
         public interface Single extends SelectionModel {
 
             /**
@@ -1316,6 +1339,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * developer is unable to select something programmatically, it is not
          * allowed for the end-user to select anything, either.
          */
+        @Deprecated
         public interface None extends SelectionModel {
 
             /**
@@ -1340,6 +1364,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * A base class for SelectionModels that contains some of the logic that is
      * reusable.
      */
+    @Deprecated
     public static abstract class AbstractSelectionModel extends
             AbstractGridExtension implements SelectionModel, DataGenerator {
         protected final LinkedHashSet<Object> selection = new LinkedHashSet<>();
@@ -1437,6 +1462,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * A default implementation of a {@link SelectionModel.Single}
      */
+    @Deprecated
     public static class SingleSelectionModel extends AbstractSelectionModel
             implements SelectionModel.Single {
 
@@ -1542,6 +1568,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * A default implementation for a {@link SelectionModel.None}
      */
+    @Deprecated
     public static class NoSelectionModel extends AbstractSelectionModel
             implements SelectionModel.None {
 
@@ -1569,6 +1596,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * A default implementation of a {@link SelectionModel.Multi}
      */
+    @Deprecated
     public static class MultiSelectionModel extends AbstractSelectionModel
             implements SelectionModel.Multi {
 
@@ -1901,6 +1929,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * should not be stored anywhere outside of the method providing these
      * instances.
      */
+    @Deprecated
     public static class RowReference implements Serializable {
         private final Grid grid;
 
@@ -1963,6 +1992,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * should not be stored anywhere outside of the method providing these
      * instances.
      */
+    @Deprecated
     public static class CellReference implements Serializable {
         private final RowReference rowReference;
 
@@ -2038,6 +2068,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      *
      * @see Grid#setRowStyleGenerator(RowStyleGenerator)
      */
+    @Deprecated
     public interface RowStyleGenerator extends Serializable {
 
         /**
@@ -2056,6 +2087,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      *
      * @see Grid#setCellStyleGenerator(CellStyleGenerator)
      */
+    @Deprecated
     public interface CellStyleGenerator extends Serializable {
 
         /**
@@ -2079,6 +2111,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      *
      * @since 7.6
      */
+    @Deprecated
     public interface RowDescriptionGenerator extends Serializable {
 
         /**
@@ -2103,6 +2136,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      *
      * @since 7.6
      */
+    @Deprecated
     public interface CellDescriptionGenerator extends Serializable {
 
         /**
@@ -2217,6 +2251,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * @param <ROWTYPE>
      *            the type of the rows in the section
      */
+    @Deprecated
     public abstract static class StaticSection<ROWTYPE extends StaticSection.StaticRow<?>>
             implements Serializable {
 
@@ -2226,6 +2261,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * @param <CELLTYPE>
          *            the type of the cells in the row
          */
+        @Deprecated
         public abstract static class StaticRow<CELLTYPE extends StaticCell>
                 implements Serializable {
 
@@ -2481,6 +2517,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * A header or footer cell. Has a simple textual caption.
          */
+        @Deprecated
         abstract static class StaticCell implements Serializable {
 
             private CellState cellState = new CellState();
@@ -2966,6 +3003,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Represents the header section of a Grid.
      */
+    @Deprecated
     protected static class Header extends StaticSection<HeaderRow> {
 
         private HeaderRow defaultRow = null;
@@ -3073,6 +3111,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Represents a header row in Grid.
      */
+    @Deprecated
     public static class HeaderRow extends StaticSection.StaticRow<HeaderCell> {
 
         protected HeaderRow(StaticSection<?> section) {
@@ -3125,6 +3164,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Represents a header cell in Grid. Can be a merged cell for multiple
      * columns.
      */
+    @Deprecated
     public static class HeaderCell extends StaticSection.StaticCell {
 
         protected HeaderCell(HeaderRow row) {
@@ -3136,6 +3176,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Represents the footer section of a Grid. By default Footer is not
      * visible.
      */
+    @Deprecated
     protected static class Footer extends StaticSection<FooterRow> {
 
         private final GridStaticSectionState footerState = new GridStaticSectionState();
@@ -3164,6 +3205,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Represents a footer row in Grid.
      */
+    @Deprecated
     public static class FooterRow extends StaticSection.StaticRow<FooterCell> {
 
         protected FooterRow(StaticSection<?> section) {
@@ -3185,6 +3227,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Represents a footer cell in Grid.
      */
+    @Deprecated
     public static class FooterCell extends StaticSection.StaticCell {
 
         protected FooterCell(FooterRow row) {
@@ -3196,6 +3239,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * A column in the grid. Can be obtained by calling
      * {@link Grid#getColumn(Object propertyId)}.
      */
+    @Deprecated
     public static class Column implements Serializable {
 
         /**
@@ -4126,6 +4170,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * @param <T>
      *            the type this renderer knows how to present
      */
+    @Deprecated
     public static abstract class AbstractRenderer<T>
             extends AbstractGridExtension implements Renderer<T> {
 
@@ -4284,6 +4329,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      *
      * @since 7.5
      */
+    @Deprecated
     public static abstract class AbstractGridExtension
             extends AbstractExtension {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/InlineDateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/InlineDateField.java
index 1bec2bc61e..7c4e7e1721 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/InlineDateField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/InlineDateField.java
@@ -31,6 +31,7 @@ import com.vaadin.v7.data.Property;
  * @author Vaadin Ltd.
  * @since 5.0
  */
+@Deprecated
 public class InlineDateField extends DateField {
 
     public InlineDateField() {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java
index dc89fffabf..9836f33d20 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java
@@ -56,6 +56,7 @@ import com.vaadin.v7.shared.ui.label.LabelState;
  * @since 3.0
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class Label extends AbstractComponent implements Property<String>,
         Property.Viewer, Property.ValueChangeListener,
         Property.ValueChangeNotifier, Comparable<Label> {
@@ -331,6 +332,7 @@ public class Label extends AbstractComponent implements Property<String>,
      * @author Vaadin Ltd.
      * @since 3.0
      */
+    @Deprecated
     public static class ValueChangeEvent extends Component.Event
             implements Property.ValueChangeEvent {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/ListSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ListSelect.java
index 3b5683f55d..1e776c4878 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/ListSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ListSelect.java
@@ -27,6 +27,7 @@ import com.vaadin.v7.data.Container;
  * lazyloading, and other advanced features.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class ListSelect extends AbstractSelect {
 
     private int rows = 0;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/NativeSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/NativeSelect.java
index d68f184d43..752884663f 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/NativeSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/NativeSelect.java
@@ -33,6 +33,7 @@ import com.vaadin.v7.data.Container;
  * better choice.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class NativeSelect extends AbstractSelect
         implements FieldEvents.BlurNotifier, FieldEvents.FocusNotifier {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java
index c85e0ff631..0dba641909 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java
@@ -40,10 +40,11 @@ import com.vaadin.v7.shared.ui.optiongroup.OptionGroupState;
  * Configures select to be used as an option group.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class OptionGroup extends AbstractSelect
         implements FieldEvents.BlurNotifier, FieldEvents.FocusNotifier {
 
-    private Set<Object> disabledItemIds = new HashSet<Object>();
+    private Set<Object> disabledItemIds = new HashSet<>();
 
     public OptionGroup() {
         super();
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/PopupDateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/PopupDateField.java
index cf223b0779..317fc30f45 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/PopupDateField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/PopupDateField.java
@@ -34,6 +34,7 @@ import com.vaadin.v7.shared.ui.datefield.PopupDateFieldState;
  * @author Vaadin Ltd.
  * @since 5.0
  */
+@Deprecated
 public class PopupDateField extends DateField {
 
     private String inputPrompt = null;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java
index be730af130..14831d7d81 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java
@@ -34,6 +34,7 @@ import com.vaadin.v7.shared.ui.progressindicator.ProgressBarState;
  * @since 7.1
  * @author Vaadin Ltd
  */
+@Deprecated
 public class ProgressBar extends AbstractField<Float>
         implements Property.Viewer, Property.ValueChangeListener {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java
index 15887e0fb0..ca638a98da 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java
@@ -34,6 +34,7 @@ import com.vaadin.v7.shared.ui.textarea.RichTextAreaState;
  * {@link RichTextArea} may produce unexpected results as formatting is counted
  * into length of field.
  */
+@Deprecated
 public class RichTextArea extends AbstractField<String>
         implements LegacyComponent {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Slider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Slider.java
index 81f17e0b79..15b083e38d 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Slider.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Slider.java
@@ -322,6 +322,7 @@ public class Slider extends AbstractField<Double> {
      * @author Vaadin Ltd.
      *
      */
+    @Deprecated
     public class ValueOutOfBoundsException extends RuntimeException {
 
         private final Double value;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
index 5656a59af2..dc7b762c13 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
@@ -102,6 +102,7 @@ import com.vaadin.v7.shared.ui.table.TableState;
  * @author Vaadin Ltd.
  * @since 3.0
  */
+@Deprecated
 @SuppressWarnings({ "deprecation" })
 public class Table extends AbstractSelect implements Action.Container,
         Container.Ordered, Container.Sortable, ItemClickNotifier, DragSource,
@@ -112,6 +113,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Modes that Table support as drag sourse.
      */
+    @Deprecated
     public enum TableDragMode {
         /**
          * Table does not start drag and drop events. HTM5 style events started
@@ -143,6 +145,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     protected static final int CELL_FIRSTCOL = 5;
 
+    @Deprecated
     public enum Align {
         /**
          * Left column alignment. <b>This is the default behaviour. </b>
@@ -204,6 +207,7 @@ public class Table extends AbstractSelect implements Action.Container,
     @Deprecated
     public static final Align ALIGN_RIGHT = Align.RIGHT;
 
+    @Deprecated
     public enum ColumnHeaderMode {
         /**
          * Column headers are hidden.
@@ -253,6 +257,7 @@ public class Table extends AbstractSelect implements Action.Container,
     @Deprecated
     public static final ColumnHeaderMode COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID = ColumnHeaderMode.EXPLICIT_DEFAULTS_ID;
 
+    @Deprecated
     public enum RowHeaderMode {
         /**
          * Row caption mode: The row headers are hidden. <b>This is the default
@@ -382,57 +387,57 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Keymapper for column ids.
      */
-    private final KeyMapper<Object> columnIdMap = new KeyMapper<Object>();
+    private final KeyMapper<Object> columnIdMap = new KeyMapper<>();
 
     /**
      * Holds visible column propertyIds - in order.
      */
-    private LinkedList<Object> visibleColumns = new LinkedList<Object>();
+    private LinkedList<Object> visibleColumns = new LinkedList<>();
 
     /**
      * Holds noncollapsible columns.
      */
-    private HashSet<Object> noncollapsibleColumns = new HashSet<Object>();
+    private HashSet<Object> noncollapsibleColumns = new HashSet<>();
 
     /**
      * Holds propertyIds of currently collapsed columns.
      */
-    private final HashSet<Object> collapsedColumns = new HashSet<Object>();
+    private final HashSet<Object> collapsedColumns = new HashSet<>();
 
     /**
      * Holds headers for visible columns (by propertyId).
      */
-    private final HashMap<Object, String> columnHeaders = new HashMap<Object, String>();
+    private final HashMap<Object, String> columnHeaders = new HashMap<>();
 
     /**
      * Holds footers for visible columns (by propertyId).
      */
-    private final HashMap<Object, String> columnFooters = new HashMap<Object, String>();
+    private final HashMap<Object, String> columnFooters = new HashMap<>();
 
     /**
      * Holds icons for visible columns (by propertyId).
      */
-    private final HashMap<Object, Resource> columnIcons = new HashMap<Object, Resource>();
+    private final HashMap<Object, Resource> columnIcons = new HashMap<>();
 
     /**
      * Holds alignments for visible columns (by propertyId).
      */
-    private HashMap<Object, Align> columnAlignments = new HashMap<Object, Align>();
+    private HashMap<Object, Align> columnAlignments = new HashMap<>();
 
     /**
      * Holds column widths in pixels for visible columns (by propertyId).
      */
-    private final HashMap<Object, Integer> columnWidths = new HashMap<Object, Integer>();
+    private final HashMap<Object, Integer> columnWidths = new HashMap<>();
 
     /**
      * Holds column expand rations for visible columns (by propertyId).
      */
-    private final HashMap<Object, Float> columnExpandRatios = new HashMap<Object, Float>();
+    private final HashMap<Object, Float> columnExpandRatios = new HashMap<>();
 
     /**
      * Holds column generators
      */
-    private final HashMap<Object, ColumnGenerator> columnGenerators = new LinkedHashMap<Object, ColumnGenerator>();
+    private final HashMap<Object, ColumnGenerator> columnGenerators = new LinkedHashMap<>();
 
     /**
      * Holds value of property pageLength. 0 disables paging.
@@ -585,11 +590,11 @@ public class Table extends AbstractSelect implements Action.Container,
 
     private RowGenerator rowGenerator = null;
 
-    private final Map<Field<?>, Property<?>> associatedProperties = new HashMap<Field<?>, Property<?>>();
+    private final Map<Field<?>, Property<?>> associatedProperties = new HashMap<>();
 
     private boolean painted = false;
 
-    private HashMap<Object, Converter<String, Object>> propertyValueConverters = new HashMap<Object, Converter<String, Object>>();
+    private HashMap<Object, Converter<String, Object>> propertyValueConverters = new HashMap<>();
 
     /**
      * Set to true if the client-side should be informed that the key mapper has
@@ -598,7 +603,7 @@ public class Table extends AbstractSelect implements Action.Container,
      */
     private boolean keyMapperReset;
 
-    private List<Throwable> exceptionsDuringCachePopulation = new ArrayList<Throwable>();
+    private List<Throwable> exceptionsDuringCachePopulation = new ArrayList<>();
 
     private boolean isBeingPainted;
 
@@ -682,7 +687,7 @@ public class Table extends AbstractSelect implements Action.Container,
                     "Can not set visible columns to null value");
         }
 
-        final LinkedList<Object> newVC = new LinkedList<Object>();
+        final LinkedList<Object> newVC = new LinkedList<>();
 
         // Checks that the new visible columns contains no nulls, properties
         // exist and that there are no duplicates before adding them to newVC.
@@ -887,7 +892,7 @@ public class Table extends AbstractSelect implements Action.Container,
         }
 
         // Resets the alignments
-        final HashMap<Object, Align> newCA = new HashMap<Object, Align>();
+        final HashMap<Object, Align> newCA = new HashMap<>();
         int i = 0;
         for (final Iterator<Object> it = visibleColumns.iterator(); it.hasNext()
                 && i < columnAlignments.length; i++) {
@@ -1464,7 +1469,7 @@ public class Table extends AbstractSelect implements Action.Container,
         if (columnOrder == null || !isColumnReorderingAllowed()) {
             return;
         }
-        final LinkedList<Object> newOrder = new LinkedList<Object>();
+        final LinkedList<Object> newOrder = new LinkedList<>();
         for (int i = 0; i < columnOrder.length; i++) {
             if (columnOrder[i] != null
                     && visibleColumns.contains(columnOrder[i])) {
@@ -1786,6 +1791,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * </p>
      *
      */
+    @Deprecated
     public static class CacheUpdateException extends RuntimeException {
         private Throwable[] causes;
         private Table table;
@@ -2194,8 +2200,8 @@ public class Table extends AbstractSelect implements Action.Container,
         if (replaceListeners) {
             // initialize the listener collections, this should only be done if
             // the entire cache is refreshed (through refreshRenderedCells)
-            listenedProperties = new HashSet<Property<?>>();
-            visibleComponents = new HashSet<Component>();
+            listenedProperties = new HashSet<>();
+            visibleComponents = new HashSet<>();
         }
 
         Object[][] cells = new Object[cols + CELL_FIRSTCOL][rows];
@@ -2636,7 +2642,7 @@ public class Table extends AbstractSelect implements Action.Container,
             throws UnsupportedOperationException {
 
         // remove generated columns from the list of columns being assigned
-        final LinkedList<Object> availableCols = new LinkedList<Object>();
+        final LinkedList<Object> availableCols = new LinkedList<>();
         for (Iterator<Object> it = visibleColumns.iterator(); it.hasNext();) {
             Object id = it.next();
             if (!columnGenerators.containsKey(id)) {
@@ -2727,7 +2733,7 @@ public class Table extends AbstractSelect implements Action.Container,
         } else {
             generated = Collections.emptyList();
         }
-        List<Object> visibleIds = new ArrayList<Object>();
+        List<Object> visibleIds = new ArrayList<>();
         if (generated.isEmpty()) {
             visibleIds.addAll(newDataSource.getContainerPropertyIds());
         } else {
@@ -2769,7 +2775,7 @@ public class Table extends AbstractSelect implements Action.Container,
             newDataSource = new IndexedContainer();
         }
         if (visibleIds == null) {
-            visibleIds = new ArrayList<Object>();
+            visibleIds = new ArrayList<>();
         }
 
         // Retain propertyValueConverters if their corresponding ids are
@@ -2778,7 +2784,7 @@ public class Table extends AbstractSelect implements Action.Container,
         if (propertyValueConverters != null) {
             Collection<?> newPropertyIds = newDataSource
                     .getContainerPropertyIds();
-            LinkedList<Object> retainableValueConverters = new LinkedList<Object>();
+            LinkedList<Object> retainableValueConverters = new LinkedList<>();
             for (Object propertyId : newPropertyIds) {
                 Converter<String, ?> converter = getConverter(propertyId);
                 if (converter != null) {
@@ -2811,7 +2817,7 @@ public class Table extends AbstractSelect implements Action.Container,
         }
 
         // don't add the same id twice
-        Collection<Object> col = new LinkedList<Object>();
+        Collection<Object> col = new LinkedList<>();
         for (Iterator<?> it = visibleIds.iterator(); it.hasNext();) {
             Object id = it.next();
             if (!col.contains(id)) {
@@ -2852,7 +2858,7 @@ public class Table extends AbstractSelect implements Action.Container,
      */
     private LinkedHashSet<Object> getItemIdsInRange(Object itemId,
             final int length) {
-        LinkedHashSet<Object> ids = new LinkedHashSet<Object>();
+        LinkedHashSet<Object> ids = new LinkedHashSet<>();
         for (int i = 0; i < length; i++) {
             assert itemId != null; // should not be null unless client-server
                                    // are out of sync
@@ -2875,7 +2881,7 @@ public class Table extends AbstractSelect implements Action.Container,
         Set<Object> renderedButNotSelectedItemIds = getCurrentlyRenderedItemIds();
 
         @SuppressWarnings("unchecked")
-        HashSet<Object> newValue = new LinkedHashSet<Object>(
+        HashSet<Object> newValue = new LinkedHashSet<>(
                 (Collection<Object>) getValue());
 
         if (variables.containsKey("clearSelections")) {
@@ -2930,7 +2936,7 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     private Set<Object> getCurrentlyRenderedItemIds() {
-        HashSet<Object> ids = new HashSet<Object>();
+        HashSet<Object> ids = new HashSet<>();
         if (pageBuffer != null) {
             for (int i = 0; i < pageBuffer[CELL_ITEMID].length; i++) {
                 ids.add(pageBuffer[CELL_ITEMID][i]);
@@ -2964,7 +2970,7 @@ public class Table extends AbstractSelect implements Action.Container,
         if (!isSelectable() && variables.containsKey("selected")) {
             // Not-selectable is a special case, AbstractSelect does not support
             // TODO could be optimized.
-            variables = new HashMap<String, Object>(variables);
+            variables = new HashMap<>(variables);
             variables.remove("selected");
         }
 
@@ -2976,7 +2982,7 @@ public class Table extends AbstractSelect implements Action.Container,
                 && variables.containsKey("selected")
                 && multiSelectMode == MultiSelectMode.DEFAULT) {
             handleSelectedItems(variables);
-            variables = new HashMap<String, Object>(variables);
+            variables = new HashMap<>(variables);
             variables.remove("selected");
         }
 
@@ -3075,7 +3081,7 @@ public class Table extends AbstractSelect implements Action.Container,
                 try {
                     final Object[] ids = (Object[]) variables
                             .get("collapsedcolumns");
-                    Set<Object> idSet = new HashSet<Object>();
+                    Set<Object> idSet = new HashSet<>();
                     for (Object id : ids) {
                         idSet.add(columnIdMap.get(id.toString()));
                     }
@@ -3648,7 +3654,7 @@ public class Table extends AbstractSelect implements Action.Container,
     private void paintAvailableColumns(PaintTarget target)
             throws PaintException {
         if (columnCollapsingAllowed) {
-            final HashSet<Object> collapsedCols = new HashSet<Object>();
+            final HashSet<Object> collapsedCols = new HashSet<>();
             for (Object colId : visibleColumns) {
                 if (isColumnCollapsed(colId)) {
                     collapsedCols.add(colId);
@@ -3772,7 +3778,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     private void paintVisibleColumnOrder(PaintTarget target) {
         // Visible column order
-        final ArrayList<String> visibleColOrder = new ArrayList<String>();
+        final ArrayList<String> visibleColOrder = new ArrayList<>();
         for (Object columnId : visibleColumns) {
             if (!isColumnCollapsed(columnId)) {
                 visibleColOrder.add(columnIdMap.key(columnId));
@@ -3782,9 +3788,9 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     private Set<Action> findAndPaintBodyActions(PaintTarget target) {
-        Set<Action> actionSet = new LinkedHashSet<Action>();
+        Set<Action> actionSet = new LinkedHashSet<>();
         if (actionHandlers != null) {
-            final ArrayList<String> keys = new ArrayList<String>();
+            final ArrayList<String> keys = new ArrayList<>();
             for (Handler ah : actionHandlers) {
                 // Getting actions for the null item, which in this case means
                 // the body item
@@ -3846,7 +3852,7 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     private String[] findSelectedKeys() {
-        LinkedList<String> selectedKeys = new LinkedList<String>();
+        LinkedList<String> selectedKeys = new LinkedList<>();
         if (isMultiSelect()) {
             HashSet<?> sel = new HashSet<Object>((Set<?>) getValue());
             Collection<?> vids = getVisibleItemIds();
@@ -4002,7 +4008,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         // Actions
         if (actionHandlers != null) {
-            final ArrayList<String> keys = new ArrayList<String>();
+            final ArrayList<String> keys = new ArrayList<>();
             for (Handler ah : actionHandlers) {
                 final Action[] aa = ah.getActions(itemId, this);
                 if (aa != null) {
@@ -4197,8 +4203,8 @@ public class Table extends AbstractSelect implements Action.Container,
         if (actionHandler != null) {
 
             if (actionHandlers == null) {
-                actionHandlers = new LinkedList<Handler>();
-                actionMapper = new KeyMapper<Action>();
+                actionHandlers = new LinkedList<>();
+                actionMapper = new KeyMapper<>();
             }
 
             if (!actionHandlers.contains(actionHandler)) {
@@ -4536,7 +4542,7 @@ public class Table extends AbstractSelect implements Action.Container,
     @Override
     public Collection<?> getVisibleItemIds() {
 
-        final LinkedList<Object> visible = new LinkedList<Object>();
+        final LinkedList<Object> visible = new LinkedList<>();
 
         final Object[][] cells = getVisibleCells();
         // may be null if the table has not been rendered yet (e.g. not attached
@@ -4618,8 +4624,7 @@ public class Table extends AbstractSelect implements Action.Container,
         Collection<?> containerPropertyIds = getContainerDataSource()
                 .getContainerPropertyIds();
 
-        LinkedList<Object> newVisibleColumns = new LinkedList<Object>(
-                visibleColumns);
+        LinkedList<Object> newVisibleColumns = new LinkedList<>(visibleColumns);
         for (Iterator<Object> iterator = newVisibleColumns.iterator(); iterator
                 .hasNext();) {
             Object id = iterator.next();
@@ -5047,6 +5052,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Table.addGeneratedColumn along with an id for the column to be generated.
      *
      */
+    @Deprecated
     public interface ColumnGenerator extends Serializable {
 
         /**
@@ -5097,6 +5103,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * to the cell content is <tt>v-table-cell-content-[style name]</tt>, and
      * the row style will be <tt>v-table-row-[style name]</tt>.
      */
+    @Deprecated
     public interface CellStyleGenerator extends Serializable {
 
         /**
@@ -5188,6 +5195,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *
      * @since 6.3
      */
+    @Deprecated
     public class TableTransferable extends DataBoundTransferable {
 
         protected TableTransferable(Map<String, Object> rawVariables) {
@@ -5277,6 +5285,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * initialized from server and no subsequent requests requests are needed
      * during that drag and drop operation.
      */
+    @Deprecated
     public static abstract class TableDropCriterion
             extends ServerSideCriterion {
 
@@ -5362,6 +5371,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * the column which header was pressed and details about the mouse event
      * itself.
      */
+    @Deprecated
     public static class HeaderClickEvent extends ClickEvent {
         public static final Method HEADER_CLICK_METHOD;
 
@@ -5402,6 +5412,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * the column which header was pressed and details about the mouse event
      * itself.
      */
+    @Deprecated
     public static class FooterClickEvent extends ClickEvent {
         public static final Method FOOTER_CLICK_METHOD;
 
@@ -5450,6 +5461,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Interface for the listener for column header mouse click events. The
      * headerClick method is called when the user presses a header column cell.
      */
+    @Deprecated
     public interface HeaderClickListener extends Serializable {
 
         /**
@@ -5466,6 +5478,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Interface for the listener for column footer mouse click events. The
      * footerClick method is called when the user presses a footer column cell.
      */
+    @Deprecated
     public interface FooterClickListener extends Serializable {
 
         /**
@@ -5632,6 +5645,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * columns property id which was fired, the previous width of the column and
      * the width of the column after the resize.
      */
+    @Deprecated
     public static class ColumnResizeEvent extends Component.Event {
         public static final Method COLUMN_RESIZE_METHOD;
 
@@ -5701,6 +5715,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Interface for listening to column resize events.
      */
+    @Deprecated
     public interface ColumnResizeListener extends Serializable {
 
         /**
@@ -5759,6 +5774,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * This event is fired when a columns are reordered by the end user user.
      */
+    @Deprecated
     public static class ColumnReorderEvent extends Component.Event {
         public static final Method METHOD;
 
@@ -5788,6 +5804,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Interface for listening to column reorder events.
      */
+    @Deprecated
     public interface ColumnReorderListener extends Serializable {
 
         /**
@@ -5803,6 +5820,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *
      * @since 7.6
      */
+    @Deprecated
     public static class ColumnCollapseEvent extends Component.Event {
 
         public static final Method METHOD = ReflectTools.findMethod(
@@ -5838,6 +5856,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *
      * @since 7.6
      */
+    @Deprecated
     public interface ColumnCollapseListener extends Serializable {
 
         /**
@@ -5949,6 +5968,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *
      * Row generators can be used for e.g. summary rows or grouping of items.
      */
+    @Deprecated
     public interface RowGenerator extends Serializable {
         /**
          * Called for every row that is painted in the Table. Returning a
@@ -5983,6 +6003,7 @@ public class Table extends AbstractSelect implements Action.Container,
         public GeneratedRow generateRow(Table table, Object itemId);
     }
 
+    @Deprecated
     public static class GeneratedRow implements Serializable {
         private boolean htmlContentAllowed = false;
         private boolean spanColumns = false;
@@ -6168,7 +6189,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         if (colgroup != null) {
             int i = 0;
-            List<Object> pIds = new ArrayList<Object>();
+            List<Object> pIds = new ArrayList<>();
             for (Element col : colgroup.children()) {
                 if (!col.tagName().equals("col")) {
                     throw new DesignException("invalid column");
@@ -6270,7 +6291,7 @@ public class Table extends AbstractSelect implements Action.Container,
             return;
         }
 
-        Set<String> selected = new HashSet<String>();
+        Set<String> selected = new HashSet<>();
         for (Element tr : tbody.children()) {
             readItem(tr, selected, context);
         }
@@ -6426,6 +6447,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *
      * @since 7.6
      */
+    @Deprecated
     public static class TableContextClickEvent extends ContextClickEvent {
 
         private final Object itemId;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java
index 014c86c72f..676f2f6366 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java
@@ -33,6 +33,7 @@ import com.vaadin.v7.data.Container;
  * @since 6.0
  * @see FormFieldFactory
  */
+@Deprecated
 public interface TableFieldFactory extends Serializable {
     /**
      * Creates a field based on the Container, item id, property id and the
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java
index 8375649716..c635c0835c 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java
@@ -26,6 +26,7 @@ import com.vaadin.v7.shared.ui.textarea.TextAreaState;
 /**
  * A text field that supports multi line editing.
  */
+@Deprecated
 public class TextArea extends AbstractTextField {
 
     /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
index 87917ffa53..9a3403e3d4 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
@@ -76,6 +76,7 @@ import com.vaadin.v7.shared.ui.tree.TreeState;
  * @since 3.0
  */
 @SuppressWarnings({ "serial", "deprecation" })
+@Deprecated
 public class Tree extends AbstractSelect implements Container.Hierarchical,
         Action.Container, ItemClickNotifier, DragSource, DropTarget {
 
@@ -84,6 +85,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      *
      * @since 7.6
      */
+    @Deprecated
     public static class TreeContextClickEvent extends ContextClickEvent {
 
         private final Object itemId;
@@ -117,12 +119,12 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Item icons alt texts.
      */
-    private final HashMap<Object, String> itemIconAlts = new HashMap<Object, String>();
+    private final HashMap<Object, String> itemIconAlts = new HashMap<>();
 
     /**
      * Set of expanded nodes.
      */
-    private HashSet<Object> expanded = new HashSet<Object>();
+    private HashSet<Object> expanded = new HashSet<>();
 
     /**
      * List of action handlers.
@@ -163,6 +165,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Supported drag modes for Tree.
      */
+    @Deprecated
     public enum TreeDragMode {
         /**
          * When drag mode is NONE, dragging from Tree is not supported. Browsers
@@ -369,7 +372,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
         boolean result = true;
 
         // Initial stack
-        final Stack<Object> todo = new Stack<Object>();
+        final Stack<Object> todo = new Stack<>();
         todo.add(startItemId);
 
         // Expands recursively
@@ -422,7 +425,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
         boolean result = true;
 
         // Initial stack
-        final Stack<Object> todo = new Stack<Object>();
+        final Stack<Object> todo = new Stack<>();
         todo.add(startItemId);
 
         // Collapse recursively
@@ -522,7 +525,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
         if (!isSelectable() && variables.containsKey("selected")) {
             // Not-selectable is a special case, AbstractSelect does not support
             // TODO could be optimized.
-            variables = new HashMap<String, Object>(variables);
+            variables = new HashMap<>(variables);
             variables.remove("selected");
         }
 
@@ -561,7 +564,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
         if (variables.containsKey("selected") && isMultiSelect()
                 && multiSelectMode == MultiSelectMode.DEFAULT) {
             handleSelectedItems(variables);
-            variables = new HashMap<String, Object>(variables);
+            variables = new HashMap<>(variables);
             variables.remove("selected");
         }
 
@@ -595,7 +598,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
         final String[] ka = (String[]) variables.get("selected");
 
         // Converts the key-array to id-set
-        final LinkedList<Object> s = new LinkedList<Object>();
+        final LinkedList<Object> s = new LinkedList<>();
         for (int i = 0; i < ka.length; i++) {
             final Object id = itemIdMapper.get(ka[i]);
             if (!isNullSelectionAllowed()
@@ -666,15 +669,15 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
         }
 
         // Initialize variables
-        final Set<Action> actionSet = new LinkedHashSet<Action>();
+        final Set<Action> actionSet = new LinkedHashSet<>();
 
         // rendered selectedKeys
-        LinkedList<String> selectedKeys = new LinkedList<String>();
+        LinkedList<String> selectedKeys = new LinkedList<>();
 
-        final LinkedList<String> expandedKeys = new LinkedList<String>();
+        final LinkedList<String> expandedKeys = new LinkedList<>();
 
         // Iterates through hierarchical tree using a stack of iterators
-        final Stack<Iterator<?>> iteratorStack = new Stack<Iterator<?>>();
+        final Stack<Iterator<?>> iteratorStack = new Stack<>();
         Collection<?> ids;
         if (partialUpdate) {
             ids = getChildren(expandedItemId);
@@ -691,7 +694,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
          * by right clicking on the Tree body
          */
         if (actionHandlers != null) {
-            final ArrayList<String> keys = new ArrayList<String>();
+            final ArrayList<String> keys = new ArrayList<>();
             for (Handler ah : actionHandlers) {
 
                 // Getting action for the null item, which in this case
@@ -780,7 +783,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
                 // Actions
                 if (actionHandlers != null) {
-                    final ArrayList<String> keys = new ArrayList<String>();
+                    final ArrayList<String> keys = new ArrayList<>();
                     final Iterator<Action.Handler> ahi = actionHandlers
                             .iterator();
                     while (ahi.hasNext()) {
@@ -1028,6 +1031,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * @author Vaadin Ltd.
      * @since 3.0
      */
+    @Deprecated
     public static class ExpandEvent extends Component.Event {
 
         private final Object expandedItemId;
@@ -1060,6 +1064,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * @author Vaadin Ltd.
      * @since 3.0
      */
+    @Deprecated
     public interface ExpandListener extends Serializable {
 
         public static final Method EXPAND_METHOD = ReflectTools.findMethod(
@@ -1131,6 +1136,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * @author Vaadin Ltd.
      * @since 3.0
      */
+    @Deprecated
     public static class CollapseEvent extends Component.Event {
 
         private final Object collapsedItemId;
@@ -1163,6 +1169,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * @author Vaadin Ltd.
      * @since 3.0
      */
+    @Deprecated
     public interface CollapseListener extends Serializable {
 
         public static final Method COLLAPSE_METHOD = ReflectTools.findMethod(
@@ -1240,8 +1247,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
         if (actionHandler != null) {
 
             if (actionHandlers == null) {
-                actionHandlers = new LinkedList<Action.Handler>();
-                actionMapper = new KeyMapper<Action>();
+                actionHandlers = new LinkedList<>();
+                actionMapper = new KeyMapper<>();
             }
 
             if (!actionHandlers.contains(actionHandler)) {
@@ -1289,10 +1296,10 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     @Override
     public Collection<?> getVisibleItemIds() {
 
-        final LinkedList<Object> visible = new LinkedList<Object>();
+        final LinkedList<Object> visible = new LinkedList<>();
 
         // Iterates trough hierarchical tree using a stack of iterators
-        final Stack<Iterator<?>> iteratorStack = new Stack<Iterator<?>>();
+        final Stack<Iterator<?>> iteratorStack = new Stack<>();
         final Collection<?> ids = rootItemIds();
         if (ids != null) {
             iteratorStack.push(ids.iterator());
@@ -1418,6 +1425,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * CSS class name that will be added to the item content is
      * <tt>v-tree-node-[style name]</tt>.
      */
+    @Deprecated
     public interface ItemStyleGenerator extends Serializable {
 
         /**
@@ -1454,6 +1462,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      *
      * @since 6.3
      */
+    @Deprecated
     public class TreeTargetDetails extends AbstractSelectTargetDetails {
 
         TreeTargetDetails(Map<String, Object> rawVariables) {
@@ -1584,6 +1593,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      *
      * @since 6.3
      */
+    @Deprecated
     protected class TreeTransferable extends DataBoundTransferable {
 
         public TreeTransferable(Component sourceComponent,
@@ -1630,6 +1640,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * initialized from server and no subsequent requests requests are needed
      * during that drag and drop operation.
      */
+    @Deprecated
     public static abstract class TreeDropCriterion extends ServerSideCriterion {
 
         private Tree tree;
@@ -1702,6 +1713,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      *
      * @since 6.3
      */
+    @Deprecated
     public static class TargetItemAllowsChildren extends TargetDetailIs {
 
         private static TargetItemAllowsChildren instance = new TargetItemAllowsChildren();
@@ -1748,6 +1760,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * <p>
      * The root items is also consider to be valid target.
      */
+    @Deprecated
     public class TargetInSubtree extends ClientSideCriterion {
 
         private Object rootId;
@@ -1836,7 +1849,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     }
 
     private void cleanupExpandedItems() {
-        Set<Object> removedItemIds = new HashSet<Object>();
+        Set<Object> removedItemIds = new HashSet<>();
         for (Object expandedItemId : expanded) {
             if (getItem(expandedItemId) == null) {
                 removedItemIds.add(expandedItemId);
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
index f9a35f2b46..4192883098 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
@@ -68,6 +68,7 @@ import com.vaadin.v7.ui.Tree.ExpandListener;
  * share UI state in the container.
  */
 @SuppressWarnings({ "serial" })
+@Deprecated
 public class TreeTable extends Table implements Hierarchical {
 
     private interface ContainerStrategy extends Serializable {
@@ -196,7 +197,7 @@ public class TreeTable extends Table implements Hierarchical {
      */
     private class HierarchicalStrategy extends AbstractStrategy {
 
-        private final HashSet<Object> openItems = new HashSet<Object>();
+        private final HashSet<Object> openItems = new HashSet<>();
 
         @Override
         public boolean isNodeOpen(Object itemId) {
@@ -283,7 +284,7 @@ public class TreeTable extends Table implements Hierarchical {
          */
         private List<Object> getPreOrder() {
             if (preOrder == null) {
-                preOrder = new ArrayList<Object>();
+                preOrder = new ArrayList<>();
                 Collection<?> rootItemIds = getContainerDataSource()
                         .rootItemIds();
                 for (Object id : rootItemIds) {
@@ -894,7 +895,7 @@ public class TreeTable extends Table implements Hierarchical {
 
     @Override
     protected List<Object> getItemIds(int firstIndex, int rows) {
-        List<Object> itemIds = new ArrayList<Object>();
+        List<Object> itemIds = new ArrayList<>();
         for (int i = firstIndex; i < firstIndex + rows; i++) {
             itemIds.add(getIdByIndex(i));
         }
@@ -908,8 +909,8 @@ public class TreeTable extends Table implements Hierarchical {
             return;
         }
 
-        Set<String> selected = new HashSet<String>();
-        Stack<Object> parents = new Stack<Object>();
+        Set<String> selected = new HashSet<>();
+        Stack<Object> parents = new Stack<>();
         int lastDepth = -1;
 
         for (Element tr : tbody.children()) {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java
index 4766d938ea..50d9e60bb6 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java
@@ -29,6 +29,7 @@ import com.vaadin.v7.shared.ui.twincolselect.TwinColSelectState;
  * side for selected items.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class TwinColSelect extends AbstractSelect {
 
     private int rows = 0;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java
index 230d87b7f7..e3f1bce837 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java
@@ -26,6 +26,7 @@ import com.vaadin.v7.ui.Calendar;
  *
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class CalendarComponentEvent extends Component.Event {
 
     /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java
index ea892a6b9d..a272b1444f 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java
@@ -31,11 +31,13 @@ import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
  * @since 7.1.0
  * @author Vaadin Ltd.
  */
+@Deprecated
 public interface CalendarComponentEvents extends Serializable {
 
     /**
      * Notifier interface for notifying listener of calendar events
      */
+    @Deprecated
     public interface CalendarEventNotifier extends Serializable {
         /**
          * Get the assigned event handler for the given eventId.
@@ -49,6 +51,7 @@ public interface CalendarComponentEvents extends Serializable {
     /**
      * Notifier interface for event drag & drops.
      */
+    @Deprecated
     public interface EventMoveNotifier extends CalendarEventNotifier {
 
         /**
@@ -65,6 +68,7 @@ public interface CalendarComponentEvents extends Serializable {
      * MoveEvent is sent when existing event is dragged to a new position.
      */
     @SuppressWarnings("serial")
+    @Deprecated
     public class MoveEvent extends CalendarComponentEvent {
 
         public static final String EVENT_ID = CalendarEventId.EVENTMOVE;
@@ -116,6 +120,7 @@ public interface CalendarComponentEvents extends Serializable {
      * Handler interface for when events are being dragged on the calendar
      *
      */
+    @Deprecated
     public interface EventMoveHandler extends EventListener, Serializable {
 
         /** Trigger method for the MoveEvent. */
@@ -136,6 +141,7 @@ public interface CalendarComponentEvents extends Serializable {
     /**
      * Handler interface for day or time cell drag-marking with mouse.
      */
+    @Deprecated
     public interface RangeSelectNotifier
             extends Serializable, CalendarEventNotifier {
 
@@ -153,6 +159,7 @@ public interface CalendarComponentEvents extends Serializable {
      * mouse.
      */
     @SuppressWarnings("serial")
+    @Deprecated
     public class RangeSelectEvent extends CalendarComponentEvent {
 
         public static final String EVENT_ID = CalendarEventId.RANGESELECT;
@@ -221,6 +228,7 @@ public interface CalendarComponentEvents extends Serializable {
     }
 
     /** RangeSelectHandler handles RangeSelectEvent. */
+    @Deprecated
     public interface RangeSelectHandler extends EventListener, Serializable {
 
         /** Trigger method for the RangeSelectEvent. */
@@ -239,6 +247,7 @@ public interface CalendarComponentEvents extends Serializable {
     }
 
     /** Notifier interface for navigation listening. */
+    @Deprecated
     public interface NavigationNotifier extends Serializable {
         /**
          * Add a forward navigation listener.
@@ -285,6 +294,7 @@ public interface CalendarComponentEvents extends Serializable {
      * ForwardEvent is sent when forward navigation button is clicked.
      */
     @SuppressWarnings("serial")
+    @Deprecated
     public class ForwardEvent extends CalendarComponentEvent {
 
         public static final String EVENT_ID = CalendarEventId.FORWARD;
@@ -301,6 +311,7 @@ public interface CalendarComponentEvents extends Serializable {
     }
 
     /** ForwardHandler handles ForwardEvent. */
+    @Deprecated
     public interface ForwardHandler extends EventListener, Serializable {
 
         /** Trigger method for the ForwardEvent. */
@@ -320,6 +331,7 @@ public interface CalendarComponentEvents extends Serializable {
      * BackwardEvent is sent when backward navigation button is clicked.
      */
     @SuppressWarnings("serial")
+    @Deprecated
     public class BackwardEvent extends CalendarComponentEvent {
 
         public static final String EVENT_ID = CalendarEventId.BACKWARD;
@@ -336,6 +348,7 @@ public interface CalendarComponentEvents extends Serializable {
     }
 
     /** BackwardHandler handles BackwardEvent. */
+    @Deprecated
     public interface BackwardHandler extends EventListener, Serializable {
 
         /** Trigger method for the BackwardEvent. */
@@ -355,6 +368,7 @@ public interface CalendarComponentEvents extends Serializable {
      * DateClickEvent is sent when a date is clicked.
      */
     @SuppressWarnings("serial")
+    @Deprecated
     public class DateClickEvent extends CalendarComponentEvent {
 
         public static final String EVENT_ID = CalendarEventId.DATECLICK;
@@ -379,6 +393,7 @@ public interface CalendarComponentEvents extends Serializable {
     }
 
     /** DateClickHandler handles DateClickEvent. */
+    @Deprecated
     public interface DateClickHandler extends EventListener, Serializable {
 
         /** Trigger method for the DateClickEvent. */
@@ -398,6 +413,7 @@ public interface CalendarComponentEvents extends Serializable {
      * EventClick is sent when an event is clicked.
      */
     @SuppressWarnings("serial")
+    @Deprecated
     public class EventClick extends CalendarComponentEvent {
 
         public static final String EVENT_ID = CalendarEventId.EVENTCLICK;
@@ -422,6 +438,7 @@ public interface CalendarComponentEvents extends Serializable {
     }
 
     /** EventClickHandler handles EventClick. */
+    @Deprecated
     public interface EventClickHandler extends EventListener, Serializable {
 
         /** Trigger method for the EventClick. */
@@ -441,6 +458,7 @@ public interface CalendarComponentEvents extends Serializable {
      * WeekClick is sent when week is clicked.
      */
     @SuppressWarnings("serial")
+    @Deprecated
     public class WeekClick extends CalendarComponentEvent {
 
         public static final String EVENT_ID = CalendarEventId.WEEKCLICK;
@@ -489,6 +507,7 @@ public interface CalendarComponentEvents extends Serializable {
     }
 
     /** WeekClickHandler handles WeekClicks. */
+    @Deprecated
     public interface WeekClickHandler extends EventListener, Serializable {
 
         /** Trigger method for the WeekClick. */
@@ -508,6 +527,7 @@ public interface CalendarComponentEvents extends Serializable {
      * EventResize is sent when an event is resized
      */
     @SuppressWarnings("serial")
+    @Deprecated
     public class EventResize extends CalendarComponentEvent {
 
         public static final String EVENT_ID = CalendarEventId.EVENTRESIZE;
@@ -577,6 +597,7 @@ public interface CalendarComponentEvents extends Serializable {
     /**
      * Notifier interface for event resizing.
      */
+    @Deprecated
     public interface EventResizeNotifier extends Serializable {
 
         /**
@@ -591,6 +612,7 @@ public interface CalendarComponentEvents extends Serializable {
     /**
      * Handler for EventResize event.
      */
+    @Deprecated
     public interface EventResizeHandler extends EventListener, Serializable {
 
         /** Trigger method for the EventResize. */
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java
index 69a4123c1b..bc8fa4e32c 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java
@@ -27,6 +27,7 @@ import java.util.TimeZone;
  *
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class CalendarDateRange implements Serializable {
 
     private Date start;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java
index ab439e9d12..6be54f1811 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java
@@ -33,6 +33,7 @@ import com.vaadin.v7.ui.Calendar;
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class CalendarTargetDetails extends TargetDetailsImpl {
 
     private boolean hasDropTime;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java
index 961b2d8fec..4f15272eb0 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java
@@ -50,6 +50,7 @@ import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSet
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class ContainerEventProvider
         implements CalendarEditableEventProvider, EventSetChangeNotifier,
         EventChangeNotifier, EventMoveHandler, EventResizeHandler,
@@ -84,14 +85,14 @@ public class ContainerEventProvider
     /**
      * Listeners attached to the container
      */
-    private final List<EventSetChangeListener> eventSetChangeListeners = new LinkedList<CalendarEventProvider.EventSetChangeListener>();
-    private final List<EventChangeListener> eventChangeListeners = new LinkedList<CalendarEvent.EventChangeListener>();
+    private final List<EventSetChangeListener> eventSetChangeListeners = new LinkedList<>();
+    private final List<EventChangeListener> eventChangeListeners = new LinkedList<>();
 
     /**
      * The event cache contains the events previously created by
      * {@link #getEvents(Date, Date)}
      */
-    private final List<CalendarEvent> eventCache = new LinkedList<CalendarEvent>();
+    private final List<CalendarEvent> eventCache = new LinkedList<>();
 
     /**
      * The container used as datasource
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java
index f1b6524d2c..3f899debd7 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java
@@ -30,6 +30,7 @@ import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeNotif
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     private String caption;
@@ -37,7 +38,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
     private Date end;
     private Date start;
     private String styleName;
-    private transient List<EventChangeListener> listeners = new ArrayList<EventChangeListener>();
+    private transient List<EventChangeListener> listeners = new ArrayList<>();
 
     private boolean isAllDay;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java
index 59c8baca9c..2fa32f93e3 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java
@@ -42,12 +42,13 @@ import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSet
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class BasicEventProvider implements CalendarEditableEventProvider,
         EventSetChangeNotifier, CalendarEvent.EventChangeListener {
 
-    protected List<CalendarEvent> eventList = new ArrayList<CalendarEvent>();
+    protected List<CalendarEvent> eventList = new ArrayList<>();
 
-    private List<EventSetChangeListener> listeners = new ArrayList<EventSetChangeListener>();
+    private List<EventSetChangeListener> listeners = new ArrayList<>();
 
     /*
      * (non-Javadoc)
@@ -58,7 +59,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
      */
     @Override
     public List<CalendarEvent> getEvents(Date startDate, Date endDate) {
-        ArrayList<CalendarEvent> activeEvents = new ArrayList<CalendarEvent>();
+        ArrayList<CalendarEvent> activeEvents = new ArrayList<>();
 
         for (CalendarEvent ev : eventList) {
             long from = startDate.getTime();
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEditableEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEditableEventProvider.java
index 90f8992720..6092fe2208 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEditableEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEditableEventProvider.java
@@ -22,6 +22,7 @@ package com.vaadin.v7.ui.components.calendar.event;
  * @since 7.1.0
  * @author Vaadin Ltd.
  */
+@Deprecated
 public interface CalendarEditableEventProvider extends CalendarEventProvider {
 
     /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEvent.java
index 9aaa1cd5ba..cfc3d44c1f 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEvent.java
@@ -33,6 +33,7 @@ import java.util.Date;
  * @author Vaadin Ltd.
  *
  */
+@Deprecated
 public interface CalendarEvent extends Serializable {
 
     /**
@@ -93,6 +94,7 @@ public interface CalendarEvent extends Serializable {
      * Event to signal that an event has changed.
      */
     @SuppressWarnings("serial")
+    @Deprecated
     public class EventChangeEvent implements Serializable {
 
         private CalendarEvent source;
@@ -113,6 +115,7 @@ public interface CalendarEvent extends Serializable {
     /**
      * Listener for EventSetChange events.
      */
+    @Deprecated
     public interface EventChangeListener extends Serializable {
 
         /**
@@ -124,6 +127,7 @@ public interface CalendarEvent extends Serializable {
     /**
      * Notifier interface for EventChange events.
      */
+    @Deprecated
     public interface EventChangeNotifier extends Serializable {
 
         /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEventProvider.java
index bef6aaea18..831b6c1731 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEventProvider.java
@@ -26,6 +26,7 @@ import java.util.List;
  * @since 7.1.0
  * @author Vaadin Ltd.
  */
+@Deprecated
 public interface CalendarEventProvider extends Serializable {
     /**
      * <p>
@@ -58,6 +59,7 @@ public interface CalendarEventProvider extends Serializable {
      *
      */
     @SuppressWarnings("serial")
+    @Deprecated
     public class EventSetChangeEvent implements Serializable {
 
         private CalendarEventProvider source;
@@ -79,6 +81,7 @@ public interface CalendarEventProvider extends Serializable {
     /**
      * Listener for EventSetChange events.
      */
+    @Deprecated
     public interface EventSetChangeListener extends Serializable {
 
         /**
@@ -90,6 +93,7 @@ public interface CalendarEventProvider extends Serializable {
     /**
      * Notifier interface for EventSetChange events.
      */
+    @Deprecated
     public interface EventSetChangeNotifier extends Serializable {
 
         /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/EditableCalendarEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/EditableCalendarEvent.java
index cb3553ec87..eb7d12a058 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/EditableCalendarEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/EditableCalendarEvent.java
@@ -35,6 +35,7 @@ import java.util.Date;
  * @since 7.1
  * @author Vaadin Ltd.
  */
+@Deprecated
 public interface EditableCalendarEvent extends CalendarEvent {
 
     /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java
index 3f38d19a4f..677ba4ed7b 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java
@@ -29,6 +29,7 @@ import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardHand
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class BasicBackwardHandler implements BackwardHandler {
 
     /*
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicDateClickHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicDateClickHandler.java
index 381acb6b1d..d90d94d774 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicDateClickHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicDateClickHandler.java
@@ -29,6 +29,7 @@ import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickHan
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class BasicDateClickHandler implements DateClickHandler {
 
     /*
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventMoveHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventMoveHandler.java
index be27b606fe..cb1422d90b 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventMoveHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventMoveHandler.java
@@ -29,6 +29,7 @@ import com.vaadin.v7.ui.components.calendar.event.EditableCalendarEvent;
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class BasicEventMoveHandler implements EventMoveHandler {
 
     /*
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventResizeHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventResizeHandler.java
index 9b6f08ff09..5a722e9365 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventResizeHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventResizeHandler.java
@@ -29,6 +29,7 @@ import com.vaadin.v7.ui.components.calendar.event.EditableCalendarEvent;
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class BasicEventResizeHandler implements EventResizeHandler {
 
     /*
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java
index aa13c650ef..1d5007c0fd 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java
@@ -29,6 +29,7 @@ import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardHandl
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class BasicForwardHandler implements ForwardHandler {
 
     /*
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicWeekClickHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicWeekClickHandler.java
index 420d0a76f6..7827127973 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicWeekClickHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicWeekClickHandler.java
@@ -30,6 +30,7 @@ import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClickHan
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class BasicWeekClickHandler implements WeekClickHandler {
 
     /*
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/AbstractJavaScriptRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/AbstractJavaScriptRenderer.java
index 2d0ac7f62e..755c3fcc60 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/AbstractJavaScriptRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/AbstractJavaScriptRenderer.java
@@ -109,6 +109,7 @@ import elemental.json.JsonValue;
  * @author Vaadin Ltd
  * @since 7.4
  */
+@Deprecated
 public abstract class AbstractJavaScriptRenderer<T>
         extends AbstractRenderer<T> {
     private JavaScriptCallbackHelper callbackHelper = new JavaScriptCallbackHelper(
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ButtonRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ButtonRenderer.java
index 906fc025bb..ffd41ecd4b 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ButtonRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ButtonRenderer.java
@@ -23,6 +23,7 @@ package com.vaadin.v7.ui.renderers;
  * @since 7.4
  * @author Vaadin Ltd
  */
+@Deprecated
 public class ButtonRenderer extends ClickableRenderer<String> {
 
     /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ClickableRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ClickableRenderer.java
index bd63e08c93..9ea9e365e1 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ClickableRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ClickableRenderer.java
@@ -37,6 +37,7 @@ import com.vaadin.v7.ui.Grid.Column;
  * @since 7.4
  * @author Vaadin Ltd
  */
+@Deprecated
 public class ClickableRenderer<T> extends AbstractRenderer<T> {
 
     /**
@@ -45,6 +46,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> {
      *
      * @see {@link ButtonRenderer#addClickListener(RendererClickListener)}
      */
+    @Deprecated
     public interface RendererClickListener extends ConnectorEventListener {
 
         static final Method CLICK_METHOD = ReflectTools.findMethod(
@@ -62,6 +64,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> {
     /**
      * An event fired when a button rendered by a ButtonRenderer is clicked.
      */
+    @Deprecated
     public static class RendererClickEvent extends ClickEvent {
 
         private Object itemId;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/DateRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/DateRenderer.java
index ac3b831acc..95e22919ae 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/DateRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/DateRenderer.java
@@ -29,6 +29,7 @@ import elemental.json.JsonValue;
  * @since 7.4
  * @author Vaadin Ltd
  */
+@Deprecated
 public class DateRenderer extends AbstractRenderer<Date> {
     private final Locale locale;
     private final String formatString;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/HtmlRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/HtmlRenderer.java
index 5264f19e0b..cd4dc2083d 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/HtmlRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/HtmlRenderer.java
@@ -23,6 +23,7 @@ import com.vaadin.v7.ui.Grid.AbstractRenderer;
  * @author Vaadin Ltd
  * @since 7.4
  */
+@Deprecated
 public class HtmlRenderer extends AbstractRenderer<String> {
     /**
      * Creates a new HTML renderer.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ImageRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ImageRenderer.java
index 19c7a77b01..55d80b99ab 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ImageRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ImageRenderer.java
@@ -33,6 +33,7 @@ import elemental.json.JsonValue;
  * @since 7.4
  * @author Vaadin Ltd
  */
+@Deprecated
 public class ImageRenderer extends ClickableRenderer<Resource> {
 
     /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java
index 061f6d5790..871657411a 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java
@@ -28,6 +28,7 @@ import elemental.json.JsonValue;
  * @since 7.4
  * @author Vaadin Ltd
  */
+@Deprecated
 public class NumberRenderer extends AbstractRenderer<Number> {
     private final Locale locale;
     private final NumberFormat numberFormat;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ProgressBarRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ProgressBarRenderer.java
index d19c09ec59..76210bf3bc 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ProgressBarRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ProgressBarRenderer.java
@@ -25,6 +25,7 @@ import elemental.json.JsonValue;
  * @author Vaadin Ltd
  * @since 7.4
  */
+@Deprecated
 public class ProgressBarRenderer extends AbstractRenderer<Double> {
 
     /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/Renderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/Renderer.java
index ce221760cc..97fd25ff4b 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/Renderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/Renderer.java
@@ -33,6 +33,7 @@ import elemental.json.JsonValue;
  * @since 7.4
  * @author Vaadin Ltd
  */
+@Deprecated
 public interface Renderer<T> extends Extension {
 
     /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/TextRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/TextRenderer.java
index 23306baf75..4103e15193 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/TextRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/TextRenderer.java
@@ -23,6 +23,7 @@ import com.vaadin.v7.ui.Grid.AbstractRenderer;
  * @since 7.4
  * @author Vaadin Ltd
  */
+@Deprecated
 public class TextRenderer extends AbstractRenderer<String> {
 
     /**