-
Notifications
You must be signed in to change notification settings - Fork 974
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1582 from fl4via/2.2.x_backport-fixes
[UNDERTOW-2347] [UNDERTOW-1926] [UNDERTOW-2351] Backport fixes to 2.2.x branch
- Loading branch information
Showing
6 changed files
with
206 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
...src/test/java/io/undertow/websockets/jsr/test/annotated/BadAnnotatedEndpointTestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * JBoss, Home of Professional Open Source. | ||
| * Copyright 2024 Red Hat, Inc., and individual contributors | ||
| * as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.undertow.websockets.jsr.test.annotated; | ||
|
|
||
| import io.undertow.servlet.api.DeploymentInfo; | ||
| import io.undertow.servlet.api.DeploymentManager; | ||
| import io.undertow.servlet.api.ServletContainer; | ||
| import io.undertow.servlet.test.util.TestClassIntrospector; | ||
| import io.undertow.servlet.test.util.TestResourceLoader; | ||
| import io.undertow.testutils.DefaultServer; | ||
| import io.undertow.testutils.HttpOneOnly; | ||
| import io.undertow.websockets.jsr.ServerWebSocketContainer; | ||
| import io.undertow.websockets.jsr.WebSocketDeploymentInfo; | ||
| import org.junit.AfterClass; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.ExpectedException; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| import javax.servlet.ServletException; | ||
| import javax.websocket.DeploymentException; | ||
| import javax.websocket.server.ServerEndpointConfig; | ||
|
|
||
| import static org.hamcrest.core.IsInstanceOf.instanceOf; | ||
| /** | ||
| * @author baranowb | ||
| */ | ||
| @RunWith(DefaultServer.class) | ||
| @HttpOneOnly | ||
| public class BadAnnotatedEndpointTestCase { | ||
|
|
||
| private static ServerWebSocketContainer deployment; | ||
| private static DeploymentManager deploymentManager; | ||
|
|
||
| @BeforeClass | ||
| public static void setup() throws Exception { | ||
|
|
||
| final ServletContainer container = ServletContainer.Factory.newInstance(); | ||
|
|
||
| DeploymentInfo builder = new DeploymentInfo() | ||
| .setClassLoader(BadAnnotatedEndpointTestCase.class.getClassLoader()).setContextPath("/ws") | ||
| .setResourceManager(new TestResourceLoader(BadAnnotatedEndpointTestCase.class)) | ||
| .setClassIntrospecter(TestClassIntrospector.INSTANCE) | ||
| .addServletContextAttribute(WebSocketDeploymentInfo.ATTRIBUTE_NAME, | ||
| new WebSocketDeploymentInfo() | ||
| .setBuffers(DefaultServer.getBufferPool()) | ||
| .setWorker(DefaultServer.getWorkerSupplier()) | ||
| .addEndpoint(BadOnMessageEndpoint.class) | ||
| .addListener(readyContainer -> deployment = readyContainer) | ||
| .addEndpoint(ServerEndpointConfig.Builder.create( | ||
| AnnotatedAddedProgrammaticallyEndpoint.class, | ||
| AnnotatedAddedProgrammaticallyEndpoint.PATH) | ||
| .build()) | ||
| ) | ||
| .setDeploymentName("servletContext.war"); | ||
|
|
||
|
|
||
| deploymentManager = container.addDeployment(builder); | ||
|
|
||
| } | ||
|
|
||
| @AfterClass | ||
| public static void after() throws ServletException { | ||
| if (deployment != null) { | ||
| deployment.close(); | ||
| deployment = null; | ||
| } | ||
| if (deploymentManager != null) { | ||
| deploymentManager.stop(); | ||
| deploymentManager.undeploy(); | ||
| } | ||
| } | ||
|
|
||
| @Rule | ||
| public final ExpectedException thrown = ExpectedException.none(); | ||
|
|
||
| @Test | ||
| public void testStringOnMessage() throws Exception { | ||
| thrown.expect(RuntimeException.class); | ||
| thrown.expectMessage("javax.websocket.DeploymentException: UT003012: Method public int io.undertow.websockets.jsr.test.annotated.BadOnMessageEndpoint.handleMessage(int,javax.websocket.EndpointConfig) has invalid parameters at locations [1]"); | ||
| thrown.expectCause(instanceOf(DeploymentException.class)); | ||
| deploymentManager.deploy(); | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
...ets-jsr/src/test/java/io/undertow/websockets/jsr/test/annotated/BadOnMessageEndpoint.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * JBoss, Home of Professional Open Source. | ||
| * Copyright 2024 Red Hat, Inc., and individual contributors | ||
| * as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.undertow.websockets.jsr.test.annotated; | ||
|
|
||
| import javax.websocket.EndpointConfig; | ||
| import javax.websocket.OnMessage; | ||
| import javax.websocket.OnOpen; | ||
| import javax.websocket.Session; | ||
| import javax.websocket.server.PathParam; | ||
| import javax.websocket.server.ServerEndpoint; | ||
|
|
||
| /** | ||
| * @author baranowb | ||
| */ | ||
| @ServerEndpoint("/increment/{increment}") | ||
| public class BadOnMessageEndpoint { | ||
|
|
||
| int increment; | ||
|
|
||
| @OnOpen | ||
| public void open(final Session session, final EndpointConfig config, @PathParam("increment") int increment) { | ||
| this.increment = increment; | ||
| } | ||
|
|
||
| @OnMessage | ||
| public int handleMessage(final int message, EndpointConfig config) { | ||
| System.err.println("---> "+config); | ||
| return message + increment; | ||
| } | ||
|
|
||
| } |