You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2011/06/10 08:02:12 UTC
svn commit: r1134198 [2/5] - in /camel/trunk/components:
camel-atom/src/main/java/org/apache/camel/component/atom/
camel-bam/src/main/java/org/apache/camel/bam/model/
camel-bam/src/main/java/org/apache/camel/bam/processor/
camel-bindy/src/main/java/org...
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java Fri Jun 10 06:02:06 2011
@@ -57,7 +57,7 @@ public class OsgiCamelContextPublisher e
props.put(CONTEXT_VERSION_PROPERTY, getBundleVersion(bundleContext.getBundle()));
if (log.isDebugEnabled()) {
- log.debug("Registering CamelContext [" + context.getName() + "] in OSGi registry");
+ log.debug("Registering CamelContext [{}] in OSGi registry", context.getName());
}
ServiceRegistration reg = bundleContext.registerService(CamelContext.class.getName(), context, props);
registrations.put(context, reg);
@@ -66,7 +66,7 @@ public class OsgiCamelContextPublisher e
ServiceRegistration reg = registrations.get(context);
if (reg != null) {
if (log.isDebugEnabled()) {
- log.debug("Unregistering CamelContext [" + context.getName() + "] from OSGi registry");
+ log.debug("Unregistering CamelContext [{}] from OSGi registry", context.getName());
}
reg.unregister();
}
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java Fri Jun 10 06:02:06 2011
@@ -40,8 +40,8 @@ public class OsgiComponentResolver imple
Object bean = null;
try {
bean = context.getRegistry().lookup(name);
- if (bean != null && LOG.isDebugEnabled()) {
- LOG.debug("Found component: " + name + " in registry: " + bean);
+ if (bean != null) {
+ LOG.debug("Found component: {} in registry: {}", name, bean);
}
} catch (Exception e) {
LOG.debug("Ignored error looking up bean: " + name + ". Error: " + e);
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java Fri Jun 10 06:02:06 2011
@@ -41,8 +41,8 @@ public class OsgiDataFormatResolver impl
Object bean = null;
try {
bean = context.getRegistry().lookup(name);
- if (bean != null && LOG.isDebugEnabled()) {
- LOG.debug("Found language: " + name + " in registry: " + bean);
+ if (bean != null) {
+ LOG.debug("Found language: {} in registry: {}", name, bean);
}
} catch (Exception e) {
if (LOG.isDebugEnabled()) {
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java Fri Jun 10 06:02:06 2011
@@ -41,8 +41,8 @@ public class OsgiLanguageResolver implem
Object bean = null;
try {
bean = context.getRegistry().lookup(name);
- if (bean != null && LOG.isDebugEnabled()) {
- LOG.debug("Found language: " + name + " in registry: " + bean);
+ if (bean != null) {
+ LOG.debug("Found language: {} in registry: {}", name, bean);
}
} catch (Exception e) {
if (LOG.isDebugEnabled()) {
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java Fri Jun 10 06:02:06 2011
@@ -300,7 +300,7 @@ public abstract class AbstractCamelConte
getContext().addRouteDefinitions(getRoutes());
if (LOG.isDebugEnabled()) {
- LOG.debug("Found JAXB created routes: " + getRoutes());
+ LOG.debug("Found JAXB created routes: {}", getRoutes());
}
findRouteBuilders();
installRoutes();
@@ -414,9 +414,7 @@ public abstract class AbstractCamelConte
for (RouteContextRefDefinition ref : getRouteRefs()) {
List<RouteDefinition> defs = ref.lookupRoutes(getContext());
for (RouteDefinition def : defs) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Adding route from " + ref + " -> " + def);
- }
+ LOG.debug("Adding route from {} -> {}", ref, def);
// add in top as they are most likely to be common/shared
// which you may want to start first
getRoutes().add(0, def);
Modified: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java Fri Jun 10 06:02:06 2011
@@ -182,9 +182,7 @@ public class CamelConduit extends Abstra
} else {
pattern = ExchangePattern.InOut;
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("send the message to endpoint" + targetCamelEndpointUri);
- }
+ LOG.debug("send the message to endpoint {}", targetCamelEndpointUri);
org.apache.camel.Exchange exchange = producer.createExchange(pattern);
exchange.setProperty(Exchange.TO_ENDPOINT, targetCamelEndpointUri);
Modified: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java Fri Jun 10 06:02:06 2011
@@ -273,9 +273,7 @@ public class CamelDestination extends Ab
CachedOutputStream outputStream = (CachedOutputStream)outMessage.getContent(OutputStream.class);
camelExchange.getOut().setBody(outputStream.getInputStream());
- if (LOG.isDebugEnabled()) {
- LOG.debug("send the response message: " + outputStream);
- }
+ LOG.debug("send the response message: {}", outputStream);
}
@Override
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java Fri Jun 10 06:02:06 2011
@@ -58,7 +58,7 @@ public class CxfClientCallback extends C
ctx);
}
if (LOG.isDebugEnabled()) {
- LOG.debug(Thread.currentThread().getName() + " calling handleResponse");
+ LOG.debug("{} calling handleResponse", Thread.currentThread().getName());
}
camelAsyncCallback.done(false);
}
@@ -77,7 +77,7 @@ public class CxfClientCallback extends C
ctx);
}
if (LOG.isDebugEnabled()) {
- LOG.debug(Thread.currentThread().getName() + " calling handleException");
+ LOG.debug("{} calling handleException", Thread.currentThread().getName());
}
camelAsyncCallback.done(false);
}
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Fri Jun 10 06:02:06 2011
@@ -168,10 +168,7 @@ public class CxfEndpoint extends Default
sfb.getFeatures().add(new MessageDataFormatFeature());
}
} else {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Ignore DataFormat mode " + getDataFormat()
- + " since SEI class is annotated with WebServiceProvider");
- }
+ LOG.debug("Ignore DataFormat mode {} since SEI class is annotated with WebServiceProvider", getDataFormat());
}
if (loggingFeatureEnabled) {
@@ -556,16 +553,12 @@ public class CxfEndpoint extends Default
public Bus getBus() {
if (bus == null) {
bus = doGetBus();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using DefaultBus " + bus);
- }
+ LOG.debug("Using DefaultBus {}", bus);
}
if (!getBusHasBeenCalled.getAndSet(true) && isSetDefaultBus) {
BusFactory.setDefaultBus(bus);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Set bus " + bus + " as thread default bus");
- }
+ LOG.debug("Set bus {} as thread default bus", bus);
}
return bus;
}
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java Fri Jun 10 06:02:06 2011
@@ -122,9 +122,7 @@ public class CxfHeaderFilterStrategy ext
// get filter
MessageHeaderFilter messageHeaderfilter = getMessageHeaderFilter(exchange);
if (messageHeaderfilter == null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("No CXF Binding namespace can be resolved. Message headers are intact.");
- }
+ LOG.debug("No CXF Binding namespace can be resolved. Message headers are intact.");
return false;
}
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Fri Jun 10 06:02:06 2011
@@ -304,10 +304,7 @@ public class CxfProducer extends Default
lp = endpoint.getDefaultOperationName();
}
if (lp == null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Try to find a default operation. You should set '"
- + CxfConstants.OPERATION_NAME + "' in header.");
- }
+ LOG.debug("Try to find a default operation. You should set '{}' in header.", CxfConstants.OPERATION_NAME);
Collection<BindingOperationInfo> bois =
client.getEndpoint().getEndpointInfo().getBinding().getOperations();
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Fri Jun 10 06:02:06 2011
@@ -679,7 +679,7 @@ public class DefaultCxfBinding implement
answer.add((Element)part);
} else {
if (LOG.isDebugEnabled()) {
- LOG.debug("Unhandled part type '" + part.getClass());
+ LOG.debug("Unhandled part type '{}'", part.getClass());
}
}
}
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java Fri Jun 10 06:02:06 2011
@@ -52,7 +52,7 @@ public class CxfBeanDestination extends
@Override
public void activate() {
if (LOG.isDebugEnabled()) {
- LOG.debug("Activating CxfBeanDestination " + getCamelDestinationUri());
+ LOG.debug("Activating CxfBeanDestination {}", getCamelDestinationUri());
}
endpoint = cxfBeanComponent.getEndpoint(getCamelDestinationUri());
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java Fri Jun 10 06:02:06 2011
@@ -37,9 +37,7 @@ public class CxfBeanTransportFactory ext
@Override
public Destination getDestination(EndpointInfo endpointInfo) throws IOException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Create CxfBeanDestination: " + endpointInfo);
- }
+ LOG.debug("Create CxfBeanDestination: {}", endpointInfo);
// lookup endpoint from component instead of CamelContext because it may not
// be added to the CamelContext yet.
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java Fri Jun 10 06:02:06 2011
@@ -90,9 +90,7 @@ public class CxfRsEndpoint extends Defau
public HeaderFilterStrategy getHeaderFilterStrategy() {
if (headerFilterStrategy == null) {
headerFilterStrategy = new CxfRsHeaderFilterStrategy();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Create default header filter strategy " + headerFilterStrategy);
- }
+ LOG.debug("Create default header filter strategy {}", headerFilterStrategy);
}
return headerFilterStrategy;
}
@@ -124,9 +122,7 @@ public class CxfRsEndpoint extends Defau
public synchronized CxfRsBinding getBinding() {
if (binding == null) {
binding = new DefaultCxfRsBinding();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Create default CXF Binding " + binding);
- }
+ LOG.debug("Create default CXF Binding {}", binding);
}
if (!bindingInitialized.getAndSet(true) && binding instanceof HeaderFilterStrategyAware) {
Modified: camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecBinding.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecBinding.java (original)
+++ camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecBinding.java Fri Jun 10 06:02:06 2011
@@ -64,9 +64,7 @@ public class DefaultExecBinding implemen
// use args from header instead from endpoint
s = exchange.getContext().getTypeConverter().convertTo(String.class, exchange, args);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Parsing argument String to a List: " + s);
- }
+ LOG.debug("Parsing argument String to a List: {}", s);
argsList = splitToWhiteSpaceSeparatedTokens(s);
}
Modified: camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java (original)
+++ camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java Fri Jun 10 06:02:06 2011
@@ -54,9 +54,7 @@ public class FlatpackComponent extends R
resource = getResourceLoader().getResource(remaining);
}
}
- if (log.isDebugEnabled()) {
- log.debug(this + " using flatpack map resource: " + resource);
- }
+ log.debug("{} using flatpack map resource: {}", this, resource);
FixedLengthEndpoint answer;
if (fixed) {
answer = new FixedLengthEndpoint(uri, resource);
Modified: camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java (original)
+++ camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java Fri Jun 10 06:02:06 2011
@@ -86,9 +86,7 @@ public class FreemarkerEndpoint extends
public FreemarkerEndpoint findOrCreateEndpoint(String uri, String newResourceUri) {
String newUri = uri.replace(getResourceUri(), newResourceUri);
- if (log.isDebugEnabled()) {
- log.debug("Getting endpoint with URI: " + newUri);
- }
+ log.debug("Getting endpoint with URI: {}", newUri);
return (FreemarkerEndpoint) getCamelContext().getEndpoint(newUri);
}
@@ -103,9 +101,7 @@ public class FreemarkerEndpoint extends
if (newResourceUri != null) {
exchange.getIn().removeHeader(FreemarkerConstants.FREEMARKER_RESOURCE_URI);
- if (log.isDebugEnabled()) {
- log.debug(FreemarkerConstants.FREEMARKER_RESOURCE_URI + " set to " + newResourceUri + " creating new endpoint to handle exchange");
- }
+ log.debug("{} set to {} creating new endpoint to handle exchange", FreemarkerConstants.FREEMARKER_RESOURCE_URI, newResourceUri);
FreemarkerEndpoint newEndpoint = findOrCreateEndpoint(getEndpointUri(), newResourceUri);
newEndpoint.onExchange(exchange);
return;
@@ -125,14 +121,10 @@ public class FreemarkerEndpoint extends
Template template;
if (reader != null) {
- if (log.isDebugEnabled()) {
- log.debug("Freemarker is evaluating template read from header " + FreemarkerConstants.FREEMARKER_TEMPLATE + " using context: " + variableMap);
- }
+ log.debug("Freemarker is evaluating template read from header {} using context: {}", FreemarkerConstants.FREEMARKER_TEMPLATE, variableMap);
template = new Template("temp", reader, new Configuration());
} else {
- if (log.isDebugEnabled()) {
- log.debug("Freemarker is evaluating " + path + " using context: " + variableMap);
- }
+ log.debug("Freemarker is evaluating {} using context: {}", path, variableMap);
if (getEncoding() != null) {
template = configuration.getTemplate(path, getEncoding());
} else {
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java Fri Jun 10 06:02:06 2011
@@ -116,7 +116,8 @@ public class FtpEndpoint<T extends FTPFi
}
if (log.isDebugEnabled()) {
- log.debug("Created FTPClient [connectTimeout: " + client.getConnectTimeout() + ", soTimeout: " + getSoTimeout() + ", dataTimeout: " + dataTimeout + "]: " + client);
+ log.debug("Created FTPClient [connectTimeout: {}, soTimeout: {}, dataTimeout: {}]: {}",
+ new Object[]{client.getConnectTimeout(), getSoTimeout(), dataTimeout, client});
}
FtpOperations operations = new FtpOperations(client, getFtpClientConfig());
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java Fri Jun 10 06:02:06 2011
@@ -206,9 +206,7 @@ public class FtpOperations implements Re
}
public boolean deleteFile(String name) throws GenericFileOperationFailedException {
- if (log.isDebugEnabled()) {
- log.debug("Deleting file: " + name);
- }
+ log.debug("Deleting file: {}", name);
try {
return this.client.deleteFile(name);
} catch (IOException e) {
@@ -217,9 +215,7 @@ public class FtpOperations implements Re
}
public boolean renameFile(String from, String to) throws GenericFileOperationFailedException {
- if (log.isDebugEnabled()) {
- log.debug("Renaming file: " + from + " to: " + to);
- }
+ log.debug("Renaming file: {} to: {}", from, to);
try {
return client.rename(from, to);
} catch (IOException e) {
@@ -401,9 +397,7 @@ public class FtpOperations implements Re
IOHelper.close(os, "retrieve: " + name, log);
}
- if (log.isDebugEnabled()) {
- log.debug("Retrieve file to local work file result: " + result);
- }
+ log.debug("Retrieve file to local work file result: {}", result);
if (result) {
log.trace("Renaming local in progress file from: {} to: {}", temp, local);
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java Fri Jun 10 06:02:06 2011
@@ -157,7 +157,8 @@ public class FtpsEndpoint extends FtpEnd
}
if (log.isDebugEnabled()) {
- log.debug("Created FTPSClient [connectTimeout: " + client.getConnectTimeout() + ", soTimeout: " + getSoTimeout() + ", dataTimeout: " + dataTimeout + "]: " + client);
+ log.debug("Created FTPSClient [connectTimeout: {}, soTimeout: {}, dataTimeout: {}]: {}",
+ new Object[]{client.getConnectTimeout(), getSoTimeout(), dataTimeout, client});
}
FtpsOperations operations = new FtpsOperations(client, getFtpClientConfig());
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java Fri Jun 10 06:02:06 2011
@@ -55,15 +55,11 @@ public class FtpsOperations extends FtpO
}
if (execPbsz != null) {
- if (log.isDebugEnabled()) {
- log.debug("FTPClient initializing with execPbsz=" + execPbsz);
- }
+ log.debug("FTPClient initializing with execPbsz={}", execPbsz);
getFtpClient().execPBSZ(execPbsz);
}
if (execProt != null) {
- if (log.isDebugEnabled()) {
- log.debug("FTPClient initializing with execProt=" + execProt);
- }
+ log.debug("FTPClient initializing with execProt={}", execProt);
getFtpClient().execPROT(execProt);
}
} catch (SSLException e) {
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java Fri Jun 10 06:02:06 2011
@@ -89,7 +89,7 @@ public abstract class RemoteFileConsumer
if (getOperations().isConnected()) {
loggedIn = false;
if (log.isDebugEnabled()) {
- log.debug("Disconnecting from: " + remoteServer());
+ log.debug("Disconnecting from: {}", remoteServer());
}
getOperations().disconnect();
}
@@ -111,9 +111,7 @@ public abstract class RemoteFileConsumer
// recover by re-creating operations which should most likely be able to recover
if (!loggedIn) {
- if (log.isDebugEnabled()) {
- log.debug("Trying to recover connection to: " + getEndpoint() + " with a fresh client.");
- }
+ log.debug("Trying to recover connection to: {} with a fresh client.", getEndpoint());
setOperations(getEndpoint().createRemoteFileOperations());
connectIfNecessary();
}
@@ -122,7 +120,7 @@ public abstract class RemoteFileConsumer
protected void connectIfNecessary() throws IOException {
if (!loggedIn) {
if (log.isDebugEnabled()) {
- log.debug("Not connected/logged in, connecting to: " + remoteServer());
+ log.debug("Not connected/logged in, connecting to: {}", remoteServer());
}
loggedIn = getOperations().connect((RemoteFileConfiguration) endpoint.getConfiguration());
if (loggedIn) {
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java Fri Jun 10 06:02:06 2011
@@ -86,9 +86,7 @@ public class RemoteFileProducer<T> exten
public void disconnect() throws GenericFileOperationFailedException {
loggedIn = false;
if (getOperations().isConnected()) {
- if (log.isDebugEnabled()) {
- log.debug("Disconnecting from: " + getEndpoint());
- }
+ log.debug("Disconnecting from: {}", getEndpoint());
getOperations().disconnect();
}
}
@@ -181,9 +179,7 @@ public class RemoteFileProducer<T> exten
// recover by re-creating operations which should most likely be able to recover
if (!loggedIn) {
- if (log.isDebugEnabled()) {
- log.debug("Trying to recover connection to: " + getEndpoint() + " with a fresh client.");
- }
+ log.debug("Trying to recover connection to: {} with a fresh client.", getEndpoint());
setOperations(getEndpoint().createRemoteFileOperations());
connectIfNecessary();
}
@@ -191,9 +187,7 @@ public class RemoteFileProducer<T> exten
protected void connectIfNecessary() throws GenericFileOperationFailedException {
if (!getOperations().isConnected()) {
- if (log.isDebugEnabled()) {
- log.debug("Not already connected/logged in. Connecting to: " + getEndpoint());
- }
+ log.debug("Not already connected/logged in. Connecting to: {}", getEndpoint());
RemoteFileConfiguration config = getEndpoint().getConfiguration();
loggedIn = getOperations().connect(config);
if (!loggedIn) {
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java Fri Jun 10 06:02:06 2011
@@ -246,9 +246,7 @@ public class SftpOperations implements R
}
public boolean deleteFile(String name) throws GenericFileOperationFailedException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Deleting file: " + name);
- }
+ LOG.debug("Deleting file: {}", name);
try {
channel.rm(name);
return true;
@@ -258,9 +256,7 @@ public class SftpOperations implements R
}
public boolean renameFile(String from, String to) throws GenericFileOperationFailedException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Renaming file: " + from + " to: " + to);
- }
+ LOG.debug("Renaming file: {} to: {}", from, to);
try {
channel.rename(from, to);
return true;
@@ -288,9 +284,7 @@ public class SftpOperations implements R
}
if (!success) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Trying to build remote directory: " + directory);
- }
+ LOG.debug("Trying to build remote directory: {}", directory);
try {
channel.mkdir(directory);
@@ -580,9 +574,7 @@ public class SftpOperations implements R
IOHelper.close(os, "retrieve: " + name, LOG);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Retrieve file to local work file result: true");
- }
+ LOG.debug("Retrieve file to local work file result: true");
// operation went okay so rename temp to local after we have retrieved the data
LOG.trace("Renaming local in progress file from: {} to: {}", temp, local);
Modified: camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java (original)
+++ camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java Fri Jun 10 06:02:06 2011
@@ -100,9 +100,7 @@ public class HawtDBAggregationRepository
}
public Exchange add(final CamelContext camelContext, final String key, final Exchange exchange) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Adding key [" + key + "] -> " + exchange);
- }
+ LOG.debug("Adding key [{}] -> {}", key, exchange);
try {
// If we could guarantee that the key and exchange are immutable,
// then we could have stuck them directly into the index,
@@ -166,16 +164,12 @@ public class HawtDBAggregationRepository
throw new RuntimeException("Error getting key " + key + " from repository " + repositoryName, e);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Getting key [" + key + "] -> " + answer);
- }
+ LOG.debug("Getting key [{}] -> {}", key, answer);
return answer;
}
public void remove(final CamelContext camelContext, final String key, final Exchange exchange) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Removing key [" + key + "]");
- }
+ LOG.debug("Removing key [{}]", key);
try {
final Buffer keyBuffer = codec.marshallKey(key);
final Buffer confirmKeyBuffer = codec.marshallKey(exchange.getExchangeId());
@@ -206,9 +200,7 @@ public class HawtDBAggregationRepository
}
public void confirm(final CamelContext camelContext, final String exchangeId) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Confirming exchangeId [" + exchangeId + "]");
- }
+ LOG.debug("Confirming exchangeId [{}]", exchangeId);
try {
final Buffer confirmKeyBuffer = codec.marshallKey(exchangeId);
hawtDBFile.execute(new Work<Buffer>() {
@@ -319,7 +311,7 @@ public class HawtDBAggregationRepository
LOG.trace("Scanned and found no exchange to recover.");
} else {
if (LOG.isDebugEnabled()) {
- LOG.debug("Scanned and found " + answer.size() + " exchange(s) to recover (note some of them may already be in progress).");
+ LOG.debug("Scanned and found {} exchange(s) to recover (note some of them may already be in progress).", answer.size());
}
}
return answer;
@@ -351,9 +343,7 @@ public class HawtDBAggregationRepository
throw new RuntimeException("Error recovering exchangeId " + exchangeId + " from repository " + repositoryName, e);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Recovering exchangeId [" + exchangeId + "] -> " + answer);
- }
+ LOG.debug("Recovering exchangeId [{}] -> {}", exchangeId, answer);
return answer;
}
@@ -370,9 +360,7 @@ public class HawtDBAggregationRepository
}
});
- if (LOG.isDebugEnabled()) {
- LOG.debug("Size of repository [" + repositoryName + "] -> " + answer);
- }
+ LOG.debug("Size of repository [{}] -> {}", repositoryName, answer);
return answer;
}
Modified: camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBFile.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBFile.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBFile.java (original)
+++ camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBFile.java Fri Jun 10 06:02:06 2011
@@ -70,7 +70,7 @@ public class HawtDBFile extends TxPageFi
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Starting HawtDB using file: " + getFile());
+ LOG.debug("Starting HawtDB using file: {}", getFile());
}
open();
@@ -99,7 +99,7 @@ public class HawtDBFile extends TxPageFi
public void stop() {
if (LOG.isDebugEnabled()) {
- LOG.debug("Stopping HawtDB using file: " + getFile());
+ LOG.debug("Stopping HawtDB using file: {}", getFile());
}
close();
@@ -130,9 +130,7 @@ public class HawtDBFile extends TxPageFi
// add it to indexes so we can find it the next time
indexes.put(name, page);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Created new repository index with name " + name + " at location " + page);
- }
+ LOG.debug("Created new repository index with name {} at location {}", name, page);
answer = created;
} else if (location != null) {
@@ -152,8 +150,8 @@ public class HawtDBFile extends TxPageFi
while (!done) {
try {
// only log at DEBUG level if we are retrying
- if (attempt > 0 && LOG.isDebugEnabled()) {
- LOG.debug("Attempt " + attempt + " to execute work " + work);
+ if (attempt > 0) {
+ LOG.debug("Attempt {} to execute work {}", attempt, work);
}
attempt++;
Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadAndRecoverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadAndRecoverTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadAndRecoverTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadAndRecoverTest.java Fri Jun 10 06:02:06 2011
@@ -58,9 +58,7 @@ public class HawtDBAggregateLoadAndRecov
Map<String, Object> headers = new HashMap<String, Object>();
headers.put("id", id);
headers.put("seq", i);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Sending " + value + " with id " + id);
- }
+ LOG.debug("Sending {} with id {}", value, id);
template.sendBodyAndHeaders("seda:start", value, headers);
// simulate a little delay
Thread.sleep(5);
Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java Fri Jun 10 06:02:06 2011
@@ -59,9 +59,7 @@ public class HawtDBAggregateLoadConcurre
executor.submit(new Callable<Object>() {
public Object call() throws Exception {
char id = KEYS[key];
- if (LOG.isDebugEnabled()) {
- LOG.debug("Sending " + value + " with id " + id);
- }
+ LOG.debug("Sending {} with id {}", value, id);
template.sendBodyAndHeader("direct:start", value, "id", "" + id);
// simulate a little delay
Thread.sleep(3);
Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadTest.java Fri Jun 10 06:02:06 2011
@@ -51,9 +51,7 @@ public class HawtDBAggregateLoadTest ext
for (int i = 0; i < SIZE; i++) {
final int value = 1;
char id = 'A';
- if (LOG.isDebugEnabled()) {
- LOG.debug("Sending " + value + " with id " + id);
- }
+ LOG.debug("Sending {} with id {}", value, id);
template.sendBodyAndHeader("seda:start?size=" + SIZE, value, "id", "" + id);
}
Modified: camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPDecoder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPDecoder.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPDecoder.java (original)
+++ camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPDecoder.java Fri Jun 10 06:02:06 2011
@@ -71,7 +71,7 @@ class HL7MLLPDecoder extends CumulativeP
String body = in.getString(state.length(), charsetDecoder(session));
if (LOG.isDebugEnabled()) {
- LOG.debug("Decoded HL7 from byte stream of length " + state.length() + " to String of length " + body.length());
+ LOG.debug("Decoded HL7 from byte stream of length {} to String of length {}", state.length(), body.length());
}
out.write(body);
// Avoid redelivery of scanned message
@@ -113,7 +113,7 @@ class HL7MLLPDecoder extends CumulativeP
state.posStart = in.position();
state.waitingForEndByte2 = false;
if (LOG.isDebugEnabled()) {
- LOG.debug("Message starts at position " + state.posStart);
+ LOG.debug("Message starts at position {}", state.posStart);
}
}
}
@@ -131,7 +131,7 @@ class HL7MLLPDecoder extends CumulativeP
// last 2 end markers
state.waitingForEndByte2 = false;
if (LOG.isDebugEnabled()) {
- LOG.debug("Message ends at position " + state.posEnd);
+ LOG.debug("Message ends at position {}", state.posEnd);
}
break;
}
Modified: camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPEncoder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPEncoder.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPEncoder.java (original)
+++ camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPEncoder.java Fri Jun 10 06:02:06 2011
@@ -87,7 +87,7 @@ class HL7MLLPEncoder implements Protocol
// flip the buffer so we can use it to write to the out stream
buf.flip();
if (LOG.isDebugEnabled()) {
- LOG.debug("Encoding HL7 from " + message.getClass().getCanonicalName() + " to byte stream");
+ LOG.debug("Encoding HL7 from {} to byte stream", message.getClass().getCanonicalName());
}
out.write(buf);
}
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java Fri Jun 10 06:02:06 2011
@@ -102,17 +102,12 @@ public class HttpEndpoint extends Defaul
if (ObjectHelper.isNotEmpty(getCamelContext().getProperties().get("http.proxyHost")) && ObjectHelper.isNotEmpty(getCamelContext().getProperties().get("http.proxyPort"))) {
String host = getCamelContext().getProperties().get("http.proxyHost");
int port = Integer.parseInt(getCamelContext().getProperties().get("http.proxyPort"));
- if (LOG.isDebugEnabled()) {
- LOG.debug("CamelContext properties http.proxyHost and http.proxyPort detected. Using http proxy host: "
- + host + " port: " + port);
- }
+ LOG.debug("CamelContext properties http.proxyHost and http.proxyPort detected. Using http proxy host: {} port: {}", host, port);
answer.getHostConfiguration().setProxy(host, port);
}
if (proxyHost != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using proxy: " + proxyHost + ":" + proxyPort);
- }
+ LOG.debug("Using proxy: {}:{}", proxyHost, proxyPort);
answer.getHostConfiguration().setProxy(proxyHost, proxyPort);
}
@@ -126,9 +121,7 @@ public class HttpEndpoint extends Defaul
if (auth == null) {
throw new IllegalArgumentException("Unknown authMethod: " + value + " in authMethodPriority: " + authMethodPriority);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using authSchemePriority #" + i + ": " + auth);
- }
+ LOG.debug("Using authSchemePriority #{}: {}", i, auth);
authPrefs.add(auth.name());
i++;
}
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java Fri Jun 10 06:02:06 2011
@@ -93,12 +93,10 @@ public class HttpProducer extends Defaul
// lets store the result in the output message.
try {
if (LOG.isDebugEnabled()) {
- LOG.debug("Executing http " + method.getName() + " method: " + method.getURI().toString());
+ LOG.debug("Executing http {} method: {}", method.getName(), method.getURI().toString());
}
int responseCode = executeMethod(method);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Http responseCode: " + responseCode);
- }
+ LOG.debug("Http responseCode: {}", responseCode);
if (!throwException) {
// if we do not use failed exception then populate response for all response codes
@@ -291,9 +289,7 @@ public class HttpProducer extends Defaul
if (methodToUse.isEntityEnclosing()) {
((EntityEnclosingMethod) method).setRequestEntity(requestEntity);
if (requestEntity != null && requestEntity.getContentType() == null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("No Content-Type provided for URL: " + url + " with exchange: " + exchange);
- }
+ LOG.debug("No Content-Type provided for URL: {} with exchange: {}", url, exchange);
}
}
Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java (original)
+++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java Fri Jun 10 06:02:06 2011
@@ -116,10 +116,7 @@ public class HttpEndpoint extends Defaul
if (ObjectHelper.isNotEmpty(getCamelContext().getProperties().get("http.proxyHost")) && ObjectHelper.isNotEmpty(getCamelContext().getProperties().get("http.proxyPort"))) {
String host = getCamelContext().getProperties().get("http.proxyHost");
int port = Integer.parseInt(getCamelContext().getProperties().get("http.proxyPort"));
- if (LOG.isDebugEnabled()) {
- LOG.debug("CamelContext properties http.proxyHost and http.proxyPort detected. Using http proxy host: "
- + host + " port: " + port);
- }
+ LOG.debug("CamelContext properties http.proxyHost and http.proxyPort detected. Using http proxy host: {} port: {}", host, port);
HttpHost proxy = new HttpHost(host, port);
answer.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
}
@@ -129,9 +126,7 @@ public class HttpEndpoint extends Defaul
configurer.configureHttpClient(answer);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Created HttpClient " + answer);
- }
+ LOG.debug("Created HttpClient {}", answer);
return answer;
}
Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java (original)
+++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java Fri Jun 10 06:02:06 2011
@@ -96,13 +96,11 @@ public class HttpProducer extends Defaul
HttpResponse httpResponse = null;
try {
if (LOG.isDebugEnabled()) {
- LOG.debug("Executing http " + httpRequest.getMethod() + " method: " + httpRequest.getURI().toString());
+ LOG.debug("Executing http {} method: {}", httpRequest.getMethod(), httpRequest.getURI().toString());
}
httpResponse = executeMethod(httpRequest);
int responseCode = httpResponse.getStatusLine().getStatusCode();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Http responseCode: " + responseCode);
- }
+ LOG.debug("Http responseCode: {}", responseCode);
if (throwException && (responseCode < 100 || responseCode >= 300)) {
throw populateHttpOperationFailedException(exchange, httpRequest, httpResponse, responseCode);
@@ -304,9 +302,7 @@ public class HttpProducer extends Defaul
if (methodToUse.isEntityEnclosing()) {
((HttpEntityEnclosingRequestBase) httpRequest).setEntity(requestEntity);
if (requestEntity != null && requestEntity.getContentType() == null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("No Content-Type provided for URL: " + url + " with exchange: " + exchange);
- }
+ LOG.debug("No Content-Type provided for URL: {} with exchange: {}", url, exchange);
}
}
Modified: camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisConsumer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisConsumer.java (original)
+++ camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisConsumer.java Fri Jun 10 06:02:06 2011
@@ -146,9 +146,7 @@ public class IBatisConsumer extends Sche
pendingExchanges = total - index - 1;
// process the current exchange
- if (LOG.isDebugEnabled()) {
- LOG.debug("Processing exchange: " + exchange);
- }
+ LOG.debug("Processing exchange: {}", exchange);
getProcessor().process(exchange);
try {
Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java Fri Jun 10 06:02:06 2011
@@ -50,7 +50,7 @@ public class IrcComponent extends Defaul
final IRCConnection connection;
if (connectionCache.containsKey(configuration.getCacheKey())) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Returning Cached Connection to " + configuration.getHostname() + ":" + configuration.getNickname());
+ LOG.debug("Returning Cached Connection to {}:{}", configuration.getHostname(), configuration.getNickname());
}
connection = connectionCache.get(configuration.getCacheKey());
} else {
@@ -66,8 +66,8 @@ public class IrcComponent extends Defaul
if (configuration.getUsingSSL()) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Creating SSL Connection to " + configuration.getHostname() + " destination(s): " + configuration.getListOfChannels()
- + " nick: " + configuration.getNickname() + " user: " + configuration.getUsername());
+ LOG.debug("Creating SSL Connection to {} destination(s): {} nick: {} user: {}",
+ new Object[]{configuration.getHostname(), configuration.getListOfChannels(), configuration.getNickname(), configuration.getUsername()});
}
SSLIRCConnection sconn = new SSLIRCConnection(configuration.getHostname(), configuration.getPorts(), configuration.getPassword(),
configuration.getNickname(), configuration.getUsername(), configuration.getRealname());
@@ -77,8 +77,8 @@ public class IrcComponent extends Defaul
} else {
if (LOG.isDebugEnabled()) {
- LOG.debug("Creating Connection to " + configuration.getHostname() + " destination(s): " + configuration.getListOfChannels()
- + " nick: " + configuration.getNickname() + " user: " + configuration.getUsername());
+ LOG.debug("Creating Connection to {} destination(s): {} nick: {} user: {}",
+ new Object[]{configuration.getHostname(), configuration.getListOfChannels(), configuration.getNickname(), configuration.getUsername()});
}
conn = new IRCConnection(configuration.getHostname(), configuration.getPorts(), configuration.getPassword(),
Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java Fri Jun 10 06:02:06 2011
@@ -45,9 +45,7 @@ public class IrcConsumer extends Default
protected void doStop() throws Exception {
if (connection != null) {
for (String channel : endpoint.getConfiguration().getChannels()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Parting: " + channel);
- }
+ LOG.debug("Parting: {}", channel);
connection.doPart(channel);
}
connection.removeIRCEventListener(listener);
Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java Fri Jun 10 06:02:06 2011
@@ -195,12 +195,12 @@ public class IrcEndpoint extends Default
if (ObjectHelper.isNotEmpty(key)) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Joining: " + channel + " using " + connection.getClass().getName() + " with key " + key);
+ LOG.debug("Joining: {} using {} with key {}", new Object[]{channel, connection.getClass().getName(), key});
}
connection.doJoin(channel, key);
} else {
if (LOG.isDebugEnabled()) {
- LOG.debug("Joining: " + channel + " using " + connection.getClass().getName());
+ LOG.debug("Joining: {} using {}", channel, connection.getClass().getName());
}
connection.doJoin(channel);
}
Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java (original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java Fri Jun 10 06:02:06 2011
@@ -51,20 +51,14 @@ public class IrcProducer extends Default
}
if (isMessageACommand(msg)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Sending command: " + msg);
- }
+ LOG.debug("Sending command: {}", msg);
connection.send(msg);
} else if (targetChannel != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Sending to: " + targetChannel + " message: " + msg);
- }
+ LOG.debug("Sending to: {} message: {}", targetChannel, msg);
connection.doPrivmsg(targetChannel, msg);
} else {
for (String channel : endpoint.getConfiguration().getChannels()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Sending to: " + channel + " message: " + msg);
- }
+ LOG.debug("Sending to: {} message: {}", channel, msg);
connection.doPrivmsg(channel, msg);
}
}
@@ -83,9 +77,7 @@ public class IrcProducer extends Default
protected void doStop() throws Exception {
if (connection != null) {
for (String channel : endpoint.getConfiguration().getChannels()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Parting: " + channel);
- }
+ LOG.debug("Parting: {}", channel);
connection.doPart(channel);
}
connection.removeIRCEventListener(listener);
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=1134198&r1=1134197&r2=1134198&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 Jun 10 06:02:06 2011
@@ -75,9 +75,7 @@ public class JdbcProducer extends Defaul
IntrospectionSupport.setProperties(stmt, parameters);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Executing JDBC statement: " + sql);
- }
+ LOG.debug("Executing JDBC statement: {}", sql);
if (stmt.execute(sql)) {
rs = stmt.getResultSet();
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java Fri Jun 10 06:02:06 2011
@@ -44,9 +44,7 @@ public class DefaultJettyHttpBinding imp
public void populateResponse(Exchange exchange, JettyContentExchange httpExchange) throws Exception {
int responseCode = httpExchange.getResponseStatus();
- if (LOG.isDebugEnabled()) {
- LOG.debug("HTTP responseCode: " + responseCode);
- }
+ LOG.debug("HTTP responseCode: {}", responseCode);
Message in = exchange.getIn();
if (!isThrowExceptionOnFailure()) {
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java Fri Jun 10 06:02:06 2011
@@ -139,7 +139,7 @@ public class JettyContentExchange extend
int exchangeState = getStatus();
if (LOG.isDebugEnabled()) {
- LOG.debug("TaskComplete with state " + exchangeState + " for url: " + getUrl());
+ LOG.debug("TaskComplete with state {} for url: {}", exchangeState, getUrl());
}
try {
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java Fri Jun 10 06:02:06 2011
@@ -579,8 +579,7 @@ public class JettyHttpComponent extends
String host = System.getProperty("http.proxyHost");
int port = Integer.parseInt(System.getProperty("http.proxyPort"));
if (LOG.isDebugEnabled()) {
- LOG.debug("Java System Property http.proxyHost and http.proxyPort detected. Using http proxy host: "
- + host + " port: " + port);
+ LOG.debug("Java System Property http.proxyHost and http.proxyPort detected. Using http proxy host: {} port: {}", host, port);
}
httpClient.setProxy(new Address(host, port));
}
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java Fri Jun 10 06:02:06 2011
@@ -178,7 +178,7 @@ public class JettyHttpProducer extends D
protected static void doSendExchange(HttpClient client, JettyContentExchange httpExchange) throws IOException {
if (LOG.isDebugEnabled()) {
- LOG.debug("Sending HTTP request to: " + httpExchange.getUrl());
+ LOG.debug("Sending HTTP request to: {}", httpExchange.getUrl());
}
client.send(httpExchange);
}
Modified: camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.java (original)
+++ camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.java Fri Jun 10 06:02:06 2011
@@ -34,9 +34,7 @@ public class JingComponent extends Resou
JingValidator validator = new JingValidator();
Resource resource = resolveMandatoryResource(remaining);
validator.setSchemaResource(resource);
- if (log.isDebugEnabled()) {
- log.debug(this + " using schema resource: " + resource);
- }
+ log.debug("{} using schema resource: {}", this, resource);
configureValidator(validator, uri, remaining, parameters);
return new ProcessorEndpoint(uri, this, validator);
}
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java Fri Jun 10 06:02:06 2011
@@ -66,9 +66,7 @@ public class EndpointMessageListener imp
public void onMessage(final Message message) {
LOG.trace("onMessage START");
- if (LOG.isDebugEnabled()) {
- LOG.debug(endpoint + " consumer received JMS message: " + message);
- }
+ LOG.debug("{} consumer received JMS message: {}", endpoint, message);
boolean sendReply;
RuntimeCamelException rce = null;
@@ -275,9 +273,7 @@ public class EndpointMessageListener imp
protected void sendReply(Destination replyDestination, final Message message, final Exchange exchange,
final org.apache.camel.Message out, final Exception cause) {
if (replyDestination == null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Cannot send reply message as there is no replyDestination for: " + out);
- }
+ LOG.debug("Cannot send reply message as there is no replyDestination for: {}", out);
return;
}
getTemplate().send(replyDestination, new MessageCreator() {
@@ -287,7 +283,7 @@ public class EndpointMessageListener imp
reply.setJMSCorrelationID(correlationID);
if (LOG.isDebugEnabled()) {
- LOG.debug(endpoint + " sending reply JMS message [correlationId:" + correlationID + "]: " + reply);
+ LOG.debug("{} sending reply JMS message [correlationId:{}]: {}", new Object[]{endpoint, correlationID, reply});
}
return reply;
}
@@ -297,9 +293,7 @@ public class EndpointMessageListener imp
protected void sendReply(String replyDestination, final Message message, final Exchange exchange,
final org.apache.camel.Message out, final Exception cause) {
if (replyDestination == null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Cannot send reply message as there is no replyDestination for: " + out);
- }
+ LOG.debug("Cannot send reply message as there is no replyDestination for: {}", out);
return;
}
getTemplate().send(replyDestination, new MessageCreator() {
@@ -309,7 +303,7 @@ public class EndpointMessageListener imp
reply.setJMSCorrelationID(correlationID);
if (LOG.isDebugEnabled()) {
- LOG.debug(endpoint + " sending reply JMS message [correlationId:" + correlationID + "]: " + reply);
+ LOG.debug("{} sending reply JMS message [correlationId:{}]: {}", new Object[]{endpoint, correlationID, reply});
}
return reply;
}
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java Fri Jun 10 06:02:06 2011
@@ -258,9 +258,7 @@ public class JmsBinding {
if (answer == null) {
if (cause != null) {
// an exception occurred so send it as response
- if (LOG.isDebugEnabled()) {
- LOG.debug("Will create JmsMessage with caused exception: " + cause);
- }
+ LOG.debug("Will create JmsMessage with caused exception: {}", cause);
// create jms message containing the caused exception
answer = createJmsMessage(cause, session);
} else {
@@ -334,8 +332,8 @@ public class JmsBinding {
JmsMessageHelper.setProperty(jmsMessage, key, value);
} else if (LOG.isDebugEnabled()) {
// okay the value is not a primitive or string so we cannot sent it over the wire
- LOG.debug("Ignoring non primitive header: " + headerName + " of class: "
- + headerValue.getClass().getName() + " with value: " + headerValue);
+ LOG.debug("Ignoring non primitive header: {} of class: {} with value: {}",
+ new Object[]{headerName, headerValue.getClass().getName(), headerValue});
}
}
}
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java Fri Jun 10 06:02:06 2011
@@ -247,18 +247,18 @@ public class JmsConfiguration implements
}
// need to log just before so the message is 100% correct when logged
- if (logger.isDebugEnabled()) {
- logger.debug("Sending JMS message to: " + producer.getDestination() + " with message: " + message);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Sending JMS message to: {} with message: {}", producer.getDestination(), message);
}
producer.send(message, deliveryMode, priority, ttl);
} else {
// need to log just before so the message is 100% correct when logged
- if (logger.isDebugEnabled()) {
- logger.debug("Sending JMS message to: " + producer.getDestination() + " with message: " + message);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Sending JMS message to: {} with message: {}", producer.getDestination(), message);
}
super.doSend(producer, message);
- if (logger.isTraceEnabled()) {
- logger.trace("Sent JMS message to: " + producer.getDestination() + " with message: " + message);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Sent JMS message to: " + producer.getDestination() + " with message: " + message);
}
}
}
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java Fri Jun 10 06:02:06 2011
@@ -88,9 +88,7 @@ public class JmsConsumer extends Default
*/
protected void testConnectionOnStartup() throws FailedToCreateConsumerException {
try {
- if (log.isDebugEnabled()) {
- log.debug("Testing JMS Connection on startup for destination: " + getDestinationName());
- }
+ log.debug("Testing JMS Connection on startup for destination: {}", getDestinationName());
Connection con = listenerContainer.getConnectionFactory().createConnection();
JmsUtils.closeConnection(con);
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java Fri Jun 10 06:02:06 2011
@@ -179,7 +179,7 @@ public class JmsEndpoint extends Default
if (configuration.getTaskExecutor() != null) {
if (log.isDebugEnabled()) {
- log.debug("Using custom TaskExecutor: " + configuration.getTaskExecutor() + " on listener container: " + listenerContainer);
+ log.debug("Using custom TaskExecutor: {} on listener container: {}", configuration.getTaskExecutor(), listenerContainer);
}
listenerContainer.setTaskExecutor(configuration.getTaskExecutor());
} else {
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java Fri Jun 10 06:02:06 2011
@@ -232,9 +232,7 @@ public class JmsProducer extends Default
Object jmsReplyTo = JmsMessageHelper.getJMSReplyTo(answer);
if (endpoint.isDisableReplyTo()) {
// honor disable reply to configuration
- if (LOG.isDebugEnabled()) {
- LOG.debug("ReplyTo is disabled on endpoint: " + endpoint);
- }
+ LOG.debug("ReplyTo is disabled on endpoint: {}", endpoint);
JmsMessageHelper.setJMSReplyTo(answer, null);
} else {
// if the binding did not create the reply to then we have to try to create it here
@@ -255,8 +253,8 @@ public class JmsProducer extends Default
// log at debug what we are doing, as higher level may cause noise in production logs
// this behavior is also documented at the camel website
if (LOG.isDebugEnabled()) {
- LOG.debug("Disabling JMSReplyTo: " + jmsReplyTo + " for destination: " + to
- + ". Use preserveMessageQos=true to force Camel to keep the JMSReplyTo on endpoint: " + endpoint);
+ LOG.debug("Disabling JMSReplyTo: {} for destination: {}. Use preserveMessageQos=true to force Camel to keep the JMSReplyTo on endpoint: {}",
+ new Object[]{jmsReplyTo, to, endpoint});
}
jmsReplyTo = null;
}
@@ -276,14 +274,10 @@ public class JmsProducer extends Default
if (jmsReplyTo == null) {
// okay then fallback and create the queue
if (endpoint.isPubSubDomain()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Creating JMSReplyTo topic: " + replyTo);
- }
+ LOG.debug("Creating JMSReplyTo topic: {}", replyTo);
jmsReplyTo = session.createTopic(replyTo);
} else {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Creating JMSReplyTo queue: " + replyTo);
- }
+ LOG.debug("Creating JMSReplyTo queue: {}", replyTo);
jmsReplyTo = session.createQueue(replyTo);
}
}
@@ -295,9 +289,7 @@ public class JmsProducer extends Default
replyTo = (Destination) jmsReplyTo;
}
if (replyTo != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using JMSReplyTo destination: " + replyTo);
- }
+ LOG.debug("Using JMSReplyTo destination: {}", replyTo);
JmsMessageHelper.setJMSReplyTo(answer, replyTo);
} else {
// do not use JMSReplyTo
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java Fri Jun 10 06:02:06 2011
@@ -100,9 +100,7 @@ public abstract class ReplyManagerSuppor
return;
}
- if (log.isDebugEnabled()) {
- log.debug("Received reply message with correlationID: " + correlationID + " -> " + message);
- }
+ log.debug("Received reply message with correlationID: {} -> {}", correlationID, message);
// handle the reply message
handleReplyMessage(correlationID, message);
@@ -122,16 +120,12 @@ public abstract class ReplyManagerSuppor
Object body = response.getBody();
if (endpoint.isTransferException() && body instanceof Exception) {
- if (log.isDebugEnabled()) {
- log.debug("Reply received. Setting reply as an Exception: " + body);
- }
+ log.debug("Reply received. Setting reply as an Exception: {}", body);
// we got an exception back and endpoint was configured to transfer exception
// therefore set response as exception
exchange.setException((Exception) body);
} else {
- if (log.isDebugEnabled()) {
- log.debug("Reply received. Setting reply as OUT message: " + body);
- }
+ log.debug("Reply received. Setting reply as OUT message: {}", body);
// regular response
exchange.setOut(response);
}