- changed test package name from org.baeldung to com.baeldung (#897)

- streams are added where neccessary
- format fixes

spring-apache-camel/pom.xml

@@ -11,7 +11,7 @@
 	<properties>
 		<env.camel.version>2.16.1</env.camel.version>
 		<env.spring.version>4.3.4.RELEASE</env.spring.version>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
 		<java.version>1.8</java.version>
 		<junit.version>4.12</junit.version>
 	</properties>
@@ -48,7 +48,11 @@
 			<artifactId>spring-context</artifactId>
 			<version>${env.spring.version}</version>
 		</dependency>
-
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.7.21</version>
+		</dependency>
 	</dependencies>
 
 	<build>

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() {
+        from("file://" + SOURCE_FOLDER + "?delete=true").process((exchange) -> {
-            @Override
+            throw new IllegalArgumentException("Exception thrown!");
-            public void process(Exchange exchange) throws Exception {
-                throw new IllegalArgumentException("Exception thrown!");
-            }
         });
     }
 }

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">
 
-	<bean id="contentBasedFileRouter" class="org.baeldung.camel.file.ContentBasedFileRouter" />
+	<bean id="contentBasedFileRouter" class="com.baeldung.camel.file.ContentBasedFileRouter" />
 
 	<camelContext xmlns="http://camel.apache.org/schema/spring">
 		<routeBuilder ref="contentBasedFileRouter" />

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">
 
-	<bean id="deadLetterChannelFileRouter" class="org.baeldung.camel.file.DeadLetterChannelFileRouter" />
+	<bean id="deadLetterChannelFileRouter" class="com.baeldung.camel.file.DeadLetterChannelFileRouter" />
 
 	<camelContext xmlns="http://camel.apache.org/schema/spring">
 		<routeBuilder ref="deadLetterChannelFileRouter" />

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">
 
-	<bean id="messageTranslatorFileRouter" class="org.baeldung.camel.file.MessageTranslatorFileRouter" />
+	<bean id="messageTranslatorFileRouter" class="com.baeldung.camel.file.MessageTranslatorFileRouter" />
 
 	<camelContext xmlns="http://camel.apache.org/schema/spring">
 		<routeBuilder ref="messageTranslatorFileRouter" />

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">
 
-	<bean id="multicastFileRouter" class="org.baeldung.camel.file.MulticastFileRouter" />
+	<bean id="multicastFileRouter" class="com.baeldung.camel.file.MulticastFileRouter" />
 
 	<camelContext xmlns="http://camel.apache.org/schema/spring">
 		<routeBuilder ref="multicastFileRouter" />

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">
 
-	<bean id="splitterFileRouter" class="org.baeldung.camel.file.SplitterFileRouter" />
+	<bean id="splitterFileRouter" class="com.baeldung.camel.file.SplitterFileRouter" />
 
 	<camelContext xmlns="http://camel.apache.org/schema/spring">
 		<routeBuilder ref="splitterFileRouter" />

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;

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;