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 [4/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-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDefaultContextAndRouteBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDefaultContextAndRouteBuilderTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDefaultContextAndRouteBuilderTest.java (original)
+++ camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDefaultContextAndRouteBuilderTest.java Fri Jun 10 06:02:06 2011
@@ -77,9 +77,7 @@ public class RouteboxDefaultContextAndRo
});
context.start();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Beginning Test ---> testRouteboxUsingDefaultContextAndRouteBuilder()");
- }
+ LOG.debug("Beginning Test ---> testRouteboxUsingDefaultContextAndRouteBuilder()");
Book book = new Book("Sir Arthur Conan Doyle", "The Adventures of Sherlock Holmes");
@@ -87,14 +85,10 @@ public class RouteboxDefaultContextAndRo
assertEquals("Book with Author " + book.getAuthor() + " and title " + book.getTitle() + " added to Catalog", response);
book = (Book) sendFindBookRequest(template, routeboxUri, "findBook", "Sir Arthur Conan Doyle");
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received book with author " + book.getAuthor() + " and title " + book.getTitle());
- }
+ LOG.debug("Received book with author {} and title {}", book.getAuthor(), book.getTitle());
assertEquals("The Adventures of Sherlock Holmes", book.getTitle());
- if (LOG.isDebugEnabled()) {
- LOG.debug("Completed Test ---> testRouteboxUsingDefaultContextAndRouteBuilder()");
- }
+ LOG.debug("Completed Test ---> testRouteboxUsingDefaultContextAndRouteBuilder()");
context.stop();
}
Modified: camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectProducerOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectProducerOnlyTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectProducerOnlyTest.java (original)
+++ camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectProducerOnlyTest.java Fri Jun 10 06:02:06 2011
@@ -77,9 +77,7 @@ public class RouteboxDirectProducerOnlyT
});
context.start();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Beginning Test ---> testRouteboxDirectSyncRequests()");
- }
+ LOG.debug("Beginning Test ---> testRouteboxDirectSyncRequests()");
Book book = new Book("Sir Arthur Conan Doyle", "The Adventures of Sherlock Holmes");
@@ -89,14 +87,10 @@ public class RouteboxDirectProducerOnlyT
//Thread.sleep(2000);
book = (Book) sendFindBookRequest(template, "direct:start", "findBook", "Sir Arthur Conan Doyle");
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received book with author " + book.getAuthor() + " and title " + book.getTitle());
- }
+ LOG.debug("Received book with author {} and title {}", book.getAuthor(), book.getTitle());
assertEquals("The Adventures of Sherlock Holmes", book.getTitle());
- if (LOG.isDebugEnabled()) {
- LOG.debug("Completed Test ---> testRouteboxDirectSyncRequests()");
- }
+ LOG.debug("Completed Test ---> testRouteboxDirectSyncRequests()");
context.stop();
}
}
Modified: camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectTest.java (original)
+++ camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectTest.java Fri Jun 10 06:02:06 2011
@@ -77,9 +77,7 @@ public class RouteboxDirectTest extends
});
context.start();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Beginning Test ---> testRouteboxDirectAsyncRequests()");
- }
+ LOG.debug("Beginning Test ---> testRouteboxDirectAsyncRequests()");
Book book = new Book("Sir Arthur Conan Doyle", "The Adventures of Sherlock Holmes");
@@ -91,14 +89,10 @@ public class RouteboxDirectTest extends
//Thread.sleep(2000);
book = (Book) sendFindBookRequest(template, routeboxUri, "findBook", "Sir Arthur Conan Doyle");
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received book with author " + book.getAuthor() + " and title " + book.getTitle());
- }
+ LOG.debug("Received book with author {} and title {}", book.getAuthor(), book.getTitle());
assertEquals("The Adventures of Sherlock Holmes", book.getTitle());
- if (LOG.isDebugEnabled()) {
- LOG.debug("Completed Test ---> testRouteboxDirectAsyncRequests()");
- }
+ LOG.debug("Completed Test ---> testRouteboxDirectAsyncRequests()");
context.stop();
}
Modified: camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java (original)
+++ camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java Fri Jun 10 06:02:06 2011
@@ -83,9 +83,7 @@ public class RouteboxDispatchMapTest ext
});
context.start();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Beginning Test ---> testRouteboxUsingDispatchMap()");
- }
+ LOG.debug("Beginning Test ---> testRouteboxUsingDispatchMap()");
Book book = new Book("Sir Arthur Conan Doyle", "The Adventures of Sherlock Holmes");
@@ -93,14 +91,10 @@ public class RouteboxDispatchMapTest ext
assertEquals("Book with Author " + book.getAuthor() + " and title " + book.getTitle() + " added to Catalog", response);
book = (Book) sendFindBookRequest(template, routeboxUri, "findBook", "Sir Arthur Conan Doyle");
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received book with author " + book.getAuthor() + " and title " + book.getTitle());
- }
+ LOG.debug("Received book with author {} and title {}", book.getAuthor(), book.getTitle());
assertEquals("The Adventures of Sherlock Holmes", book.getTitle());
- if (LOG.isDebugEnabled()) {
- LOG.debug("Completed Test ---> testRouteboxUsingDispatchMap()");
- }
+ LOG.debug("Completed Test ---> testRouteboxUsingDispatchMap()");
context.stop();
}
Modified: camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxSedaTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxSedaTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxSedaTest.java (original)
+++ camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxSedaTest.java Fri Jun 10 06:02:06 2011
@@ -77,9 +77,7 @@ public class RouteboxSedaTest extends Ro
});
context.start();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Beginning Test ---> testRouteboxSedaAsyncRequests()");
- }
+ LOG.debug("Beginning Test ---> testRouteboxSedaAsyncRequests()");
Book book = new Book("Sir Arthur Conan Doyle", "The Adventures of Sherlock Holmes");
@@ -91,14 +89,10 @@ public class RouteboxSedaTest extends Ro
//Thread.sleep(2000);
book = (Book) sendFindBookRequest(template, routeboxUri, "findBook", "Sir Arthur Conan Doyle");
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received book with author " + book.getAuthor() + " and title " + book.getTitle());
- }
+ LOG.debug("Received book with author {} and title {}", book.getAuthor(), book.getTitle());
assertEquals("The Adventures of Sherlock Holmes", book.getTitle());
- if (LOG.isDebugEnabled()) {
- LOG.debug("Completed Test ---> testRouteboxSedaAsyncRequests()");
- }
+ LOG.debug("Completed Test ---> testRouteboxSedaAsyncRequests()");
context.stop();
}
Modified: camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/BookCatalog.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/BookCatalog.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/BookCatalog.java (original)
+++ camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/BookCatalog.java Fri Jun 10 06:02:06 2011
@@ -37,24 +37,18 @@ public class BookCatalog {
}
public String addToCatalog(Book book) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Adding book with author " + book.getAuthor() + " and title " + book.getTitle());
- }
+ LOG.debug("Adding book with author {} and title {}", book.getAuthor(), book.getTitle());
map.put(book.getAuthor(), book);
return "Book with Author " + book.getAuthor() + " and title " + book.getTitle() + " added to Catalog";
}
public Book findBook(String author) throws Exception {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Finding book with author " + author);
- }
+ LOG.debug("Finding book with author {}", author);
return map.get(author);
}
public Book findAuthor(String title) throws Exception {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Finding author with book " + title);
- }
+ LOG.debug("Finding author with book {}", title);
Set<String> keys = map.keySet();
Book book = null;
Modified: camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java (original)
+++ camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java Fri Jun 10 06:02:06 2011
@@ -47,17 +47,12 @@ public class UpdatedDateFilter implement
updated = ((SyndEntry)entry).getPublishedDate();
}
if (updated == null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("No updated time for entry so assuming its valid: entry=[" + entry + "]");
- }
+ LOG.debug("No updated time for entry so assuming its valid: entry=[{}]", entry);
return true;
}
if (lastUpdate != null) {
if (lastUpdate.after(updated) || lastUpdate.equals(updated)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Entry is older than lastupdate=[" + lastUpdate
- + "], no valid entry=[" + entry + "]");
- }
+ LOG.debug("Entry is older than lastupdate=[{}], no valid entry=[{}]", lastUpdate, entry);
return false;
}
}
Modified: camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java (original)
+++ camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java Fri Jun 10 06:02:06 2011
@@ -109,9 +109,7 @@ public abstract class XQueryBuilder impl
@SuppressWarnings("unchecked")
public Object evaluate(Exchange exchange) {
try {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Evaluation: " + expression + " for exchange: " + exchange);
- }
+ LOG.debug("Evaluation: {} for exchange: {}", expression, exchange);
if (resultType != null) {
if (resultType.equals(String.class)) {
@@ -511,9 +509,7 @@ public abstract class XQueryBuilder impl
protected synchronized void initialize(Exchange exchange) throws XPathException, IOException {
// must use synchronized for concurrency issues and only let it initialize once
if (!initialized.get()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Initializing XQueryBuilder " + this);
- }
+ LOG.debug("Initializing XQueryBuilder {}", this);
configuration = new Configuration();
configuration.setHostLanguage(Configuration.XQUERY);
configuration.setStripsWhiteSpace(isStripsAllWhiteSpace() ? Whitespace.ALL : Whitespace.IGNORABLE);
Modified: camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java (original)
+++ camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java Fri Jun 10 06:02:06 2011
@@ -34,9 +34,7 @@ public class XQueryComponent extends Res
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
Resource resource = resolveMandatoryResource(remaining);
- if (log.isDebugEnabled()) {
- log.debug(this + " using schema resource: " + resource);
- }
+ log.debug("{} using schema resource: {}", this, resource);
XQueryBuilder xslt = XQueryBuilder.xquery(resource.getURL());
configureXslt(xslt, uri, remaining, parameters);
return new ProcessorEndpoint(uri, this, xslt);
Modified: camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java (original)
+++ camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java Fri Jun 10 06:02:06 2011
@@ -534,9 +534,7 @@ public class ScriptBuilder implements Ex
populateBindings(getEngine(), exchange);
addScriptEngineArguments(getEngine(), exchange);
Object result = runScript();
- if (LOG.isDebugEnabled()) {
- LOG.debug("The script evaluation result is: " + result);
- }
+ LOG.debug("The script evaluation result is: {}", result);
return result;
} catch (ScriptException e) {
if (LOG.isDebugEnabled()) {
Modified: camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java (original)
+++ camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java Fri Jun 10 06:02:06 2011
@@ -199,9 +199,7 @@ public class ShiroSecurityPolicy impleme
try {
currentUser.login(token);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Current User " + currentUser.getPrincipal() + " successfully authenticated");
- }
+ LOG.debug("Current User {} successfully authenticated", currentUser.getPrincipal());
} catch (UnknownAccountException uae) {
throw new UnknownAccountException("Authentication Failed. There is no user with username of " + token.getPrincipal(), uae.getCause());
} catch (IncorrectCredentialsException ice) {
@@ -225,9 +223,7 @@ public class ShiroSecurityPolicy impleme
}
}
} else {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Valid Permissions List not specified for ShiroSecurityPolicy. No authorization checks will be performed for current user");
- }
+ LOG.debug("Valid Permissions List not specified for ShiroSecurityPolicy. No authorization checks will be performed for current user");
authorized = true;
}
@@ -235,9 +231,7 @@ public class ShiroSecurityPolicy impleme
throw new CamelAuthorizationException("Authorization Failed. Subject's role set does not have the necessary permissions to perform further processing", exchange);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Current User " + currentUser.getPrincipal() + " is successfully authorized. The exchange will be allowed to proceed");
- }
+ LOG.debug("Current User {} is successfully authorized. The exchange will be allowed to proceed", currentUser.getPrincipal());
}
public CipherService getCipherService() {
Modified: camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java (original)
+++ camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java Fri Jun 10 06:02:06 2011
@@ -55,19 +55,15 @@ public class SipPresenceAgentListener im
Request request = requestEvent.getRequest();
ServerTransaction serverTransactionId = requestEvent.getServerTransaction();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Request: " + request.getMethod());
- LOG.debug("Server Transaction Id:" + serverTransactionId);
- }
+ LOG.debug("Request: {}", request.getMethod());
+ LOG.debug("Server Transaction Id: {}", serverTransactionId);
if (request.getMethod().equals(Request.SUBSCRIBE)) {
processSubscribe(requestEvent, serverTransactionId);
} else if (request.getMethod().equals(Request.PUBLISH)) {
processPublish(requestEvent, serverTransactionId);
} else {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received expected request with method: " + request.getMethod() + ". No further processing done");
- }
+ LOG.debug("Received expected request with method: {}. No further processing done", request.getMethod());
}
}
@@ -107,9 +103,7 @@ public class SipPresenceAgentListener im
notifyRequest.setHeader(eventHeader);
notifyRequest.setHeader(sipPresenceAgent.getConfiguration().getContactHeader());
notifyRequest.setContent(body, sipPresenceAgent.getConfiguration().getContentTypeHeader());
- if (LOG.isDebugEnabled()) {
- LOG.debug("Sending the following NOTIFY request to Subscriber: " + notifyRequest);
- }
+ LOG.debug("Sending the following NOTIFY request to Subscriber: {}", notifyRequest);
ClientTransaction clientTransactionId = sipPresenceAgent.getProvider().getNewClientTransaction(notifyRequest);
@@ -120,10 +114,8 @@ public class SipPresenceAgentListener im
ServerTransaction serverTransactionId) {
try {
Request request = requestEvent.getRequest();
- if (LOG.isDebugEnabled()) {
- LOG.debug("SipPresenceAgentListener: Received a Publish request, sending OK");
- LOG.debug("SipPresenceAgentListener request: " + request);
- }
+ LOG.debug("SipPresenceAgentListener: Received a Publish request, sending OK");
+ LOG.debug("SipPresenceAgentListener request: {}", request);
EventHeader eventHeader = (EventHeader) requestEvent.getRequest().getHeader(EventHeader.NAME);
Response response = sipPresenceAgent.getConfiguration().getMessageFactory().createResponse(202, request);
sipPresenceAgent.getProvider().sendResponse(response);
@@ -141,15 +133,11 @@ public class SipPresenceAgentListener im
SipProvider sipProvider = (SipProvider) requestEvent.getSource();
Request request = requestEvent.getRequest();
try {
- if (LOG.isDebugEnabled()) {
- LOG.debug("SipPresenceAgentListener: Received a Subscribe request, sending OK");
- LOG.debug("SipPresenceAgentListener request: " + request);
- }
+ LOG.debug("SipPresenceAgentListener: Received a Subscribe request, sending OK");
+ LOG.debug("SipPresenceAgentListener request: {}", request);
EventHeader eventHeader = (EventHeader) request.getHeader(EventHeader.NAME);
if (eventHeader == null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Cannot find event header.... dropping request.");
- }
+ LOG.debug("Cannot find event header.... dropping request.");
return;
}
@@ -182,10 +170,8 @@ public class SipPresenceAgentListener im
response.addHeader(sipPresenceAgent.getConfiguration().getExpiresHeader());
st.sendResponse(response);
- if (LOG.isDebugEnabled()) {
- LOG.debug("SipPresenceAgentListener: Sent OK Message");
- LOG.debug("SipPresenceAgentListener response: " + response);
- }
+ LOG.debug("SipPresenceAgentListener: Sent OK Message");
+ LOG.debug("SipPresenceAgentListener response: {}", response);
sendNotification(eventHeader, isInitial, request.getContent());
} catch (Throwable e) {
Modified: camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java (original)
+++ camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java Fri Jun 10 06:02:06 2011
@@ -49,12 +49,8 @@ public class SipSubscriptionListener imp
}
private void dispatchExchange(Object response) throws CamelException {
- Exchange exchange;
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("Consumer Dispatching the received notification along the route");
- }
- exchange = sipSubscriber.getEndpoint().createExchange(ExchangePattern.InOnly);
+ LOG.debug("Consumer Dispatching the received notification along the route");
+ Exchange exchange = sipSubscriber.getEndpoint().createExchange(ExchangePattern.InOnly);
exchange.getIn().setBody(response);
try {
sipSubscriber.getProcessor().process(exchange);
@@ -68,11 +64,9 @@ public class SipSubscriptionListener imp
ServerTransaction serverTransactionId = requestReceivedEvent
.getServerTransaction();
String viaBranch = ((ViaHeader)(request.getHeaders(ViaHeader.NAME).next())).getParameter("branch");
- if (LOG.isDebugEnabled()) {
- LOG.debug("Request: " + request.getMethod());
- LOG.debug("Server Transaction Id:" + serverTransactionId);
- LOG.debug("Received From Branch:" + viaBranch);
- }
+ LOG.debug("Request: {}", request.getMethod());
+ LOG.debug("Server Transaction Id: {}", serverTransactionId);
+ LOG.debug("Received From Branch: {}", viaBranch);
if (request.getMethod().equals(Request.NOTIFY)) {
processNotify(requestReceivedEvent, serverTransactionId);
@@ -81,16 +75,12 @@ public class SipSubscriptionListener imp
public synchronized void processNotify(RequestEvent requestEvent,
ServerTransaction serverTransactionId) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Notification received at Subscriber");
- }
+ LOG.debug("Notification received at Subscriber");
SipProvider provider = (SipProvider) requestEvent.getSource();
Request notify = requestEvent.getRequest();
try {
if (serverTransactionId == null) {
- if (LOG.isDebugEnabled()) {
- LOG.info("ServerTransaction is null. Creating new Server transaction");
- }
+ LOG.info("ServerTransaction is null. Creating new Server transaction");
serverTransactionId = provider.getNewServerTransaction(notify);
}
Dialog dialog = serverTransactionId.getDialog();
@@ -111,9 +101,7 @@ public class SipSubscriptionListener imp
// Subscription is terminated?
if (subscriptionState.getState().equalsIgnoreCase(SubscriptionStateHeader.TERMINATED)) {
- if (LOG.isDebugEnabled()) {
- LOG.info("Subscription state is terminated. Deleting the current dialog");
- }
+ LOG.info("Subscription state is terminated. Deleting the current dialog");
dialog.delete();
}
} catch (Exception e) {
@@ -122,15 +110,11 @@ public class SipSubscriptionListener imp
}
public void processResponse(ResponseEvent responseReceivedEvent) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Response received at Subscriber");
- }
+ LOG.debug("Response received at Subscriber");
Response response = responseReceivedEvent.getResponse();
Transaction clientTransactionId = responseReceivedEvent.getClientTransaction();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Response received with client transaction id " + clientTransactionId + ":" + response.getStatusCode());
- }
+ LOG.debug("Response received with client transaction id {}:{}", clientTransactionId, response.getStatusCode());
if (clientTransactionId == null) {
if (LOG.isWarnEnabled()) {
LOG.warn("Stray response -- dropping");
Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java (original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java Fri Jun 10 06:02:06 2011
@@ -83,9 +83,7 @@ public class SmppConsumer extends Defaul
private final MessageIDGenerator messageIDGenerator = new RandomMessageIDGenerator();
public void onAcceptAlertNotification(AlertNotification alertNotification) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received an alertNotification " + alertNotification);
- }
+ LOG.debug("Received an alertNotification {}", alertNotification);
try {
Exchange exchange = getEndpoint().createOnAcceptAlertNotificationExchange(
@@ -100,9 +98,7 @@ public class SmppConsumer extends Defaul
}
public void onAcceptDeliverSm(DeliverSm deliverSm) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received a deliverSm " + deliverSm);
- }
+ LOG.debug("Received a deliverSm {}", deliverSm);
try {
Exchange exchange = getEndpoint().createOnAcceptDeliverSmExchange(deliverSm);
@@ -117,9 +113,7 @@ public class SmppConsumer extends Defaul
public DataSmResult onAcceptDataSm(DataSm dataSm, Session session)
throws ProcessRequestException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received a dataSm " + dataSm);
- }
+ LOG.debug("Received a dataSm {}", dataSm);
MessageId newMessageId = messageIDGenerator.newMessageId();
Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java (original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java Fri Jun 10 06:02:06 2011
@@ -135,10 +135,7 @@ public class SmppProducer extends Defaul
}
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Sending a short message for exchange id '"
- + exchange.getExchangeId() + "'...");
- }
+ LOG.debug("Sending a short message for exchange id '{}'...", exchange.getExchangeId());
// only possible by trying to reconnect
if (this.session == null) {
@@ -169,21 +166,14 @@ public class SmppProducer extends Defaul
(byte) 0,
submitSm.getShortMessage());
- if (LOG.isDebugEnabled()) {
- LOG.debug("Sent a short message for exchange id '"
- + exchange.getExchangeId() + "' and received message id '"
- + messageId + "'");
- }
+ LOG.debug("Sent a short message for exchange id '{}' and received message id '{}'",
+ exchange.getExchangeId(), messageId);
if (exchange.getPattern().isOutCapable()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Exchange is out capable, setting headers on out exchange...");
- }
+ LOG.debug("Exchange is out capable, setting headers on out exchange...");
exchange.getOut().setHeader(SmppBinding.ID, messageId);
} else {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Exchange is not out capable, setting headers on in exchange...");
- }
+ LOG.debug("Exchange is not out capable, setting headers on in exchange...");
exchange.getIn().setHeader(SmppBinding.ID, messageId);
}
}
Modified: camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java (original)
+++ camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java Fri Jun 10 06:02:06 2011
@@ -123,9 +123,7 @@ public class SnmpEndpoint extends Defaul
// set the address
String address = String.format("%s:%s/%d", getProtocol(), host, port);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using snmp address " + address);
- }
+ LOG.debug("Using snmp address {}", address);
setAddress(address);
}
Modified: camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java (original)
+++ camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java Fri Jun 10 06:02:06 2011
@@ -90,21 +90,21 @@ public class SnmpOIDPoller extends Sched
// listen to the transport
if (LOG.isDebugEnabled()) {
- LOG.debug("Starting OID poller on " + endpoint.getAddress() + " using " + endpoint.getProtocol() + " protocol");
+ LOG.debug("Starting OID poller on {} using {} protocol", endpoint.getAddress(), endpoint.getProtocol());
}
this.transport.listen();
- LOG.info("Started OID poller on " + endpoint.getAddress() + " using " + endpoint.getProtocol() + " protocol");
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Started OID poller on {} using {} protocol", endpoint.getAddress(), endpoint.getProtocol());
+ }
}
@Override
protected void doStop() throws Exception {
// stop listening to the transport
if (this.transport != null && this.transport.isListening()) {
- if (LOG.isDebugEnabled()) {
- LOG.info("Stopping OID poller on " + targetAddress);
- }
+ LOG.info("Stopping OID poller on {}", targetAddress);
this.transport.close();
- LOG.info("Stopped OID poller on " + targetAddress);
+ LOG.info("Stopped OID poller on {}", targetAddress);
}
super.doStop();
@@ -150,7 +150,7 @@ public class SnmpOIDPoller extends Sched
*/
public void processPDU(PDU pdu) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received response event for " + this.endpoint.getAddress() + " : " + pdu);
+ LOG.debug("Received response event for {} : {}", this.endpoint.getAddress(), pdu);
}
Exchange exchange = endpoint.createExchange(pdu);
try {
Modified: camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java (original)
+++ camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java Fri Jun 10 06:02:06 2011
@@ -70,10 +70,12 @@ public class SnmpTrapConsumer extends De
// listen to the transport
if (LOG.isDebugEnabled()) {
- LOG.debug("Starting trap consumer on " + endpoint.getAddress() + " using " + endpoint.getProtocol() + " protocol");
+ LOG.debug("Starting trap consumer on {} using {} protocol", endpoint.getAddress(), endpoint.getProtocol());
}
this.transport.listen();
- LOG.info("Started trap consumer on " + endpoint.getAddress() + " using " + endpoint.getProtocol() + " protocol");
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Started trap consumer on {} using {} protocol", endpoint.getAddress(), endpoint.getProtocol());
+ }
}
@Override
@@ -81,7 +83,7 @@ public class SnmpTrapConsumer extends De
// stop listening to the transport
if (this.transport != null && this.transport.isListening()) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Stopping trap consumer on " + this.endpoint.getAddress());
+ LOG.debug("Stopping trap consumer on {}", this.endpoint.getAddress());
}
this.transport.close();
LOG.info("Stopped trap consumer on " + this.endpoint.getAddress());
@@ -102,7 +104,7 @@ public class SnmpTrapConsumer extends De
public void processPDU(PDU pdu) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received trap event for " + this.endpoint.getAddress() + " : " + pdu);
+ LOG.debug("Received trap event for {} : {}", this.endpoint.getAddress(), pdu);
}
Exchange exchange = endpoint.createExchange(pdu);
try {
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java Fri Jun 10 06:02:06 2011
@@ -134,9 +134,7 @@ public class SpringIntegrationConsumer
SpringIntegrationBinding.storeToSpringIntegrationMessage(exchange.getOut());
// send the message to spring integration
- if (log.isDebugEnabled()) {
- log.debug("Sending " + siOutMessage + " to ReplyChannel: " + reply);
- }
+ log.debug("Sending {} to ReplyChannel: {}", siOutMessage, reply);
reply.send(siOutMessage);
}
}
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java Fri Jun 10 06:02:06 2011
@@ -95,9 +95,7 @@ public class SpringIntegrationProducer e
// subscribe so we can receive the reply from spring integration
inputChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
- if (log.isDebugEnabled()) {
- log.debug("Received " + message + " from InputChannel: " + inputChannel);
- }
+ log.debug("Received {} from InputChannel: {}", message, inputChannel);
SpringIntegrationBinding.storeToCamelMessage(message, exchange.getOut());
}
});
@@ -105,9 +103,7 @@ public class SpringIntegrationProducer e
org.springframework.integration.Message siOutmessage = SpringIntegrationBinding.createSpringIntegrationMessage(exchange);
// send the message to spring integration
- if (log.isDebugEnabled()) {
- log.debug("Sending " + siOutmessage + " to OutputChannel: " + outputChannel);
- }
+ log.debug("Sending {} to OutputChannel: {}", siOutmessage, outputChannel);
outputChannel.send(siOutmessage);
}
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java Fri Jun 10 06:02:06 2011
@@ -74,9 +74,7 @@ public class CamelSourceAdapter extends
replyChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received " + message + " from ReplyChannel: " + replyChannel);
- }
+ LOG.debug("Received {} from ReplyChannel: {}", message, replyChannel);
//TODO set the corralationID
SpringIntegrationBinding.storeToCamelMessage(message, exchange.getOut());
}
Modified: camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java (original)
+++ camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java Fri Jun 10 06:02:06 2011
@@ -91,7 +91,7 @@ public class JavaConfigContextLoader imp
*/
public ApplicationContext loadContext(String... locations) {
if (logger.isDebugEnabled()) {
- logger.debug("Creating a JavaConfigApplicationContext for " + Arrays.asList(locations));
+ logger.debug("Creating a JavaConfigApplicationContext for {}", Arrays.asList(locations));
}
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
@@ -112,10 +112,8 @@ public class JavaConfigContextLoader imp
}
}
- if (logger.isDebugEnabled()) {
- logger.debug("Setting config classes to " + configClasses);
- logger.debug("Setting base packages to " + basePackages);
- }
+ logger.debug("Setting config classes to {}", configClasses);
+ logger.debug("Setting base packages to {}", basePackages);
for (Class<?> configClass : configClasses) {
context.register(configClass);
Modified: camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java (original)
+++ camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java Fri Jun 10 06:02:06 2011
@@ -106,9 +106,7 @@ public class SpringSecurityAuthorization
// try to get it from thread context as a fallback
if (answer == null && useThreadSecurityContext) {
answer = SecurityContextHolder.getContext().getAuthentication();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Get the authentication from SecurityContextHolder");
- }
+ LOG.debug("Get the authentication from SecurityContextHolder");
}
return answer;
}
@@ -134,16 +132,12 @@ public class SpringSecurityAuthorization
private Authentication authenticateIfRequired(Authentication authentication) {
if (authentication.isAuthenticated() && !alwaysReauthenticate) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Previously Authenticated: " + authentication);
- }
+ LOG.debug("Previously Authenticated: {}", authentication);
return authentication;
}
authentication = authenticationManager.authenticate(authentication);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Successfully Authenticated: " + authentication);
- }
+ LOG.debug("Successfully Authenticated: {}", authentication);
return authentication;
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java Fri Jun 10 06:02:06 2011
@@ -61,9 +61,7 @@ public abstract class ResourceBasedEndpo
public Resource getResource() {
if (resource == null) {
- if (log.isDebugEnabled()) {
- log.debug("Loading resource: " + resourceUri + " using: " + getResourceLoader());
- }
+ log.debug("Loading resource: {} using: {}", resourceUri, getResourceLoader());
resource = getResourceLoader().getResource(resourceUri);
if (resource == null) {
throw new IllegalArgumentException("Could not find resource for URI: " + resourceUri + " using: " + getResourceLoader());
@@ -91,16 +89,12 @@ public abstract class ResourceBasedEndpo
if (contentCache) {
synchronized (resource) {
if (buffer == null) {
- if (log.isDebugEnabled()) {
- log.debug("Reading resource: " + resourceUri + " into the content cache");
- }
+ log.debug("Reading resource: {} into the content cache", resourceUri);
is = getResourceAsInputStreamWithoutCache();
buffer = IOConverter.toBytes(is);
}
}
- if (log.isDebugEnabled()) {
- log.debug("Using resource: " + resourceUri + " from the content cache");
- }
+ log.debug("Using resource: {} from the content cache", resourceUri);
return new ByteArrayInputStream(buffer);
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java Fri Jun 10 06:02:06 2011
@@ -47,9 +47,7 @@ public class TestEndpoint extends MockEn
@Override
protected void doStart() throws Exception {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Consuming expected messages from: " + expectedMessageEndpoint);
- }
+ LOG.debug("Consuming expected messages from: {}", expectedMessageEndpoint);
final List<Object> expectedBodies = new ArrayList<Object>();
EndpointHelper.pollEndpoint(expectedMessageEndpoint, new Processor() {
public void process(Exchange exchange) throws Exception {
@@ -58,9 +56,7 @@ public class TestEndpoint extends MockEn
}
}, timeout);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Received: " + expectedBodies.size() + " expected message(s) from: " + expectedMessageEndpoint);
- }
+ LOG.debug("Received: {} expected message(s) from: {}", expectedBodies.size(), expectedMessageEndpoint);
expectedBodiesReceived(expectedBodies);
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java Fri Jun 10 06:02:06 2011
@@ -35,9 +35,7 @@ public class ValidatorComponent extends
SpringValidator validator = new SpringValidator();
Resource resource = resolveMandatoryResource(remaining);
validator.setSchemaResource(resource);
- if (log.isDebugEnabled()) {
- log.debug(this + " using schema resource: " + resource);
- }
+ log.debug("{} using schema resource: {}", resource);
configureValidator(validator, uri, remaining, parameters);
// force loading of schema at create time otherwise concurrent processing could
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=1134198&r1=1134197&r2=1134198&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 Fri Jun 10 06:02:06 2011
@@ -69,9 +69,7 @@ public class XsltComponent extends Resou
protected Endpoint createEndpoint(String uri, final String remaining, Map<String, Object> parameters) throws Exception {
final Resource resource = resolveMandatoryResource(remaining);
- if (log.isDebugEnabled()) {
- log.debug(this + " using schema resource: " + resource);
- }
+ log.debug("{} using schema resource: {}", this, resource);
final XsltBuilder xslt = getCamelContext().getInjector().newInstance(XsltBuilder.class);
// lets allow the converter to be configured
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactory.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactory.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactory.java Fri Jun 10 06:02:06 2011
@@ -38,9 +38,7 @@ public class CamelContextFactory impleme
}
public void setBundleContext(BundleContext bundleContext) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using BundleContext: " + bundleContext);
- }
+ LOG.debug("Using BundleContext: {}", bundleContext);
this.bundleContext = bundleContext;
}
@@ -49,9 +47,7 @@ public class CamelContextFactory impleme
}
public void setRegistry(Registry registry) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using Registry: " + registry);
- }
+ LOG.debug("Using Registry: {}", registry);
this.registry = registry;
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java Fri Jun 10 06:02:06 2011
@@ -42,9 +42,7 @@ public class CamelContextFactoryBean ext
}
public void setBundleContext(BundleContext bundleContext) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using BundleContext: " + bundleContext);
- }
+ LOG.debug("Using BundleContext: {}", bundleContext);
this.bundleContext = bundleContext;
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Fri Jun 10 06:02:06 2011
@@ -239,9 +239,7 @@ public class CamelContextFactoryBean ext
// let the spring camel context handle the events
context.onApplicationEvent(event);
} else {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Publishing spring-event: " + event);
- }
+ LOG.debug("Publishing spring-event: {}", event);
if (event instanceof ContextRefreshedEvent) {
// now lets start the CamelContext so that all its possible
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=1134198&r1=1134197&r2=1134198&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 Fri Jun 10 06:02:06 2011
@@ -57,22 +57,16 @@ public class ContextScanRouteBuilderFind
// certain beans should be ignored
if (shouldIgnoreBean(bean)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Ignoring RouteBuilder id: " + key);
- }
+ LOG.debug("Ignoring RouteBuilder id: {}", key);
continue;
}
if (!isFilteredClass(bean)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Ignoring filtered RouteBuilder id: " + key + " as class: " + bean.getClass());
- }
+ LOG.debug("Ignoring filtered RouteBuilder id: {} as class: {}", key, bean.getClass());
continue;
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Adding instantiated RouteBuilder id: " + key + " as class: " + bean.getClass());
- }
+ LOG.debug("Adding instantiated RouteBuilder id: {} as class: {}", key, bean.getClass());
list.add((RoutesBuilder) bean);
}
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java Fri Jun 10 06:02:06 2011
@@ -62,16 +62,12 @@ public class PackageScanRouteBuilderFind
// certain beans should be ignored
if (shouldIgnoreBean(aClass)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Ignoring RouteBuilder class: " + aClass);
- }
+ LOG.debug("Ignoring RouteBuilder class: {}", aClass);
continue;
}
if (!isValidClass(aClass)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Ignoring invalid RouteBuilder class: " + aClass);
- }
+ LOG.debug("Ignoring invalid RouteBuilder class: {}", aClass);
continue;
}
@@ -81,9 +77,7 @@ public class PackageScanRouteBuilderFind
// Inject the annotated resource
beanPostProcessor.postProcessBeforeInitialization(builder, builder.toString());
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Adding instantiated RouteBuilder: " + builder);
- }
+ LOG.debug("Adding instantiated RouteBuilder: {}", builder);
list.add(builder);
}
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java Fri Jun 10 06:02:06 2011
@@ -90,9 +90,7 @@ public class SpringCamelContext extends
}
public void onApplicationEvent(ApplicationEvent event) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("onApplicationEvent: " + event);
- }
+ LOG.debug("onApplicationEvent: {}", event);
if (event instanceof ContextRefreshedEvent) {
// now lets start the CamelContext so that all its possible
@@ -113,7 +111,7 @@ public class SpringCamelContext extends
if (eventEndpoint != null) {
eventEndpoint.onApplicationEvent(event);
} else {
- LOG.info("No spring-event endpoint enabled to handle event: " + event);
+ LOG.info("No spring-event endpoint enabled to handle event: {}", event);
}
}
@@ -135,9 +133,7 @@ public class SpringCamelContext extends
LOG.warn("Cannot find the class loader from application context, using the thread context class loader instead");
cl = Thread.currentThread().getContextClassLoader();
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Set the application context classloader to: " + cl);
- }
+ LOG.debug("Set the application context classloader to: {}", cl);
this.setApplicationContextClassLoader(cl);
if (applicationContext instanceof ConfigurableApplicationContext) {
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java Fri Jun 10 06:02:06 2011
@@ -142,9 +142,7 @@ public class CamelNamespaceHandler exten
} else {
LOG.info("OSGi environment not detected.");
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using " + cl.getCanonicalName() + " as CamelContextBeanDefinitionParser");
- }
+ LOG.debug("Using {} as CamelContextBeanDefinitionParser", cl.getCanonicalName());
registerParser("camelContext", new CamelContextBeanDefinitionParser(cl));
}
@@ -387,9 +385,7 @@ public class CamelNamespaceHandler exten
} else {
for (String depend : depends) {
depend = depend.trim();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Adding dependsOn " + depend + " to CamelContext(" + factoryBean.getId() + ")");
- }
+ LOG.debug("Adding dependsOn {} to CamelContext({})", depend, factoryBean.getId());
builder.addDependsOn(depend);
}
}
@@ -566,17 +562,15 @@ public class CamelNamespaceHandler exten
autoRegisterMap.put(id, definition);
parserContext.registerComponent(new BeanComponentDefinition(definition, id));
if (LOG.isDebugEnabled()) {
- LOG.debug("Registered default: " + definition.getBeanClassName() + " with id: " + id + " on camel context: " + contextId);
+ LOG.debug("Registered default: {} with id: {} on camel context: {}", new Object[]{definition.getBeanClassName(), id, contextId});
}
} else {
// ups we have already registered it before with same id, but on another camel context
// this is not good so we need to remove all traces of this auto registering.
// end user must manually add the needed XML elements and provide unique ids access all camel context himself.
- if (LOG.isDebugEnabled()) {
- LOG.debug("Unregistered default: " + definition.getBeanClassName() + " with id: " + id
- + " as we have multiple camel contexts and they must use unique ids."
- + " You must define the definition in the XML file manually to avoid id clashes when using multiple camel contexts");
- }
+ LOG.debug("Unregistered default: {} with id: {} as we have multiple camel contexts and they must use unique ids."
+ + " You must define the definition in the XML file manually to avoid id clashes when using multiple camel contexts",
+ definition.getBeanClassName(), id);
parserContext.getRegistry().removeBeanDefinition(id);
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java Fri Jun 10 06:02:06 2011
@@ -77,18 +77,14 @@ public class SpringTransactionPolicy imp
// otherwise its just the "default" that has not explicit been configured
// and if so then we can safely replace that with our transacted error handler
if (ErrorHandlerBuilderRef.isErrorHandlerBuilderConfigured(ref)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Looking up ErrorHandlerBuilder with ref: " + ref);
- }
+ LOG.debug("Looking up ErrorHandlerBuilder with ref: {}", ref);
builder = ErrorHandlerBuilderRef.lookupErrorHandlerBuilder(routeContext, ref);
}
}
if (builder != null && builder.supportTransacted()) {
// already a TX error handler then we are good to go
- if (LOG.isDebugEnabled()) {
- LOG.debug("The ErrorHandlerBuilder configured is already a TransactionErrorHandlerBuilder: " + builder);
- }
+ LOG.debug("The ErrorHandlerBuilder configured is already a TransactionErrorHandlerBuilder: {}", builder);
answer = createTransactionErrorHandler(routeContext, processor, builder);
answer.setExceptionPolicy(builder.getExceptionPolicyStrategy());
// configure our answer based on the existing error handler
@@ -97,12 +93,10 @@ public class SpringTransactionPolicy imp
// no transaction error handler builder configure so create a temporary one as we got all
// the needed information form the configured builder anyway this allow us to use transacted
// routes anyway even though the error handler is not transactional, eg ease of configuration
- if (LOG.isDebugEnabled()) {
- if (builder != null) {
- LOG.debug("The ErrorHandlerBuilder configured is not a TransactionErrorHandlerBuilder: " + builder);
- } else {
- LOG.debug("No ErrorHandlerBuilder configured, will use default TransactionErrorHandlerBuilder settings");
- }
+ if (builder != null) {
+ LOG.debug("The ErrorHandlerBuilder configured is not a TransactionErrorHandlerBuilder: {}", builder);
+ } else {
+ LOG.debug("No ErrorHandlerBuilder configured, will use default TransactionErrorHandlerBuilder settings");
}
TransactionErrorHandlerBuilder txBuilder = new TransactionErrorHandlerBuilder();
txBuilder.setTransactionTemplate(getTransactionTemplate());
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java Fri Jun 10 06:02:06 2011
@@ -115,20 +115,14 @@ public class TransactionErrorHandler ext
// mark the beginning of this transaction boundary
exchange.getUnitOfWork().beginTransactedBy(transactionKey);
- if (log.isDebugEnabled()) {
- log.debug("Transaction begin (" + transactionKey + ") for ExchangeId: " + exchange.getExchangeId());
- }
+ log.debug("Transaction begin ({}) for ExchangeId: {}", transactionKey, exchange.getExchangeId());
doInTransactionTemplate(exchange);
- if (log.isDebugEnabled()) {
- log.debug("Transaction commit (" + transactionKey + ") for ExchangeId: " + exchange.getExchangeId());
- }
+ log.debug("Transaction commit ({}) for ExchangeId: {}", transactionKey, exchange.getExchangeId());
} catch (TransactionRollbackException e) {
// ignore as its just a dummy exception to force spring TX to rollback
- if (log.isDebugEnabled()) {
- log.debug("Transaction rollback (" + transactionKey + ") for ExchangeId: " + exchange.getExchangeId() + " due exchange was marked for rollbackOnly");
- }
+ log.debug("Transaction rollback ({}) for ExchangeId: {} due exchange was marked for rollbackOnly", transactionKey, exchange.getExchangeId());
} catch (Exception e) {
log.warn("Transaction rollback (" + transactionKey + ") for ExchangeId: " + exchange.getExchangeId() + " due exception: " + e.getMessage());
exchange.setException(e);
@@ -147,8 +141,8 @@ public class TransactionErrorHandler ext
log.debug("Transaction rollback (" + transactionKey + ") for ExchangeId: " + exchange.getExchangeId()
+ " due exchange was marked for rollbackOnlyLast and due exception: ", cause);
} else {
- log.debug("Transaction rollback (" + transactionKey + ") for ExchangeId: " + exchange.getExchangeId()
- + " due exchange was marked for rollbackOnlyLast");
+ log.debug("Transaction rollback ({}) for ExchangeId: {} due exchange was marked for rollbackOnlyLast",
+ transactionKey, exchange.getExchangeId());
}
}
// remove caused exception due we was marked as rollback only last
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java Fri Jun 10 06:02:06 2011
@@ -79,13 +79,12 @@ public class TransactionErrorHandlerBuil
Map<String, TransactionTemplate> map = routeContext.lookupByType(TransactionTemplate.class);
if (map != null && map.size() == 1) {
transactionTemplate = map.values().iterator().next();
- } else if (LOG.isDebugEnabled()) {
- if (map == null || map.isEmpty()) {
- LOG.trace("No TransactionTemplate found in registry.");
- } else {
- LOG.debug("Found " + map.size() + " TransactionTemplate in registry. "
- + "Cannot determine which one to use. Please configure a TransactionTemplate on the TransactionErrorHandlerBuilder");
- }
+ }
+ if (map == null || map.isEmpty()) {
+ LOG.trace("No TransactionTemplate found in registry.");
+ } else {
+ LOG.debug("Found {} TransactionTemplate in registry. Cannot determine which one to use. "
+ + "Please configure a TransactionTemplate on the TransactionErrorHandlerBuilder", map.size());
}
}
@@ -93,13 +92,12 @@ public class TransactionErrorHandlerBuil
Map<String, PlatformTransactionManager> map = routeContext.lookupByType(PlatformTransactionManager.class);
if (map != null && map.size() == 1) {
transactionTemplate = new TransactionTemplate(map.values().iterator().next());
- } else if (LOG.isDebugEnabled()) {
- if (map == null || map.isEmpty()) {
- LOG.trace("No PlatformTransactionManager found in registry.");
- } else {
- LOG.debug("Found " + map.size() + " PlatformTransactionManager in registry. "
- + "Cannot determine which one to use for TransactionTemplate. Please configure a TransactionTemplate on the TransactionErrorHandlerBuilder");
- }
+ }
+ if (map == null || map.isEmpty()) {
+ LOG.trace("No PlatformTransactionManager found in registry.");
+ } else {
+ LOG.debug("Found {} PlatformTransactionManager in registry. Cannot determine which one to use for TransactionTemplate. "
+ + "Please configure a TransactionTemplate on the TransactionErrorHandlerBuilder", map.size());
}
}
Modified: camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java (original)
+++ camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java Fri Jun 10 06:02:06 2011
@@ -121,9 +121,7 @@ public class JdbcAggregationRepository e
try {
final byte[] data = codec.marshallExchange(camelContext, exchange);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Adding exchange with key: [" + key + "]");
- }
+ LOG.debug("Adding exchange with key: [{}]", key);
String insert = "INSERT INTO " + getRepositoryName() + " (" + EXCHANGE + ", " + ID + ") VALUES (?, ?)";
String update = "UPDATE " + getRepositoryName() + " SET " + EXCHANGE + " = ? WHERE " + ID + " = ?";
@@ -160,9 +158,7 @@ public class JdbcAggregationRepository e
final String key = correlationId;
Exchange result = get(key, getRepositoryName(), camelContext);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Getting key [" + key + "] -> " + result);
- }
+ LOG.debug("Getting key [{}] -> {}", key, result);
return result;
}
@@ -197,9 +193,7 @@ public class JdbcAggregationRepository e
try {
final byte[] data = codec.marshallExchange(camelContext, exchange);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Removing key [" + key + "]");
- }
+ LOG.debug("Removing key [{}]", key);
jdbcTemplate.update("DELETE FROM " + getRepositoryName() + " WHERE " + ID + " = ?",
new Object[]{key});
@@ -222,9 +216,7 @@ public class JdbcAggregationRepository e
public void confirm(final CamelContext camelContext, final String exchangeId) {
transactionTemplate.execute(new TransactionCallbackWithoutResult() {
protected void doInTransactionWithoutResult(TransactionStatus status) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Confirming exchangeId [" + exchangeId + "]");
- }
+ LOG.debug("Confirming exchangeId [{}]", exchangeId);
final String confirmKey = exchangeId;
jdbcTemplate.update("DELETE FROM " + getRepositoryNameCompleted() + " WHERE " + ID + " = ?",
@@ -272,9 +264,7 @@ public class JdbcAggregationRepository e
final String key = exchangeId;
Exchange answer = get(key, getRepositoryNameCompleted(), camelContext);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Recovering exchangeId [" + key + "] -> " + answer);
- }
+ LOG.debug("Recovering exchangeId [{}] -> {}", key, answer);
return answer;
}
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java Fri Jun 10 06:02:06 2011
@@ -48,9 +48,7 @@ public class JdbcAggregateLoadAndRecover
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?size=" + SIZE, value, headers);
// simulate a little delay
Thread.sleep(3);
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java Fri Jun 10 06:02:06 2011
@@ -48,9 +48,7 @@ public class JdbcAggregateLoadConcurrent
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-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadTest.java Fri Jun 10 06:02:06 2011
@@ -38,9 +38,7 @@ public class JdbcAggregateLoadTest exten
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-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java Fri Jun 10 06:02:06 2011
@@ -216,9 +216,7 @@ public class StreamConsumer extends Defa
private InputStream resolveStreamFromUrl() throws IOException {
String u = endpoint.getUrl();
ObjectHelper.notEmpty(u, "url");
- if (LOG.isDebugEnabled()) {
- LOG.debug("About to read from url: " + u);
- }
+ LOG.debug("About to read from url: {}", u);
URL url = new URL(u);
URLConnection c = url.openConnection();
@@ -234,7 +232,7 @@ public class StreamConsumer extends Defa
File file = new File(fileName);
if (LOG.isDebugEnabled()) {
- LOG.debug("File to be scanned : " + file.getName() + ", path : " + file.getAbsolutePath());
+ LOG.debug("File to be scanned : {}, path : {}", file.getName(), file.getAbsolutePath());
}
if (file.canRead()) {
Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java Fri Jun 10 06:02:06 2011
@@ -158,9 +158,7 @@ public class StreamEndpoint extends Defa
Charset getCharset() {
if (encoding == null) {
encoding = Charset.defaultCharset().name();
- if (LOG.isDebugEnabled()) {
- LOG.debug("No encoding parameter using default charset: " + encoding);
- }
+ LOG.debug("No encoding parameter using default charset: {}", encoding);
}
if (!Charset.isSupported(encoding)) {
throw new IllegalArgumentException("The encoding: " + encoding + " is not supported");
Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java Fri Jun 10 06:02:06 2011
@@ -87,9 +87,7 @@ public class StreamProducer extends Defa
private OutputStream resolveStreamFromUrl() throws IOException {
String u = endpoint.getUrl();
ObjectHelper.notEmpty(u, "url");
- if (LOG.isDebugEnabled()) {
- LOG.debug("About to write to url: " + u);
- }
+ LOG.debug("About to write to url: {}", u);
URL url = new URL(u);
URLConnection c = url.openConnection();
@@ -99,9 +97,7 @@ public class StreamProducer extends Defa
private OutputStream resolveStreamFromFile() throws IOException {
String fileName = endpoint.getFileName();
ObjectHelper.notEmpty(fileName, "fileName");
- if (LOG.isDebugEnabled()) {
- LOG.debug("About to write to file: " + fileName);
- }
+ LOG.debug("About to write to file: {}", fileName);
File f = new File(fileName);
// will create a new file if missing or append to existing
f.createNewFile();
@@ -127,9 +123,7 @@ public class StreamProducer extends Defa
if (!(body instanceof String)) {
byte[] bytes = exchange.getIn().getBody(byte[].class);
if (bytes != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Writing as byte[]: " + bytes + " to " + outputStream);
- }
+ LOG.debug("Writing as byte[]: {} to {}", bytes, outputStream);
outputStream.write(bytes);
return;
}
@@ -141,7 +135,7 @@ public class StreamProducer extends Defa
Writer writer = new OutputStreamWriter(outputStream, charset);
BufferedWriter bw = new BufferedWriter(writer);
if (LOG.isDebugEnabled()) {
- LOG.debug("Writing as text: " + body + " to " + outputStream + " using encoding:" + charset);
+ LOG.debug("Writing as text: {} to {} using encoding: {}", new Object[]{body, outputStream, charset});
}
bw.write(s);
bw.write("\n");
Modified: camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java (original)
+++ camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java Fri Jun 10 06:02:06 2011
@@ -62,9 +62,7 @@ public class StringTemplateEndpoint exte
String text = exchange.getContext().getTypeConverter().mandatoryConvertTo(String.class, getResourceAsInputStream());
StringTemplate template = new StringTemplate(text);
template.setAttributes(variableMap);
- if (log.isDebugEnabled()) {
- log.debug("StringTemplate is writing using attributes: " + variableMap);
- }
+ log.debug("StringTemplate is writing using attributes: {}", variableMap);
template.write(new AutoIndentWriter(buffer));
// now lets output the results to the exchange