You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2021/03/13 00:36:41 UTC
[camel] branch master updated (9076c74 -> 00a78cd)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
discard 9076c74 Fix source format
new 00a78cd Fix source format
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (9076c74)
\
N -- N -- N refs/heads/master (00a78cd)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/component/file/FileToFileWithFlattenTest.java | 6 ------
1 file changed, 6 deletions(-)
[camel] 01/01: Fix source format
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 00a78cd0eee654a4df9ec0cf8f68343095d67a25
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Mar 12 22:14:30 2021 +0100
Fix source format
---
.../file/FileConsumerExtendedAttributesTest.java | 18 +++++++++---------
.../file/FileProducerCharsetUTFOptimizedTest.java | 2 +-
.../component/file/FileToFileWithFlattenTest.java | 12 ------------
3 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExtendedAttributesTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExtendedAttributesTest.java
index 30029b7..b65fada 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExtendedAttributesTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExtendedAttributesTest.java
@@ -36,31 +36,31 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class FileConsumerExtendedAttributesTest extends ContextTestSupport {
private static final String FILE = "attributes.txt";
- private final String ROOT = testDirectory().toString();
+ private final String root = testDirectory().toString();
@Override
@BeforeEach
public void setUp() throws Exception {
super.setUp();
- Files.createFile(Paths.get(ROOT, "basic", FILE));
- Files.createFile(Paths.get(ROOT, "basic-as-default", FILE));
- Files.createFile(Paths.get(ROOT, "basic-as-default-with-filter", FILE));
- Files.createFile(Paths.get(ROOT, "posix", FILE));
+ Files.createFile(Paths.get(root, "basic", FILE));
+ Files.createFile(Paths.get(root, "basic-as-default", FILE));
+ Files.createFile(Paths.get(root, "basic-as-default-with-filter", FILE));
+ Files.createFile(Paths.get(root, "posix", FILE));
}
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- fromF("file://%s/basic?initialDelay=0&delay=10&extendedAttributes=basic:*", ROOT).convertBodyTo(String.class)
+ fromF("file://%s/basic?initialDelay=0&delay=10&extendedAttributes=basic:*", root).convertBodyTo(String.class)
.to("mock:basic");
- fromF("file://%s/basic-as-default?initialDelay=0&delay=10&extendedAttributes=*", ROOT)
+ fromF("file://%s/basic-as-default?initialDelay=0&delay=10&extendedAttributes=*", root)
.convertBodyTo(String.class).to("mock:basic-as-default");
fromF("file://%s/basic-as-default-with-filter?initialDelay=0&delay=10&extendedAttributes=size,lastModifiedTime,lastAccessTime",
- ROOT).convertBodyTo(String.class)
+ root).convertBodyTo(String.class)
.to("mock:basic-as-default-with-filter");
- fromF("file://%s/posix?initialDelay=0&delay=10&extendedAttributes=posix:*", ROOT).convertBodyTo(String.class)
+ fromF("file://%s/posix?initialDelay=0&delay=10&extendedAttributes=posix:*", root).convertBodyTo(String.class)
.to("mock:posix");
}
};
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFOptimizedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFOptimizedTest.java
index 69fcd6b..8302559 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFOptimizedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFOptimizedTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class FileProducerCharsetUTFOptimizedTest extends ContextTestSupport {
// use utf-8 as original payload with 00e6 which is a danish ae letter
- private byte[] utf = ("ABC\u00e6D\uD867\uDE3DE\uD83C\uDFF3").getBytes(StandardCharsets.UTF_8);
+ private byte[] utf = "ABC\u00e6D\uD867\uDE3DE\uD83C\uDFF3".getBytes(StandardCharsets.UTF_8);
@Test
public void testFileProducerCharsetUTFOptimized() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java
index 9c0c1e4..e4f3e5b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java
@@ -58,19 +58,13 @@ public class FileToFileWithFlattenTest extends ContextTestSupport {
// flatten files
mock.expectedFileExists(testFile("flatten-out/bye.txt"));
- ;
mock.expectedFileExists(testFile("flatten-out/hello.txt"));
- ;
mock.expectedFileExists(testFile("flatten-out/goodday.txt"));
- ;
// default move files
mock.expectedFileExists(testFile("flatten-in/.camel/bye.txt"));
- ;
mock.expectedFileExists(testFile("flatten-in/sub/.camel/hello.txt"));
- ;
mock.expectedFileExists(testFile("flatten-in/sub/sub2/.camel/goodday.txt"));
- ;
assertMockEndpointsSatisfied();
}
@@ -91,19 +85,13 @@ public class FileToFileWithFlattenTest extends ContextTestSupport {
// flatten files
mock.expectedFileExists(testFile("flatten-out/bye.txt"));
- ;
mock.expectedFileExists(testFile("flatten-out/hello.txt"));
- ;
mock.expectedFileExists(testFile("flatten-out/goodday.txt"));
- ;
// default move files
mock.expectedFileExists(testFile("flatten-in/.camel/bye.txt"));
- ;
mock.expectedFileExists(testFile("flatten-in/sub/.camel/hello.txt"));
- ;
mock.expectedFileExists(testFile("flatten-in/sub/sub2/.camel/goodday.txt"));
- ;
assertMockEndpointsSatisfied();
}