You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/11/21 03:45:07 UTC
svn commit: r719456 - in /activemq/camel/branches/camel-1.x:
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/processor/
camel-core/src/main/java/org/apache/camel...
Author: ningjiang
Date: Thu Nov 20 18:45:06 2008
New Revision: 719456
URL: http://svn.apache.org/viewvc?rev=719456&view=rev
Log:
Fixed the CS errors
Modified:
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/CustomLog.java
activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java
activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java
activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorWithOutBodyTraceTest.java
activemq/camel/branches/camel-1.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
activemq/camel/branches/camel-1.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java
activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java
activemq/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
activemq/camel/branches/camel-1.x/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java Thu Nov 20 18:45:06 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,12 @@
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/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/ProducerTemplateProcessor.java Thu Nov 20 18:45:06 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/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/DelayerType.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/DelayerType.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/DelayerType.java Thu Nov 20 18:45:06 2008
@@ -83,8 +83,8 @@
private Expression createAbsoluteTimeDelayExpression(RouteContext routeContext) {
ExpressionType expr = getExpression();
if (expr != null) {
- if (ObjectHelper.isNotNullAndNonEmpty(expr.getExpression()) ||
- expr.getExpressionValue() != null) {
+ if (ObjectHelper.isNotNullAndNonEmpty(expr.getExpression())
+ || expr.getExpressionValue() != null) {
return expr.createExpression(routeContext);
}
}
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java Thu Nov 20 18:45:06 2008
@@ -27,11 +27,11 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
+import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.Route;
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.language.constant.ConstantLanguage;
import org.apache.camel.processor.CatchProcessor;
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java Thu Nov 20 18:45:06 2008
@@ -126,7 +126,7 @@
long duration = time - groupStartTime;
groupStartTime = time;
- return getAction() + ": " + receivedCount + " messages so far. Last group took: " + (duration)
+ return getAction() + ": " + receivedCount + " messages so far. Last group took: " + duration
+ " millis which is: " + numberFormat.format(rate)
+ " messages per second. average: " + numberFormat.format(average);
}
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java Thu Nov 20 18:45:06 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/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java Thu Nov 20 18:45:06 2008
@@ -41,7 +41,7 @@
private Predicate<Exchange> 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 {@link CamelContext} if one is enabled
Modified: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/CustomLog.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/CustomLog.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/CustomLog.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/CustomLog.java Thu Nov 20 18:45:06 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/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithRetryLoggingLevelSetTest.java Thu Nov 20 18:45:06 2008
@@ -133,7 +133,7 @@
// END SNIPPET: exceptionBuilder1
from("direct:a")
- .processRef("myExceptionThrowingProcessor").to("mock:result");
+ .processRef("myExceptionThrowingProcessor").to("mock:result");
}
};
}
Modified: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java Thu Nov 20 18:45:06 2008
@@ -22,7 +22,7 @@
public void testLogStringDurationIsNotZero() throws Exception {
ThroughputLogger underTest = new ThroughputLogger(10);
- for (int i=0; i<25; i++) {
+ for (int i = 0; i < 25; i++) {
underTest.process(null);
}
String message = (String) underTest.logMessage(null);
Modified: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorWithOutBodyTraceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorWithOutBodyTraceTest.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorWithOutBodyTraceTest.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorWithOutBodyTraceTest.java Thu Nov 20 18:45:06 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/branches/camel-1.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java Thu Nov 20 18:45:06 2008
@@ -18,11 +18,10 @@
import javax.sql.DataSource;
+import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.Component;
-import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.DefaultExchange;
Modified: activemq/camel/branches/camel-1.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java Thu Nov 20 18:45:06 2008
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.jdbc;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.sql.DataSource;
import org.apache.camel.ContextTestSupport;
@@ -26,9 +29,6 @@
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import java.util.List;
-import java.util.ArrayList;
-
public class JdbcOptionsTest extends ContextTestSupport {
private String driverClass = "org.hsqldb.jdbcDriver";
private String url = "jdbc:hsqldb:mem:camel_jdbc";
Modified: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java Thu Nov 20 18:45:06 2008
@@ -17,10 +17,12 @@
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 {
return createSpringCamelContext(this, "org/apache/camel/spring/processor/traceInterceptorWithOutBodyTrace.xml");
Modified: activemq/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java Thu Nov 20 18:45:06 2008
@@ -16,10 +16,11 @@
*/
package org.apache.camel.component.sql;
-import javax.sql.DataSource;
import java.util.List;
import java.util.Map;
+import javax.sql.DataSource;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
Modified: activemq/camel/branches/camel-1.x/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java?rev=719456&r1=719455&r2=719456&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java (original)
+++ activemq/camel/branches/camel-1.x/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java Thu Nov 20 18:45:06 2008
@@ -82,6 +82,14 @@
* @parameter expression="true"
*/
protected boolean runCamel;
+
+ /**
+ * Should we try run the DOT executable on the generated .DOT file to
+ * generate images
+ *
+ * @parameter expression="true"
+ */
+ protected boolean useDot;
/**
* The main class to execute.
@@ -91,15 +99,7 @@
* @required
*/
private String mainClass;
-
- /**
- * Should we try run the DOT executable on the generated .DOT file to
- * generate images
- *
- * @parameter expression="true"
- */
- protected boolean useDot;
-
+
/**
* Reference to Maven 2 Project.
*