You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2011/02/05 22:25:10 UTC
svn commit: r1067527 - in /servicemix/components/trunk:
bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/
bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/marshaler/
bindings/servicemix-snmp/src/main/java/org/apache/se...
Author: jbonofre
Date: Sat Feb 5 21:25:08 2011
New Revision: 1067527
URL: http://svn.apache.org/viewvc?rev=1067527&view=rev
Log:
[SMXCOMP-852] Use SLF4J args to avoid string concatenation.
Modified:
servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java
servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java
servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshaler.java
servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpPollingEndpoint.java
servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpTrapConsumerEndpoint.java
servicemix/components/trunk/bindings/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipPollerEndpoint.java
servicemix/components/trunk/bindings/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipSenderEndpoint.java
servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSPollingEndpoint.java
servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java
servicemix/components/trunk/bindings/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPReceiverEndpoint.java
servicemix/components/trunk/bindings/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPSenderEndpoint.java
servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/pojos/LoggingPojo.java
servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java
servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java
servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/UriTest.java
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AnnotatedBean.java
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/PlainBean.java
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java
servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/util/StrictSerializationHeaderFilterStrategy.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/MyEchoComponent.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java
servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/SpringJbiTestSupport.java
servicemix/components/trunk/engines/servicemix-drools/src/main/java/org/apache/servicemix/drools/DroolsEndpoint.java
Modified: servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppConsumerEndpoint.java Sat Feb 5 21:25:08 2011
@@ -97,7 +97,7 @@ public class SmppConsumerEndpoint extend
// check for valid port number
if (this.port <= 0) {
- logger.warn("Invalid SMPP port specified. Use the default one : " + SMPP_DEFAULT_PORT);
+ logger.warn("Invalid SMPP port specified. Use the default one : {}", SMPP_DEFAULT_PORT);
this.port = SMPP_DEFAULT_PORT;
}
// check for valid host
Modified: servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/SmppProviderEndpoint.java Sat Feb 5 21:25:08 2011
@@ -106,7 +106,7 @@ public class SmppProviderEndpoint extend
// check for valid port number
if (this.port <= 0) {
- logger.warn("Invalid SMPP port specified. Use the default one : " + SMPP_DEFAULT_PORT);
+ logger.warn("Invalid SMPP port specified. Use the default one : {}", SMPP_DEFAULT_PORT);
this.port = SMPP_DEFAULT_PORT;
}
// check for valid host
@@ -215,7 +215,7 @@ public class SmppProviderEndpoint extend
MessageRequest sm = marshaler.fromNMS(exchange, in);
try {
- logger.debug("Submiting request: " + sm);
+ logger.debug("Submiting request: {}", sm);
String messageId = session
.submitShortMessage("CMT", TypeOfNumber.valueOf(sm.getSourceAddrTon()),
NumberingPlanIndicator.valueOf(sm.getSourceAddrNpi()),
@@ -227,7 +227,7 @@ public class SmppProviderEndpoint extend
Alphabet.ALPHA_DEFAULT), (byte) 0, sm
.getShortMessage());
- logger.debug("Message sent with ID " + messageId);
+ logger.debug("Message sent with ID {}", messageId);
} catch (PDUException pduException) {
logger.error("Invalid PDU parameter", pduException);
fail(exchange, new Exception("Invalid PDU parameter", pduException));
Modified: servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshaler.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshaler.java (original)
+++ servicemix/components/trunk/bindings/servicemix-smpp/src/main/java/org/apache/servicemix/smpp/marshaler/DefaultSmppMarshaler.java Sat Feb 5 21:25:08 2011
@@ -134,50 +134,50 @@ public class DefaultSmppMarshaler implem
if ((node = getNotEmptyNodeListOrNull(document, TAG_SOURCE)) != null) {
sm.setSourceAddr(getFirstNodeValue(node));
- logger.debug(TAG_SOURCE + ": " + sm.getSourceAddr());
+ logger.debug("{}: {}", TAG_SOURCE, sm.getSourceAddr());
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_DESTINATION)) != null) {
sm.setDestAddress(getFirstNodeValue(node));
- logger.debug(TAG_DESTINATION + ": " + sm.getDestAddress());
+ logger.debug("{}: {}", TAG_DESTINATION, sm.getDestAddress());
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_TEXT)) != null) {
sm.setShortMessage(getFirstNodeValue(node).getBytes());
- logger.debug(TAG_TEXT + ": " + new String(sm.getShortMessage()));
+ logger.debug("{}: {}", TAG_TEXT, new String(sm.getShortMessage()));
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_TON)) != null) {
ton = getFirstNodeValue(node);
sm.setDestAddrTon(TypeOfNumber.valueOf(ton).value());
sm.setSourceAddrTon(TypeOfNumber.valueOf(ton).value());
- logger.debug(TAG_TON + ": " + ton);
+ logger.debug("{}: {}", TAG_TON, ton);
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_NPI)) != null) {
npi = getFirstNodeValue(node);
sm.setDestAddrNpi(NumberingPlanIndicator.valueOf(npi).value());
sm.setSourceAddrNpi(NumberingPlanIndicator.valueOf(npi).value());
- logger.debug(TAG_NPI + ": " + npi);
+ logger.debug("{}: {}", TAG_NPI, npi);
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_REGISTERED_DELIVERY)) != null) {
String registeredDelivery = getFirstNodeValue(node);
sm.setRegisteredDelivery(SMSCDeliveryReceipt.valueOf(registeredDelivery).value());
- logger.debug(TAG_REGISTERED_DELIVERY + ": " + registeredDelivery);
+ logger.debug("{}: {}", TAG_REGISTERED_DELIVERY, registeredDelivery);
} else {
sm.setRegisteredDelivery(SMSCDeliveryReceipt.DEFAULT.value());
- logger.debug(TAG_REGISTERED_DELIVERY + ": DEFAULT");
+ logger.debug("{}: DEFAULT", TAG_REGISTERED_DELIVERY);
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_SCHEDULE_DELIVERY_TIME)) != null) {
sm.setScheduleDeliveryTime(getFirstNodeValue(node));
- logger.debug(TAG_SCHEDULE_DELIVERY_TIME + ": " + sm.getScheduleDeliveryTime());
+ logger.debug("{}: {}", TAG_SCHEDULE_DELIVERY_TIME, sm.getScheduleDeliveryTime());
}
if ((node = getNotEmptyNodeListOrNull(document, TAG_VALIDITY_PERIOD)) != null) {
sm.setValidityPeriod(getFirstNodeValue(node));
- logger.debug(TAG_VALIDITY_PERIOD + ": " + sm.getValidityPeriod());
+ logger.debug("{}: {}", TAG_VALIDITY_PERIOD, sm.getValidityPeriod());
}
} catch (Exception exception) {
throw new TransformerException(exception);
Modified: servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpPollingEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpPollingEndpoint.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpPollingEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpPollingEndpoint.java Sat Feb 5 21:25:08 2011
@@ -204,8 +204,8 @@ public class SnmpPollingEndpoint extends
// check for valid response
if (event.getRequest() == null || event.getResponse() == null) {
// ignore null requests/responses
- logger.debug("Received invalid snmp event. Request: " + event.getRequest() + " / Response: "
- + event.getResponse());
+ logger.debug("Received invalid snmp event. Request: {} / Response: {}", event.getRequest(),
+ event.getResponse());
return;
}
Modified: servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpTrapConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpTrapConsumerEndpoint.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpTrapConsumerEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-snmp/src/main/java/org/apache/servicemix/snmp/SnmpTrapConsumerEndpoint.java Sat Feb 5 21:25:08 2011
@@ -154,7 +154,7 @@ public class SnmpTrapConsumerEndpoint ex
if (pdu != null) {
sendSnmpTrapMessage(pdu);
} else {
- logger.debug("Received invalid trap PDU: " + pdu);
+ logger.debug("Received invalid trap PDU: {}", pdu);
}
}
Modified: servicemix/components/trunk/bindings/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipPollerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipPollerEndpoint.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipPollerEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipPollerEndpoint.java Sat Feb 5 21:25:08 2011
@@ -184,20 +184,18 @@ public class TrueZipPollerEndpoint exten
if (!fileOrDirectory.isDirectory()) {
pollFile(fileOrDirectory); // process the file
} else if (processDir) {
- logger.debug("Polling directory " + fileOrDirectory);
+ logger.debug("Polling directory {}", fileOrDirectory);
File[] files = (File[]) fileOrDirectory.listFiles(getFilter());
for (int i = 0; i < files.length; i++) {
pollFileOrDirectory(files[i], isRecursive()); // self-recursion
}
} else {
- logger.debug("Skipping directory " + fileOrDirectory);
+ logger.debug("Skipping directory {}", fileOrDirectory);
}
}
protected void pollFile(final File aFile) {
- if (logger.isDebugEnabled()) {
- logger.debug("Scheduling file " + aFile + " for processing");
- }
+ logger.debug("Scheduling file {} for processing", aFile);
getExecutor().execute(new Runnable() {
public void run() {
String uri = file.toURI().relativize(aFile.toURI()).toString();
@@ -210,14 +208,12 @@ public class TrueZipPollerEndpoint exten
lock.unlock();
} catch (Exception ex) {
// can't release the lock
- logger.error("Unable to release lock on " + uri, ex);
+ logger.error("Unable to release lock on {}", uri, ex);
}
lockManager.removeLock(uri);
}
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("Unable to acquire lock on " + aFile);
- }
+ logger.debug("Unable to acquire lock on {}", aFile);
lockManager.removeLock(uri);
}
}
@@ -226,9 +222,7 @@ public class TrueZipPollerEndpoint exten
protected void processFileAndDelete(File aFile) {
try {
- if (logger.isDebugEnabled()) {
- logger.debug("Processing file " + aFile);
- }
+ logger.debug("Processing file {}", aFile);
if (aFile.exists()) {
processFile(aFile);
if (isDeleteFile() && !aFile.delete()) {
@@ -236,7 +230,7 @@ public class TrueZipPollerEndpoint exten
}
}
} catch (Exception e) {
- logger.error("Failed to process file: " + aFile + ". Reason: " + e, e);
+ logger.error("Failed to process file: {}.", aFile, e);
}
}
Modified: servicemix/components/trunk/bindings/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipSenderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipSenderEndpoint.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipSenderEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-truezip/src/main/java/org/apache/servicemix/truezip/TrueZipSenderEndpoint.java Sat Feb 5 21:25:08 2011
@@ -84,9 +84,7 @@ public class TrueZipSenderEndpoint exten
} else {
newFile = new File(directory, name);
}
- if (logger.isDebugEnabled()) {
- logger.debug("Writing to file: " + newFile.getCanonicalPath());
- }
+ logger.debug("Writing to file: {}", newFile.getCanonicalPath());
out = new BufferedOutputStream(new FileOutputStream(newFile));
marshaler.writeMessage(exchange, in, out, name);
} finally {
@@ -94,7 +92,7 @@ public class TrueZipSenderEndpoint exten
try {
out.close();
} catch (IOException e) {
- logger.error("Caught exception while closing stream on error: " + e, e);
+ logger.error("Caught exception while closing stream on error: {}" + e.getMessage(), e);
}
}
}
Modified: servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSPollingEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSPollingEndpoint.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSPollingEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSPollingEndpoint.java Sat Feb 5 21:25:08 2011
@@ -158,13 +158,13 @@ public class VFSPollingEndpoint extends
"Property org.apache.servicemix.vfs was removed from the exchange -- unable to delete/archive the file");
}
- logger.debug("Releasing " + aFile.getName().getPathDecoded());
+ logger.debug("Releasing {}", aFile.getName().getPathDecoded());
// first try to close the stream
try {
stream.close();
} catch (IOException ex) {
- logger.error("Unable to close stream for file " + aFile.getName().getPathDecoded(), ex);
+ logger.error("Unable to close stream for file {}", aFile.getName().getPathDecoded(), ex);
}
try {
@@ -181,8 +181,7 @@ public class VFSPollingEndpoint extends
throw new JBIException(
"Received an exchange with status ERROR, but no exception was set");
}
- logger.warn("Message in file " + aFile.getName().getPathDecoded() + " could not be handled successfully: "
- + e.getMessage(), e);
+ logger.warn("Message in file {} could not be handled successfully.", aFile.getName().getPathDecoded(), e);
} else {
// we should never get an ACTIVE exchange -- the File poller
// only sends InOnly exchanges
@@ -217,7 +216,7 @@ public class VFSPollingEndpoint extends
lock.unlock();
} catch (Exception ex) {
// can't release the lock
- logger.error("", ex);
+ logger.error("Can't release the lock.", ex);
}
}
}
@@ -232,7 +231,7 @@ public class VFSPollingEndpoint extends
try {
file = FileObjectResolver.resolveToFileObject(getFileSystemManager(), getPath());
} catch (Exception e) {
- logger.debug("Unable to resolve path: " + getPath(), e);
+ logger.debug("Unable to resolve path: {}", getPath(), e);
file = null;
}
}
@@ -268,7 +267,7 @@ public class VFSPollingEndpoint extends
pollFile(fileOrDirectory);
} else if (processDir) {
// process the folder
- logger.debug("Polling directory " + fileOrDirectory.getName().getPathDecoded());
+ logger.debug("Polling directory {}", fileOrDirectory.getName().getPathDecoded());
FileObject[] files = null;
if (selector != null) {
@@ -282,7 +281,7 @@ public class VFSPollingEndpoint extends
pollFileOrDirectory(f, isRecursive());
}
} else {
- logger.debug("Skipping directory " + fileOrDirectory.getName().getPathDecoded());
+ logger.debug("Skipping directory {}", fileOrDirectory.getName().getPathDecoded());
}
}
@@ -313,9 +312,7 @@ public class VFSPollingEndpoint extends
}
// try to add to set of processed files
if (workingSet.add(aFile)) {
- if (logger.isDebugEnabled()) {
- logger.debug("Scheduling file " + aFile.getName().getPathDecoded() + " for processing");
- }
+ logger.debug("Scheduling file {} for processing.", aFile.getName().getPathDecoded());
// execute processing in another thread
getExecutor().execute(new ExecutorAwareRunnable() {
@@ -326,9 +323,7 @@ public class VFSPollingEndpoint extends
processFileNow(aFile);
} else {
workingSet.remove(aFile);
- if (logger.isDebugEnabled()) {
- logger.debug("Unable to acquire lock on " + aFile.getName().getURI());
- }
+ logger.debug("Unable to acquire lock on {}", aFile.getName().getURI());
}
}
public boolean shouldRunSynchronously(){
@@ -345,9 +340,7 @@ public class VFSPollingEndpoint extends
*/
protected void processFileNow(FileObject aFile) {
try {
- if (logger.isDebugEnabled()) {
- logger.debug("Processing file " + aFile.getName().getURI());
- }
+ logger.debug("Processing file {}", aFile.getName().getURI());
if (aFile.exists()) {
processFile(aFile);
@@ -355,7 +348,7 @@ public class VFSPollingEndpoint extends
} catch (Exception e) {
workingSet.remove(aFile);
unlockAsyncFile(aFile);
- logger.error("Failed to process file: " + aFile.getName().getURI() + ". Reason: " + e, e);
+ logger.error("Failed to process file: {}", aFile.getName().getURI(), e);
}
}
Modified: servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-vfs/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java Sat Feb 5 21:25:08 2011
@@ -104,7 +104,7 @@ public class VFSSendingEndpoint extends
out.close();
}
catch (IOException e) {
- logger.error("Caught exception while closing stream on error: " + e, e);
+ logger.error("Caught exception while closing stream on error: {}", e.getMessage(), e);
}
}
if (tmpName != null && name != null && !name.equals(tmpName)) {
Modified: servicemix/components/trunk/bindings/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPReceiverEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPReceiverEndpoint.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPReceiverEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPReceiverEndpoint.java Sat Feb 5 21:25:08 2011
@@ -110,15 +110,15 @@ public class XMPPReceiverEndpoint extend
if (this.connection == null) {
this.connection = new XMPPConnection(this.connectionConfig);
- this.logger.debug("Connecting to server " + this.host);
+ this.logger.debug("Connecting to server {}", this.host);
this.connection.connect();
}
if (this.login && !this.connection.isAuthenticated()) {
if (this.user != null) {
- this.logger.debug("Logging into Jabber as user: " + this.user + " on connection: " + this.connection);
+ this.logger.debug("Logging into Jabber as user: {} on connection: {}", this.user, this.connection);
if (this.password == null) {
- this.logger.warn("No password configured for user: " + this.user);
+ this.logger.warn("No password configured for user: {}", this.user);
}
if (this.createAccount) {
@@ -131,7 +131,7 @@ public class XMPPReceiverEndpoint extend
this.connection.login(this.user, this.password);
}
} else {
- this.logger.debug("Logging in anonymously to Jabber on connection: " + this.connection);
+ this.logger.debug("Logging in anonymously to Jabber on connection: {}", this.connection);
this.connection.loginAnonymously();
}
// now lets send a presence we are available
@@ -152,7 +152,7 @@ public class XMPPReceiverEndpoint extend
@Override
public void stop() throws Exception {
if (this.connection != null && this.connection.isConnected()) {
- this.logger.debug("Disconnecting from server " + this.host);
+ this.logger.debug("Disconnecting from server {}", this.host);
this.connection.disconnect();
this.connection = null;
}
@@ -180,7 +180,7 @@ public class XMPPReceiverEndpoint extend
this.marshaler.toJBI(in, packet);
getChannel().send(exchange);
} catch (MessagingException e) {
- this.logger.error("Unable to send exchange for packet " + packet.toXML(), e);
+ this.logger.error("Unable to send exchange for packet {}", packet.toXML(), e);
}
}
Modified: servicemix/components/trunk/bindings/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPSenderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPSenderEndpoint.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPSenderEndpoint.java (original)
+++ servicemix/components/trunk/bindings/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPSenderEndpoint.java Sat Feb 5 21:25:08 2011
@@ -114,15 +114,15 @@ public class XMPPSenderEndpoint extends
if (this.connection == null) {
this.connection = new XMPPConnection(this.connectionConfig);
- this.logger.debug("Connecting to server " + this.host);
+ this.logger.debug("Connecting to server {}", this.host);
this.connection.connect();
}
if (this.login && !this.connection.isAuthenticated()) {
if (this.user != null) {
- this.logger.debug("Logging into Jabber as user: " + this.user + " on connection: " + this.connection);
+ this.logger.debug("Logging into Jabber as user: {} on connection: {}", this.user, this.connection);
if (this.password == null) {
- this.logger.warn("No password configured for user: " + this.user);
+ this.logger.warn("No password configured for user: {}", this.user);
}
if (this.createAccount) {
@@ -135,7 +135,7 @@ public class XMPPSenderEndpoint extends
this.connection.login(this.user, this.password);
}
} else {
- this.logger.debug("Logging in anonymously to Jabber on connection: " + this.connection);
+ this.logger.debug("Logging in anonymously to Jabber on connection: {}", this.connection);
this.connection.loginAnonymously();
}
// now lets send a presence we are available
@@ -157,7 +157,7 @@ public class XMPPSenderEndpoint extends
@Override
public void stop() throws Exception {
if (this.connection != null && this.connection.isConnected()) {
- this.logger.debug("Disconnecting from server " + this.host);
+ this.logger.debug("Disconnecting from server {}", this.host);
this.connection.disconnect();
this.connection = null;
}
Modified: servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/pojos/LoggingPojo.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/pojos/LoggingPojo.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/pojos/LoggingPojo.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/pojos/LoggingPojo.java Sat Feb 5 21:25:08 2011
@@ -111,7 +111,7 @@ public class LoggingPojo extends BeanSup
sb.append(" ]").append('\n');
}
display(exchange, "in", sb);
- logger.info("Exchange received " + sb.toString());
+ logger.info("Exchange received {}", sb.toString());
if (exchange instanceof InOut) {
MessageUtil.transferInToOut(exchange, exchange);
send(exchange);
Modified: servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java Sat Feb 5 21:25:08 2011
@@ -110,7 +110,7 @@ public class BeanInfo {
Expression expression = createParameterUnmarshalExpression(clazz, method,
parameterType, parameterAnnotations[i]);
if (expression == null) {
- logger.debug("No expression available for method: " + method.toString() + " parameter: " + i + " so ignoring method");
+ logger.debug("No expression available for method: {} parameter: {} so ignoring method", method.toString(), i);
return;
}
parameterExpressions[i] = expression;
Modified: servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/ResolverUtil.java Sat Feb 5 21:25:08 2011
@@ -211,7 +211,7 @@ public class ResolverUtil<T> {
try {
urls = loader.getResources(packageName);
} catch (IOException ioe) {
- logger.warn("Could not read package: " + packageName, ioe);
+ logger.warn("Could not read package: {}", packageName, ioe);
return;
}
while (urls.hasMoreElements()) {
@@ -226,7 +226,7 @@ public class ResolverUtil<T> {
if (urlPath.indexOf('!') > 0) {
urlPath = urlPath.substring(0, urlPath.indexOf('!'));
}
- logger.info("Scanning for classes in [" + urlPath + "] matching criteria: " + test);
+ logger.info("Scanning for classes in [{}] matching criteria: {}", urlPath, test);
File file = new File(urlPath);
if (file.isDirectory()) {
loadImplementationsInDirectory(test, packageName, file);
@@ -303,15 +303,14 @@ public class ResolverUtil<T> {
try {
String externalName = fqn.substring(0, fqn.indexOf('.')).replace('/', '.');
ClassLoader loader = getClassLoader();
- logger.trace("Checking to see if class " + externalName + " matches criteria [" + test + "]");
+ logger.trace("Checking to see if class {} matches criteria [{}]", externalName, test);
Class type = loader.loadClass(externalName);
if (test.matches(type)) {
matches.add((Class<T>) type);
}
} catch (Throwable t) {
- logger.warn("Could not examine class '" + fqn + "' due to a "
- + t.getClass().getName() + " with message: " + t.getMessage());
+ logger.warn("Could not examine class '{}'", fqn, t);
}
}
}
\ No newline at end of file
Modified: servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java Sat Feb 5 21:25:08 2011
@@ -202,8 +202,8 @@ public abstract class TransformBeanSuppo
try {
fail(exchange, e);
} catch (Exception e2) {
- logger.warn("Unable to handle error: " + e2, e2);
- logger.debug("Original error: " + e, e);
+ logger.warn("Unable to handle error: {}", e2, e2);
+ logger.debug("Original error: {}", e, e);
}
}
}
@@ -249,7 +249,7 @@ public abstract class TransformBeanSuppo
+ " but has no Out nor Fault message");
}
} catch (Exception e) {
- logger.debug("Original error: " + e, e);
+ logger.debug("Original error: {}", e, e);
}
}
Modified: servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/UriTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/UriTest.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/UriTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/UriTest.java Sat Feb 5 21:25:08 2011
@@ -61,21 +61,21 @@ public class UriTest extends TestCase {
}
protected void dump(URI uri) {
- logger.info("URI: " + uri);
- logger.info("getAuthority(): " + uri.getAuthority());
- logger.info("getFragment(): " + uri.getFragment());
- logger.info("getHost(): " + uri.getHost());
- logger.info("getPath(): " + uri.getPath());
- logger.info("getPort(): " + uri.getPort());
- logger.info("getQuery(): " + uri.getQuery());
- logger.info("getRawAuthority(): " + uri.getRawAuthority());
- logger.info("getRawFragment(): " + uri.getRawFragment());
- logger.info("getRawPath(): " + uri.getRawPath());
- logger.info("getRawQuery(): " + uri.getRawQuery());
- logger.info("getRawSchemeSpecificPart(): " + uri.getRawSchemeSpecificPart());
- logger.info("getRawUserInfo(): " + uri.getRawUserInfo());
- logger.info("getScheme(): " + uri.getScheme());
- logger.info("getSchemeSpecificPart(): " + uri.getSchemeSpecificPart());
- logger.info("getUserInfo(): " + uri.getUserInfo());
+ logger.info("URI: {}", uri);
+ logger.info("getAuthority(): {}", uri.getAuthority());
+ logger.info("getFragment(): {}", uri.getFragment());
+ logger.info("getHost(): {}", uri.getHost());
+ logger.info("getPath(): {}", uri.getPath());
+ logger.info("getPort(): {}", uri.getPort());
+ logger.info("getQuery(): {}", uri.getQuery());
+ logger.info("getRawAuthority(): {}", uri.getRawAuthority());
+ logger.info("getRawFragment(): {}", uri.getRawFragment());
+ logger.info("getRawPath(): {}", uri.getRawPath());
+ logger.info("getRawQuery(): {}", uri.getRawQuery());
+ logger.info("getRawSchemeSpecificPart(): {}", uri.getRawSchemeSpecificPart());
+ logger.info("getRawUserInfo(): {}", uri.getRawUserInfo());
+ logger.info("getScheme(): {}", uri.getScheme());
+ logger.info("getSchemeSpecificPart(): {}", uri.getSchemeSpecificPart());
+ logger.info("getUserInfo(): {}", uri.getUserInfo());
}
}
Modified: servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AnnotatedBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AnnotatedBean.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AnnotatedBean.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AnnotatedBean.java Sat Feb 5 21:25:08 2011
@@ -37,7 +37,7 @@ public class AnnotatedBean {
public void myExchangeMethod(MessageExchange messageExchange) {
this.myExchangeMethod = messageExchange;
- logger.info("myExchangeMethod() received exchange: " + messageExchange);
+ logger.info("myExchangeMethod() received exchange: {}", messageExchange);
}
public MessageExchange getMyExchangeMethod() {
Modified: servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java Sat Feb 5 21:25:08 2011
@@ -33,10 +33,10 @@ public class AutoDeployedBean {
private final Logger logger = LoggerFactory.getLogger(AutoDeployedBean.class);
public void foo(MessageExchange messageExchange) {
- logger.info("foo() called with exchange: " + messageExchange);
+ logger.info("foo() called with exchange: {}", messageExchange);
}
public void bar(MessageExchange messageExchange) {
- logger.info("bar() called with exchange: " + messageExchange);
+ logger.info("bar() called with exchange: {}", messageExchange);
}
}
Modified: servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java Sat Feb 5 21:25:08 2011
@@ -45,7 +45,7 @@ public class ListenerBean implements Mes
public void onMessageExchange(MessageExchange exchange) throws MessagingException {
this.lastExchange = exchange;
- logger.info("Received exchange: " + exchange);
+ logger.info("Received exchange: {}", exchange);
if (exchange instanceof InOnly) {
exchange.setStatus(ExchangeStatus.DONE);
channel.send(exchange);
Modified: servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/PlainBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/PlainBean.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/PlainBean.java (original)
+++ servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/PlainBean.java Sat Feb 5 21:25:08 2011
@@ -41,30 +41,30 @@ public class PlainBean {
public void foo(MessageExchange messageExchange) {
this.foo = messageExchange;
- logger.info("foo() called with exchange: " + messageExchange);
+ logger.info("foo() called with exchange: {}", messageExchange);
}
public void bar(MessageExchange messageExchange) {
this.bar = messageExchange;
- logger.info("bar() called with exchange: " + messageExchange);
+ logger.info("bar() called with exchange: {}", messageExchange);
}
public void methodWithPropertyParameter(@Property(name = "person") String name) {
this.propertyParameter = name;
- logger.info("methodWithPropertyParameter() called with parameter: " + name);
+ logger.info("methodWithPropertyParameter() called with parameter: {}", name);
}
public void methodWithPropertyParameterAndXPath(@Property(name = "person") String name,
@XPath(xpath = "/hello/@address") String address) {
this.propertyParameter = name;
this.xpathParameter = address;
- logger.info("methodWithPropertyParameterAndXPath() called with parameter: " + address);
+ logger.info("methodWithPropertyParameterAndXPath() called with parameter: {}", address);
}
public void methodWithPropertyParameterAndContent(@Property(name = "person") String name, @Content Object content) {
this.propertyParameter = name;
this.body = content;
- logger.info("methodWithPropertyParameterAndContent() called with body: " + content);
+ logger.info("methodWithPropertyParameterAndContent() called with body: {}", content);
}
Modified: servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelConsumerEndpoint.java Sat Feb 5 21:25:08 2011
@@ -65,7 +65,7 @@ public class CamelConsumerEndpoint exten
final ContinuationData data = continuations.remove(messageExchange.getExchangeId());
if (data == null) {
- logger.error("Unexpected MessageExchange received: " + messageExchange);
+ logger.error("Unexpected MessageExchange received: {}", messageExchange);
} else {
binding.runWithCamelContextClassLoader(new Callable<Object>() {
public Object call() throws Exception {
Modified: servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java Sat Feb 5 21:25:08 2011
@@ -97,9 +97,7 @@ public class CamelProviderEndpoint exten
done(exchange);
// In message
} else if (exchange.getMessage("in") != null) {
- if (logger.isDebugEnabled()) {
- logger.debug("Received exchange: " + exchange);
- }
+ logger.debug("Received exchange: {}", exchange);
final Exchange camelExchange = binding.createExchange(exchange);
camelExchange.setFromEndpoint(camelEndpoint);
camelExchange.addOnCompletion(this);
@@ -150,7 +148,7 @@ public class CamelProviderEndpoint exten
doSend(me);
}
} catch (MessagingException e) {
- logger.warn("Unable to send JBI MessageExchange after successful Camel route invocation: " + me, e);
+ logger.warn("Unable to send JBI MessageExchange after successful Camel route invocation: {}", me, e);
}
}
@@ -171,7 +169,7 @@ public class CamelProviderEndpoint exten
fail(me, binding.extractException(exchange));
}
} catch (MessagingException e) {
- logger.warn("Unable to send JBI MessageExchange after successful Camel route invocation: " + me, e);
+ logger.warn("Unable to send JBI MessageExchange after successful Camel route invocation: {}", me, e);
}
}
}
Modified: servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java Sat Feb 5 21:25:08 2011
@@ -108,7 +108,7 @@ public class JbiBinding {
try {
ClassLoader loader = context.getApplicationContextClassLoader();
if (loader != null) {
- logger.debug("Set the thread context classloader " + loader);
+ logger.debug("Set the thread context classloader {}", loader);
Thread.currentThread().setContextClassLoader(loader);
}
return callable.call();
@@ -236,7 +236,7 @@ public class JbiBinding {
public void copyFromCamelToJbi(Message message, NormalizedMessage normalizedMessage) throws MessagingException {
if (message != null && message.getBody() != null) {
if (message.getBody(Source.class) == null) {
- logger.warn("Unable to convert message body of type " + message.getBody().getClass() + " into an XML Source");
+ logger.warn("Unable to convert message body of type {} into an XML Source", message.getBody().getClass());
} else {
normalizedMessage.setContent(message.getBody(Source.class));
}
Modified: servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/osgi/OsgiCamelJbiComponent.java Sat Feb 5 21:25:08 2011
@@ -112,7 +112,7 @@ public class OsgiCamelJbiComponent exten
if (bean instanceof BundleContextAware) {
BundleContextAware bundleContextAware = (BundleContextAware)bean;
if (bundleContext == null) {
- logger.warn("No bundle defined yet so cannot inject into: " + bean);
+ logger.warn("No bundle defined yet so cannot inject into: {}", bean);
} else {
bundleContextAware.setBundleContext(bundleContext);
}
Modified: servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/util/StrictSerializationHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/util/StrictSerializationHeaderFilterStrategy.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/util/StrictSerializationHeaderFilterStrategy.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/main/java/org/apache/servicemix/camel/util/StrictSerializationHeaderFilterStrategy.java Sat Feb 5 21:25:08 2011
@@ -51,7 +51,7 @@ public class StrictSerializationHeaderFi
oos = new ObjectOutputStream(new ByteArrayOutputStream());
oos.writeObject(o);
} catch (IOException e) {
- logger.debug(String.format("%s implements Serializable, but serialization throws IOException: filtering key %s", o, s));
+ logger.debug("{} implements Serializable, but serialization throws IOException: filtering key {}", o, s);
return true;
} finally {
if (oos != null) {
Modified: servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/CamelContextEndpointLifeCycleTest.java Sat Feb 5 21:25:08 2011
@@ -70,7 +70,7 @@ public class CamelContextEndpointLifeCyc
component.getServiceUnitManager().shutDown(suName);
component.getServiceUnitManager().undeploy(suName, path.getAbsolutePath());
} catch (Exception e) {
- logger.error("Caught: " + e, e);
+ logger.error("Caught: {}", e, e);
throw e;
}
}
Modified: servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/MyEchoComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/MyEchoComponent.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/MyEchoComponent.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/MyEchoComponent.java Sat Feb 5 21:25:08 2011
@@ -42,7 +42,7 @@ public class MyEchoComponent extends Ech
if (exchange.getOperation() != null) {
out.setProperty("operation", exchange.getOperation());
}
- logger.info("Echoed back message: " + out);
+ logger.info("Echoed back message: {}", out);
return true;
}
Modified: servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/NonJbiCamelEndpointsIntegrationTest.java Sat Feb 5 21:25:08 2011
@@ -60,7 +60,7 @@ public class NonJbiCamelEndpointsIntegra
try {
for (int i = 0; i < 2; i++) {
- logger.info("Loop counter: " + i);
+ logger.info("Loop counter: {}", i);
// Deploy and start su
component.getServiceUnitManager().deploy(suName,
@@ -93,11 +93,11 @@ public class NonJbiCamelEndpointsIntegra
client.send(exchange);
fail("Should have failed to send to a no longer deployed component");
} catch (Throwable e) {
- logger.debug("Caught expected exception as the component is undeployed: " + e, e);
+ logger.debug("Caught expected exception as the component is undeployed: {}", e, e);
}
}
} catch (Exception e) {
- logger.error("Caught: " + e, e);
+ logger.error("Caught: {}", e, e);
throw e;
}
}
@@ -120,8 +120,7 @@ public class NonJbiCamelEndpointsIntegra
fail("Unable to create temporary working root directory ["
+ tempTemp.getAbsolutePath() + "]");
}
- logger.info("Using temporary root directory ["
- + tempRootDir.getAbsolutePath() + "]");
+ logger.info("Using temporary root directory [{}]", tempRootDir.getAbsolutePath());
container.setEmbedded(true);
container.setCreateJmxConnector(false);
@@ -165,7 +164,7 @@ public class NonJbiCamelEndpointsIntegra
}
public static boolean deleteDir(File dir) {
- logger.info("Deleting directory : " + dir.getAbsolutePath());
+ logger.info("Deleting directory : {}", dir.getAbsolutePath());
if (dir.isDirectory()) {
String[] children = dir.list();
for (int i = 0; i < children.length; i++) {
Modified: servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/SpringJbiTestSupport.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/SpringJbiTestSupport.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/SpringJbiTestSupport.java (original)
+++ servicemix/components/trunk/engines/servicemix-camel/src/test/java/org/apache/servicemix/camel/SpringJbiTestSupport.java Sat Feb 5 21:25:08 2011
@@ -60,7 +60,7 @@ public abstract class SpringJbiTestSuppo
if (!tempTemp.mkdirs()) {
fail("Unable to create temporary working root directory [" + tempTemp.getAbsolutePath() + "]");
}
- logger.info("Using temporary root directory [" + tempRootDir.getAbsolutePath() + "]");
+ logger.info("Using temporary root directory [{}]", tempRootDir.getAbsolutePath());
jbiContainer.setRootDir(tempRootDir.getAbsolutePath());
jbiContainer.setEmbedded(true);
Modified: servicemix/components/trunk/engines/servicemix-drools/src/main/java/org/apache/servicemix/drools/DroolsEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-drools/src/main/java/org/apache/servicemix/drools/DroolsEndpoint.java?rev=1067527&r1=1067526&r2=1067527&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-drools/src/main/java/org/apache/servicemix/drools/DroolsEndpoint.java (original)
+++ servicemix/components/trunk/engines/servicemix-drools/src/main/java/org/apache/servicemix/drools/DroolsEndpoint.java Sat Feb 5 21:25:08 2011
@@ -262,7 +262,7 @@ public class DroolsEndpoint extends Prov
done(exchange);
}
} else {
- logger.debug("No pending exchange found for " + correlation + ", no additional rules will be triggered");
+ logger.debug("No pending exchange found for {}, no additional rules will be triggered", correlation);
}
}