Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…

…5605-wakeup-blocked-threads
jetty · Feb 16, 2021 · ace019a · ace019a
2 parents f70a766 + 19c32d6
commit ace019a
Show file tree

Hide file tree

Showing 150 changed files with 3,111 additions and 2,557 deletions.
diff --git a/build-resources/src/main/resources/jetty-checkstyle.xml b/build-resources/src/main/resources/jetty-checkstyle.xml
@@ -98,7 +98,7 @@
 
     <!-- Member Name Format -->
     <module name="MemberName">
-      <property name="format" value="^[_a-z][a-zA-Z0-9]*$"/>
+      <property name="format" value="^[_a-z][a-zA-Z0-9]*$" />
     </module>
 
     <!-- require braces is disabled - we don't enforce that in Jetty
@@ -107,10 +107,15 @@
     </module>
      -->
 
+    <!-- Enforced Whitespace After specific tokens -->
+    <module name="WhitespaceAfter">
+      <property name="tokens" value="COMMA, SEMI, LITERAL_IF, LITERAL_ELSE, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, DO_WHILE" />
+    </module>
+
     <!-- No Whitespace After specific tokens -->
     <module name="NoWhitespaceAfter">
-      <property name="tokens" value="ARRAY_INIT, AT, INC, DEC, UNARY_MINUS, UNARY_PLUS, BNOT, LNOT, DOT, ARRAY_DECLARATOR, INDEX_OP, TYPECAST"/>
-      <property name="allowLineBreaks" value="true"/>
+      <property name="tokens" value="ARRAY_INIT, AT, INC, DEC, UNARY_MINUS, UNARY_PLUS, BNOT, LNOT, DOT, ARRAY_DECLARATOR, INDEX_OP, TYPECAST" />
+      <property name="allowLineBreaks" value="true" />
     </module>
 
     <!-- No Whitespace Before specific tokens -->

diff --git a/demos/demo-jetty-webapp/src/main/config/webapps/test.d/override-web.xml b/demos/demo-jetty-webapp/src/main/config/webapps/test.d/override-web.xml
diff --git a/demos/demo-jetty-webapp/src/main/config/webapps/test.xml b/demos/demo-jetty-webapp/src/main/config/webapps/test.xml
diff --git a/demos/demo-jetty-webapp/src/test/java/org/eclipse/jetty/DispatchServletTest.java b/demos/demo-jetty-webapp/src/test/java/org/eclipse/jetty/DispatchServletTest.java
@@ -113,7 +113,7 @@ public void testSelfRefDeep() throws Exception
         context.addServlet(DefaultServlet.class, "/");
 
         String[] selfRefs =
-            {"/dispatch/forward", "/dispatch/includeS", "/dispatch/includeW", "/dispatch/includeN",};
+            {"/dispatch/forward", "/dispatch/includeS", "/dispatch/includeW", "/dispatch/includeN"};
 
         /*
          * Number of nested dispatch requests. 220 is a good value, as it won't