Update since tags (#11001)8.5.0.alpha2

6 files changed, 27 insertions, 29 deletions

diff --git a/server/src/main/java/com/vaadin/server/SerializablePredicate.java b/server/src/main/java/com/vaadin/server/SerializablePredicate.java
index 495fdb2c9f..71f82c79aa 100644
--- a/server/src/main/java/com/vaadin/server/SerializablePredicate.java
+++ b/server/src/main/java/com/vaadin/server/SerializablePredicate.java
@@ -46,7 +46,7 @@ public interface SerializablePredicate<T> extends Predicate<T>, Serializable {
      *         AND of this predicate and the {@code other} predicate
      * @throws NullPointerException
      *             if other is null
-     * @since
+     * @since 8.5
      */
     default SerializablePredicate<T> and(
             SerializablePredicate<? super T> other) {
@@ -60,7 +60,7 @@ public interface SerializablePredicate<T> extends Predicate<T>, Serializable {
      *
      * @return a predicate that represents the logical negation of this
      *         predicate
-     * @since
+     * @since 8.5
      */
     default SerializablePredicate<T> negate() {
         return t -> !test(t);
@@ -83,7 +83,7 @@ public interface SerializablePredicate<T> extends Predicate<T>, Serializable {
      *         OR of this predicate and the {@code other} predicate
      * @throws NullPointerException
      *             if other is null
-     * @since
+     * @since 8.5
      */
     default SerializablePredicate<T> or(
             SerializablePredicate<? super T> other) {
@@ -102,7 +102,7 @@ public interface SerializablePredicate<T> extends Predicate<T>, Serializable {
      *            may be {@code null}
      * @return a predicate that tests if two arguments are equal according to
      *         {@link Objects#equals(Object, Object)}
-     * @since
+     * @since 8.5
      */
     static <T> SerializablePredicate<T> isEqual(Serializable targetRef) {
         return (null == targetRef) ? Objects::isNull
diff --git a/server/src/main/java/com/vaadin/server/VaadinServlet.java b/server/src/main/java/com/vaadin/server/VaadinServlet.java
index a32b1f5067..4058f3e992 100644
--- a/server/src/main/java/com/vaadin/server/VaadinServlet.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServlet.java
@@ -772,13 +772,15 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * resource to the client.
      *
      * @param request
+     *            The request
      * @param response
-     * @return true if a file was served and the request has been handled, false
-     *         otherwise.
+     *            The response
+     * @return {@code true} if a file was served and the request has been
+     *         handled; {@code false} otherwise.
      * @throws IOException
      * @throws ServletException
      *
-     * @since
+     * @since 8.5
      */
     protected boolean serveStaticResources(HttpServletRequest request,
             HttpServletResponse response) throws IOException, ServletException {
@@ -798,11 +800,13 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @param filename
      *            The filename to serve. Should always start with /VAADIN/.
      * @param request
+     *            The request
      * @param response
+     *            The response
      * @throws IOException
      * @throws ServletException
      *
-     * @since
+     * @since 8.5
      */
     protected void serveStaticResourcesInVAADIN(String filename,
             HttpServletRequest request, HttpServletResponse response)
@@ -900,19 +904,15 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * web.xml using resourceCacheTime (defaults to 1 hour).
      *
      * @param filename
+     *            the filename
      * @return cache lifetime for the given filename in seconds
      */
     protected int getCacheTime(String filename) {
-        /*
-         * GWT conventions:
-         *
-         * - files containing .nocache. will not be cached.
-         *
-         * - files containing .cache. will be cached for one year.
-         *
-         * https://developers.google.com/web-toolkit/doc/latest/
-         * DevGuideCompilingAndDebugging#perfect_caching
-         */
+        // GWT conventions:
+        // - files containing .nocache. will not be cached.
+        // - files containing .cache. will be cached for one year.
+        // https://developers.google.com/web-toolkit/doc/latest/DevGuideCompilingAndDebugging#perfect_caching
+
         if (filename.contains(".nocache.")) {
             return 0;
         }
@@ -1430,7 +1430,6 @@ public class VaadinServlet extends HttpServlet implements Constants {
 
     /*
      * (non-Javadoc)
-     *
      * @see javax.servlet.GenericServlet#destroy()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/server/communication/PushHandler.java b/server/src/main/java/com/vaadin/server/communication/PushHandler.java
index 0613d883f2..6344f7386f 100644
--- a/server/src/main/java/com/vaadin/server/communication/PushHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PushHandler.java
@@ -170,7 +170,7 @@ public class PushHandler {
      * Creates the ServerRpcHandler to use.
      *
      * @return the ServerRpcHandler to use
-     * @since
+     * @since 8.5
      */
     protected ServerRpcHandler createRpcHandler() {
         return new ServerRpcHandler();
@@ -366,11 +366,10 @@ public class PushHandler {
                 /*
                  * UI not found, could be because FF has asynchronously closed
                  * the websocket connection and Atmosphere has already done
-                 * cleanup of the request attributes.
-                 *
-                 * In that case, we still have a chance of finding the right UI
-                 * by iterating through the UIs in the session looking for one
-                 * using the same AtmosphereResource.
+                 * cleanup of the request attributes. In that case, we still
+                 * have a chance of finding the right UI by iterating through
+                 * the UIs in the session looking for one using the same
+                 * AtmosphereResource.
                  */
                 ui = findUiUsingResource(resource, session.getUIs());
 
diff --git a/server/src/main/java/com/vaadin/ui/ComboBox.java b/server/src/main/java/com/vaadin/ui/ComboBox.java
index 32ee7b278a..5d4a3f4f54 100644
--- a/server/src/main/java/com/vaadin/ui/ComboBox.java
+++ b/server/src/main/java/com/vaadin/ui/ComboBox.java
@@ -285,7 +285,7 @@ public class ComboBox<T> extends AbstractSingleSelect<T>
      *
      * @param dataCommunicator
      *            the data comnunicator to use with this ComboBox
-     * @since
+     * @since 8.5
      */
     protected ComboBox(DataCommunicator<T> dataCommunicator) {
         super(dataCommunicator);
diff --git a/server/src/main/java/com/vaadin/ui/Upload.java b/server/src/main/java/com/vaadin/ui/Upload.java
index 0e64654d38..96bd112303 100644
--- a/server/src/main/java/com/vaadin/ui/Upload.java
+++ b/server/src/main/java/com/vaadin/ui/Upload.java
@@ -1207,7 +1207,7 @@ public class Upload extends AbstractComponent
      *
      * @return comma-separated list of desired mime types to be uploaded
      * @see #setAcceptMimeTypes
-     * @since
+     * @since 8.5
      */
     public String getAcceptMimeTypes() {
         return getState(false).acceptMimeTypes;
@@ -1223,7 +1223,7 @@ public class Upload extends AbstractComponent
      * @param acceptMimeTypes
      *            comma-separated list of desired mime types to be uploaded
      * @see #getAcceptMimeTypes
-     * @since
+     * @since 8.5
      */
     public void setAcceptMimeTypes(String acceptMimeTypes) {
         getState().acceptMimeTypes = acceptMimeTypes;
diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java b/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java
index fdb95d8d61..0e67c5a36a 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java
@@ -735,7 +735,7 @@ public class DesignContext implements Serializable {
          *
          * @return the context
          *
-         * @since
+         * @since 8.5
          */
         public DesignContext getContext() {
             return context;