Repository: camel Updated Branches: refs/heads/camel-2.12.x 53c75549f -> fba86184c
Fixed bunch of CS errors in camel-2.12.x Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fba86184 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fba86184 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fba86184 Branch: refs/heads/camel-2.12.x Commit: fba86184cb69e9278a84a6e02580ca675663102b Parents: 53c7554 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Fri Jun 27 20:28:52 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Jun 27 22:45:41 2014 +0800 ---------------------------------------------------------------------- .../component/properties/DefaultPropertiesParser.java | 4 ++-- .../camel/component/apns/factory/ApnsServiceFactory.java | 2 +- .../cxf/jaxrs/CxfRsHeaderFilterStrategyTest.java | 10 +++++----- .../camel/component/mail/MailContentTypeResolverTest.java | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fba86184/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java b/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java index 7d25e8d..f6c3aba 100644 --- a/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java +++ b/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java @@ -20,11 +20,11 @@ import java.util.HashSet; import java.util.Properties; import java.util.Set; +import static java.lang.String.format; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static java.lang.String.format; - /** * A parser to parse a string which contains property placeholders */ http://git-wip-us.apache.org/repos/asf/camel/blob/fba86184/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java index 28e3f9f..118e19c 100644 --- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java +++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java @@ -162,7 +162,7 @@ public class ApnsServiceFactory implements CamelContextAware { } public void setApnsDelegate(ApnsDelegate apnsDelegate) { - this.apnsDelegate = apnsDelegate; + this.apnsDelegate = apnsDelegate; } public ApnsService getApnsService() { http://git-wip-us.apache.org/repos/asf/camel/blob/fba86184/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategyTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategyTest.java index eab6c41..be3d946 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategyTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategyTest.java @@ -26,16 +26,16 @@ public class CxfRsHeaderFilterStrategyTest extends Assert { @Test public void testFilterContentType() throws Exception { HeaderFilterStrategy filter = new CxfRsHeaderFilterStrategy(); - assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders("content-type","just a test", null)); - assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders("Content-Type","just a test", null)); + assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders("content-type", "just a test", null)); + assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders("Content-Type", "just a test", null)); } - + @Test public void testFilterCamelHeaders() throws Exception { HeaderFilterStrategy filter = new CxfRsHeaderFilterStrategy(); - assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders(Exchange.CHARSET_NAME,"just a test", null)); + assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders(Exchange.CHARSET_NAME, "just a test", null)); assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders(CxfConstants.CAMEL_CXF_RS_RESPONSE_CLASS, "just a test", null)); - assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders("org.apache.camel.such.Header","just a test", null)); + assertTrue("Get a wrong filtered result", filter.applyFilterToCamelHeaders("org.apache.camel.such.Header", "just a test", null)); assertFalse("Get a wrong filtered result", filter.applyFilterToCamelHeaders("camel.result", "just a test", null)); } http://git-wip-us.apache.org/repos/asf/camel/blob/fba86184/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java index 3b1a8c6..b48fb18 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java @@ -77,8 +77,8 @@ public class MailContentTypeResolverTest extends CamelTestSupport { // as we use a custom content type resolver the content type should then be fixed and correct // content type should match - boolean match1 = ("image/jpeg; name=logo.jpeg").equals(handler.getContentType()); - boolean match2 = ("application/octet-stream; name=logo.jpeg").equals(handler.getContentType()); + boolean match1 = "image/jpeg; name=logo.jpeg".equals(handler.getContentType()); + boolean match2 = "application/octet-stream; name=logo.jpeg".equals(handler.getContentType()); assertTrue("Should match 1 or 2", match1 || match2); producer.stop(); @@ -98,4 +98,4 @@ public class MailContentTypeResolverTest extends CamelTestSupport { } }; } -} \ No newline at end of file +}
