From de1077c375cfac68dad8f1c53eddb573009ec39e Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 13 Aug 2020 22:04:56 +1000
Subject: [PATCH] Fix WebSocketServerExamplesTest to work with surefire update

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-websocket/websocket-javax-server/pom.xml              | 2 +-
 .../tests}/server/examples/GetHttpSessionConfigurator.java  | 2 +-
 .../javax/tests}/server/examples/GetHttpSessionSocket.java  | 2 +-
 .../javax/tests}/server/examples/MyAuthedConfigurator.java  | 2 +-
 .../javax/tests}/server/examples/MyAuthedSocket.java        | 2 +-
 .../javax/tests}/server/examples/StreamingEchoSocket.java   | 2 +-
 .../tests}/server/examples/WebSocketServerExamplesTest.java | 2 +-
 .../src/test/resources/jetty-websocket-httpclient.xml       | 0
 .../java/org/eclipse/jetty/websocket/util/InvokerUtils.java | 6 ++++++
 pom.xml                                                     | 2 +-
 10 files changed, 14 insertions(+), 8 deletions(-)
 rename jetty-websocket/{websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax => websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/server/examples/GetHttpSessionConfigurator.java (95%)
 rename jetty-websocket/{websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax => websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/server/examples/GetHttpSessionSocket.java (96%)
 rename jetty-websocket/{websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax => websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/server/examples/MyAuthedConfigurator.java (96%)
 rename jetty-websocket/{websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax => websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/server/examples/MyAuthedSocket.java (94%)
 rename jetty-websocket/{websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax => websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/server/examples/StreamingEchoSocket.java (95%)
 rename jetty-websocket/{websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax => websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests}/server/examples/WebSocketServerExamplesTest.java (99%)
 rename jetty-websocket/{websocket-javax-server => websocket-javax-tests}/src/test/resources/jetty-websocket-httpclient.xml (100%)

diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml
index e543c2dc12c0..a0251b8779c7 100644
--- a/jetty-websocket/websocket-javax-server/pom.xml
+++ b/jetty-websocket/websocket-javax-server/pom.xml
@@ -51,7 +51,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
-            @{argLine} ${jetty.surefire.argLine} --add-exports org.eclipse.jetty.websocket.javax.server/org.eclipse.jetty.websocket.javax.server.examples=org.eclipse.jetty.websocket.javax.common --add-reads org.eclipse.jetty.websocket.javax.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.javax.common=org.eclipse.jetty.websocket.javax.server
+            @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.javax.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.javax.common=org.eclipse.jetty.websocket.javax.server
           </argLine>
         </configuration>
       </plugin>
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/GetHttpSessionConfigurator.java
similarity index 95%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java
rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/GetHttpSessionConfigurator.java
index 808905039837..2f732934afef 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/GetHttpSessionConfigurator.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.javax.server.examples;
+package org.eclipse.jetty.websocket.javax.tests.server.examples;
 
 import javax.servlet.http.HttpSession;
 import javax.websocket.HandshakeResponse;
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/GetHttpSessionSocket.java
similarity index 96%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java
rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/GetHttpSessionSocket.java
index 15daea9f5cdf..56327b631742 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/GetHttpSessionSocket.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.javax.server.examples;
+package org.eclipse.jetty.websocket.javax.tests.server.examples;
 
 import java.io.IOException;
 import javax.servlet.http.HttpSession;
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/MyAuthedConfigurator.java
similarity index 96%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java
rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/MyAuthedConfigurator.java
index d633f2f26be2..47b9f7e3d393 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/MyAuthedConfigurator.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.javax.server.examples;
+package org.eclipse.jetty.websocket.javax.tests.server.examples;
 
 import java.security.Principal;
 import javax.websocket.HandshakeResponse;
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/MyAuthedSocket.java
similarity index 94%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java
rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/MyAuthedSocket.java
index a2b6396d19ee..cf3b8f10266d 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/MyAuthedSocket.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.javax.server.examples;
+package org.eclipse.jetty.websocket.javax.tests.server.examples;
 
 import javax.websocket.OnMessage;
 import javax.websocket.server.ServerEndpoint;
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/StreamingEchoSocket.java
similarity index 95%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java
rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/StreamingEchoSocket.java
index d5d86e451ec2..4631a2a74cc4 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/StreamingEchoSocket.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.javax.server.examples;
+package org.eclipse.jetty.websocket.javax.tests.server.examples;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/WebSocketServerExamplesTest.java
similarity index 99%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java
rename to jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/WebSocketServerExamplesTest.java
index 22c96ca9772e..0bdb21ba5e4d 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/examples/WebSocketServerExamplesTest.java
@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.javax.server.examples;
+package org.eclipse.jetty.websocket.javax.tests.server.examples;
 
 import java.net.URI;
 import java.util.concurrent.ArrayBlockingQueue;
diff --git a/jetty-websocket/websocket-javax-server/src/test/resources/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/jetty-websocket-httpclient.xml
similarity index 100%
rename from jetty-websocket/websocket-javax-server/src/test/resources/jetty-websocket-httpclient.xml
rename to jetty-websocket/websocket-javax-tests/src/test/resources/jetty-websocket-httpclient.xml
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java b/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java
index c09827cc608a..8a3bc181b801 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java
+++ b/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java
@@ -26,6 +26,9 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class InvokerUtils
 {
     public static class Arg
@@ -135,6 +138,7 @@ public Arg getParamArg(Method method, Class<?> paramType, int idx)
     }
 
     public static final ParamIdentifier PARAM_IDENTITY = new ParamIdentity();
+    private static final Logger LOG = LoggerFactory.getLogger(InvokerUtils.class);
 
     /**
      * Bind optional arguments to provided method handle
@@ -425,6 +429,8 @@ private static MethodHandle mutatedInvoker(MethodHandles.Lookup lookup, Class<?>
         {
             if (!throwOnFailure)
             {
+                if (LOG.isDebugEnabled())
+                    LOG.debug("Unable to obtain MethodHandle for " + method, e);
                 return null;
             }
 
diff --git a/pom.xml b/pom.xml
index 57a5c04740fa..619a2f271fab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
     <jetty.surefire.argLine>-Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx2g -Xms2g -Xlog:gc:stderr:time,level,tags</jetty.surefire.argLine>
 
     <!-- some maven plugins versions -->
-    <maven.surefire.version>3.0.0-M4</maven.surefire.version>
+    <maven.surefire.version>3.0.0-M5</maven.surefire.version>
     <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
     <maven.dependency.plugin.version>3.1.1</maven.dependency.plugin.version>
     <maven.resources.plugin.version>3.1.0</maven.resources.plugin.version>