Fix formatting (#11023)

5 files changed, 28 insertions, 24 deletions

diff --git a/server/src/main/java/com/vaadin/data/util/BeanUtil.java b/server/src/main/java/com/vaadin/data/util/BeanUtil.java
index 4600451b4e..7365814996 100644
--- a/server/src/main/java/com/vaadin/data/util/BeanUtil.java
+++ b/server/src/main/java/com/vaadin/data/util/BeanUtil.java
@@ -229,33 +229,37 @@ public final class BeanUtil implements Serializable {
     }
 
     /**
-     * Checks if the object is serializable or not. To be used in assertion checks only,
-     * since the check might be a bit heavyweight.
+     * Checks if the object is serializable or not. To be used in assertion
+     * checks only, since the check might be a bit heavyweight.
      *
-     * @param obj to be checked
+     * @param obj
+     *            to be checked
      * @return {@code true}
-     * @throws AssertionError if the object is not serializable
+     * @throws AssertionError
+     *             if the object is not serializable
      */
     public static boolean checkSerialization(Object obj) {
         try {
-            ObjectOutputStream dummyObjectOutputStream = new ObjectOutputStream(new OutputStream() {
-                @Override
-                public void write(int b) {
-                }
+            ObjectOutputStream dummyObjectOutputStream = new ObjectOutputStream(
+                    new OutputStream() {
+                        @Override
+                        public void write(int b) {
+                        }
 
-                @SuppressWarnings("NullableProblems")
-                @Override
-                public void write(byte[] ignored) {
-                }
+                        @SuppressWarnings("NullableProblems")
+                        @Override
+                        public void write(byte[] ignored) {
+                        }
 
-                @SuppressWarnings("NullableProblems")
-                @Override
-                public void write(byte[] b, int off, int len) {
-                }
-            });
+                        @SuppressWarnings("NullableProblems")
+                        @Override
+                        public void write(byte[] b, int off, int len) {
+                        }
+                    });
             dummyObjectOutputStream.writeObject(obj);
         } catch (Throwable e) {
-            throw new AssertionError("Formatter supplier should be serializable", e);
+            throw new AssertionError(
+                    "Formatter supplier should be serializable", e);
         }
         return true;
     }
diff --git a/server/src/main/java/com/vaadin/server/VaadinServlet.java b/server/src/main/java/com/vaadin/server/VaadinServlet.java
index 4058f3e992..b0d270accb 100644
--- a/server/src/main/java/com/vaadin/server/VaadinServlet.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServlet.java
@@ -1430,6 +1430,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
 
     /*
      * (non-Javadoc)
+     *
      * @see javax.servlet.GenericServlet#destroy()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/ui/Upload.java b/server/src/main/java/com/vaadin/ui/Upload.java
index 6cea3ce2d9..301dc2d2e2 100644
--- a/server/src/main/java/com/vaadin/ui/Upload.java
+++ b/server/src/main/java/com/vaadin/ui/Upload.java
@@ -1118,7 +1118,7 @@ public class Upload extends AbstractComponent
                     fireUploadSuccess(event.getFileName(), event.getMimeType(),
                             event.getContentLength());
                     endUpload();
-                    if(lastStartedEvent != null)
+                    if (lastStartedEvent != null)
                         lastStartedEvent.disposeStreamVariable();
                 }
 
@@ -1138,7 +1138,7 @@ public class Upload extends AbstractComponent
                         }
                     } finally {
                         endUpload();
-                        if(lastStartedEvent != null)
+                        if (lastStartedEvent != null)
                             lastStartedEvent.disposeStreamVariable();
                     }
                 }
diff --git a/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java b/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java
index 9922da8956..9d921e1a52 100644
--- a/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java
@@ -103,7 +103,7 @@ public class ClassesSerializableTest {
             "com\\.vaadin\\.screenshotbrowser\\.ScreenshotBrowser.*", //
             "com\\.vaadin\\.osgi.*", //
             "com\\.vaadin\\.server\\.osgi.*",
-            //V7
+            // V7
             "com\\.vaadin\\.v7\\.ui\\.themes\\.BaseTheme",
             "com\\.vaadin\\.v7\\.ui\\.themes\\.ChameleonTheme",
             "com\\.vaadin\\.v7\\.ui\\.themes\\.Reindeer",
@@ -113,8 +113,7 @@ public class ClassesSerializableTest {
             "com\\.vaadin\\.v7\\.data\\.util.BeanItemContainerGenerator.*",
             "com\\.vaadin\\.v7\\.data\\.util\\.sqlcontainer\\.connection\\.MockInitialContextFactory",
             "com\\.vaadin\\.v7\\.data\\.util\\.sqlcontainer\\.DataGenerator",
-            "com\\.vaadin\\.v7\\.data\\.util\\.sqlcontainer\\.FreeformQueryUtil",
-    };
+            "com\\.vaadin\\.v7\\.data\\.util\\.sqlcontainer\\.FreeformQueryUtil", };
 
     /**
      * Tests that all the relevant classes and interfaces under
diff --git a/server/src/test/java/com/vaadin/ui/AbstractListingTest.java b/server/src/test/java/com/vaadin/ui/AbstractListingTest.java
index 77cd7779c3..61b99b2c4a 100644
--- a/server/src/test/java/com/vaadin/ui/AbstractListingTest.java
+++ b/server/src/test/java/com/vaadin/ui/AbstractListingTest.java
@@ -30,7 +30,7 @@ public class AbstractListingTest {
 
         /**
          * Used to execute data generation
-         * 
+         *
          * @param initial
          *            {@code true} to mock initial data request; {@code false}
          *            for follow-up request.