Replacement guide javadocs for deprecated classes, part two (#8719)

Partial fix for #8682

26 files changed, 95 insertions, 3 deletions

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ConverterFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ConverterFactory.java
index 1730a15e10..e8607c553f 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ConverterFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ConverterFactory.java
@@ -16,6 +16,8 @@
 
 package com.vaadin.v7.data.util.converter;
 
+import com.vaadin.data.Binder;
+
 import java.io.Serializable;
 
 /**
@@ -25,6 +27,7 @@ import java.io.Serializable;
  * @author Vaadin Ltd.
  * @since 7.0
  *
+ * @deprecated As of 8.0, no replacement available - provide explicit converters for {@link Binder}.
  */
 @Deprecated
 public interface ConverterFactory extends Serializable {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ConverterUtil.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ConverterUtil.java
index 9d1580af9e..1a263c14ad 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ConverterUtil.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ConverterUtil.java
@@ -19,7 +19,9 @@ import java.io.Serializable;
 import java.util.Locale;
 
 import com.vaadin.server.VaadinSession;
-
+/*
+ * @deprecated As of 8.0, no replacement available.
+ */
 @Deprecated
 public class ConverterUtil implements Serializable {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/DefaultConverterFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/DefaultConverterFactory.java
index 4f9fe0fc29..73c5de9d05 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/DefaultConverterFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/DefaultConverterFactory.java
@@ -34,6 +34,8 @@ import com.vaadin.server.VaadinSession;
  *
  * @author Vaadin Ltd
  * @since 7.0
+ *
+ * @deprecated As of 8.0, no replacement available.
  */
 @Deprecated
 public class DefaultConverterFactory implements ConverterFactory {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ReverseConverter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ReverseConverter.java
index 007ae1c686..8bfce86fb6 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ReverseConverter.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ReverseConverter.java
@@ -29,6 +29,8 @@ import java.util.Locale;
  *
  * @author Vaadin Ltd
  * @since 7.0
+ *
+ * @deprecated As of 8.0, no direct replacement available.
  */
 @Deprecated
 public class ReverseConverter<PRESENTATION, MODEL>
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToByteConverter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToByteConverter.java
index f26921f62a..40014d4595 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToByteConverter.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToByteConverter.java
@@ -16,6 +16,8 @@
 
 package com.vaadin.v7.data.util.converter;
 
+import com.vaadin.data.Binder;
+
 import java.text.NumberFormat;
 import java.util.Locale;
 
@@ -29,6 +31,9 @@ import java.util.Locale;
  *
  * @author Vaadin Ltd
  * @since 7.4
+ *
+ * @deprecated As of 8.0, a lightweight lambda-based converter can be build with
+ *  {@link Binder}{@code .forField(...).withConverter(...)} methods.
  */
 @Deprecated
 public class StringToByteConverter
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToCollectionConverter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToCollectionConverter.java
index ff4ec95b4d..13cef7ece3 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToCollectionConverter.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToCollectionConverter.java
@@ -15,6 +15,8 @@
  */
 package com.vaadin.v7.data.util.converter;
 
+import com.vaadin.data.Binder;
+
 import java.io.Serializable;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -37,6 +39,9 @@ import java.util.Locale;
  * @since 7.5.0
  *
  * @author Vaadin Ltd
+ *
+ * @deprecated As of 8.0, a lightweight lambda-based converter can be build with
+ *  {@link Binder}{@code .forField(...).withConverter(...)} methods.
  */
 @Deprecated
 public class StringToCollectionConverter
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToEnumConverter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToEnumConverter.java
index 77ece19896..18b1ed70cb 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToEnumConverter.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToEnumConverter.java
@@ -15,6 +15,8 @@
  */
 package com.vaadin.v7.data.util.converter;
 
+import com.vaadin.data.Binder;
+
 import java.util.EnumSet;
 import java.util.Locale;
 
@@ -35,6 +37,9 @@ import java.util.Locale;
  *
  * @author Vaadin Ltd
  * @since 7.4
+ *
+ * @deprecated As of 8.0, a lightweight lambda-based converter can be build with
+ *  {@link Binder}{@code .forField(...).withConverter(...)} methods.
  */
 @Deprecated
 public class StringToEnumConverter implements Converter<String, Enum> {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToShortConverter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToShortConverter.java
index 88dfd1e313..1bb0da0c85 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToShortConverter.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToShortConverter.java
@@ -29,6 +29,8 @@ import java.util.Locale;
  *
  * @author Vaadin Ltd
  * @since 7.4
+ *
+ * @deprecated As of 8.0, no direct replacement available, see {@link com.vaadin.data.converter.StringToIntegerConverter}
  */
 @Deprecated
 public class StringToShortConverter
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/AbstractJunctionFilter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/AbstractJunctionFilter.java
index da5e3f2d52..cc1bc8b67f 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/AbstractJunctionFilter.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/AbstractJunctionFilter.java
@@ -19,6 +19,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 
+import com.vaadin.data.provider.Query;
 import com.vaadin.v7.data.Container.Filter;
 
 /**
@@ -28,6 +29,8 @@ import com.vaadin.v7.data.Container.Filter;
  * implementing {@link Filter} for in-memory filters.
  *
  * @since 6.6
+ *
+ * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
  */
 @Deprecated
 public abstract class AbstractJunctionFilter implements Filter {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/And.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/And.java
index a791e1d42a..85634c6ae1 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/And.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/And.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.data.provider.Query;
 import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 
@@ -30,6 +31,8 @@ import com.vaadin.v7.data.Item;
  * @see Or
  *
  * @since 6.6
+ *
+ * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
  */
 @Deprecated
 public final class And extends AbstractJunctionFilter {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Between.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Between.java
index d7f4ef8f10..4f8e65550f 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Between.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Between.java
@@ -17,10 +17,14 @@ package com.vaadin.v7.data.util.filter;
 
 import java.util.Arrays;
 
+import com.vaadin.data.provider.Query;
 import com.vaadin.shared.util.SharedUtil;
 import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 
+/**
+ * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
+ */
 @Deprecated
 public class Between implements Filter {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java
index 2eecad7b43..e57c710dad 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.data.provider.Query;
 import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
@@ -32,6 +33,8 @@ import com.vaadin.v7.data.Property;
  * reference value.
  *
  * @since 6.6
+ *
+ * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
  */
 @Deprecated
 public abstract class Compare implements Filter {
@@ -55,6 +58,8 @@ public abstract class Compare implements Filter {
      * use e.g. database comparison operations.
      *
      * @since 6.6
+     *
+     * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
      */
     @Deprecated
     public static final class Equal extends Compare {
@@ -88,6 +93,8 @@ public abstract class Compare implements Filter {
      * and may use e.g. database comparison operations.
      *
      * @since 6.6
+     *
+     * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
      */
     @Deprecated
     public static final class Greater extends Compare {
@@ -122,6 +129,8 @@ public abstract class Compare implements Filter {
      * and may use e.g. database comparison operations.
      *
      * @since 6.6
+     *
+     * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
      */
     @Deprecated
     public static final class Less extends Compare {
@@ -156,6 +165,8 @@ public abstract class Compare implements Filter {
      * and may use e.g. database comparison operations.
      *
      * @since 6.6
+     *
+     * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
      */
     @Deprecated
     public static final class GreaterOrEqual extends Compare {
@@ -190,6 +201,8 @@ public abstract class Compare implements Filter {
      * and may use e.g. database comparison operations.
      *
      * @since 6.6
+     *
+     * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
      */
     @Deprecated
     public static final class LessOrEqual extends Compare {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java
index 92551334b4..3c94b88e10 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.data.provider.Query;
 import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
@@ -25,6 +26,8 @@ import com.vaadin.v7.data.Property;
  * This filter also directly supports in-memory filtering.
  *
  * @since 6.6
+ *
+ * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
  */
 @Deprecated
 public final class IsNull implements Filter {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Like.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Like.java
index 88d931e066..a091c9a664 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Like.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Like.java
@@ -15,9 +15,13 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.data.provider.Query;
 import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 
+/**
+ * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
+ */
 @Deprecated
 public class Like implements Filter {
     private final Object propertyId;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Not.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Not.java
index 1c8126f365..42fad8ff5d 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Not.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Not.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.data.provider.Query;
 import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 
@@ -25,6 +26,8 @@ import com.vaadin.v7.data.Item;
  * does so.
  *
  * @since 6.6
+ *
+ * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
  */
 @Deprecated
 public final class Not implements Filter {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Or.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Or.java
index e4720d69c2..0eeed77727 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Or.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Or.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.data.provider.Query;
 import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 
@@ -30,6 +31,8 @@ import com.vaadin.v7.data.Item;
  * @see And
  *
  * @since 6.6
+ *
+ * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
  */
 @Deprecated
 public final class Or extends AbstractJunctionFilter {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java
index d75d3719c7..ab2014ae02 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.data.provider.Query;
 import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
@@ -34,6 +35,8 @@ import com.vaadin.v7.data.Property;
  * TODO this might still change
  *
  * @since 6.6
+ *
+ * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
  */
 @Deprecated
 public final class SimpleStringFilter implements Filter {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/UnsupportedFilterException.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/UnsupportedFilterException.java
index 13759f4c78..e438433318 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/UnsupportedFilterException.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/UnsupportedFilterException.java
@@ -15,6 +15,8 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.data.provider.Query;
+
 import java.io.Serializable;
 
 /**
@@ -27,6 +29,8 @@ import java.io.Serializable;
  * perform filtering.
  *
  * @since 6.6
+ *
+ * @deprecated As of 8.0, no replacement available. See {@link Query#getFilter()}
  */
 @Deprecated
 public class UnsupportedFilterException extends RuntimeException
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractStringValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractStringValidator.java
index 739cd151be..6951186d09 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractStringValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractStringValidator.java
@@ -26,6 +26,9 @@ package com.vaadin.v7.data.validator;
  *
  * @author Vaadin Ltd.
  * @since 5.4
+ *
+ *
+ * @deprecated As of 8.0, replaced by {@link com.vaadin.data.validator.AbstractValidator}
  */
 @SuppressWarnings("serial")
 @Deprecated
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java
index 62f75af888..2515e6cef9 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java
@@ -42,6 +42,8 @@ import com.vaadin.v7.data.Validator;
  *            The type
  * @author Vaadin Ltd.
  * @since 5.4
+ *
+ * @deprecated As of 8.0, replaced by {@link com.vaadin.data.validator.AbstractValidator}
  */
 @Deprecated
 public abstract class AbstractValidator<T> implements Validator {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BeanValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BeanValidator.java
index 82c7199e47..6457bd562d 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BeanValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BeanValidator.java
@@ -26,6 +26,7 @@ import javax.validation.Validation;
 import javax.validation.ValidatorFactory;
 import javax.validation.metadata.ConstraintDescriptor;
 
+import com.vaadin.data.BeanValidationBinder;
 import com.vaadin.v7.data.Validator;
 
 /**
@@ -43,6 +44,8 @@ import com.vaadin.v7.data.Validator;
  *
  * @author Petri Hakala
  * @author Henri Sara
+ *
+ * @deprecated See {@link BeanValidationBinder} and {@link com.vaadin.data.validator.BeanValidator}
  */
 @Deprecated
 public class BeanValidator implements Validator {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/CompositeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/CompositeValidator.java
index eac5b3152f..97d5b31178 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/CompositeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/CompositeValidator.java
@@ -21,6 +21,8 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 
+import com.vaadin.data.Binder;
+import com.vaadin.data.HasValue;
 import com.vaadin.v7.data.Validator;
 
 /**
@@ -32,6 +34,10 @@ import com.vaadin.v7.data.Validator;
  *
  * @author Vaadin Ltd.
  * @since 3.0
+ *
+ * @deprecated As of 8.0, no direct replacement available. See {@link Binder#forField(HasValue)} and various methods for
+ * validation and conversion chaining: {@code withValidator(...)}, {@code withConverter(...)},
+ * {@code withNullRepresentation(...)}
  */
 @SuppressWarnings("serial")
 @Deprecated
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/NullValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/NullValidator.java
index 783934a30b..f95a9c82c4 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/NullValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/NullValidator.java
@@ -16,6 +16,8 @@
 
 package com.vaadin.v7.data.validator;
 
+import com.vaadin.data.Binder;
+import com.vaadin.data.HasValue;
 import com.vaadin.v7.data.Validator;
 
 /**
@@ -24,6 +26,10 @@ import com.vaadin.v7.data.Validator;
  *
  * @author Vaadin Ltd.
  * @since 3.0
+ *
+ * @deprecated As of 8.0, no direct replacement available. See {@link Binder#forField(HasValue)} and various methods for
+ * validation and conversion chaining: {@code withValidator(...)}, {@code withConverter(...)},
+ * {@code withNullRepresentation(...)}
  */
 @SuppressWarnings("serial")
 @Deprecated
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
index b401c1b81b..02ab06cb53 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.vaadin.ui.AbstractListing;
 import org.jsoup.nodes.Element;
 
 import com.vaadin.event.Transferable;
@@ -77,6 +78,8 @@ import com.vaadin.v7.shared.ui.select.AbstractSelectState;
  *
  * @author Vaadin Ltd.
  * @since 5.0
+ *
+ * @deprecated As of 8.0, no replacement available. See {@link AbstractListing}
  */
 @SuppressWarnings("serial")
 @Deprecated
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
index e3f122f25d..e18af39fb8 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
@@ -102,7 +102,7 @@ import com.vaadin.v7.shared.ui.table.TableState;
  * @author Vaadin Ltd.
  * @since 3.0
  *
- * @deprecated As of 8.0, use Grid instead
+ * @deprecated As of 8.0, use {@link com.vaadin.ui.Grid} instead
  */
 @Deprecated
 @SuppressWarnings({ "deprecation" })
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java
index 1f3d14c8dd..a32571da22 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java
@@ -33,7 +33,7 @@ import com.vaadin.v7.data.Container;
  * @since 6.0
  * @see FormFieldFactory
  *
- * @deprecated As of 8.0, Table is replaced by Grid
+ * @deprecated As of 8.0, Table is replaced by {@link com.vaadin.ui.Grid}
  */
 @Deprecated
 public interface TableFieldFactory extends Serializable {