Move old Sort related classes into compatibility module. (#7999)

Fixes vaadin/framework8-issues#563
vaadin · Dec 15, 2016 · 6185ad5 · 6185ad5
1 parent ca049c8
commit 6185ad5
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 31 deletions.
diff --git a/.../main/java/com/vaadin/data/sort/Sort.java → ...in/java/com/vaadin/v7/data/sort/Sort.java b/.../main/java/com/vaadin/data/sort/Sort.java → ...in/java/com/vaadin/v7/data/sort/Sort.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.sort;
+package com.vaadin.v7.data.sort;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -28,6 +28,7 @@
  * @since 7.4
  * @author Vaadin Ltd
  */
+@Deprecated
 public class Sort implements Serializable {
 
     private final Sort previous;

diff --git a/.../java/com/vaadin/data/sort/SortOrder.java → ...va/com/vaadin/v7/data/sort/SortOrder.java b/.../java/com/vaadin/data/sort/SortOrder.java → ...va/com/vaadin/v7/data/sort/SortOrder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.sort;
+package com.vaadin.v7.data.sort;
 
 import java.io.Serializable;
 
@@ -26,6 +26,7 @@
  * @since 7.4
  * @author Vaadin Ltd
  */
+@Deprecated
 public class SortOrder implements Serializable {
 
     private final Object propertyId;

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/GeneratedPropertyContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/GeneratedPropertyContainer.java
@@ -27,11 +27,11 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import com.vaadin.data.sort.SortOrder;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.sort.SortOrder;
 import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
 
 /**

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
@@ -17,8 +17,8 @@
 
 import java.io.Serializable;
 
-import com.vaadin.data.sort.SortOrder;
 import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.sort.SortOrder;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.util.filter.UnsupportedFilterException;

diff --git a/...main/java/com/vaadin/event/SortEvent.java → ...n/java/com/vaadin/v7/event/SortEvent.java b/...main/java/com/vaadin/event/SortEvent.java → ...n/java/com/vaadin/v7/event/SortEvent.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.event;
+package com.vaadin.v7.event;
 
 import java.io.Serializable;
 import java.util.List;
 
-import com.vaadin.data.sort.SortOrder;
 import com.vaadin.shared.Registration;
 import com.vaadin.ui.Component;
+import com.vaadin.v7.data.sort.SortOrder;
 
 /**
  * Event describing a change in sorting of a {@link Container}. Fired by
@@ -31,6 +31,7 @@
  * @since 7.4
  * @author Vaadin Ltd
  */
+@Deprecated
 public class SortEvent extends Component.Event {
 
     private final List<SortOrder> sortOrder;
@@ -76,6 +77,7 @@ public boolean isUserOriginated() {
      * Listener for sort order change events.
      */
     @FunctionalInterface
+    @Deprecated
     public interface SortListener extends Serializable {
         /**
          * Called when the sort order has changed.
@@ -90,6 +92,7 @@ public interface SortListener extends Serializable {
      * The interface for adding and removing listeners for {@link SortEvent
      * SortEvents}.
      */
+    @Deprecated
     public interface SortNotifier extends Serializable {
         /**
          * Adds a sort order change listener that gets notified when the sort
@@ -107,10 +110,7 @@ public interface SortNotifier extends Serializable {
          *
          * @param listener
          *            the sort order change listener to remove
-         * @deprecated use a {@link Registration} returned by
-         *             {@link #addSortListener(SortListener)}
          */
-        @Deprecated
         public void removeSortListener(SortListener listener);
     }
 }
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
@@ -42,16 +42,11 @@
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
-import com.vaadin.data.sort.Sort;
-import com.vaadin.data.sort.SortOrder;
 import com.vaadin.event.ContextClickEvent;
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
-import com.vaadin.event.SortEvent;
-import com.vaadin.event.SortEvent.SortListener;
-import com.vaadin.event.SortEvent.SortNotifier;
 import com.vaadin.server.AbstractClientConnector;
 import com.vaadin.server.AbstractExtension;
 import com.vaadin.server.EncodeResult;
@@ -90,6 +85,8 @@
 import com.vaadin.v7.data.fieldgroup.DefaultFieldGroupFieldFactory;
 import com.vaadin.v7.data.fieldgroup.FieldGroup;
 import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.v7.data.sort.Sort;
+import com.vaadin.v7.data.sort.SortOrder;
 import com.vaadin.v7.data.fieldgroup.FieldGroupFieldFactory;
 import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.v7.data.util.converter.Converter;
@@ -100,8 +97,11 @@
 import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
 import com.vaadin.v7.event.SelectionEvent;
+import com.vaadin.v7.event.SortEvent;
 import com.vaadin.v7.event.SelectionEvent.SelectionListener;
 import com.vaadin.v7.event.SelectionEvent.SelectionNotifier;
+import com.vaadin.v7.event.SortEvent.SortListener;
+import com.vaadin.v7.event.SortEvent.SortNotifier;
 import com.vaadin.v7.server.communication.data.DataGenerator;
 import com.vaadin.v7.server.communication.data.RpcDataProviderExtension;
 import com.vaadin.v7.shared.ui.grid.ColumnResizeMode;

diff --git a/...tibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java b/...tibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java
@@ -23,13 +23,13 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.sort.SortOrder;
 import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Container.Indexed;
 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.util.GeneratedPropertyContainer.GeneratedPropertyItem;
 import com.vaadin.v7.data.util.filter.Compare;

diff --git a/...ibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/sort/SortTest.java b/...ibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/sort/SortTest.java
@@ -23,12 +23,12 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.sort.Sort;
-import com.vaadin.data.sort.SortOrder;
-import com.vaadin.event.SortEvent;
-import com.vaadin.event.SortEvent.SortListener;
 import com.vaadin.shared.data.sort.SortDirection;
+import com.vaadin.v7.data.sort.Sort;
+import com.vaadin.v7.data.sort.SortOrder;
 import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.event.SortEvent;
+import com.vaadin.v7.event.SortEvent.SortListener;
 import com.vaadin.v7.ui.Grid;
 
 public class SortTest {

diff --git a/server/src/main/java/com/vaadin/ui/components/grid/SortOrderProvider.java b/server/src/main/java/com/vaadin/ui/components/grid/SortOrderProvider.java
@@ -31,8 +31,8 @@
  * @author Vaadin Ltd
  */
 @FunctionalInterface
-public interface SortOrderProvider
-        extends SerializableFunction<SortDirection, Stream<SortOrder<String>>> {
+public interface SortOrderProvider extends
+        SerializableFunction<SortDirection, Stream<SortOrder<String>>> {
 
     /**
      * Generates the sort orders when rows are sorted by a column.

diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridGeneratedProperties.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridGeneratedProperties.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.v7.tests.components.grid;
 
-import com.vaadin.data.sort.Sort;
-import com.vaadin.data.sort.SortOrder;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.tests.components.AbstractReindeerTestUI;
@@ -26,6 +24,8 @@
 import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Container.Filterable;
 import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.sort.Sort;
+import com.vaadin.v7.data.sort.SortOrder;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.GeneratedPropertyContainer;
 import com.vaadin.v7.data.util.IndexedContainer;

diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSortIndicator.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSortIndicator.java
@@ -18,12 +18,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vaadin.data.sort.SortOrder;
-import com.vaadin.event.SortEvent;
-import com.vaadin.event.SortEvent.SortListener;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.tests.components.AbstractReindeerTestUI;
+import com.vaadin.v7.data.sort.SortOrder;
+import com.vaadin.v7.event.SortEvent;
+import com.vaadin.v7.event.SortEvent.SortListener;
 import com.vaadin.v7.ui.Grid;
 
 /*

diff --git a/...st/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeatures.java b/...st/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeatures.java
@@ -29,10 +29,6 @@
 import java.util.Random;
 
 import com.vaadin.annotations.Theme;
-import com.vaadin.data.sort.Sort;
-import com.vaadin.data.sort.SortOrder;
-import com.vaadin.event.SortEvent;
-import com.vaadin.event.SortEvent.SortListener;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.tests.components.AbstractComponentTest;
 import com.vaadin.ui.Button;
@@ -49,11 +45,15 @@
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
 import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.v7.data.sort.Sort;
+import com.vaadin.v7.data.sort.SortOrder;
 import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.event.SelectionEvent;
 import com.vaadin.v7.event.SelectionEvent.SelectionListener;
+import com.vaadin.v7.event.SortEvent;
+import com.vaadin.v7.event.SortEvent.SortListener;
 import com.vaadin.v7.shared.ui.grid.ColumnResizeMode;
 import com.vaadin.v7.shared.ui.grid.GridStaticCellType;
 import com.vaadin.v7.shared.ui.grid.HeightMode;

diff --git a/...rc/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridSortingIndicators.java b/...rc/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridSortingIndicators.java
@@ -15,14 +15,14 @@
  */
 package com.vaadin.v7.tests.components.grid.basicfeatures;
 
-import com.vaadin.data.sort.Sort;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.tests.components.AbstractReindeerTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.sort.Sort;
 import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.v7.ui.Grid;