Fix javadoc references (#10067)

And remove unused imports.

29 files changed, 28 insertions, 55 deletions

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;