From dfd2d7a23801729314528a0f094f4ca71b132b33 Mon Sep 17 00:00:00 2001 From: Ante Pocedulic Date: Thu, 15 Dec 2016 16:23:08 +0100 Subject: [PATCH] - changed test package name from org.baeldung to com.baeldung (#897) - streams are added where neccessary - format fixes --- spring-apache-camel/pom.xml | 8 ++++++-- .../camel/file/DeadLetterChannelFileRouter.java | 12 ++++-------- .../camel-context-ContentBasedFileRouterTest.xml | 2 +- .../camel-context-DeadLetterChannelFileRouter.xml | 2 +- ...camel-context-MessageTranslatorFileRouterTest.xml | 2 +- .../camel-context-MulticastFileRouterTest.xml | 2 +- .../resources/camel-context-SplitterFileRouter.xml | 2 +- .../destination-folder/2016-12-14 23-33-25File1.txt | 0 .../destination-folder/2016-12-14 23-33-25File2.txt | 0 .../ContentBasedFileRouterIntegrationTest.java | 2 +- .../DeadLetterChannelFileRouterIntegrationTest.java | 3 +-- .../file/processor/FileProcessorIntegrationTest.java | 2 +- .../camel/file/processor/FileProcessorTest.java | 2 +- .../MessageTranslatorFileRouterIntegrationTest.java | 2 +- .../MulticastFileRouterIntegrationTest.java | 2 +- .../processor/SplitterFileRouterIntegrationTest.java | 2 +- .../apache/camel/main/AppIntegrationTest.java | 2 +- 17 files changed, 23 insertions(+), 24 deletions(-) create mode 100755 spring-apache-camel/src/test/destination-folder/2016-12-14 23-33-25File1.txt create mode 100755 spring-apache-camel/src/test/destination-folder/2016-12-14 23-33-25File2.txt rename spring-apache-camel/src/test/java/{org => com}/apache/camel/file/processor/ContentBasedFileRouterIntegrationTest.java (97%) rename spring-apache-camel/src/test/java/{org => com}/apache/camel/file/processor/DeadLetterChannelFileRouterIntegrationTest.java (94%) rename spring-apache-camel/src/test/java/{org => com}/apache/camel/file/processor/FileProcessorIntegrationTest.java (98%) rename spring-apache-camel/src/test/java/{org => com}/apache/camel/file/processor/FileProcessorTest.java (98%) rename spring-apache-camel/src/test/java/{org => com}/apache/camel/file/processor/MessageTranslatorFileRouterIntegrationTest.java (97%) rename spring-apache-camel/src/test/java/{org => com}/apache/camel/file/processor/MulticastFileRouterIntegrationTest.java (97%) rename spring-apache-camel/src/test/java/{org => com}/apache/camel/file/processor/SplitterFileRouterIntegrationTest.java (97%) rename spring-apache-camel/src/test/java/{org => com}/apache/camel/main/AppIntegrationTest.java (96%) diff --git a/spring-apache-camel/pom.xml b/spring-apache-camel/pom.xml index e68768a624..4daa3c1e9a 100644 --- a/spring-apache-camel/pom.xml +++ b/spring-apache-camel/pom.xml @@ -11,7 +11,7 @@ 2.16.1 4.3.4.RELEASE - 2.19.1 + 2.19.1 1.8 4.12 @@ -48,7 +48,11 @@ spring-context ${env.spring.version} - + + org.slf4j + slf4j-log4j12 + 1.7.21 + diff --git a/spring-apache-camel/src/main/java/com/baeldung/camel/file/DeadLetterChannelFileRouter.java b/spring-apache-camel/src/main/java/com/baeldung/camel/file/DeadLetterChannelFileRouter.java index 0388560175..fdcad99f02 100644 --- a/spring-apache-camel/src/main/java/com/baeldung/camel/file/DeadLetterChannelFileRouter.java +++ b/spring-apache-camel/src/main/java/com/baeldung/camel/file/DeadLetterChannelFileRouter.java @@ -1,8 +1,6 @@ package com.baeldung.camel.file; -import org.apache.camel.Exchange; import org.apache.camel.LoggingLevel; -import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; public class DeadLetterChannelFileRouter extends RouteBuilder { @@ -10,13 +8,11 @@ public class DeadLetterChannelFileRouter extends RouteBuilder { @Override public void configure() throws Exception { - errorHandler(deadLetterChannel("log:dead?level=ERROR").maximumRedeliveries(3).redeliveryDelay(1000).retryAttemptedLogLevel(LoggingLevel.ERROR)); + errorHandler(deadLetterChannel("log:dead?level=ERROR").maximumRedeliveries(3) + .redeliveryDelay(1000).retryAttemptedLogLevel(LoggingLevel.ERROR)); - from("file://" + SOURCE_FOLDER + "?delete=true").process(new Processor() { - @Override - public void process(Exchange exchange) throws Exception { - throw new IllegalArgumentException("Exception thrown!"); - } + from("file://" + SOURCE_FOLDER + "?delete=true").process((exchange) -> { + throw new IllegalArgumentException("Exception thrown!"); }); } } diff --git a/spring-apache-camel/src/main/resources/camel-context-ContentBasedFileRouterTest.xml b/spring-apache-camel/src/main/resources/camel-context-ContentBasedFileRouterTest.xml index f6bf8c7503..d6d3e62f1c 100644 --- a/spring-apache-camel/src/main/resources/camel-context-ContentBasedFileRouterTest.xml +++ b/spring-apache-camel/src/main/resources/camel-context-ContentBasedFileRouterTest.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> - + diff --git a/spring-apache-camel/src/main/resources/camel-context-DeadLetterChannelFileRouter.xml b/spring-apache-camel/src/main/resources/camel-context-DeadLetterChannelFileRouter.xml index 3ed80da7e0..ef61174b32 100644 --- a/spring-apache-camel/src/main/resources/camel-context-DeadLetterChannelFileRouter.xml +++ b/spring-apache-camel/src/main/resources/camel-context-DeadLetterChannelFileRouter.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> - + diff --git a/spring-apache-camel/src/main/resources/camel-context-MessageTranslatorFileRouterTest.xml b/spring-apache-camel/src/main/resources/camel-context-MessageTranslatorFileRouterTest.xml index d3d2706e22..7ab988ca8a 100644 --- a/spring-apache-camel/src/main/resources/camel-context-MessageTranslatorFileRouterTest.xml +++ b/spring-apache-camel/src/main/resources/camel-context-MessageTranslatorFileRouterTest.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> - + diff --git a/spring-apache-camel/src/main/resources/camel-context-MulticastFileRouterTest.xml b/spring-apache-camel/src/main/resources/camel-context-MulticastFileRouterTest.xml index 4982b61dbd..6f7e7cbb60 100644 --- a/spring-apache-camel/src/main/resources/camel-context-MulticastFileRouterTest.xml +++ b/spring-apache-camel/src/main/resources/camel-context-MulticastFileRouterTest.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> - + diff --git a/spring-apache-camel/src/main/resources/camel-context-SplitterFileRouter.xml b/spring-apache-camel/src/main/resources/camel-context-SplitterFileRouter.xml index 1f5945707a..9d4a890cc6 100644 --- a/spring-apache-camel/src/main/resources/camel-context-SplitterFileRouter.xml +++ b/spring-apache-camel/src/main/resources/camel-context-SplitterFileRouter.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> - + diff --git a/spring-apache-camel/src/test/destination-folder/2016-12-14 23-33-25File1.txt b/spring-apache-camel/src/test/destination-folder/2016-12-14 23-33-25File1.txt new file mode 100755 index 0000000000..e69de29bb2 diff --git a/spring-apache-camel/src/test/destination-folder/2016-12-14 23-33-25File2.txt b/spring-apache-camel/src/test/destination-folder/2016-12-14 23-33-25File2.txt new file mode 100755 index 0000000000..e69de29bb2 diff --git a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/ContentBasedFileRouterIntegrationTest.java b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/ContentBasedFileRouterIntegrationTest.java similarity index 97% rename from spring-apache-camel/src/test/java/org/apache/camel/file/processor/ContentBasedFileRouterIntegrationTest.java rename to spring-apache-camel/src/test/java/com/apache/camel/file/processor/ContentBasedFileRouterIntegrationTest.java index 29a5b4fc0f..b0920fe3b5 100644 --- a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/ContentBasedFileRouterIntegrationTest.java +++ b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/ContentBasedFileRouterIntegrationTest.java @@ -1,4 +1,4 @@ -package org.apache.camel.file.processor; +package com.apache.camel.file.processor; import java.io.File; diff --git a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/DeadLetterChannelFileRouterIntegrationTest.java b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/DeadLetterChannelFileRouterIntegrationTest.java similarity index 94% rename from spring-apache-camel/src/test/java/org/apache/camel/file/processor/DeadLetterChannelFileRouterIntegrationTest.java rename to spring-apache-camel/src/test/java/com/apache/camel/file/processor/DeadLetterChannelFileRouterIntegrationTest.java index 49d91aa661..eb684230c9 100644 --- a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/DeadLetterChannelFileRouterIntegrationTest.java +++ b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/DeadLetterChannelFileRouterIntegrationTest.java @@ -1,9 +1,8 @@ -package org.apache.camel.file.processor; +package com.apache.camel.file.processor; import java.io.File; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/FileProcessorIntegrationTest.java b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/FileProcessorIntegrationTest.java similarity index 98% rename from spring-apache-camel/src/test/java/org/apache/camel/file/processor/FileProcessorIntegrationTest.java rename to spring-apache-camel/src/test/java/com/apache/camel/file/processor/FileProcessorIntegrationTest.java index e73ad1e4a4..1d88e8aeb4 100644 --- a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/FileProcessorIntegrationTest.java +++ b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/FileProcessorIntegrationTest.java @@ -1,4 +1,4 @@ -package org.apache.camel.file.processor; +package com.apache.camel.file.processor; import java.io.File; diff --git a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/FileProcessorTest.java b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/FileProcessorTest.java similarity index 98% rename from spring-apache-camel/src/test/java/org/apache/camel/file/processor/FileProcessorTest.java rename to spring-apache-camel/src/test/java/com/apache/camel/file/processor/FileProcessorTest.java index 3d63f614e0..c4a3ced84f 100644 --- a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/FileProcessorTest.java +++ b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/FileProcessorTest.java @@ -1,4 +1,4 @@ -package org.apache.camel.file.processor; +package com.apache.camel.file.processor; import java.io.File; diff --git a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/MessageTranslatorFileRouterIntegrationTest.java b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/MessageTranslatorFileRouterIntegrationTest.java similarity index 97% rename from spring-apache-camel/src/test/java/org/apache/camel/file/processor/MessageTranslatorFileRouterIntegrationTest.java rename to spring-apache-camel/src/test/java/com/apache/camel/file/processor/MessageTranslatorFileRouterIntegrationTest.java index d9d889c4df..bcd382dd6c 100644 --- a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/MessageTranslatorFileRouterIntegrationTest.java +++ b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/MessageTranslatorFileRouterIntegrationTest.java @@ -1,4 +1,4 @@ -package org.apache.camel.file.processor; +package com.apache.camel.file.processor; import java.io.File; diff --git a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/MulticastFileRouterIntegrationTest.java b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/MulticastFileRouterIntegrationTest.java similarity index 97% rename from spring-apache-camel/src/test/java/org/apache/camel/file/processor/MulticastFileRouterIntegrationTest.java rename to spring-apache-camel/src/test/java/com/apache/camel/file/processor/MulticastFileRouterIntegrationTest.java index 960d310692..137480ac8e 100644 --- a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/MulticastFileRouterIntegrationTest.java +++ b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/MulticastFileRouterIntegrationTest.java @@ -1,4 +1,4 @@ -package org.apache.camel.file.processor; +package com.apache.camel.file.processor; import java.io.File; diff --git a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/SplitterFileRouterIntegrationTest.java b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/SplitterFileRouterIntegrationTest.java similarity index 97% rename from spring-apache-camel/src/test/java/org/apache/camel/file/processor/SplitterFileRouterIntegrationTest.java rename to spring-apache-camel/src/test/java/com/apache/camel/file/processor/SplitterFileRouterIntegrationTest.java index 9e942dd4c2..1991dd8d21 100644 --- a/spring-apache-camel/src/test/java/org/apache/camel/file/processor/SplitterFileRouterIntegrationTest.java +++ b/spring-apache-camel/src/test/java/com/apache/camel/file/processor/SplitterFileRouterIntegrationTest.java @@ -1,4 +1,4 @@ -package org.apache.camel.file.processor; +package com.apache.camel.file.processor; import java.io.File; import java.io.FileWriter; diff --git a/spring-apache-camel/src/test/java/org/apache/camel/main/AppIntegrationTest.java b/spring-apache-camel/src/test/java/com/apache/camel/main/AppIntegrationTest.java similarity index 96% rename from spring-apache-camel/src/test/java/org/apache/camel/main/AppIntegrationTest.java rename to spring-apache-camel/src/test/java/com/apache/camel/main/AppIntegrationTest.java index fc7fa9653b..b33e6a3b29 100644 --- a/spring-apache-camel/src/test/java/org/apache/camel/main/AppIntegrationTest.java +++ b/spring-apache-camel/src/test/java/com/apache/camel/main/AppIntegrationTest.java @@ -1,4 +1,4 @@ -package org.apache.camel.main; +package com.apache.camel.main; import com.baeldung.camel.main.App; import junit.framework.TestCase;