Author: ningjiang
Date: Wed Feb 24 11:29:08 2010
New Revision: 915754
URL: http://svn.apache.org/viewvc?rev=915754&view=rev
Log:
Fixed the CS errors of camel-rss and camel-restlet
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiMethodsEndpointTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java
camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java?rev=915754&r1=915753&r2=915754&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletExceptionResponseTest.java
Wed Feb 24 11:29:08 2010
@@ -47,10 +47,10 @@
@Test
public void testExceptionResponse() throws Exception {
- HttpResponse response = doExecute(new
HttpPost("http://localhost:9080/users/homer";));
- String body = EntityUtils.toString(response.getEntity());
-
- assertHttpResponse(response, 500, "text/plain");
+ HttpResponse response = doExecute(new
HttpPost("http://localhost:9080/users/homer";));
+ String body = EntityUtils.toString(response.getEntity());
+
+ assertHttpResponse(response, 500, "text/plain");
assertTrue(body.contains("IllegalArgumentException"));
assertTrue(body.contains("Damn something went wrong"));
}
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java?rev=915754&r1=915753&r2=915754&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
Wed Feb 24 11:29:08 2010
@@ -49,8 +49,8 @@
@Test
public void testFaultResponse() throws Exception {
- HttpResponse response = doExecute(new
HttpPost("http://localhost:9080/users/homer";));
-
- assertHttpResponse(response, 404, "text/plain", "Application fault");
+ HttpResponse response = doExecute(new
HttpPost("http://localhost:9080/users/homer";));
+
+ assertHttpResponse(response, 404, "text/plain", "Application fault");
}
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiMethodsEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiMethodsEndpointTest.java?rev=915754&r1=915753&r2=915754&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiMethodsEndpointTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiMethodsEndpointTest.java
Wed Feb 24 11:29:08 2010
@@ -33,16 +33,16 @@
@Test
public void testPostMethod() throws Exception {
- HttpResponse response = doExecute(new
HttpPost("http://localhost:9080/users/homer";));
-
- assertHttpResponse(response, 200, "text/plain", "POST");
+ HttpResponse response = doExecute(new
HttpPost("http://localhost:9080/users/homer";));
+
+ assertHttpResponse(response, 200, "text/plain", "POST");
}
@Test
public void testGetMethod() throws Exception {
- HttpResponse response = doExecute(new
HttpGet("http://localhost:9080/users/homer";));
-
- assertHttpResponse(response, 200, "text/plain", "GET");
+ HttpResponse response = doExecute(new
HttpGet("http://localhost:9080/users/homer";));
+
+ assertHttpResponse(response, 200, "text/plain", "GET");
}
protected RouteBuilder createRouteBuilder() {
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java?rev=915754&r1=915753&r2=915754&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java
Wed Feb 24 11:29:08 2010
@@ -48,16 +48,16 @@
@Test
public void testPostUserUriPattern() throws Exception {
- HttpResponse response = doExecute(new
HttpPost("http://localhost:9080/users/homer";));
-
- assertHttpResponse(response, 200, "text/plain", "POST homer");
+ HttpResponse response = doExecute(new
HttpPost("http://localhost:9080/users/homer";));
+
+ assertHttpResponse(response, 200, "text/plain", "POST homer");
}
@Test
public void testGetAtomUriPattern() throws Exception {
- HttpResponse response = doExecute(new
HttpGet("http://localhost:9080/atom/collection/foo/component/bar";));
-
- assertHttpResponse(response, 200, "text/plain", "GET foo bar");
+ HttpResponse response = doExecute(new
HttpGet("http://localhost:9080/atom/collection/foo/component/bar";));
+
+ assertHttpResponse(response, 200, "text/plain", "GET foo bar");
}
@Override
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java?rev=915754&r1=915753&r2=915754&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java
Wed Feb 24 11:29:08 2010
@@ -56,9 +56,9 @@
@Test
public void testPostBody() throws Exception {
- HttpUriRequest method = new
HttpPost("http://localhost:9080/users/homer";);
+ HttpUriRequest method = new
HttpPost("http://localhost:9080/users/homer";);
((HttpEntityEnclosingRequestBase)method).setEntity(new
StringEntity(MSG_BODY));
-
+
HttpResponse response = doExecute(method);
assertHttpResponse(response, 200, "text/plain");
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java?rev=915754&r1=915753&r2=915754&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java
Wed Feb 24 11:29:08 2010
@@ -51,8 +51,8 @@
@Test
public void testPostBody() throws Exception {
- HttpResponse response = doExecute(new
HttpGet("http://localhost:9080/users/homer?"; + QUERY_STRING));
-
- assertHttpResponse(response, 200, "text/plain");
+ HttpResponse response = doExecute(new
HttpGet("http://localhost:9080/users/homer?"; + QUERY_STRING));
+
+ assertHttpResponse(response, 200, "text/plain");
}
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java?rev=915754&r1=915753&r2=915754&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
Wed Feb 24 11:29:08 2010
@@ -53,9 +53,9 @@
@Test
public void testCustomResponse() throws Exception {
- HttpResponse response = doExecute(new
HttpPost("http://localhost:9080/users/homer";));
-
- assertHttpResponse(response, 417, "application/JSON");
+ HttpResponse response = doExecute(new
HttpPost("http://localhost:9080/users/homer";));
+
+ assertHttpResponse(response, 417, "application/JSON");
}
@Test
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java?rev=915754&r1=915753&r2=915754&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletTestSupport.java
Wed Feb 24 11:29:08 2010
@@ -32,27 +32,30 @@
* @version $Revision$
*/
public abstract class RestletTestSupport extends CamelTestSupport {
-
+
public HttpResponse doExecute(HttpUriRequest method) throws Exception {
- HttpClient client = new DefaultHttpClient();
+ HttpClient client = new DefaultHttpClient();
try {
- HttpResponse response = client.execute(method);
- response.setEntity(new
BufferedHttpEntity(response.getEntity()));
- return response;
+ HttpResponse response = client.execute(method);
+ response.setEntity(new BufferedHttpEntity(response.getEntity()));
+ return response;
} finally {
- client.getConnectionManager().shutdown();
+ client.getConnectionManager().shutdown();
}
}
-
- public static void assertHttpResponse(HttpResponse response, int
expectedStatusCode, String expectedContentType) throws ParseException,
IOException {
- assertHttpResponse(response, expectedStatusCode, expectedContentType,
null);
+
+ public static void assertHttpResponse(HttpResponse response, int
expectedStatusCode,
+ String expectedContentType) throws
ParseException, IOException {
+ assertHttpResponse(response, expectedStatusCode, expectedContentType,
null);
}
-
- public static void assertHttpResponse(HttpResponse response, int
expectedStatusCode, String expectedContentType, String expectedBody) throws
ParseException, IOException {
- assertEquals(expectedStatusCode,
response.getStatusLine().getStatusCode());
-
assertTrue(response.getFirstHeader("Content-Type").getValue().startsWith(expectedContentType));
- if (expectedBody != null) {
- assertEquals(expectedBody,
EntityUtils.toString(response.getEntity()));
- }
+
+ public static void assertHttpResponse(HttpResponse response, int
expectedStatusCode,
+ String expectedContentType, String
expectedBody)
+ throws ParseException, IOException {
+ assertEquals(expectedStatusCode,
response.getStatusLine().getStatusCode());
+
assertTrue(response.getFirstHeader("Content-Type").getValue().startsWith(expectedContentType));
+ if (expectedBody != null) {
+ assertEquals(expectedBody,
EntityUtils.toString(response.getEntity()));
+ }
}
-}
\ No newline at end of file
+}
Modified:
camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java?rev=915754&r1=915753&r2=915754&view=diff
==============================================================================
---
camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java
(original)
+++
camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java
Wed Feb 24 11:29:08 2010
@@ -26,10 +26,11 @@
public int compare(SyndEntry s1, SyndEntry s2) {
Date d1 = getUpdatedDate(s1);
Date d2 = getUpdatedDate(s2);
- if ( d2 != null && d1 != null )
+ if (d2 != null && d1 != null) {
return d2.compareTo(d1);
- else
+ } else {
return 0;
+ }
}
private Date getUpdatedDate(SyndEntry entry) {
