Author: ningjiang
Date: Fri Oct 31 20:38:18 2008
New Revision: 709635
URL: http://svn.apache.org/viewvc?rev=709635&view=rev
Log:
Fixed the cs errors
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/CustomLog.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorWithOutBodyTraceTest.java
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java?rev=709635&r1=709634&r2=709635&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
Fri Oct 31 20:38:18 2008
@@ -63,7 +63,7 @@
protected abstract String getOperationText();
protected String assertionFailureMessage(Exchange exchange, Object
leftValue, Object rightValue) {
- return this + " failed on " + exchange +
- " with left value <" + leftValue + "> right value <" + rightValue
+ ">";
+ return this + " failed on " + exchange
+ + " with left value <" + leftValue + "> right value <" +
rightValue + ">";
}
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java?rev=709635&r1=709634&r2=709635&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
Fri Oct 31 20:38:18 2008
@@ -29,8 +29,9 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.CamelContextHelper;
+import org.apache.camel.util.ObjectHelper;
+
import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
/**
@@ -46,12 +47,7 @@
private boolean useEndpointCache = true;
private final Map<String, Endpoint<E>> endpointCache = new HashMap<String,
Endpoint<E>>();
private Endpoint<E> defaultEndpoint;
-
- public static DefaultProducerTemplate newInstance(CamelContext
camelContext, String defaultEndpointUri) {
- Endpoint endpoint =
CamelContextHelper.getMandatoryEndpoint(camelContext, defaultEndpointUri);
- return new DefaultProducerTemplate(camelContext, endpoint);
- }
-
+
public DefaultProducerTemplate(CamelContext context) {
this.context = context;
}
@@ -61,6 +57,11 @@
this.defaultEndpoint = defaultEndpoint;
}
+ public static DefaultProducerTemplate newInstance(CamelContext
camelContext, String defaultEndpointUri) {
+ Endpoint endpoint =
CamelContextHelper.getMandatoryEndpoint(camelContext, defaultEndpointUri);
+ return new DefaultProducerTemplate(camelContext, endpoint);
+ }
+
public E send(String endpointUri, E exchange) {
Endpoint endpoint = resolveMandatoryEndpoint(endpointUri);
return send(endpoint, exchange);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java?rev=709635&r1=709634&r2=709635&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java
Fri Oct 31 20:38:18 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,8 +16,8 @@
*/
package org.apache.camel.impl;
-import org.apache.camel.Processor;
import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.util.ObjectHelper;
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java?rev=709635&r1=709634&r2=709635&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
Fri Oct 31 20:38:18 2008
@@ -35,8 +35,8 @@
private boolean showHeaders = true;
private boolean showBody = true;
private boolean showBodyType = true;
- private boolean showOutBody = false;
- private boolean showOutBodyType = false;
+ private boolean showOutBody;
+ private boolean showOutBodyType;
private boolean showException = true;
public Object format(TraceInterceptor interceptor, Exchange exchange) {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java?rev=709635&r1=709634&r2=709635&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
Fri Oct 31 20:38:18 2008
@@ -41,7 +41,7 @@
private Predicate traceFilter;
private boolean traceInterceptors;
private boolean traceExceptions = true;
- private boolean traceOutExchanges = false;
+ private boolean traceOutExchanges;
/**
* A helper method to return the Tracer instance for a given [EMAIL
PROTECTED] CamelContext} if one is enabled
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/CustomLog.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/CustomLog.java?rev=709635&r1=709634&r2=709635&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/CustomLog.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/CustomLog.java
Fri Oct 31 20:38:18 2008
@@ -20,8 +20,8 @@
class CustomLog implements Log {
- boolean loggedTrace = false;
- boolean loggedFatal = false;
+ boolean loggedTrace;
+ boolean loggedFatal;
public boolean isDebugEnabled() {
return true;
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java?rev=709635&r1=709634&r2=709635&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java
Fri Oct 31 20:38:18 2008
@@ -133,7 +133,7 @@
// END SNIPPET: exceptionBuilder1
from("direct:a")
-
.processRef("myExceptionThrowingProcessor").to("mock:result");
+
.processRef("myExceptionThrowingProcessor").to("mock:result");
}
};
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorWithOutBodyTraceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorWithOutBodyTraceTest.java?rev=709635&r1=709634&r2=709635&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorWithOutBodyTraceTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorWithOutBodyTraceTest.java
Fri Oct 31 20:38:18 2008
@@ -39,9 +39,9 @@
// END SNIPPET: tracingOutExchanges
from("direct:start").
- transform().body().
- to("mock:a").
- to("mock:b");
+ transform().body().
+ to("mock:a").
+ to("mock:b");
}
};
}
Modified:
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java?rev=709635&r1=709634&r2=709635&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
(original)
+++
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
Fri Oct 31 20:38:18 2008
@@ -16,13 +16,13 @@
*/
package org.apache.camel.language.groovy;
-import groovy.lang.Binding;
-import groovy.lang.Script;
-
import java.util.AbstractMap;
import java.util.Collections;
import java.util.Set;
+import groovy.lang.Binding;
+import groovy.lang.Script;
+
import org.apache.camel.Exchange;
import org.apache.camel.impl.ExpressionSupport;
import org.apache.camel.util.ExchangeHelper;
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java?rev=709635&r1=709634&r2=709635&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java
Fri Oct 31 20:38:18 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +16,9 @@
*/
package org.apache.camel.component.jms;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
@@ -25,10 +27,8 @@
import org.apache.camel.impl.DefaultProducerTemplate;
import org.apache.camel.impl.ProducerTemplateProcessor;
import org.apache.camel.util.ObjectHelper;
-import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
+import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
/**
* A JMS [EMAIL PROTECTED] MessageListener} which converts an incoming JMS
message into a Camel message [EMAIL PROTECTED] Exchange} then
@@ -44,6 +44,12 @@
private final Processor processor;
private JmsBinding binding = new JmsBinding();
private ExchangePattern pattern = ExchangePattern.InOnly;
+
+ public CamelMessageListener(CamelContext camelContext, Processor
processor) {
+ this.camelContext = camelContext;
+ this.processor = processor;
+ ObjectHelper.notNull(processor, "processor");
+ }
/**
* Creates a new CamelMessageListener which will invoke a Camel endpoint
@@ -67,13 +73,7 @@
*/
public static CamelMessageListener newInstance(CamelContext camelContext,
ProducerTemplate producerTemplate) {
return new CamelMessageListener(camelContext, new
ProducerTemplateProcessor(producerTemplate));
- }
-
- public CamelMessageListener(CamelContext camelContext, Processor
processor) {
- this.camelContext = camelContext;
- this.processor = processor;
- ObjectHelper.notNull(processor, "processor");
- }
+ }
/**
* Processes the incoming JMS message
Modified:
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java?rev=709635&r1=709634&r2=709635&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java
(original)
+++
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java
Fri Oct 31 20:38:18 2008
@@ -51,7 +51,7 @@
endpoint.expectedBodiesReceived(body);
template.sendBody(uri, body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testTCPEncodeUTF8InputIsString() throws Exception {
@@ -71,7 +71,7 @@
endpoint.expectedBodiesReceived(body);
template.sendBody(uri, body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testTCPEncodeUTF8TextLineInputIsString() throws Exception {
@@ -91,7 +91,7 @@
endpoint.expectedBodiesReceived(body);
template.sendBody(uri, body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
// Note: MINA does not support sending bytes with the textline codec
@@ -114,7 +114,7 @@
endpoint.expectedBodiesReceived(body);
template.sendBody(uri, body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testUDPEncodeUTF8InputIsString() throws Exception {
@@ -135,7 +135,7 @@
template.sendBody(uri, body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testUDPEncodeUTF8InputIsStringNoMock() throws Exception {
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java?rev=709635&r1=709634&r2=709635&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java
Fri Oct 31 20:38:18 2008
@@ -17,9 +17,9 @@
package org.apache.camel.spring.processor;
-import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
import org.apache.camel.CamelContext;
import org.apache.camel.processor.TraceInterceptorWithOutBodyTraceTest;
+import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
public class SpringTraceInterceptorWithOutBodyTraceTest extends
TraceInterceptorWithOutBodyTraceTest {
protected CamelContext createCamelContext() throws Exception {
