Organize imports

Change-Id: Iedb6ed985dfc6b69c4a4753a876545d67621898f

28 files changed, 31 insertions, 39 deletions

diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java
index a2a8aa27af..6476635829 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java
@@ -20,6 +20,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import com.vaadin.v7.ui.LegacyField;
+
 /**
  * Defines the custom property name to be bound to a {@link LegacyField} using
  * {@link FieldGroup} or {@link BeanFieldGroup}.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java
index 57c2fc1046..5411a63c15 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java
@@ -57,8 +57,8 @@ import com.vaadin.ui.declarative.DesignException;
 import com.vaadin.ui.declarative.DesignFormatter;
 import com.vaadin.v7.data.Validator.InvalidValueException;
 import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyConverterUtil;
 import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
+import com.vaadin.v7.data.util.converter.LegacyConverterUtil;
 import com.vaadin.v7.ui.LegacyAbstractField;
 
 /**
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
index 63c6f5aeaf..ac9ffb0eeb 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
@@ -20,8 +20,8 @@ import com.vaadin.server.JavaScriptCallbackHelper;
 import com.vaadin.server.JsonCodec;
 import com.vaadin.shared.JavaScriptExtensionState;
 import com.vaadin.shared.communication.ServerRpc;
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
 import com.vaadin.ui.JavaScriptFunction;
+import com.vaadin.ui.LegacyGrid.AbstractRenderer;
 
 import elemental.json.Json;
 import elemental.json.JsonValue;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
index 7a87f8f4c1..3d7d5ab9d2 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.ui.renderers;
 
-import elemental.json.JsonValue;
-
 /**
  * A Renderer that displays a button with a textual caption. The value of the
  * corresponding property is used as the caption. Click listeners can be added
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java
index c197f7415a..85d7801c41 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java
@@ -16,7 +16,6 @@
 package com.vaadin.ui.renderers;
 
 import com.vaadin.ui.LegacyGrid.AbstractRenderer;
-import elemental.json.JsonValue;
 
 /**
  * A renderer for presenting HTML content.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
index ac73615272..799e67b9e7 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
@@ -16,7 +16,6 @@
 package com.vaadin.ui.renderers;
 
 import com.vaadin.ui.LegacyGrid.AbstractRenderer;
-import elemental.json.JsonValue;
 
 /**
  * A renderer for presenting simple plain-text string values.
diff --git a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java
index 93aa1350b0..e5aade1217 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java
@@ -22,7 +22,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.fieldgroup.DefaultFieldGroupFieldFactory;
 import com.vaadin.ui.AbstractSelect;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.ListSelect;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java b/compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java
index 979f472e20..0c6932c65e 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java
@@ -1,13 +1,13 @@
 package com.vaadin.data.util.filter;
 
-import junit.framework.TestCase;
-
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.PropertysetItem;
 
+import junit.framework.TestCase;
+
 public abstract class AbstractFilterTestBase<FILTERTYPE extends Filter>
         extends TestCase {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java
index 8ce298c065..3d12fc78ba 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java
@@ -6,7 +6,6 @@ import java.sql.SQLException;
 import java.sql.Statement;
 
 import org.junit.Assert;
-import org.junit.Test;
 
 import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB;
 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
index 8688c9ae64..c8b5b5a2b3 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
@@ -2,8 +2,6 @@ package com.vaadin.data.util.sqlcontainer;
 
 import java.util.List;
 
-import org.junit.Test;
-
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB;
 import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
index 1c70c8dad7..42b02cf874 100644
--- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
@@ -4,8 +4,6 @@ import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
 
-import org.junit.Test;
-
 /**
  * Provides a JNDI initial context factory for the MockContext.
  */
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java
index f126e636ba..5897a1fc2d 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java
@@ -17,14 +17,14 @@ package com.vaadin.tests.server.component.grid;
 
 import java.util.Iterator;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.FooterCell;
 import com.vaadin.ui.LegacyGrid.HeaderCell;
-import com.vaadin.ui.Label;
 
 public class GridChildrenTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
index 1af2577fa3..e5c46e3ba2 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
@@ -19,13 +19,13 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.LegacyGrid;
 
 public class GridColumnAddingAndRemovingTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java
