You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/03/30 08:35:51 UTC
svn commit: r759848 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel: ./ impl/
Author: davsclaus
Date: Mon Mar 30 06:35:49 2009
New Revision: 759848
URL: http://svn.apache.org/viewvc?rev=759848&view=rev
Log:
Polished code based on sonar reports.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java?rev=759848&r1=759847&r2=759848&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java Mon Mar 30 06:35:49 2009
@@ -31,6 +31,11 @@
this.uri = uri;
}
+ public NoFactoryAvailableException(String uri, Throwable cause) {
+ this(uri);
+ initCause(cause);
+ }
+
public String getUri() {
return uri;
}
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=759848&r1=759847&r2=759848&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 Mon Mar 30 06:35:49 2009
@@ -558,7 +558,7 @@
answer = languages.get(language);
// check if the language is singleton, if so return the shared instance
- if (answer != null && answer instanceof IsSingleton) {
+ if (answer instanceof IsSingleton) {
boolean singleton = ((IsSingleton) answer).isSingleton();
if (singleton) {
return answer;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java?rev=759848&r1=759847&r2=759848&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java Mon Mar 30 06:35:49 2009
@@ -44,10 +44,10 @@
public abstract class DefaultComponent extends ServiceSupport implements Component {
private static final transient Log LOG = LogFactory.getLog(DefaultComponent.class);
- private final int defaultThreadPoolSize = 5;
+ private static final int DEFAULT_THREADPOOL_SIZE = 5;
private CamelContext camelContext;
private ScheduledExecutorService executorService;
-
+
public DefaultComponent() {
}
@@ -127,7 +127,7 @@
* @param parameters the parameters, an empty map if no parameters given
* @throws ResolveEndpointFailedException should be thrown if the URI validation failed
*/
- protected void validateURI(String uri, String path, Map parameters) throws ResolveEndpointFailedException {
+ protected void validateURI(String uri, String path, Map parameters) {
// check for uri containing & but no ? marker
if (uri.contains("&") && !uri.contains("?")) {
throw new ResolveEndpointFailedException(uri, "Invalid uri syntax: no ? marker however the uri "
@@ -164,7 +164,7 @@
* A factory method to create a default thread pool and executor
*/
protected ScheduledExecutorService createExecutorService() {
- return new ScheduledThreadPoolExecutor(defaultThreadPoolSize, new ThreadFactory() {
+ return new ScheduledThreadPoolExecutor(DEFAULT_THREADPOOL_SIZE, new ThreadFactory() {
int counter;
public synchronized Thread newThread(Runnable runnable) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java?rev=759848&r1=759847&r2=759848&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java Mon Mar 30 06:35:49 2009
@@ -90,7 +90,7 @@
* @param t the exception to handle
*/
protected void handleException(Throwable t) {
- Throwable newt = (t == null) ? new Throwable("Handling [null] exception") : t;
+ Throwable newt = (t == null) ? new IllegalArgumentException("Handling [null] exception") : t;
getExceptionHandler().handleException(newt);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java?rev=759848&r1=759847&r2=759848&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java Mon Mar 30 06:35:49 2009
@@ -104,7 +104,7 @@
public synchronized ScheduledExecutorService getExecutorService() {
if (executorService == null) {
Component c = getComponent();
- if (c != null && c instanceof DefaultComponent) {
+ if (c instanceof DefaultComponent) {
DefaultComponent dc = (DefaultComponent) c;
executorService = dc.getExecutorService();
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java?rev=759848&r1=759847&r2=759848&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java Mon Mar 30 06:35:49 2009
@@ -92,14 +92,14 @@
setProperties(safeCopy(exchange.getProperties()));
// this can cause strangeness if we copy, say, a FileMessage onto an FtpExchange with overloaded getExchange() methods etc.
- safeCopy(getIn(), exchange, exchange.getIn());
+ safeCopy(getIn(), exchange.getIn());
Message copyOut = exchange.getOut(false);
if (copyOut != null) {
- safeCopy(getOut(true), exchange, copyOut);
+ safeCopy(getOut(true), copyOut);
}
Message copyFault = exchange.getFault(false);
if (copyFault != null) {
- safeCopy(getFault(true), exchange, copyFault);
+ safeCopy(getFault(true), copyFault);
}
setException(exchange.getException());
@@ -108,7 +108,7 @@
setFromEndpoint(exchange.getFromEndpoint());
}
- private static void safeCopy(Message message, Exchange exchange, Message that) {
+ private static void safeCopy(Message message, Message that) {
if (message != null) {
message.copyFrom(that);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java?rev=759848&r1=759847&r2=759848&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeHolder.java Mon Mar 30 06:35:49 2009
@@ -52,10 +52,10 @@
private Object inBody;
private Object outBody;
private Object faultBody;
- private Map<String, Object> inHeaders = new LinkedHashMap<String, Object>();
- private Map<String, Object> outHeaders = new LinkedHashMap<String, Object>();
- private Map<String, Object> properties = new LinkedHashMap<String, Object>();
- private Map<String, Object> faultHeaders = new LinkedHashMap<String, Object>();
+ private final Map<String, Object> inHeaders = new LinkedHashMap<String, Object>();
+ private final Map<String, Object> outHeaders = new LinkedHashMap<String, Object>();
+ private final Map<String, Object> properties = new LinkedHashMap<String, Object>();
+ private final Map<String, Object> faultHeaders = new LinkedHashMap<String, Object>();
private Exception exception;
/**
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java?rev=759848&r1=759847&r2=759848&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java Mon Mar 30 06:35:49 2009
@@ -37,8 +37,8 @@
public class DefaultFactoryFinder implements FactoryFinder {
protected final ConcurrentHashMap<String, Class> classMap = new ConcurrentHashMap<String, Class>();
- private ClassResolver classResolver;
- private String path;
+ private final ClassResolver classResolver;
+ private final String path;
public DefaultFactoryFinder(ClassResolver classResolver, String resourcePath) {
this.classResolver = classResolver;
@@ -53,7 +53,7 @@
try {
return newInstance(key, null);
} catch (Exception e) {
- throw new NoFactoryAvailableException(key);
+ throw new NoFactoryAvailableException(key, e);
}
}
@@ -69,15 +69,13 @@
}
public Class findClass(String key, String propertyPrefix) throws ClassNotFoundException, IOException {
- if (propertyPrefix == null) {
- propertyPrefix = "";
- }
+ String prefix = propertyPrefix != null ? propertyPrefix : "";
- Class clazz = classMap.get(propertyPrefix + key);
+ Class clazz = classMap.get(prefix + key);
if (clazz == null) {
- clazz = newInstance(doFindFactoryProperties(key), propertyPrefix);
+ clazz = newInstance(doFindFactoryProperties(key), prefix);
if (clazz != null) {
- classMap.put(propertyPrefix + key, clazz);
+ classMap.put(prefix + key, clazz);
}
}
return clazz;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java?rev=759848&r1=759847&r2=759848&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MainSupport.java Mon Mar 30 06:35:49 2009
@@ -46,9 +46,9 @@
public abstract class MainSupport extends ServiceSupport {
protected static final Log LOG = LogFactory.getLog(MainSupport.class);
protected String dotOutputDir;
- private List<Option> options = new ArrayList<Option>();
- private CountDownLatch latch = new CountDownLatch(1);
- private AtomicBoolean completed = new AtomicBoolean(false);
+ private final List<Option> options = new ArrayList<Option>();
+ private final CountDownLatch latch = new CountDownLatch(1);
+ private final AtomicBoolean completed = new AtomicBoolean(false);
private long duration = -1;
private TimeUnit timeUnit = TimeUnit.MILLISECONDS;
private String routesOutputFile;
@@ -56,7 +56,7 @@
private boolean debug;
private boolean trace;
private List<RouteBuilder> routeBuilders = new ArrayList<RouteBuilder>();
- private List<CamelContext> camelContexts = new ArrayList<CamelContext>();
+ private final List<CamelContext> camelContexts = new ArrayList<CamelContext>();
private ProducerTemplate camelTemplate;
protected MainSupport() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java?rev=759848&r1=759847&r2=759848&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java Mon Mar 30 06:35:49 2009
@@ -45,7 +45,8 @@
}
};
- private List<TypeMapping> typeMappings = new ArrayList<TypeMapping>();
+
+ private final List<TypeMapping> typeMappings = new ArrayList<TypeMapping>();
public ReportingTypeConverterLoader(PackageScanClassResolver resolver) {
super(resolver);
@@ -74,11 +75,11 @@
*/
public static class TypeMapping {
private static int counter;
- private Class toType;
- private Class fromType;
- private Class converterType;
- private Method method;
- private int index;
+ private final Class toType;
+ private final Class fromType;
+ private final Class converterType;
+ private final Method method;
+ private final int index;
public TypeMapping(Class toType, Class fromType, Class converterType, Method method) {
this.toType = toType;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java?rev=759848&r1=759847&r2=759848&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java Mon Mar 30 06:35:49 2009
@@ -29,7 +29,7 @@
* Used by the camel-maven-plugin.
*/
public class ReportingTypeConverterRegistry implements TypeConverterRegistry {
- private List<String> errors = new ArrayList<String>();
+ private final List<String> errors = new ArrayList<String>();
public String[] getErrors() {
return errors.toArray(new String[errors.size()]);