Author: hadrian
Date: Fri Apr 29 16:21:02 2011
New Revision: 1097867
URL: http://svn.apache.org/viewvc?rev=1097867&view=rev
Log:
Supressing checkstyle and eclipse warnings
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1097867&r1=1097866&r2=1097867&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Fri Apr 29 16:21:02 2011
@@ -809,7 +809,6 @@ public class DefaultCamelContext extends
}
}
- @SuppressWarnings("deprecation")
public synchronized boolean removeRoute(String routeId) throws Exception {
RouteService routeService = routeServices.get(routeId);
if (routeService != null) {
@@ -1693,7 +1692,6 @@ public class DefaultCamelContext extends
}
}
- @SuppressWarnings("deprecation")
protected synchronized void stopRouteService(RouteService routeService,
boolean removingRoutes) throws Exception {
routeService.setRemovingRoutes(removingRoutes);
stopRouteService(routeService);
@@ -1716,7 +1714,6 @@ public class DefaultCamelContext extends
}
}
- @SuppressWarnings("deprecation")
protected synchronized void suspendRouteService(RouteService routeService)
throws Exception {
routeService.setRemovingRoutes(false);
routeService.suspend();
Modified:
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java?rev=1097867&r1=1097866&r2=1097867&view=diff
==============================================================================
---
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
(original)
+++
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
Fri Apr 29 16:21:02 2011
@@ -205,7 +205,7 @@ public class CometdComponent extends Def
sslSocketConnector.getSslContextFactory().setKeyManagerPassword(sslPassword);
sslSocketConnector.getSslContextFactory().setKeyStorePassword(sslKeyPassword);
if (sslKeystore != null) {
-
sslSocketConnector.getSslContextFactory().setKeyStore(sslKeystore);;
+
sslSocketConnector.getSslContextFactory().setKeyStore(sslKeystore);
}
}
return sslSocketConnector;
Modified:
camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java?rev=1097867&r1=1097866&r2=1097867&view=diff
==============================================================================
---
camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
(original)
+++
camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
Fri Apr 29 16:21:02 2011
@@ -87,10 +87,10 @@ public class JdbcProducer extends Defaul
exchange.getOut().setHeader(JdbcConstants.JDBC_UPDATE_COUNT,
updateCount);
}
conn.commit();
- } catch (Exception e){
- try{
+ } catch (Exception e) {
+ try {
conn.rollback();
- } catch (SQLException sqle){
+ } catch (SQLException sqle) {
LOG.warn("Error on jdbc component rollback: " + sqle, sqle);
}
throw e;
@@ -107,9 +107,9 @@ public class JdbcProducer extends Defaul
private void closeQuietly(ResultSet rs) {
if (rs != null) {
- try{
+ try {
rs.close();
- } catch (SQLException sqle){
+ } catch (SQLException sqle) {
LOG.warn("Error by closing result set: " + sqle, sqle);
}
}
@@ -117,9 +117,9 @@ public class JdbcProducer extends Defaul
private void closeQuietly(Statement stmt) {
if (stmt != null) {
- try{
+ try {
stmt.close();
- } catch (SQLException sqle){
+ } catch (SQLException sqle) {
LOG.warn("Error by closing statement: " + sqle, sqle);
}
}
@@ -127,9 +127,9 @@ public class JdbcProducer extends Defaul
private void resetAutoCommit(Connection con, Boolean autoCommit) {
if (con != null && autoCommit != null) {
- try{
+ try {
con.setAutoCommit(autoCommit);
- } catch (SQLException sqle){
+ } catch (SQLException sqle) {
LOG.warn("Error by resetting auto commit to its original
value: " + sqle, sqle);
}
}
@@ -137,9 +137,9 @@ public class JdbcProducer extends Defaul
private void closeQuietly(Connection con) {
if (con != null) {
- try{
+ try {
con.close();
- } catch (SQLException sqle){
+ } catch (SQLException sqle) {
LOG.warn("Error by closing connection: " + sqle, sqle);
}
}
Modified:
camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java?rev=1097867&r1=1097866&r2=1097867&view=diff
==============================================================================
---
camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java
(original)
+++
camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java
Fri Apr 29 16:21:02 2011
@@ -87,7 +87,7 @@ public class JdbcOptionsTest extends Cam
@Test
public void testInsertRollback() throws Exception {
// insert 2 records
- try{
+ try {
template.sendBody("direct:startTx", "insert into customer values
('cust3', 'johnsmith');insert into customer values ('cust3', 'hkesler')");
fail("Should have thrown a CamelExecutionException");
} catch (CamelExecutionException e) {
Modified:
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java?rev=1097867&r1=1097866&r2=1097867&view=diff
==============================================================================
---
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
(original)
+++
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
Fri Apr 29 16:21:02 2011
@@ -135,8 +135,8 @@ public abstract class TestSupport extend
public static <T> T assertIsInstanceOf(Class<T> expectedType, Object
value) {
assertNotNull(value, "Expected an instance of type: " +
expectedType.getName() + " but was null");
- assertTrue(expectedType.isInstance(value), "object should be a " +
expectedType.getName() +
- " but was: " + value + " with type: " +
value.getClass().getName());
+ assertTrue(expectedType.isInstance(value), "object should be a " +
expectedType.getName()
+ + " but was: " + value + " with type: " +
value.getClass().getName());
return expectedType.cast(value);
}