Broaden files that checkstyle sees, fix errors it found (#10251)

Author: niloc132

dev/build.xml

@@ -283,20 +283,18 @@
         <filename name="com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java"
                   negate="yes"/>
         <filename name="com/google/gwt/dev/js/rhino/**/*.java" negate="yes"/>
-        <filename name="org/eclipse/**/*.java" negate="yes"/>
-        <filename name="org/apache/**/*.java" negate="yes"/>
       </fileset>
       <fileset dir="core/super"/>
+      <fileset dir="codeserver/java"/>
     </gwt.checkstyle>
   </target>
 
   <target name="checkstyle-tests" description="Static analysis of tests">
     <gwt.checkstyle.tests>
       <fileset dir="core/test">
-        <filename name="com/google/gwt/dev/js/rhino/**/*.java" negate="yes"/>
-        <filename name="org/eclipse/**/*.java" negate="yes"/>
         <filename name="org/apache/**/*.java" negate="yes"/>
       </fileset>
+      <fileset dir="codeserver/javatests" />
     </gwt.checkstyle.tests>
   </target>
 

dev/codeserver/java/com/google/gwt/dev/codeserver/WebServer.java

@@ -37,15 +37,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.DispatcherType;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

dev/codeserver/javatests/com/google/gwt/dev/codeserver/client/CodeServerGwtTest.java

@@ -150,7 +150,7 @@ public native void testRecompiler() /*-{
     // do the test
     recompiler.compile(function(result) {
       callbackCalled = true;
-      //compile is done
+      // compile is done
       assertStringEquals('ok', result.status);
       assertStringEquals('http://mytesthost:7812/recompile/testModule' +
           '?prop1=val1&prop2=val2&_callback=__gwt_sdm_globals.callbacks.c1234',
@@ -200,7 +200,7 @@ public native void testMetaTagParser() /*-{
     assertStringEquals('test2', props.test1);
   }-*/;
 
-  public native void testBaseUrlProvider_nocache () /*-{
+  public native void testBaseUrlProvider_nocache() /*-{
     var assertStringEquals = @CodeServerGwtTest::assertEquals(Ljava/lang/String;Ljava/lang/String;);
     var BaseUrlProvider = $wnd.namespace.lib.BaseUrlProvider;
     var baseUrlProvider = new BaseUrlProvider('testModule');
@@ -228,7 +228,7 @@ public native void testBaseUrlProvider_nocache () /*-{
   }-*/;
 
   // Issue #8973
-  public native void testBaseUrlProvider_nocache_relative_with_querystring () /*-{
+  public native void testBaseUrlProvider_nocache_relative_with_querystring() /*-{
     var assertStringEquals = @CodeServerGwtTest::assertEquals(Ljava/lang/String;Ljava/lang/String;);
     var BaseUrlProvider = $wnd.namespace.lib.BaseUrlProvider;
     var baseUrlProvider = new BaseUrlProvider('testModule');
@@ -293,7 +293,6 @@ public native void testBaseUrlProvider_basetag() /*-{
       return null;
     };
 
-
     baseUrlProvider.__getBaseElements = function() {
       return [
         {href: 'http://localhost:9876/somepath1/'},
@@ -312,7 +311,7 @@ public native void testBaseUrlProvider_basetag() /*-{
   }-*/;
 
   private void ensureJsInjected() {
-    if(injected) {
+    if (injected) {
       return;
     }
     Resource res = GWT.create(Resource.class);

tools/datetimefmtcreator/src/com/google/gwt/tools/datetimefmtcreator/DateTimeFormatCreator.java

@@ -232,7 +232,6 @@ private void generateAlias(GwtLocale locale, GwtLocale parent) throws IOExceptio
           out.close();
         }
       }
-
     }
 
     private void generateLocale(GwtLocale locale, GwtLocale parent, Map<String, String[]> values)

user/build.xml

@@ -313,23 +313,24 @@
   <target name="checkstyle-source" description="Static analysis of source">
     <gwt.checkstyle>
       <fileset dir="src">
+        <exclude name="org/hibernate/validator/ValidationMessages.java"/>
+      </fileset>
+      <fileset dir="super">
         <exclude name="javax/validation/super/javax/validation/constraints/Pattern.java"/>
         <exclude name="javax/validation/super/javax/validation/spi/ConfigurationState.java"/>
         <exclude name="javax/validation/super/javax/validation/MessageInterpolator.java"/>
         <exclude name="javax/validation/super/javax/validation/Configuration.java"/>
-        <exclude name="javax/validation/super/javax/validation/Validation.java"/>
-        <exclude name="org/hibernate/validator/super/org/hibernate/validator/**/*.java"/>
-        <exclude name="org/hibernate/validator/ValidationMessages.java"/>
+        <exclude name="org/hibernate/validator/super/org/hibernate/validator/engine/PathImpl.java"/>
       </fileset>
