You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2017/07/08 11:36:29 UTC
[1/3] camel git commit: replace System.getProperty("line.separator")
with System.lineSeparator()
Repository: camel
Updated Branches:
refs/heads/master ffc08f480 -> f59e3ec66
replace System.getProperty("line.separator") with System.lineSeparator()
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bfec7c14
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bfec7c14
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bfec7c14
Branch: refs/heads/master
Commit: bfec7c14b8ae332df02d3e5d6ce2394a6c707bfa
Parents: dcb001f
Author: Pascal Schumacher <pa...@gmx.net>
Authored: Sat Jul 8 11:22:01 2017 +0200
Committer: Pascal Schumacher <pa...@gmx.net>
Committed: Sat Jul 8 11:22:01 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/processor/DefaultExchangeFormatter.java | 2 +-
.../camel/processor/interceptor/DefaultTraceFormatter.java | 2 +-
.../org/apache/camel/util/jsse/BaseSSLContextParameters.java | 2 +-
camel-core/src/test/java/org/apache/camel/TestSupport.java | 2 +-
.../org/apache/camel/component/log/LogBodyWithNewLineTest.java | 4 ++--
.../camel/component/file/remote/FtpConsumerFileSplitTest.java | 2 +-
.../component/google/drive/AbstractGoogleDriveTestSupport.java | 2 +-
.../camel/component/mina2/Mina2ReverseProtocolHandler.java | 2 +-
.../org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java | 2 +-
.../apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java | 2 +-
.../src/main/java/org/apache/camel/test/TestSupport.java | 2 +-
.../src/main/java/org/apache/camel/test/junit4/TestSupport.java | 2 +-
.../src/main/java/org/apache/camel/testng/TestSupport.java | 2 +-
.../org/apache/camel/springboot/commands/crsh/OutputBuffer.java | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
index 5cf552f..bf39ab9 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DefaultExchangeFormatter.java
@@ -37,7 +37,7 @@ import org.apache.camel.util.StringHelper;
@UriParams
public class DefaultExchangeFormatter implements ExchangeFormatter {
- protected static final String LS = System.getProperty("line.separator");
+ protected static final String LS = System.lineSeparator();
private static final String SEPARATOR = "###REPLACE_ME###";
public enum OutputStyle { Default, Tab, Fixed }
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
index c00590e..7c35952 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
@@ -31,7 +31,7 @@ import org.apache.camel.util.MessageHelper;
@Deprecated
public class DefaultTraceFormatter implements TraceFormatter {
- protected static final String LS = System.getProperty("line.separator");
+ protected static final String LS = System.lineSeparator();
private static final String SEPARATOR = "###REPLACE_ME###";
private int breadCrumbLength;
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java b/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
index 170eda2..e4c73a3 100644
--- a/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
+++ b/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
@@ -73,7 +73,7 @@ public abstract class BaseSSLContextParameters extends JsseParameters {
private static final Logger LOG = LoggerFactory.getLogger(BaseSSLContextParameters.class);
- private static final String LS = System.getProperty("line.separator");
+ private static final String LS = System.lineSeparator();
private static final String SSL_ENGINE_CIPHER_SUITE_LOG_MSG = createCipherSuiteLogMessage("SSLEngine");
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/camel-core/src/test/java/org/apache/camel/TestSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/TestSupport.java b/camel-core/src/test/java/org/apache/camel/TestSupport.java
index 70ee0bf..44acc58 100644
--- a/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
*/
public abstract class TestSupport extends TestCase {
- protected static final String LS = System.getProperty("line.separator");
+ protected static final String LS = System.lineSeparator();
private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
protected Logger log = LoggerFactory.getLogger(getClass());
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java b/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java
index af3d598..6b3ce69 100644
--- a/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java
@@ -57,7 +57,7 @@ public class LogBodyWithNewLineTest extends ContextTestSupport {
}
public void testNoSkip() throws Exception {
- final String ls = System.getProperty("line.separator");
+ final String ls = System.lineSeparator();
String body = "1" + ls + "2" + ls + "3";
template.sendBody("direct:start", body);
@@ -68,7 +68,7 @@ public class LogBodyWithNewLineTest extends ContextTestSupport {
}
public void testSkip() throws Exception {
- final String ls = System.getProperty("line.separator");
+ final String ls = System.lineSeparator();
String body = "1" + ls + "2" + ls + "3";
template.sendBody("direct:skip", body);
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
index 5064671..44c3be3 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
@@ -47,7 +47,7 @@ public class FtpConsumerFileSplitTest extends FtpServerTestSupport {
public void configure() throws Exception {
from(getFtpUrl())
.to("log:file")
- .split(body().tokenize(System.getProperty("line.separator")))
+ .split(body().tokenize(System.lineSeparator()))
.to("log:line")
.to("mock:result");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
index fac64bc..8637db5 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
@@ -50,7 +50,7 @@ public abstract class AbstractGoogleDriveTestSupport extends CamelTestSupport {
private static String propertyText;
- private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+ private static final String LINE_SEPARATOR = System.lineSeparator();
private static final String TEST_OPTIONS_PROPERTIES = "/test-options.properties";
private static final String REFRESH_TOKEN_PROPERTY = "refreshToken";
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ReverseProtocolHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ReverseProtocolHandler.java b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ReverseProtocolHandler.java
index 6267dc0..aa99467 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ReverseProtocolHandler.java
+++ b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ReverseProtocolHandler.java
@@ -43,7 +43,7 @@ public class Mina2ReverseProtocolHandler extends IoHandlerAdapter {
if (TestSupport.isPlatform("windows")) {
// seems to be only required on windows to make it work!
- buf.append(System.getProperty("line.separator"));
+ buf.append(System.lineSeparator());
}
// and write it back.
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
index 68d5aa1..4b8cb78 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
+++ b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
@@ -69,7 +69,7 @@ public class Mina2UdpNoCamelTest {
UDPClient client = new UDPClient();
client.connect("127.0.0.1", port);
for (int i = 0; i < 222; i++) {
- client.sendNoMina("Hello Mina " + i + System.getProperty("line.separator"));
+ client.sendNoMina("Hello Mina " + i + System.lineSeparator());
}
Thread.sleep(2000);
assertEquals(222, server.numMessagesReceived);
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
index 73fa126..c1b139d 100644
--- a/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
+++ b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
@@ -46,7 +46,7 @@ public final class TidyMarkupTestSupport {
String line = null;
while ((line = input.readLine()) != null) {
fileContent.append(line);
- fileContent.append(System.getProperty("line.separator"));
+ fileContent.append(System.lineSeparator());
}
} finally {
input.close();
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
index dac93c4..c13213a 100644
--- a/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
+++ b/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
*/
@Deprecated
public abstract class TestSupport extends TestCase {
- protected static final String LS = System.getProperty("line.separator");
+ protected static final String LS = System.lineSeparator();
private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
protected Logger log = LoggerFactory.getLogger(getClass());
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
index 1c25eba..fcd0b7b 100644
--- a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
+++ b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
*/
public abstract class TestSupport extends Assert {
- protected static final String LS = System.getProperty("line.separator");
+ protected static final String LS = System.lineSeparator();
private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
protected Logger log = LoggerFactory.getLogger(getClass());
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
index 99d1974..803170e 100644
--- a/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
+++ b/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
@@ -48,7 +48,7 @@ import org.testng.Assert;
* A bunch of useful testing methods
*/
public abstract class TestSupport extends Assert {
- protected static final String LS = System.getProperty("line.separator");
+ protected static final String LS = System.lineSeparator();
private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
protected Logger log = LoggerFactory.getLogger(getClass());
http://git-wip-us.apache.org/repos/asf/camel/blob/bfec7c14/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/OutputBuffer.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/OutputBuffer.java b/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/OutputBuffer.java
index 5f54004..c6924e4 100644
--- a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/OutputBuffer.java
+++ b/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/OutputBuffer.java
@@ -37,7 +37,7 @@ class OutputBuffer {
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(baos.toByteArray())));
StringBuffer sb = new StringBuffer();
String line;
- String lineSeparator = System.getProperty("line.separator");
+ String lineSeparator = System.lineSeparator();
try {
while ((line = bufferedReader.readLine()) != null) {
sb.append(line);
[3/3] camel git commit: Merge branch 'system_lineSeparator' of
https://github.com/PascalSchumacher/camel
Posted by bv...@apache.org.
Merge branch 'system_lineSeparator' of https://github.com/PascalSchumacher/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f59e3ec6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f59e3ec6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f59e3ec6
Branch: refs/heads/master
Commit: f59e3ec665567c1581f4f495f70d10666ac1b4f6
Parents: ffc08f4 39f8256
Author: Babak Vahdat <bv...@apache.org>
Authored: Sat Jul 8 13:35:55 2017 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Sat Jul 8 13:35:55 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/processor/DefaultExchangeFormatter.java | 2 +-
.../camel/processor/interceptor/DefaultTraceFormatter.java | 2 +-
.../org/apache/camel/util/jsse/BaseSSLContextParameters.java | 2 +-
camel-core/src/test/java/org/apache/camel/TestSupport.java | 2 +-
.../component/dataset/FileDataSetProducerWithSplitTest.java | 2 +-
.../org/apache/camel/component/log/LogBodyWithNewLineTest.java | 6 ++----
.../camel/component/file/remote/FtpConsumerFileSplitTest.java | 2 +-
.../component/google/drive/AbstractGoogleDriveTestSupport.java | 3 +--
.../camel/component/mina2/Mina2ReverseProtocolHandler.java | 2 +-
.../org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java | 2 +-
.../java/org/apache/camel/component/stream/StreamFileTest.java | 2 +-
.../camel/component/stream/StreamGroupLinesStrategyTest.java | 2 +-
.../org/apache/camel/component/stream/StreamSystemOutTest.java | 2 +-
.../apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java | 2 +-
.../src/main/java/org/apache/camel/test/TestSupport.java | 2 +-
.../main/java/org/apache/camel/test/junit4/TestSupport.java | 2 +-
.../src/main/java/org/apache/camel/testng/TestSupport.java | 2 +-
.../apache/camel/springboot/commands/crsh/OutputBuffer.java | 2 +-
18 files changed, 19 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[2/3] camel git commit: use CamelTestSupport#LS instead of
System#lineSeparator were possible
Posted by bv...@apache.org.
use CamelTestSupport#LS instead of System#lineSeparator were possible
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/39f82566
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/39f82566
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/39f82566
Branch: refs/heads/master
Commit: 39f82566f9fb79affb5a18d741c219215d1dc91c
Parents: bfec7c1
Author: Pascal Schumacher <pa...@gmx.net>
Authored: Sat Jul 8 13:16:04 2017 +0200
Committer: Pascal Schumacher <pa...@gmx.net>
Committed: Sat Jul 8 13:16:04 2017 +0200
----------------------------------------------------------------------
.../component/dataset/FileDataSetProducerWithSplitTest.java | 2 +-
.../org/apache/camel/component/log/LogBodyWithNewLineTest.java | 6 ++----
.../camel/component/file/remote/FtpConsumerFileSplitTest.java | 2 +-
.../component/google/drive/AbstractGoogleDriveTestSupport.java | 3 +--
.../java/org/apache/camel/component/stream/StreamFileTest.java | 2 +-
.../camel/component/stream/StreamGroupLinesStrategyTest.java | 2 +-
.../org/apache/camel/component/stream/StreamSystemOutTest.java | 2 +-
7 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/39f82566/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java b/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
index ed1474b..f65a7a3 100644
--- a/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
@@ -70,7 +70,7 @@ public class FileDataSetProducerWithSplitTest extends ContextTestSupport {
@Override
public void setUp() throws Exception {
File fileDataset = createFileDatasetWithSystemEndOfLine();
- dataSet = new FileDataSet(fileDataset, System.lineSeparator());
+ dataSet = new FileDataSet(fileDataset, LS);
assertEquals("Unexpected DataSet size", testDataFileRecordCount, dataSet.getSize());
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/39f82566/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java b/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java
index 6b3ce69..63333fe 100644
--- a/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java
@@ -57,8 +57,7 @@ public class LogBodyWithNewLineTest extends ContextTestSupport {
}
public void testNoSkip() throws Exception {
- final String ls = System.lineSeparator();
- String body = "1" + ls + "2" + ls + "3";
+ String body = "1" + LS + "2" + LS + "3";
template.sendBody("direct:start", body);
@@ -68,8 +67,7 @@ public class LogBodyWithNewLineTest extends ContextTestSupport {
}
public void testSkip() throws Exception {
- final String ls = System.lineSeparator();
- String body = "1" + ls + "2" + ls + "3";
+ String body = "1" + LS + "2" + LS + "3";
template.sendBody("direct:skip", body);
http://git-wip-us.apache.org/repos/asf/camel/blob/39f82566/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
index 44c3be3..9ede3f4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
@@ -47,7 +47,7 @@ public class FtpConsumerFileSplitTest extends FtpServerTestSupport {
public void configure() throws Exception {
from(getFtpUrl())
.to("log:file")
- .split(body().tokenize(System.lineSeparator()))
+ .split(body().tokenize(LS))
.to("log:line")
.to("mock:result");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/39f82566/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
index 8637db5..4c844fd 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
@@ -50,7 +50,6 @@ public abstract class AbstractGoogleDriveTestSupport extends CamelTestSupport {
private static String propertyText;
- private static final String LINE_SEPARATOR = System.lineSeparator();
private static final String TEST_OPTIONS_PROPERTIES = "/test-options.properties";
private static final String REFRESH_TOKEN_PROPERTY = "refreshToken";
@@ -91,7 +90,7 @@ public abstract class AbstractGoogleDriveTestSupport extends CamelTestSupport {
final BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8"));
String line;
while ((line = reader.readLine()) != null) {
- builder.append(line).append(LINE_SEPARATOR);
+ builder.append(line).append(LS);
}
propertyText = builder.toString();
http://git-wip-us.apache.org/repos/asf/camel/blob/39f82566/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
----------------------------------------------------------------------
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
index 16b6491..d53d11d 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
@@ -92,7 +92,7 @@ public class StreamFileTest extends CamelTestSupport {
from("direct:start").routeId("produce")
.to("stream:file?fileName=target/stream/StreamFileTest.txt&autoCloseCount=2");
from("file://target/stream?fileName=StreamFileTest.txt&noop=true").routeId("consume").autoStartup(false)
- .split().tokenize(System.lineSeparator()).to("mock:result");
+ .split().tokenize(LS).to("mock:result");
}
});
context.start();
http://git-wip-us.apache.org/repos/asf/camel/blob/39f82566/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesStrategyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesStrategyTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesStrategyTest.java
index 265ab18..10bb6af 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesStrategyTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesStrategyTest.java
@@ -38,7 +38,7 @@ public class StreamGroupLinesStrategyTest extends StreamGroupLinesTest {
StringBuilder buffer = new StringBuilder();
for (String line : lines) {
buffer.append(line);
- buffer.append(System.lineSeparator());
+ buffer.append(LS);
}
return buffer.toString();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/39f82566/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java
----------------------------------------------------------------------
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java
index 5427a1a..a2691f9 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java
@@ -45,7 +45,7 @@ public class StreamSystemOutTest extends CamelTestSupport {
template.sendBody("direct:in", message);
// Then
- assertEquals(message + System.lineSeparator(), new String(mockOut.toByteArray()));
+ assertEquals(message + LS, new String(mockOut.toByteArray()));
} finally {
System.setOut(stdOut);
}