Update @deprecated messages in VaadinService related classes (#10229)

Also remove deprecation of individual methods in the already deprecated
LegacyApplication

Change-Id: Iead36f52552dc492081690dddc018203dc21ccba

11 files changed, 36 insertions, 42 deletions

diff --git a/server/src/com/vaadin/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java
index 50150c5d5c..d1180c479b 100644
--- a/server/src/com/vaadin/server/AbstractCommunicationManager.java
+++ b/server/src/com/vaadin/server/AbstractCommunicationManager.java
@@ -95,7 +95,7 @@ import com.vaadin.ui.Window;
  * <p>
  * TODO Document better!
  * 
- * @deprecated might be refactored or removed before 7.0.0
+ * @deprecated will likely change or be removed in a future version
  */
 @Deprecated
 @SuppressWarnings("serial")
@@ -112,7 +112,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
      * 
      * @author peholmst
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public interface Callback extends Serializable {
@@ -2391,7 +2391,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
     /**
      * @return
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected abstract BootstrapHandler createBootstrapHandler();
diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java
index 1ab4390351..43fc6a5c70 100644
--- a/server/src/com/vaadin/server/BootstrapHandler.java
+++ b/server/src/com/vaadin/server/BootstrapHandler.java
@@ -48,7 +48,7 @@ import com.vaadin.ui.UI;
  * @author Vaadin Ltd
  * @since 7.0.0
  * 
- * @deprecated might be refactored or removed before 7.0.0
+ * @deprecated will likely change or be removed in a future version
  */
 @Deprecated
 public abstract class BootstrapHandler implements RequestHandler {
diff --git a/server/src/com/vaadin/server/CommunicationManager.java b/server/src/com/vaadin/server/CommunicationManager.java
index 6d60789be7..acc0e46c0c 100644
--- a/server/src/com/vaadin/server/CommunicationManager.java
+++ b/server/src/com/vaadin/server/CommunicationManager.java
@@ -33,7 +33,7 @@ import com.vaadin.ui.UI;
  * @author Vaadin Ltd.
  * @since 5.0
  * 
- * @deprecated might be refactored or removed before 7.0.0
+ * @deprecated will likely change or be removed in a future version
  */
 @Deprecated
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/server/LegacyApplication.java b/server/src/com/vaadin/server/LegacyApplication.java
index 6307b9f0c2..dc55bca344 100644
--- a/server/src/com/vaadin/server/LegacyApplication.java
+++ b/server/src/com/vaadin/server/LegacyApplication.java
@@ -252,10 +252,7 @@ public abstract class LegacyApplication implements ErrorListener {
      * </p>
      * 
      * @return the URL.
-     * 
-     * @deprecated might be refactored or removed before 7.0.0
      */
-    @Deprecated
     public String getLogoutURL() {
         return logoutURL;
     }
@@ -269,10 +266,7 @@ public abstract class LegacyApplication implements ErrorListener {
      * 
      * @param logoutURL
      *            the logoutURL to set.
-     * 
-     * @deprecated might be refactored or removed before 7.0.0
      */
-    @Deprecated
     public void setLogoutURL(String logoutURL) {
         this.logoutURL = logoutURL;
     }
diff --git a/server/src/com/vaadin/server/PortletCommunicationManager.java b/server/src/com/vaadin/server/PortletCommunicationManager.java
index 84d48fdf83..0d63c4b8dc 100644
--- a/server/src/com/vaadin/server/PortletCommunicationManager.java
+++ b/server/src/com/vaadin/server/PortletCommunicationManager.java
@@ -38,7 +38,7 @@ import com.vaadin.ui.UI;
  * @author peholmst
  * 
  * 
- * @deprecated might be refactored or removed before 7.0.0
+ * @deprecated will likely change or be removed in a future version
  */
 @Deprecated
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java
index 11e341a16f..d7d4a65245 100644
--- a/server/src/com/vaadin/server/VaadinPortlet.java
+++ b/server/src/com/vaadin/server/VaadinPortlet.java
@@ -65,7 +65,7 @@ import com.vaadin.util.CurrentInstance;
 public class VaadinPortlet extends GenericPortlet implements Constants {
 
     /**
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public static final String RESOURCE_URL_ID = "APP";
@@ -221,7 +221,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * This portlet parameter is used to add styles to the main element. E.g
      * "height:500px" generates a style="height:500px" to the main element.
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public static final String PORTLET_PARAMETER_STYLE = "style";
@@ -230,13 +230,13 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * This portal parameter is used to define the name of the Vaadin theme that
      * is used for all Vaadin applications in the portal.
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public static final String PORTAL_PARAMETER_VAADIN_THEME = "vaadin.theme";
 
     /**
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public static final String WRITE_AJAX_PAGE_SCRIPT_WIDGETSET_SHOULD_WRITE = "writeAjaxPageScriptWidgetsetShouldWrite";
@@ -307,7 +307,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
     /**
      * @author Vaadin Ltd
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected enum RequestType {
@@ -318,7 +318,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * @param vaadinRequest
      * @return
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected RequestType getRequestType(VaadinPortletRequest vaadinRequest) {
@@ -369,7 +369,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * @throws PortletException
      * @throws IOException
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected void handleRequest(PortletRequest request,
@@ -711,7 +711,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * @throws IOException
      *             if the writing failed due to input/output error.
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     void criticalNotification(VaadinPortletRequest request,
diff --git a/server/src/com/vaadin/server/VaadinPortletService.java b/server/src/com/vaadin/server/VaadinPortletService.java
index 5651d033be..4e7d61d702 100644
--- a/server/src/com/vaadin/server/VaadinPortletService.java
+++ b/server/src/com/vaadin/server/VaadinPortletService.java
@@ -167,7 +167,7 @@ public class VaadinPortletService extends VaadinService {
      *            the request to get a request type for
      * @return the request type
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected RequestType getRequestType(VaadinRequest request) {
diff --git a/server/src/com/vaadin/server/VaadinPortletSession.java b/server/src/com/vaadin/server/VaadinPortletSession.java
index af7b0f32bf..989ed0b3ea 100644
--- a/server/src/com/vaadin/server/VaadinPortletSession.java
+++ b/server/src/com/vaadin/server/VaadinPortletSession.java
@@ -52,7 +52,7 @@ import com.vaadin.util.CurrentInstance;
  * 
  * @author peholmst
  * 
- * @deprecated might be refactored or removed before 7.0.0
+ * @deprecated will likely change or be removed in a future version
  */
 @Deprecated
 @SuppressWarnings("serial")
diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index 60f2fed123..e48153642b 100644
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -454,7 +454,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @throws IOException
      *             if the writing failed due to input/output error.
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected void criticalNotification(VaadinServletRequest request,
@@ -548,7 +548,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      *            the resource path.
      * @return the resource path.
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected static String getResourcePath(ServletContext servletContext,
@@ -602,7 +602,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @param themeName
      * @return
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected static String stripSpecialChars(String themeName) {
@@ -636,7 +636,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @throws IOException
      * @throws ServletException
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     void handleServiceSessionExpired(VaadinServletRequest request,
@@ -990,7 +990,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * 
      * @since 6.6.7
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected boolean isAllowedVAADINResourceUrl(HttpServletRequest request,
@@ -1081,7 +1081,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @author Vaadin Ltd
      * @since 7.0.0
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected enum RequestType {
@@ -1092,7 +1092,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @param request
      * @return
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected RequestType getRequestType(VaadinServletRequest request) {
@@ -1184,7 +1184,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      *             if the application is denied access to the persistent data
      *             store represented by the given URL.
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected URL getApplicationUrl(HttpServletRequest request)
@@ -1239,7 +1239,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @param unsafe
      * @return a safe string to be added inside an html tag
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public static final String safeEscapeForHtml(String unsafe) {
diff --git a/server/src/com/vaadin/server/VaadinServletService.java b/server/src/com/vaadin/server/VaadinServletService.java
index e1b51fa8ed..9cb97873e7 100644
--- a/server/src/com/vaadin/server/VaadinServletService.java
+++ b/server/src/com/vaadin/server/VaadinServletService.java
@@ -139,7 +139,7 @@ public class VaadinServletService extends VaadinService {
      *            the request to get a request type for
      * @return the request type
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected RequestType getRequestType(VaadinRequest request) {
diff --git a/server/src/com/vaadin/server/VaadinSession.java b/server/src/com/vaadin/server/VaadinSession.java
index 3fc75b67f4..9bfd03b402 100644
--- a/server/src/com/vaadin/server/VaadinSession.java
+++ b/server/src/com/vaadin/server/VaadinSession.java
@@ -161,7 +161,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      * Get the web browser associated with this session.
      * 
      * @return
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public WebBrowser getBrowser() {
@@ -221,7 +221,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
     /**
      * @return
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public AbstractCommunicationManager getCommunicationManager() {
@@ -234,7 +234,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      * @param underlyingSession
      * @return
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public static VaadinSession getForSession(VaadinService service,
@@ -254,7 +254,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      * 
      * @param service
      *            TODO
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public void removeFromSession(VaadinService service) {
@@ -268,7 +268,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
     /**
      * @param session
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public void storeInSession(VaadinService service, WrappedSession session) {
@@ -521,7 +521,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      *            A connector that has not yet been assigned an id.
      * @return A new id for the connector
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public String createConnectorId(ClientConnector connector) {
@@ -589,7 +589,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      *            the bootstrap response event for which listeners should be
      *            fired
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public void modifyBootstrapResponse(BootstrapResponse response) {
@@ -608,7 +608,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      * 
      * @since 7.0.0
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     public void cleanupInactiveUIs() {
@@ -698,13 +698,13 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      * 
      * @since 7.0.0
      * 
-     * @deprecated Might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      * 
      * @param ui
      *            The UI whose status to check
      * @return true if the UI is alive, false if it could be removed.
      * 
-     * @deprecated might be refactored or removed before 7.0.0
+     * @deprecated will likely change or be removed in a future version
      */
     @Deprecated
     protected boolean isUIAlive(UI ui) {