You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/09/08 14:53:38 UTC
svn commit: r1701795 - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/model/adapter/
broker-core/src/main/jav...
Author: kwall
Date: Tue Sep 8 12:53:38 2015
New Revision: 1701795
URL: http://svn.apache.org/r1701795
Log:
QPID-6728: Refactoring - SLF4J - replace Object arrays in logging statements with the shorter varargs form
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/LoggingFilter.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Session.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java
Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java?rev=1701795&r1=1701794&r2=1701795&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java Tue Sep 8 12:53:38 2015
@@ -274,7 +274,7 @@ public abstract class AbstractBDBMessage
}
- getLogger().warn("Lock timeout exception. Retrying (attempt {} of {} ", new Object[] {(attempts + 1), LOCK_RETRY_ATTEMPTS, e});
+ getLogger().warn("Lock timeout exception. Retrying (attempt {} of {} ", (attempts + 1), LOCK_RETRY_ATTEMPTS, e);
if(++attempts < LOCK_RETRY_ATTEMPTS)
{
@@ -617,7 +617,7 @@ public abstract class AbstractBDBMessage
if (getLogger().isDebugEnabled())
{
getLogger().debug("Enqueuing message {} on queue {} with id {} in transaction {}",
- new Object[]{messageId, queue.getName(), queue.getId(), tx});
+ messageId, queue.getName(), queue.getId(), tx);
}
getDeliveryDb().put(tx, key, value);
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1701795&r1=1701794&r2=1701795&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Tue Sep 8 12:53:38 2015
@@ -560,9 +560,7 @@ public abstract class AbstractConfigured
public void onFailure(final Throwable t)
{
LOGGER.error("Exception occurred while closing {} : {}",
- new Object[]{child.getClass().getSimpleName(),
- child.getName(),
- t});
+ child.getClass().getSimpleName(), child.getName(), t);
}
});
childCloseFutures.add(childCloseFuture);
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1701795&r1=1701794&r2=1701795&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java Tue Sep 8 12:53:38 2015
@@ -320,7 +320,7 @@ public class BrokerAdapter extends Abstr
{
hasBrokerAnyErroredChildren = true;
LOGGER.warn("Broker child object '{}' of type '{}' is {}",
- new Object[]{ child.getName(), childClass.getSimpleName(), State.ERRORED });
+ child.getName(), childClass.getSimpleName(), State.ERRORED);
}
}
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java?rev=1701795&r1=1701794&r2=1701795&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java Tue Sep 8 12:53:38 2015
@@ -583,7 +583,7 @@ public abstract class AbstractJDBCMessag
if (getLogger().isDebugEnabled())
{
getLogger().debug("Enqueuing message {} on queue {} with id {} [Connection {}]",
- new Object[] {messageId, queue.getName(), queue.getId(), conn});
+ messageId, queue.getName(), queue.getId(), conn);
}
try (PreparedStatement stmt = conn.prepareStatement(INSERT_INTO_QUEUE_ENTRY))
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1701795&r1=1701794&r2=1701795&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Tue Sep 8 12:53:38 2015
@@ -2019,7 +2019,7 @@ public abstract class AbstractVirtualHos
public void onFailure(final Throwable t)
{
_logger.error("Exception occurred while opening {} : {}",
- new Object[]{child.getClass().getSimpleName(), child.getName(), t});
+ child.getClass().getSimpleName(), child.getName(), t);
}
});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/LoggingFilter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/LoggingFilter.java?rev=1701795&r1=1701794&r2=1701795&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/LoggingFilter.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/LoggingFilter.java Tue Sep 8 12:53:38 2015
@@ -63,7 +63,7 @@ public class LoggingFilter implements Fi
method = httpRequest.getMethod();
user = getRequestPrincipals(httpRequest);
url = getRequestURL(httpRequest);
- LOGGER.debug("REQUEST user='{}' method='{}' url='{}'", new String[]{user, method, url});
+ LOGGER.debug("REQUEST user='{}' method='{}' url='{}'", user, method, url);
}
try
{
@@ -79,7 +79,7 @@ public class LoggingFilter implements Fi
user = getRequestPrincipals(httpRequest);
}
String responseStatus = String.valueOf(httpResponse.getStatus());
- LOGGER.debug("RESPONSE user='{}' method='{}' url='{}' status='{}'", new String[]{user, method, url, responseStatus});
+ LOGGER.debug("RESPONSE user='{}' method='{}' url='{}' status='{}'", user, method, url, responseStatus);
}
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java?rev=1701795&r1=1701794&r2=1701795&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java Tue Sep 8 12:53:38 2015
@@ -599,7 +599,7 @@ public final class QpidByteBuffer
{
if (_isPoolInitialized && (bufferSize != _pooledBufferSize || maxPoolSize != _bufferPool.getMaxSize()))
{
- final String errorMessage = String.format("QpidBteBuffer pool has already been initialised with bufferSize=%d and maxPoolSize=%d." +
+ final String errorMessage = String.format("QpidByteBuffer pool has already been initialised with bufferSize=%d and maxPoolSize=%d." +
"Second initialisation with bufferSize=%d and maxPoolSize=%d will be ignored.",
_pooledBufferSize, _bufferPool.getMaxSize(), bufferSize, maxPoolSize);
throw new IllegalStateException(errorMessage);
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Session.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Session.java?rev=1701795&r1=1701794&r2=1701795&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Session.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Session.java Tue Sep 8 12:53:38 2015
@@ -441,7 +441,7 @@ public class Session extends SessionInvo
{
if(LOGGER.isDebugEnabled())
{
- LOGGER.debug("{} ch={} processed([{},{}]) {} {}", new Object[] {this, channel, lower, upper, syncPoint, maxProcessed});
+ LOGGER.debug("{} ch={} processed([{},{}]) {} {}", this, channel, lower, upper, syncPoint, maxProcessed);
}
boolean flush;
@@ -548,7 +548,7 @@ public class Session extends SessionInvo
//avoid autoboxing
if(LOGGER.isDebugEnabled())
{
- LOGGER.debug("{} complete({}, {})", new Object[] {this, lower, upper});
+ LOGGER.debug("{} complete({}, {})", this, lower, upper);
}
synchronized (commandsLock)
{
@@ -841,7 +841,7 @@ public class Session extends SessionInvo
checkFailoverRequired("Session sync was interrupted by failover.");
if(LOGGER.isDebugEnabled())
{
- LOGGER.debug("{} waiting for[{}]: {}, {}", new Object[] {this, point, maxComplete, commands});
+ LOGGER.debug("{} waiting for[{}]: {}, {}", this, point, maxComplete, commands);
}
w.await();
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java?rev=1701795&r1=1701794&r2=1701795&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java Tue Sep 8 12:53:38 2015
@@ -160,7 +160,7 @@ public final class IoSender implements R
{
try
{
- LOGGER.error("write timed out for socket {}: head {}, tail {}", new Object[] {_remoteSocketAddress, head, tail});
+ LOGGER.error("write timed out for socket {}: head {}, tail {}", _remoteSocketAddress, head, tail);
throw new SenderException(String.format("write timed out for socket %s: head %d, tail %d", _remoteSocketAddress, head, tail));
}
finally
Modified: qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java?rev=1701795&r1=1701794&r2=1701795&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java (original)
+++ qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java Tue Sep 8 12:53:38 2015
@@ -89,7 +89,7 @@ public class ProducerParticipant impleme
if (LOGGER.isInfoEnabled())
{
LOGGER.info("Producer {} about to send messages. Duration limit: {} ms, Message limit: {}",
- new Object[]{getName(), requiredDuration, numberOfMessages});
+ getName(), requiredDuration, numberOfMessages);
}
while (true)
Modified: qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java?rev=1701795&r1=1701794&r2=1701795&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java (original)
+++ qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/controller/ClientRegistry.java Tue Sep 8 12:53:38 2015
@@ -18,7 +18,6 @@
*/
package org.apache.qpid.disttest.controller;
-import static java.lang.String.valueOf;
import java.util.Collection;
import java.util.Collections;
@@ -108,11 +107,10 @@ public class ClientRegistry
LOGGER.debug(
"awaitClients(numberOfClientsToAwait={}, idleTimeout={}) " +
"returning numberOfClientsAbsent={} after {} ms",
- new Object[] {
- valueOf(numberOfClientsToAwait),
- valueOf(idleTimeout),
- valueOf(retVal),
- valueOf(System.currentTimeMillis() - startTime)});
+ numberOfClientsToAwait,
+ idleTimeout,
+ retVal,
+ System.currentTimeMillis() - startTime);
}
private long deadline(final long idleTimeout)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org