-      <fileset dir="super/com/google/gwt/emul"/>
-      <fileset dir="super/com/google/gwt/junit/translatable"/>
     </gwt.checkstyle>
   </target>
   <target name="checkstyle-tests" description="Static analysis of source">
     <gwt.checkstyle.tests>
       <fileset dir="test">
-        <include name="com/google/**/*.java"/>
-        <include name="test/**"/>
+        <exclude name="org/**" />
+      </fileset>
+      <fileset dir="test-super">
+        <exclude name="org/**" />
       </fileset>
     </gwt.checkstyle.tests>
   </target>

user/super/com/google/gwt/emul/java/lang/Math.java

@@ -154,7 +154,7 @@ public static int floorMod(long dividend, int divisor) {
     return (int) floorMod(dividend, (long) divisor);
   }
 
-  @SuppressWarnings("CheckStyle.MethodName")
+  @SuppressWarnings("checkstyle:MethodName")
   public static double IEEEremainder(double v, double m) {
     double ratio = v / m;
     double closest = Math.ceil(ratio);

user/super/com/google/gwt/emul/java/lang/StrictMath.java

@@ -285,7 +285,7 @@ public static double cbrt(double x) {
     return Math.cbrt(x);
   }
 
-  @SuppressWarnings("CheckStyle.MethodName")
+  @SuppressWarnings("checkstyle:MethodName")
   public static double IEEEremainder(double x, double y) {
     return Math.IEEEremainder(x, y);
   }

user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java17Test.java

@@ -20,8 +20,9 @@
 
 import java.util.Arrays;
 import java.util.List;
-
-import jsinterop.annotations.*;
+import jsinterop.annotations.JsMethod;
+import jsinterop.annotations.JsProperty;
+import jsinterop.annotations.JsType;
 
 /**
  * Tests Java 17 features. It is super sourced so that gwt can be compiles under Java 11.
@@ -45,11 +46,10 @@ public interface TextBlock {
   public sealed class Shape permits Square, Circle {
     public static int count = 0;
 
-    public static Shape returnAndIncrement(Shape shape){
+    public static Shape returnAndIncrement(Shape shape) {
       count++;
       return shape;
     }
-
   }
 
   public final class Square extends Shape {
@@ -174,7 +174,7 @@ public String toString() {
     assertEquals("bar", RecordWithStaticField.foo);
     // Under the current implementation this next line would fail - this is not inconsistent with the spec,
     // but it is different than what the JVM does.
-//    assertEquals(0, new TopLevelRecord("", 0).hashCode());
+    // assertEquals(0, new TopLevelRecord("", 0).hashCode());
     assertFalse(0 == new TopLevelRecord("", 7).hashCode());
     assertFalse(0 == new TopLevelRecord("Pear", 0).hashCode());
 
@@ -188,7 +188,7 @@ public String toString() {
     // check that an instance is equal to itself
     assertEquals(sameA, sameA);
     assertEquals(sameA.hashCode(), sameA.hashCode());
-    //check that an instance is equal to a different record instance with same values
+    // check that an instance is equal to a different record instance with same values
     assertEquals(sameA, sameB);
     assertEquals(sameA.hashCode(), sameB.hashCode());
 

user/test-super/com/google/gwt/emultest/super/com/google/gwt/emultest/java17/lang/MathTest.java

@@ -28,8 +28,8 @@ public void testAbsExact() {
     assertEquals(1, Math.absExact(hideFromCompiler(-1)));
     assertThrowsArithmetic(() -> Math.absExact(hideFromCompiler(Integer.MIN_VALUE)));
     assertEquals(Long.MAX_VALUE, Math.absExact(hideFromCompiler(Long.MAX_VALUE)));
-    assertEquals(0, Math.absExact(hideFromCompiler(0l)));
-    assertEquals(1, Math.absExact(hideFromCompiler(-1l)));
+    assertEquals(0, Math.absExact(hideFromCompiler(0L)));
+    assertEquals(1, Math.absExact(hideFromCompiler(-1L)));
     assertThrowsArithmetic(() -> Math.absExact(hideFromCompiler(Long.MIN_VALUE)));
   }
 

user/test-super/com/google/gwt/emultest/super/com/google/gwt/emultest/java17/util/stream/DoubleStreamTest.java

@@ -34,6 +34,6 @@ public void testMapMulti() {
     assertEquals(new double[]{1.0, 2.0, 3.0, 6.0},
         DoubleStream.of(1.0, 3.0).mapMulti(doubling).toArray());
     assertEquals(new double[0],
-        DoubleStream.of(1.0, 2.0).mapMulti((a, b) -> {}).toArray());
+        DoubleStream.of(1.0, 2.0).mapMulti((a, b) -> { }).toArray());
   }
 }