You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/04/07 09:51:37 UTC
[1/2] camel git commit: CAMEL-8600: Fixed test after change
Repository: camel
Updated Branches:
refs/heads/master e6e3047b0 -> 0f8648611
CAMEL-8600: Fixed test after change
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0f864861
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0f864861
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0f864861
Branch: refs/heads/master
Commit: 0f86486111cafaad2eb84e3f2e77f67ab2b4b18c
Parents: 9b380b8
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Apr 7 09:51:14 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 7 09:51:50 2015 +0200
----------------------------------------------------------------------
.../camel/component/file/remote/UriConfigurationTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0f864861/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
index 12aea2a..8d6783a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
@@ -37,7 +37,7 @@ public class UriConfigurationTest extends CamelTestSupport {
assertNull(config.getUsername());
assertNull(config.getPassword());
assertEquals(false, config.isBinary());
- assertEquals(RemoteFileConfiguration.PathSeparator.Auto, config.getSeparator());
+ assertEquals(RemoteFileConfiguration.PathSeparator.UNIX, config.getSeparator());
}
@Test
@@ -51,7 +51,7 @@ public class UriConfigurationTest extends CamelTestSupport {
assertNull(config.getUsername());
assertNull(config.getPassword());
assertEquals(false, config.isBinary());
- assertEquals(RemoteFileConfiguration.PathSeparator.Auto, config.getSeparator());
+ assertEquals(RemoteFileConfiguration.PathSeparator.UNIX, config.getSeparator());
}
@Test
@@ -67,7 +67,7 @@ public class UriConfigurationTest extends CamelTestSupport {
assertEquals(false, config.isBinary());
assertEquals(false, config.isImplicit());
assertEquals("TLS", config.getSecurityProtocol());
- assertEquals(RemoteFileConfiguration.PathSeparator.Auto, config.getSeparator());
+ assertEquals(RemoteFileConfiguration.PathSeparator.UNIX, config.getSeparator());
}
@Test
[2/2] camel git commit: CAMEL-8586: File component optimization
required for file response body. Thanks to Sergey Zolotaryov for the patch.
Posted by da...@apache.org.
CAMEL-8586: File component optimization required for file response body. Thanks to Sergey Zolotaryov for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9b380b85
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9b380b85
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9b380b85
Branch: refs/heads/master
Commit: 9b380b85b597382b068b9c26e20f5025e89f725c
Parents: e6e3047
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Apr 6 12:30:20 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 7 09:51:50 2015 +0200
----------------------------------------------------------------------
.../camel/component/file/FileOperations.java | 2 +-
.../file/FileProducerFileBodyGetsMoved.java | 78 ++++++++++++++++++++
2 files changed, 79 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9b380b85/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java b/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
index 5bf82bb..4164a07 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
@@ -223,10 +223,10 @@ public class FileOperations implements GenericFileOperations<File> {
Object body = exchange.getIn().getBody();
if (body instanceof WrappedFile) {
body = ((WrappedFile<?>) body).getFile();
- fileBased = true;
}
if (body instanceof File) {
source = (File) body;
+ fileBased = true;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9b380b85/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileBodyGetsMoved.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileBodyGetsMoved.java b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileBodyGetsMoved.java
new file mode 100644
index 0000000..2e5aca9
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerFileBodyGetsMoved.java
@@ -0,0 +1,78 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.file;
+
+import java.io.File;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Checks that body of type {@link java.io.File} is simply moved avoiding
+ * copying using IO streams.
+ */
+public class FileProducerFileBodyGetsMoved extends ContextTestSupport {
+
+ @Before
+ @Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/filemove");
+ super.setUp();
+ }
+
+ @Test
+ public void testStoreFileExchangeBodyIsFile() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedFileExists("target/filemove/testStoreFile");
+ mock.expectedMessageCount(1);
+ File temporaryFile = File.createTempFile("camel", "test");
+
+ template.requestBodyAndHeader("direct:in", temporaryFile, Exchange.FILE_LOCAL_WORK_PATH, temporaryFile);
+
+ mock.assertIsSatisfied();
+ assertFalse("Temporary body file should have been moved, not copied", temporaryFile.exists());
+ }
+
+ @Test
+ public void testStoreFileExchangeBodyIsWrappedFile() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedFileExists("target/filemove/testStoreFile");
+ mock.expectedMessageCount(1);
+ File temporaryFile = File.createTempFile("camel", "test");
+
+ GenericFile<File> body = new GenericFile<File>();
+ body.setFile(temporaryFile);
+ template.requestBodyAndHeader("direct:in", temporaryFile, Exchange.FILE_LOCAL_WORK_PATH, temporaryFile);
+
+ mock.assertIsSatisfied();
+ assertFalse("Temporary body file should have been moved, not copied", temporaryFile.exists());
+ }
+
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("direct:in").to("file://target/filemove/?fileName=testStoreFile")
+ .to("mock:result");
+ }
+ };
+ }
+
+}