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 2017/10/29 09:34:24 UTC
[3/6] qpid-broker-j git commit: NO-JIRA: [Broker-J] Standardise the
name of the static LOGGER field across source code - no functional change
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
index 79b2c66..0a2e323 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
@@ -96,7 +96,7 @@ public class AMQPConnection_0_8Impl
OPEN
}
- private static final Logger _logger = LoggerFactory.getLogger(AMQPConnection_0_8Impl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AMQPConnection_0_8Impl.class);
private static final String BROKER_DEBUG_BINARY_DATA_LENGTH = "broker.debug.binaryDataLength";
private static final int DEFAULT_DEBUG_BINARY_DATA_LENGTH = 80;
@@ -256,7 +256,7 @@ public class AMQPConnection_0_8Impl
}
catch (AMQFrameDecodingException | IOException e)
{
- _logger.error("Unexpected exception", e);
+ LOGGER.error("Unexpected exception", e);
throw new ConnectionScopedRuntimeException(e);
}
catch (StoreException e)
@@ -292,7 +292,7 @@ public class AMQPConnection_0_8Impl
{
exception = exceptionForThisChannel;
}
- _logger.error("Error informing channel that receiving is complete. Channel: " + channel,
+ LOGGER.error("Error informing channel that receiving is complete. Channel: " + channel,
exceptionForThisChannel);
}
}
@@ -354,7 +354,7 @@ public class AMQPConnection_0_8Impl
}
catch (QpidException e)
{
- _logger.debug("Received unsupported protocol initiation for protocol version: {} ", getProtocolVersion());
+ LOGGER.debug("Received unsupported protocol initiation for protocol version: {} ", getProtocolVersion());
writeFrame(new ProtocolInitiation(ProtocolVersion.getLatestSupportedVersion()));
_sender.flush();
@@ -364,9 +364,9 @@ public class AMQPConnection_0_8Impl
@Override
public synchronized void writeFrame(AMQDataBlock frame)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("SEND: " + frame);
+ LOGGER.debug("SEND: " + frame);
}
frame.writePayload(_sender);
@@ -492,7 +492,7 @@ public class AMQPConnection_0_8Impl
{
if (!(re instanceof ConnectionScopedRuntimeException))
{
- _logger.error("Unexpected exception closing channel", re);
+ LOGGER.error("Unexpected exception closing channel", re);
}
firstException = re;
}
@@ -583,13 +583,13 @@ public class AMQPConnection_0_8Impl
if (closeWhenNoRoute != null)
{
_closeWhenNoRoute = Boolean.parseBoolean(closeWhenNoRoute);
- _logger.debug("Client set closeWhenNoRoute={} for connection {}", _closeWhenNoRoute, this);
+ LOGGER.debug("Client set closeWhenNoRoute={} for connection {}", _closeWhenNoRoute, this);
}
String compressionSupported = clientProperties.getString(ConnectionStartProperties.QPID_MESSAGE_COMPRESSION_SUPPORTED);
if (compressionSupported != null)
{
_compressionSupported = Boolean.parseBoolean(compressionSupported);
- _logger.debug("Client set compressionSupported={} for connection {}", _compressionSupported, this);
+ LOGGER.debug("Client set compressionSupported={} for connection {}", _compressionSupported, this);
}
String clientId = clientProperties.getString(ConnectionStartProperties.CLIENT_ID_0_8);
@@ -605,7 +605,7 @@ public class AMQPConnection_0_8Impl
setSendQueueDeleteOkRegardless(sendQueueDeleteOkRegardless);
if (sendQueueDeleteOkRegardless)
{
- _logger.debug("Peer is an older Qpid client, queue delete-ok response will be sent"
+ LOGGER.debug("Peer is an older Qpid client, queue delete-ok response will be sent"
+ " regardless for connection {}", this);
}
@@ -684,7 +684,7 @@ public class AMQPConnection_0_8Impl
}
catch (ConnectionScopedRuntimeException | TransportException e)
{
- _logger.error("Could not close protocol engine", e);
+ LOGGER.error("Could not close protocol engine", e);
}
finally
{
@@ -885,9 +885,9 @@ public class AMQPConnection_0_8Impl
@Override
public void receiveChannelOpen(final int channelId)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + channelId + "] ChannelOpen");
+ LOGGER.debug("RECV[" + channelId + "] ChannelOpen");
}
assertState(ConnectionState.OPEN);
@@ -911,7 +911,7 @@ public class AMQPConnection_0_8Impl
}
else
{
- _logger.debug("Connecting to: {}", virtualHost.getName());
+ LOGGER.debug("Connecting to: {}", virtualHost.getName());
final AMQChannel channel = new AMQChannel(this, channelId, virtualHost.getMessageStore());
channel.create();
@@ -943,9 +943,9 @@ public class AMQPConnection_0_8Impl
AMQShortString capabilities,
boolean insist)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV ConnectionOpen[" +" virtualHost: " + virtualHostName + " capabilities: " + capabilities + " insist: " + insist + " ]");
+ LOGGER.debug("RECV ConnectionOpen[" +" virtualHost: " + virtualHostName + " capabilities: " + capabilities + " insist: " + insist + " ]");
}
assertState(ConnectionState.AWAIT_OPEN);
@@ -1015,9 +1015,9 @@ public class AMQPConnection_0_8Impl
final int classId,
final int methodId)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV ConnectionClose[" +" replyCode: " + replyCode + " replyText: " + replyText + " classId: " + classId + " methodId: " + methodId + " ]");
+ LOGGER.debug("RECV ConnectionClose[" +" replyCode: " + replyCode + " replyText: " + replyText + " classId: " + classId + " methodId: " + methodId + " ]");
}
try
@@ -1033,7 +1033,7 @@ public class AMQPConnection_0_8Impl
}
catch (Exception e)
{
- _logger.error("Error closing connection for " + getRemoteAddressString(), e);
+ LOGGER.error("Error closing connection for " + getRemoteAddressString(), e);
}
finally
{
@@ -1044,9 +1044,9 @@ public class AMQPConnection_0_8Impl
@Override
public void receiveConnectionCloseOk()
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV ConnectionCloseOk");
+ LOGGER.debug("RECV ConnectionCloseOk");
}
closeNetworkConnection();
@@ -1055,9 +1055,9 @@ public class AMQPConnection_0_8Impl
@Override
public void receiveConnectionSecureOk(final byte[] response)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV ConnectionSecureOk[ response: ******** ] ");
+ LOGGER.debug("RECV ConnectionSecureOk[ response: ******** ] ");
}
assertState(ConnectionState.AWAIT_SECURE_OK);
@@ -1078,9 +1078,9 @@ public class AMQPConnection_0_8Impl
final byte[] response,
final AMQShortString locale)
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("RECV ConnectionStartOk["
+ LOGGER.debug("RECV ConnectionStartOk["
+ " clientProperties: "
+ clientProperties
+ " mechanism: "
@@ -1093,7 +1093,7 @@ public class AMQPConnection_0_8Impl
assertState(ConnectionState.AWAIT_START_OK);
- _logger.debug("SASL Mechanism selected: {} Locale : {}", mechanism, locale);
+ LOGGER.debug("SASL Mechanism selected: {} Locale : {}", mechanism, locale);
if (mechanism == null || mechanism.length() == 0)
{
@@ -1130,7 +1130,7 @@ public class AMQPConnection_0_8Impl
case ERROR:
Exception cause = authResult.getCause();
- _logger.debug("Authentication failed: {}", (cause == null ? "" : cause.getMessage()));
+ LOGGER.debug("Authentication failed: {}", (cause == null ? "" : cause.getMessage()));
sendConnectionClose(ErrorCodes.NOT_ALLOWED, "Authentication failed", 0);
@@ -1141,7 +1141,7 @@ public class AMQPConnection_0_8Impl
_successfulAuthenticationResult = authResult;
if (challenge == null || challenge.length == 0)
{
- _logger.debug("Connected as: {}", authResult.getSubject());
+ LOGGER.debug("Connected as: {}", authResult.getSubject());
setSubject(authResult.getSubject());
int frameMax = getDefaultMaxFrameSize();
@@ -1181,9 +1181,9 @@ public class AMQPConnection_0_8Impl
@Override
public void receiveConnectionTuneOk(final int channelMax, final long frameMax, final int heartbeat)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV ConnectionTuneOk[" +" channelMax: " + channelMax + " frameMax: " + frameMax + " heartbeat: " + heartbeat + " ]");
+ LOGGER.debug("RECV ConnectionTuneOk[" +" channelMax: " + channelMax + " frameMax: " + frameMax + " heartbeat: " + heartbeat + " ]");
}
assertState(ConnectionState.AWAIT_TUNE_OK);
@@ -1326,9 +1326,9 @@ public class AMQPConnection_0_8Impl
@Override
public void receiveHeartbeat()
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV Heartbeat");
+ LOGGER.debug("RECV Heartbeat");
}
// No op
@@ -1338,9 +1338,9 @@ public class AMQPConnection_0_8Impl
public void receiveProtocolHeader(final ProtocolInitiation protocolInitiation)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV ProtocolHeader [" + protocolInitiation + " ]");
+ LOGGER.debug("RECV ProtocolHeader [" + protocolInitiation + " ]");
}
protocolInitiationReceived(protocolInitiation);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java
index a1fbc9a..f0b5cdf 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java
@@ -33,7 +33,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class BrokerDecoder extends ServerDecoder
{
- private static final Logger _logger = LoggerFactory.getLogger(BrokerDecoder.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BrokerDecoder.class);
private final AMQPConnection_0_8Impl _connection;
/**
* Creates a new AMQP decoder.
@@ -53,7 +53,7 @@ public class BrokerDecoder extends ServerDecoder
long startTime = 0;
try
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
startTime = System.currentTimeMillis();
}
@@ -67,9 +67,9 @@ public class BrokerDecoder extends ServerDecoder
}
finally
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("Frame handled in {} ms.", (System.currentTimeMillis() - startTime));
+ LOGGER.debug("Frame handled in {} ms.", (System.currentTimeMillis() - startTime));
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java
index c45b705..9b18a1e 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java
@@ -37,7 +37,7 @@ public class BasicContentHeaderProperties
public static final byte NON_PERSISTENT = 1;
public static final byte PERSISTENT = 2;
- private static final Logger _logger = LoggerFactory.getLogger(BasicContentHeaderProperties.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BasicContentHeaderProperties.class);
private static final AMQShortString ZERO_STRING = null;
@@ -489,9 +489,9 @@ public class BasicContentHeaderProperties
{
_propertyFlags = propertyFlags;
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Property flags: " + _propertyFlags);
+ LOGGER.debug("Property flags: " + _propertyFlags);
}
if(_encodedForm != null)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/AMQBindingURL.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/AMQBindingURL.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/AMQBindingURL.java
index a0f9069..1899f71 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/AMQBindingURL.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/AMQBindingURL.java
@@ -31,7 +31,7 @@ import org.apache.qpid.server.exchange.ExchangeDefaults;
public class AMQBindingURL implements BindingURL
{
- private static final Logger _logger = LoggerFactory.getLogger(AMQBindingURL.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AMQBindingURL.class);
private final String _url;
private String _exchangeClass = ExchangeDefaults.DIRECT_EXCHANGE_CLASS;
@@ -45,9 +45,9 @@ public class AMQBindingURL implements BindingURL
{
// format:
// <exch_class>://<exch_name>/[<destination>]/[<queue>]?<option>='<value>'[,<option>='<value>']*
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Parsing URL: " + url);
+ LOGGER.debug("Parsing URL: " + url);
}
_url = url;
_options = new HashMap<>();
@@ -67,9 +67,9 @@ public class AMQBindingURL implements BindingURL
+ " to be a '" + getExchangeClass() + "' exchange. It must be an instance of the '"
+ ExchangeDefaults.DIRECT_EXCHANGE_CLASS + "' exchange.");
}
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("URL Parsed: " + this);
+ LOGGER.debug("URL Parsed: " + this);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURLParser.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURLParser.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURLParser.java
index 41b3024..94dbaef 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURLParser.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURLParser.java
@@ -45,7 +45,7 @@ public class BindingURLParser
private static final char COLON_CHAR = ':';
private static final char END_OF_URL_MARKER_CHAR = '%';
- private static final Logger _logger = LoggerFactory.getLogger(BindingURLParser.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BindingURLParser.class);
private char[] _url;
private AMQBindingURL _bindingURL;
@@ -84,7 +84,7 @@ public class BindingURLParser
{
_error =
"Invalid URL format [current_state = " + prevState + ", details extracted so far " + _bindingURL + " ] error at (" + _index + ") due to " + _error;
- _logger.debug(_error);
+ LOGGER.debug(_error);
URISyntaxException ex;
ex = new URISyntaxException(markErrorLocation(),"Error occurred while parsing URL",_index);
throw ex;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
index e3f9a0e..d1ea39a 100755
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
@@ -59,7 +59,7 @@ import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
public class MessageMetaData_1_0 implements StorableMessageMetaData
{
- private static final Logger _logger = LoggerFactory.getLogger(MessageMetaData_1_0.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MessageMetaData_1_0.class);
private static final MessageMetaDataType_1_0 TYPE = new MessageMetaDataType_1_0();
public static final MessageMetaDataType.Factory<MessageMetaData_1_0> FACTORY = new MetaDataFactory();
private static final byte VERSION_BYTE = 1;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
index d74828e..e52452a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
@@ -110,7 +110,7 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
static final Symbol DELAYED_DELIVERY = Symbol.valueOf("DELAYED_DELIVERY");
static final Symbol SHARED_CAPABILITY = Symbol.getSymbol("shared");
static final Symbol GLOBAL_CAPABILITY = Symbol.getSymbol("global");
- private static final Logger _logger = LoggerFactory.getLogger(Session_1_0.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(Session_1_0.class);
public static final Symbol LIFETIME_POLICY = Symbol.valueOf("lifetime-policy");
private static final EnumSet<SessionState> END_STATES =
EnumSet.of(SessionState.END_RECVD, SessionState.END_PIPE, SessionState.END_SENT, SessionState.ENDED);
@@ -770,7 +770,7 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
}
catch (AbstractConfiguredObject.DuplicateNameException e)
{
- _logger.error("A temporary queue was created with a name which collided with an existing queue name");
+ LOGGER.error("A temporary queue was created with a name which collided with an existing queue name");
throw new ConnectionScopedRuntimeException(e);
}
}
@@ -803,7 +803,7 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
}
catch (AbstractConfiguredObject.DuplicateNameException e)
{
- _logger.error("A temporary destination was created with a name which collided with an existing destination name '{}'", destName);
+ LOGGER.error("A temporary destination was created with a name which collided with an existing destination name '{}'", destName);
throw new ConnectionScopedRuntimeException(e);
}
}
@@ -1347,7 +1347,7 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
public void onFailure(final Throwable t)
{
String errorMessage = String.format("Failed to create LinkEndpoint in response to Attach: %s", _attach);
- _logger.error(errorMessage, t);
+ LOGGER.error(errorMessage, t);
throw new ConnectionScopedRuntimeException(errorMessage, t);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java
index d754f09..8ac3cec 100644
--- a/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java
+++ b/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCMessageStore.java
@@ -45,7 +45,7 @@ import org.apache.qpid.server.store.StoreException;
public class GenericJDBCMessageStore extends GenericAbstractJDBCMessageStore
{
- private static final Logger _logger = LoggerFactory.getLogger(GenericJDBCMessageStore.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(GenericJDBCMessageStore.class);
private String _connectionURL;
private ConnectionProvider _connectionProvider;
@@ -85,7 +85,7 @@ public class GenericJDBCMessageStore extends GenericAbstractJDBCMessageStore
JDBCConnectionProviderFactory.FACTORIES.get(connectionPoolType);
if(connectionProviderFactory == null)
{
- _logger.warn("Unknown connection pool type: " + connectionPoolType + ". No connection pooling will be used");
+ LOGGER.warn("Unknown connection pool type: " + connectionPoolType + ". No connection pooling will be used");
connectionProviderFactory = new DefaultConnectionProviderFactory();
}
@@ -144,7 +144,7 @@ public class GenericJDBCMessageStore extends GenericAbstractJDBCMessageStore
@Override
protected Logger getLogger()
{
- return _logger;
+ return LOGGER;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java
index 64b10d4..ccaa7f8 100644
--- a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java
+++ b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java
@@ -45,7 +45,7 @@ import org.apache.qpid.server.util.Action;
public class BrokerLogbackSocketLoggerImpl
extends AbstractBrokerLogger<BrokerLogbackSocketLoggerImpl> implements BrokerLogbackSocketLogger<BrokerLogbackSocketLoggerImpl>
{
- private static final Logger _logger = LoggerFactory.getLogger(BrokerLogbackSocketLoggerImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BrokerLogbackSocketLoggerImpl.class);
private final List<Action<Void>> _stopLoggingActions = new CopyOnWriteArrayList<>();
@@ -121,7 +121,7 @@ public class BrokerLogbackSocketLoggerImpl
final String existingValue = loggerContext.getProperty(key);
if (existingValue != null && !Objects.equals(existingValue, value))
{
- _logger.warn("Logback context property key '{}' value '{}' overwritten with value '{}", key, existingValue, value);
+ LOGGER.warn("Logback context property key '{}' value '{}' overwritten with value '{}", key, existingValue, value);
}
loggerContext.putProperty(key, value);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
index 99b26f8..798d11a 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
@@ -46,7 +46,7 @@ import org.apache.qpid.test.utils.QpidTestCase;
public class AppenderUtilsTest extends QpidTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(AppenderUtilsTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AppenderUtilsTest.class);
public static final String LAYOUT = "%d %-5p [%t] \\(%c{2}\\) # %m%n";
public static final int MAX_FILE_SIZE = 101;
@@ -175,7 +175,7 @@ public class AppenderUtilsTest extends QpidTestCase
}
else
{
- _logger.warn("could not set permissions on temporary directory - test skipped");
+ LOGGER.warn("could not set permissions on temporary directory - test skipped");
}
}
finally
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java
index c58f252..e7e9b7c 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java
@@ -30,7 +30,7 @@ import java.util.Properties;
public class DojoHelper
{
- private static final Logger _logger = LoggerFactory.getLogger(DojoHelper.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DojoHelper.class);
public static final String VERSION_FILE = "dojoconfig.properties";
public static final String DOJO_VERSION_PROPERTY = "dojo-version";
@@ -56,7 +56,7 @@ public class DojoHelper
InputStream propertyStream = DojoHelper.class.getClassLoader().getResourceAsStream(VERSION_FILE);
if (propertyStream == null)
{
- _logger.warn("Unable to find resource " + VERSION_FILE + " from classloader");
+ LOGGER.warn("Unable to find resource " + VERSION_FILE + " from classloader");
}
else
{
@@ -72,19 +72,19 @@ public class DojoHelper
}
catch (IOException e)
{
- _logger.warn("Exception closing InputStream for " + VERSION_FILE + " resource:", e);
+ LOGGER.warn("Exception closing InputStream for " + VERSION_FILE + " resource:", e);
}
}
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Dumping Dojo Config:");
+ LOGGER.debug("Dumping Dojo Config:");
for (Map.Entry<Object, Object> entry : props.entrySet())
{
- _logger.debug("Property: " + entry.getKey() + " Value: " + entry.getValue());
+ LOGGER.debug("Property: " + entry.getKey() + " Value: " + entry.getValue());
}
- _logger.debug("End of property dump");
+ LOGGER.debug("End of property dump");
}
_version = props.getProperty(DOJO_VERSION_PROPERTY, _version);
@@ -98,7 +98,7 @@ public class DojoHelper
catch (IOException e)
{
// Log a warning about this and leave the values initialized to unknown.
- _logger.error("Exception loading " + VERSION_FILE + " resource:", e);
+ LOGGER.error("Exception loading " + VERSION_FILE + " resource:", e);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 5dbbe67..8d79402 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -120,7 +120,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException;
@ManagedObject( category = false, type = HttpManagement.PLUGIN_TYPE )
public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implements HttpManagementConfiguration<HttpManagement>, PortManager
{
- private final Logger _logger = LoggerFactory.getLogger(HttpManagement.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(HttpManagement.class);
// 10 minutes by default
public static final int DEFAULT_TIMEOUT_IN_SECONDS = 60 * 10;
@@ -202,7 +202,7 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
Collection<HttpPort<?>> httpPorts = getEligibleHttpPorts(getBroker().getPorts());
if (httpPorts.isEmpty())
{
- _logger.warn("HttpManagement plugin is configured but no suitable HTTP ports are available.");
+ LOGGER.warn("HttpManagement plugin is configured but no suitable HTTP ports are available.");
}
else
{
@@ -286,7 +286,7 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
private Server createServer(Collection<HttpPort<?>> ports)
{
- _logger.debug("Starting up web server on {}", ports);
+ LOGGER.debug("Starting up web server on {}", ports);
_allowPortActivation = true;
_jettyServerExecutor = Executors.newSingleThreadExecutor(new DaemonThreadFactory("Jetty-Server-Thread"));
@@ -534,16 +534,16 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
public void handshakeFailed(final Event event, final Throwable failure)
{
SSLEngine sslEngine = event.getSSLEngine();
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.info("TLS handshake failed: host='{}', port={}",
+ LOGGER.info("TLS handshake failed: host='{}', port={}",
sslEngine.getPeerHost(),
sslEngine.getPeerPort(),
failure);
}
else
{
- _logger.info("TLS handshake failed: host='{}', port={}: {}",
+ LOGGER.info("TLS handshake failed: host='{}', port={}: {}",
sslEngine.getPeerHost(),
sslEngine.getPeerPort(),
String.valueOf(failure));
@@ -555,9 +555,9 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
int acceptors = connector.getAcceptors();
int selectors = connector.getSelectorManager().getSelectorCount();
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug(
+ LOGGER.debug(
"Created connector for http port {} with maxThreads={}, minThreads={}, acceptors={}, selectors={}, acceptBacklog={}",
port.getName(),
port.getThreadPoolMaximum(),
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java
----------------------------------------------------------------------
diff --git a/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java b/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java
index d3ec830..b436a2f 100644
--- a/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java
+++ b/perftests/src/main/java/org/apache/qpid/disttest/db/ResultsDbWriter.java
@@ -46,7 +46,7 @@ import org.apache.qpid.disttest.results.aggregation.ITestResult;
public class ResultsDbWriter implements ResultsWriter
{
- private static final Logger _logger = LoggerFactory.getLogger(ResultsDbWriter.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ResultsDbWriter.class);
private static final String RESULTS_TABLE_NAME = "RESULTS";
@@ -233,7 +233,7 @@ public class ResultsDbWriter implements ResultsWriter
Statement statement = connection.createStatement();
try
{
- _logger.info("About to create results table using SQL: " + CREATE_RESULTS_TABLE);
+ LOGGER.info("About to create results table using SQL: " + CREATE_RESULTS_TABLE);
statement.execute(CREATE_RESULTS_TABLE);
}
finally
@@ -297,7 +297,7 @@ public class ResultsDbWriter implements ResultsWriter
{
throw new RuntimeException("Couldn't write results " + results, e);
}
- _logger.info(this + " wrote " + results.getTestResults().size() + " results to database");
+ LOGGER.info(this + " wrote " + results.getTestResults().size() + " results to database");
}
@Override
@@ -332,9 +332,9 @@ public class ResultsDbWriter implements ResultsWriter
private void writeParticipantResult(Connection connection, ParticipantResult participantResult) throws SQLException
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("About to write to DB the following participant result: " + participantResult);
+ LOGGER.debug("About to write to DB the following participant result: " + participantResult);
}
PreparedStatement statement = null;
@@ -423,7 +423,7 @@ public class ResultsDbWriter implements ResultsWriter
}
catch(SQLException e)
{
- _logger.error("Couldn't write " + participantResult, e);
+ LOGGER.error("Couldn't write " + participantResult, e);
}
finally
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
----------------------------------------------------------------------
diff --git a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
index fbc0ab5..7ebf483 100644
--- a/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
+++ b/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
@@ -52,7 +52,7 @@ import org.apache.qpid.test.utils.TestFileUtils;
*/
public class ChartProductionTest extends QpidTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(ChartProductionTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ChartProductionTest.class);
private static final String TEST_CHARTTITLE = "TEST_CHARTTITLE";
private static final String TEST_CHARTSUBTITLE = "TEST_CHARTSUBTITLE";
private static final String TEST_XAXIS = "TEST_XAXIS";
@@ -99,7 +99,7 @@ public class ChartProductionTest extends QpidTestCase
}
else
{
- _logger.info("Charting directory for manual observation " + chartDir);
+ LOGGER.info("Charting directory for manual observation " + chartDir);
}
_writer.setOutputDirectory(chartDir);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java
----------------------------------------------------------------------
diff --git a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java
index 68c6026..d9aec56 100644
--- a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java
+++ b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/PortHelper.java
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
public class PortHelper
{
- private static final Logger _logger = LoggerFactory.getLogger(PortHelper.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PortHelper.class);
public static final int START_PORT_NUMBER = 10000;
@@ -100,7 +100,7 @@ public class PortHelper
public void waitUntilPortsAreFree(Set<Integer> ports)
{
- _logger.debug("Checking if ports " + ports + " are free...");
+ LOGGER.debug("Checking if ports " + ports + " are free...");
for (Integer port : ports)
{
@@ -110,7 +110,7 @@ public class PortHelper
}
}
- _logger.debug("ports " + ports + " are free");
+ LOGGER.debug("ports " + ports + " are free");
}
private void waitUntilPortIsFree(int port)
@@ -130,7 +130,7 @@ public class PortHelper
{
if(alreadyFailed)
{
- _logger.debug("port " + port + " is now available");
+ LOGGER.debug("port " + port + " is now available");
}
return;
}
@@ -163,7 +163,7 @@ public class PortHelper
}
catch (IOException e)
{
- _logger.debug("port " + port + " is not free");
+ LOGGER.debug("port " + port + " is not free");
return false;
}
finally
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
----------------------------------------------------------------------
diff --git a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index 60151e8..630dbe0 100644
--- a/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -57,7 +57,7 @@ public class QpidTestCase extends TestCase
public static final String TEST_RESOURCES_DIR = TEST_PROFILES_DIR + "test_resources/";
public static final String TMP_FOLDER = System.getProperty("java.io.tmpdir");
- private static final Logger _logger = LoggerFactory.getLogger(QpidTestCase.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(QpidTestCase.class);
private static QpidTestCase _currentInstance;
private final Map<String, String> _propertiesSetForTest = new HashMap<>();
@@ -77,7 +77,7 @@ public class QpidTestCase extends TestCase
{
if (Boolean.getBoolean("test.exclude"))
{
- _logger.info("Some tests should be excluded, building the exclude list");
+ LOGGER.info("Some tests should be excluded, building the exclude list");
String exclusionListURIs = System.getProperty(TEST_EXCLUDEFILES, "");
String exclusionListString = System.getProperty(TEST_EXCLUDELIST, "");
String testExcludes = System.getProperty(TEST_EXCLUDES);
@@ -98,7 +98,7 @@ public class QpidTestCase extends TestCase
File file = new File(uri);
if (file.exists())
{
- _logger.info("Using exclude file: " + uri);
+ LOGGER.info("Using exclude file: " + uri);
try(FileReader fileReader = new FileReader(file))
{
try(BufferedReader in = new BufferedReader(fileReader))
@@ -114,18 +114,18 @@ public class QpidTestCase extends TestCase
}
catch (IOException e)
{
- _logger.warn("Exception when reading exclusion list", e);
+ LOGGER.warn("Exception when reading exclusion list", e);
}
}
else
{
- _logger.info("Specified exclude file does not exist: " + uri);
+ LOGGER.info("Specified exclude file does not exist: " + uri);
}
}
if (!exclusionListString.equals(""))
{
- _logger.info("Using excludeslist: " + exclusionListString);
+ LOGGER.info("Using excludeslist: " + exclusionListString);
for (String test : exclusionListString.split("\\s+"))
{
exclusionList.add(test);
@@ -146,7 +146,7 @@ public class QpidTestCase extends TestCase
@Override
public void run(TestResult testResult)
{
- final LoggerContext loggerContext = ((ch.qos.logback.classic.Logger) _logger).getLoggerContext();
+ final LoggerContext loggerContext = ((ch.qos.logback.classic.Logger) LOGGER).getLoggerContext();
try
{
_currentInstance = this;
@@ -156,7 +156,7 @@ public class QpidTestCase extends TestCase
_exclusionList.contains(getClass().getName() + "#*") ||
_exclusionList.contains(getClass().getName() + "#" + getName()))
{
- _logger.info("Test: " + getName() + " is excluded");
+ LOGGER.info("Test: " + getName() + " is excluded");
testResult.endTest(this);
}
else
@@ -167,7 +167,7 @@ public class QpidTestCase extends TestCase
}
finally
{
- _logger.info(ClassicConstants.FINALIZE_SESSION_MARKER, "Shutting down sub-appender");
+ LOGGER.info(ClassicConstants.FINALIZE_SESSION_MARKER, "Shutting down sub-appender");
_currentInstance = null;
loggerContext.putProperty(LogbackPropertyValueDiscriminator.CLASS_QUALIFIED_TEST_NAME, null);
revertTestSystemProperties();
@@ -177,7 +177,7 @@ public class QpidTestCase extends TestCase
@Override
protected void runTest() throws Throwable
{
- _logger.info("========== run " + getTestName() + " ==========");
+ LOGGER.info("========== run " + getTestName() + " ==========");
super.runTest();
}
@@ -185,9 +185,9 @@ public class QpidTestCase extends TestCase
{
final String storeType = System.getProperty(VIRTUAL_HOST_NODE_TYPE);
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug(VIRTUAL_HOST_NODE_TYPE + "=" + storeType);
+ LOGGER.debug(VIRTUAL_HOST_NODE_TYPE + "=" + storeType);
}
return storeType != null ? storeType : "TestMemory";
@@ -259,7 +259,7 @@ public class QpidTestCase extends TestCase
System.setProperty(property, value);
}
- _logger.info("Set system property \"" + property + "\" to: \"" + value + "\"");
+ LOGGER.info("Set system property \"" + property + "\" to: \"" + value + "\"");
}
/**
@@ -269,7 +269,7 @@ public class QpidTestCase extends TestCase
{
if(!_propertiesSetForTest.isEmpty())
{
- _logger.debug("reverting " + _propertiesSetForTest.size() + " test properties");
+ LOGGER.debug("reverting " + _propertiesSetForTest.size() + " test properties");
for (String key : _propertiesSetForTest.keySet())
{
String value = _propertiesSetForTest.get(key);
@@ -290,14 +290,14 @@ public class QpidTestCase extends TestCase
@Override
protected void setUp() throws Exception
{
- _logger.info("========== start " + getTestName() + " ==========");
+ LOGGER.info("========== start " + getTestName() + " ==========");
super.setUp();
}
@Override
protected void tearDown() throws Exception
{
- _logger.info("========== tearDown " + getTestName() + " ==========");
+ LOGGER.info("========== tearDown " + getTestName() + " ==========");
for (Runnable runnable : _tearDownRegistry)
{
runnable.run();
@@ -327,7 +327,7 @@ public class QpidTestCase extends TestCase
File file = new File(pathToFileWithOverriddenClientAndBrokerProperties);
if (file.exists())
{
- _logger.info("Loading overridden system properties from {}", file.getAbsolutePath());
+ LOGGER.info("Loading overridden system properties from {}", file.getAbsolutePath());
try (InputStream propertiesStream = new FileInputStream(file))
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
----------------------------------------------------------------------
diff --git a/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 5de67f0..455b864 100755
--- a/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -58,7 +58,7 @@ public class QpidBrokerTestCase extends QpidTestCase
public static final String QUEUE = "queue";
public static final String TOPIC = "topic";
public static final String MANAGEMENT_MODE_PASSWORD = "mm_password";
- protected static final Logger _logger = LoggerFactory.getLogger(QpidBrokerTestCase.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(QpidBrokerTestCase.class);
protected static final long RECEIVE_TIMEOUT = Long.getLong("qpid.test_receive_timeout", 1000L);
protected static final String INDEX = "index";
protected static final String CONTENT = "content";
@@ -92,7 +92,7 @@ public class QpidBrokerTestCase extends QpidTestCase
}
catch (Exception e)
{
- _logger.error("exception", e);
+ LOGGER.error("exception", e);
throw e;
}
finally
@@ -102,13 +102,13 @@ public class QpidBrokerTestCase extends QpidTestCase
// reset properties used in the test
revertSystemProperties();
- _logger.info("========== stop " + getTestName() + " ==========");
+ LOGGER.info("========== stop " + getTestName() + " ==========");
}
}
public Logger getLogger()
{
- return QpidBrokerTestCase._logger;
+ return QpidBrokerTestCase.LOGGER;
}
public File getOutputFile()
@@ -566,7 +566,7 @@ public class QpidBrokerTestCase extends QpidTestCase
@Override
protected void tearDown() throws java.lang.Exception
{
- _logger.debug("tearDown started");
+ LOGGER.debug("tearDown started");
try
{
for (Connection c : _connections)
@@ -607,13 +607,13 @@ public class QpidBrokerTestCase extends QpidTestCase
catch (Exception e)
{
success = false;
- _logger.error("Failed to stop broker " + broker, e);
+ LOGGER.error("Failed to stop broker " + broker, e);
if (broker != null)
{
// save the thread dump in case of dead locks
try
{
- _logger.error("Broker " + broker + " thread dump:" + broker.dumpThreads());
+ LOGGER.error("Broker " + broker + " thread dump:" + broker.dumpThreads());
}
finally
{
@@ -889,7 +889,7 @@ public class QpidBrokerTestCase extends QpidTestCase
public BrokerHolder create(BrokerHolder.BrokerType brokerType, int port, QpidBrokerTestCase testCase)
{
// This will force the creation of the file appender
- _logger.debug("Creating BrokerHolder");
+ LOGGER.debug("Creating BrokerHolder");
final File logFile = testCase.getOutputFile();
final String classQualifiedTestName = testCase.getClassQualifiedTestName();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java b/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
index 6ddd1f3..e46db0e 100644
--- a/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
+++ b/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
@@ -67,7 +67,7 @@ import org.apache.qpid.url.URLSyntaxException;
*/
public class FailoverBehaviourTest extends FailoverBaseCase implements ExceptionListener
{
- protected static final Logger _LOGGER = LoggerFactory.getLogger(FailoverBehaviourTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(FailoverBehaviourTest.class);
private static final String TEST_MESSAGE_FORMAT = "test message {0}";
@@ -754,7 +754,7 @@ public class FailoverBehaviourTest extends FailoverBaseCase implements Exception
catch (JMSException e)
{
// OK we will be failing over
- _logger.debug("Got JMS exception, probably just failing over", e);
+ LOGGER.debug("Got JMS exception, probably just failing over", e);
}
}
@@ -780,18 +780,18 @@ public class FailoverBehaviourTest extends FailoverBaseCase implements Exception
if (hardKill)
{
- _logger.debug("Killing the Broker");
+ LOGGER.debug("Killing the Broker");
killDefaultBroker();
}
else
{
- _logger.debug("Stopping the Broker");
+ LOGGER.debug("Stopping the Broker");
stopDefaultBroker();
}
if (exception.get() != null)
{
- _logger.error("Unexpected exception from producer thread", exception.get());
+ LOGGER.error("Unexpected exception from producer thread", exception.get());
}
assertNull("Producer thread should not have got an exception", exception.get());
@@ -1034,9 +1034,9 @@ public class FailoverBehaviourTest extends FailoverBaseCase implements Exception
{
try
{
- _LOGGER.debug("Stopping connection from dispatcher thread");
+ LOGGER.debug("Stopping connection from dispatcher thread");
_connection.stop();
- _LOGGER.debug("Connection stopped from dispatcher thread");
+ LOGGER.debug("Connection stopped from dispatcher thread");
}
catch (Exception e)
@@ -1114,7 +1114,7 @@ public class FailoverBehaviourTest extends FailoverBaseCase implements Exception
public boolean preFailover(final boolean redirect)
{
failoverBegun.countDown();
- _LOGGER.info("Failover started");
+ LOGGER.info("Failover started");
return true;
}
@@ -1328,7 +1328,7 @@ public class FailoverBehaviourTest extends FailoverBaseCase implements Exception
String text = MessageFormat.format(messagePattern, i);
Message message = producerSession.createTextMessage(text);
producer.send(message);
- _LOGGER.debug("Test message number " + i + " produced with text = " + text + ", and JMSMessageID = " + message.getJMSMessageID());
+ LOGGER.debug("Test message number " + i + " produced with text = " + text + ", and JMSMessageID = " + message.getJMSMessageID());
}
if(standaloneProducer)
@@ -1384,7 +1384,7 @@ public class FailoverBehaviourTest extends FailoverBaseCase implements Exception
{
fail("JMSException occured while getting message text:" + e.getMessage());
}
- _LOGGER.debug("Test message number " + messageIndex + " consumed with text = " + receivedText + ", and JMSMessageID = " + receivedMessage.getJMSMessageID());
+ LOGGER.debug("Test message number " + messageIndex + " consumed with text = " + receivedText + ", and JMSMessageID = " + receivedMessage.getJMSMessageID());
assertEquals("Failover is broken! Expected [" + expectedText + "] but got [" + receivedText + "]",
expectedText, receivedText);
}
@@ -1413,7 +1413,7 @@ public class FailoverBehaviourTest extends FailoverBaseCase implements Exception
private void awaitForFailoverCompletion(long delay)
{
- _logger.info("Awaiting {} ms for failover completion..", delay);
+ LOGGER.info("Awaiting {} ms for failover completion..", delay);
try
{
if (!_failoverComplete.await(delay, TimeUnit.MILLISECONDS))
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java b/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
index be239f5..f78b9d2 100644
--- a/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
+++ b/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
@@ -50,7 +50,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
*/
public class MultipleBrokersFailoverTest extends QpidBrokerTestCase implements ConnectionListener
{
- private static final Logger _logger = LoggerFactory.getLogger(MultipleBrokersFailoverTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MultipleBrokersFailoverTest.class);
private static final String FAILOVER_VIRTUAL_HOST = "failover";
private static final String NON_FAILOVER_VIRTUAL_HOST = "nonfailover";
@@ -208,7 +208,7 @@ public class MultipleBrokersFailoverTest extends QpidBrokerTestCase implements C
private void awaitForFailoverCompletion(long delay) throws Exception
{
- _logger.info("Awaiting Failover completion..");
+ LOGGER.info("Awaiting Failover completion..");
if (!_failoverComplete.await(delay, TimeUnit.MILLISECONDS))
{
fail("Failover did not complete within " + delay + "ms.");
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java b/systests/src/test/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java
index 89cd108..330012f 100644
--- a/systests/src/test/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java
+++ b/systests/src/test/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java
@@ -43,7 +43,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class PrefetchBehaviourTest extends QpidBrokerTestCase
{
- protected static final Logger _logger = LoggerFactory.getLogger(PrefetchBehaviourTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PrefetchBehaviourTest.class);
private Connection _normalConnection;
private AtomicBoolean _exceptionCaught;
private CountDownLatch _processingStarted;
@@ -86,9 +86,9 @@ public class PrefetchBehaviourTest extends QpidBrokerTestCase
{
try
{
- _logger.debug("starting processing");
+ LOGGER.debug("starting processing");
_processingStarted.countDown();
- _logger.debug("processing started");
+ LOGGER.debug("processing started");
//simulate message processing
Thread.sleep(processingTime);
@@ -99,7 +99,7 @@ public class PrefetchBehaviourTest extends QpidBrokerTestCase
}
catch(Exception e)
{
- _logger.error("Exception caught in message listener");
+ LOGGER.error("Exception caught in message listener");
_exceptionCaught.set(true);
}
}
@@ -117,7 +117,7 @@ public class PrefetchBehaviourTest extends QpidBrokerTestCase
//wait for the first message to start being processed by the async consumer
assertTrue("Async processing failed to start in allowed timeframe", _processingStarted.await(2000, TimeUnit.MILLISECONDS));
- _logger.debug("proceeding with test");
+ LOGGER.debug("proceeding with test");
//try to consumer the other messages with another consumer while the async procesisng occurs
Session normalSession = _normalConnection.createSession(true, Session.AUTO_ACKNOWLEDGE);
@@ -134,7 +134,7 @@ public class PrefetchBehaviourTest extends QpidBrokerTestCase
assertNull("Consumer should not have received a 5th message",msg);
//wait for the other consumer to finish to ensure it completes ok
- _logger.debug("waiting for async consumer to complete");
+ LOGGER.debug("waiting for async consumer to complete");
assertTrue("Async processing failed to complete in allowed timeframe", _processingStarted.await(processingTime + 2000, TimeUnit.MILLISECONDS));
assertFalse("Unexpected exception during async message processing",_exceptionCaught.get());
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java b/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java
index c36eded..5703473 100644
--- a/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java
+++ b/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java
@@ -527,7 +527,7 @@ public class SSLTest extends QpidBrokerTestCase
{
if(shouldSucceed)
{
- _logger.error("Caught unexpected exception",e);
+ LOGGER.error("Caught unexpected exception",e);
fail("Connection failed, unexpected exception thrown");
}
else
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
index afe76a8..af17308 100644
--- a/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
+++ b/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
@@ -52,7 +52,7 @@ import org.apache.qpid.url.BindingURL;
public class ReturnUnroutableMandatoryMessageTest extends QpidBrokerTestCase implements ExceptionListener
{
- private static final Logger _logger = LoggerFactory.getLogger(ReturnUnroutableMandatoryMessageTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ReturnUnroutableMandatoryMessageTest.class);
private final List<Message> _bouncedMessageList = Collections.synchronizedList(new ArrayList<Message>());
@@ -92,7 +92,7 @@ public class ReturnUnroutableMandatoryMessageTest extends QpidBrokerTestCase imp
producerSession = (AMQSession) con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
// Need to start the "producer" connection in order to receive bounced messages
- _logger.info("Starting producer connection");
+ LOGGER.info("Starting producer connection");
con2.start();
}
catch (JMSException jmse)
@@ -106,22 +106,22 @@ public class ReturnUnroutableMandatoryMessageTest extends QpidBrokerTestCase imp
MessageProducer mandatoryProducer = producerSession.createProducer(queue);
// First test - should neither be bounced nor routed
- _logger.info("Sending non-routable non-mandatory message");
+ LOGGER.info("Sending non-routable non-mandatory message");
TextMessage msg1 = producerSession.createTextMessage("msg1");
nonMandatoryProducer.send(msg1);
// Second test - should be bounced
- _logger.info("Sending non-routable mandatory message");
+ LOGGER.info("Sending non-routable mandatory message");
TextMessage msg2 = producerSession.createTextMessage("msg2");
mandatoryProducer.send(msg2);
// Third test - should be routed
- _logger.info("Sending routable message");
+ LOGGER.info("Sending routable message");
TextMessage msg3 = producerSession.createTextMessage("msg3");
msg3.setStringProperty("F1000", "1");
mandatoryProducer.send(msg3);
- _logger.info("Starting consumer connection");
+ LOGGER.info("Starting consumer connection");
con.start();
TextMessage tm = (TextMessage) consumer.receive(1000L);
@@ -171,23 +171,23 @@ public class ReturnUnroutableMandatoryMessageTest extends QpidBrokerTestCase imp
AMQSession producerSession = (AMQSession) con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
// Need to start the "producer" connection in order to receive bounced messages
- _logger.info("Starting producer connection");
+ LOGGER.info("Starting producer connection");
con2.start();
MessageProducer nonMandatoryProducer = producerSession.createProducer(valid_queue, false, false);
MessageProducer mandatoryProducer = producerSession.createProducer(invalid_queue);
// First test - should be routed
- _logger.info("Sending non-mandatory message");
+ LOGGER.info("Sending non-mandatory message");
TextMessage msg1 = producerSession.createTextMessage("msg1");
nonMandatoryProducer.send(msg1);
// Second test - should be bounced
- _logger.info("Sending non-routable mandatory message");
+ LOGGER.info("Sending non-routable mandatory message");
TextMessage msg2 = producerSession.createTextMessage("msg2");
mandatoryProducer.send(msg2);
- _logger.info("Starting consumer connection");
+ LOGGER.info("Starting consumer connection");
con.start();
TextMessage tm = (TextMessage) consumer.receive(1000L);
@@ -232,23 +232,23 @@ public class ReturnUnroutableMandatoryMessageTest extends QpidBrokerTestCase imp
AMQSession producerSession = (AMQSession) con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
// Need to start the "producer" connection in order to receive bounced messages
- _logger.info("Starting producer connection");
+ LOGGER.info("Starting producer connection");
con2.start();
MessageProducer nonMandatoryProducer = producerSession.createProducer(valid_topic, false, false);
MessageProducer mandatoryProducer = producerSession.createProducer(invalid_topic, false, true);
// First test - should be routed
- _logger.info("Sending non-mandatory message");
+ LOGGER.info("Sending non-mandatory message");
TextMessage msg1 = producerSession.createTextMessage("msg1");
nonMandatoryProducer.send(msg1);
// Second test - should be bounced
- _logger.info("Sending non-routable mandatory message");
+ LOGGER.info("Sending non-routable mandatory message");
TextMessage msg2 = producerSession.createTextMessage("msg2");
mandatoryProducer.send(msg2);
- _logger.info("Starting consumer connection");
+ LOGGER.info("Starting consumer connection");
con.start();
TextMessage tm = (TextMessage) consumer.receive(1000L);
@@ -288,11 +288,11 @@ public class ReturnUnroutableMandatoryMessageTest extends QpidBrokerTestCase imp
AMQNoRouteException noRoute = (AMQNoRouteException) linkedException;
Message bounced = (Message) noRoute.getUndeliveredMessage();
_bouncedMessageList.add(bounced);
- _logger.info("Caught expected NoRouteException");
+ LOGGER.info("Caught expected NoRouteException");
}
else
{
- _logger.warn("Caught exception on producer: ", jmsException);
+ LOGGER.warn("Caught exception on producer: ", jmsException);
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java b/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java
index af8edf4..ca7eca6 100644
--- a/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java
+++ b/systests/src/test/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java
@@ -31,6 +31,9 @@ import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.Topic;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.qpid.server.model.Consumer;
/**
@@ -46,6 +49,8 @@ import org.apache.qpid.server.model.Consumer;
*/
public class ConsumerLoggingTest extends AbstractTestLogging
{
+ private static final Logger LOGGER = LoggerFactory.getLogger(ConsumerLoggingTest.class);
+
static final String SUB_PREFIX = "SUB-";
private Connection _connection;
@@ -323,7 +328,7 @@ public class ConsumerLoggingTest extends AbstractTestLogging
Thread.sleep(2500l);
- _logger.debug("Looking for SUB-1003s");
+ LOGGER.debug("Looking for SUB-1003s");
List<String> results = waitAndFindMatches("SUB-1003");
assertTrue("Expected at least two suspension messages, but got " + results.size(), results.size() >= 2);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java b/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
index ac26495..3c94162 100644
--- a/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
+++ b/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
@@ -40,7 +40,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class MultipleTransactedBatchProducerTest extends QpidBrokerTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(MultipleTransactedBatchProducerTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MultipleTransactedBatchProducerTest.class);
private static final int MESSAGE_COUNT = 1000;
private static final int BATCH_SIZE = 50;
@@ -183,11 +183,11 @@ public class MultipleTransactedBatchProducerTest extends QpidBrokerTestCase
}
catch (JMSException e)
{
- _logger.error(_desc + " received exception: " + e.getMessage(), e);
+ LOGGER.error(_desc + " received exception: " + e.getMessage(), e);
failAsyncTest(e.getMessage());
}
- _logger.info("Consumer received message:"+ msgCount + " with ID: " + msgID);
+ LOGGER.info("Consumer received message:"+ msgCount + " with ID: " + msgID);
try
{
@@ -195,7 +195,7 @@ public class MultipleTransactedBatchProducerTest extends QpidBrokerTestCase
}
catch (JMSException e)
{
- _logger.error(_desc + " received exception: " + e.getMessage(), e);
+ LOGGER.error(_desc + " received exception: " + e.getMessage(), e);
failAsyncTest(e.getMessage());
}
}
@@ -224,7 +224,7 @@ public class MultipleTransactedBatchProducerTest extends QpidBrokerTestCase
}
catch (Exception e)
{
- _logger.error(_desc + " received exception: " + e.getMessage(), e);
+ LOGGER.error(_desc + " received exception: " + e.getMessage(), e);
failAsyncTest(e.getMessage());
}
}
@@ -242,14 +242,14 @@ public class MultipleTransactedBatchProducerTest extends QpidBrokerTestCase
@Override
public void onException(JMSException e)
{
- _logger.error(_desc + " received exception: " + e.getMessage(), e);
+ LOGGER.error(_desc + " received exception: " + e.getMessage(), e);
failAsyncTest(e.getMessage());
}
}
private void failAsyncTest(String msg)
{
- _logger.error("Failing test because: " + msg);
+ LOGGER.error("Failing test because: " + msg);
_failMsg = msg;
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java b/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
index 0ae0556..21ed1e7 100644
--- a/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
+++ b/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
@@ -259,7 +259,7 @@ public class PriorityQueueTest extends QpidBrokerTestCase
private static class ReflectingMessageListener implements MessageListener
{
- private static final Logger _logger = LoggerFactory.getLogger(PriorityQueueTest.ReflectingMessageListener.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PriorityQueueTest.ReflectingMessageListener.class);
private Session _prodSess;
private Session _consSess;
@@ -285,7 +285,7 @@ public class PriorityQueueTest extends QpidBrokerTestCase
{
_latch.countDown();
long msgNum = _origCount - _latch.getCount();
- _logger.info("Received message " + msgNum + " with ID: " + message.getIntProperty("msg"));
+ LOGGER.info("Received message " + msgNum + " with ID: " + message.getIntProperty("msg"));
if(_latch.getCount() > 0)
{
@@ -302,7 +302,7 @@ public class PriorityQueueTest extends QpidBrokerTestCase
}
catch(Throwable t)
{
- _logger.error(t.getMessage(), t);
+ LOGGER.error(t.getMessage(), t);
_lastThrown = t;
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java b/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
index 0fc215d..062479c 100644
--- a/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
+++ b/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
@@ -52,7 +52,7 @@ import org.apache.qpid.test.utils.TestBrokerConfiguration;
public class ProducerFlowControlTest extends AbstractTestLogging
{
- private static final Logger _logger = LoggerFactory.getLogger(ProducerFlowControlTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ProducerFlowControlTest.class);
private Connection _producerConnection;
private Connection _consumerConnection;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java b/systests/src/test/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
index 8947d73..3383e7f 100644
--- a/systests/src/test/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
+++ b/systests/src/test/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
@@ -29,6 +29,9 @@ import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.qpid.QpidException;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
@@ -41,6 +44,8 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
*/
public class QueueDepthWithSelectorTest extends QpidBrokerTestCase
{
+ private static final Logger LOGGER = LoggerFactory.getLogger(QueueDepthWithSelectorTest.class);
+
protected final String VHOST = "test";
protected final String QUEUE = this.getClass().getName();
@@ -81,17 +86,17 @@ public class QueueDepthWithSelectorTest extends QpidBrokerTestCase
public void test() throws Exception
{
//Send messages
- _logger.info("Starting to send messages");
+ LOGGER.info("Starting to send messages");
for (int msg = 0; msg < MSG_COUNT; msg++)
{
_producer.send(nextMessage(msg));
}
- _logger.info("Closing connection");
+ LOGGER.info("Closing connection");
//Close the connection.. .giving the broker time to clean up its state.
_producerConnection.close();
//Verify we get all the messages.
- _logger.info("Verifying messages");
+ LOGGER.info("Verifying messages");
verifyAllMessagesRecevied(50);
verifyBrokerState(0);
@@ -99,7 +104,7 @@ public class QueueDepthWithSelectorTest extends QpidBrokerTestCase
_clientConnection.close();
//Verify Broker state
- _logger.info("Verifying broker state");
+ LOGGER.info("Verifying broker state");
verifyBrokerState(0);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java b/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
index 62b3882..918bdde 100644
--- a/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
+++ b/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
@@ -45,7 +45,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class TimeToLiveTest extends QpidBrokerTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(TimeToLiveTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TimeToLiveTest.class);
protected final String QUEUE = "TimeToLiveQueue";
@@ -162,9 +162,9 @@ public class TimeToLiveTest extends QpidBrokerTestCase
Message receivedThird = consumer.receive(_shortReceiveTimeout);
// Log the messages to help diagnosis incase of failure
- _logger.info("First:"+receivedFirst);
- _logger.info("Second:"+receivedSecond);
- _logger.info("Third:"+receivedThird);
+ LOGGER.info("First:"+receivedFirst);
+ LOGGER.info("Second:"+receivedSecond);
+ LOGGER.info("Third:"+receivedThird);
// Only first and last messages sent should survive expiry
Assert.assertNull("More messages received", receivedThird);
@@ -317,9 +317,9 @@ public class TimeToLiveTest extends QpidBrokerTestCase
Message receivedThird = durableSubscriber.receive(getShortReceiveTimeout());
// Log the messages to help diagnosis incase of failure
- _logger.info("First:"+receivedFirst);
- _logger.info("Second:"+receivedSecond);
- _logger.info("Third:"+receivedThird);
+ LOGGER.info("First:"+receivedFirst);
+ LOGGER.info("Second:"+receivedSecond);
+ LOGGER.info("Third:"+receivedThird);
// Only first and last messages sent should survive expiry
Assert.assertNull("More messages received", receivedThird);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java b/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
index 6f2c532..5a86be1 100644
--- a/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
@@ -42,7 +42,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
*/
public class CloseOnNoRouteForMandatoryMessageTest extends QpidBrokerTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(CloseOnNoRouteForMandatoryMessageTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(CloseOnNoRouteForMandatoryMessageTest.class);
private Connection _connection;
private UnroutableMessageTestExceptionListener _testExceptionListener = new UnroutableMessageTestExceptionListener();
@@ -70,7 +70,7 @@ public class CloseOnNoRouteForMandatoryMessageTest extends QpidBrokerTestCase
}
catch (IllegalStateException ise)
{
- _logger.debug("Caught exception", ise);
+ LOGGER.debug("Caught exception", ise);
//The session was marked closed even before we had a chance to call commit on it
assertTrue("ISE did not indicate closure", ise.getMessage().contains("closed"));
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java b/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
index 72225de..c2c7aeb 100644
--- a/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
@@ -31,6 +31,10 @@ import javax.jms.QueueBrowser;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.naming.NamingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.qpid.QpidException;
import org.apache.qpid.client.AMQDestination;
import org.apache.qpid.client.AMQSession;
@@ -38,6 +42,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class QueueBrowserAutoAckTest extends QpidBrokerTestCase
{
+ private static final Logger LOGGER = LoggerFactory.getLogger(QueueBrowserAutoAckTest.class);
protected Connection _clientConnection;
protected Session _clientSession;
protected Queue _queue;
@@ -125,14 +130,14 @@ public class QueueBrowserAutoAckTest extends QpidBrokerTestCase
{
// create QueueBrowser
- _logger.info("Creating Queue Browser");
+ LOGGER.info("Creating Queue Browser");
QueueBrowser queueBrowser = _clientSession.createBrowser(_queue);
// check for messages
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Checking for " + expectedDepth + " messages with QueueBrowser");
+ LOGGER.debug("Checking for " + expectedDepth + " messages with QueueBrowser");
}
//Check what the session believes the queue count to be.
@@ -161,9 +166,9 @@ public class QueueBrowserAutoAckTest extends QpidBrokerTestCase
msgCount++;
}
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Found " + msgCount + " messages total in browser");
+ LOGGER.debug("Found " + msgCount + " messages total in browser");
}
// check to see if all messages found
@@ -210,7 +215,7 @@ public class QueueBrowserAutoAckTest extends QpidBrokerTestCase
for (int count = 0; count < browserEnumerationCount; count++)
{
- _logger.info("Checking getEnumeration:" + count);
+ LOGGER.info("Checking getEnumeration:" + count);
Enumeration msgs = queueBrowser.getEnumeration();
int msgCount = 0;
@@ -309,7 +314,7 @@ public class QueueBrowserAutoAckTest extends QpidBrokerTestCase
MessageConsumer consumer = session.createConsumer(_queue);
- _logger.info("Verify messages are still on the queue");
+ LOGGER.info("Verify messages are still on the queue");
Message tempMsg;
@@ -325,7 +330,7 @@ public class QueueBrowserAutoAckTest extends QpidBrokerTestCase
//Close this new connection
connection.close();
- _logger.info("All messages received from queue");
+ LOGGER.info("All messages received from queue");
//ensure no message left.
checkQueueDepth(0);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/systests/src/test/java/org/apache/qpid/test/client/RollbackOrderTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/client/RollbackOrderTest.java b/systests/src/test/java/org/apache/qpid/test/client/RollbackOrderTest.java
index f649fde..ea3352e 100644
--- a/systests/src/test/java/org/apache/qpid/test/client/RollbackOrderTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/client/RollbackOrderTest.java
@@ -33,6 +33,8 @@ import javax.jms.Queue;
import javax.jms.Session;
import junit.framework.AssertionFailedError;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
@@ -87,7 +89,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
*/
public class RollbackOrderTest extends QpidBrokerTestCase
{
-
+ private static final Logger LOGGER = LoggerFactory.getLogger(RollbackOrderTest.class);
private Connection _connection;
private Queue _queue;
private Session _session;
@@ -153,7 +155,7 @@ public class RollbackOrderTest extends QpidBrokerTestCase
}
catch (JMSException e)
{
- _logger.error("Error:" + e.getMessage(), e);
+ LOGGER.error("Error:" + e.getMessage(), e);
exceptions[(int)count.getCount()] = e;
}
catch (AssertionFailedError cf)
@@ -164,7 +166,7 @@ public class RollbackOrderTest extends QpidBrokerTestCase
count.countDown();
}
- _logger.error("Error:" + cf.getMessage(), cf);
+ LOGGER.error("Error:" + cf.getMessage(), cf);
failed.set(true);
}
}
@@ -179,7 +181,7 @@ public class RollbackOrderTest extends QpidBrokerTestCase
{
if (e != null)
{
- _logger.error("Encountered exception", e);
+ LOGGER.error("Encountered exception", e);
failed.set(true);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org