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 2015/06/10 10:28:34 UTC
[1/2] camel git commit: Fixed the CS error in camel-ftp
Repository: camel
Updated Branches:
refs/heads/master 0e54bc8e5 -> 148333845
Fixed the CS error in camel-ftp
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/22d3d0f8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/22d3d0f8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/22d3d0f8
Branch: refs/heads/master
Commit: 22d3d0f8e2f07ad8e31bd6ba3acfd7a662dc0e27
Parents: 0e54bc8
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Jun 10 16:27:33 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Jun 10 16:27:33 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/file/remote/FtpUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/22d3d0f8/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
index e190243..476099c 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
@@ -120,8 +120,8 @@ public final class FtpUtils {
public static void ensureRelativeFtpDirectory(Component ftpComponent, RemoteFileConfiguration configuration) {
if (FileUtil.hasLeadingSeparator(configuration.getDirectoryName())) {
String relativePath = FileUtil.stripLeadingSeparator(configuration.getDirectoryName());
- LOG.warn(String.format("%s doesn't support absolute paths, \"%s\" will be converted to \"%s\". " +
- "After Camel 2.16, absolute paths will be invalid.",
+ LOG.warn(String.format("%s doesn't support absolute paths, \"%s\" will be converted to \"%s\". "
+ + "After Camel 2.16, absolute paths will be invalid.",
ftpComponent.getClass().getSimpleName(),
configuration.getDirectoryName(),
relativePath));
[2/2] camel git commit: Fixed the CS errors in camel-test-blueprint
Posted by ni...@apache.org.
Fixed the CS errors in camel-test-blueprint
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/14833384
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/14833384
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/14833384
Branch: refs/heads/master
Commit: 148333845b476302fdd9041e770d513a5dce1475
Parents: 22d3d0f
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Jun 10 16:28:13 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Jun 10 16:28:13 2015 +0800
----------------------------------------------------------------------
.../camel/test/blueprint/component/rest/FromRestGetTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/14833384/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java
index b474568..d03610c 100644
--- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java
+++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.camel.test.blueprint.component.rest;
+import java.util.Arrays;
import org.apache.camel.model.ToDefinition;
import org.apache.camel.model.rest.RestDefinition;
@@ -22,8 +23,6 @@ import org.apache.camel.model.rest.RestParamType;
import org.apache.camel.test.blueprint.CamelBlueprintTestSupport;
import org.junit.Test;
-import java.util.Arrays;
-
public class FromRestGetTest extends CamelBlueprintTestSupport {
@Override
@@ -63,7 +62,7 @@ public class FromRestGetTest extends CamelBlueprintTestSupport {
assertEquals("integer", rest.getVerbs().get(0).getParams().get(0).getDataType());
assertEquals("string", rest.getVerbs().get(0).getParams().get(1).getDataType());
assertEquals(Arrays.asList("1", "2", "3", "4"), rest.getVerbs().get(0).getParams().get(0).getAllowableValues());
- assertEquals(Arrays.asList("a","b","c","d"), rest.getVerbs().get(0).getParams().get(1).getAllowableValues());
+ assertEquals(Arrays.asList("a", "b", "c", "d"), rest.getVerbs().get(0).getParams().get(1).getAllowableValues());
assertEquals("1", rest.getVerbs().get(0).getParams().get(0).getDefaultValue());
assertEquals("b", rest.getVerbs().get(0).getParams().get(1).getDefaultValue());