Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix WebSocketServerExamplesTest to work after maven surefire update #5154

Merged
merged 1 commit into from
Aug 16, 2020
Merged

Fix WebSocketServerExamplesTest to work after maven surefire update #5154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jetty-websocket/websocket-javax-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion .../examples/GetHttpSessionConfigurator.java → .../examples/GetHttpSessionConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...server/examples/GetHttpSessionSocket.java → ...server/examples/GetHttpSessionSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...server/examples/MyAuthedConfigurator.java → ...server/examples/MyAuthedConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...javax/server/examples/MyAuthedSocket.java → ...tests/server/examples/MyAuthedSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../server/examples/StreamingEchoSocket.java → .../server/examples/StreamingEchoSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...examples/WebSocketServerExamplesTest.java → ...examples/WebSocketServerExamplesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 .../resources/jetty-websocket-httpclient.xml → .../resources/jetty-websocket-httpclient.xml
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions ...websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down