Repository: camel Updated Branches: refs/heads/camel-2.19.x cb274125a -> 8e8a91454 refs/heads/master f33b55749 -> a02940559
CAMEL-11838: camel-websocket - Static resource returns empty body Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a0294055 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a0294055 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a0294055 Branch: refs/heads/master Commit: a02940559f756da7a1102d51f3cbadede14c7cf4 Parents: f33b557 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Sep 25 15:57:46 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Sep 25 15:57:46 2017 +0200 ---------------------------------------------------------------------- .../websocket/JettyClassPathResource.java | 4 +- .../websocket/WebsocketStaticTest.java | 120 +++++++++++++++++++ .../src/test/resources/hello.html | 5 + 3 files changed, 127 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a0294055/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java index 1b6fa2a..abbb332 100644 --- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java +++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java @@ -70,7 +70,7 @@ public class JettyClassPathResource extends Resource { @Override public long length() { - return 0; + return -1; } @Override @@ -113,7 +113,7 @@ public class JettyClassPathResource extends Resource { } @Override - public Resource addPath(String path) throws IOException, MalformedURLException { + public Resource addPath(String path) throws IOException { return new JettyClassPathResource(resolver, this.path + "/" + path); } http://git-wip-us.apache.org/repos/asf/camel/blob/a0294055/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java new file mode 100644 index 0000000..0bb7065 --- /dev/null +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java @@ -0,0 +1,120 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.camel.component.websocket; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.test.AvailablePortFinder; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.asynchttpclient.AsyncHttpClient; +import org.asynchttpclient.DefaultAsyncHttpClient; +import org.asynchttpclient.Response; +import org.asynchttpclient.ws.WebSocket; +import org.asynchttpclient.ws.WebSocketTextListener; +import org.asynchttpclient.ws.WebSocketUpgradeHandler; +import org.junit.Before; +import org.junit.Test; + +public class WebsocketStaticTest extends CamelTestSupport { + + private static List<String> received = new ArrayList<String>(); + private static CountDownLatch latch = new CountDownLatch(1); + protected int port; + + @Override + @Before + public void setUp() throws Exception { + port = AvailablePortFinder.getNextAvailable(16200); + super.setUp(); + } + + @Test + public void testStaticResource() throws Exception { + AsyncHttpClient c = new DefaultAsyncHttpClient(); + + WebSocket websocket = c.prepareGet("ws://127.0.0.1:" + port + "/echo").execute( + new WebSocketUpgradeHandler.Builder() + .addWebSocketListener(new WebSocketTextListener() { + @Override + public void onMessage(String message) { + received.add(message); + log.info("received --> " + message); + latch.countDown(); + } + + @Override + public void onOpen(WebSocket websocket) { + } + + @Override + public void onClose(WebSocket websocket) { + } + + @Override + public void onError(Throwable t) { + t.printStackTrace(); + } + }).build()).get(); + + websocket.sendMessage("Beer"); + assertTrue(latch.await(10, TimeUnit.SECONDS)); + + assertEquals(1, received.size()); + assertEquals("BeerBeer", received.get(0)); + + // now call static html + Response response = c.prepareGet("http://127.0.0.1:"; + port + "/hello.html").execute().get(5, TimeUnit.SECONDS); + assertNotNull(response); + assertEquals(200, response.getStatusCode()); + String body = response.getResponseBody(); + assertNotNull(body); + log.info(body); + assertTrue(body.contains("Hello World")); + c.close(); + + websocket.close(); + c.close(); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() { + WebsocketComponent websocketComponent = (WebsocketComponent) context.getComponent("websocket"); + websocketComponent.setPort(port); + websocketComponent.setMinThreads(1); + websocketComponent.setMaxThreads(20); + websocketComponent.setStaticResources("classpath:."); + + // START SNIPPET: e1 + // expose a echo websocket client, that sends back an echo + from("websocket://echo") + .log(">>> Message received from WebSocket Client : ${body}") + .transform().simple("${body}${body}") + // send back to the client, by sending the message to the same endpoint + // this is needed as by default messages is InOnly + // and we will by default send back to the current client using the provided connection key + .to("websocket://echo"); + // END SNIPPET: e1 + } + }; + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/a0294055/components/camel-websocket/src/test/resources/hello.html ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/resources/hello.html b/components/camel-websocket/src/test/resources/hello.html new file mode 100644 index 0000000..695c7a7 --- /dev/null +++ b/components/camel-websocket/src/test/resources/hello.html @@ -0,0 +1,5 @@ +<html> +<body> +Hello World +</body> +</html> \ No newline at end of file
