Merge branch jetty-9.4.x into jetty-10.0.x

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> # Conflicts: # Jenkinsfile # examples/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java # jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java # jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java # jetty-http/src/test/java/org/eclipse/jetty/http/HttpTester.java # jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartParserTest.java # jetty-http/src/test/java/org/eclipse/jetty/http/PathMapTest.java # jetty-http/src/test/java/org/eclipse/jetty/http/matchers/HttpFieldsMatchersTest.java # jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/it/TestGetContent.java # jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterLenientTest.java # jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterTest.java # jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java # jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletLifeCycleTest.java # jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java # jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultNoRecompressTest.java # jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java # jetty-unixsocket/src/test/java/org/eclipse/jetty/unixsocket/UnixSocketClient.java # jetty-util/src/test/java/org/eclipse/jetty/util/B64CodeTest.java # jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java # jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java # jetty-webapp/src/test/java/org/eclipse/jetty/webapp/ClasspathPatternTest.java # jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/LargeMessageTest.java # jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerGoodSignaturesTest.java # jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerInvalidSignaturesTest.java # jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadataSetTest.java # jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/utils/ReflectUtilsTest.java # jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java # jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java # jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/RestartContextTest.java # jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerGoodSignaturesTest.java # jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerInvalidSignaturesTest.java # jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/SessionTest.java # jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java # jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java # jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java # jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java # jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java # jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfigTest.java # jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilQuoteTest.java # jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilTest.java # jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ConnectionManagerTest.java # jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TomcatServerQuirksTest.java # jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientInitTest.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/GeneratorTest.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ParserTest.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/TextPayloadParserTest.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase11.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase12.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase2.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase4.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase73.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventDriverTest.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedScannerTest.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ConnectionStateTest.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/http/HttpResponseHeaderParserTest.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageDebug.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/Utf8CharBufferTest.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/UnitGenerator.java # jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/util/Utf8PartialBuilderTest.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/RedirectWebSocketClientTest.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/SimpleServletServer.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6BadUTF.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6GoodUTF.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7BadStatusCodes.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7GoodStatusCodes.java # jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase9.java # pom.xml # tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationsTest.java # tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java # tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java # tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java
Anda77 · Jan 15, 2020 · 01a5974 · 01a5974
2 parents 81d32f6 + 33a5a25
commit 01a5974
Show file tree

Hide file tree

Showing 207 changed files with 1,532 additions and 1,539 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
           agent { node { label 'linux' } }
           options { timeout(time: 120, unit: 'MINUTES') }
           steps {
-            mavenBuild("jdk11", "-Pmongodb clean install", "maven3", true) // -Pautobahn
+            mavenBuild("jdk11", "-T3 -Pmongodb clean install", "maven3", true) // -Pautobahn
             // Collect up the jacoco execution results (only on main build)
             jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
               exclusionPattern: '' +
@@ -44,7 +44,7 @@ pipeline {
           agent { node { label 'linux' } }
           steps {
             timeout(time: 120, unit: 'MINUTES') {
-              mavenBuild("jdk13", "-Pmongodb clean install", "maven3", true)
+              mavenBuild("jdk13", "-T3 -Pmongodb clean install", "maven3", true)
               warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
               junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml'
             }
@@ -55,7 +55,7 @@ pipeline {
           agent { node { label 'linux' } }
           steps {
             timeout(time: 30, unit: 'MINUTES') {
-              mavenBuild("jdk11", "install javadoc:javadoc -DskipTests", "maven3", true)
+              mavenBuild("jdk11", "install javadoc:javadoc javadoc:aggregate-jar -DskipTests -Dpmd.skip=true -Dcheckstyle.skip=true", "maven3", true)
               warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'JavaDoc'], [parserName: 'Java']]
             }
           }
@@ -116,7 +116,7 @@ def mavenBuild(jdk, cmdline, mvnName, junitPublishDisabled) {
     mavenOpts: mavenOpts,
     mavenLocalRepo: localRepo) {
     // Some common Maven command line + provided command line
-    sh "mvn -Pci -V -B -T3 -e -fae -Dmaven.test.failure.ignore=true -Djetty.testtracker.log=true $cmdline -Dunix.socket.tmp=" + env.JENKINS_HOME
+    sh "mvn -Pci -V -B -e -fae -Dmaven.test.failure.ignore=true -Djetty.testtracker.log=true $cmdline -Dunix.socket.tmp=" + env.JENKINS_HOME
   }
 }
 

diff --git a/build-resources/src/main/resources/jetty-checkstyle.xml b/build-resources/src/main/resources/jetty-checkstyle.xml
@@ -14,12 +14,6 @@
 
   <property name="fileExtensions" value="java"/>
 
-  <!-- reference to suppressions filter for both eclipse and intellij checkstyle plugins -->
-  <module name="SuppressionFilter">
-    <property name="file" value="${checkstyle.suppressions.file}"/>
-    <property name="optional" value="true"/>
-  </module>
-
   <!-- Excludes all 'module-info.java' files              -->
   <!-- See https://checkstyle.org/config_filefilters.html -->
   <module name="BeforeExecutionExclusionFileFilter">

diff --git a/build-resources/src/main/resources/jetty-suppressions.xml b/build-resources/src/main/resources/jetty-suppressions.xml
diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
@@ -220,7 +220,7 @@ public void testJep238MultiReleaseInJar() throws Exception
     }
 
     @Test