index 570e9b92fc..769532b03b 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java
@@ -34,7 +34,6 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import com.vaadin.ui.LegacyGrid;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.junit.Before;
@@ -45,6 +44,7 @@ import com.vaadin.server.KeyMapper;
 import com.vaadin.shared.ui.grid.GridColumnState;
 import com.vaadin.shared.ui.grid.GridState;
 import com.vaadin.shared.util.SharedUtil;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.Column;
 import com.vaadin.ui.LegacyGrid.ColumnResizeEvent;
 import com.vaadin.ui.LegacyGrid.ColumnResizeListener;
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java
index fa6c57df93..6bbac2977c 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java
@@ -21,12 +21,12 @@ import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Test;
 
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.AbstractInMemoryContainer;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.Column;
 
 public class GridContainerNotSortableTest {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java
index 7b07aefcb2..c865bd8494 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java
@@ -19,15 +19,15 @@ import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.DetailsGenerator;
 import com.vaadin.ui.LegacyGrid.RowReference;
-import com.vaadin.ui.Label;
 
 public class GridContainerTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java
index 15daa264d9..6fe47b22a0 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java
@@ -24,10 +24,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Method;
 
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyTextField;
-
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Assert;
@@ -42,6 +38,9 @@ import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.server.MockVaadinSession;
 import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinSession;
+import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class GridEditorTest {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java
index 452d2713a4..3bba51ab17 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java
@@ -17,9 +17,9 @@ package com.vaadin.tests.server.component.grid;
 
 import static org.junit.Assert.assertTrue;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Test;
 
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.AbstractGridExtension;
 
 public class GridExtensionTest {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java
index 7e910d2428..1a2011de73 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java
@@ -21,13 +21,13 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Collection;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.SelectionEvent;
 import com.vaadin.event.SelectionEvent.SelectionListener;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.SelectionMode;
 import com.vaadin.ui.LegacyGrid.SelectionModel;
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java
index 7a8209d50b..95daf47e25 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java
@@ -21,12 +21,12 @@ import static org.junit.Assert.assertNull;
 
 import java.lang.reflect.Method;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.data.Container.Indexed;
 import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.LegacyGrid;
 
 public class GridStaticSectionTest extends LegacyGrid {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java
index 1199486742..54e9b30988 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java
@@ -19,7 +19,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -29,6 +28,7 @@ import com.vaadin.data.Container;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.SelectionEvent;
 import com.vaadin.event.SelectionEvent.SelectionListener;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.MultiSelectionModel;
 import com.vaadin.ui.LegacyGrid.SelectionMode;
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
index 71d24a2d8e..5a2afed01c 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
@@ -15,9 +15,10 @@
  */
 package com.vaadin.tests.server.component.grid.declarative;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Test;
 
+import com.vaadin.ui.LegacyGrid;
+
 public class GridColumnDeclarativeTest extends GridDeclarativeTestBase {
 
     @Test
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
index 8ca99327dc..6d26b40996 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
@@ -17,22 +17,23 @@ package com.vaadin.tests.server.component.grid.declarative;
 
 import static org.junit.Assert.assertSame;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.grid.HeightMode;
 import com.vaadin.tests.design.DeclarativeTestBase;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.MultiSelectionModel;
 import com.vaadin.ui.LegacyGrid.NoSelectionModel;
 import com.vaadin.ui.LegacyGrid.SingleSelectionModel;
 
 /**
- * Tests declarative support for {@link Grid} properties.
+ * Tests declarative support for Grid properties.
  *
  * @since
  * @author Vaadin Ltd
  */
-public class GridDeclarativeAttributeTest extends DeclarativeTestBase<LegacyGrid> {
+public class GridDeclarativeAttributeTest
+        extends DeclarativeTestBase<LegacyGrid> {
 
     @Test
     public void testBasicAttributes() {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
index 3e97910be7..59ab5b8343 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
@@ -17,10 +17,10 @@ package com.vaadin.tests.server.component.grid.declarative;
 
 import java.util.List;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Assert;
 
 import com.vaadin.tests.design.DeclarativeTestBase;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.Column;
 import com.vaadin.ui.LegacyGrid.FooterCell;
 import com.vaadin.ui.LegacyGrid.FooterRow;
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
index 1207063c16..ef536359be 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
@@ -15,17 +15,17 @@
  */
 package com.vaadin.tests.server.component.grid.declarative;
 
-import com.vaadin.ui.LegacyGrid;
 import org.jsoup.nodes.Element;
 import org.jsoup.parser.Tag;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.Column;
 import com.vaadin.ui.LegacyGrid.FooterRow;
 import com.vaadin.ui.LegacyGrid.HeaderRow;
-import com.vaadin.ui.Label;
 import com.vaadin.ui.declarative.DesignContext;
 
 public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
index f5b98824cd..8bf03e9d5e 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
@@ -15,11 +15,11 @@
  */
 package com.vaadin.tests.server.component.grid.declarative;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.data.Container;
+import com.vaadin.ui.LegacyGrid;
 
 public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase {
 
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
index b55b0815f8..1a0e0a1102 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
@@ -15,9 +15,9 @@
  */
 package com.vaadin.tests.server.component.grid.declarative;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Test;
 
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.declarative.DesignException;
 
 public class GridStructureDeclarativeTest extends GridDeclarativeTestBase {
diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
index f3b9b1cece..53f3d3acb8 100644
--- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
@@ -25,7 +25,6 @@ import com.vaadin.ui.Table.Align;
 import com.vaadin.ui.Table.ColumnHeaderMode;
 import com.vaadin.ui.Table.RowHeaderMode;
 import com.vaadin.ui.Table.TableDragMode;
-import com.vaadin.ui.declarative.Design;
 
 /**
  * Test declarative support for {@link Table}.