You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/06/27 14:29:42 UTC
[1/2] git commit: fixed some CS errors
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x 2bf29e331 -> 92c8d3b9d
fixed some CS errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ae4c08d6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ae4c08d6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ae4c08d6
Branch: refs/heads/camel-2.13.x
Commit: ae4c08d6a8abd450cffd96f2f31c67159a73385c
Parents: 2bf29e3
Author: cmueller <cm...@apache.org>
Authored: Mon Jun 23 12:36:59 2014 +0200
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 27 20:29:15 2014 +0800
----------------------------------------------------------------------
.../camel/dataformat/zipfile/ZipIterator.java | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ae4c08d6/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
----------------------------------------------------------------------
diff --git a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
index 5900d66..6366f4c 100644
--- a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
+++ b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
@@ -122,16 +122,18 @@ class ZipIterator implements Iterator<Message> {
zipInputStream = null;
}
}
-
- private ZipEntry getNextEntry() throws IOException {
- ZipEntry entry = null;
-
- while ((entry = zipInputStream.getNextEntry()) != null)
- if (!entry.isDirectory())
- return entry;
-
- return null;
- }
+
+ private ZipEntry getNextEntry() throws IOException {
+ ZipEntry entry = null;
+
+ while ((entry = zipInputStream.getNextEntry()) != null) {
+ if (!entry.isDirectory()) {
+ return entry;
+ }
+ }
+
+ return null;
+ }
@Override
public void remove() {
[2/2] git commit: Fix bunch of CS errors in camel-2.13.x branch
Posted by ni...@apache.org.
Fix bunch of CS errors in camel-2.13.x branch
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/92c8d3b9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/92c8d3b9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/92c8d3b9
Branch: refs/heads/camel-2.13.x
Commit: 92c8d3b9d4d7755f96c5a96a2b8d5d9f5b06663a
Parents: ae4c08d
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jun 27 20:28:52 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 27 20:29:16 2014 +0800
----------------------------------------------------------------------
.../component/properties/DefaultPropertiesParser.java | 4 ++--
.../cxf/jaxrs/CxfRsHeaderFilterStrategyTest.java | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/92c8d3b9/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/92c8d3b9/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));
}