Fix javadoc references (#10067)

And remove unused imports.

85 files changed, 107 insertions, 177 deletions

diff --git a/client/src/main/java/com/vaadin/client/ApplicationConnection.java b/client/src/main/java/com/vaadin/client/ApplicationConnection.java
index 8da676668b..aa02cd0a6f 100644
--- a/client/src/main/java/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/main/java/com/vaadin/client/ApplicationConnection.java
@@ -42,7 +42,6 @@ import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ApplicationConfiguration.ErrorMessage;
-import com.vaadin.client.ApplicationConnection.ApplicationStoppedEvent;
 import com.vaadin.client.communication.ConnectionStateHandler;
 import com.vaadin.client.communication.Heartbeat;
 import com.vaadin.client.communication.MessageHandler;
@@ -236,7 +235,7 @@ public class ApplicationConnection implements HasHandlers {
      *
      * To listen for the event add a {@link ApplicationStoppedHandler} by
      * invoking
-     * {@link ApplicationConnection#addHandler(ApplicationConnection.ApplicationStoppedEvent.Type, ApplicationStoppedHandler)}
+     * {@link ApplicationConnection#addHandler(GwtEvent.Type, ApplicationStoppedHandler)}
      * to the {@link ApplicationConnection}
      *
      * @since 7.1.8
@@ -279,7 +278,7 @@ public class ApplicationConnection implements HasHandlers {
     /**
      * A listener for listening to application stopped events. The listener can
      * be added to a {@link ApplicationConnection} by invoking
-     * {@link ApplicationConnection#addHandler(ApplicationStoppedEvent.Type, ApplicationStoppedHandler)}
+     * {@link ApplicationConnection#addHandler(GwtEvent.Type, ApplicationStoppedHandler)}
      *
      * @since 7.1.8
      * @author Vaadin Ltd
diff --git a/client/src/main/java/com/vaadin/client/HasChildMeasurementHintConnector.java b/client/src/main/java/com/vaadin/client/HasChildMeasurementHintConnector.java
index e6049fbc8b..e96642c669 100644
--- a/client/src/main/java/com/vaadin/client/HasChildMeasurementHintConnector.java
+++ b/client/src/main/java/com/vaadin/client/HasChildMeasurementHintConnector.java
@@ -40,7 +40,8 @@ public interface HasChildMeasurementHintConnector
         MEASURE_ALWAYS,
 
         /**
-         * Measure child component only if child component is a {@link Layout}
+         * Measure child component only if child component is an
+         * {@link com.vaadin.client.ui.AbstractLayoutConnector AbstractLayoutConnector}
          * or implements either {@link ManagedLayout} or
          * {@link ElementResizeListener}.
          */
diff --git a/client/src/main/java/com/vaadin/client/UIDL.java b/client/src/main/java/com/vaadin/client/UIDL.java
index 05a2e5f5ef..332b7aae9d 100644
--- a/client/src/main/java/com/vaadin/client/UIDL.java
+++ b/client/src/main/java/com/vaadin/client/UIDL.java
@@ -23,7 +23,6 @@ import java.util.Set;
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.core.client.JsArrayString;
 import com.vaadin.server.PaintTarget;
-import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Component;
 
 /**
@@ -63,7 +62,7 @@ public final class UIDL extends JavaScriptObject {
      * Gets the name of this UIDL section, as created with
      * {@link PaintTarget#startTag(String) PaintTarget.startTag()} in the
      * server-side {@link Component#paint(PaintTarget) Component.paint()} or
-     * (usually) {@link AbstractComponent#paintContent(PaintTarget)
+     * (usually) {@link com.vaadin.ui.AbstractComponent#paintContent(PaintTarget)
      * AbstractComponent.paintContent()}. Note that if the UIDL corresponds to a
      * Paintable, a component identifier will be returned instead - this is used
      * internally and is not needed within
diff --git a/client/src/main/java/com/vaadin/client/WidgetUtil.java b/client/src/main/java/com/vaadin/client/WidgetUtil.java
index 7fc027d55d..0aced86b03 100644
--- a/client/src/main/java/com/vaadin/client/WidgetUtil.java
+++ b/client/src/main/java/com/vaadin/client/WidgetUtil.java
@@ -828,7 +828,7 @@ public class WidgetUtil {
      * DOM upwards from given element.
      * <p>
      * <strong>Note:</strong> If {@code element} is inside some widget {@code W}
-     * , <em>and</em> {@code W} in turn is wrapped in a {@link Composite}
+     * , <em>and</em> {@code W} in turn is wrapped in a {@link com.google.gwt.user.client.ui.Composite Composite}
      * {@code C}, this method will not find {@code W} but returns {@code C}.
      * This may also be the case with other Composite-like classes that hijack
      * the event handling of their child widget(s).
@@ -847,7 +847,7 @@ public class WidgetUtil {
      * traversing DOM upwards from given element.
      * <p>
      * <strong>Note:</strong> If {@code element} is inside some widget {@code W}
-     * , <em>and</em> {@code W} in turn is wrapped in a {@link Composite}
+     * , <em>and</em> {@code W} in turn is wrapped in a {@link com.google.gwt.user.client.ui.Composite Composite}
      * {@code C}, this method will not find {@code W}. It returns either
      * {@code C} or null, depending on whether the class parameter matches. This
      * may also be the case with other Composite-like classes that hijack the
@@ -871,7 +871,7 @@ public class WidgetUtil {
      * traversing DOM upwards from given element.
      * <p>
      * <strong>Note:</strong> If {@code element} is inside some widget {@code W}
-     * , <em>and</em> {@code W} in turn is wrapped in a {@link Composite}
+     * , <em>and</em> {@code W} in turn is wrapped in a {@link com.google.gwt.user.client.ui.Composite Composite}
      * {@code C}, this method will not find {@code W}. It returns either
      * {@code C} or null, depending on whether the class parameter matches. This
      * may also be the case with other Composite-like classes that hijack the
diff --git a/client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java
index a7d2bbf6b4..026f962cb7 100644
--- a/client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java
@@ -26,7 +26,9 @@ import com.vaadin.shared.ui.grid.renderers.RendererClickRpc;
 import elemental.json.JsonObject;
 
 /**
- * An abstract base class for {@link ClickableRenderer} connectors.
+ * An abstract base class for
+ * {@link com.vaadin.client.renderers.ClickableRenderer ClickableRenderer}
+ * connectors.
  *
  * @param <T>
  *            the presentation type of the renderer
diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/AbstractGridRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/AbstractGridRendererConnector.java
index ff2b9876dd..dabd685bb3 100644
--- a/client/src/main/java/com/vaadin/client/connectors/grid/AbstractGridRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/grid/AbstractGridRendererConnector.java
@@ -25,8 +25,8 @@ import elemental.json.JsonObject;
 
 /**
  * An abstract base class for renderer connectors. A renderer connector is used
- * to link a client-side {@link Renderer} to a server-side
- * {@link com.vaadin.client.renderers.Renderer Renderer}. As a connector, it can
+ * to link a client-side {@link com.vaadin.client.renderers.Renderer Renderer} to a server-side
+ * {@link com.vaadin.ui.renderers.Renderer Renderer}. As a connector, it can
  * use the regular Vaadin RPC and shared state mechanism to pass additional
  * state and information between the client and the server. This base class
  * itself only uses the basic {@link com.vaadin.shared.communication.SharedState
diff --git a/client/src/main/java/com/vaadin/client/ui/JsniMousewheelHandler.java b/client/src/main/java/com/vaadin/client/ui/JsniMousewheelHandler.java
index 7911b393e8..daa6964c16 100644
--- a/client/src/main/java/com/vaadin/client/ui/JsniMousewheelHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/JsniMousewheelHandler.java
@@ -19,7 +19,6 @@ import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.client.widgets.Escalator;
 
 /**
  * A mousewheel handling class to get around the limits of
@@ -27,7 +26,7 @@ import com.vaadin.client.widgets.Escalator;
  *
  * For internal use only. May be removed or replaced in the future.
  *
- * @see Escalator.JsniWorkaround
+ * @see com.vaadin.client.widgets.JsniWorkaround JsniWorkaround
  */
 // FIXME remove the copy in v7 package
 abstract class JsniMousewheelHandler {
diff --git a/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java b/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java
index b12690dbff..88c84ad5bb 100644
--- a/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java
@@ -17,7 +17,6 @@
 package com.vaadin.client.ui;
 
 import java.util.HashMap;
-import java.util.Iterator;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.ImageElement;
diff --git a/client/src/main/java/com/vaadin/client/ui/VNotification.java b/client/src/main/java/com/vaadin/client/ui/VNotification.java
index 0eaee0102c..8f98b6bd08 100644
--- a/client/src/main/java/com/vaadin/client/ui/VNotification.java
+++ b/client/src/main/java/com/vaadin/client/ui/VNotification.java
@@ -18,7 +18,6 @@ package com.vaadin.client.ui;
 
 import java.util.ArrayList;
 import java.util.EventObject;
-import java.util.Iterator;
 
 import com.google.gwt.aria.client.Roles;
 import com.google.gwt.core.client.GWT;
diff --git a/client/src/main/java/com/vaadin/client/ui/VUI.java b/client/src/main/java/com/vaadin/client/ui/VUI.java
index 71f3daeaf0..28b9fd06c6 100644
--- a/client/src/main/java/com/vaadin/client/ui/VUI.java
+++ b/client/src/main/java/com/vaadin/client/ui/VUI.java
@@ -330,7 +330,7 @@ public class VUI extends SimplePanel implements ResizeHandler,
         Profiler.leave("VUI.sendClientResized");
     }
 
-    public native static void goTo(String url)
+    public static native void goTo(String url)
     /*-{
        $wnd.location = url;
      }-*/;
diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/EscalatorUpdater.java b/client/src/main/java/com/vaadin/client/widget/escalator/EscalatorUpdater.java
index b07594946f..749a999e79 100644
--- a/client/src/main/java/com/vaadin/client/widget/escalator/EscalatorUpdater.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/EscalatorUpdater.java
@@ -26,7 +26,8 @@ import com.vaadin.client.widgets.Escalator;
  * The updater is responsible for internally handling all remote communication,
  * should the displayed data need to be fetched remotely.
  * <p>
- * This has a similar function to {@link Grid Grid's} {@link Renderer Renderers}
+ * This has a similar function to {@link com.vaadin.client.widgets.Grid Grid's}
+ * {@link com.vaadin.client.renderers.Renderer Renderers}
  * , although they operate on different abstraction levels.
  *
  * @since 7.4
@@ -35,7 +36,7 @@ import com.vaadin.client.widgets.Escalator;
  * @see Escalator#getHeader()
  * @see Escalator#getBody()
  * @see Escalator#getFooter()
- * @see Renderer
+ * @see com.vaadin.client.renderers.Renderer Renderer
  */
 public interface EscalatorUpdater {
 
diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightCell.java b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightCell.java
index 7a130d3946..7ad0d922a4 100644
--- a/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightCell.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightCell.java
@@ -24,7 +24,7 @@ import com.vaadin.client.widget.escalator.FlyweightRow.CellIterator;
 import com.vaadin.client.widgets.Escalator;
 
 /**
- * A {@link FlyweightCell} represents a cell in the {@link Grid} or
+ * A {@link FlyweightCell} represents a cell in the {@link com.vaadin.client.widgets.Grid Grid} or
  * {@link Escalator} at a certain point in time.
  *
  * <p>
diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java
index 0105560a00..e93fe1d3a8 100644
--- a/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
 import java.util.List;
 
 import com.google.gwt.dom.client.TableRowElement;
-import com.vaadin.client.widgets.Escalator;
 
 /**
  * An internal implementation of the {@link Row} interface.
@@ -31,7 +30,7 @@ import com.vaadin.client.widgets.Escalator;
  *
  * @since 7.4
  * @author Vaadin Ltd
- * @see Escalator.AbstractRowContainer#refreshRow(Node, int)
+ * @see com.vaadin.client.widgets.Escalator.AbstractRowContainer#refreshRow(TableRowElement, int)
  */
 public class FlyweightRow implements Row {
 
@@ -215,7 +214,7 @@ public class FlyweightRow implements Row {
      *
      * @return an iterable of flyweight cells
      *
-     * @see #setup(Element, int, int[])
+     * @see #setup(TableRowElement, int, int[])
      * @see #teardown()
      */
     public Iterable<FlyweightCell> getCells() {
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/DataAvailableEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/DataAvailableEvent.java
index b1ed8757d2..798280e245 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/DataAvailableEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/DataAvailableEvent.java
@@ -34,7 +34,8 @@ public class DataAvailableEvent extends GwtEvent<DataAvailableHandler> {
     }
 
     /**
-     * Returns the range of available rows in {@link DataSource} for this event.
+     * Returns the range of available rows in {@link com.vaadin.client.data.DataSource DataSource}
+     * for this event.
      *
      * @return range of available rows
      */
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/RowStyleGenerator.java b/client/src/main/java/com/vaadin/client/widget/grid/RowStyleGenerator.java
index 35285e17d3..3b1e85c4d4 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/RowStyleGenerator.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/RowStyleGenerator.java
@@ -23,7 +23,8 @@ import java.io.Serializable;
  * @author Vaadin Ltd
  * @param <T>
  *            the row type of the target grid
- * @see Grid#setRowStyleGenerator(RowStyleGenerator)
+ * @see com.vaadin.client.widgets.Grid#setRowStyleGenerator(RowStyleGenerator)
+ *      Grid#setRowStyleGenerator(RowStyleGenerator)
  * @since 7.4
  */
 public interface RowStyleGenerator<T> extends Serializable {
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/JsniMousewheelHandler.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/JsniMousewheelHandler.java
index 8d573a0f38..97f00aa274 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/JsniMousewheelHandler.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/JsniMousewheelHandler.java
@@ -19,7 +19,6 @@ import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.v7.client.widgets.Escalator;
 
 /**
  * A mousewheel handling class to get around the limits of
@@ -27,7 +26,7 @@ import com.vaadin.v7.client.widgets.Escalator;
  *
  * For internal use only. May be removed or replaced in the future.
  *
- * @see Escalator.JsniWorkaround
+ * @see com.vaadin.v7.client.widgets.JsniWorkaround JsniWorkaround
  */
 abstract class JsniMousewheelHandler {
 
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/EscalatorUpdater.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/EscalatorUpdater.java
index bb4fc9ca1e..121d669c7e 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/EscalatorUpdater.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/EscalatorUpdater.java
@@ -26,7 +26,8 @@ import com.vaadin.v7.client.widgets.Escalator;
  * The updater is responsible for internally handling all remote communication,
  * should the displayed data need to be fetched remotely.
  * <p>
- * This has a similar function to {@link Grid Grid's} {@link Renderer Renderers}
+ * This has a similar function to {@link com.vaadin.v7.client.widgets.Grid Grid's}
+ * {@link com.vaadin.v7.client.renderers.Renderer Renderers}
  * , although they operate on different abstraction levels.
  *
  * @since 7.4
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/FlyweightCell.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/FlyweightCell.java
index d77b94a352..b96d90078a 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/FlyweightCell.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/FlyweightCell.java
@@ -24,7 +24,7 @@ import com.vaadin.v7.client.widget.escalator.FlyweightRow.CellIterator;
 import com.vaadin.v7.client.widgets.Escalator;
 
 /**
- * A {@link FlyweightCell} represents a cell in the {@link Grid} or
+ * A {@link FlyweightCell} represents a cell in the {@link com.vaadin.v7.client.widgets.Grid Grid} or
  * {@link Escalator} at a certain point in time.
  *
  * <p>
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/FlyweightRow.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/FlyweightRow.java
index 7f6e9d4049..f322a86eb9 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/FlyweightRow.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/FlyweightRow.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
 import java.util.List;
 
 import com.google.gwt.dom.client.TableRowElement;
-import com.vaadin.v7.client.widgets.Escalator;
 
 /**
  * An internal implementation of the {@link Row} interface.
@@ -31,7 +30,8 @@ import com.vaadin.v7.client.widgets.Escalator;
  *
  * @since 7.4
  * @author Vaadin Ltd
- * @see Escalator.AbstractRowContainer#refreshRow(Node, int)
+ * @see com.vaadin.v7.client.widgets.Escalator.AbstractRowContainer#refreshRow(TableRowElement, int)
+ *      Escalator.AbstractRowContainer#refreshRow(TableRowElement, int)
  */
 public class FlyweightRow implements Row {
 
@@ -215,7 +215,7 @@ public class FlyweightRow implements Row {
      *
      * @return an iterable of flyweight cells
      *
-     * @see #setup(Element, int, int[])
+     * @see #setup(TableRowElement, int, int[])
      * @see #teardown()
      */
     public Iterable<FlyweightCell> getCells() {
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/DataAvailableEvent.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/DataAvailableEvent.java
index 9f51c73047..2d71ce5ced 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/DataAvailableEvent.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/DataAvailableEvent.java
@@ -34,7 +34,7 @@ public class DataAvailableEvent extends GwtEvent<DataAvailableHandler> {
     }
 
     /**
-     * Returns the range of available rows in {@link DataSource} for this event.
+     * Returns the range of available rows in {@link com.vaadin.client.data.DataSource DataSource} for this event.
      *
      * @return range of available rows
      */
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/RowStyleGenerator.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/RowStyleGenerator.java
index 194041e894..07d4f447ed 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/RowStyleGenerator.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/grid/RowStyleGenerator.java
@@ -23,7 +23,8 @@ import java.io.Serializable;
  * @author Vaadin Ltd
  * @param <T>
  *            the row type of the target grid
- * @see Grid#setRowStyleGenerator(RowStyleGenerator)
+ * @see com.vaadin.v7.client.widgets.Grid#setRowStyleGenerator(RowStyleGenerator)
+ *            Grid#setRowStyleGenerator(RowStyleGenerator)
  * @since 7.4
  */
 public interface RowStyleGenerator<T> extends Serializable {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java
index 452f011f0a..154014707a 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java
@@ -40,7 +40,7 @@ import com.vaadin.v7.ui.Field;
  * FieldGroup provides an easy way of binding fields to data and handling
  * commits of these fields.
  * <p>
- * The functionality of FieldGroup is similar to {@link Form} but
+ * The functionality of FieldGroup is similar to {@link com.vaadin.v7.ui.Form Form} but
  * {@link FieldGroup} does not handle layouts in any way. The typical use case
  * is to create a layout outside the FieldGroup and then use FieldGroup to bind
  * the fields to a data source.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java
index 346088d3ac..23cc54f096 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.v7.data.util;
 
-import com.vaadin.data.provider.DataProvider;
-
 import java.util.Collection;
 
 import com.vaadin.data.provider.ListDataProvider;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java
index eee7f8a321..5a3a0cd3b5 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java
@@ -15,10 +15,10 @@
  */
 package com.vaadin.v7.data.util;
 
-import com.vaadin.data.provider.ListDataProvider;
-
 import java.util.Collection;
 
+import com.vaadin.data.provider.ListDataProvider;
+
 /**
  * An in-memory container for JavaBeans.
  *
@@ -190,7 +190,8 @@ public class BeanItemContainer<BEANTYPE>
      * @param newItemId
      *            the bean (of type BT) to add (not null)
      *
-     * @see Container.Ordered#addItemAfter(Object, Object)
+     * @see com.vaadin.v7.data.Container.Ordered#addItemAfter(Object, Object)
+     *            Ordered#addItemAfter(Object, Object)
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -223,7 +224,7 @@ public class BeanItemContainer<BEANTYPE>
      *
      * The bean is used both as the item contents and as the item identifier.
      *
-     * @see Container#addItem(Object)
+     * @see com.vaadin.v7.data.Container#addItem(Object) Container#addItem(Object)
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -236,7 +237,7 @@ public class BeanItemContainer<BEANTYPE>
      *
      * The bean is used both as the item contents and as the item identifier.
      *
-     * @see Container#addItem(Object)
+     * @see com.vaadin.v7.data.Container#addItem(Object) Container#addItem(Object)
      */
     @Override
     public BeanItem<BEANTYPE> addBean(BEANTYPE bean) {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java
index 880350a3b2..e373020bd8 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java
@@ -17,13 +17,12 @@ package com.vaadin.v7.data.util;
 
 import java.util.Collection;
 
-import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Container.Hierarchical;
 
 /**
  * A wrapper class for adding external ordering to containers not implementing
- * the {@link Container.Ordered} interface while retaining {@link Hierarchical}
- * features.
+ * the {@link com.vaadin.v7.data.Container.Ordered Container.Ordered}
+ * interface while retaining {@link Hierarchical} features.
  *
  * @see ContainerOrderedWrapper
  *
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java
index 70572c8e65..d1e45c0d1b 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java
@@ -16,7 +16,6 @@
 package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
-import java.util.Map;
 
 import com.vaadin.data.Binder;
 import com.vaadin.data.provider.DataProvider;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java
index 16ff8052cf..bbe51c09a0 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java
@@ -16,7 +16,6 @@
 package com.vaadin.v7.data.util;
 
 import com.vaadin.v7.data.Property;
-import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeNotifier;
 
 /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/event/SortEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/event/SortEvent.java
index 044b42b10f..8a1e2a129e 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/event/SortEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/event/SortEvent.java
@@ -23,8 +23,8 @@ import com.vaadin.ui.Component;
 import com.vaadin.v7.data.sort.SortOrder;
 
 /**
- * Event describing a change in sorting of a {@link Container}. Fired by
- * {@link SortNotifier SortNotifiers}.
+ * Event describing a change in sorting of a {@link com.vaadin.v7.data.Container Container}.
+ * Fired by {@link SortNotifier SortNotifiers}.
  *
  * @see SortListener
  *
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java
index 5d1b8ffee3..e2d7a81104 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java
@@ -32,7 +32,6 @@ import com.vaadin.server.KeyMapper;
 import com.vaadin.shared.Range;
 import com.vaadin.shared.data.DataProviderRpc;
 import com.vaadin.shared.data.DataRequestRpc;
-import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Container.Indexed;
 import com.vaadin.v7.data.Container.Indexed.ItemAddEvent;
 import com.vaadin.v7.data.Container.Indexed.ItemRemoveEvent;
@@ -54,7 +53,7 @@ import elemental.json.JsonObject;
 
 /**
  * Provides Vaadin server-side container data source to a
- * {@link com.vaadin.v7.client.connectors.GridConnector}. This is currently
+ * {@link com.vaadin.v7.client.connectors.GridConnector GridConnector}. This is currently
  * implemented as an Extension hardcoded to support a specific connector type.
  * This will be changed once framework support for something more flexible has
  * been implemented.
@@ -154,9 +153,10 @@ public class RpcDataProviderExtension extends AbstractExtension {
 
     /**
      * A class to listen to changes in property values in the Container added
-     * with {@link Grid#setContainerDatasource(Container.Indexed)}, and notifies
-     * the data source to update the client-side representation of the modified
-     * item.
+     * with {@link Grid#setContainerDatasource(com.vaadin.v7.data.Container.Indexed)
+     * Grid#setContainerDatasource(Container.Indexed)},
+     * and notifies the data source to update the client-side representation
+     * of the modified item.
      * <p>
      * One instance of this class can (and should) be reused for all the
      * properties in an item, since this class will inform that the entire row
@@ -167,7 +167,8 @@ public class RpcDataProviderExtension extends AbstractExtension {
      * value changes, an instance of this class needs to be attached to each and
      * every Item's Property in the container.
      *
-     * @see Grid#addValueChangeListener(Container, Object, Object)
+     * @see Grid#addValueChangeListener(com.vaadin.v7.data.Container, Object, Object)
+     *      Grid#addValueChangeListener(Container, Object, Object)
      * @see Grid#valueChangeListeners
      */
     private class GridValueChangeListener implements ValueChangeListener {
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 caef040d25..9b64d1e6f8 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
@@ -1520,7 +1520,8 @@ public class Grid extends AbstractComponent
     }
 
     /**
-     * A default implementation of a {@link SelectionModel.Single}
+     * A default implementation of a
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.Single SelectionModel.Single}.
      */
     @Deprecated
     public static class SingleSelectionModel extends AbstractSelectionModel
@@ -1646,7 +1647,8 @@ public class Grid extends AbstractComponent
     }
 
     /**
-     * A default implementation for a {@link SelectionModel.None}
+     * A default implementation for a
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.None SelectionModel.None}.
      */
     @Deprecated
     public static class NoSelectionModel extends AbstractSelectionModel
@@ -1674,7 +1676,8 @@ public class Grid extends AbstractComponent
     }
 
     /**
-     * A default implementation of a {@link SelectionModel.Multi}
+     * A default implementation of a
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.Multi SelectionModel.Multi}.
      */
     @Deprecated
     public static class MultiSelectionModel extends AbstractSelectionModel
@@ -5883,7 +5886,7 @@ public class Grid extends AbstractComponent
      * <p>
      * This method is a shorthand that delegates to the
      * {@link #getSelectionModel() selection model}. Only
-     * {@link SelectionModel.Single} is supported.
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.Single SelectionModel.Single} is supported.
      *
      * @return the item id of the currently selected item, or <code>null</code>
      *         if nothing is selected
@@ -5920,8 +5923,9 @@ public class Grid extends AbstractComponent
      * <p>
      * This method is a shorthand that delegates to the
      * {@link #getSelectionModel() selection model}. Only
-     * {@link SelectionModel.Single} and {@link SelectionModel.Multi} are
-     * supported.
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.Single SelectionModel.Single}
+     * and {@link com.vaadin.v7.ui.Grid.SelectionModel.Multi SelectionModel.Multi}
+     * are supported.
      *
      * @param itemId
      *            the itemId to mark as selected
@@ -5966,8 +5970,9 @@ public class Grid extends AbstractComponent
      * <p>
      * This method is a shorthand that delegates to the
      * {@link #getSelectionModel() selection model}. Only
-     * {@link SelectionModel.Single} and {@link SelectionModel.Multi} are
-     * supported.
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.Single SelectionModel.Single}
+     * and {@link com.vaadin.v7.ui.Grid.SelectionModel.Multi SelectionModel.Multi}
+     * are supported.
      *
      * @param itemId
      *            the itemId to remove from being selected
@@ -6013,8 +6018,9 @@ public class Grid extends AbstractComponent
      * <p>
      * This method is a shorthand that delegates to the
      * {@link #getSelectionModel() selection model}. Only
-     * {@link SelectionModel.Single} and {@link SelectionModel.Multi} are
-     * supported.
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.Single SelectionModel.Single}
+     * and {@link com.vaadin.v7.ui.Grid.SelectionModel.Multi SelectionModel.Multi}
+     * are supported.
      *
      * @return <code>true</code> if the selection state changed,
      *         <code>false</code> if the itemId was already selected
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 3c608efc70..4ea45422d3 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
@@ -39,7 +39,6 @@ import com.vaadin.ui.declarative.DesignException;
 import com.vaadin.v7.data.Collapsible;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Container.Hierarchical;
-import com.vaadin.v7.data.Container.ItemSetChangeEvent;
 import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
 import com.vaadin.v7.data.util.HierarchicalContainer;
 import com.vaadin.v7.data.util.HierarchicalContainerOrderedWrapper;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java
index 3b4a0bb27a..2d288a66d9 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java
@@ -173,7 +173,7 @@ public class Reindeer extends BaseTheme {
 
     /**
      * Changes the background of a layout to white. Applies to
-     * {@link VerticalLayout}, {@link HorizontalLayout}, {@link GridLayout},
+     * {@link VerticalLayout}, {@link HorizontalLayout}, {@link com.vaadin.ui.GridLayout GridLayout},
      * {@link FormLayout}, {@link CssLayout}, {@link VerticalSplitPanel} and
      * {@link HorizontalSplitPanel}.
      * <p>
@@ -184,7 +184,7 @@ public class Reindeer extends BaseTheme {
 
     /**
      * Changes the background of a layout to a shade of blue. Applies to
-     * {@link VerticalLayout}, {@link HorizontalLayout}, {@link GridLayout},
+     * {@link VerticalLayout}, {@link HorizontalLayout}, {@link com.vaadin.ui.GridLayout GridLayout},
      * {@link FormLayout}, {@link CssLayout}, {@link VerticalSplitPanel} and
      * {@link HorizontalSplitPanel}.
      * <p>
@@ -202,7 +202,7 @@ public class Reindeer extends BaseTheme {
      * </p>
      * <p>
      * Applies to {@link VerticalLayout}, {@link HorizontalLayout},
-     * {@link GridLayout}, {@link FormLayout} and {@link CssLayout}.
+     * {@link com.vaadin.ui.GridLayout GridLayout}, {@link FormLayout} and {@link CssLayout}.
      * </p>
      *
      */
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java
index ef4aac49f5..74133fa0b6 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java
@@ -29,8 +29,8 @@ import com.vaadin.v7.data.Container.ItemSetChangeEvent;
 import com.vaadin.v7.data.Container.ItemSetChangeListener;
 import com.vaadin.v7.data.Container.PropertySetChangeEvent;
 import com.vaadin.v7.data.Container.PropertySetChangeListener;
-import com.vaadin.v7.data.sort.SortOrder;
 import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.sort.SortOrder;
 import com.vaadin.v7.data.util.GeneratedPropertyContainer.GeneratedPropertyItem;
 import com.vaadin.v7.data.util.filter.Compare;
 import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
diff --git a/liferay-integration/src/main/java/com/vaadin/osgi/liferay/VaadinPortletProvider.java b/liferay-integration/src/main/java/com/vaadin/osgi/liferay/VaadinPortletProvider.java
index b95f0b591e..a932c84fbe 100644
--- a/liferay-integration/src/main/java/com/vaadin/osgi/liferay/VaadinPortletProvider.java
+++ b/liferay-integration/src/main/java/com/vaadin/osgi/liferay/VaadinPortletProvider.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.osgi.liferay;
 
-import java.util.Optional;
-
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceObjects;
 import org.osgi.service.component.ComponentContext;
diff --git a/server/src/main/java/com/vaadin/data/BinderValidationStatus.java b/server/src/main/java/com/vaadin/data/BinderValidationStatus.java
index 151a4b549b..49a3102636 100644
--- a/server/src/main/java/com/vaadin/data/BinderValidationStatus.java
+++ b/server/src/main/java/com/vaadin/data/BinderValidationStatus.java
@@ -16,7 +16,6 @@
 package com.vaadin.data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
diff --git a/server/src/main/java/com/vaadin/data/BinderValidationStatusHandler.java b/server/src/main/java/com/vaadin/data/BinderValidationStatusHandler.java
index 3bfa9c863a..74c2c9595d 100644
--- a/server/src/main/java/com/vaadin/data/BinderValidationStatusHandler.java
+++ b/server/src/main/java/com/vaadin/data/BinderValidationStatusHandler.java
@@ -16,7 +16,6 @@
 package com.vaadin.data;
 
 import com.vaadin.event.SerializableEventListener;
-import com.vaadin.ui.AbstractComponent;
 
 /**
  * Handler for {@link BinderValidationStatus} changes.
@@ -26,7 +25,7 @@ import com.vaadin.ui.AbstractComponent;
  * handling.
  * <p>
  * The default handler will show
- * {@link AbstractComponent#setComponentError(com.vaadin.server.ErrorMessage) an
+ * {@link com.vaadin.ui.AbstractComponent#setComponentError(com.vaadin.server.ErrorMessage) an
  * error message} for failed field validations. For bean level validation errors
  * it will display the first error message in
  * {@link Binder#setStatusLabel(com.vaadin.ui.Label) status label}, if one has
diff --git a/server/src/main/java/com/vaadin/data/BindingValidationStatusHandler.java b/server/src/main/java/com/vaadin/data/BindingValidationStatusHandler.java
index 6e509be0ac..0486135de3 100644
--- a/server/src/main/java/com/vaadin/data/BindingValidationStatusHandler.java
+++ b/server/src/main/java/com/vaadin/data/BindingValidationStatusHandler.java
@@ -17,7 +17,6 @@ package com.vaadin.data;
 
 import com.vaadin.data.Binder.BindingBuilder;
 import com.vaadin.event.SerializableEventListener;
-import com.vaadin.ui.AbstractComponent;
 
 /**
  * Handler for {@link BindingValidationStatus} changes.
@@ -25,7 +24,7 @@ import com.vaadin.ui.AbstractComponent;
  * {@link BindingBuilder#withValidationStatusHandler(BindingValidationStatusHandler)}
  * Register} an instance of this class to be able to override the default
  * handling, which is to show
- * {@link AbstractComponent#setComponentError(com.vaadin.server.ErrorMessage) an
+ * {@link com.vaadin.ui.AbstractComponent#setComponentError(com.vaadin.server.ErrorMessage) an
  * error message} for failed field validations.
  *
  * @author Vaadin Ltd
diff --git a/server/src/main/java/com/vaadin/data/HasValue.java b/server/src/main/java/com/vaadin/data/HasValue.java
index aad436a089..be5629f952 100644
--- a/server/src/main/java/com/vaadin/data/HasValue.java
+++ b/server/src/main/java/com/vaadin/data/HasValue.java
@@ -23,7 +23,6 @@ import java.util.Optional;
 
 import com.vaadin.event.HasUserOriginated;
 import com.vaadin.event.SerializableEventListener;
-import com.vaadin.server.Setter;
 import com.vaadin.shared.Registration;
 import com.vaadin.ui.Component;
 import com.vaadin.util.ReflectTools;
@@ -210,7 +209,8 @@ public interface HasValue<V> extends Serializable {
      * values. Specific implementations might not support this.
      *
      * @return empty value
-     * @see Binder#bind(HasValue, ValueProvider, Setter)
+     * @see Binder#bind(HasValue, ValueProvider, com.vaadin.server.Setter)
+     *      Binder#bind(HasValue, ValueProvider, Setter)
      */
     public default V getEmptyValue() {
         return null;
diff --git a/server/src/main/java/com/vaadin/data/ValidationException.java b/server/src/main/java/com/vaadin/data/ValidationException.java
index 92043872e2..fb06d12348 100644
--- a/server/src/main/java/com/vaadin/data/ValidationException.java
+++ b/server/src/main/java/com/vaadin/data/ValidationException.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.data;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/server/src/main/java/com/vaadin/data/provider/DataProvider.java b/server/src/main/java/com/vaadin/data/provider/DataProvider.java
index f24be8ca17..936bcc4536 100644
--- a/server/src/main/java/com/vaadin/data/provider/DataProvider.java
+++ b/server/src/main/java/com/vaadin/data/provider/DataProvider.java
@@ -28,7 +28,6 @@ import com.vaadin.data.provider.CallbackDataProvider.CountCallback;
 import com.vaadin.data.provider.CallbackDataProvider.FetchCallback;
 import com.vaadin.server.SerializableBiFunction;
 import com.vaadin.server.SerializableFunction;
-import com.vaadin.server.SerializableToIntFunction;
 import com.vaadin.shared.Registration;
 
 /**
diff --git a/server/src/main/java/com/vaadin/data/provider/GridSortOrder.java b/server/src/main/java/com/vaadin/data/provider/GridSortOrder.java
index cf53718caf..15ff389097 100644
--- a/server/src/main/java/com/vaadin/data/provider/GridSortOrder.java
+++ b/server/src/main/java/com/vaadin/data/provider/GridSortOrder.java
@@ -19,7 +19,7 @@ import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.ui.Grid.Column;
 
 /**
- * Sorting information for {@link Grid}.
+ * Sorting information for {@link com.vaadin.ui.Grid Grid}.
  *
  * @param <T>
  *            the grid type
@@ -28,7 +28,7 @@ import com.vaadin.ui.Grid.Column;
 public class GridSortOrder<T> extends SortOrder<Column<T, ?>> {
 
     /**
-     * Construct sorting information for usage in a {@link Grid}.
+     * Construct sorting information for usage in a {@link com.vaadin.ui.Grid Grid}.
      *
      * @param column
      *            the column to be sorted
diff --git a/server/src/main/java/com/vaadin/event/ConnectorActionManager.java b/server/src/main/java/com/vaadin/event/ConnectorActionManager.java
index 8f121015f5..36cbf20362 100644
--- a/server/src/main/java/com/vaadin/event/ConnectorActionManager.java
+++ b/server/src/main/java/com/vaadin/event/ConnectorActionManager.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.event;
 
-import java.util.logging.Logger;
-
 import com.vaadin.event.Action.Container;
 import com.vaadin.server.ClientConnector;
 import com.vaadin.server.VariableOwner;
diff --git a/server/src/main/java/com/vaadin/event/EventRouter.java b/server/src/main/java/com/vaadin/event/EventRouter.java
index 04c05d3af8..f5c04b2de1 100644
--- a/server/src/main/java/com/vaadin/event/EventRouter.java
+++ b/server/src/main/java/com/vaadin/event/EventRouter.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
-import java.util.logging.Logger;
 
 import com.vaadin.server.ErrorEvent;
 import com.vaadin.server.ErrorHandler;
diff --git a/server/src/main/java/com/vaadin/event/selection/SingleSelectionEvent.java b/server/src/main/java/com/vaadin/event/selection/SingleSelectionEvent.java
index 36feafdd43..4047c1c60e 100644
--- a/server/src/main/java/com/vaadin/event/selection/SingleSelectionEvent.java
+++ b/server/src/main/java/com/vaadin/event/selection/SingleSelectionEvent.java
@@ -20,7 +20,6 @@ import java.util.Optional;
 import java.util.Set;
 
 import com.vaadin.data.HasValue.ValueChangeEvent;
-import com.vaadin.data.SelectionModel;
 import com.vaadin.ui.AbstractSingleSelect;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.SingleSelect;
@@ -83,7 +82,8 @@ public class SingleSelectionEvent<T> extends ValueChangeEvent<T>
      *
      * @return the selected item or an empty optional if deselected
      *
-     * @see SelectionModel.Single#getSelectedItem()
+     * @see com.vaadin.data.SelectionModel.Single#getSelectedItem()
+     *      SelectionModel.Single#getSelectedItem()
      */
     public Optional<T> getSelectedItem() {
         return Optional.ofNullable(getValue());
diff --git a/server/src/main/java/com/vaadin/event/selection/SingleSelectionListener.java b/server/src/main/java/com/vaadin/event/selection/SingleSelectionListener.java
index b5683affe6..611647fdc3 100644
--- a/server/src/main/java/com/vaadin/event/selection/SingleSelectionListener.java
+++ b/server/src/main/java/com/vaadin/event/selection/SingleSelectionListener.java
@@ -17,7 +17,6 @@ package com.vaadin.event.selection;
 
 import java.lang.reflect.Method;
 
-import com.vaadin.data.SelectionModel;
 import com.vaadin.event.SerializableEventListener;
 import com.vaadin.util.ReflectTools;
 
@@ -32,7 +31,7 @@ import com.vaadin.util.ReflectTools;
  * @param <T>
  *            the type of the selected item
  *
- * @see SelectionModel.Single
+ * @see com.vaadin.data.SelectionModel.Single SelectionModel.Single
  * @see SingleSelectionEvent
  */
 @FunctionalInterface
diff --git a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java
index 00cbb4f7b4..75f5d27b4f 100644
--- a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java
+++ b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java
@@ -31,7 +31,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.WeakHashMap;
-import java.util.logging.Logger;
 
 import com.vaadin.event.EventRouter;
 import com.vaadin.event.MethodEventSource;
diff --git a/server/src/main/java/com/vaadin/server/Setter.java b/server/src/main/java/com/vaadin/server/Setter.java
index 056979b8f5..300c7e1b6f 100644
--- a/server/src/main/java/com/vaadin/server/Setter.java
+++ b/server/src/main/java/com/vaadin/server/Setter.java
@@ -19,13 +19,13 @@ import java.io.Serializable;
 import java.util.function.BiConsumer;
 
 import com.vaadin.data.Binder;
-import com.vaadin.data.HasValue;
 
 /**
  * The function to write the field value to the bean property
  *
  * @see BiConsumer
- * @see Binder#bind(HasValue, SerializableFunction, Setter)
+ * @see Binder#bind(com.vaadin.data.HasValue, SerializableFunction, Setter)
+ *            Binder#bind(HasValue, SerializableFunction, Setter)
  * @param <BEAN>
  *            the type of the target bean
  * @param <FIELDVALUE>
diff --git a/server/src/main/java/com/vaadin/server/StreamVariable.java b/server/src/main/java/com/vaadin/server/StreamVariable.java
index d62481dabf..5252a207fc 100644
--- a/server/src/main/java/com/vaadin/server/StreamVariable.java
+++ b/server/src/main/java/com/vaadin/server/StreamVariable.java
@@ -18,10 +18,6 @@ package com.vaadin.server;
 import java.io.OutputStream;
 import java.io.Serializable;
 
-import com.vaadin.server.StreamVariable.StreamingEndEvent;
-import com.vaadin.server.StreamVariable.StreamingErrorEvent;
-import com.vaadin.server.StreamVariable.StreamingStartEvent;
-
 /**
  * StreamVariable is a special kind of variable whose value is streamed to an
  * {@link OutputStream} provided by the {@link #getOutputStream()} method. E.g.
@@ -57,7 +53,7 @@ public interface StreamVariable extends Serializable {
      * {@link #onProgress(long, long)} is called in a synchronized block when
      * the content is being received. This is potentially bit slow, so we are
      * calling that method only if requested. The value is requested after the
-     * {@link #uploadStarted(StreamingStartEvent)} event, but not after reading
+     * {@link #streamingStarted(StreamingStartEvent)} event, but not after reading
      * each buffer.
      *
      * @return true if this {@link StreamVariable} wants to by notified during
@@ -120,7 +116,7 @@ public interface StreamVariable extends Serializable {
     }
 
     /**
-     * Event passed to {@link #uploadStarted(StreamingStartEvent)} method before
+     * Event passed to {@link #streamingStarted(StreamingStartEvent)} method before
      * the streaming of the content to {@link StreamVariable} starts.
      */
     public interface StreamingStartEvent extends StreamingEvent {
@@ -140,14 +136,14 @@ public interface StreamVariable extends Serializable {
     }
 
     /**
-     * Event passed to {@link #uploadFinished(StreamingEndEvent)} method the
+     * Event passed to {@link #streamingFinished(StreamingEndEvent)} method the
      * contents have been streamed to StreamVariable successfully.
      */
     public interface StreamingEndEvent extends StreamingEvent {
     }
 
     /**
-     * Event passed to {@link #uploadFailed(StreamingErrorEvent)} method when
+     * Event passed to {@link #streamingFailed(StreamingErrorEvent)} method when
      * the streaming ended before the end of the input. The streaming may fail
      * due an interruption by {@link } or due an other unknown exception in
      * communication. In the latter case the exception is also passed to
diff --git a/server/src/main/java/com/vaadin/server/VaadinSession.java b/server/src/main/java/com/vaadin/server/VaadinSession.java
index 26b9cfa7a1..a49c286f4a 100644
--- a/server/src/main/java/com/vaadin/server/VaadinSession.java
+++ b/server/src/main/java/com/vaadin/server/VaadinSession.java
@@ -678,8 +678,8 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
     /**
      * Gets the currently used session. The current session is automatically
      * defined when processing requests related to the session (see
-     * {@link ThreadLocal}) and in {@link VaadinSession#access(Command)} and
-     * {@link UI#access(Command)}. In other cases, (e.g. from background
+     * {@link ThreadLocal}) and in {@link VaadinSession#access(Runnable)} and
+     * {@link UI#access(Runnable)}. In other cases, (e.g. from background
      * threads, the current session is not automatically defined.
      * <p>
      * The session is stored using a weak reference to avoid leaking memory in
diff --git a/server/src/main/java/com/vaadin/ui/AbstractComponent.java b/server/src/main/java/com/vaadin/ui/AbstractComponent.java
index 92aaa0cb36..70e77e71f7 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractComponent.java
@@ -29,7 +29,6 @@ import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Set;
 import java.util.StringTokenizer;
-import java.util.logging.Logger;
 
 import org.jsoup.nodes.Attribute;
 import org.jsoup.nodes.Attributes;
diff --git a/server/src/main/java/com/vaadin/ui/AbstractLocalDateTimeField.java b/server/src/main/java/com/vaadin/ui/AbstractLocalDateTimeField.java
index 1e036f371b..0eca15246a 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractLocalDateTimeField.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractLocalDateTimeField.java
@@ -16,7 +16,6 @@
 package com.vaadin.ui;
 
 import java.time.Instant;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
diff --git a/server/src/main/java/com/vaadin/ui/ComboBox.java b/server/src/main/java/com/vaadin/ui/ComboBox.java
index 0d7e7fc619..00d735f839 100644
--- a/server/src/main/java/com/vaadin/ui/ComboBox.java
+++ b/server/src/main/java/com/vaadin/ui/ComboBox.java
@@ -813,7 +813,7 @@ public class ComboBox<T> extends AbstractSingleSelect<T>
      * size callback.
      * <p>
      * This method is a shorthand for making a {@link CallbackDataProvider} that
-     * handles a partial {@link Query} object.
+     * handles a partial {@link com.vaadin.data.provider.Query Query} object.
      *
      * @param fetchItems
      *            a callback for fetching items
@@ -835,8 +835,8 @@ public class ComboBox<T> extends AbstractSingleSelect<T>
      * Predicate to check {@link ComboBox} item captions against user typed
      * strings.
      *
-     * @see #setItems(CaptionFilter, Collection)
-     * @see #setItems(CaptionFilter, Object[])
+     * @see ComboBox#setItems(CaptionFilter, Collection)
+     * @see ComboBox#setItems(CaptionFilter, Object[])
      * @since 8.0
      */
     @FunctionalInterface
diff --git a/server/src/main/java/com/vaadin/ui/LegacyWindow.java b/server/src/main/java/com/vaadin/ui/LegacyWindow.java
index dda734899d..7cb20a82b9 100644
--- a/server/src/main/java/com/vaadin/ui/LegacyWindow.java
+++ b/server/src/main/java/com/vaadin/ui/LegacyWindow.java
@@ -19,7 +19,6 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 import com.vaadin.server.LegacyApplication;
-import com.vaadin.server.Page.BrowserWindowResizeEvent;
 import com.vaadin.server.Page.BrowserWindowResizeListener;
 import com.vaadin.server.Resource;
 import com.vaadin.server.VaadinRequest;
@@ -321,7 +320,8 @@ public class LegacyWindow extends UI {
      * @param resizeListener
      *            the listener to add
      *
-     * @see BrowserWindowResizeListener#browserWindowResized(BrowserWindowResizeEvent)
+     * @see BrowserWindowResizeListener#browserWindowResized(com.vaadin.server.Page.BrowserWindowResizeEvent)
+     *      BrowserWindowResizeListener#browserWindowResized(BrowserWindowResizeEvent)
      * @see #setResizeLazy(boolean)
      *
      * @deprecated As of 7.0, use the similarly named api in Page instead
diff --git a/server/src/main/java/com/vaadin/ui/UI.java b/server/src/main/java/com/vaadin/ui/UI.java
index e17c7fec38..ac4815f92d 100644
--- a/server/src/main/java/com/vaadin/ui/UI.java
+++ b/server/src/main/java/com/vaadin/ui/UI.java
@@ -23,7 +23,6 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
diff --git a/server/src/main/java/com/vaadin/ui/Upload.java b/server/src/main/java/com/vaadin/ui/Upload.java
index 4812c8ffd5..4cd9ea7b82 100644
--- a/server/src/main/java/com/vaadin/ui/Upload.java
+++ b/server/src/main/java/com/vaadin/ui/Upload.java
@@ -19,7 +19,6 @@ import java.io.OutputStream;
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Objects;
diff --git a/server/src/main/java/com/vaadin/ui/dnd/DragSourceExtension.java b/server/src/main/java/com/vaadin/ui/dnd/DragSourceExtension.java
index d123700be9..5debdffbd0 100644
--- a/server/src/main/java/com/vaadin/ui/dnd/DragSourceExtension.java
+++ b/server/src/main/java/com/vaadin/ui/dnd/DragSourceExtension.java
@@ -23,7 +23,6 @@ import java.util.Objects;
 import com.vaadin.server.AbstractExtension;
 import com.vaadin.server.Resource;
 import com.vaadin.shared.Registration;
-import com.vaadin.shared.ui.dnd.criteria.ComparisonOperator;
 import com.vaadin.shared.ui.dnd.DragSourceRpc;
 import com.vaadin.shared.ui.dnd.DragSourceState;
 import com.vaadin.shared.ui.dnd.DropEffect;
@@ -329,8 +328,9 @@ public class DragSourceExtension<T extends AbstractComponent>
      *         key of the payload to be transferred
      * @param value
      *         value of the payload to be transferred
-     * @see DropTargetExtension#setDropCriterion(String, ComparisonOperator,
+     * @see DropTargetExtension#setDropCriterion(String, com.vaadin.shared.ui.dnd.criteria.ComparisonOperator,
      * int)
+     *      DropTargetExtension#setDropCriterion(String, ComparisonOperator, int)
      */
     public void setPayload(String key, int value) {
         setPayload(key, String.valueOf(value), Payload.ValueType.INTEGER);
@@ -350,8 +350,9 @@ public class DragSourceExtension<T extends AbstractComponent>
      *         key of the payload to be transferred
      * @param value
      *         value of the payload to be transferred
-     * @see DropTargetExtension#setDropCriterion(String, ComparisonOperator,
+     * @see DropTargetExtension#setDropCriterion(String, com.vaadin.shared.ui.dnd.criteria.ComparisonOperator,
      * double)
+     *      DropTargetExtension#setDropCriterion(String, ComparisonOperator, double)
      */
     public void setPayload(String key, double value) {
         setPayload(key, String.valueOf(value), Payload.ValueType.DOUBLE);
diff --git a/server/src/main/java/com/vaadin/ui/dnd/event/DragEndEvent.java b/server/src/main/java/com/vaadin/ui/dnd/event/DragEndEvent.java
index df71ed0a08..11c019f74e 100644
--- a/server/src/main/java/com/vaadin/ui/dnd/event/DragEndEvent.java
+++ b/server/src/main/java/com/vaadin/ui/dnd/event/DragEndEvent.java
@@ -16,7 +16,6 @@
 package com.vaadin.ui.dnd.event;
 
 import com.vaadin.shared.ui.dnd.DropEffect;
-import com.vaadin.shared.ui.dnd.EffectAllowed;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.dnd.DragSourceExtension;
@@ -62,7 +61,8 @@ public class DragEndEvent<T extends AbstractComponent> extends Component.Event {
      *
      * @return The {@code DataTransfer.dropEffect} parameter of the client side
      * dragend event.
-     * @see DragSourceExtension#setEffectAllowed(EffectAllowed)
+     * @see DragSourceExtension#setEffectAllowed(com.vaadin.shared.ui.dnd.EffectAllowed)
+     *      DragSourceExtension#setEffectAllowed(EffectAllowed)
      * @see DropTargetExtension#setDropEffect(DropEffect)
      * @see DropTargetExtension#setDropCriteriaScript(String)
      */
diff --git a/server/src/main/java/com/vaadin/ui/dnd/event/FileDropEvent.java b/server/src/main/java/com/vaadin/ui/dnd/event/FileDropEvent.java
index 331b83c784..ed53dbc678 100644
--- a/server/src/main/java/com/vaadin/ui/dnd/event/FileDropEvent.java
+++ b/server/src/main/java/com/vaadin/ui/dnd/event/FileDropEvent.java
@@ -16,7 +16,6 @@
 package com.vaadin.ui.dnd.event;
 
 import java.util.Collection;
-import java.util.List;
 
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Component;
diff --git a/server/src/test/java/com/vaadin/data/BeanPropertySetTest.java b/server/src/test/java/com/vaadin/data/BeanPropertySetTest.java
index 593479f24a..c577db6067 100644
--- a/server/src/test/java/com/vaadin/data/BeanPropertySetTest.java
+++ b/server/src/test/java/com/vaadin/data/BeanPropertySetTest.java
@@ -23,7 +23,6 @@ import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
diff --git a/server/src/test/java/com/vaadin/data/provider/hierarchical/HierarchicalCommunicatorTest.java b/server/src/test/java/com/vaadin/data/provider/hierarchical/HierarchicalCommunicatorTest.java
index cdf71a21f1..9c1c47215c 100644
--- a/server/src/test/java/com/vaadin/data/provider/hierarchical/HierarchicalCommunicatorTest.java
+++ b/server/src/test/java/com/vaadin/data/provider/hierarchical/HierarchicalCommunicatorTest.java
@@ -9,7 +9,6 @@ import com.vaadin.server.MockVaadinSession;
 import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.UI;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
diff --git a/server/src/test/java/com/vaadin/data/validator/NotEmptyValidator.java b/server/src/test/java/com/vaadin/data/validator/NotEmptyValidator.java
index 57709ff5e2..706aa6536b 100644
--- a/server/src/test/java/com/vaadin/data/validator/NotEmptyValidator.java
+++ b/server/src/test/java/com/vaadin/data/validator/NotEmptyValidator.java
@@ -27,9 +27,6 @@ import com.vaadin.data.ValueContext;
  * Simple validator to check against {@code null} value and empty {@link String}
  * value.
  * <p>
- * This validator works similar to {@link NotNullValidator} but in addition it
- * also check whether the value is not an empty String.
- * <p>
  * This validator can be suitable for fields that have been marked as required
  * with {@link HasValue#setRequiredIndicatorVisible(boolean)}.
  * <p>
diff --git a/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java b/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java
index b43de2f456..4a6a2f5647 100644
--- a/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java
+++ b/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java
@@ -19,7 +19,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
diff --git a/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java b/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java
index 545871f9ce..b87d459517 100644
--- a/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java
+++ b/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java
@@ -15,15 +15,12 @@
  */
 package com.vaadin.ui;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.SelectionModel.Multi;
 import com.vaadin.data.provider.DataProvider;
 import com.vaadin.server.ServerRpcManager;
 import com.vaadin.shared.data.selection.SelectionServerRpc;
diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java
index 9a8fb53105..98508ad705 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java
@@ -23,8 +23,6 @@ import com.vaadin.shared.annotations.DelegateToWidget;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.shared.ui.AbstractSingleSelectState;
 
-import elemental.json.JsonArray;
-
 /**
  * The shared state for the {@link com.vaadin.ui.Grid} component.
  *
@@ -43,42 +41,42 @@ public class GridState extends AbstractSingleSelectState {
     /**
      * The key in which a row's data can be found.
      *
-     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, JsonArray)
+     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, elemental.json.JsonArray)
      */
     public static final String JSONKEY_DATA = "d";
 
     /**
      * The key in which a row's own key can be found.
      *
-     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, JsonArray)
+     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, elemental.json.JsonArray)
      */
     public static final String JSONKEY_ROWKEY = "k";
 
     /**
      * The key in which a row's generated style can be found.
      *
-     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, JsonArray)
+     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, elemental.json.JsonArray)
      */
     public static final String JSONKEY_ROWSTYLE = "rs";
 
     /**
      * The key in which a generated styles for a row's cells can be found.
      *
-     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, JsonArray)
+     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, elemental.json.JsonArray)
      */
     public static final String JSONKEY_CELLSTYLES = "cs";
 
     /**
      * The key in which a row's description can be found.
      *
-     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, JsonArray)
+     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, elemental.json.JsonArray)
      */
     public static final String JSONKEY_ROWDESCRIPTION = "rd";
 
     /**
      * The key in which a cell's description can be found.
      *
-     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, JsonArray)
+     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, elemental.json.JsonArray)
      */
     public static final String JSONKEY_CELLDESCRIPTION = "cd";
 
diff --git a/test/servlet-containers/jsp-integration/src/main/java/com/vaadin/tests/integration/TrivialUI.java b/test/servlet-containers/jsp-integration/src/main/java/com/vaadin/tests/integration/TrivialUI.java
index f38119f304..e360f21bdc 100644
--- a/test/servlet-containers/jsp-integration/src/main/java/com/vaadin/tests/integration/TrivialUI.java
+++ b/test/servlet-containers/jsp-integration/src/main/java/com/vaadin/tests/integration/TrivialUI.java
@@ -15,9 +15,7 @@
  */
 package com.vaadin.tests.integration;
 
-import com.vaadin.annotations.VaadinServletConfiguration;
 import com.vaadin.server.VaadinRequest;
-import com.vaadin.server.VaadinServlet;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 
diff --git a/test/servlet-containers/karaf/vaadin-karaf-bundle1/src/main/java/com/vaadin/test/osgi/myapplication1/CustomWidgetSet.java b/test/servlet-containers/karaf/vaadin-karaf-bundle1/src/main/java/com/vaadin/test/osgi/myapplication1/CustomWidgetSet.java
index 7a34f343f6..36f6a45744 100644
--- a/test/servlet-containers/karaf/vaadin-karaf-bundle1/src/main/java/com/vaadin/test/osgi/myapplication1/CustomWidgetSet.java
+++ b/test/servlet-containers/karaf/vaadin-karaf-bundle1/src/main/java/com/vaadin/test/osgi/myapplication1/CustomWidgetSet.java
@@ -1,8 +1,6 @@
 package com.vaadin.test.osgi.myapplication1;
 
-import com.vaadin.osgi.resources.OsgiVaadinTheme;
 import com.vaadin.osgi.resources.OsgiVaadinWidgetset;
-import com.vaadin.ui.themes.ValoTheme;
 import org.osgi.service.component.annotations.Component;
 
 @Component
diff --git a/test/servlet-containers/karaf/vaadin-karaf-bundle2/src/main/java/com/vaadin/test/osgi/myapplication/MyUI.java b/test/servlet-containers/karaf/vaadin-karaf-bundle2/src/main/java/com/vaadin/test/osgi/myapplication/MyUI.java
index eb52336eb5..14529ecea1 100644
--- a/test/servlet-containers/karaf/vaadin-karaf-bundle2/src/main/java/com/vaadin/test/osgi/myapplication/MyUI.java
+++ b/test/servlet-containers/karaf/vaadin-karaf-bundle2/src/main/java/com/vaadin/test/osgi/myapplication/MyUI.java
@@ -2,7 +2,6 @@ package com.vaadin.test.osgi.myapplication;
 
 import javax.servlet.annotation.WebServlet;
 
-import com.vaadin.annotations.Theme;
 import org.osgi.service.component.annotations.Component;
 
 import com.vaadin.annotations.VaadinServletConfiguration;
diff --git a/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java b/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
index 6baa1b364b..a4719be6ec 100644
--- a/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
@@ -1,7 +1,6 @@
 package com.vaadin.tests;
 
 import java.util.HashMap;
-import java.util.Iterator;
 
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/uitest/src/main/java/com/vaadin/tests/Parameters.java b/uitest/src/main/java/com/vaadin/tests/Parameters.java
index 647c6575f1..c483b4e6b3 100644
--- a/uitest/src/main/java/com/vaadin/tests/Parameters.java
+++ b/uitest/src/main/java/com/vaadin/tests/Parameters.java
@@ -18,7 +18,6 @@ package com.vaadin.tests;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.Iterator;
 import java.util.Map;
 
 import com.vaadin.server.ExternalResource;
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
index b4b933ecde..c2d910ec26 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
@@ -18,7 +18,6 @@ package com.vaadin.tests;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.Label;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java
index 4af8820d27..3757079c42 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java
@@ -20,7 +20,6 @@ import com.vaadin.tests.components.AbstractReindeerTestUI;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.MenuBar;
-import com.vaadin.ui.MenuBar.Command;
 import com.vaadin.ui.MenuBar.MenuItem;
 import com.vaadin.ui.VerticalLayout;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuTooltip.java
index 59e5cf7734..54ef51e757 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuTooltip.java
@@ -19,7 +19,6 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractReindeerTestUI;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.MenuBar;
-import com.vaadin.ui.MenuBar.Command;
 import com.vaadin.ui.MenuBar.MenuItem;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java
index c6e4749a98..f9dba43fc6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java
@@ -1,7 +1,6 @@
 package com.vaadin.tests.components.treetable;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeV8ContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeV8ContextClick.java
index ed30eb47d6..4af1fdf8b0 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeV8ContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeV8ContextClick.java
@@ -16,7 +16,6 @@
 package com.vaadin.tests.contextclick;
 
 import com.vaadin.data.TreeData;
-import com.vaadin.shared.Registration;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.HorizontalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/data/DataProviderRefresh.java b/uitest/src/main/java/com/vaadin/tests/data/DataProviderRefresh.java
index 4476073b6d..5e7fd6672e 100644
--- a/uitest/src/main/java/com/vaadin/tests/data/DataProviderRefresh.java
+++ b/uitest/src/main/java/com/vaadin/tests/data/DataProviderRefresh.java
@@ -3,8 +3,6 @@ package com.vaadin.tests.data;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-import java.util.Random;
 import java.util.stream.Stream;
 
 import com.vaadin.data.provider.AbstractDataProvider;
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
index 0709e5d888..3c4e56e933 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
@@ -3,7 +3,6 @@ package com.vaadin.tests.dd;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
index b06fb68ef8..88eaa89219 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
@@ -2,7 +2,6 @@ package com.vaadin.tests.integration;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
index c4a50bf0d1..c45b99df37 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.themes.valo;
 
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map.Entry;
 
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeHorizontalResize.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeHorizontalResize.java
index 1606a40272..b38e4d9bf3 100644
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeHorizontalResize.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/TreeHorizontalResize.java
@@ -1,7 +1,5 @@
 package com.vaadin.v7.tests.components.tree;
 
-import java.util.Iterator;
-
 import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Panel;
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/tree/Trees.java b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/Trees.java
index 17e63bea4a..c6c523fd40 100644
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/tree/Trees.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/tree/Trees.java
@@ -1,7 +1,6 @@
 package com.vaadin.v7.tests.components.tree;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateTextHandlingTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateTextHandlingTest.java
index 602d709261..848759c76d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateTextHandlingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateTextHandlingTest.java
@@ -2,10 +2,8 @@ package com.vaadin.tests.components.datefield;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.DateFieldElement;
-import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupTimeClosingWithEscTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupTimeClosingWithEscTest.java
index 6bb7a67e1c..bfebb53226 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupTimeClosingWithEscTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupTimeClosingWithEscTest.java
@@ -22,8 +22,6 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
 
-import com.vaadin.testbench.annotations.RunLocally;
-import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class PopupTimeClosingWithEscTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToTest.java
index 8bdb246d81..a3c3002e91 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToTest.java
@@ -12,7 +12,6 @@ import com.vaadin.testbench.elements.GridElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.ui.Button;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadInTabsheetV7Test.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadInTabsheetV7Test.java
index 051cf7a56e..6326402f3b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadInTabsheetV7Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadInTabsheetV7Test.java
@@ -15,22 +15,6 @@
  */
 package com.vaadin.tests.components.upload;
 
-import com.vaadin.testbench.elements.UploadElement;
-import com.vaadin.tests.tb3.MultiBrowserTest;
-import org.junit.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.internal.WrapsElement;
-import org.openqa.selenium.remote.DesiredCapabilities;
-import org.openqa.selenium.remote.LocalFileDetector;
-import org.openqa.selenium.remote.RemoteWebElement;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.List;
-
 /**
  * Verifies that there's no client side errors when changing a tab containing
  * Upload right after uploading is succeeded (#8728)
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeV8ContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeV8ContextClickTest.java
index 3272cce334..a4663fc539 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeV8ContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeV8ContextClickTest.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.contextclick;
 
-import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.TreeElement;
 import org.junit.Test;
 import org.openqa.selenium.WebElement;