This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 089089397f2d18acdd448013b7ea0c3382cb441d
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jun 19 09:48:29 2020 +0200
[CAMEL-11807] Fix checkstyle
---
.../servlet/HttpClientRouteExampleSpringTest.java | 15 ++--
.../component/servlet/HttpClientRouteTest.java | 57 +++++++-------
.../servlet/MultiServletConsumerTest.java | 5 +-
.../camel/component/servlet/ServletAsyncTest.java | 8 +-
.../servlet/ServletCamelRouterTestSupport.java | 88 +++++++++++-----------
.../component/servlet/ServletChoiceBeanTest.java | 10 +--
.../servlet/ServletMuteExceptionTest.java | 15 ++--
.../servlet/ServletNoSlashNeededTest.java | 7 +-
.../component/servlet/ServletRootPathTest.java | 7 +-
.../component/servlet/ServletSetBodyTest.java | 7 +-
.../ServletSetExchangePropertyBeanTest.java | 7 +-
.../servlet/ServletSwitchingStatusCode204Test.java | 15 ++--
.../servlet/ServletTransferExceptionTest.java | 7 +-
.../servlet/rest/RestApiMatchUriServletTest.java | 7 +-
.../RestServletBindingModeAutoWithJsonTest.java | 7 +-
.../RestServletBindingModeAutoWithXmlTest.java | 8 +-
.../rest/RestServletBindingModeJsonTest.java | 15 ++--
...RestServletBindingModeJsonWithContractTest.java | 10 +--
.../RestServletBindingModeOffWithContractTest.java | 10 +--
.../rest/RestServletBindingModeXmlTest.java | 15 ++--
.../component/servlet/rest/RestServletGetTest.java | 7 +-
.../servlet/rest/RestServletGetWildcardsTest.java | 13 +---
.../rest/RestServletMethodNotAllowedTest.java | 7 +-
.../servlet/rest/RestServletOptionsTest.java | 17 ++---
.../servlet/rest/RestServletPojoInOutTest.java | 20 ++---
.../rest/RestServletPostJsonJaxbPojoTest.java | 8 +-
.../rest/RestServletPostJsonPojoListTest.java | 8 +-
.../servlet/rest/RestServletPostJsonPojoTest.java | 8 +-
.../rest/RestServletPostXmlJaxbPojoTest.java | 15 ++--
.../servlet/rest/RestServletVerbTest.java | 33 +++-----
30 files changed, 192 insertions(+), 264 deletions(-)
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteExampleSpringTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteExampleSpringTest.java
index d6a5dff..b1fa756 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteExampleSpringTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteExampleSpringTest.java
@@ -27,17 +27,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class HttpClientRouteExampleSpringTest extends
ServletCamelRouterTestSupport {
@Test
public void testHttpRestricMethod() throws Exception {
-
- ServletUnitClient client = newClient();
+
// Send a web get method request
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/hello");
- WebResponse response = client.getResponse(req);
-
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/hello");
+ WebResponse response = query(req);
+
assertEquals("OK", response.getResponseMessage(), "Get a wrong
response message.");
assertEquals("Add a name parameter to uri, eg ?name=foo",
response.getText(), "Get a wrong response text.");
-
- req = new GetMethodWebRequest(CONTEXT_URL +
"/services/hello?name=Willem");
- response = client.getResponse(req);
+
+ req = new GetMethodWebRequest(contextUrl +
"/services/hello?name=Willem");
+ response = query(req);
assertEquals("Hello Willem how are you?", response.getText(), "Get a
wrong response text.");
}
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
index 64d2507..878390a 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
@@ -39,70 +39,67 @@ public class HttpClientRouteTest extends
ServletCamelRouterTestSupport {
@Test
public void testHttpClient() throws Exception {
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/hello", new ByteArrayInputStream(POST_DATA.getBytes()),
CONTENT_TYPE);
- ServletUnitClient client = newClient();
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/hello",
+ new ByteArrayInputStream(POST_DATA.getBytes()), CONTENT_TYPE);
+ WebResponse response = query(req);
assertEquals("text/xml", response.getContentType(), "Get wrong content
type");
assertTrue("UTF-8".equalsIgnoreCase(response.getCharacterSet()));
assertEquals("/hello", response.getHeaderField("PATH"), "Get a wrong
message header");
assertEquals("OK", response.getResponseMessage(), "The response
message is wrong");
- req = new PostMethodWebRequest(CONTEXT_URL + "/services/helloworld",
new ByteArrayInputStream(POST_DATA.getBytes()), CONTENT_TYPE);
- response = client.getResponse(req);
+ req = new PostMethodWebRequest(contextUrl + "/services/helloworld",
+ new ByteArrayInputStream(POST_DATA.getBytes()), CONTENT_TYPE);
+ response = query(req);
assertEquals("text/xml", response.getContentType(), "Get wrong content
type");
assertTrue("UTF-8".equalsIgnoreCase(response.getCharacterSet()));
assertEquals("/helloworld", response.getHeaderField("PATH"), "Get a
wrong message header");
assertEquals("OK", response.getResponseMessage(), "The response
message is wrong");
- client.setExceptionsThrownOnErrorStatus(false);
}
-
+
@Test
public void testHttpRestricMethod() throws Exception {
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/testHttpMethodRestrict", new
ByteArrayInputStream(POST_DATA.getBytes()), "text/xml; charset=UTF-8");
- ServletUnitClient client = newClient();
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/testHttpMethodRestrict",
+ new ByteArrayInputStream(POST_DATA.getBytes()), "text/xml;
charset=UTF-8");
+ WebResponse response = query(req);
assertEquals("OK", response.getResponseMessage(), "The response
message is wrong");
assertEquals(POST_DATA, response.getText(), "The response body is
wrong");
-
+
// Send other web method request
- req = new GetMethodWebRequest(CONTEXT_URL +
"/services/testHttpMethodRestrict");
+ req = new GetMethodWebRequest(contextUrl +
"/services/testHttpMethodRestrict");
try {
- response = client.getResponse(req);
+ response = query(req);
fail("Expect the exception here");
} catch (Exception ex) {
- HttpException httpException = (HttpException)ex;
+ HttpException httpException = (HttpException) ex;
assertEquals(405, httpException.getResponseCode(), "Get a wrong
response code");
}
}
@Test
public void testHttpConverter() throws Exception {
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/testConverter", new ByteArrayInputStream(POST_DATA.getBytes()),
"text/xml; charset=UTF-8");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/testConverter",
+ new ByteArrayInputStream(POST_DATA.getBytes()), "text/xml;
charset=UTF-8");
+ WebResponse response = query(req, false);
assertEquals("OK", response.getResponseMessage(), "The response
message is wrong");
assertEquals("Bye World", response.getText(), "The response body is
wrong");
}
@Test
public void testHttpUnicodeResponseWithStringResponse() throws Exception {
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/testUnicodeWithStringResponse", new
ByteArrayInputStream(POST_DATA.getBytes()), "text/xml; charset=UTF-8");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/testUnicodeWithStringResponse",
+ new ByteArrayInputStream(POST_DATA.getBytes()), "text/xml;
charset=UTF-8");
+ WebResponse response = query(req, false);
assertEquals("OK", response.getResponseMessage(), "The response
message is wrong");
assertEquals(UNICODE_TEXT, response.getText(), "The response body is
wrong");
}
@Test
public void testHttpUnicodeResponseWithObjectResponse() throws Exception {
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/testUnicodeWithObjectResponse", new
ByteArrayInputStream(POST_DATA.getBytes()), "text/xml; charset=UTF-8");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/testUnicodeWithObjectResponse",
+ new ByteArrayInputStream(POST_DATA.getBytes()), "text/xml;
charset=UTF-8");
+ WebResponse response = query(req, false);
assertEquals("OK", response.getResponseMessage(), "The response
message is wrong");
assertEquals(UNICODE_TEXT, response.getText(), "The response body is
wrong");
}
@@ -123,7 +120,8 @@ public class HttpClientRouteTest extends
ServletCamelRouterTestSupport {
fail("Excepts exception here");
} catch (Exception ex) {
assertTrue(ex instanceof FailedToStartRouteException, "Get a wrong
exception.");
- assertTrue(ex.getCause().getCause() instanceof
UnsupportedOperationException, "Get a wrong cause of exception.");
+ assertTrue(ex.getCause().getCause() instanceof
UnsupportedOperationException,
+ "Get a wrong cause of exception.");
}
}
@@ -143,13 +141,14 @@ public class HttpClientRouteTest extends
ServletCamelRouterTestSupport {
String charsetEncoding =
exchange.getIn().getHeader(Exchange.HTTP_CHARACTER_ENCODING, String.class);
assertEquals(charsetEncoding, "UTF-8", "Get a wrong charset
name from the message header");
// assert exchange charset
- assertEquals("UTF-8",
exchange.getProperty(Exchange.CHARSET_NAME), "Get a wrong charset naem from the
exchange property");
+ assertEquals("UTF-8",
exchange.getProperty(Exchange.CHARSET_NAME),
+ "Get a wrong charset naem from the exchange property");
exchange.getMessage().setHeader(Exchange.CONTENT_TYPE,
contentType + "; charset=UTF-8");
exchange.getMessage().setHeader("PATH", path);
exchange.getMessage().setBody("<b>Hello World</b>");
});
// END SNIPPET: route
-
+
from("servlet:testHttpMethodRestrict?httpMethodRestrict=POST").process(exchange
-> {
String request = exchange.getIn().getBody(String.class);
exchange.getMessage().setBody(request);
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/MultiServletConsumerTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/MultiServletConsumerTest.java
index 5b5dc57..1783788 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/MultiServletConsumerTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/MultiServletConsumerTest.java
@@ -53,9 +53,8 @@ public class MultiServletConsumerTest extends
ServletCamelRouterTestSupport {
}
public String getService(String path) throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL + path);
- ServletUnitClient client = newClient();
- WebResponse response = client.getResponse(req);
+ WebRequest req = new GetMethodWebRequest(contextUrl + path);
+ WebResponse response = query(req);
return response.getText();
}
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletAsyncTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletAsyncTest.java
index 7b48da0..7d19f5d 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletAsyncTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletAsyncTest.java
@@ -31,13 +31,13 @@ public class ServletAsyncTest extends
ServletCamelRouterTestSupport {
public void testHello() throws Exception {
final String name = "Arnaud";
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/hello");
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/hello");
req.setParameter("name", name);
- ServletUnitClient client = newClient();
- WebResponse response = client.getResponse(req);
+ WebResponse response = query(req);
assertEquals(200, response.getResponseCode());
- assertEquals(MessageFormat.format("Hello {0} how are you?", name),
response.getText(), "The response message is wrong");
+ assertEquals(MessageFormat.format("Hello {0} how are you?", name),
response.getText(),
+ "The response message is wrong");
}
@Override
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java
index c46ed46..c45a621 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java
@@ -41,7 +41,7 @@ import org.junit.jupiter.api.BeforeEach;
public class ServletCamelRouterTestSupport extends CamelTestSupport {
public static final String CONTEXT = "/mycontext";
- protected String CONTEXT_URL;
+ protected String contextUrl;
protected boolean startCamelContext = true;
protected int port;
protected DeploymentManager manager;
@@ -59,7 +59,7 @@ public class ServletCamelRouterTestSupport extends
CamelTestSupport {
server = Undertow.builder().addHttpListener(port, "localhost")
.setHandler(path).build();
server.start();
- CONTEXT_URL = "http://localhost:"; + port + CONTEXT;
+ contextUrl = "http://localhost:"; + port + CONTEXT;
if (startCamelContext) {
super.setUp();
}
@@ -85,11 +85,37 @@ public class ServletCamelRouterTestSupport extends
CamelTestSupport {
.addMapping("/services/*"));
}
- protected ServletUnitClient newClient() {
- return new ServletUnitClient();
+ protected WebResponse query(WebRequest req) throws IOException {
+ return query(req, true);
}
- protected static abstract class WebRequest {
+ protected WebResponse query(WebRequest req, boolean
exceptionsThrownOnErrorStatus) throws IOException {
+ String params = req.params.entrySet().stream().map(e -> e.getKey() +
"=" + e.getValue())
+ .collect(Collectors.joining("&"));
+ String urlStr = params.isEmpty() ? req.url : req.url + "?" + params;
+ URL url = new URL(urlStr);
+ HttpURLConnection con = (HttpURLConnection) url.openConnection();
+ con.setUseCaches(false);
+ req.headers.forEach(con::addRequestProperty);
+ con.setRequestMethod(req.getMethod());
+ if (req instanceof PostMethodWebRequest) {
+ con.setDoOutput(true);
+ InputStream is = ((PostMethodWebRequest) req).content;
+ if (is != null) {
+ IOHelper.copy(is, con.getOutputStream());
+ }
+ }
+ int code = con.getResponseCode();
+ if (exceptionsThrownOnErrorStatus && code >=
HttpURLConnection.HTTP_BAD_REQUEST) {
+ if (code == HttpURLConnection.HTTP_NOT_FOUND) {
+ throw new HttpNotFoundException(code,
con.getResponseMessage(), url);
+ }
+ throw new HttpException(code, con.getResponseMessage(), url);
+ }
+ return new WebResponse(con);
+ }
+
+ protected abstract static class WebRequest {
protected String url;
protected Map<String, String> headers = new HashMap<>();
protected Map<String, String> params = new HashMap<>();
@@ -114,6 +140,7 @@ public class ServletCamelRouterTestSupport extends
CamelTestSupport {
super(url);
headers.put("Content-Length", "0");
}
+
public String getMethod() {
return "GET";
}
@@ -121,14 +148,17 @@ public class ServletCamelRouterTestSupport extends
CamelTestSupport {
protected static class PostMethodWebRequest extends WebRequest {
protected InputStream content;
+
public PostMethodWebRequest(String url) {
super(url);
}
+
public PostMethodWebRequest(String url, InputStream content, String
contentType) {
super(url);
this.content = content;
headers.put("Content-Type", contentType);
}
+
public String getMethod() {
return "POST";
}
@@ -138,9 +168,11 @@ public class ServletCamelRouterTestSupport extends
CamelTestSupport {
public PutMethodWebRequest(String url) {
super(url);
}
+
public PutMethodWebRequest(String url, InputStream content, String
contentType) {
super(url, content, contentType);
}
+
public String getMethod() {
return "PUT";
}
@@ -150,12 +182,13 @@ public class ServletCamelRouterTestSupport extends
CamelTestSupport {
public OptionsMethodWebRequest(String url) {
super(url);
}
+
public String getMethod() {
return "OPTIONS";
}
}
- protected static abstract class HeaderOnlyWebRequest extends WebRequest {
+ protected abstract static class HeaderOnlyWebRequest extends WebRequest {
public HeaderOnlyWebRequest(String url) {
super(url);
}
@@ -215,7 +248,7 @@ public class ServletCamelRouterTestSupport extends
CamelTestSupport {
public String getCharacterSet() {
String content = con.getContentType();
- return content != null && content.contains(";charset=")
+ return content != null && content.contains(";charset=")
? content.substring(content.lastIndexOf(";charset=") +
";charset=".length())
: con.getContentEncoding();
}
@@ -225,45 +258,10 @@ public class ServletCamelRouterTestSupport extends
CamelTestSupport {
}
}
- protected static class ServletUnitClient {
-
- protected boolean exceptionsThrownOnErrorStatus = true;
-
- public WebResponse getResponse(WebRequest req) throws IOException {
- String params = req.params.entrySet().stream().map(e -> e.getKey()
+ "=" + e.getValue())
- .collect(Collectors.joining("&"));
- String urlStr = params.isEmpty() ? req.url : req.url + "?" +
params;
- URL url = new URL(urlStr);
- HttpURLConnection con = (HttpURLConnection) url.openConnection();
- con.setUseCaches(false);
- req.headers.forEach(con::addRequestProperty);
- con.setRequestMethod(req.getMethod());
- if (req instanceof PostMethodWebRequest) {
- con.setDoOutput(true);
- InputStream is = ((PostMethodWebRequest) req).content;
- if (is != null) {
- IOHelper.copy(is, con.getOutputStream());
- }
- }
- int code = con.getResponseCode();
- if (exceptionsThrownOnErrorStatus && code >=
HttpURLConnection.HTTP_BAD_REQUEST) {
- if (code == HttpURLConnection.HTTP_NOT_FOUND) {
- throw new HttpNotFoundException(code,
con.getResponseMessage(), url);
- }
- throw new HttpException(code, con.getResponseMessage(), url);
- }
- return new WebResponse(con);
- }
-
- public void setExceptionsThrownOnErrorStatus(boolean val) {
- this.exceptionsThrownOnErrorStatus = val;
- }
- }
-
protected static class HttpException extends RuntimeException {
- private int code;
- private String message;
- private URL url;
+ private final int code;
+ private final String message;
+ private final URL url;
public HttpException(int code, String message, URL url) {
this.code = code;
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletChoiceBeanTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletChoiceBeanTest.java
index d95e50d..e66564c 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletChoiceBeanTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletChoiceBeanTest.java
@@ -29,10 +29,9 @@ public class ServletChoiceBeanTest extends
ServletCamelRouterTestSupport {
public void testClient() throws Exception {
getMockEndpoint("mock:bean").expectedMessageCount(1);
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/hello");
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/hello");
req.setParameter("id", "123");
- ServletUnitClient client = newClient();
- WebResponse response = client.getResponse(req);
+ WebResponse response = query(req);
assertEquals(200, response.getResponseCode());
assertEquals("Client is Donald Duck", response.getText(), "The
response message is wrong");
@@ -44,10 +43,9 @@ public class ServletChoiceBeanTest extends
ServletCamelRouterTestSupport {
public void testNoClient() throws Exception {
getMockEndpoint("mock:bean").expectedMessageCount(1);
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/hello");
- ServletUnitClient client = newClient();
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/hello");
try {
- client.getResponse(req);
+ query(req);
fail("Should throw exception");
} catch (HttpNotFoundException e) {
assertEquals(404, e.getResponseCode());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletMuteExceptionTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletMuteExceptionTest.java
index 298c0d8..b0b32d3 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletMuteExceptionTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletMuteExceptionTest.java
@@ -27,23 +27,20 @@ public class ServletMuteExceptionTest extends
ServletCamelRouterTestSupport {
@Test
public void testMuteException() throws Exception {
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/mute", new ByteArrayInputStream("".getBytes()), "text/plain");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/mute",
+ new ByteArrayInputStream("".getBytes()), "text/plain");
+ WebResponse response = query(req, false);
assertEquals(500, response.getResponseCode());
assertEquals("text/plain", response.getContentType());
assertEquals("Exception", response.getText());
}
-
@Test
public void testMuteWithTransferException() throws Exception {
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/muteWithTransfer", new ByteArrayInputStream("".getBytes()),
"text/plain");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/muteWithTransfer",
+ new ByteArrayInputStream("".getBytes()), "text/plain");
+ WebResponse response = query(req, false);
assertEquals(500, response.getResponseCode());
assertEquals("text/plain", response.getContentType());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletNoSlashNeededTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletNoSlashNeededTest.java
index 108f91d..fd279ff 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletNoSlashNeededTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletNoSlashNeededTest.java
@@ -25,13 +25,12 @@ public class ServletNoSlashNeededTest extends
ServletCamelRouterTestSupport {
@Test
public void testNoSlashNeeded() throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/hello");
- ServletUnitClient client = newClient();
- WebResponse response = client.getResponse(req);
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/hello");
+ WebResponse response = query(req);
assertEquals("Bye World", response.getText(), "The response message is
wrong");
}
-
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletRootPathTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletRootPathTest.java
index c06d616..7bf7fd5 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletRootPathTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletRootPathTest.java
@@ -25,13 +25,12 @@ public class ServletRootPathTest extends
ServletCamelRouterTestSupport {
@Test
public void testRootPath() throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL + "/services/");
- ServletUnitClient client = newClient();
- WebResponse response = client.getResponse(req);
+ WebRequest req = new GetMethodWebRequest(contextUrl + "/services/");
+ WebResponse response = query(req);
assertEquals("Bye World", response.getText(), "The response message is
wrong");
}
-
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSetBodyTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSetBodyTest.java
index 1eb6c6a..159c275 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSetBodyTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSetBodyTest.java
@@ -25,13 +25,12 @@ public class ServletSetBodyTest extends
ServletCamelRouterTestSupport {
@Test
public void testSetBody() throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/hello");
- ServletUnitClient client = newClient();
- WebResponse response = client.getResponse(req);
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/hello");
+ WebResponse response = query(req);
assertEquals("Bye World", response.getText(), "The response message is
wrong");
}
-
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSetExchangePropertyBeanTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSetExchangePropertyBeanTest.java
index 73b73d8..b1e5277 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSetExchangePropertyBeanTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSetExchangePropertyBeanTest.java
@@ -25,14 +25,13 @@ public class ServletSetExchangePropertyBeanTest extends
ServletCamelRouterTestSu
@Test
public void testSetProperty() throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/hello");
- ServletUnitClient client = newClient();
- WebResponse response = client.getResponse(req);
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/hello");
+ WebResponse response = query(req);
assertEquals(204, response.getResponseCode());
assertEquals("", response.getText(), "The response message is wrong");
}
-
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSwitchingStatusCode204Test.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSwitchingStatusCode204Test.java
index 096cc76..670a8cf 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSwitchingStatusCode204Test.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSwitchingStatusCode204Test.java
@@ -26,9 +26,8 @@ public class ServletSwitchingStatusCode204Test extends
ServletCamelRouterTestSup
@Test
public void testSwitchingNoBodyTo204() throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/bar");
- ServletUnitClient client = newClient();
- WebResponse response = client.getResponse(req);
+ WebRequest req = new GetMethodWebRequest(contextUrl + "/services/bar");
+ WebResponse response = query(req);
assertEquals(204, response.getResponseCode());
assertEquals("", response.getText());
@@ -36,9 +35,8 @@ public class ServletSwitchingStatusCode204Test extends
ServletCamelRouterTestSup
@Test
public void testNoSwitchingNoCode() throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/foo");
- ServletUnitClient client = newClient();
- WebResponse response = client.getResponse(req);
+ WebRequest req = new GetMethodWebRequest(contextUrl + "/services/foo");
+ WebResponse response = query(req);
assertEquals(200, response.getResponseCode());
assertEquals("No Content", response.getText());
@@ -46,9 +44,8 @@ public class ServletSwitchingStatusCode204Test extends
ServletCamelRouterTestSup
@Test
public void testNoSwitchingNoBody() throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/foobar");
- ServletUnitClient client = newClient();
- WebResponse response = client.getResponse(req);
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/foobar");
+ WebResponse response = query(req);
assertEquals(200, response.getResponseCode());
assertEquals("", response.getText());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletTransferExceptionTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletTransferExceptionTest.java
index 13bc15d..325a573 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletTransferExceptionTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletTransferExceptionTest.java
@@ -31,10 +31,9 @@ public class ServletTransferExceptionTest extends
ServletCamelRouterTestSupport
@Test
public void testTransferException() throws Exception {
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/hello", new ByteArrayInputStream("".getBytes()), "text/plain");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/hello",
+ new ByteArrayInputStream("".getBytes()), "text/plain");
+ WebResponse response = query(req, false);
assertEquals(500, response.getResponseCode());
assertEquals(HttpConstants.CONTENT_TYPE_JAVA_SERIALIZED_OBJECT,
response.getContentType());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestApiMatchUriServletTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestApiMatchUriServletTest.java
index 34d893d..1f4d823 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestApiMatchUriServletTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestApiMatchUriServletTest.java
@@ -23,16 +23,13 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class RestApiMatchUriServletTest extends ServletCamelRouterTestSupport {
@Test
public void testApiDocGet() throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/api-doc");
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/api-doc");
req.setHeaderField("Accept", "application/json");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeAutoWithJsonTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeAutoWithJsonTest.java
index 586fbd0..b06eeee 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeAutoWithJsonTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeAutoWithJsonTest.java
@@ -37,10 +37,9 @@ public class RestServletBindingModeAutoWithJsonTest extends
ServletCamelRouterTe
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/new", new ByteArrayInputStream(body.getBytes()),
"application/json");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/new",
+ new ByteArrayInputStream(body.getBytes()), "application/json");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeAutoWithXmlTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeAutoWithXmlTest.java
index b8c4b77..fc34f90 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeAutoWithXmlTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeAutoWithXmlTest.java
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class RestServletBindingModeAutoWithXmlTest extends
ServletCamelRouterTestSupport {
@Test
@@ -38,10 +37,9 @@ public class RestServletBindingModeAutoWithXmlTest extends
ServletCamelRouterTes
String body = "<user name=\"Donald Duck\" id=\"123\"></user>";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/new", new ByteArrayInputStream(body.getBytes()),
"application/xml");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/new",
+ new ByteArrayInputStream(body.getBytes()), "application/xml");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeJsonTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeJsonTest.java
index e102322..b4f7bc4 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeJsonTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeJsonTest.java
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class RestServletBindingModeJsonTest extends
ServletCamelRouterTestSupport {
@Test
@@ -37,10 +36,9 @@ public class RestServletBindingModeJsonTest extends
ServletCamelRouterTestSuppor
mock.message(0).body().isInstanceOf(UserJaxbPojo.class);
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/new", new ByteArrayInputStream(body.getBytes()),
"application/json");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/new",
+ new ByteArrayInputStream(body.getBytes()), "application/json");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
@@ -58,10 +56,9 @@ public class RestServletBindingModeJsonTest extends
ServletCamelRouterTestSuppor
mock.expectedMessageCount(0);
String body = "<user name=\"Donald Duck\" id=\"123\"></user>";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/new", new ByteArrayInputStream(body.getBytes()),
"application/xml");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/new",
+ new ByteArrayInputStream(body.getBytes()), "application/xml");
+ WebResponse response = query(req, false);
assertEquals(500, response.getResponseCode());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeJsonWithContractTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeJsonWithContractTest.java
index 9946c9c..c1b6977 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeJsonWithContractTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeJsonWithContractTest.java
@@ -30,7 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-
public class RestServletBindingModeJsonWithContractTest extends
ServletCamelRouterTestSupport {
@Test
@@ -40,10 +39,9 @@ public class RestServletBindingModeJsonWithContractTest
extends ServletCamelRout
mock.message(0).body().isInstanceOf(UserPojoEx.class);
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/new", new ByteArrayInputStream(body.getBytes()),
"application/json");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/new",
+ new ByteArrayInputStream(body.getBytes()), "application/json");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
String answer = response.getText();
assertTrue(answer.contains("\"active\":true"), "Unexpected response: "
+ answer);
@@ -52,7 +50,7 @@ public class RestServletBindingModeJsonWithContractTest
extends ServletCamelRout
Object obj = mock.getReceivedExchanges().get(0).getIn().getBody();
assertEquals(UserPojoEx.class, obj.getClass());
- UserPojoEx user = (UserPojoEx)obj;
+ UserPojoEx user = (UserPojoEx) obj;
assertNotNull(user);
assertEquals(123, user.getId());
assertEquals("Donald Duck", user.getName());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeOffWithContractTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeOffWithContractTest.java
index 59a14e3..26068d9 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeOffWithContractTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeOffWithContractTest.java
@@ -30,7 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-
public class RestServletBindingModeOffWithContractTest extends
ServletCamelRouterTestSupport {
@Test
@@ -40,10 +39,9 @@ public class RestServletBindingModeOffWithContractTest
extends ServletCamelRoute
mock.message(0).body().isInstanceOf(UserPojoEx.class);
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/new", new ByteArrayInputStream(body.getBytes()),
"application/json");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/new",
+ new ByteArrayInputStream(body.getBytes()), "application/json");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
String answer = response.getText();
assertTrue(answer.contains("\"active\":true"), "Unexpected response: "
+ answer);
@@ -52,7 +50,7 @@ public class RestServletBindingModeOffWithContractTest
extends ServletCamelRoute
Object obj = mock.getReceivedExchanges().get(0).getIn().getBody();
assertEquals(UserPojoEx.class, obj.getClass());
- UserPojoEx user = (UserPojoEx)obj;
+ UserPojoEx user = (UserPojoEx) obj;
assertNotNull(user);
assertEquals(123, user.getId());
assertEquals("Donald Duck", user.getName());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeXmlTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeXmlTest.java
index 06d0d98..461a8bd 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeXmlTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeXmlTest.java
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class RestServletBindingModeXmlTest extends
ServletCamelRouterTestSupport {
@Test
@@ -37,10 +36,9 @@ public class RestServletBindingModeXmlTest extends
ServletCamelRouterTestSupport
mock.message(0).body().isInstanceOf(UserJaxbPojo.class);
String body = "<user name=\"Donald Duck\" id=\"123\"></user>";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/new", new ByteArrayInputStream(body.getBytes()),
"application/xml");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/new",
+ new ByteArrayInputStream(body.getBytes()), "application/xml");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
@@ -59,10 +57,9 @@ public class RestServletBindingModeXmlTest extends
ServletCamelRouterTestSupport
// we bind to xml, but send in json, which is not possible
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/new", new ByteArrayInputStream(body.getBytes()),
"application/json");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/new",
+ new ByteArrayInputStream(body.getBytes()), "application/json");
+ WebResponse response = query(req, false);
assertEquals(500, response.getResponseCode());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java
index 62a5368..a8cbbf7 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java
@@ -24,7 +24,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class RestServletGetTest extends ServletCamelRouterTestSupport {
@BindToRegistry("myBinding")
@@ -32,10 +31,8 @@ public class RestServletGetTest extends
ServletCamelRouterTestSupport {
@Test
public void testServletProducerGet() throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/users/123/basic");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/users/123/basic");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java
index a23bd99..8e93c6a 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java
@@ -24,7 +24,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class RestServletGetWildcardsTest extends ServletCamelRouterTestSupport
{
@BindToRegistry("myBinding")
@@ -32,10 +31,8 @@ public class RestServletGetWildcardsTest extends
ServletCamelRouterTestSupport {
@Test
public void testServletProducerGet() throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/users/123/basic");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/users/123/basic");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
@@ -44,10 +41,8 @@ public class RestServletGetWildcardsTest extends
ServletCamelRouterTestSupport {
@Test
public void testServletProducerGetWildcards() throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/users/456/name=g*");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/users/456/name=g*");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java
index 83ac536..03f69aa 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java
@@ -24,7 +24,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class RestServletMethodNotAllowedTest extends
ServletCamelRouterTestSupport {
@BindToRegistry("myBinding")
@@ -32,10 +31,8 @@ public class RestServletMethodNotAllowedTest extends
ServletCamelRouterTestSuppo
@Test
public void testServletMethodNotAllowed() throws Exception {
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/123/basic");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/123/basic");
+ WebResponse response = query(req, false);
assertEquals(405, response.getResponseCode());
}
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java
index 2019c08..0fad305 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletOptionsTest.java
@@ -24,7 +24,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class RestServletOptionsTest extends ServletCamelRouterTestSupport {
@BindToRegistry("myBinding")
@@ -32,17 +31,15 @@ public class RestServletOptionsTest extends
ServletCamelRouterTestSupport {
@Test
public void testServletOptions() throws Exception {
- WebRequest req = new OptionsMethodWebRequest(CONTEXT_URL +
"/services/users/v1/customers");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new OptionsMethodWebRequest(contextUrl +
"/services/users/v1/customers");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
assertEquals("GET,OPTIONS", response.getHeaderField("ALLOW"));
assertEquals("", response.getText());
- req = new OptionsMethodWebRequest(CONTEXT_URL +
"/services/users/v1/id/123");
- response = client.getResponse(req);
+ req = new OptionsMethodWebRequest(contextUrl +
"/services/users/v1/id/123");
+ response = query(req, false);
assertEquals(200, response.getResponseCode());
assertEquals("PUT,OPTIONS", response.getHeaderField("ALLOW"));
@@ -51,10 +48,8 @@ public class RestServletOptionsTest extends
ServletCamelRouterTestSupport {
@Test
public void testMultipleServletOptions() throws Exception {
- WebRequest req = new OptionsMethodWebRequest(CONTEXT_URL +
"/services/users/v2/options");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new OptionsMethodWebRequest(contextUrl +
"/services/users/v2/options");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
assertEquals("GET,POST,OPTIONS", response.getHeaderField("ALLOW"));
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPojoInOutTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPojoInOutTest.java
index e7864e8..839c700 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPojoInOutTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPojoInOutTest.java
@@ -26,16 +26,14 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class RestServletPojoInOutTest extends ServletCamelRouterTestSupport {
@Test
public void testServletPojoInOut() throws Exception {
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/lives", new ByteArrayInputStream(body.getBytes()),
"application/json");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/lives",
+ new ByteArrayInputStream(body.getBytes()), "application/json");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
@@ -44,14 +42,12 @@ public class RestServletPojoInOutTest extends
ServletCamelRouterTestSupport {
assertNotNull(out);
assertEquals("{\"iso\":\"EN\",\"country\":\"England\"}", out);
}
-
+
@Test
public void testServletPojoGet() throws Exception {
-
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/users/lives");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/users/lives");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
@@ -59,7 +55,7 @@ public class RestServletPojoInOutTest extends
ServletCamelRouterTestSupport {
assertNotNull(out);
assertEquals("{\"iso\":\"EN\",\"country\":\"England\"}", out);
- }
+ }
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostJsonJaxbPojoTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostJsonJaxbPojoTest.java
index 51e662d..3572a90e 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostJsonJaxbPojoTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostJsonJaxbPojoTest.java
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class RestServletPostJsonJaxbPojoTest extends
ServletCamelRouterTestSupport {
@Test
@@ -37,10 +36,9 @@ public class RestServletPostJsonJaxbPojoTest extends
ServletCamelRouterTestSuppo
mock.message(0).body().isInstanceOf(UserJaxbPojo.class);
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/new", new ByteArrayInputStream(body.getBytes()),
"application/json");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/new",
+ new ByteArrayInputStream(body.getBytes()), "application/json");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostJsonPojoListTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostJsonPojoListTest.java
index 3292caa..42c59e7 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostJsonPojoListTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostJsonPojoListTest.java
@@ -28,7 +28,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class RestServletPostJsonPojoListTest extends
ServletCamelRouterTestSupport {
@Test
@@ -37,10 +36,9 @@ public class RestServletPostJsonPojoListTest extends
ServletCamelRouterTestSuppo
mock.expectedMessageCount(1);
String body = "[ {\"id\": 123, \"name\": \"Donald Duck\"}, {\"id\":
456, \"name\": \"John Doe\"} ]";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/new", new ByteArrayInputStream(body.getBytes()),
"application/json");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/new",
+ new ByteArrayInputStream(body.getBytes()), "application/json");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
assertEquals("application/json", response.getContentType());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostJsonPojoTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostJsonPojoTest.java
index e145171..46e7ddd 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostJsonPojoTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostJsonPojoTest.java
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class RestServletPostJsonPojoTest extends ServletCamelRouterTestSupport
{
@Test
@@ -37,10 +36,9 @@ public class RestServletPostJsonPojoTest extends
ServletCamelRouterTestSupport {
mock.message(0).body().isInstanceOf(UserPojo.class);
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/new", new ByteArrayInputStream(body.getBytes()),
"application/json");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/new",
+ new ByteArrayInputStream(body.getBytes()), "application/json");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostXmlJaxbPojoTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostXmlJaxbPojoTest.java
index a2299c4..7d48a11 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostXmlJaxbPojoTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPostXmlJaxbPojoTest.java
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class RestServletPostXmlJaxbPojoTest extends
ServletCamelRouterTestSupport {
@Test
@@ -37,10 +36,9 @@ public class RestServletPostXmlJaxbPojoTest extends
ServletCamelRouterTestSuppor
mock.message(0).body().isInstanceOf(UserJaxbPojo.class);
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/new", new ByteArrayInputStream(body.getBytes()),
"application/json");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/new",
+ new ByteArrayInputStream(body.getBytes()), "application/json");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
@@ -59,10 +57,9 @@ public class RestServletPostXmlJaxbPojoTest extends
ServletCamelRouterTestSuppor
mock.message(0).body().isInstanceOf(UserJaxbPojo.class);
String body = "<user name=\"Donald Duck\" id=\"456\"></user>";
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users/new", new ByteArrayInputStream(body.getBytes()), "foo");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users/new",
+ new ByteArrayInputStream(body.getBytes()), "foo");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletVerbTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletVerbTest.java
index f74b223..d9ae401 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletVerbTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletVerbTest.java
@@ -26,15 +26,12 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class RestServletVerbTest extends ServletCamelRouterTestSupport {
@Test
public void testGetAll() throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/users");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/users");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
assertEquals("[{ \"id\":\"1\", \"name\":\"Scott\" },{ \"id\":\"2\",
\"name\":\"Claus\" }]", response.getText());
@@ -42,10 +39,8 @@ public class RestServletVerbTest extends
ServletCamelRouterTestSupport {
@Test
public void testGetOne() throws Exception {
- WebRequest req = new GetMethodWebRequest(CONTEXT_URL +
"/services/users/1");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new GetMethodWebRequest(contextUrl +
"/services/users/1");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
assertEquals("{ \"id\":\"1\", \"name\":\"Scott\" }",
response.getText());
@@ -59,10 +54,9 @@ public class RestServletVerbTest extends
ServletCamelRouterTestSupport {
mock.expectedBodiesReceived(body);
mock.expectedHeaderReceived(Exchange.HTTP_METHOD, "POST");
- WebRequest req = new PostMethodWebRequest(CONTEXT_URL +
"/services/users", new ByteArrayInputStream(body.getBytes()),
"application/json");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PostMethodWebRequest(contextUrl +
"/services/users",
+ new ByteArrayInputStream(body.getBytes()), "application/json");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
@@ -78,10 +72,9 @@ public class RestServletVerbTest extends
ServletCamelRouterTestSupport {
mock.expectedHeaderReceived("id", "1");
mock.expectedHeaderReceived(Exchange.HTTP_METHOD, "PUT");
- WebRequest req = new PutMethodWebRequest(CONTEXT_URL +
"/services/users/1", new ByteArrayInputStream(body.getBytes()),
"application/json");
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebRequest req = new PutMethodWebRequest(contextUrl +
"/services/users/1",
+ new ByteArrayInputStream(body.getBytes()), "application/json");
+ WebResponse response = query(req, false);
assertEquals(200, response.getResponseCode());
@@ -94,15 +87,13 @@ public class RestServletVerbTest extends
ServletCamelRouterTestSupport {
mock.expectedHeaderReceived("id", "1");
mock.expectedHeaderReceived(Exchange.HTTP_METHOD, "DELETE");
- WebRequest req = new HeaderOnlyWebRequest(CONTEXT_URL +
"/services/users/1") {
+ WebRequest req = new HeaderOnlyWebRequest(contextUrl +
"/services/users/1") {
@Override
public String getMethod() {
return "DELETE";
}
};
- ServletUnitClient client = newClient();
- client.setExceptionsThrownOnErrorStatus(false);
- WebResponse response = client.getResponse(req);
+ WebResponse response = query(req, false);
assertEquals(204, response.getResponseCode());
