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/03/27 22:30:01 UTC
svn commit: r1086028 [2/3] - in /camel/trunk/components:
camel-blueprint/src/main/java/org/apache/camel/blueprint/
camel-cache/src/main/java/org/apache/camel/component/cache/
camel-cache/src/main/java/org/apache/camel/processor/cache/
camel-cometd/src/...
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=1086028&r1=1086027&r2=1086028&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 Sun Mar 27 20:29:58 2011
@@ -105,9 +105,7 @@ public class RemoteFileProducer<T> exten
}
}
- if (log.isTraceEnabled()) {
- log.trace("preWriteCheck send noop success: " + noop);
- }
+ log.trace("preWriteCheck send noop success: {}", noop);
// if not alive then reconnect
if (!noop) {
@@ -131,9 +129,7 @@ public class RemoteFileProducer<T> exten
public void postWriteCheck() {
try {
if (getEndpoint().isDisconnect()) {
- if (log.isTraceEnabled()) {
- log.trace("postWriteCheck disconnect from: " + getEndpoint());
- }
+ log.trace("postWriteCheck disconnect from: {}", getEndpoint());
disconnect();
}
} catch (GenericFileOperationFailedException e) {
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java Sun Mar 27 20:29:58 2011
@@ -64,9 +64,7 @@ public class SftpConsumer extends Remote
}
protected boolean doPollDirectory(String absolutePath, String dirName, List<GenericFile<ChannelSftp.LsEntry>> fileList) {
- if (log.isTraceEnabled()) {
- log.trace("doPollDirectory from absolutePath: " + absolutePath + ", dirName: " + dirName);
- }
+ log.trace("doPollDirectory from absolutePath: {}, dirName: {}", absolutePath, dirName);
// remove trailing /
dirName = FileUtil.stripTrailingSeparator(dirName);
@@ -79,9 +77,7 @@ public class SftpConsumer extends Remote
dir = absolutePath;
}
- if (log.isTraceEnabled()) {
- log.trace("Polling directory: " + dir);
- }
+ log.trace("Polling directory: {}", dir);
List<ChannelSftp.LsEntry> files;
if (isStepwise()) {
files = operations.listFiles();
@@ -90,15 +86,11 @@ public class SftpConsumer extends Remote
}
if (files == null || files.isEmpty()) {
// no files in this directory to poll
- if (log.isTraceEnabled()) {
- log.trace("No files found in directory: " + dir);
- }
+ log.trace("No files found in directory: {}", dir);
return true;
} else {
// we found some files
- if (log.isTraceEnabled()) {
- log.trace("Found " + files.size() + " in directory: " + dir);
- }
+ log.trace("Found {} in directory: {}", files.size(), dir);
}
for (ChannelSftp.LsEntry file : files) {
@@ -126,7 +118,7 @@ public class SftpConsumer extends Remote
if (isValidFile(remote, false)) {
if (isInProgress(remote)) {
if (log.isTraceEnabled()) {
- log.trace("Skipping as file is already in progress: " + remote.getFileName());
+ log.trace("Skipping as file is already in progress: {}", remote.getFileName());
}
} else {
// matched file so add
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=1086028&r1=1086027&r2=1086028&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 Sun Mar 27 20:29:58 2011
@@ -73,7 +73,7 @@ public class SftpOperations implements R
while (!connected) {
try {
if (LOG.isTraceEnabled() && attempt > 0) {
- LOG.trace("Reconnect attempt #" + attempt + " connecting to + " + configuration.remoteServerInformation());
+ LOG.trace("Reconnect attempt #{} connecting to + {}", attempt, configuration.remoteServerInformation());
}
if (channel == null || !channel.isConnected()) {
@@ -111,9 +111,7 @@ public class SftpOperations implements R
}
GenericFileOperationFailedException failed = new GenericFileOperationFailedException("Cannot connect to " + configuration.remoteServerInformation(), e);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Cannot connect due: " + failed.getMessage());
- }
+ LOG.trace("Cannot connect due: {}", failed.getMessage());
attempt++;
if (attempt > endpoint.getMaximumReconnectAttempts()) {
throw failed;
@@ -275,9 +273,7 @@ public class SftpOperations implements R
// must normalize directory first
directory = endpoint.getConfiguration().normalizePath(directory);
- if (LOG.isTraceEnabled()) {
- LOG.trace("buildDirectory(" + directory + "," + absolute + ")");
- }
+ LOG.trace("buildDirectory({},{})", directory, absolute);
// ignore absolute as all dirs are relative with FTP
boolean success = false;
@@ -332,9 +328,7 @@ public class SftpOperations implements R
// do not try to build root folder (/ or \)
if (!(directory.equals("/") || directory.equals("\\"))) {
try {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Trying to build remote directory by chunk: " + directory);
- }
+ LOG.trace("Trying to build remote directory by chunk: {}", directory);
channel.mkdir(directory);
success = true;
@@ -348,9 +342,7 @@ public class SftpOperations implements R
}
public String getCurrentDirectory() throws GenericFileOperationFailedException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("getCurrentDirectory()");
- }
+ LOG.trace("getCurrentDirectory()");
try {
return channel.pwd();
} catch (SftpException e) {
@@ -359,9 +351,7 @@ public class SftpOperations implements R
}
public void changeCurrentDirectory(String path) throws GenericFileOperationFailedException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("changeCurrentDirectory(" + path + ")");
- }
+ LOG.trace("changeCurrentDirectory({})", path);
if (ObjectHelper.isEmpty(path)) {
return;
}
@@ -402,9 +392,7 @@ public class SftpOperations implements R
return;
}
- if (LOG.isTraceEnabled()) {
- LOG.trace("Changing directory: " + path);
- }
+ LOG.trace("Changing directory: {}", path);
try {
channel.cd(path);
} catch (SftpException e) {
@@ -413,9 +401,7 @@ public class SftpOperations implements R
}
public void changeToParentDirectory() throws GenericFileOperationFailedException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("changeToParentDirectory()");
- }
+ LOG.trace("changeToParentDirectory()");
String current = getCurrentDirectory();
String parent = FileUtil.compactPath(current + "/..");
@@ -432,9 +418,7 @@ public class SftpOperations implements R
}
public List<ChannelSftp.LsEntry> listFiles(String path) throws GenericFileOperationFailedException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("listFiles(" + path + ")");
- }
+ LOG.trace("listFiles({})", path);
if (ObjectHelper.isEmpty(path)) {
// list current directory if file path is not given
path = ".";
@@ -456,9 +440,7 @@ public class SftpOperations implements R
}
public boolean retrieveFile(String name, Exchange exchange) throws GenericFileOperationFailedException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("retrieveFile(" + name + ")");
- }
+ LOG.trace("retrieveFile({})", name);
if (ObjectHelper.isNotEmpty(endpoint.getLocalWorkDirectory())) {
// local work directory is configured so we should store file content as files in this local directory
return retrieveFileToFileInLocalWorkDirectory(name, exchange);
@@ -585,9 +567,7 @@ public class SftpOperations implements R
}
} catch (SftpException e) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Error occurred during retrieving file: " + name + " to local directory. Deleting local work file: " + temp);
- }
+ LOG.trace("Error occurred during retrieving file: {} to local directory. Deleting local work file: {}", name, temp);
// failed to retrieve the file so we need to close streams and delete in progress file
// must close stream before deleting file
IOHelper.close(os, "retrieve: " + name, LOG);
@@ -605,9 +585,7 @@ public class SftpOperations implements R
}
// operation went okay so rename temp to local after we have retrieved the data
- if (LOG.isTraceEnabled()) {
- LOG.trace("Renaming local in progress file from: " + temp + " to: " + local);
- }
+ LOG.trace("Renaming local in progress file from: {} to: {}", temp, local);
if (!FileUtil.renameFile(temp, local)) {
throw new GenericFileOperationFailedException("Cannot rename local work file from: " + temp + " to: " + local);
}
@@ -619,9 +597,7 @@ public class SftpOperations implements R
// must normalize name first
name = endpoint.getConfiguration().normalizePath(name);
- if (LOG.isTraceEnabled()) {
- LOG.trace("storeFile(" + name + ")");
- }
+ LOG.trace("storeFile({})", name);
boolean answer = false;
String currentDir = null;
@@ -653,18 +629,14 @@ public class SftpOperations implements R
}
private boolean doStoreFile(String name, String targetName, Exchange exchange) throws GenericFileOperationFailedException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("doStoreFile(" + targetName + ")");
- }
+ LOG.trace("doStoreFile({})", targetName);
// if an existing file already exists what should we do?
if (endpoint.getFileExist() == GenericFileExist.Ignore || endpoint.getFileExist() == GenericFileExist.Fail) {
boolean existFile = existsFile(targetName);
if (existFile && endpoint.getFileExist() == GenericFileExist.Ignore) {
// ignore but indicate that the file was written
- if (LOG.isTraceEnabled()) {
- LOG.trace("An existing file already exists: " + name + ". Ignore and do not override it.");
- }
+ LOG.trace("An existing file already exists: {}. Ignore and do not override it.", name);
return true;
} else if (existFile && endpoint.getFileExist() == GenericFileExist.Fail) {
throw new GenericFileOperationFailedException("File already exist: " + name + ". Cannot write new file.");
@@ -691,9 +663,7 @@ public class SftpOperations implements R
}
public boolean existsFile(String name) throws GenericFileOperationFailedException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("existsFile(" + name + ")");
- }
+ LOG.trace("existsFile({})", name);
// check whether a file already exists
String directory = FileUtil.onlyPath(name);
@@ -712,9 +682,7 @@ public class SftpOperations implements R
for (Object file : files) {
ChannelSftp.LsEntry entry = (ChannelSftp.LsEntry) file;
String existing = entry.getFilename();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Existing file: " + existing + ", target file: " + name);
- }
+ LOG.trace("Existing file: {}, target file: {}", existing, name);
existing = FileUtil.stripPath(existing);
if (existing != null && existing.equals(onlyName)) {
return true;
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=1086028&r1=1086027&r2=1086028&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 Sun Mar 27 20:29:58 2011
@@ -250,9 +250,7 @@ public class HawtDBAggregationRepository
throw new RuntimeException("Error unmarshalling key: " + keyBuffer, e);
}
if (key != null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("getKey [" + key + "]");
- }
+ LOG.trace("getKey [{}]", key);
keys.add(key);
}
}
@@ -296,9 +294,7 @@ public class HawtDBAggregationRepository
throw new RuntimeException("Error unmarshalling confirm key: " + keyBuffer, e);
}
if (exchangeId != null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Scan exchangeId [" + exchangeId + "]");
- }
+ LOG.trace("Scan exchangeId [{}]", exchangeId);
answer.add(exchangeId);
}
}
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=1086028&r1=1086027&r2=1086028&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 Sun Mar 27 20:29:58 2011
@@ -103,16 +103,12 @@ public class HawtDBFile extends TxPageFi
}
public <T> T execute(Work<T> work) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Executing work +++ start +++ " + work);
- }
+ LOG.trace("Executing work +++ start +++ {}", work);
Transaction tx = pageFile.tx();
T answer = doExecute(work, tx, pageFile);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Executing work +++ done +++ " + work);
- }
+ LOG.trace("Executing work +++ done +++ {}", work);
return answer;
}
@@ -136,15 +132,11 @@ public class HawtDBFile extends TxPageFi
answer = created;
} else if (location != null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Repository index with name " + name + " at location " + location);
- }
+ LOG.trace("Repository index with name {} at location {}", name, location);
answer = INDEX_FACTORY.open(tx, location);
}
- if (LOG.isTraceEnabled()) {
- LOG.trace("Repository index with name " + name + " -> " + answer);
- }
+ LOG.trace("Repository index with name {} -> {}", name, answer);
return answer;
}
@@ -164,9 +156,7 @@ public class HawtDBFile extends TxPageFi
// execute and get answer
answer = work.execute(tx);
- if (LOG.isTraceEnabled()) {
- LOG.trace("TX is read only: " + tx.isReadOnly() + " for executed work: " + work);
- }
+ LOG.trace("TX is read only: {} for executed work: {}", tx.isReadOnly(), work);
// commit work
tx.commit();
// and flush so we ensure data is spooled to disk
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java Sun Mar 27 20:29:58 2011
@@ -55,9 +55,7 @@ public class CamelServlet extends HttpSe
@Override
protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- if (log.isTraceEnabled()) {
- log.trace("Service: " + request);
- }
+ log.trace("Service: {}", request);
// Is there a consumer registered for the request.
HttpConsumer consumer = resolve(request);
@@ -87,9 +85,7 @@ public class CamelServlet extends HttpSe
exchange.setIn(new HttpMessage(exchange, request, response));
try {
- if (log.isTraceEnabled()) {
- log.trace("Processing request for exchangeId: " + exchange.getExchangeId());
- }
+ log.trace("Processing request for exchangeId: {}", exchange.getExchangeId());
// process the exchange
consumer.getProcessor().process(exchange);
} catch (Exception e) {
@@ -97,9 +93,7 @@ public class CamelServlet extends HttpSe
}
try {
- if (log.isTraceEnabled()) {
- log.trace("Writing response for exchangeId: " + exchange.getExchangeId());
- }
+ log.trace("Writing response for exchangeId: {}", exchange.getExchangeId());
// now lets output to the response
consumer.getBinding().writeResponse(exchange, response);
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=1086028&r1=1086027&r2=1086028&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 Sun Mar 27 20:29:58 2011
@@ -89,9 +89,7 @@ public class IBatisConsumer extends Sche
// poll data from the database
IBatisEndpoint endpoint = getEndpoint();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Polling: " + endpoint);
- }
+ LOG.trace("Polling: {}", endpoint);
List<Object> data = CastUtils.cast(endpoint.getProcessingStrategy().poll(this, getEndpoint()));
// create a list of exchange objects with the data
Modified: camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java (original)
+++ camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java Sun Mar 27 20:29:58 2011
@@ -64,14 +64,10 @@ public class IBatisProducer extends Defa
Object result;
Object in = exchange.getIn().getBody();
if (in != null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("QueryForObject: " + in + " using statement: " + statement);
- }
+ LOG.trace("QueryForObject: {} using statement: {}", in, statement);
result = client.queryForObject(statement, in);
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("QueryForObject using statement: " + statement);
- }
+ LOG.trace("QueryForObject using statement: {}", statement);
result = client.queryForObject(statement);
}
@@ -84,14 +80,10 @@ public class IBatisProducer extends Defa
Object result;
Object in = exchange.getIn().getBody();
if (in != null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("QueryForList: " + in + " using statement: " + statement);
- }
+ LOG.trace("QueryForList: {} using statement: {}", in, statement);
result = client.queryForList(statement, in);
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("QueryForList using statement: " + statement);
- }
+ LOG.trace("QueryForList using statement: {}", statement);
result = client.queryForList(statement);
}
@@ -108,16 +100,12 @@ public class IBatisProducer extends Defa
Iterator iter = ObjectHelper.createIterator(in);
while (iter.hasNext()) {
Object value = iter.next();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Inserting: " + value + " using statement: " + statement);
- }
+ LOG.trace("Inserting: {} using statement: {}", value, statement);
result = client.insert(statement, value);
doProcessResult(exchange, result);
}
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Inserting using statement: " + statement);
- }
+ LOG.trace("Inserting using statement: {}", statement);
result = client.insert(statement);
doProcessResult(exchange, result);
}
@@ -133,16 +121,12 @@ public class IBatisProducer extends Defa
Iterator iter = ObjectHelper.createIterator(in);
while (iter.hasNext()) {
Object value = iter.next();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Updating: " + value + " using statement: " + statement);
- }
+ LOG.trace("Updating: {} using statement: {}", value, statement);
result = client.update(statement, value);
doProcessResult(exchange, result);
}
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Updating using statement: " + statement);
- }
+ LOG.trace("Updating using statement: {}", statement);
result = client.update(statement);
doProcessResult(exchange, result);
}
@@ -158,16 +142,12 @@ public class IBatisProducer extends Defa
Iterator iter = ObjectHelper.createIterator(in);
while (iter.hasNext()) {
Object value = iter.next();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Deleting: " + value + " using statement: " + statement);
- }
+ LOG.trace("Deleting: {} using statement: {}", value, statement);
result = client.delete(statement, value);
doProcessResult(exchange, result);
}
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Deleting using statement: " + statement);
- }
+ LOG.trace("Deleting using statement: {}", statement);
result = client.delete(statement);
doProcessResult(exchange, result);
}
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=1086028&r1=1086027&r2=1086028&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 Sun Mar 27 20:29:58 2011
@@ -79,9 +79,7 @@ public class EndpointMessageListener imp
}
// process the exchange
- if (LOG.isTraceEnabled()) {
- LOG.trace("onMessage.process START");
- }
+ LOG.trace("onMessage.process START");
String correlationId = message.getJMSCorrelationID();
if (correlationId != null) {
@@ -93,9 +91,7 @@ public class EndpointMessageListener imp
} catch (Throwable e) {
exchange.setException(e);
}
- if (LOG.isTraceEnabled()) {
- LOG.trace("onMessage.process END");
- }
+ LOG.trace("onMessage.process END");
// get the correct jms message to send as reply
JmsMessage body = null;
@@ -145,9 +141,7 @@ public class EndpointMessageListener imp
if (rce != null) {
handleException(rce);
- if (LOG.isTraceEnabled()) {
- LOG.trace("onMessage END throwing exception: " + rce.getMessage());
- }
+ LOG.trace("onMessage END throwing exception: {}", rce.getMessage());
throw rce;
}
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=1086028&r1=1086027&r2=1086028&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 Sun Mar 27 20:29:58 2011
@@ -106,23 +106,19 @@ public class JmsBinding {
// based on message type
if (endpoint != null && endpoint.getMessageConverter() != null) {
if (LOG.isTraceEnabled()) {
- LOG.trace("Extracting body using a custom MessageConverter: " + endpoint.getMessageConverter() + " from JMS message: " + message);
+ LOG.trace("Extracting body using a custom MessageConverter: {} from JMS message: {}", endpoint.getMessageConverter(), message);
}
return endpoint.getMessageConverter().fromMessage(message);
}
// if we are configured to not map the jms message then return it as body
if (endpoint != null && !endpoint.getConfiguration().isMapJmsMessage()) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Option map JMS message is false so using JMS message as body: " + message);
- }
+ LOG.trace("Option map JMS message is false so using JMS message as body: {}", message);
return message;
}
if (message instanceof ObjectMessage) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Extracting body as a ObjectMessage from JMS message: " + message);
- }
+ LOG.trace("Extracting body as a ObjectMessage from JMS message: {}", message);
ObjectMessage objectMessage = (ObjectMessage)message;
Object payload = objectMessage.getObject();
if (payload instanceof DefaultExchangeHolder) {
@@ -133,25 +129,17 @@ public class JmsBinding {
return objectMessage.getObject();
}
} else if (message instanceof TextMessage) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Extracting body as a TextMessage from JMS message: " + message);
- }
+ LOG.trace("Extracting body as a TextMessage from JMS message: {}", message);
TextMessage textMessage = (TextMessage)message;
return textMessage.getText();
} else if (message instanceof MapMessage) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Extracting body as a MapMessage from JMS message: " + message);
- }
+ LOG.trace("Extracting body as a MapMessage from JMS message: {}", message);
return createMapFromMapMessage((MapMessage)message);
} else if (message instanceof BytesMessage) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Extracting body as a BytesMessage from JMS message: " + message);
- }
+ LOG.trace("Extracting body as a BytesMessage from JMS message: {}", message);
return createByteArrayFromBytesMessage((BytesMessage)message);
} else if (message instanceof StreamMessage) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Extracting body as a StreamMessage from JMS message: " + message);
- }
+ LOG.trace("Extracting body as a StreamMessage from JMS message: {}", message);
return message;
} else {
return null;
@@ -327,13 +315,13 @@ public class JmsBinding {
jmsMessage.setIntProperty(JmsConstants.JMS_DELIVERY_MODE, deliveryMode);
} else if (headerName.equals("JMSExpiration")) {
jmsMessage.setJMSExpiration(ExchangeHelper.convertToType(exchange, Long.class, headerValue));
- } else if (LOG.isTraceEnabled()) {
+ } else {
// The following properties are set by the MessageProducer:
// JMSDestination
// The following are set on the underlying JMS provider:
// JMSMessageID, JMSTimestamp, JMSRedelivered
// log at trace level to not spam log
- LOG.trace("Ignoring JMS header: " + headerName + " with value: " + headerValue);
+ LOG.trace("Ignoring JMS header: {} with value: {}", headerName, headerValue);
}
} else if (shouldOutputHeader(in, headerName, headerValue, exchange)) {
// only primitive headers and strings is allowed as properties
@@ -415,9 +403,7 @@ public class JmsBinding {
}
protected Message createJmsMessage(Exception cause, Session session) throws JMSException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Using JmsMessageType: " + Object);
- }
+ LOG.trace("Using JmsMessageType: {}", Object);
return session.createObjectMessage(cause);
}
@@ -426,9 +412,7 @@ public class JmsBinding {
// special for transferExchange
if (endpoint != null && endpoint.isTransferExchange()) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Option transferExchange=true so we use JmsMessageType: Object");
- }
+ LOG.trace("Option transferExchange=true so we use JmsMessageType: Object");
Serializable holder = DefaultExchangeHolder.marshal(exchange);
return session.createObjectMessage(holder);
}
@@ -436,7 +420,7 @@ public class JmsBinding {
// use a custom message converter
if (endpoint != null && endpoint.getMessageConverter() != null) {
if (LOG.isTraceEnabled()) {
- LOG.trace("Creating JmsMessage using a custom MessageConverter: " + endpoint.getMessageConverter() + " with body: " + body);
+ LOG.trace("Creating JmsMessage using a custom MessageConverter: {} with body: {}", endpoint.getMessageConverter(), body);
}
return endpoint.getMessageConverter().toMessage(body, session);
}
@@ -453,9 +437,7 @@ public class JmsBinding {
// create the JmsMessage based on the type
if (type != null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Using JmsMessageType: " + type);
- }
+ LOG.trace("Using JmsMessageType: {}", type);
return createJmsMessageForType(exchange, body, headers, session, context, type);
}
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=1086028&r1=1086027&r2=1086028&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 Sun Mar 27 20:29:58 2011
@@ -259,8 +259,6 @@ public class JmsConfiguration implements
logger.trace("Sent JMS message to: " + producer.getDestination() + " with message: " + message);
}
}
-
-
}
}
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java Sun Mar 27 20:29:58 2011
@@ -206,9 +206,7 @@ public class JmsMessage extends DefaultM
@Override
protected String createMessageId() {
if (jmsMessage == null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("No javax.jms.Message set so generating a new message id");
- }
+ LOG.trace("No javax.jms.Message set so generating a new message id");
return super.createMessageId();
}
try {
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=1086028&r1=1086027&r2=1086028&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 Sun Mar 27 20:29:58 2011
@@ -330,9 +330,7 @@ public class JmsProducer extends Default
CamelJmsTemplate template = (CamelJmsTemplate) (inOut ? getInOutTemplate() : getInOnlyTemplate());
- if (LOG.isTraceEnabled()) {
- LOG.trace("Using " + (inOut ? "inOut" : "inOnly") + " jms template");
- }
+ LOG.trace("Using {} jms template", inOut ? "inOut" : "inOnly");
// destination should be preferred
if (destination != null) {
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java Sun Mar 27 20:29:58 2011
@@ -53,9 +53,7 @@ public class PersistentQueueReplyManager
}
public void updateCorrelationId(String correlationId, String newCorrelationId, long requestTimeout) {
- if (log.isTraceEnabled()) {
- log.trace("Updated provisional correlationId [" + correlationId + "] to expected correlationId [" + newCorrelationId + "]");
- }
+ log.trace("Updated provisional correlationId [{}] to expected correlationId [{}]", correlationId, newCorrelationId);
ReplyHandler handler = correlation.remove(correlationId);
if (handler == null) {
@@ -147,9 +145,7 @@ public class PersistentQueueReplyManager
} else if (creator != null) {
id = creator.get();
}
- if (log.isTraceEnabled()) {
- log.trace("Using MessageSelector[" + id + "]");
- }
+ log.trace("Using MessageSelector[{}]", id);
return id;
}
}
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=1086028&r1=1086027&r2=1086028&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 Sun Mar 27 20:29:58 2011
@@ -61,9 +61,7 @@ public abstract class ReplyManagerSuppor
}
public void setReplyTo(Destination replyTo) {
- if (log.isTraceEnabled()) {
- log.trace("ReplyTo destination: " + replyTo);
- }
+ log.trace("ReplyTo destination: {}", replyTo);
this.replyTo = replyTo;
// trigger latch as the reply to has been resolved and set
replyToLatch.countDown();
@@ -176,9 +174,7 @@ public abstract class ReplyManagerSuppor
boolean done = false;
int counter = 0;
while (!done && counter++ < 50) {
- if (log.isTraceEnabled()) {
- log.trace("Early reply not found handler at attempt " + counter + ". Waiting a bit longer.");
- }
+ log.trace("Early reply not found handler at attempt {}. Waiting a bit longer.", counter);
try {
Thread.sleep(100);
} catch (InterruptedException e) {
@@ -191,8 +187,8 @@ public abstract class ReplyManagerSuppor
if (answer != null) {
if (log.isTraceEnabled()) {
- log.trace("Early reply with correlationID [" + correlationID + "] has been matched after "
- + counter + " attempts and can be processed using handler: " + answer);
+ log.trace("Early reply with correlationID [{}] has been matched after {} attempts and can be processed using handler: {}",
+ new Object[]{correlationID, counter, answer});
}
}
}
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java Sun Mar 27 20:29:58 2011
@@ -44,9 +44,7 @@ public class TemporaryQueueReplyManager
}
public void updateCorrelationId(String correlationId, String newCorrelationId, long requestTimeout) {
- if (log.isTraceEnabled()) {
- log.trace("Updated provisional correlationId [" + correlationId + "] to expected correlationId [" + newCorrelationId + "]");
- }
+ log.trace("Updated provisional correlationId [{}] to expected correlationId [{}]", correlationId, newCorrelationId);
ReplyHandler handler = correlation.remove(correlationId);
correlation.put(newCorrelationId, handler, requestTimeout);
Modified: camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueConsumer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueConsumer.java (original)
+++ camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueConsumer.java Sun Mar 27 20:29:58 2011
@@ -91,14 +91,10 @@ public class Jt400DataQueueConsumer exte
DataQueueEntry entry;
if (timeout >= 0) {
int seconds = (int)timeout / 1000;
- if (log.isTraceEnabled()) {
- log.trace("Reading from data queue: " + queue.getName() + " with " + seconds + " seconds timeout");
- }
+ log.trace("Reading from data queue: {} with {} seconds timeout", queue.getName(), seconds);
entry = queue.read(seconds);
} else {
- if (log.isTraceEnabled()) {
- log.trace("Reading from data queue: " + queue.getName() + " with no timeout");
- }
+ log.trace("Reading from data queue: {} with no timeout", queue.getName());
entry = queue.read(-1);
}
Modified: camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java (original)
+++ camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java Sun Mar 27 20:29:58 2011
@@ -62,7 +62,7 @@ public class Jt400PgmProducer extends De
boolean result = pgmCall.run();
if (LOG.isTraceEnabled()) {
- LOG.trace("Executed PGM '" + commandStr + "' in host '" + iSeries.getSystemName() + "'. Success? " + result);
+ LOG.trace("Executed PGM '{}' in host '{}'. Success? {}", new Object[]{commandStr, iSeries.getSystemName(), result});
}
if (result) {
Modified: camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java (original)
+++ camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java Sun Mar 27 20:29:58 2011
@@ -143,9 +143,7 @@ public class KestrelConsumer extends Def
}
public void run() {
- if (log.isTraceEnabled()) {
- log.trace("Kestrel poller is running");
- }
+ log.trace("Kestrel poller is running");
// Construct the target key that we'll be requesting from kestrel.
// Include the /t=... wait time as applicable.
@@ -179,9 +177,7 @@ public class KestrelConsumer extends Def
// Poll kestrel until we get an object back
Object value = null;
while (isRunAllowed() && !shutdownPending) {
- if (log.isTraceEnabled()) {
- log.trace("Polling " + target);
- }
+ log.trace("Polling {}", target);
try {
value = memcachedClient.get(target);
if (value != null) {
@@ -209,9 +205,7 @@ public class KestrelConsumer extends Def
}
}
- if (log.isTraceEnabled()) {
- log.trace("Got object from " + target);
- }
+ log.trace("Got object from {}", target);
if (concurrent) {
// Pass the object to the handler thread via the exchanger.
@@ -247,9 +241,7 @@ public class KestrelConsumer extends Def
}
}
}
- if (log.isTraceEnabled()) {
- log.trace("Finished polling " + target);
- }
+ log.trace("Finished polling {}", target);
// Decrement the shutdown countdown latch
shutdownLatch.countDown();
@@ -262,7 +254,7 @@ public class KestrelConsumer extends Def
public void run() {
if (log.isTraceEnabled()) {
- log.trace(Thread.currentThread().getName() + " is starting");
+ log.trace("{} is starting", Thread.currentThread().getName());
}
while (isRunAllowed() && !shutdownPending) {
@@ -292,9 +284,7 @@ public class KestrelConsumer extends Def
continue;
}
- if (log.isTraceEnabled()) {
- log.trace("Got a value from the exchanger");
- }
+ log.trace("Got a value from the exchanger");
// Create the exchange and let camel process/route it
Exchange exchange = null;
@@ -319,7 +309,7 @@ public class KestrelConsumer extends Def
shutdownLatch.countDown();
if (log.isTraceEnabled()) {
- log.trace(Thread.currentThread().getName() + " is finished");
+ log.trace("{} is finished", Thread.currentThread().getName());
}
}
}
Modified: camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java (original)
+++ camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java Sun Mar 27 20:29:58 2011
@@ -107,18 +107,14 @@ public class LdapProducer extends Defaul
private List<SearchResult> pagedSearch(LdapContext ldapContext, String searchFilter) throws Exception {
List<SearchResult> data = new ArrayList<SearchResult>();
- if (log.isTraceEnabled()) {
- log.trace("Using paged ldap search, pageSize=" + pageSize);
- }
+ log.trace("Using paged ldap search, pageSize={}", pageSize);
Control[] requestControls = new Control[]{new PagedResultsControl(pageSize, Control.CRITICAL)};
ldapContext.setRequestControls(requestControls);
do {
List<SearchResult> pageResult = simpleSearch(ldapContext, searchFilter);
data.addAll(pageResult);
- if (log.isTraceEnabled()) {
- log.trace("Page returned " + pageResult.size() + " entries");
- }
+ log.trace("Page returned {} entries", pageResult.size());
} while (prepareNextPage(ldapContext));
if (log.isDebugEnabled()) {
Modified: camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java (original)
+++ camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java Sun Mar 27 20:29:58 2011
@@ -102,8 +102,8 @@ public class LuceneIndexer {
private void add(String field, String value, boolean analyzed) throws IOException {
if (LOG.isTraceEnabled()) {
- LOG.trace("Adding field: " + field);
- LOG.trace(" value: " + value);
+ LOG.trace("Adding field: {}", field);
+ LOG.trace(" value: {}", value);
}
Document doc = new Document();
@@ -126,18 +126,14 @@ public class LuceneIndexer {
}
}
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Adding " + file);
- }
+ LOG.trace("Adding {}", file);
openIndexWriter();
add("path", file.getPath(), false);
add("contents", new String(IOConverter.toByteArray(file)), true);
closeIndexWriter();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Added " + file + " successfully");
- }
+ LOG.trace("Added {} successfully", file);
}
} else {
LOG.warn("Directory/File " + file.getAbsolutePath() + " could not be read."
Modified: camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java (original)
+++ camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java Sun Mar 27 20:29:58 2011
@@ -76,9 +76,7 @@ public class LuceneSearcher {
}
private int doSearch(String searchPhrase, int maxNumberOfHits, Version luenceVersion) throws NullPointerException, ParseException, IOException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("*** Search Phrase: " + searchPhrase + " ***");
- }
+ LOG.trace("*** Search Phrase: {} ***", searchPhrase);
QueryParser parser = new QueryParser(luenceVersion, "contents", analyzer);
Query query = parser.parse(searchPhrase);
@@ -86,9 +84,7 @@ public class LuceneSearcher {
indexSearcher.search(query, collector);
hits = collector.topDocs().scoreDocs;
- if (LOG.isTraceEnabled()) {
- LOG.trace("*** Search generated " + hits.length + " hits ***");
- }
+ LOG.trace("*** Search generated {} hits ***", hits.length);
return hits.length;
}
}
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java Sun Mar 27 20:29:58 2011
@@ -142,9 +142,7 @@ public class MailBinding {
contentType = contentType.trim() + "; charset=" + IOConverter.getCharsetName(exchange, false);
}
- if (LOG.isTraceEnabled()) {
- LOG.trace("Determined Content-Type: " + contentType);
- }
+ LOG.trace("Determined Content-Type: {}", contentType);
return contentType;
}
@@ -197,9 +195,7 @@ public class MailBinding {
String contentType = determineContentType(configuration, exchange);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Using Content-Type " + contentType + " for MimeMessage: " + part);
- }
+ LOG.trace("Using Content-Type {} for MimeMessage: {}", contentType, part);
// always store content in a byte array data store to avoid various content type and charset issues
DataSource ds = new ByteArrayDataSource(exchange.getIn().getBody(String.class), contentType);
@@ -216,9 +212,7 @@ public class MailBinding {
String contentType = determineContentType(configuration, exchange);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Using Content-Type " + contentType + " for BodyPart: " + part);
- }
+ LOG.trace("Using Content-Type {} for BodyPart: {}", contentType, part);
// always store content in a byte array data store to avoid various content type and charset issues
DataSource ds = new ByteArrayDataSource(exchange.getIn().getBody(String.class), contentType);
@@ -301,12 +295,12 @@ public class MailBinding {
} else {
String disposition = part.getDisposition();
if (LOG.isTraceEnabled()) {
- LOG.trace("Part #" + i + ": Disposition: " + part.getDisposition());
- LOG.trace("Part #" + i + ": Description: " + part.getDescription());
- LOG.trace("Part #" + i + ": ContentType: " + part.getContentType());
- LOG.trace("Part #" + i + ": FileName: " + part.getFileName());
- LOG.trace("Part #" + i + ": Size: " + part.getSize());
- LOG.trace("Part #" + i + ": LineCount: " + part.getLineCount());
+ LOG.trace("Part #{}: Disposition: {}", i, part.getDisposition());
+ LOG.trace("Part #{}: Description: {}", i, part.getDescription());
+ LOG.trace("Part #{}: ContentType: {}", i, part.getContentType());
+ LOG.trace("Part #{}: FileName: {}", i, part.getFileName());
+ LOG.trace("Part #{}: Size: {}", i, part.getSize());
+ LOG.trace("Part #{}: LineCount: {}", i, part.getLineCount());
}
if (disposition != null && (disposition.equalsIgnoreCase(Part.ATTACHMENT) || disposition.equalsIgnoreCase(Part.INLINE))) {
@@ -437,9 +431,9 @@ public class MailBinding {
DataHandler handler = entry.getValue();
if (LOG.isTraceEnabled()) {
- LOG.trace("Attachment #" + i + ": Disposition: " + partDisposition);
- LOG.trace("Attachment #" + i + ": DataHandler: " + handler);
- LOG.trace("Attachment #" + i + ": FileName: " + attachmentFilename);
+ LOG.trace("Attachment #{}: Disposition: {}", i, partDisposition);
+ LOG.trace("Attachment #{}: DataHandler: {}", i, handler);
+ LOG.trace("Attachment #{}: FileName: {}", i, attachmentFilename);
}
if (handler != null) {
if (shouldAddAttachment(exchange, attachmentFilename, handler)) {
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java Sun Mar 27 20:29:58 2011
@@ -71,9 +71,7 @@ public class MimeMultipartAlternativeTes
((MailMessage)out.getIn()).getMessage().writeTo(baos);
String dumpedMessage = baos.toString();
assertTrue("There should have the " + expectString, dumpedMessage.indexOf(expectString) > 0);
- if (log.isTraceEnabled()) {
- log.trace("multipart alternative: \n" + dumpedMessage);
- }
+ log.trace("multipart alternative: \n{}", dumpedMessage);
// plain text
assertEquals(alternativeBody, out.getIn().getBody(String.class));
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java Sun Mar 27 20:29:58 2011
@@ -65,9 +65,7 @@ public class MimeMultipartAlternativeWit
((MailMessage)out.getIn()).getMessage().writeTo(baos);
String dumpedMessage = baos.toString();
assertTrue("There should have the " + expectString, dumpedMessage.indexOf(expectString) > 0);
- if (log.isTraceEnabled()) {
- log.trace("multipart alternative: \n" + dumpedMessage);
- }
+ log.trace("multipart alternative: \n{}", dumpedMessage);
// plain text
assertEquals(alternativeBody, out.getIn().getBody(String.class));
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java Sun Mar 27 20:29:58 2011
@@ -71,9 +71,7 @@ public class MimeMultipartAlternativeWit
((MailMessage)out.getIn()).getMessage().writeTo(baos);
String dumpedMessage = baos.toString();
assertTrue("There should have the " + expectString, dumpedMessage.indexOf(expectString) > 0);
- if (log.isTraceEnabled()) {
- log.trace("multipart alternative: \n" + dumpedMessage);
- }
+ log.trace("multipart alternative: \n{}", dumpedMessage);
// plain text
assertEquals(alternativeBody, out.getIn().getBody(String.class));
Modified: camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java (original)
+++ camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java Sun Mar 27 20:29:58 2011
@@ -48,9 +48,7 @@ public final class MinaHelper {
WriteFuture future = session.write(body);
// must use a timeout (we use 10s) as in some very high performance scenarios a write can cause
// thread hanging forever
- if (LOG.isTraceEnabled()) {
- LOG.trace("Waiting for write to complete");
- }
+ LOG.trace("Waiting for write to complete");
future.join(10 * 1000L);
if (!future.isWritten()) {
LOG.warn("Cannot write body: " + body + " using session: " + session);
Modified: camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java (original)
+++ camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java Sun Mar 27 20:29:58 2011
@@ -187,9 +187,7 @@ public class MinaProducer extends Defaul
// Change the worker timeout to 0 second to make the I/O thread quit soon when there's no connection to manage.
// Default worker timeout is 60 sec and therefore the client using MinaProducer cannot terminate the JVM
// asap but must wait for the timeout to happen, so to speed this up we set the timeout to 0.
- if (LOG.isTraceEnabled()) {
- LOG.trace("Setting SocketConnector WorkerTimeout=0 to force MINA stopping its resources faster");
- }
+ LOG.trace("Setting SocketConnector WorkerTimeout=0 to force MINA stopping its resources faster");
((SocketConnector) connector).setWorkerTimeout(0);
}
Modified: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java (original)
+++ camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java Sun Mar 27 20:29:58 2011
@@ -89,9 +89,7 @@ public class MyBatisConsumer extends Sch
// poll data from the database
MyBatisEndpoint endpoint = getEndpoint();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Polling: " + endpoint);
- }
+ LOG.trace("Polling: {}", endpoint);
List<Object> data = CastUtils.cast(endpoint.getProcessingStrategy().poll(this, getEndpoint()));
// create a list of exchange objects with the data
Modified: camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java (original)
+++ camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java Sun Mar 27 20:29:58 2011
@@ -67,14 +67,10 @@ public class MyBatisProducer extends Def
Object result;
Object in = exchange.getIn().getBody();
if (in != null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("SelectOne: " + in + " using statement: " + statement);
- }
+ LOG.trace("SelectOne: {} using statement: {}", in, statement);
result = session.selectOne(statement, in);
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("SelectOne using statement: " + statement);
- }
+ LOG.trace("SelectOne using statement: {}", statement);
result = session.selectOne(statement);
}
@@ -91,14 +87,10 @@ public class MyBatisProducer extends Def
Object result;
Object in = exchange.getIn().getBody();
if (in != null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("SelectList: " + in + " using statement: " + statement);
- }
+ LOG.trace("SelectList: {} using statement: {}", in, statement);
result = session.selectList(statement, in);
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("SelectList using statement: " + statement);
- }
+ LOG.trace("SelectList using statement: {}", statement);
result = session.selectList(statement);
}
@@ -119,16 +111,12 @@ public class MyBatisProducer extends Def
Iterator iter = ObjectHelper.createIterator(in);
while (iter.hasNext()) {
Object value = iter.next();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Inserting: " + value + " using statement: " + statement);
- }
+ LOG.trace("Inserting: {} using statement: {}", value, statement);
result = session.insert(statement, value);
doProcessResult(exchange, result);
}
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Inserting using statement: " + statement);
- }
+ LOG.trace("Inserting using statement: {}", statement);
result = session.insert(statement);
doProcessResult(exchange, result);
}
@@ -149,16 +137,12 @@ public class MyBatisProducer extends Def
Iterator iter = ObjectHelper.createIterator(in);
while (iter.hasNext()) {
Object value = iter.next();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Updating: " + value + " using statement: " + statement);
- }
+ LOG.trace("Updating: {} using statement: {}", value, statement);
result = session.update(statement, value);
doProcessResult(exchange, result);
}
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Updating using statement: " + statement);
- }
+ LOG.trace("Updating using statement: {}", statement);
result = session.update(statement);
doProcessResult(exchange, result);
}
@@ -179,16 +163,12 @@ public class MyBatisProducer extends Def
Iterator iter = ObjectHelper.createIterator(in);
while (iter.hasNext()) {
Object value = iter.next();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Deleting: " + value + " using statement: " + statement);
- }
+ LOG.trace("Deleting: {} using statement: {}", value, statement);
result = session.delete(statement, value);
doProcessResult(exchange, result);
}
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Deleting using statement: " + statement);
- }
+ LOG.trace("Deleting using statement: {}", statement);
result = session.delete(statement);
doProcessResult(exchange, result);
}
Modified: camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java (original)
+++ camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java Sun Mar 27 20:29:58 2011
@@ -52,9 +52,7 @@ public class NagiosEventNotifier extends
log.info("Sending notification to Nagios: {}", payload.getMessage());
sender.send(payload);
- if (log.isTraceEnabled()) {
- log.trace("Sending notification done");
- }
+ log.trace("Sending notification done");
}
public boolean isEnabled(EventObject eventObject) {
Modified: camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java (original)
+++ camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java Sun Mar 27 20:29:58 2011
@@ -58,9 +58,7 @@ public class NagiosProducer extends Defa
log.debug("Sending notification to Nagios: " + payload.getMessage());
}
sender.send(payload);
- if (log.isTraceEnabled()) {
- log.trace("Sending notification done");
- }
+ log.trace("Sending notification done");
}
@Override
Modified: camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyHelper.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyHelper.java (original)
+++ camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyHelper.java Sun Mar 27 20:29:58 2011
@@ -57,17 +57,13 @@ public final class NettyHelper {
if (TextLineDelimiter.LINE.equals(delimiter)) {
// line delimiter so ensure it ends with newline
if (!s.endsWith("\n")) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Auto appending missing newline delimiter to body");
- }
+ LOG.trace("Auto appending missing newline delimiter to body");
s = s + "\n";
}
} else {
// null delimiter so ensure it ends with null
if (!s.endsWith("\u0000")) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Auto appending missing null delimiter to body");
- }
+ LOG.trace("Auto appending missing null delimiter to body");
s = s + "\u0000";
}
}
@@ -96,9 +92,7 @@ public final class NettyHelper {
}
// wait for the write
- if (LOG.isTraceEnabled()) {
- LOG.trace("Waiting for write to complete");
- }
+ LOG.trace("Waiting for write to complete");
future.awaitUninterruptibly();
// if it was not a success then thrown an exception
@@ -115,9 +109,7 @@ public final class NettyHelper {
*/
public static void close(Channel channel) {
if (channel != null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Closing channel: " + channel);
- }
+ LOG.trace("Closing channel: {}", channel);
channel.close().awaitUninterruptibly();
}
}
Modified: camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java (original)
+++ camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java Sun Mar 27 20:29:58 2011
@@ -86,9 +86,7 @@ public class ClientChannelHandler extend
@Override
public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Channel closed: " + ctx.getChannel());
- }
+ LOG.trace("Channel closed: {}", ctx.getChannel());
if (producer.getConfiguration().isSync() && !messageReceived && !exceptionHandled) {
// session was closed but no message received. This could be because the remote server had an internal error
Modified: camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ServerChannelHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ServerChannelHandler.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ServerChannelHandler.java (original)
+++ camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ServerChannelHandler.java Sun Mar 27 20:29:58 2011
@@ -51,18 +51,14 @@ public class ServerChannelHandler extend
@Override
public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Channel open: " + e.getChannel());
- }
+ LOG.trace("Channel open: {}", e.getChannel());
// to keep track of open sockets
consumer.getAllChannels().add(e.getChannel());
}
@Override
public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Channel closed: " + e.getChannel());
- }
+ LOG.trace("Channel closed: {}", e.getChannel());
}
@Override
Modified: camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java (original)
+++ camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java Sun Mar 27 20:29:58 2011
@@ -70,9 +70,7 @@ public class PaxLoggingConsumer extends
// TODO: populate exchange headers
exchange.getIn().setBody(paxLoggingEvent);
- if (LOG.isTraceEnabled()) {
- LOG.trace("PaxLogging " + endpoint.getName() + " is firing");
- }
+ LOG.trace("PaxLogging {} is firing", endpoint.getName());
try {
getProcessor().process(exchange);
// log exception if an exception occurred and was not handled
Modified: camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java (original)
+++ camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java Sun Mar 27 20:29:58 2011
@@ -90,9 +90,7 @@ public class RestletProducer extends Def
String uri = endpoint.getProtocol() + "://" + endpoint.getHost() + ":" + endpoint.getPort() + endpoint.getUriPattern();
// substitute { } placeholders in uri and use mandatory headers
- if (LOG.isTraceEnabled()) {
- LOG.trace("Substituting { } placeholders in uri: " + uri);
- }
+ LOG.trace("Substituting { } placeholders in uri: {}", uri);
Matcher matcher = PATTERN.matcher(uri);
while (matcher.find()) {
String key = matcher.group(1);
@@ -103,7 +101,7 @@ public class RestletProducer extends Def
}
if (LOG.isTraceEnabled()) {
- LOG.trace("Replacing: " + matcher.group(0) + " with header value: " + header);
+ LOG.trace("Replacing: {} with header value: {}", matcher.group(0), header);
}
uri = matcher.replaceFirst(header);
@@ -182,9 +180,7 @@ public class RestletProducer extends Def
if (response instanceof Response) {
for (Map.Entry<String, Object> entry : ((Response) response).getAttributes().entrySet()) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Parse external header " + entry.getKey() + "=" + entry.getValue());
- }
+ LOG.trace("Parse external header {}={}", entry.getKey(), entry.getValue());
answer.put(entry.getKey(), entry.getValue().toString());
}
}
Modified: camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java (original)
+++ camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java Sun Mar 27 20:29:58 2011
@@ -71,7 +71,7 @@ public class RouteboxConfiguration {
setUri(uri);
setAuthority(uri.getAuthority());
if (LOG.isTraceEnabled()) {
- LOG.trace("Authority: " + uri.getAuthority());
+ LOG.trace("Authority: {}", uri.getAuthority());
}
setEndpointName(getAuthority());
Modified: camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/seda/RouteboxSedaProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/seda/RouteboxSedaProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/seda/RouteboxSedaProducer.java (original)
+++ camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/seda/RouteboxSedaProducer.java Sun Mar 27 20:29:58 2011
@@ -72,12 +72,12 @@ public class RouteboxSedaProducer extend
// check for timeout, which then already would have invoked the latch
if (latch.getCount() == 0) {
if (log.isTraceEnabled()) {
- log.trace(this + ". Timeout occurred so response will be ignored: " + (response.hasOut() ? response.getOut() : response.getIn()));
+ log.trace("{}. Timeout occurred so response will be ignored: {}", this, response.hasOut() ? response.getOut() : response.getIn());
}
return;
} else {
if (log.isTraceEnabled()) {
- log.trace(this + " with response: " + (response.hasOut() ? response.getOut() : response.getIn()));
+ log.trace("{} with response: {}", this, response.hasOut() ? response.getOut() : response.getIn());
}
try {
ExchangeHelper.copyResults(exchange, response);
@@ -102,9 +102,7 @@ public class RouteboxSedaProducer extend
queue.add(copy);
if (timeout > 0) {
- if (log.isTraceEnabled()) {
- log.trace("Waiting for task to complete using timeout (ms): " + timeout + " at [" + endpoint.getEndpointUri() + "]");
- }
+ log.trace("Waiting for task to complete using timeout (ms): {} at [{}]", timeout, endpoint.getEndpointUri());
// lets see if we can get the task done before the timeout
boolean done = false;
try {
@@ -118,9 +116,7 @@ public class RouteboxSedaProducer extend
latch.countDown();
}
} else {
- if (log.isTraceEnabled()) {
- log.trace("Waiting for task to complete (blocking) at [" + endpoint.getEndpointUri() + "]");
- }
+ log.trace("Waiting for task to complete (blocking) at [{}]", endpoint.getEndpointUri());
// no timeout then wait until its done
try {
latch.await();
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java Sun Mar 27 20:29:58 2011
@@ -149,9 +149,7 @@ public class XsltComponent extends Resou
}
private void loadResource(XsltBuilder xslt, Resource resource) throws TransformerConfigurationException {
- if (log.isTraceEnabled()) {
- log.trace(this + " loading schema resource: " + resource);
- }
+ log.trace("{} loading schema resource: {}", this, resource);
try {
xslt.setTransformerInputStream(resource.getInputStream());
} catch (Exception e) {
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java Sun Mar 27 20:29:58 2011
@@ -82,9 +82,7 @@ public class CamelBeanPostProcessor impl
}
public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Camel bean processing before initialization for bean: " + beanName);
- }
+ LOG.trace("Camel bean processing before initialization for bean: {}", beanName);
// some beans cannot be post processed at this given time, so we gotta check beforehand
if (!canPostProcessBean(bean, beanName)) {
@@ -108,9 +106,7 @@ public class CamelBeanPostProcessor impl
}
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Camel bean processing after initialization for bean: " + beanName);
- }
+ LOG.trace("Camel bean processing after initialization for bean: {}", beanName);
// some beans cannot be post processed at this given time, so we gotta check beforehand
if (!canPostProcessBean(bean, beanName)) {
@@ -175,9 +171,7 @@ public class CamelBeanPostProcessor impl
CamelContextAware camelContextAware = (CamelContextAware) bean;
CamelContext context = camelContextAware.getCamelContext();
if (context != null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("CamelContext already set on bean with id [" + beanName + "]. Will keep existing CamelContext on bean.");
- }
+ LOG.trace("CamelContext already set on bean with id [{}]. Will keep existing CamelContext on bean.", beanName);
return false;
}
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java Sun Mar 27 20:29:58 2011
@@ -53,9 +53,7 @@ public class ContextScanRouteBuilderFind
Object bean = entry.getValue();
Object key = entry.getKey();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Found RouteBuilder with id: " + key + " -> " + bean);
- }
+ LOG.trace("Found RouteBuilder with id: {} -> {}", key, bean);
// certain beans should be ignored
if (shouldIgnoreBean(bean)) {