Author: bvahdat
Date: Sat Feb 25 12:37:35 2012
New Revision: 1293592
URL: http://svn.apache.org/viewvc?rev=1293592&view=rev
Log:
Polished and fixed a bunch of CS errors.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java
camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/JschComponent.java
camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java?rev=1293592&r1=1293591&r2=1293592&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java
Sat Feb 25 12:37:35 2012
@@ -30,8 +30,8 @@ import org.apache.camel.support.Synchron
*/
public class SedaWaitForTaskNewerOnCompletionTest extends ContextTestSupport {
- private final CountDownLatch latch = new CountDownLatch(1);
private static String done = "";
+ private final CountDownLatch latch = new CountDownLatch(1);
public void testNever() throws Exception {
getMockEndpoint("mock:dead").expectedMessageCount(0);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java?rev=1293592&r1=1293591&r2=1293592&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java
Sat Feb 25 12:37:35 2012
@@ -18,10 +18,7 @@ package org.apache.camel.processor;
import java.util.Iterator;
-import org.apache.camel.CamelExecutionException;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
/**
Modified:
camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/JschComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/JschComponent.java?rev=1293592&r1=1293591&r2=1293592&view=diff
==============================================================================
---
camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/JschComponent.java
(original)
+++
camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/JschComponent.java
Sat Feb 25 12:37:35 2012
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.jsch;
-import com.jcraft.jsch.JSch;
-
import java.net.URI;
import java.util.Map;
+import com.jcraft.jsch.JSch;
+
import org.apache.camel.CamelContext;
import org.apache.camel.component.file.GenericFileEndpoint;
import org.apache.camel.component.file.remote.RemoteFileComponent;
Modified:
camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java?rev=1293592&r1=1293591&r2=1293592&view=diff
==============================================================================
---
camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
(original)
+++
camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
Sat Feb 25 12:37:35 2012
@@ -16,7 +16,12 @@
*/
package org.apache.camel.component.jsch;
-import static org.apache.camel.util.ObjectHelper.isNotEmpty;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Hashtable;
+import java.util.List;
+
import com.jcraft.jsch.ChannelExec;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
@@ -24,12 +29,6 @@ import com.jcraft.jsch.Session;
import com.jcraft.jsch.UIKeyboardInteractive;
import com.jcraft.jsch.UserInfo;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Hashtable;
-import java.util.List;
-
import org.apache.camel.Exchange;
import org.apache.camel.component.file.GenericFileEndpoint;
import org.apache.camel.component.file.GenericFileOperationFailedException;
@@ -39,6 +38,8 @@ import org.apache.camel.util.ObjectHelpe
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.util.ObjectHelper.isNotEmpty;
+
/**
* SCP remote file operations
*/
@@ -98,7 +99,7 @@ public class ScpOperations implements Re
// TODO: need config for scp *-p* (preserves modification times,
access times, and modes from the original file)
// String command="scp " + (ptimestamp ? "-p " : "") + "-t " +
configuration.getDirectory();
// TODO: refactor to use generic command
- String command="scp -t " + target;
+ String command = "scp -t " + target;
channel.setCommand(command);
channel.connect(timeout);
LOG.trace("Channel connected to {}",
cfg.remoteServerInformation());
Modified:
camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java?rev=1293592&r1=1293591&r2=1293592&view=diff
==============================================================================
---
camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
(original)
+++
camel/trunk/components/camel-jsch/src/test/java/org/apache/camel/component/jsch/ScpServerTestSupport.java
Sat Feb 25 12:37:35 2012
@@ -16,17 +16,17 @@
*/
package org.apache.camel.component.jsch;
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
-import com.jcraft.jsch.UserInfo;
-
import java.io.File;
import java.io.IOException;
import java.security.Provider;
import java.security.Provider.Service;
import java.security.Security;
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
+import com.jcraft.jsch.UserInfo;
+
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.FileUtil;
Modified:
camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java?rev=1293592&r1=1293591&r2=1293592&view=diff
==============================================================================
---
camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
(original)
+++
camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
Sat Feb 25 12:37:35 2012
@@ -19,7 +19,6 @@ package org.apache.camel.component.print
import java.io.InputStream;
import javax.print.DocFlavor;
-import javax.print.DocPrintJob;
import javax.print.PrintException;
import javax.print.PrintService;
import javax.print.PrintServiceLookup;
@@ -73,10 +72,6 @@ public class PrinterProducer extends Def
return printRequestAttributeSet;
}
- private DocPrintJob assignPrintJob(PrintService printService) {
- return printService.createPrintJob();
- }
-
private PrintService assignPrintService() throws PrintException {
PrintService printService;
Modified:
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java?rev=1293592&r1=1293591&r2=1293592&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
(original)
+++
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
Sat Feb 25 12:37:35 2012
@@ -178,7 +178,6 @@ public class SpringWebserviceProducer ex
}
});
-
}
@Override
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java?rev=1293592&r1=1293591&r2=1293592&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
Sat Feb 25 12:37:35 2012
@@ -24,7 +24,6 @@ import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Route;
import org.apache.camel.core.xml.AbstractCamelContextFactoryBean;
import org.apache.camel.impl.DefaultPackageScanClassResolver;
import org.apache.camel.impl.scan.AssignableToPackageScanFilter;
Modified:
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java?rev=1293592&r1=1293591&r2=1293592&view=diff
==============================================================================
---
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
(original)
+++
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
Sat Feb 25 12:37:35 2012
@@ -21,7 +21,6 @@ import java.util.HashSet;
import java.util.List;
import org.apache.camel.CamelContext;
-import org.apache.camel.Route;
import org.apache.camel.spring.CamelBeanPostProcessor;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.util.CastUtils;
Modified:
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java?rev=1293592&r1=1293591&r2=1293592&view=diff
==============================================================================
---
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
(original)
+++
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
Sat Feb 25 12:37:35 2012
@@ -20,7 +20,6 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import org.apache.camel.CamelContext;
-import org.apache.camel.Route;
import org.apache.camel.spring.CamelBeanPostProcessor;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.test.ExcludingPackageScanClassResolver;
Modified:
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java?rev=1293592&r1=1293591&r2=1293592&view=diff
==============================================================================
---
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
(original)
+++
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
Sat Feb 25 12:37:35 2012
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Set;
import org.apache.camel.CamelContext;
-import org.apache.camel.Route;
import org.apache.camel.impl.DefaultPackageScanClassResolver;
import org.apache.camel.impl.scan.AssignableToPackageScanFilter;
import org.apache.camel.impl.scan.InvertingPackageScanFilter;
