Author: hadrian
Date: Tue Nov 10 13:49:48 2009
New Revision: 834465
URL: http://svn.apache.org/viewvc?rev=834465&view=rev
Log:
Checkstyle fixes
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/AsyncProcessorConverter.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactedAsyncUsingThreadsTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/MyXPath.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Server.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoadBrokerTest.java
camel/trunk/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/AsyncProcessorConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/AsyncProcessorConverter.java?rev=834465&r1=834464&r2=834465&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/AsyncProcessorConverter.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/AsyncProcessorConverter.java
Tue Nov 10 13:49:48 2009
@@ -27,7 +27,11 @@
* @version $Revision$
*/
@Converter
-public class AsyncProcessorConverter {
+public final class AsyncProcessorConverter {
+
+ private AsyncProcessorConverter() {
+ // Utility class
+ }
private static final class ProcessorToAsyncProcessorBridge extends
DelegateProcessor implements AsyncProcessor {
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactedAsyncUsingThreadsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactedAsyncUsingThreadsTest.java?rev=834465&r1=834464&r2=834465&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactedAsyncUsingThreadsTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactedAsyncUsingThreadsTest.java
Tue Nov 10 13:49:48 2009
@@ -30,6 +30,10 @@
*/
public class TransactedAsyncUsingThreadsTest extends CamelSpringTestSupport {
+ private static int counter;
+ private static String thread1;
+ private static String thread2;
+
protected ClassPathXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(
"/org/apache/camel/component/jms/tx/TransactedAsyncUsingThreadsTest.xml");
@@ -39,10 +43,6 @@
return 0;
}
- private static int counter;
- private static String thread1;
- private static String thread2;
-
@Before
public void init() {
counter = 0;
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/MyXPath.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/MyXPath.java?rev=834465&r1=834464&r2=834465&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/MyXPath.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/MyXPath.java
Tue Nov 10 13:49:48 2009
@@ -15,16 +15,18 @@
* limitations under the License.
*/
package org.apache.camel.component.xslt;
+
//START SNIPPET: example
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.w3c.dom.NodeList;
+
import org.apache.camel.component.bean.XPathAnnotationExpressionFactory;
import org.apache.camel.language.LanguageAnnotation;
import org.apache.camel.language.NamespacePrefix;
-import org.w3c.dom.NodeList;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
Modified:
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Server.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Server.java?rev=834465&r1=834464&r2=834465&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Server.java
(original)
+++
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Server.java
Tue Nov 10 13:49:48 2009
@@ -18,8 +18,6 @@
import javax.xml.ws.Endpoint;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
Modified:
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java?rev=834465&r1=834464&r2=834465&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java
(original)
+++
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java
Tue Nov 10 13:49:48 2009
@@ -16,15 +16,9 @@
*/
package org.apache.camel.example.cxf.provider;
-import javax.xml.ws.Endpoint;
-
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-
public class Server {
AbstractApplicationContext applicationContext;
Modified:
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java?rev=834465&r1=834464&r2=834465&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java
(original)
+++
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java
Tue Nov 10 13:49:48 2009
@@ -18,17 +18,18 @@
import java.net.MalformedURLException;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.PingMeFault;
import org.apache.hello_world_soap_http.types.FaultDetail;
+
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
public class CamelTransportClientServerTest extends Assert {
static AbstractApplicationContext context;
Modified:
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java?rev=834465&r1=834464&r2=834465&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java
(original)
+++
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java
Tue Nov 10 13:49:48 2009
@@ -16,16 +16,16 @@
*/
package org.apache.camel.example.cxf.jaxrs;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.example.cxf.jaxrs.resources.Book;
import org.apache.camel.example.cxf.jaxrs.resources.BookNotFoundFault;
import org.apache.camel.example.cxf.jaxrs.resources.BookStore;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
-import org.apache.camel.test.junit4.CamelTestSupport;
+
import org.junit.Test;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
public class JAXRSClientServerTest extends CamelSpringTestSupport {
Modified:
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoadBrokerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoadBrokerTest.java?rev=834465&r1=834464&r2=834465&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoadBrokerTest.java
(original)
+++
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/webservice/version/LoadBrokerTest.java
Tue Nov 10 13:49:48 2009
@@ -16,17 +16,14 @@
*/
package org.apache.camel.loanbroker.webservice.version;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.apache.camel.CamelContext;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.loanbroker.webservice.version.bank.BankServer;
-import
org.apache.camel.loanbroker.webservice.version.credit.CreditAgencyServer;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
public class LoadBrokerTest extends Assert {
AbstractApplicationContext applicationContext;
@@ -62,5 +59,4 @@
assertTrue(delta2 < delta1);
}
-
}
Modified:
camel/trunk/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java?rev=834465&r1=834464&r2=834465&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java
(original)
+++
camel/trunk/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java
Tue Nov 10 13:49:48 2009
@@ -16,12 +16,14 @@
*/
package org.apache.camel.example.spring.javaconfig;
+import org.apache.camel.CamelContext;
+import org.apache.camel.spring.javaconfig.Main;
+
import org.junit.Assert;
import org.junit.Test;
+
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.apache.camel.CamelContext;
-import org.apache.camel.spring.javaconfig.Main;
/**
* @version $Revision$