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:26 UTC
[5/6] qpid-broker-j git commit: NO-JIRA: [Broker-J] Standardise the
name of the static LOGGER field across source code - no functional change
NO-JIRA: [Broker-J] Standardise the name of the static LOGGER field across source code - no functional change
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/7884dc92
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/7884dc92
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/7884dc92
Branch: refs/heads/master
Commit: 7884dc92a0c6dfb2fac8150298806b0697de7668
Parents: 2422183
Author: Keith Wall <ke...@gmail.com>
Authored: Fri Oct 27 21:55:38 2017 +0100
Committer: Keith Wall <ke...@gmail.com>
Committed: Sun Oct 29 07:34:11 2017 +0000
----------------------------------------------------------------------
.../upgrade/AbstractStoreUpgrade.java | 16 +-
.../berkeleydb/upgrade/CursorOperation.java | 4 +-
.../berkeleydb/upgrade/DatabaseTemplate.java | 4 +-
.../berkeleydb/upgrade/UpgradeFrom4To5.java | 34 +--
.../berkeleydb/upgrade/UpgradeFrom5To6.java | 32 +--
.../berkeleydb/BDBStoreUpgradeTestPreparer.java | 8 +-
.../berkeleydb/upgrade/UpgradeFrom5To6Test.java | 4 +-
.../server/store/berkeleydb/BDBUpgradeTest.java | 2 +-
.../qpid/server/exchange/AbstractExchange.java | 6 +-
.../server/exchange/DirectExchangeImpl.java | 4 +-
.../server/exchange/FanoutExchangeImpl.java | 4 +-
.../qpid/server/exchange/HeadersBinding.java | 8 +-
.../server/exchange/HeadersExchangeImpl.java | 8 +-
.../qpid/server/exchange/TopicExchangeImpl.java | 8 +-
.../server/filter/FilterManagerFactory.java | 4 +-
.../filter/JMSMessagePropertyExpression.java | 6 +-
.../qpid/server/filter/JMSSelectorFilter.java | 6 +-
.../qpid/server/message/RoutingResult.java | 6 +-
.../qpid/server/plugin/QpidServiceLoader.java | 4 +-
.../server/protocol/v0_8/AMQShortString.java | 2 +-
.../server/protocol/v0_8/EncodingUtils.java | 2 +-
.../qpid/server/protocol/v0_8/FieldTable.java | 10 +-
.../apache/qpid/server/queue/AbstractQueue.java | 10 +-
.../Base64MD5PasswordFilePrincipalDatabase.java | 4 +-
.../PlainPasswordFilePrincipalDatabase.java | 4 +-
.../manager/SimpleAuthenticationManager.java | 2 +-
.../SimpleLDAPAuthenticationManagerImpl.java | 22 +-
.../apache/qpid/server/store/EventManager.java | 6 +-
.../transport/AbstractAMQPConnection.java | 6 +-
.../transport/MultiVersionProtocolEngine.java | 12 +-
.../MultiVersionProtocolEngineFactory.java | 4 +-
.../server/txn/AsyncAutoCommitTransaction.java | 10 +-
.../qpid/server/txn/AutoCommitTransaction.java | 10 +-
.../org/apache/qpid/server/txn/DtxBranch.java | 26 +--
.../qpid/server/txn/LocalTransaction.java | 22 +-
.../server/virtualhost/AbstractVirtualHost.java | 30 +--
.../AsynchronousMessageStoreRecoverer.java | 14 +-
.../SynchronousMessageStoreRecoverer.java | 16 +-
.../server/queue/AbstractQueueTestBase.java | 2 +-
.../store/MessageStoreQuotaEventsTestBase.java | 4 +-
.../security/access/config/AclFileParser.java | 4 +-
.../access/config/AclRulePredicates.java | 4 +-
.../access/config/RuleBasedAccessControl.java | 8 +-
.../server/security/access/config/RuleSet.java | 16 +-
.../access/firewall/HostnameFirewallRule.java | 12 +-
.../access/firewall/NetworkFirewallRule.java | 10 +-
.../protocol/v0_10/AMQPConnection_0_10Impl.java | 2 +-
...ExplicitAcceptDispositionChangeListener.java | 2 +-
...ImplicitAcceptDispositionChangeListener.java | 4 +-
.../qpid/server/protocol/v0_8/AMQChannel.java | 214 +++++++++----------
.../protocol/v0_8/AMQPConnection_0_8Impl.java | 68 +++---
.../server/protocol/v0_8/BrokerDecoder.java | 8 +-
.../transport/BasicContentHeaderProperties.java | 6 +-
.../apache/qpid/server/url/AMQBindingURL.java | 10 +-
.../qpid/server/url/BindingURLParser.java | 4 +-
.../protocol/v1_0/MessageMetaData_1_0.java | 2 +-
.../qpid/server/protocol/v1_0/Session_1_0.java | 8 +-
.../store/jdbc/GenericJDBCMessageStore.java | 6 +-
.../logback/BrokerLogbackSocketLoggerImpl.java | 4 +-
.../logging/logback/AppenderUtilsTest.java | 4 +-
.../server/management/plugin/DojoHelper.java | 16 +-
.../management/plugin/HttpManagement.java | 16 +-
.../qpid/disttest/db/ResultsDbWriter.java | 12 +-
.../chartbuilder/ChartProductionTest.java | 4 +-
.../org/apache/qpid/test/utils/PortHelper.java | 10 +-
.../apache/qpid/test/utils/QpidTestCase.java | 34 +--
.../qpid/test/utils/QpidBrokerTestCase.java | 16 +-
.../client/failover/FailoverBehaviourTest.java | 22 +-
.../failover/MultipleBrokersFailoverTest.java | 4 +-
.../client/prefetch/PrefetchBehaviourTest.java | 12 +-
.../org/apache/qpid/client/ssl/SSLTest.java | 2 +-
.../ReturnUnroutableMandatoryMessageTest.java | 32 +--
.../server/logging/ConsumerLoggingTest.java | 7 +-
.../MultipleTransactedBatchProducerTest.java | 14 +-
.../qpid/server/queue/PriorityQueueTest.java | 6 +-
.../server/queue/ProducerFlowControlTest.java | 2 +-
.../queue/QueueDepthWithSelectorTest.java | 13 +-
.../qpid/server/queue/TimeToLiveTest.java | 14 +-
.../CloseOnNoRouteForMandatoryMessageTest.java | 4 +-
.../test/client/QueueBrowserAutoAckTest.java | 21 +-
.../qpid/test/client/RollbackOrderTest.java | 10 +-
.../UnroutableMessageTestExceptionListener.java | 4 +-
.../AddressBasedDestinationTest.java | 4 +-
.../qpid/test/client/failover/FailoverTest.java | 64 +++---
.../qpid/test/client/message/SelectorTest.java | 18 +-
.../test/unit/ack/AcknowledgeOnMessageTest.java | 15 +-
.../apache/qpid/test/unit/ack/RecoverTest.java | 40 ++--
.../qpid/test/unit/basic/BytesMessageTest.java | 4 +-
.../test/unit/basic/FieldTableMessageTest.java | 4 +-
.../qpid/test/unit/basic/LargeMessageTest.java | 6 +-
.../qpid/test/unit/basic/MapMessageTest.java | 6 +-
.../test/unit/basic/MultipleConnectionTest.java | 4 +-
.../qpid/test/unit/basic/ObjectMessageTest.java | 4 +-
.../qpid/test/unit/basic/PropertyValueTest.java | 16 +-
.../qpid/test/unit/basic/SessionStartTest.java | 4 +-
.../qpid/test/unit/basic/TextMessageTest.java | 12 +-
.../qpid/test/unit/basic/close/CloseTest.java | 6 +-
.../test/unit/client/MaxDeliveryCountTest.java | 14 +-
.../unit/client/message/ObjectMessageTest.java | 10 +-
.../test/unit/ct/DurableSubscriberTest.java | 20 +-
.../test/unit/message/StreamMessageTest.java | 6 +-
.../unit/topic/DurableSubscriptionTest.java | 76 +++----
.../qpid/test/unit/topic/TopicSessionTest.java | 8 +-
.../unit/transacted/CommitRollbackTest.java | 84 ++++----
.../test/unit/transacted/TransactedTest.java | 112 +++++-----
.../qpid/test/utils/FailoverBaseCase.java | 4 +-
.../qpid/transport/ProtocolNegotiationTest.java | 10 +-
.../java/org/apache/qpid/util/LogMonitor.java | 4 +-
108 files changed, 821 insertions(+), 791 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java
index 4a53a00..ec10a32 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java
@@ -30,14 +30,14 @@ import org.slf4j.LoggerFactory;
public abstract class AbstractStoreUpgrade implements StoreUpgrade
{
- private static final Logger _logger = LoggerFactory.getLogger(AbstractStoreUpgrade.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractStoreUpgrade.class);
protected void reportFinished(Environment environment, int version)
{
- _logger.info("Completed upgrade to version " + version);
- if (_logger.isDebugEnabled())
+ LOGGER.info("Completed upgrade to version " + version);
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Upgraded:");
+ LOGGER.debug("Upgraded:");
reportDatabaseRowCount(environment);
}
}
@@ -47,16 +47,16 @@ public abstract class AbstractStoreUpgrade implements StoreUpgrade
List<String> databases = environment.getDatabaseNames();
for (String database : databases)
{
- _logger.debug(" " + getRowCount(database, environment) + " rows in " + database);
+ LOGGER.debug(" " + getRowCount(database, environment) + " rows in " + database);
}
}
protected void reportStarting(Environment environment, int version)
{
- _logger.info("Starting store upgrade from version " + version);
- if (_logger.isDebugEnabled())
+ LOGGER.info("Starting store upgrade from version " + version);
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Upgrading:");
+ LOGGER.debug("Upgrading:");
reportDatabaseRowCount(environment);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java
index 59573ee..dad99fc 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
public abstract class CursorOperation implements DatabaseRunnable
{
- private static final Logger _logger = LoggerFactory.getLogger(CursorOperation.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(CursorOperation.class);
private CursorTemplate _template;
private long _rowCount;
@@ -49,7 +49,7 @@ public abstract class CursorOperation implements DatabaseRunnable
CursorOperation.this.processEntry(database, targetDatabase, transaction, key, value);
if (getProcessedCount() % 1000 == 0)
{
- _logger.info("Processed " + getProcessedCount() + " records of " + getRowCount() + ".");
+ LOGGER.info("Processed " + getProcessedCount() + " records of " + getRowCount() + ".");
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java
index 464f4b4..4023aa3 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
public class DatabaseTemplate
{
- private static final Logger _logger = LoggerFactory.getLogger(DatabaseTemplate.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseTemplate.class);
private Environment _environment;
private String _sourceDatabaseName;
@@ -106,7 +106,7 @@ public class DatabaseTemplate
}
catch (Exception e)
{
- _logger.error("Unable to close database", e);
+ LOGGER.error("Unable to close database", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
index b3e376f..9cc604d 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
@@ -72,7 +72,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
private static final byte COLON = (byte) ':';
- private static final Logger _logger = LoggerFactory.getLogger(UpgradeFrom4To5.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(UpgradeFrom4To5.class);
@Override
public void performUpgrade(final Environment environment, final UpgradeInteractionHandler handler, ConfiguredObject<?> parent)
@@ -101,7 +101,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
{
if (environment.getDatabaseNames().contains(OLD_BINDINGS_DB_NAME))
{
- _logger.info("Queue Bindings");
+ LOGGER.info("Queue Bindings");
final BindingTuple bindingTuple = new BindingTuple();
CursorOperation databaseOperation = new CursorOperation()
{
@@ -118,9 +118,9 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
AMQShortString routingKey = oldBindingRecord.getRoutingKey();
FieldTable arguments = oldBindingRecord.getArguments();
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug(String.format(
+ LOGGER.debug(String.format(
"Processing binding for queue %s, exchange %s, routingKey %s arguments %s", queueName,
exchangeName, routingKey, arguments));
}
@@ -138,9 +138,9 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
AMQShortString selectorFilterKey = AMQShortString.valueOf(AMQPFilterTypes.JMS_SELECTOR.getValue());
if (!arguments.containsKey(selectorFilterKey))
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.info("adding the empty string (i.e. 'no selector') value for " + queueName
+ LOGGER.info("adding the empty string (i.e. 'no selector') value for " + queueName
+ " and exchange " + exchangeName);
}
arguments.put(selectorFilterKey, "");
@@ -153,14 +153,14 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
new DatabaseTemplate(environment, OLD_BINDINGS_DB_NAME, NEW_BINDINGS_DB_NAME, transaction)
.run(databaseOperation);
environment.removeDatabase(transaction, OLD_BINDINGS_DB_NAME);
- _logger.info(databaseOperation.getRowCount() + " Queue Binding entries");
+ LOGGER.info(databaseOperation.getRowCount() + " Queue Binding entries");
}
}
private Set<String> upgradeQueues(final Environment environment, final UpgradeInteractionHandler handler,
List<AMQShortString> potentialDurableSubs, Transaction transaction)
{
- _logger.info("Queues");
+ LOGGER.info("Queues");
final Set<String> existingQueues = new HashSet<String>();
if (environment.getDatabaseNames().contains(OLD_QUEUE_DB_NAME))
{
@@ -181,7 +181,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
};
new DatabaseTemplate(environment, OLD_QUEUE_DB_NAME, NEW_QUEUE_DB_NAME, transaction).run(databaseOperation);
environment.removeDatabase(transaction, OLD_QUEUE_DB_NAME);
- _logger.info(databaseOperation.getRowCount() + " Queue entries");
+ LOGGER.info(databaseOperation.getRowCount() + " Queue entries");
}
return existingQueues;
}
@@ -216,7 +216,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
final Set<Long> messagesToDiscard = new HashSet<Long>();
final Set<String> queuesToDiscard = new HashSet<String>();
final QueueEntryKeyBinding queueEntryKeyBinding = new QueueEntryKeyBinding();
- _logger.info("Delivery Records");
+ LOGGER.info("Delivery Records");
CursorOperation databaseOperation = new CursorOperation()
{
@@ -290,7 +290,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
};
new DatabaseTemplate(environment, NEW_DELIVERY_DB, transaction).run(databaseOperation);
}
- _logger.info(databaseOperation.getRowCount() + " Delivery Records entries ");
+ LOGGER.info(databaseOperation.getRowCount() + " Delivery Records entries ");
environment.removeDatabase(transaction, OLD_DELIVERY_DB);
return messagesToDiscard;
@@ -357,7 +357,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
private void upgradeMetaData(final Environment environment, final UpgradeInteractionHandler handler,
final Set<Long> messagesToDiscard, Transaction transaction)
{
- _logger.info("Message MetaData");
+ LOGGER.info("Message MetaData");
if (environment.getDatabaseNames().contains(OLD_METADATA_DB_NAME))
{
final MessageMetaDataBinding binding = new MessageMetaDataBinding();
@@ -391,14 +391,14 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
new DatabaseTemplate(environment, OLD_METADATA_DB_NAME, NEW_METADATA_DB_NAME, transaction)
.run(databaseOperation);
environment.removeDatabase(transaction, OLD_METADATA_DB_NAME);
- _logger.info(databaseOperation.getRowCount() + " Message MetaData entries");
+ LOGGER.info(databaseOperation.getRowCount() + " Message MetaData entries");
}
}
private void upgradeContent(final Environment environment, final UpgradeInteractionHandler handler,
final Set<Long> messagesToDiscard, Transaction transaction)
{
- _logger.info("Message Contents");
+ LOGGER.info("Message Contents");
if (environment.getDatabaseNames().contains(OLD_CONTENT_DB_NAME))
{
final MessageContentKeyBinding keyBinding = new MessageContentKeyBinding();
@@ -447,7 +447,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
};
new DatabaseTemplate(environment, OLD_CONTENT_DB_NAME, NEW_CONTENT_DB_NAME, transaction).run(cursorOperation);
environment.removeDatabase(transaction, OLD_CONTENT_DB_NAME);
- _logger.info(cursorOperation.getRowCount() + " Message Content entries");
+ LOGGER.info(cursorOperation.getRowCount() + " Message Content entries");
}
}
@@ -463,7 +463,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
if (dbName.endsWith("_v4"))
{
String newName = dbName.substring(0, dbName.length() - 3) + "_v5";
- _logger.info("Renaming " + dbName + " into " + newName);
+ LOGGER.info("Renaming " + dbName + " into " + newName);
environment.renameDatabase(transaction, dbName, newName);
}
}
@@ -648,7 +648,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
}
catch (Exception e)
{
- _logger.error("Error converting entry to object: " + e, e);
+ LOGGER.error("Error converting entry to object: " + e, e);
// annoyingly just have to return null since we cannot throw
return null;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
index ffdcd09..68287b6 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
@@ -68,7 +68,7 @@ import org.apache.qpid.server.store.berkeleydb.FieldTableEncoding;
public class UpgradeFrom5To6 extends AbstractStoreUpgrade
{
- private static final Logger _logger = LoggerFactory.getLogger(UpgradeFrom5To6.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(UpgradeFrom5To6.class);
static final String OLD_CONTENT_DB_NAME = "messageContentDb_v5";
static final String NEW_CONTENT_DB_NAME = "MESSAGE_CONTENT";
@@ -160,7 +160,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
String newName = newDatabases[i];
if (databases.contains(oldName))
{
- _logger.info("Renaming " + oldName + " into " + newName);
+ LOGGER.info("Renaming " + oldName + " into " + newName);
environment.renameDatabase(transaction, oldName, newName);
}
}
@@ -169,7 +169,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
private void upgradeMessages(final Environment environment, final UpgradeInteractionHandler handler,
final Transaction transaction)
{
- _logger.info("Message Contents");
+ LOGGER.info("Message Contents");
if (environment.getDatabaseNames().contains(OLD_CONTENT_DB_NAME))
{
DatabaseRunnable contentOperation = new DatabaseRunnable()
@@ -192,7 +192,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
};
new DatabaseTemplate(environment, OLD_META_DATA_DB_NAME, contentTransaction)
.run(metaDataDatabaseOperation);
- _logger.info(metaDataDatabaseOperation.getRowCount() + " Message Content Entries");
+ LOGGER.info(metaDataDatabaseOperation.getRowCount() + " Message Content Entries");
}
};
new DatabaseTemplate(environment, OLD_CONTENT_DB_NAME, NEW_CONTENT_DB_NAME, transaction).run(contentOperation);
@@ -244,7 +244,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
oldMetadataDatabase.delete(txn, key);
return;
case ABORT:
- _logger.error(message);
+ LOGGER.error(message);
throw new StoreException("Unable to upgrade message " + messageId);
}
@@ -325,7 +325,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
{
if (environment.getDatabaseNames().contains(OLD_XID_DB_NAME))
{
- _logger.info("Xid Records");
+ LOGGER.info("Xid Records");
final OldPreparedTransactionBinding oldTransactionBinding = new OldPreparedTransactionBinding();
final NewPreparedTransactionBinding newTransactionBinding = new NewPreparedTransactionBinding();
CursorOperation xidEntriesCursor = new CursorOperation()
@@ -368,13 +368,13 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
};
new DatabaseTemplate(environment, OLD_XID_DB_NAME, NEW_XID_DB_NAME, transaction).run(xidEntriesCursor);
environment.removeDatabase(transaction, OLD_XID_DB_NAME);
- _logger.info(xidEntriesCursor.getRowCount() + " Xid Entries");
+ LOGGER.info(xidEntriesCursor.getRowCount() + " Xid Entries");
}
}
private void upgradeQueueEntries(Environment environment, Transaction transaction, final String virtualHostName)
{
- _logger.info("Queue Delivery Records");
+ LOGGER.info("Queue Delivery Records");
if (environment.getDatabaseNames().contains(OLD_DELIVERY_DB_NAME))
{
final OldQueueEntryBinding oldBinding = new OldQueueEntryBinding();
@@ -397,13 +397,13 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
new DatabaseTemplate(environment, OLD_DELIVERY_DB_NAME, NEW_DELIVERY_DB_NAME, transaction)
.run(queueEntriesCursor);
environment.removeDatabase(transaction, OLD_DELIVERY_DB_NAME);
- _logger.info(queueEntriesCursor.getRowCount() + " Queue Delivery Record Entries");
+ LOGGER.info(queueEntriesCursor.getRowCount() + " Queue Delivery Record Entries");
}
}
private void upgradeQueueBindings(Environment environment, Transaction transaction, final UpgradeInteractionHandler handler, final String virtualHostName)
{
- _logger.info("Queue Bindings");
+ LOGGER.info("Queue Bindings");
if (environment.getDatabaseNames().contains(OLD_QUEUE_BINDINGS_DB_NAME))
{
final QueueBindingBinding binding = new QueueBindingBinding();
@@ -432,14 +432,14 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
new DatabaseTemplate(environment, OLD_QUEUE_BINDINGS_DB_NAME, CONFIGURED_OBJECTS_DB_NAME, transaction)
.run(bindingCursor);
environment.removeDatabase(transaction, OLD_QUEUE_BINDINGS_DB_NAME);
- _logger.info(bindingCursor.getRowCount() + " Queue Binding Entries");
+ LOGGER.info(bindingCursor.getRowCount() + " Queue Binding Entries");
}
}
private List<String> upgradeExchanges(Environment environment, Transaction transaction, final String virtualHostName)
{
final List<String> exchangeNames = new ArrayList<String>();
- _logger.info("Exchanges");
+ LOGGER.info("Exchanges");
if (environment.getDatabaseNames().contains(OLD_EXCHANGE_DB_NAME))
{
final ExchangeBinding exchangeBinding = new ExchangeBinding();
@@ -468,7 +468,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
new DatabaseTemplate(environment, OLD_EXCHANGE_DB_NAME, CONFIGURED_OBJECTS_DB_NAME, transaction)
.run(exchangeCursor);
environment.removeDatabase(transaction, OLD_EXCHANGE_DB_NAME);
- _logger.info(exchangeCursor.getRowCount() + " Exchange Entries");
+ LOGGER.info(exchangeCursor.getRowCount() + " Exchange Entries");
}
return exchangeNames;
}
@@ -476,7 +476,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
private List<String> upgradeQueues(Environment environment, Transaction transaction, final String virtualHostName)
{
final List<String> queueNames = new ArrayList<String>();
- _logger.info("Queues");
+ LOGGER.info("Queues");
if (environment.getDatabaseNames().contains(OLD_QUEUE_DB_NAME))
{
final UpgradeQueueBinding queueBinding = new UpgradeQueueBinding();
@@ -501,7 +501,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
};
new DatabaseTemplate(environment, OLD_QUEUE_DB_NAME, CONFIGURED_OBJECTS_DB_NAME, transaction).run(queueCursor);
environment.removeDatabase(transaction, OLD_QUEUE_DB_NAME);
- _logger.info(queueCursor.getRowCount() + " Queue Entries");
+ LOGGER.info(queueCursor.getRowCount() + " Queue Entries");
}
return queueNames;
}
@@ -544,7 +544,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
if (moveNonExclusiveOwnerToDescription(owner, exclusive))
{
- _logger.info("Non-exclusive owner " + owner + " for queue " + queueName + " moved to " + QueueArgumentsConverter.X_QPID_DESCRIPTION);
+ LOGGER.info("Non-exclusive owner " + owner + " for queue " + queueName + " moved to " + QueueArgumentsConverter.X_QPID_DESCRIPTION);
attributesMap.put(Queue.OWNER, null);
argumentsCopy.put(AMQShortString.valueOf(QueueArgumentsConverter.X_QPID_DESCRIPTION), owner);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
index a537f66..1cff8f2 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
@@ -61,7 +61,7 @@ import org.apache.qpid.url.URLSyntaxException;
*/
public class BDBStoreUpgradeTestPreparer
{
- private static final Logger _logger = LoggerFactory.getLogger(BDBStoreUpgradeTestPreparer.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BDBStoreUpgradeTestPreparer.class);
public static final String TOPIC_NAME="myUpgradeTopic";
public static final String SUB_NAME="myDurSubName";
@@ -134,7 +134,7 @@ public class BDBStoreUpgradeTestPreparer
@Override
public void onException(JMSException e)
{
- _logger.error("Error setting exception listener for connection", e);
+ LOGGER.error("Error setting exception listener for connection", e);
}
});
// Create a session on the connection, transacted to confirm delivery
@@ -256,7 +256,7 @@ public class BDBStoreUpgradeTestPreparer
@Override
public void onException(JMSException e)
{
- _logger.error("Error setting exception listener for connection", e);
+ LOGGER.error("Error setting exception listener for connection", e);
}
});
// Create a session on the connection, transacted to confirm delivery
@@ -302,7 +302,7 @@ public class BDBStoreUpgradeTestPreparer
@Override
public void onException(JMSException e)
{
- _logger.error("Error setting exception listener for connection", e);
+ LOGGER.error("Error setting exception listener for connection", e);
}
});
// Create a session on the connection, transacted to confirm delivery
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
index e5a4c6c..6d6ab77 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
@@ -75,7 +75,7 @@ import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom5To6.UpgradeUU
public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(UpgradeFrom5To6Test.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(UpgradeFrom5To6Test.class);
private static final String ARGUMENTS = "arguments";
@Override
@@ -250,7 +250,7 @@ public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase
DatabaseEntry newKey = new DatabaseEntry();
binding.objectToEntry(corruptedCompoundKey, newKey);
- _logger.info("Deliberately corrupted message id " + originalCompoundKey.getMessageId()
+ LOGGER.info("Deliberately corrupted message id " + originalCompoundKey.getMessageId()
+ ", changed offset from " + originalCompoundKey.getOffset() + " to "
+ corruptedCompoundKey.getOffset());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
index e123722..7b5c345 100644
--- a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
+++ b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
@@ -71,7 +71,7 @@ import org.apache.qpid.util.FileUtils;
*/
public class BDBUpgradeTest extends QpidBrokerTestCase
{
- protected static final Logger _logger = LoggerFactory.getLogger(BDBUpgradeTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BDBUpgradeTest.class);
private static final String STRING_1024 = generateString(1024);
private static final String STRING_1024_256 = generateString(1024*256);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index b67f6ef..897878d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -90,7 +90,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
extends AbstractConfiguredObject<T>
implements Exchange<T>
{
- private static final Logger _logger = LoggerFactory.getLogger(AbstractExchange.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractExchange.class);
private static final ThreadLocal<Map<AbstractExchange<?>, Set<String>>> CURRENT_ROUTING = new ThreadLocal<>();
@@ -248,7 +248,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
}
else
{
- _logger.warn("Cannot find alternate binding destination '{}' for exchange '{}'", alternateDestination, toString());
+ LOGGER.warn("Cannot find alternate binding destination '{}' for exchange '{}'", alternateDestination, toString());
}
}
@@ -879,7 +879,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
{
if (isAutoDeletePending())
{
- _logger.debug("Auto-deleting exchange: {}", this);
+ LOGGER.debug("Auto-deleting exchange: {}", this);
delete();
return true;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java
index 3f4d6e8..4683042 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java
@@ -46,7 +46,7 @@ import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class DirectExchangeImpl extends AbstractExchange<DirectExchangeImpl> implements DirectExchange<DirectExchangeImpl>
{
- private static final Logger _logger = LoggerFactory.getLogger(DirectExchangeImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DirectExchangeImpl.class);
private final class BindingSet
{
@@ -124,7 +124,7 @@ public class DirectExchangeImpl extends AbstractExchange<DirectExchangeImpl> imp
}
catch (AMQInvalidArgumentException e)
{
- _logger.warn(
+ LOGGER.warn(
"Binding ignored: cannot parse filter on binding of destination '{}' to exchange '{}' with arguments: {}",
destination.getName(),
DirectExchangeImpl.this.getName(),
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java
index a950022..4c64b53 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java
@@ -45,7 +45,7 @@ import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
class FanoutExchangeImpl extends AbstractExchange<FanoutExchangeImpl> implements FanoutExchange<FanoutExchangeImpl>
{
- private static final Logger _logger = LoggerFactory.getLogger(FanoutExchangeImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(FanoutExchangeImpl.class);
private final class BindingSet
{
@@ -94,7 +94,7 @@ class FanoutExchangeImpl extends AbstractExchange<FanoutExchangeImpl> implements
}
catch (AMQInvalidArgumentException e)
{
- _logger.warn(
+ LOGGER.warn(
"Binding ignored: cannot parse filter on binding of destination '{}' to exchange '{}' with arguments: {}",
destination.getName(),
FanoutExchangeImpl.this.getName(),
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
index c14e03e..5fb5329 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
@@ -42,7 +42,7 @@ import org.apache.qpid.server.model.Binding;
*/
class HeadersBinding
{
- private static final Logger _logger = LoggerFactory.getLogger(HeadersBinding.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(HeadersBinding.class);
private final Map<String,Object> _mappings;
private final AbstractExchange.BindingIdentifier _binding;
@@ -87,7 +87,7 @@ class HeadersBinding
}
catch (AMQInvalidArgumentException e)
{
- _logger.warn("Invalid filter in binding queue '"+_binding.getDestination().getName()
+ LOGGER.warn("Invalid filter in binding queue '"+_binding.getDestination().getName()
+"' with arguments: " + _mappings);
_filter = new FilterManager();
@@ -215,7 +215,7 @@ class HeadersBinding
}
else
{
- _logger.warn("Ignoring special header: " + key);
+ LOGGER.warn("Ignoring special header: " + key);
}
}
@@ -232,7 +232,7 @@ class HeadersBinding
return false;
}
}
- _logger.warn("Ignoring unrecognised match type: " + value);
+ LOGGER.warn("Ignoring unrecognised match type: " + value);
return false;//default to all
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java
index 65eabb3..4bf7a75 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java
@@ -67,7 +67,7 @@ import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class HeadersExchangeImpl extends AbstractExchange<HeadersExchangeImpl> implements HeadersExchange<HeadersExchangeImpl>
{
- private static final Logger _logger = LoggerFactory.getLogger(HeadersExchangeImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(HeadersExchangeImpl.class);
private final Set<HeadersBinding> _bindingHeaderMatchers = Collections.newSetFromMap(new ConcurrentHashMap<>());
@@ -83,7 +83,7 @@ public class HeadersExchangeImpl extends AbstractExchange<HeadersExchangeImpl> i
final InstanceProperties instanceProperties,
RoutingResult<M> routingResult)
{
- _logger.debug("Exchange {}: routing message with headers {}", getName(), payload.getMessageHeader());
+ LOGGER.debug("Exchange {}: routing message with headers {}", getName(), payload.getMessageHeader());
for (HeadersBinding hb : _bindingHeaderMatchers)
{
@@ -91,9 +91,9 @@ public class HeadersExchangeImpl extends AbstractExchange<HeadersExchangeImpl> i
{
MessageDestination destination = hb.getBinding().getDestination();
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Exchange '{}' delivering message with headers '{}' to '{}'",
+ LOGGER.debug("Exchange '{}' delivering message with headers '{}' to '{}'",
getName(), payload.getMessageHeader(), destination.getName());
}
String actualRoutingKey = hb.getReplacementRoutingKey() == null
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeImpl.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeImpl.java
index 66933ec..39b4718 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeImpl.java
@@ -49,7 +49,7 @@ import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
class TopicExchangeImpl extends AbstractExchange<TopicExchangeImpl> implements TopicExchange<TopicExchangeImpl>
{
- private static final Logger _logger = LoggerFactory.getLogger(TopicExchangeImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TopicExchangeImpl.class);
private final TopicParser _parser = new TopicParser();
@@ -69,7 +69,7 @@ class TopicExchangeImpl extends AbstractExchange<TopicExchangeImpl> implements T
final String bindingKey = binding.getBindingKey();
final MessageDestination destination = binding.getDestination();
- _logger.debug("Updating binding of queue {} with routing key {}", destination.getName(), bindingKey);
+ LOGGER.debug("Updating binding of queue {} with routing key {}", destination.getName(), bindingKey);
String routingKey = TopicNormalizer.normalize(bindingKey);
@@ -92,7 +92,7 @@ class TopicExchangeImpl extends AbstractExchange<TopicExchangeImpl> implements T
final String bindingKey = binding.getBindingKey();
MessageDestination messageDestination = binding.getDestination();
- _logger.debug("Registering messageDestination {} with routing key {}", messageDestination.getName(), bindingKey);
+ LOGGER.debug("Registering messageDestination {} with routing key {}", messageDestination.getName(), bindingKey);
String routingKey = TopicNormalizer.normalize(bindingKey);
TopicExchangeResult result = _topicExchangeResults.get(routingKey);
@@ -163,7 +163,7 @@ class TopicExchangeImpl extends AbstractExchange<TopicExchangeImpl> implements T
{
Map<String,Object> bindingArgs = _bindings.remove(binding);
- _logger.debug("deregisterQueue args: {}", bindingArgs);
+ LOGGER.debug("deregisterQueue args: {}", bindingArgs);
String bindingKey = TopicNormalizer.normalize(binding.getBindingKey());
TopicExchangeResult result = _topicExchangeResults.get(bindingKey);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java b/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
index 16bd4c5..b278db0 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
@@ -32,7 +32,7 @@ import org.apache.qpid.server.filter.selector.TokenMgrError;
public class FilterManagerFactory
{
- private final static Logger _logger = LoggerFactory.getLogger(FilterManagerFactory.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(FilterManagerFactory.class);
private FilterManagerFactory()
{
@@ -69,7 +69,7 @@ public class FilterManagerFactory
}
else
{
- _logger.debug("No Filters found.");
+ LOGGER.debug("No Filters found.");
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java b/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
index 9fcf645..c94dd0d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
@@ -48,7 +48,7 @@ public class JMSMessagePropertyExpression implements PropertyExpression<Filterab
private static final int DEFAULT_PRIORITY = 4;
- private static final Logger _logger = LoggerFactory.getLogger(JMSMessagePropertyExpression.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(JMSMessagePropertyExpression.class);
private static final HashMap<String, Expression> JMS_PROPERTY_EXPRESSIONS = new HashMap<String, Expression>();
static
@@ -188,9 +188,9 @@ public class JMSMessagePropertyExpression implements PropertyExpression<Filterab
{
JMSDeliveryMode mode = message.isPersistent() ? JMSDeliveryMode.PERSISTENT :
JMSDeliveryMode.NON_PERSISTENT;
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("JMSDeliveryMode is :" + mode);
+ LOGGER.debug("JMSDeliveryMode is :" + mode);
}
return mode.toString();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java b/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
index 4094a42..3e85861 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
@@ -32,7 +32,7 @@ import org.apache.qpid.server.plugin.PluggableService;
@PluggableService
public class JMSSelectorFilter implements MessageFilter
{
- private final static Logger _logger = LoggerFactory.getLogger(JMSSelectorFilter.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(JMSSelectorFilter.class);
private String _selector;
private BooleanExpression _matcher;
@@ -56,9 +56,9 @@ public class JMSSelectorFilter implements MessageFilter
{
boolean match = _matcher.matches(message);
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug(message + " match(" + match + ") selector(" + System.identityHashCode(_selector) + "):" + _selector);
+ LOGGER.debug(message + " match(" + match + ") selector(" + System.identityHashCode(_selector) + "):" + _selector);
}
return match;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java b/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
index 7f0979e..5231679 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
@@ -39,7 +39,7 @@ import org.apache.qpid.server.util.Action;
public class RoutingResult<M extends ServerMessage<? extends StorableMessageMetaData>>
{
- private static final Logger _logger = LoggerFactory.getLogger(RoutingResult.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(RoutingResult.class);
private final M _message;
@@ -55,7 +55,7 @@ public class RoutingResult<M extends ServerMessage<? extends StorableMessageMeta
{
if(q.isDeleted())
{
- _logger.debug("Attempt to enqueue message onto deleted queue {}", q.getName());
+ LOGGER.debug("Attempt to enqueue message onto deleted queue {}", q.getName());
}
else
{
@@ -75,7 +75,7 @@ public class RoutingResult<M extends ServerMessage<? extends StorableMessageMeta
deletedQueues = true;
queues = new ArrayList<>(queues);
}
- _logger.debug("Attempt to enqueue message onto deleted queue {}", q.getName());
+ LOGGER.debug("Attempt to enqueue message onto deleted queue {}", q.getName());
queues.remove(q);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java b/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
index 9cdda22..662dd95 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
@@ -36,7 +36,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException;
*/
public class QpidServiceLoader
{
- private static final Logger _logger = LoggerFactory.getLogger(QpidServiceLoader.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(QpidServiceLoader.class);
public <C extends Pluggable> Iterable<C> instancesOf(Class<C> clazz)
{
@@ -82,7 +82,7 @@ public class QpidServiceLoader
throw new ServerScopedRuntimeException("At least one implementation of " + clazz + " expected");
}
- _logger.debug("Found {} implementations of {}", serviceImplementations.size(), clazz);
+ LOGGER.debug("Found {} implementations of {}", serviceImplementations.size(), clazz);
return serviceImplementations;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
index 928e309..b5aa4d7 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
@@ -45,7 +45,7 @@ public final class AMQShortString implements Comparable<AMQShortString>
private static final byte MINUS = (byte)'-';
private static final byte ZERO = (byte) '0';
- private static final Logger _logger = LoggerFactory.getLogger(AMQShortString.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AMQShortString.class);
private final byte[] _data;
private final int _offset;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java
index 84e65da..7b49e9c 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java
@@ -29,7 +29,7 @@ import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class EncodingUtils
{
- private static final Logger _logger = LoggerFactory.getLogger(EncodingUtils.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(EncodingUtils.class);
private EncodingUtils()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java
index 3fd8408..1896f40 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java
@@ -40,7 +40,7 @@ import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class FieldTable
{
- private static final Logger _logger = LoggerFactory.getLogger(FieldTable.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(FieldTable.class);
private static final String STRICT_AMQP_NAME = "STRICT_AMQP";
private static final boolean STRICT_AMQP = Boolean.valueOf(System.getProperty(STRICT_AMQP_NAME, "false"));
@@ -130,7 +130,7 @@ public class FieldTable
}
catch (AMQFrameDecodingException e)
{
- _logger.error("Error decoding FieldTable in deferred decoding mode ", e);
+ LOGGER.error("Error decoding FieldTable in deferred decoding mode ", e);
throw new IllegalArgumentException(e);
}
}
@@ -824,14 +824,14 @@ public class FieldTable
public void writeToBuffer(QpidByteBuffer buffer)
{
- final boolean trace = _logger.isDebugEnabled();
+ final boolean trace = LOGGER.isDebugEnabled();
if (trace)
{
- _logger.debug("FieldTable::writeToBuffer: Writing encoded length of " + getEncodedSize() + "...");
+ LOGGER.debug("FieldTable::writeToBuffer: Writing encoded length of " + getEncodedSize() + "...");
if (_properties != null)
{
- _logger.debug(_properties.toString());
+ LOGGER.debug(_properties.toString());
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 45ada19..ad40049 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -128,7 +128,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
MessageGroupManager.ConsumerResetHelper
{
- private static final Logger _logger = LoggerFactory.getLogger(AbstractQueue.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractQueue.class);
private static final QueueNotificationListener NULL_NOTIFICATION_LISTENER = new QueueNotificationListener()
{
@@ -568,7 +568,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
}
else
{
- _logger.warn("Cannot find alternate binding destination '{}' for queue '{}'", alternateDestination, toString());
+ LOGGER.warn("Cannot find alternate binding destination '{}' for queue '{}'", alternateDestination, toString());
}
}
@@ -1094,7 +1094,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
&& !(consumer.isDurable() && _closing))
{
- _logger.debug("Auto-deleting queue: {}", this);
+ LOGGER.debug("Auto-deleting queue: {}", this);
Subject.doAs(getSubjectWithAddedSystemRights(), new PrivilegedAction<Object>()
{
@@ -1746,7 +1746,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
{
boolean acquiredForDequeueing = entry.acquireOrSteal(() ->
{
- _logger.debug("Dequeuing stolen node {}", entry);
+ LOGGER.debug("Dequeuing stolen node {}", entry);
dequeueEntry(entry);
if (postDequeueTask != null)
{
@@ -1756,7 +1756,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
if (acquiredForDequeueing)
{
- _logger.debug("Dequeuing node {}", entry);
+ LOGGER.debug("Dequeuing node {}", entry);
dequeueEntry(entry);
if (postDequeueTask != null)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
index 37a90ef..1965e33 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
@@ -46,7 +46,7 @@ import org.apache.qpid.server.security.auth.sasl.plain.PlainNegotiator;
*/
public class Base64MD5PasswordFilePrincipalDatabase extends AbstractPasswordFilePrincipalDatabase<HashedUser>
{
- private final Logger _logger = LoggerFactory.getLogger(Base64MD5PasswordFilePrincipalDatabase.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(Base64MD5PasswordFilePrincipalDatabase.class);
private List<String> _mechanisms = Collections.unmodifiableList(Arrays.asList(CramMd5HashedNegotiator.MECHANISM,
CramMd5HexNegotiator.MECHANISM,
PlainNegotiator.MECHANISM));
@@ -122,7 +122,7 @@ public class Base64MD5PasswordFilePrincipalDatabase extends AbstractPasswordFile
@Override
protected Logger getLogger()
{
- return _logger;
+ return LOGGER;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
index b6dbff5..c31a2e3 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
@@ -52,7 +52,7 @@ import org.apache.qpid.server.security.auth.sasl.scram.ScramSaslServerSourceAdap
public class PlainPasswordFilePrincipalDatabase extends AbstractPasswordFilePrincipalDatabase<PlainUser>
{
- private final Logger _logger = LoggerFactory.getLogger(PlainPasswordFilePrincipalDatabase.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PlainPasswordFilePrincipalDatabase.class);
private final List<String> _mechanisms = Collections.unmodifiableList(Arrays.asList(PlainNegotiator.MECHANISM,
CramMd5Negotiator.MECHANISM,
ScramSHA1AuthenticationManager.MECHANISM,
@@ -121,7 +121,7 @@ public class PlainPasswordFilePrincipalDatabase extends AbstractPasswordFilePrin
@Override
protected Logger getLogger()
{
- return _logger;
+ return LOGGER;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
index 005a4c2..28058c4 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
@@ -49,7 +49,7 @@ import org.apache.qpid.server.security.auth.sasl.scram.ScramSaslServerSourceAdap
public class SimpleAuthenticationManager extends AbstractAuthenticationManager<SimpleAuthenticationManager>
implements PasswordCredentialManagingAuthenticationProvider<SimpleAuthenticationManager>
{
- private static final Logger _logger = LoggerFactory.getLogger(SimpleAuthenticationManager.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SimpleAuthenticationManager.class);
private static final String PLAIN_MECHANISM = "PLAIN";
private static final String CRAM_MD5_MECHANISM = "CRAM-MD5";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
index e028a75..863f421 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
@@ -77,7 +77,7 @@ import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationManager<SimpleLDAPAuthenticationManagerImpl>
implements SimpleLDAPAuthenticationManager<SimpleLDAPAuthenticationManagerImpl>
{
- private static final Logger _logger = LoggerFactory.getLogger(SimpleLDAPAuthenticationManagerImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SimpleLDAPAuthenticationManagerImpl.class);
private static final List<String> CONNECTIVITY_ATTRS = unmodifiableList(Arrays.asList(PROVIDER_URL,
PROVIDER_AUTH_URL,
@@ -191,7 +191,7 @@ public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationM
|| cacheExpirationTime == null || cacheExpirationTime <= 0
|| cacheIterationCount == null || cacheIterationCount < 0)
{
- _logger.debug("disabling authentication result caching");
+ LOGGER.debug("disabling authentication result caching");
cacheMaxSize = 0;
cacheExpirationTime = 1L;
cacheIterationCount = 0;
@@ -314,7 +314,7 @@ public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationM
}
catch (NamingException e)
{
- _logger.warn("Retrieving LDAP name for user '{}' resulted in error.", userId, e);
+ LOGGER.warn("Retrieving LDAP name for user '{}' resulted in error.", userId, e);
return new AuthenticationResult(AuthenticationResult.AuthenticationStatus.ERROR, e);
}
@@ -358,7 +358,7 @@ public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationM
catch (NamingException e)
{
//Some other failure
- _logger.warn("LDAP authentication attempt for username '{}' resulted in error.", name, e);
+ LOGGER.warn("LDAP authentication attempt for username '{}' resulted in error.", name, e);
return new AuthenticationResult(AuthenticationResult.AuthenticationStatus.ERROR, e);
}
finally
@@ -533,7 +533,7 @@ public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationM
}
catch (GeneralSecurityException e)
{
- _logger.error("Exception creating SSLContext", e);
+ LOGGER.error("Exception creating SSLContext", e);
if (trustStore != null)
{
throw new IllegalConfigurationException("Error creating SSLContext with trust store : " +
@@ -552,7 +552,7 @@ public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationM
_tlsProtocolBlackList);
Class<? extends AbstractLDAPSSLSocketFactory> clazz = LDAPSSLSocketFactoryGenerator.createSubClass(clazzName,
sslSocketFactory);
- _logger.debug("Connection to Directory will use custom SSL socket factory : {}", clazz);
+ LOGGER.debug("Connection to Directory will use custom SSL socket factory : {}", clazz);
return clazz;
}
@@ -583,7 +583,7 @@ public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationM
}
catch (NamingException e)
{
- _logger.error("Failed to establish connectivity to the ldap server for '{}'", providerUrl, e);
+ LOGGER.error("Failed to establish connectivity to the ldap server for '{}'", providerUrl, e);
throw new IllegalConfigurationException("Failed to establish connectivity to the ldap server." , e);
}
finally
@@ -621,18 +621,18 @@ public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationM
searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
NamingEnumeration<?> namingEnum = null;
- _logger.debug("Searching for '{}'", id);
+ LOGGER.debug("Searching for '{}'", id);
namingEnum = ctx.search(_searchContext, _searchFilter, new String[]{id}, searchControls);
if (namingEnum.hasMore())
{
SearchResult result = (SearchResult) namingEnum.next();
String name = result.getNameInNamespace();
- _logger.debug("Found '{}' DN '{}'", id, name);
+ LOGGER.debug("Found '{}' DN '{}'", id, name);
return name;
}
else
{
- _logger.debug("Not found '{}'", id);
+ LOGGER.debug("Not found '{}'", id);
return null;
}
}
@@ -698,7 +698,7 @@ public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationM
}
catch (Exception e)
{
- _logger.warn("Exception closing InitialDirContext", e);
+ LOGGER.warn("Exception closing InitialDirContext", e);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java b/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java
index bb89d58..2db0fc8 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
public class EventManager
{
private Map<Event, List<EventListener>> _listeners = new EnumMap<Event, List<EventListener>> (Event.class);
- private static final Logger _LOGGER = LoggerFactory.getLogger(EventManager.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(EventManager.class);
public synchronized void addEventListener(EventListener listener, Event... events)
{
@@ -50,9 +50,9 @@ public class EventManager
{
if (_listeners.containsKey(event))
{
- if(_LOGGER.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _LOGGER.debug("Received event " + event);
+ LOGGER.debug("Received event " + event);
}
for (EventListener listener : _listeners.get(event))
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java b/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
index 0b16b07..059db39 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
@@ -85,7 +85,7 @@ public abstract class AbstractAMQPConnection<C extends AbstractAMQPConnection<C,
{
public static final FixedKeyMapCreator PUBLISH_ACTION_MAP_CREATOR = new FixedKeyMapCreator("routingKey", "immediate");
- private static final Logger _logger = LoggerFactory.getLogger(AbstractAMQPConnection.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractAMQPConnection.class);
private final Broker<?> _broker;
private final ServerNetworkConnection _network;
@@ -373,7 +373,7 @@ public abstract class AbstractAMQPConnection<C extends AbstractAMQPConnection<C,
}
catch (NullPointerException | IllegalArgumentException e)
{
- _logger.warn("Context variable {} has invalid value and cannot be used to restrict maximum message size",
+ LOGGER.warn("Context variable {} has invalid value and cannot be used to restrict maximum message size",
MAX_MESSAGE_SIZE,
e);
maxMessageSize = Long.MAX_VALUE;
@@ -914,7 +914,7 @@ public abstract class AbstractAMQPConnection<C extends AbstractAMQPConnection<C,
{
if (isOpeningInProgress())
{
- _logger.warn("Connection has taken more than {} ms to establish. Closing as possible DoS.",
+ LOGGER.warn("Connection has taken more than {} ms to establish. Closing as possible DoS.",
_allowedTime);
getEventLogger().message(ConnectionMessages.IDLE_CLOSE(
"Protocol connection is not established within timeout period", true));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java b/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
index 1655909..2533777 100755
--- a/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
@@ -50,7 +50,7 @@ import org.apache.qpid.server.util.Action;
public class MultiVersionProtocolEngine implements ProtocolEngine
{
- private static final Logger _logger = LoggerFactory.getLogger(MultiVersionProtocolEngine.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MultiVersionProtocolEngine.class);
private static final int MINIMUM_REQUIRED_HEADER_BYTES = 8;
@@ -94,7 +94,7 @@ public class MultiVersionProtocolEngine implements ProtocolEngine
@Override
public void closed()
{
- _logger.debug("Closed");
+ LOGGER.debug("Closed");
try
{
@@ -269,7 +269,7 @@ public class MultiVersionProtocolEngine implements ProtocolEngine
@Override
public void received(QpidByteBuffer msg)
{
- _logger.debug("Error processing incoming data, could not negotiate a common protocol");
+ LOGGER.debug("Error processing incoming data, could not negotiate a common protocol");
msg.position(msg.limit());
}
@@ -454,7 +454,7 @@ public class MultiVersionProtocolEngine implements ProtocolEngine
//if a default reply was specified use its reply header instead of the most recent supported version
if(_defaultSupportedReply != null && !(_defaultSupportedReply == supportedReplyVersion))
{
- _logger.debug("Default reply to unsupported protocol version was configured, changing reply from {} to {}",
+ LOGGER.debug("Default reply to unsupported protocol version was configured, changing reply from {} to {}",
supportedReplyVersion, _defaultSupportedReply);
supportedReplyBytes = defaultSupportedReplyBytes;
@@ -539,7 +539,7 @@ public class MultiVersionProtocolEngine implements ProtocolEngine
try
{
_delegate = new ClosedDelegateProtocolEngine();
- _logger.debug("Connection from {} was closed before any protocol version was established.",
+ LOGGER.debug("Connection from {} was closed before any protocol version was established.",
_network.getRemoteAddress());
}
catch(Exception e)
@@ -622,7 +622,7 @@ public class MultiVersionProtocolEngine implements ProtocolEngine
}
else
{
- _logger.warn("Connection has taken more than {} ms to send complete protocol header. Closing as possible DoS.",
+ LOGGER.warn("Connection has taken more than {} ms to send complete protocol header. Closing as possible DoS.",
_allowedTime);
_broker.getEventLogger().message(ConnectionMessages.IDLE_CLOSE("Protocol header not received within timeout period", true));
_network.close();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngineFactory.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngineFactory.java b/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngineFactory.java
index 6b564cf..b9f2303 100755
--- a/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngineFactory.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngineFactory.java
@@ -41,7 +41,7 @@ import org.apache.qpid.server.plugin.QpidServiceLoader;
public class MultiVersionProtocolEngineFactory implements ProtocolEngineFactory
{
private static final AtomicLong ID_GENERATOR = new AtomicLong(0);
- private static final Logger _logger = LoggerFactory.getLogger(MultiVersionProtocolEngineFactory.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MultiVersionProtocolEngineFactory.class);
private final Broker<?> _broker;
private final Set<Protocol> _supported;
@@ -60,7 +60,7 @@ public class MultiVersionProtocolEngineFactory implements ProtocolEngineFactory
{
if(defaultSupportedReply != null && !supportedVersions.contains(defaultSupportedReply))
{
- _logger.warn("The configured default reply ({}) to an unsupported protocol version initiation is not"
+ LOGGER.warn("The configured default reply ({}) to an unsupported protocol version initiation is not"
+ " supported on this port. Only the following versions are supported: {}",
defaultSupportedReply, supportedVersions);
defaultSupportedReply = null;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java b/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
index 95d9c52..1f65aa3 100755
--- a/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
@@ -47,7 +47,7 @@ public class AsyncAutoCommitTransaction implements ServerTransaction
{
static final String QPID_STRICT_ORDER_WITH_MIXED_DELIVERY_MODE = "qpid.strict_order_with_mixed_delivery_mode";
- protected static final Logger _logger = LoggerFactory.getLogger(AsyncAutoCommitTransaction.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AsyncAutoCommitTransaction.class);
private final MessageStore _messageStore;
private final FutureRecorder _futureRecorder;
@@ -99,7 +99,7 @@ public class AsyncAutoCommitTransaction implements ServerTransaction
ListenableFuture<Void> future;
if(record != null)
{
- _logger.debug("Dequeue of message number {} from transaction log. Queue : {}", record.getMessageNumber(), record.getQueueId());
+ LOGGER.debug("Dequeue of message number {} from transaction log. Queue : {}", record.getMessageNumber(), record.getQueueId());
txn = _messageStore.newTransaction();
txn.dequeueMessage(record);
@@ -166,7 +166,7 @@ public class AsyncAutoCommitTransaction implements ServerTransaction
if(record != null)
{
- _logger.debug("Dequeue of message number {} from transaction log. Queue : {}", record.getMessageNumber(), record.getQueueId());
+ LOGGER.debug("Dequeue of message number {} from transaction log. Queue : {}", record.getMessageNumber(), record.getQueueId());
if(txn == null)
{
@@ -208,7 +208,7 @@ public class AsyncAutoCommitTransaction implements ServerTransaction
final MessageEnqueueRecord enqueueRecord;
if(queue.getMessageDurability().persist(message.isPersistent()))
{
- _logger.debug("Enqueue of message number {} to transaction log. Queue : {}", message.getMessageNumber(), queue.getName());
+ LOGGER.debug("Enqueue of message number {} to transaction log. Queue : {}", message.getMessageNumber(), queue.getName());
txn = _messageStore.newTransaction();
enqueueRecord = txn.enqueueMessage(queue, message);
@@ -275,7 +275,7 @@ public class AsyncAutoCommitTransaction implements ServerTransaction
{
if (queue.getMessageDurability().persist(message.isPersistent()))
{
- _logger.debug("Enqueue of message number {} to transaction log. Queue : {}", message.getMessageNumber(), queue.getName());
+ LOGGER.debug("Enqueue of message number {} to transaction log. Queue : {}", message.getMessageNumber(), queue.getName());
if (txn == null)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java b/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
index 09434b2..8f4b132 100755
--- a/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
@@ -43,7 +43,7 @@ import org.apache.qpid.server.store.TransactionLogResource;
*/
public class AutoCommitTransaction implements ServerTransaction
{
- protected static final Logger _logger = LoggerFactory.getLogger(AutoCommitTransaction.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AutoCommitTransaction.class);
private final MessageStore _messageStore;
@@ -82,7 +82,7 @@ public class AutoCommitTransaction implements ServerTransaction
{
if(record != null)
{
- _logger.debug("Dequeue of message number {} from transaction log. Queue : {}", record.getMessageNumber(), record.getQueueId());
+ LOGGER.debug("Dequeue of message number {} from transaction log. Queue : {}", record.getMessageNumber(), record.getQueueId());
txn = _messageStore.newTransaction();
txn.dequeueMessage(record);
@@ -111,7 +111,7 @@ public class AutoCommitTransaction implements ServerTransaction
MessageEnqueueRecord enqueueRecord = entry.getEnqueueRecord();
if(enqueueRecord != null)
{
- _logger.debug("Dequeue of message number {} from transaction log. Queue : {}", enqueueRecord.getMessageNumber(), enqueueRecord.getQueueId());
+ LOGGER.debug("Dequeue of message number {} from transaction log. Queue : {}", enqueueRecord.getMessageNumber(), enqueueRecord.getQueueId());
if(txn == null)
{
@@ -147,7 +147,7 @@ public class AutoCommitTransaction implements ServerTransaction
final MessageEnqueueRecord record;
if(queue.getMessageDurability().persist(message.isPersistent()))
{
- _logger.debug("Enqueue of message number {} to transaction log. Queue : {}", message.getMessageNumber(), queue.getName());
+ LOGGER.debug("Enqueue of message number {} to transaction log. Queue : {}", message.getMessageNumber(), queue.getName());
txn = _messageStore.newTransaction();
record = txn.enqueueMessage(queue, message);
@@ -201,7 +201,7 @@ public class AutoCommitTransaction implements ServerTransaction
{
if (queue.getMessageDurability().persist(message.isPersistent()))
{
- _logger.debug("Enqueue of message number {} to transaction log. Queue : {}", message.getMessageNumber(), queue.getName());
+ LOGGER.debug("Enqueue of message number {} to transaction log. Queue : {}", message.getMessageNumber(), queue.getName());
if (txn == null)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org