Repository: camel Updated Branches: refs/heads/master 71fe095de -> 16cc9ea30
CAMEL-7290 Added a sendServerVersion option to camel-jetty component Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/16cc9ea3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/16cc9ea3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/16cc9ea3 Branch: refs/heads/master Commit: 16cc9ea3054d01bda1e0a75bd8570fe8b64f0d8c Parents: 71fe095 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Thu Mar 13 10:24:15 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu Mar 13 10:24:30 2014 +0800 ---------------------------------------------------------------------- .../component/jetty/JettyHttpComponent.java | 2 ++ .../component/jetty/JettyHttpEndpoint.java | 9 ++++++ .../camel/component/jetty/HttpHeaderTest.java | 29 ++++++++++++++++++-- 3 files changed, 38 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/16cc9ea3/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java index 808f554..670a4a5 100644 --- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java +++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java @@ -296,6 +296,8 @@ public class JettyHttpComponent extends HttpComponent { if (endpoint.isEnableJmx()) { enableJmx(server); } + // just set if we need sendServerVersion, the default value is true + server.setSendServerVersion(endpoint.isSendServerVersion()); server.addConnector(connector); connectorRef = new ConnectorRef(server, connector, createServletForConnector(server, connector, endpoint.getHandlers(), endpoint)); http://git-wip-us.apache.org/repos/asf/camel/blob/16cc9ea3/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java index 0116e7a..089e159 100644 --- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java +++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java @@ -48,6 +48,7 @@ public class JettyHttpEndpoint extends HttpEndpoint { private JettyHttpBinding jettyBinding; private boolean enableJmx; private boolean enableMultipartFilter; + private boolean sendServerVersion = true; private Filter multipartFilter; private List<Filter> filters; private Long continuationTimeout; @@ -167,6 +168,14 @@ public class JettyHttpEndpoint extends HttpEndpoint { this.enableJmx = enableJmx; } + public boolean isSendServerVersion() { + return sendServerVersion; + } + + public void setSendServerVersion(boolean sendServerVersion) { + this.sendServerVersion = sendServerVersion; + } + public boolean isEnableMultipartFilter() { return enableMultipartFilter; } http://git-wip-us.apache.org/repos/asf/camel/blob/16cc9ea3/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderTest.java index 77d3e48..3bf6bb9 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderTest.java @@ -32,7 +32,28 @@ public class HttpHeaderTest extends BaseJettyTest { String result = template.requestBody("direct:start", "hello", String.class); assertEquals("Should send a right http header to the server.", "Find the key!", result); } - + + @Test + public void testServerHeader() throws Exception { + Exchange ex = template.request("http://localhost:{{port}}/server/mytest";, new Processor() { + @Override + public void process(Exchange exchange) throws Exception { + // Do nothing here + } + }); + + assertNotNull(ex.getOut().getHeader("Server")); + + ex = template.request("http://localhost:{{port2}}/server/mytest";, new Processor() { + @Override + public void process(Exchange exchange) throws Exception { + // Do nothing here + } + }); + + assertNull(ex.getOut().getHeader("Server")); + } + @Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { @@ -57,7 +78,11 @@ public class HttpHeaderTest extends BaseJettyTest { exchange.getOut().setBody("Cannot find the key!"); } }); - + + from("jetty:http://localhost:{{port}}/server/mytest";).transform(constant("Response!")); + + from("jetty:http://localhost:{{port2}}/server/mytest?sendServerVersion=false";).transform(constant("Response!")); + } }; }
