Modified: camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff ============================================================================== --- camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java (original) +++ camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java Fri Jun 10 06:02:06 2011 @@ -133,9 +133,7 @@ public class VelocityEndpoint extends Re public VelocityEndpoint findOrCreateEndpoint(String uri, String newResourceUri) { String newUri = uri.replace(getResourceUri(), newResourceUri); - if (log.isDebugEnabled()) { - log.debug("Getting endpoint with URI: " + newUri); - } + log.debug("Getting endpoint with URI: {}", newUri); return (VelocityEndpoint) getCamelContext().getEndpoint(newUri); } @@ -149,9 +147,7 @@ public class VelocityEndpoint extends Re if (newResourceUri != null) { exchange.getIn().removeHeader(VelocityConstants.VELOCITY_RESOURCE_URI); - if (log.isDebugEnabled()) { - log.debug(VelocityConstants.VELOCITY_RESOURCE_URI + " set to " + newResourceUri + " creating new endpoint to handle exchange"); - } + log.debug("{} set to {} creating new endpoint to handle exchange", VelocityConstants.VELOCITY_RESOURCE_URI, newResourceUri); VelocityEndpoint newEndpoint = findOrCreateEndpoint(getEndpointUri(), newResourceUri); newEndpoint.onExchange(exchange); return; @@ -164,7 +160,7 @@ public class VelocityEndpoint extends Re // use content from header reader = new StringReader(content); if (log.isDebugEnabled()) { - log.debug("Velocity content read from header " + VelocityConstants.VELOCITY_TEMPLATE + " for endpoint " + getEndpointUri()); + log.debug("Velocity content read from header {} for endpoint {}", VelocityConstants.VELOCITY_TEMPLATE, getEndpointUri()); } // remove the header to avoid it being propagated in the routing exchange.getIn().removeHeader(VelocityConstants.VELOCITY_TEMPLATE); @@ -173,7 +169,7 @@ public class VelocityEndpoint extends Re resource = getResource(); ObjectHelper.notNull(resource, "resource"); if (log.isDebugEnabled()) { - log.debug("Velocity content read from resource " + resource + " with resourceUri: " + path + " for endpoint " + getEndpointUri()); + log.debug("Velocity content read from resource {} with resourceUri: {} for endpoint {}", new Object[]{resource, path, getEndpointUri()}); } reader = getEncoding() != null ? new InputStreamReader(getResourceAsInputStream(), getEncoding()) : new InputStreamReader(getResourceAsInputStream()); } @@ -186,9 +182,7 @@ public class VelocityEndpoint extends Re // let velocity parse and generate the result in buffer VelocityEngine engine = getVelocityEngine(); - if (log.isDebugEnabled()) { - log.debug("Velocity is evaluating using velocity context: " + variableMap); - } + log.debug("Velocity is evaluating using velocity context: {}", variableMap); engine.evaluate(velocityContext, buffer, logTag, reader); // now lets output the results to the exchange
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java?rev=1134198&r1=1134197&r2=1134198&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java Fri Jun 10 06:02:06 2011 @@ -194,9 +194,7 @@ public class RouteResource extends Camel return Response.seeOther(new URI("/routes")).build(); } - if (LOG.isDebugEnabled()) { - LOG.debug("New Route is: " + body); - } + LOG.debug("New Route is: {}", body); LOG.info(body); if (body == null) { Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java?rev=1134198&r1=1134197&r2=1134198&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java Fri Jun 10 06:02:06 2011 @@ -135,9 +135,7 @@ public class RoutesResource extends Came public Response postRouteForm(@Context UriInfo uriInfo, @FormParam("language") String language, @FormParam("route") String body) throws URISyntaxException { - if (LOG.isDebugEnabled()) { - LOG.debug("New Route is: " + body); - } + LOG.debug("New Route is: {}", body); LOG.info(body); if (body == null) { Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java?rev=1134198&r1=1134197&r2=1134198&view=diff ============================================================================== --- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java (original) +++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java Fri Jun 10 06:02:06 2011 @@ -37,17 +37,12 @@ public class XmppComponent extends Defau @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - if (endpointCache.containsKey(uri)) { - if (LOG.isDebugEnabled()) { - LOG.debug("Using cached endpoint for URI " + uri); - } + LOG.debug("Using cached endpoint for URI {}", uri); return endpointCache.get(uri); } - if (LOG.isDebugEnabled()) { - LOG.debug("Creating new endpoint for URI " + uri); - } + LOG.debug("Creating new endpoint for URI {}", uri); XmppEndpoint endpoint = new XmppEndpoint(uri, this); URI u = new URI(uri); Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java?rev=1134198&r1=1134197&r2=1134198&view=diff ============================================================================== --- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java (original) +++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java Fri Jun 10 06:02:06 2011 @@ -119,7 +119,7 @@ public class XmppConsumer extends Defaul public void processMessage(Chat chat, Message message) { if (LOG.isDebugEnabled()) { - LOG.debug("Received XMPP message for " + endpoint.getUser() + " from " + endpoint.getParticipant() + " : " + message.getBody()); + LOG.debug("Received XMPP message for {} from {} : {}", new Object[]{endpoint.getUser(), endpoint.getParticipant(), message.getBody()}); } Exchange exchange = endpoint.createExchange(message); Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java?rev=1134198&r1=1134197&r2=1134198&view=diff ============================================================================== --- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java (original) +++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java Fri Jun 10 06:02:06 2011 @@ -153,10 +153,10 @@ public class XmppEndpoint extends Defaul if (!connection.isAuthenticated()) { if (user != null) { if (LOG.isDebugEnabled()) { - LOG.debug("Logging in to XMPP as user: " + user + " on connection: " + getConnectionMessage(connection)); + LOG.debug("Logging in to XMPP as user: {} on connection: {}", user, getConnectionMessage(connection)); } if (password == null) { - LOG.warn("No password configured for user: " + user + " on connection: " + getConnectionMessage(connection)); + LOG.warn("No password configured for user: {} on connection: {}", user, getConnectionMessage(connection)); } if (createAccount) { @@ -172,7 +172,7 @@ public class XmppEndpoint extends Defaul } } else { if (LOG.isDebugEnabled()) { - LOG.debug("Logging in anonymously to XMPP on connection: " + getConnectionMessage(connection)); + LOG.debug("Logging in anonymously to XMPP on connection: {}", getConnectionMessage(connection)); } connection.loginAnonymously(); } @@ -200,9 +200,7 @@ public class XmppEndpoint extends Defaul } String chatServer = iterator.next(); - if (LOG.isDebugEnabled()) { - LOG.debug("Detected chat server: " + chatServer); - } + LOG.debug("Detected chat server: {}", chatServer); return room + "@" + chatServer; } Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java?rev=1134198&r1=1134197&r2=1134198&view=diff ============================================================================== --- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java (original) +++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java Fri Jun 10 06:02:06 2011 @@ -53,14 +53,12 @@ public class XmppGroupChatProducer exten // make sure we are connected if (!connection.isConnected()) { if (LOG.isDebugEnabled()) { - LOG.debug("Reconnecting to: " + XmppEndpoint.getConnectionMessage(connection)); + LOG.debug("Reconnecting to: {}", XmppEndpoint.getConnectionMessage(connection)); } connection.connect(); } - if (LOG.isDebugEnabled()) { - LOG.debug("Sending XMPP message: " + message.getBody()); - } + LOG.debug("Sending XMPP message: {}", message.getBody()); chat.sendMessage(message); // must invoke nextMessage to consume the response from the server // otherwise the client local queue will fill up (CAMEL-1467) Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppLogger.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppLogger.java?rev=1134198&r1=1134197&r2=1134198&view=diff ============================================================================== --- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppLogger.java (original) +++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppLogger.java Fri Jun 10 06:02:06 2011 @@ -32,7 +32,7 @@ public class XmppLogger implements Packe public void processPacket(Packet packet) { if (LOG.isDebugEnabled()) { - LOG.debug(direction + " : " + packet.toXML()); + LOG.debug("{} : {}", direction, packet.toXML()); } } } Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java?rev=1134198&r1=1134197&r2=1134198&view=diff ============================================================================== --- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java (original) +++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java Fri Jun 10 06:02:06 2011 @@ -44,9 +44,7 @@ public class XmppPrivateChatProducer ext this.participant = participant; ObjectHelper.notEmpty(participant, "participant"); - if (LOG.isDebugEnabled()) { - LOG.debug("Creating XmppPrivateChatProducer to participant " + participant); - } + LOG.debug("Creating XmppPrivateChatProducer to participant {}", participant); } public void process(Exchange exchange) { @@ -54,7 +52,7 @@ public class XmppPrivateChatProducer ext // make sure we are connected if (!connection.isConnected()) { if (LOG.isDebugEnabled()) { - LOG.debug("Reconnecting to: " + XmppEndpoint.getConnectionMessage(connection)); + LOG.debug("Reconnecting to: {}", XmppEndpoint.getConnectionMessage(connection)); } connection.connect(); } @@ -73,7 +71,7 @@ public class XmppPrivateChatProducer ext public void processMessage(Chat chat, Message message) { // not here to do conversation if (LOG.isDebugEnabled()) { - LOG.debug("Received and discarding message from " + getParticipant() + " : " + message.getBody()); + LOG.debug("Received and discarding message from {} : {}", getParticipant(), message.getBody()); } } }); @@ -89,7 +87,7 @@ public class XmppPrivateChatProducer ext endpoint.getBinding().populateXmppMessage(message, exchange); if (LOG.isDebugEnabled()) { - LOG.debug("Sending XMPP message to " + endpoint.getParticipant() + " from " + endpoint.getUser() + " : " + message.getBody()); + LOG.debug("Sending XMPP message to {} from {} : {}", new Object[]{endpoint.getParticipant(), endpoint.getUser(), message.getBody()}); } chat.sendMessage(message); } catch (XMPPException xmppe) {