-    public void testJep238MultiReleaseInJar_JDK10() throws Exception
+    public void testJep238MultiReleaseInJarJDK10() throws Exception
     {
         File jdk10Jar = MavenTestingUtils.getTestResourceFile("jdk10/multirelease-10.jar");
         AnnotationParser parser = new AnnotationParser();

diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ClientConnectionCloseTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ClientConnectionCloseTest.java
@@ -48,7 +48,7 @@ public class ClientConnectionCloseTest extends AbstractHttpClientServerTest
 {
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_ClientConnectionClose_ServerConnectionClose_ClientClosesAfterExchange(Scenario scenario) throws Exception
+    public void testClientConnectionCloseServerConnectionCloseClientClosesAfterExchange(Scenario scenario) throws Exception
     {
         byte[] data = new byte[128 * 1024];
         start(scenario, new AbstractHandler()
@@ -106,7 +106,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_ClientConnectionClose_ServerDoesNotRespond_ClientIdleTimeout(Scenario scenario) throws Exception
+    public void testClientConnectionCloseServerDoesNotRespondClientIdleTimeout(Scenario scenario) throws Exception
     {
         start(scenario, new AbstractHandler()
         {
@@ -149,7 +149,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_ClientConnectionClose_ServerPartialResponse_ClientIdleTimeout(Scenario scenario) throws Exception
+    public void testClientConnectionCloseServerPartialResponseClientIdleTimeout(Scenario scenario) throws Exception
     {
         long idleTimeout = 1000;
         start(scenario, new AbstractHandler()
@@ -214,7 +214,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_ClientConnectionClose_ServerNoConnectionClose_ClientCloses(Scenario scenario) throws Exception
+    public void testClientConnectionCloseServerNoConnectionCloseClientCloses(Scenario scenario) throws Exception
     {
         start(scenario, new AbstractHandler()
         {

diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java
@@ -115,51 +115,51 @@ private void start(final Scenario scenario, Authenticator authenticator, Handler
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_BasicAuthentication(Scenario scenario) throws Exception
+    public void testBasicAuthentication(Scenario scenario) throws Exception
     {
         startBasic(scenario, new EmptyServerHandler());
         URI uri = URI.create(scenario.getScheme() + "://localhost:" + connector.getLocalPort());
-        test_Authentication(scenario, new BasicAuthentication(uri, realm, "basic", "basic"));
+        testAuthentication(scenario, new BasicAuthentication(uri, realm, "basic", "basic"));
     }
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_BasicEmptyRealm(Scenario scenario) throws Exception
+    public void testBasicEmptyRealm(Scenario scenario) throws Exception
     {
         realm = "";
         startBasic(scenario, new EmptyServerHandler());
         URI uri = URI.create(scenario.getScheme() + "://localhost:" + connector.getLocalPort());
-        test_Authentication(scenario, new BasicAuthentication(uri, realm, "basic", "basic"));
+        testAuthentication(scenario, new BasicAuthentication(uri, realm, "basic", "basic"));
     }
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_BasicAnyRealm(Scenario scenario) throws Exception
+    public void testBasicAnyRealm(Scenario scenario) throws Exception
     {
         startBasic(scenario, new EmptyServerHandler());
         URI uri = URI.create(scenario.getScheme() + "://localhost:" + connector.getLocalPort());
-        test_Authentication(scenario, new BasicAuthentication(uri, ANY_REALM, "basic", "basic"));
+        testAuthentication(scenario, new BasicAuthentication(uri, ANY_REALM, "basic", "basic"));
     }
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_DigestAuthentication(Scenario scenario) throws Exception
+    public void testDigestAuthentication(Scenario scenario) throws Exception
     {
         startDigest(scenario, new EmptyServerHandler());
         URI uri = URI.create(scenario.getScheme() + "://localhost:" + connector.getLocalPort());
-        test_Authentication(scenario, new DigestAuthentication(uri, realm, "digest", "digest"));
+        testAuthentication(scenario, new DigestAuthentication(uri, realm, "digest", "digest"));
     }
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_DigestAnyRealm(Scenario scenario) throws Exception
+    public void testDigestAnyRealm(Scenario scenario) throws Exception
     {
         startDigest(scenario, new EmptyServerHandler());
         URI uri = URI.create(scenario.getScheme() + "://localhost:" + connector.getLocalPort());
-        test_Authentication(scenario, new DigestAuthentication(uri, ANY_REALM, "digest", "digest"));
+        testAuthentication(scenario, new DigestAuthentication(uri, ANY_REALM, "digest", "digest"));
     }
 
-    private void test_Authentication(final Scenario scenario, Authentication authentication) throws Exception
+    private void testAuthentication(final Scenario scenario, Authentication authentication) throws Exception
     {
         AuthenticationStore authenticationStore = client.getAuthenticationStore();
 
@@ -226,7 +226,7 @@ public void onSuccess(Request request)
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_BasicAuthentication_ThenRedirect(Scenario scenario) throws Exception
+    public void testBasicAuthenticationThenRedirect(Scenario scenario) throws Exception
     {
         startBasic(scenario, new EmptyServerHandler()
         {
@@ -271,7 +271,7 @@ public void onSuccess(Request request)
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_Redirect_ThenBasicAuthentication(Scenario scenario) throws Exception
+    public void testRedirectThenBasicAuthentication(Scenario scenario) throws Exception
     {
         startBasic(scenario, new EmptyServerHandler()
         {
@@ -310,7 +310,7 @@ public void onSuccess(Request request)
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_BasicAuthentication_WithAuthenticationRemoved(Scenario scenario) throws Exception
+    public void testBasicAuthenticationWithAuthenticationRemoved(Scenario scenario) throws Exception
     {
         startBasic(scenario, new EmptyServerHandler());
 
@@ -359,7 +359,7 @@ public void onSuccess(Request request)
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_BasicAuthentication_WithWrongPassword(Scenario scenario) throws Exception
+    public void testBasicAuthenticationWithWrongPassword(Scenario scenario) throws Exception
     {
         startBasic(scenario, new EmptyServerHandler());
 
@@ -379,7 +379,7 @@ public void test_BasicAuthentication_WithWrongPassword(Scenario scenario) throws
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_Authentication_ThrowsException(Scenario scenario) throws Exception
+    public void testAuthenticationThrowsException(Scenario scenario) throws Exception
     {
         startBasic(scenario, new EmptyServerHandler());
 
@@ -419,7 +419,7 @@ public Result authenticate(Request request, ContentResponse response, HeaderInfo
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_PreemptedAuthentication(Scenario scenario) throws Exception
+    public void testPreemptedAuthentication(Scenario scenario) throws Exception
     {
         startBasic(scenario, new EmptyServerHandler());
 
@@ -449,7 +449,7 @@ public void onSuccess(Request request)
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_NonReproducibleContent(Scenario scenario) throws Exception
+    public void testNonReproducibleContent(Scenario scenario) throws Exception
     {
         startBasic(scenario, new EmptyServerHandler());
 
@@ -484,7 +484,7 @@ public boolean isReproducible()
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_RequestFailsAfterResponse(Scenario scenario) throws Exception
+    public void testRequestFailsAfterResponse(Scenario scenario) throws Exception
     {
         startBasic(scenario, new EmptyServerHandler()
         {
@@ -576,7 +576,7 @@ public void onComplete(Result result)
 
     @ParameterizedTest
     @ArgumentsSource(ScenarioProvider.class)
-    public void test_InfiniteAuthentication(Scenario scenario) throws Exception
+    public void testInfiniteAuthentication(Scenario scenario) throws Exception
     {
         String authType = "Authenticate";
         start(scenario, new EmptyServerHandler()

diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientChunkedContentTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientChunkedContentTest.java
@@ -63,7 +63,7 @@ public void dispose() throws Exception
     }
 
     @Test
-    public void test_Server_HeadersPauseTerminal_Client_Response() throws Exception
+    public void testServerHeadersPauseTerminalClientResponse() throws Exception
     {
         startClient();
 
@@ -115,7 +115,7 @@ public void onComplete(Result result)
     }
 
     @Test
-    public void test_Server_ContentTerminal_Client_ContentDelay() throws Exception
+    public void testServerContentTerminalClientContentDelay() throws Exception
     {
         startClient();