Author: ningjiang
Date: Tue May 13 01:21:32 2008
New Revision: 655776
URL: http://svn.apache.org/viewvc?rev=655776&view=rev
Log:
Fixed bunch of CS errors
Modified:
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
activemq/camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.java
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
activemq/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
Modified:
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java?rev=655776&r1=655775&r2=655776&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
Tue May 13 01:21:32 2008
@@ -32,8 +32,8 @@
import org.apache.camel.Exchange;
import org.apache.camel.PollingConsumer;
import org.apache.camel.Producer;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.impl.DefaultPollingEndpoint;
+import org.apache.camel.util.ObjectHelper;
/**
* An <a href="http://activemq.apache.org/camel/atom.html";>Atom Endpoint</a>.
Modified:
activemq/camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.java?rev=655776&r1=655775&r2=655776&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.java
(original)
+++
activemq/camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.java
Tue May 13 01:21:32 2008
@@ -35,8 +35,8 @@
JingValidator validator = new JingValidator();
Resource resource = resolveMandatoryResource(remaining);
validator.setSchemaResource(resource);
- if (LOG.isDebugEnabled()) {
- LOG.debug(this + " using schema resource: " + resource);
+ if (log.isDebugEnabled()) {
+ log.debug(this + " using schema resource: " + resource);
}
configureValidator(validator, uri, remaining, parameters);
return new ProcessorEndpoint(uri, this, validator);
Modified:
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java?rev=655776&r1=655775&r2=655776&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
Tue May 13 01:21:32 2008
@@ -35,8 +35,8 @@
protected Endpoint<Exchange> createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
Resource resource = resolveMandatoryResource(remaining);
- if (LOG.isDebugEnabled()) {
- LOG.debug(this + " using schema resource: " + resource);
+ if (log.isDebugEnabled()) {
+ log.debug(this + " using schema resource: " + resource);
}
XQueryBuilder xslt = XQueryBuilder.xquery(resource.getURL());
configureXslt(xslt, uri, remaining, parameters);
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java?rev=655776&r1=655775&r2=655776&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
Tue May 13 01:21:32 2008
@@ -29,7 +29,7 @@
* @version $Revision$
*/
public abstract class ResourceBasedComponent extends
DefaultComponent<Exchange> {
- protected final transient Log LOG = LogFactory.getLog(getClass());
+ protected final transient Log log = LogFactory.getLog(getClass());
private ResourceLoader resourceLoader = new DefaultResourceLoader();
public ResourceLoader getResourceLoader() {
@@ -48,5 +48,5 @@
return resource;
}
}
-
+
}
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java?rev=655776&r1=655775&r2=655776&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
Tue May 13 01:21:32 2008
@@ -32,7 +32,7 @@
* @version $Revision$
*/
public abstract class ResourceBasedEndpoint extends ProcessorEndpoint {
- protected final transient Log LOG = LogFactory.getLog(getClass());
+ protected final transient Log log = LogFactory.getLog(getClass());
private final String resourceUri;
private ResourceLoader resourceLoader = new DefaultResourceLoader();
private Resource resource;
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java?rev=655776&r1=655775&r2=655776&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
Tue May 13 01:21:32 2008
@@ -21,20 +21,18 @@
import org.apache.camel.Producer;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultEndpoint;
-import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
-
+import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationContextAware;
-import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationEvent;
/**
* An <a href="http://activemq.apache.org/camel/event.html";>Event Endpoint</a>
* for working with Spring ApplicationEvents
- *
+ *
* @version $Revision$
*/
public class EventEndpoint extends DefaultEndpoint<Exchange> implements
ApplicationContextAware {
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java?rev=655776&r1=655775&r2=655776&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
Tue May 13 01:21:32 2008
@@ -36,8 +36,8 @@
SpringValidator validator = new SpringValidator();
Resource resource = resolveMandatoryResource(remaining);
validator.setSchemaResource(resource);
- if (LOG.isDebugEnabled()) {
- LOG.debug(this + " using schema resource: " + resource);
+ if (log.isDebugEnabled()) {
+ log.debug(this + " using schema resource: " + resource);
}
configureValidator(validator, uri, remaining, parameters);
return new ProcessorEndpoint(uri, this, validator);
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java?rev=655776&r1=655775&r2=655776&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
Tue May 13 01:21:32 2008
@@ -45,8 +45,8 @@
protected Endpoint<Exchange> createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
Resource resource = resolveMandatoryResource(remaining);
- if (LOG.isDebugEnabled()) {
- LOG.debug(this + " using schema resource: " + resource);
+ if (log.isDebugEnabled()) {
+ log.debug(this + " using schema resource: " + resource);
}
XsltBuilder xslt = newInstance(XsltBuilder.class);
Modified:
activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java?rev=655776&r1=655775&r2=655776&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
(original)
+++
activemq/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlProducer.java
Tue May 13 01:21:32 2008
@@ -34,7 +34,7 @@
public static final String UPDATE_COUNT =
"org.apache.camel.sql.update-count";
- private String query;
+ private String query;
private JdbcTemplate jdbcTemplate;
@@ -45,29 +45,30 @@
}
public void process(final Exchange exchange) throws Exception {
-
-
+
+
jdbcTemplate.execute(query, new PreparedStatementCallback() {
-
- public Object doInPreparedStatement(PreparedStatement
ps)
- throws SQLException,
DataAccessException {
- int argNumber = 1;
- for (Iterator<?> i =
exchange.getIn().getBody(Iterator.class); i.hasNext();) {
- ps.setObject(argNumber++, i.next());
- }
- boolean isResultSet = ps.execute();
- if (isResultSet) {
- RowMapperResultSetExtractor mapper =
new RowMapperResultSetExtractor(new ColumnMapRowMapper());
- List result = (List)
mapper.extractData(ps.getResultSet());
- exchange.getOut().setBody(result);
- } else {
-
exchange.getIn().setHeader(UPDATE_COUNT, ps.getUpdateCount());
- }
- return null;
- }
-
- });
-
+
+ public Object doInPreparedStatement(PreparedStatement ps) throws
SQLException,
+ DataAccessException {
+ int argNumber = 1;
+ for (Iterator<?> i = exchange.getIn().getBody(Iterator.class);
i.hasNext();) {
+ ps.setObject(argNumber++, i.next());
+ }
+ boolean isResultSet = ps.execute();
+ if (isResultSet) {
+ RowMapperResultSetExtractor mapper = new
RowMapperResultSetExtractor(
+
new ColumnMapRowMapper());
+ List result = (List)mapper.extractData(ps.getResultSet());
+ exchange.getOut().setBody(result);
+ } else {
+ exchange.getIn().setHeader(UPDATE_COUNT,
ps.getUpdateCount());
+ }
+ return null;
+ }
+
+ });
+
}
}
Modified:
activemq/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java?rev=655776&r1=655775&r2=655776&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
Tue May 13 01:21:32 2008
@@ -38,7 +38,7 @@
protected String user = "sa";
protected String password = "";
private DataSource ds;
- private JdbcTemplate jdbcTemplate;
+ private JdbcTemplate jdbcTemplate;
public void testSimpleBody() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -62,7 +62,7 @@
Map row = assertIsInstanceOf(Map.class, received.get(0));
assertEquals(1, row.get("ID"));
}
-
+
public void testBadNumberOfParameter() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -86,7 +86,7 @@
Map row2 = assertIsInstanceOf(Map.class, received.get(1));
assertEquals("AMQ", row2.get("PROJECT"));
}
-
+
public void testListLimitedResult() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -101,22 +101,24 @@
}
public void testInsert() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(1);
-
- template.sendBody("direct:insert", new Object[] {10, "test",
"test"});
- mock.assertIsSatisfied();
- try {
- String projectName = (String)
jdbcTemplate.queryForObject("select project from projects where id = 10",
String.class);
- assertEquals("test", projectName);
- } catch (EmptyResultDataAccessException e) {
- fail("no row inserted");
- }
-
- Integer actualUpdateCount =
mock.getExchanges().get(0).getIn().getHeader(SqlProducer.UPDATE_COUNT,
Integer.class);
- assertEquals((Integer)1, actualUpdateCount);
- }
-
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:insert", new Object[] {10, "test", "test"});
+ mock.assertIsSatisfied();
+ try {
+ String projectName = (String)jdbcTemplate
+ .queryForObject("select project from projects where id = 10",
String.class);
+ assertEquals("test", projectName);
+ } catch (EmptyResultDataAccessException e) {
+ fail("no row inserted");
+ }
+
+ Integer actualUpdateCount =
mock.getExchanges().get(0).getIn().getHeader(SqlProducer.UPDATE_COUNT,
+
Integer.class);
+ assertEquals((Integer)1, actualUpdateCount);
+ }
+
protected void setUp() throws Exception {
Class.forName(driverClass);
super.setUp();
@@ -149,14 +151,12 @@
from("direct:list")
.to("sql:select * from projects where license = # and
project = # order by id")
.to("mock:result");
-
+
from("direct:simpleLimited")
.to("sql:select * from projects where license = # order by
id?template.maxRows=1")
.to("mock:result");
- from("direct:insert")
- .to("sql:insert into projects values (#, #, #)")
- .to("mock:result");
+ from("direct:insert").to("sql:insert into projects values (#,
#, #)").to("mock:result");
}
};
}
Modified:
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java?rev=655776&r1=655775&r2=655776&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
Tue May 13 01:21:32 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.stream;
+import org.apache.camel.Component;
import org.apache.camel.Consumer;
+import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.Component;
-import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultEndpoint;
public class StreamEndpoint extends DefaultEndpoint<Exchange> {
Modified:
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java?rev=655776&r1=655775&r2=655776&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
(original)
+++
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
Tue May 13 01:21:32 2008
@@ -27,8 +27,8 @@
import java.util.Arrays;
import java.util.List;
-import org.apache.camel.Exchange;
import org.apache.camel.CamelExchangeException;
+import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
