This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 5d5ea61ab1 QPID-8604: [Broker-J] long literals (#146)
5d5ea61ab1 is described below
commit 5d5ea61ab1f730c0ffdabd5b6f274ecf294877b1
Author: Daniil Kirilyuk <[email protected]>
AuthorDate: Wed Oct 19 14:46:44 2022 +0200
QPID-8604: [Broker-J] long literals (#146)
---
.../store/berkeleydb/AbstractBDBMessageStore.java | 2 +-
.../virtualhost/berkeleydb/BDBVirtualHost.java | 2 +-
.../store/berkeleydb/BDBHAVirtualHostNodeTest.java | 2 +-
.../berkeleydb/upgrade/UpgradeFrom5To6Test.java | 2 +-
.../org/apache/qpid/server/SystemLauncher.java | 2 +-
.../server/model/AbstractConfiguredObject.java | 2 +-
.../qpid/server/model/AbstractContainer.java | 8 +--
.../qpid/server/model/AbstractSystemConfig.java | 2 +-
.../java/org/apache/qpid/server/model/Broker.java | 2 +-
.../org/apache/qpid/server/model/BrokerImpl.java | 2 +-
.../org/apache/qpid/server/model/Connection.java | 2 +-
.../java/org/apache/qpid/server/model/Port.java | 2 +-
.../apache/qpid/server/txn/LocalTransaction.java | 2 +-
.../server/virtualhost/AbstractVirtualHost.java | 2 +-
.../virtualhost/QueueManagingVirtualHost.java | 8 +--
.../virtualhost/VirtualHostPropertiesNode.java | 2 +-
.../configuration/updater/TaskExecutorTest.java | 2 +-
.../logging/subjects/ConnectionLogSubjectTest.java | 2 +-
.../apache/qpid/server/model/BrokerTestHelper.java | 2 +-
.../qpid/server/queue/AbstractQueueTestBase.java | 84 +++++++++++-----------
.../qpid/server/queue/LastValueQueueTest.java | 12 ++--
.../qpid/server/queue/NotificationCheckTest.java | 12 ++--
.../qpid/server/queue/QueueEntryListTestBase.java | 2 +-
.../qpid/server/queue/StandardQueueTest.java | 8 +--
.../store/BrokerStoreUpgraderAndRecovererTest.java | 6 +-
.../qpid/server/store/MessageStoreTestCase.java | 4 +-
.../server/protocol/v0_10/ConsumerTarget_0_10.java | 6 +-
.../protocol/v0_10/ServerSessionDelegate.java | 2 +-
.../server/protocol/v0_10/ServerSessionTest.java | 4 +-
.../protocol/v0_10/WindowCreditManagerTest.java | 2 +-
.../qpid/server/protocol/v0_8/AMQChannel.java | 2 +-
.../transport/BasicContentHeaderProperties.java | 2 +-
.../v0_8/transport/CompositeAMQDataBlock.java | 2 +-
.../protocol/v0_8/transport/ContentBody.java | 2 +-
.../protocol/v0_8/transport/HeartbeatBody.java | 2 +-
.../v0_8/transport/ProtocolInitiation.java | 2 +-
.../qpid/server/protocol/v0_8/AMQChannelTest.java | 6 +-
.../protocol/v0_8/AMQPConnection_0_8Test.java | 6 +-
.../BasicContentHeaderPropertiesTest.java | 2 +-
.../v1_0/MessageConverter_Internal_to_v1_0.java | 4 +-
.../protocol/v1_0/codec/DecimalConstructor.java | 30 ++++----
.../server/protocol/v1_0/type/UnsignedByte.java | 2 +-
.../server/protocol/v1_0/type/UnsignedInteger.java | 2 +-
.../store/derby/AbstractDerbyMessageStore.java | 4 +-
.../server/logging/logback/BrokerLoggerTest.java | 20 +++---
.../management/plugin/HttpManagementTest.java | 4 +-
.../qpid/disttest/client/ConsumerParticipant.java | 2 +-
.../disttest/client/ConsumerParticipantTest.java | 2 +-
.../controller/config/TestInstanceTest.java | 4 +-
.../qpid/disttest/results/ResultsTestFixture.java | 4 +-
.../results/aggregation/SeriesStatisticsTest.java | 2 +-
51 files changed, 150 insertions(+), 148 deletions(-)
diff --git
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index a7df6a788f..cf2b81f63b 100644
---
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -491,7 +491,7 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
getLogger().info("Lock conflict exception. Retrying (attempt {} of
{})", attempts, LOCK_RETRY_ATTEMPTS);
try
{
- Thread.sleep(500l + (long)(500l *
_lockConflictRandom.nextDouble()));
+ Thread.sleep(500L + (long)(500L *
_lockConflictRandom.nextDouble()));
}
catch (InterruptedException ie)
{
diff --git
a/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
b/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
index 08db3bc419..bcc5c3c5f8 100644
---
a/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
+++
b/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
@@ -42,7 +42,7 @@ public interface BDBVirtualHost<X extends BDBVirtualHost<X>>
extends QueueManagi
// Default the JE cache to 5% of total memory, but no less than 10Mb
@ManagedContextDefault(name= QPID_BROKER_BDB_TOTAL_CACHE_SIZE)
- long DEFAULT_JE_CACHE_SIZE = Math.max(BDB_MIN_CACHE_SIZE,
Runtime.getRuntime().maxMemory()/20l);
+ long DEFAULT_JE_CACHE_SIZE = Math.max(BDB_MIN_CACHE_SIZE,
Runtime.getRuntime().maxMemory() / 20L);
@SuppressWarnings("unused")
@ManagedContextDefault(name = QPID_BROKER_BDB_COMMITER_NOTIFY_THRESHOLD,
description = "Threshold for amount of messages triggering BDB log flush to the
disk")
diff --git
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
index 9e457f5a75..f9686ceff6 100644
---
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
+++
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
@@ -826,7 +826,7 @@ public class BDBHAVirtualHostNodeTest extends UnitTestBase
int waitCounter = 100;
while ( remote.getLastKnownReplicationTransactionId() !=
node1.getLastKnownReplicationTransactionId() && (waitCounter--) != 0)
{
- Thread.sleep(100l);
+ Thread.sleep(100L);
}
assertEquals("Last transaction was not replicated",
Long.valueOf(remote.getLastKnownReplicationTransactionId()),
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 475d277643..a5a03b8952 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
@@ -214,7 +214,7 @@ public class UpgradeFrom5To6Test extends
AbstractUpgradeTestCase
final DatabaseEntry value = new DatabaseEntry();
byte[] globalId = { 1 };
byte[] branchId = { 2 };
- Xid xid = new Xid(1l, globalId, branchId);
+ Xid xid = new Xid(1L, globalId, branchId);
XidBinding xidBinding = XidBinding.getInstance();
xidBinding.objectToEntry(xid, value);
return value;
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java
b/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java
index f7941bf2f0..d2ef380f85 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java
@@ -169,7 +169,7 @@ public class SystemLauncher
if(_systemConfig != null)
{
ListenableFuture<Void> closeResult =
_systemConfig.closeAsync();
- closeResult.get(30000l, TimeUnit.MILLISECONDS);
+ closeResult.get(30000L, TimeUnit.MILLISECONDS);
}
}
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
index 0e8a7ee756..405a6de6f5 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
@@ -115,7 +115,7 @@ public abstract class AbstractConfiguredObject<X extends
ConfiguredObject<X>> im
Map<Class,Object> secureValues = new HashMap<Class, Object>();
secureValues.put(String.class, SECURED_STRING_VALUE);
secureValues.put(Integer.class, 0);
- secureValues.put(Long.class, 0l);
+ secureValues.put(Long.class, 0L);
secureValues.put(Byte.class, (byte)0);
secureValues.put(Short.class, (short)0);
secureValues.put(Double.class, (double)0);
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
index 13d202832f..f507f96947 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
@@ -167,19 +167,19 @@ public abstract class AbstractContainer<X extends
AbstractContainer<X>> extends
{
case 'k':
case 'K':
- maxMemory *= 1024l;
+ maxMemory *= 1024L;
break;
case 'm':
case 'M':
- maxMemory *= 1024l * 1024l;
+ maxMemory *= 1024L * 1024L;
break;
case 'g':
case 'G':
- maxMemory *= 1024l * 1024l * 1024l;
+ maxMemory *= 1024L * 1024L * 1024L;
break;
case 't':
case 'T':
- maxMemory *= 1024l * 1024l * 1024l * 1024l;
+ maxMemory *= 1024L * 1024L * 1024L * 1024L;
break;
case 0:
// noop
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
index cfa740a9dd..a957563597 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
@@ -63,7 +63,7 @@ import
org.apache.qpid.server.util.urlstreamhandler.classpath.Handler;
public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
extends AbstractConfiguredObject<X> implements SystemConfig<X>,
DynamicModel
{
- private static final UUID SYSTEM_ID = new UUID(0l, 0l);
+ private static final UUID SYSTEM_ID = new UUID(0L, 0L);
private final Principal _systemPrincipal;
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
b/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
index df8f78312e..456660060a 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
@@ -93,7 +93,7 @@ public interface Broker<X extends Broker<X>> extends
ConfiguredObject<X>, EventL
long DEFAULT_COMPACT_MEMORY_INTERVAL = 1000L;
@ManagedContextDefault(name = CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT)
- long DEFAULT_CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT = 5000l;
+ long DEFAULT_CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT = 5000L;
@ManagedContextDefault(name = STORE_FILESYSTEM_MAX_USAGE_PERCENT)
int DEFAULT_FILESYSTEM_MAX_USAGE_PERCENT = 90;
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
index 2d61b11b1e..5d4b8ee1cc 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
@@ -577,7 +577,7 @@ public class BrokerImpl extends
AbstractContainer<BrokerImpl> implements Broker<
{
reportDirectMemoryAboveThresholdIfExceeded();
LOGGER.debug("Assigning target sizes based on total target {}",
_flowToDiskThreshold);
- long totalSize = 0l;
+ long totalSize = 0L;
Collection<VirtualHostNode<?>> vhns = getVirtualHostNodes();
Map<QueueManagingVirtualHost<?>, Long> vhs = new HashMap<>();
for (VirtualHostNode<?> vhn : vhns)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
b/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
index 0638e53e33..39022d17bf 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
@@ -52,7 +52,7 @@ public interface Connection<X extends Connection<X>> extends
ConfiguredObject<X>
+ " which connection can hold in memory. If limit is
breached, all messages from"
+ " connection in-flight transactions are flowed to
disk including those arriving"
+ " after breaching the limit.")
- long DEFAULT_MAX_UNCOMMITTED_IN_MEMORY_SIZE = 10l * 1024l * 1024l;
+ long DEFAULT_MAX_UNCOMMITTED_IN_MEMORY_SIZE = 10L * 1024L * 1024L;
String CLOSE_RESPONSE_TIMEOUT = "connection.closeResponseTimeout";
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
b/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
index 892bd7823f..dc0060fc46 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
@@ -61,7 +61,7 @@ public interface Port<X extends Port<X>> extends
ConfiguredObject<X>
String CONNECTION_MAXIMUM_AUTHENTICATION_DELAY =
"connection.maximumAuthenticationDelay";
@ManagedContextDefault(name = CONNECTION_MAXIMUM_AUTHENTICATION_DELAY)
- long DEFAULT_MAX_CONNECTION_AUTHENTICATION_DELAY = 10000l;
+ long DEFAULT_MAX_CONNECTION_AUTHENTICATION_DELAY = 10000L;
String ALLOW_CONFIDENTIAL_OPERATIONS_ON_INSECURE_CHANNELS =
"allowConfidentialOperationsOnInsecureChannels";
// Attributes
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
b/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
index eaf1db2d5e..b164357094 100755
--- a/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
@@ -73,7 +73,7 @@ public class LocalTransaction implements ServerTransaction
private final ActivityTimeAccessor _activityTime;
private final MessageStore _transactionLog;
private volatile long _txnStartTime = 0L;
- private volatile long _txnUpdateTime = 0l;
+ private volatile long _txnUpdateTime = 0L;
private ListenableFuture<Runnable> _asyncTran;
private volatile boolean _outstandingWork;
private final LocalTransactionState _finalState;
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index 2a34f27847..2b8678dc63 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -2928,7 +2928,7 @@ public abstract class AbstractVirtualHost<X extends
AbstractVirtualHost<X>> exte
return;
}
- long usagePercent = (100l * (totalSpace - freeSpace)) / totalSpace;
+ long usagePercent = (100L * (totalSpace - freeSpace)) / totalSpace;
if (_fileSystemFull && (usagePercent < _fileSystemMaxUsagePercent))
{
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
index 003b4d1d8a..b03917afd5 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
@@ -89,7 +89,7 @@ public interface QueueManagingVirtualHost<X extends
QueueManagingVirtualHost<X>>
@ManagedContextDefault( name =
"virtualhost.storeTransactionIdleTimeoutClose")
- public static final long DEFAULT_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE = 0l;
+ public static final long DEFAULT_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE = 0L;
@ManagedContextDefault( name = "virtualhost.housekeepingThreadCount")
int DEFAULT_HOUSEKEEPING_THREAD_COUNT = 4;
@@ -114,7 +114,7 @@ public interface QueueManagingVirtualHost<X extends
QueueManagingVirtualHost<X>>
long getStoreTransactionIdleTimeoutClose();
@ManagedContextDefault( name =
"virtualhost.storeTransactionIdleTimeoutWarn")
- public static final long DEFAULT_STORE_TRANSACTION_IDLE_TIMEOUT_WARN =
180000l;
+ public static final long DEFAULT_STORE_TRANSACTION_IDLE_TIMEOUT_WARN =
180000L;
@ManagedAttribute( defaultValue =
"${virtualhost.storeTransactionIdleTimeoutWarn}",
description = "The maximum length of time, in milliseconds, that
an open store transaction may "
@@ -123,7 +123,7 @@ public interface QueueManagingVirtualHost<X extends
QueueManagingVirtualHost<X>>
long getStoreTransactionIdleTimeoutWarn();
@ManagedContextDefault( name =
"virtualhost.storeTransactionOpenTimeoutClose")
- public static final long DEFAULT_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE = 0l;
+ public static final long DEFAULT_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE = 0L;
@ManagedAttribute( defaultValue =
"${virtualhost.storeTransactionOpenTimeoutClose}",
description = "The maximum length of time, in milliseconds, that a
store transaction may "
@@ -132,7 +132,7 @@ public interface QueueManagingVirtualHost<X extends
QueueManagingVirtualHost<X>>
long getStoreTransactionOpenTimeoutClose();
@ManagedContextDefault( name =
"virtualhost.storeTransactionOpenTimeoutWarn")
- public static final long DEFAULT_STORE_TRANSACTION_OPEN_TIMEOUT_WARN =
300000l;
+ public static final long DEFAULT_STORE_TRANSACTION_OPEN_TIMEOUT_WARN =
300000L;
@ManagedAttribute( defaultValue =
"${virtualhost.storeTransactionOpenTimeoutWarn}",
description = "The maximum length of time, in milliseconds, that a
store transaction may "
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNode.java
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNode.java
index 542c3f3b7f..cc47b74094 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNode.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNode.java
@@ -87,7 +87,7 @@ public class VirtualHostPropertiesNode extends
AbstractSystemMessageSource
}
InternalMessageHeader header = new InternalMessageHeader(headers,
- null, 0l,
null, null, UUID.randomUUID().toString(),
+ null, 0L,
null, null, UUID.randomUUID().toString(),
null, null,
(byte) 4, System.currentTimeMillis(),
0L, null,
null, System.currentTimeMillis());
final InternalMessage message =
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
b/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
index 6d9f4a3848..32872df88a 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
@@ -123,7 +123,7 @@ public class TaskExecutorTest extends UnitTestBase
Thread t2 = new Thread(runnable);
t2.start();
- final long timeout = 2000l;
+ final long timeout = 2000L;
boolean awaitSubmissions = submitLatch.await(timeout,
TimeUnit.MILLISECONDS);
assertTrue(submitLatch.getCount() + " task(s) have not been submitted
within expected time",
awaitSubmissions);
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
index e453871a2c..94b4f4b43b 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
@@ -35,7 +35,7 @@ import org.apache.qpid.server.transport.AMQPConnection;
public class ConnectionLogSubjectTest extends AbstractTestLogSubject
{
- private static final long CONNECTION_ID = 456l;
+ private static final long CONNECTION_ID = 456L;
private static final String USER = "InternalTestProtocolSession";
private static final String IP_STRING = "127.0.0.1:1";
private static final String VHOST = "test";
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
index fb36677167..f140ec75e0 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
@@ -135,7 +135,7 @@ public class BrokerTestHelper
when(broker.getCategoryClass()).thenReturn(Broker.class);
when(broker.getTypeClass()).thenReturn(Broker.class);
when(broker.getParent()).thenReturn(systemConfig);
- when(broker.getContextValue(eq(Long.class),
eq(Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT))).thenReturn(0l);
+ when(broker.getContextValue(eq(Long.class),
eq(Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT))).thenReturn(0L);
when(broker.getFlowToDiskThreshold()).thenReturn(Long.MAX_VALUE);
when(broker.getTaskExecutor()).thenReturn(TASK_EXECUTOR);
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
b/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
index 04c98b919a..9ad7e2d52d 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
@@ -818,77 +818,77 @@ abstract class AbstractQueueTestBase extends UnitTestBase
Map<String,Object> attributes = new HashMap<>(_arguments);
attributes.put(Queue.NAME,"testTtlOverrideMaximumTTl");
- attributes.put(Queue.MAXIMUM_MESSAGE_TTL, 10000l);
+ attributes.put(Queue.MAXIMUM_MESSAGE_TTL, 10000L);
Queue<?> queue = _virtualHost.createChild(Queue.class, attributes);
- assertEquals("TTL has not been overridden", 60000l,
getExpirationOnQueue(queue, 50000l, 0l));
+ assertEquals("TTL has not been overridden", 60000L,
getExpirationOnQueue(queue, 50000L, 0L));
- assertEquals("TTL has not been overridden", 60000l,
getExpirationOnQueue(queue, 50000l, 65000l));
+ assertEquals("TTL has not been overridden", 60000L,
getExpirationOnQueue(queue, 50000L, 65000L));
- assertEquals("TTL has been incorrectly overridden", 55000l,
getExpirationOnQueue(queue, 50000l, 55000l));
+ assertEquals("TTL has been incorrectly overridden", 55000L,
getExpirationOnQueue(queue, 50000L, 55000L));
- long tooLateExpiration = System.currentTimeMillis() + 20000l;
+ long tooLateExpiration = System.currentTimeMillis() + 20000L;
assertTrue("TTL has not been overridden",
- tooLateExpiration != getExpirationOnQueue(queue, 0l,
tooLateExpiration));
+ tooLateExpiration != getExpirationOnQueue(queue, 0L,
tooLateExpiration));
- long acceptableExpiration = System.currentTimeMillis() + 5000l;
+ long acceptableExpiration = System.currentTimeMillis() + 5000L;
assertEquals("TTL has been incorrectly overriden",
acceptableExpiration,
- getExpirationOnQueue(queue, 0l,
acceptableExpiration));
+ getExpirationOnQueue(queue, 0L,
acceptableExpiration));
// Test the scenarios where only the minimum TTL has been set
attributes = new HashMap<>(_arguments);
attributes.put(Queue.NAME,"testTtlOverrideMinimumTTl");
- attributes.put(Queue.MINIMUM_MESSAGE_TTL, 10000l);
+ attributes.put(Queue.MINIMUM_MESSAGE_TTL, 10000L);
queue = _virtualHost.createChild(Queue.class, attributes);
- assertEquals("TTL has been overridden incorrectly", 0l,
getExpirationOnQueue(queue, 50000l, 0l));
+ assertEquals("TTL has been overridden incorrectly", 0L,
getExpirationOnQueue(queue, 50000L, 0L));
- assertEquals("TTL has been overridden incorrectly", 65000l,
getExpirationOnQueue(queue, 50000l, 65000l));
+ assertEquals("TTL has been overridden incorrectly", 65000L,
getExpirationOnQueue(queue, 50000L, 65000L));
- assertEquals("TTL has not been overriden", 60000l,
getExpirationOnQueue(queue, 50000l, 55000l));
+ assertEquals("TTL has not been overriden", 60000L,
getExpirationOnQueue(queue, 50000L, 55000L));
- long unacceptableExpiration = System.currentTimeMillis() + 5000l;
+ long unacceptableExpiration = System.currentTimeMillis() + 5000L;
assertTrue("TTL has not been overridden",
- unacceptableExpiration !=
getExpirationOnQueue(queue, 0l, tooLateExpiration));
+ unacceptableExpiration !=
getExpirationOnQueue(queue, 0L, tooLateExpiration));
- acceptableExpiration = System.currentTimeMillis() + 20000l;
+ acceptableExpiration = System.currentTimeMillis() + 20000L;
assertEquals("TTL has been incorrectly overridden",
acceptableExpiration,
- getExpirationOnQueue(queue, 0l,
acceptableExpiration));
+ getExpirationOnQueue(queue, 0L,
acceptableExpiration));
// Test the scenarios where both the minimum and maximum TTL have been
set
attributes = new HashMap<>(_arguments);
attributes.put(Queue.NAME,"testTtlOverrideBothTTl");
- attributes.put(Queue.MINIMUM_MESSAGE_TTL, 10000l);
- attributes.put(Queue.MAXIMUM_MESSAGE_TTL, 20000l);
+ attributes.put(Queue.MINIMUM_MESSAGE_TTL, 10000L);
+ attributes.put(Queue.MAXIMUM_MESSAGE_TTL, 20000L);
queue = _virtualHost.createChild(Queue.class, attributes);
- assertEquals("TTL has not been overridden", 70000l,
getExpirationOnQueue(queue, 50000l, 0l));
+ assertEquals("TTL has not been overridden", 70000L,
getExpirationOnQueue(queue, 50000L, 0L));
- assertEquals("TTL has been overridden incorrectly", 65000l,
getExpirationOnQueue(queue, 50000l, 65000l));
+ assertEquals("TTL has been overridden incorrectly", 65000L,
getExpirationOnQueue(queue, 50000L, 65000L));
- assertEquals("TTL has not been overridden", 60000l,
getExpirationOnQueue(queue, 50000l, 55000l));
+ assertEquals("TTL has not been overridden", 60000L,
getExpirationOnQueue(queue, 50000L, 55000L));
}
@Test
public void testOldestMessage()
{
Queue<?> queue = getQueue();
- queue.enqueue(createMessage(1l, (byte)1,
Collections.singletonMap("sortKey", (Object) "Z"), 10l), null, null);
- queue.enqueue(createMessage(2l, (byte)4,
Collections.singletonMap("sortKey", (Object) "M"), 100l), null, null);
- queue.enqueue(createMessage(3l, (byte)9,
Collections.singletonMap("sortKey", (Object) "A"), 1000l), null, null);
+ queue.enqueue(createMessage(1L, (byte)1,
Collections.singletonMap("sortKey", (Object) "Z"), 10L), null, null);
+ queue.enqueue(createMessage(2L, (byte)4,
Collections.singletonMap("sortKey", (Object) "M"), 100L), null, null);
+ queue.enqueue(createMessage(3L, (byte)9,
Collections.singletonMap("sortKey", (Object) "A"), 1000L), null, null);
- assertEquals(10l, queue.getOldestMessageArrivalTime());
+ assertEquals(10L, queue.getOldestMessageArrivalTime());
}
@Test
@@ -902,19 +902,19 @@ abstract class AbstractQueueTestBase extends UnitTestBase
queue.setAttributes(attributes);
ServerMessage message = createMessage(Long.valueOf(24), 50, 50);
- when(message.getArrivalTime()).thenReturn(10l);
+ when(message.getArrivalTime()).thenReturn(10L);
queue.enqueue(message, null, null);
message = createMessage(Long.valueOf(25), 50, 50);
- when(message.getArrivalTime()).thenReturn(50l);
+ when(message.getArrivalTime()).thenReturn(50L);
queue.enqueue(message, null, null);
message = createMessage(Long.valueOf(26), 50, 50);
- when(message.getArrivalTime()).thenReturn(200l);
+ when(message.getArrivalTime()).thenReturn(200L);
queue.enqueue(message, null, null);
assertEquals("Wrong number of messages in queue", (long) 3, (long)
queue.getQueueDepthMessages());
assertEquals("Wrong size of messages in queue", (long) 300,
queue.getQueueDepthBytes());
assertEquals("Wrong oldest message",
- 10l,
+ 10L,
((AbstractQueue)
queue).getEntries().getOldestEntry().getMessage().getArrivalTime());
}
@@ -929,25 +929,25 @@ abstract class AbstractQueueTestBase extends UnitTestBase
queue.setAttributes(attributes);
ServerMessage message = createMessage(Long.valueOf(24), 10, 10);
- when(message.getArrivalTime()).thenReturn(10l);
+ when(message.getArrivalTime()).thenReturn(10L);
queue.enqueue(message, null, null);
message = createMessage(Long.valueOf(25), 10, 10);
- when(message.getArrivalTime()).thenReturn(50l);
+ when(message.getArrivalTime()).thenReturn(50L);
queue.enqueue(message, null, null);
message = createMessage(Long.valueOf(26), 10, 10);
- when(message.getArrivalTime()).thenReturn(200l);
+ when(message.getArrivalTime()).thenReturn(200L);
queue.enqueue(message, null, null);
message = createMessage(Long.valueOf(27), 10, 10);
- when(message.getArrivalTime()).thenReturn(500l);
+ when(message.getArrivalTime()).thenReturn(500L);
queue.enqueue(message, null, null);
message = createMessage(Long.valueOf(28), 10, 10);
- when(message.getArrivalTime()).thenReturn(1000l);
+ when(message.getArrivalTime()).thenReturn(1000L);
queue.enqueue(message, null, null);
assertEquals("Wrong number of messages in queue", (long) 4, (long)
queue.getQueueDepthMessages());
assertEquals("Wrong size of messages in queue", (long) 80,
queue.getQueueDepthBytes());
assertEquals("Wrong oldest message",
- 50l,
+ 50L,
((AbstractQueue)
queue).getEntries().getOldestEntry().getMessage().getArrivalTime());
}
@@ -963,29 +963,29 @@ abstract class AbstractQueueTestBase extends UnitTestBase
queue.setAttributes(attributes);
ServerMessage message = createMessage(Long.valueOf(24), 10, 10);
- when(message.getArrivalTime()).thenReturn(10l);
+ when(message.getArrivalTime()).thenReturn(10L);
queue.enqueue(message, null, null);
message = createMessage(Long.valueOf(25), 10, 10);
- when(message.getArrivalTime()).thenReturn(50l);
+ when(message.getArrivalTime()).thenReturn(50L);
queue.enqueue(message, null, null);
message = createMessage(Long.valueOf(26), 20, 10);
- when(message.getArrivalTime()).thenReturn(200l);
+ when(message.getArrivalTime()).thenReturn(200L);
queue.enqueue(message, null, null);
message = createMessage(Long.valueOf(27), 20, 10);
- when(message.getArrivalTime()).thenReturn(200l);
+ when(message.getArrivalTime()).thenReturn(200L);
queue.enqueue(message, null, null);
assertEquals("Wrong number of messages in queue", (long) 4, (long)
queue.getQueueDepthMessages());
assertEquals("Wrong size of messages in queue", (long) 100,
queue.getQueueDepthBytes());
message = createMessage(Long.valueOf(27), 20, 10);
- when(message.getArrivalTime()).thenReturn(500l);
+ when(message.getArrivalTime()).thenReturn(500L);
queue.enqueue(message, null, null);
assertEquals("Wrong number of messages in queue", (long) 3, (long)
queue.getQueueDepthMessages());
assertEquals("Wrong size of messages in queue", (long) 90,
queue.getQueueDepthBytes());
assertEquals("Wrong oldest message",
- 200l,
+ 200L,
((AbstractQueue)
queue).getEntries().getOldestEntry().getMessage().getArrivalTime());
}
@@ -1369,7 +1369,7 @@ abstract class AbstractQueueTestBase extends UnitTestBase
{
final List<QueueEntry> entries = new ArrayList<>();
- ServerMessage message = createMessage(1l);
+ ServerMessage message = createMessage(1L);
when(message.getArrivalTime()).thenReturn(arrivalTime);
when(message.getExpiration()).thenReturn(expiration);
queue.enqueue(message,null, null);
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
b/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
index c83a397072..53100caec0 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
@@ -49,11 +49,11 @@ public class LastValueQueueTest extends
AbstractQueueTestBase
public void testOldestMessage()
{
Queue<?> queue = getQueue();
- queue.enqueue(createMessage(1l, (byte)1,
Collections.singletonMap("lvqKey", (Object) "Z"), 10l), null, null);
- assertEquals(10l, queue.getOldestMessageArrivalTime());
- queue.enqueue(createMessage(2l, (byte)4,
Collections.singletonMap("lvqKey", (Object) "M"), 100l), null, null);
- assertEquals(10l, queue.getOldestMessageArrivalTime());
- queue.enqueue(createMessage(3l, (byte)9,
Collections.singletonMap("lvqKey", (Object) "Z"), 1000l), null, null);
- assertEquals(100l, queue.getOldestMessageArrivalTime());
+ queue.enqueue(createMessage(1L, (byte)1,
Collections.singletonMap("lvqKey", (Object) "Z"), 10L), null, null);
+ assertEquals(10L, queue.getOldestMessageArrivalTime());
+ queue.enqueue(createMessage(2L, (byte)4,
Collections.singletonMap("lvqKey", (Object) "M"), 100L), null, null);
+ assertEquals(10L, queue.getOldestMessageArrivalTime());
+ queue.enqueue(createMessage(3L, (byte)9,
Collections.singletonMap("lvqKey", (Object) "Z"), 1000L), null, null);
+ assertEquals(100L, queue.getOldestMessageArrivalTime());
}
}
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
b/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
index 2a754bdbd7..8dbc788ec4 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
@@ -48,7 +48,7 @@ public class NotificationCheckTest extends UnitTestBase
@Test
public void testMessageCountAlertFires() throws Exception
{
- when(_queue.getAlertThresholdQueueDepthMessages()).thenReturn(1000l);
+ when(_queue.getAlertThresholdQueueDepthMessages()).thenReturn(1000L);
when(_queue.getQueueDepthMessages()).thenReturn(999, 1000, 1001);
MESSAGE_COUNT_ALERT.notifyIfNecessary(_message, _queue, _listener);
@@ -64,8 +64,8 @@ public class NotificationCheckTest extends UnitTestBase
@Test
public void testMessageSizeAlertFires() throws Exception
{
- when(_queue.getAlertThresholdMessageSize()).thenReturn(1024l);
- when(_message.getSizeIncludingHeader()).thenReturn(1023l, 1024l,
1025l);
+ when(_queue.getAlertThresholdMessageSize()).thenReturn(1024L);
+ when(_message.getSizeIncludingHeader()).thenReturn(1023L, 1024L,
1025L);
MESSAGE_SIZE_ALERT.notifyIfNecessary(_message, _queue, _listener);
verifyNoInteractions(_listener);
@@ -81,7 +81,7 @@ public class NotificationCheckTest extends UnitTestBase
public void testMessageAgeAlertFires() throws Exception
{
long now = System.currentTimeMillis();
- when(_queue.getAlertThresholdMessageAge()).thenReturn(1000l);
+ when(_queue.getAlertThresholdMessageAge()).thenReturn(1000L);
when(_queue.getOldestMessageArrivalTime()).thenReturn(now, now -
15000);
MESSAGE_AGE_ALERT.notifyIfNecessary(_message, _queue, _listener);
@@ -95,8 +95,8 @@ public class NotificationCheckTest extends UnitTestBase
@Test
public void testQueueDepthAlertFires() throws Exception
{
- when(_queue.getAlertThresholdQueueDepthBytes()).thenReturn(1024l);
- when(_queue.getQueueDepthBytes()).thenReturn(1023l, 1024l, 2048l);
+ when(_queue.getAlertThresholdQueueDepthBytes()).thenReturn(1024L);
+ when(_queue.getQueueDepthBytes()).thenReturn(1023L, 1024L, 2048L);
QUEUE_DEPTH_ALERT.notifyIfNecessary(_message, _queue, _listener);
verifyNoInteractions(_listener);
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
index 5ca73da5a0..0426eb7bef 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
@@ -91,7 +91,7 @@ public abstract class QueueEntryListTestBase extends
UnitTestBase
public void testAddGenericMessage() throws Exception
{
final QueueEntryList list = getTestList();
- final ServerMessage message = createServerMessage(666l);
+ final ServerMessage message = createServerMessage(666L);
list.add(message, null);
final QueueEntryIterator iter = list.iterator();
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
b/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
index 9a0ea22d98..228a92d7cd 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
@@ -60,7 +60,7 @@ public class StandardQueueTest extends AbstractQueueTestBase
queue.open();
setQueue(queue);
- ServerMessage message = createMessage(25l);
+ ServerMessage message = createMessage(25L);
QueueConsumer consumer =
(QueueConsumer) getQueue().addConsumer(getConsumerTarget(),
null, message.getClass(), "test",
EnumSet.of(ConsumerOption.ACQUIRES,
@@ -86,7 +86,7 @@ public class StandardQueueTest extends AbstractQueueTestBase
// register consumer
queue.addConsumer(consumer,
null,
- createMessage(-1l).getClass(),
+ createMessage(-1L).getClass(),
"test",
EnumSet.of(ConsumerOption.ACQUIRES,
ConsumerOption.SEES_REQUEUES), 0);
@@ -98,8 +98,8 @@ public class StandardQueueTest extends AbstractQueueTestBase
// assert received messages
List<MessageInstance> messages = consumer.getMessages();
assertEquals("Only 2 messages should be returned", (long) 2, (long)
messages.size());
- assertEquals("ID of first message should be 1", 1l,
(messages.get(0).getMessage()).getMessageNumber());
- assertEquals("ID of second message should be 3", 3l,
(messages.get(1).getMessage()).getMessageNumber());
+ assertEquals("ID of first message should be 1", 1L,
(messages.get(0).getMessage()).getMessageNumber());
+ assertEquals("ID of second message should be 3", 3L,
(messages.get(1).getMessage()).getMessageNumber());
}
/**
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
b/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
index 67c1d1d8b3..376997ef41 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
@@ -51,10 +51,10 @@ import org.apache.qpid.test.utils.UnitTestBase;
public class BrokerStoreUpgraderAndRecovererTest extends UnitTestBase
{
- private static final long BROKER_CREATE_TIME = 1401385808828l;
+ private static final long BROKER_CREATE_TIME = 1401385808828L;
private static final String BROKER_NAME = "Broker";
private static final String VIRTUALHOST_NAME = "test";
- private static final long VIRTUALHOST_CREATE_TIME = 1401385905260l;
+ private static final long VIRTUALHOST_CREATE_TIME = 1401385905260L;
private static final String VIRTUALHOST_CREATED_BY = "webadmin";
private ConfiguredObjectRecord _brokerRecord;
@@ -1041,7 +1041,7 @@ public class BrokerStoreUpgraderAndRecovererTest extends
UnitTestBase
Map<String,Object> expectedAttributes = new HashMap<>();
expectedAttributes.put("name", "Broker");
expectedAttributes.put("modelVersion", BrokerModel.MODEL_VERSION);
- expectedAttributes.put("createdTime", 1401385808828l);
+ expectedAttributes.put("createdTime", 1401385808828L);
assertEquals("Unexpected broker attributes", expectedAttributes,
upgradedBrokerRecord.getAttributes());
}
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
b/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
index f74f60ebfe..f8489a6d36 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
@@ -122,7 +122,7 @@ public abstract class MessageStoreTestCase extends
UnitTestBase
@Test
public void testAddAndRemoveRecordXid() throws Exception
{
- long format = 1l;
+ long format = 1L;
EnqueueRecord enqueueRecord = getTestRecord(1);
TestRecord dequeueRecord = getTestRecord(2);
EnqueueRecord[] enqueues = { enqueueRecord };
@@ -277,7 +277,7 @@ public abstract class MessageStoreTestCase extends
UnitTestBase
@Test
public void testVisitDistributedTransactions() throws Exception
{
- long format = 1l;
+ long format = 1L;
byte[] branchId = new byte[] { 2 };
byte[] globalId = new byte[] { 1 };
EnqueueRecord enqueueRecord = getTestRecord(1);
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
index d1004ceba0..3cfa80a831 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
@@ -372,7 +372,7 @@ public class ConsumerTarget_0_10 extends
AbstractConsumerTarget<ConsumerTarget_0
restoreCredit(_deferredMessageCredit, _deferredSizeCredit);
_deferredMessageCredit = 0;
- _deferredSizeCredit = 0l;
+ _deferredSizeCredit = 0L;
}
}
@@ -530,10 +530,10 @@ public class ConsumerTarget_0_10 extends
AbstractConsumerTarget<ConsumerTarget_0
switch(flowMode)
{
case CREDIT:
- _creditManager = new CreditCreditManager(0l, 0l);
+ _creditManager = new CreditCreditManager(0L, 0L);
break;
case WINDOW:
- _creditManager = new WindowCreditManager(0l, 0l);
+ _creditManager = new WindowCreditManager(0L, 0L);
break;
default:
// this should never happen, as 0-10 is finalised and so the
enum should never change
diff --git
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
index 17ea7e58da..2da686c829 100644
---
a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
+++
b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
@@ -307,7 +307,7 @@ public class ServerSessionDelegate extends
MethodDelegate<ServerSession> impleme
exception(session, method,
ExecutionErrorCode.ILLEGAL_ARGUMENT, "Cannot parse value " + value + " as a
number for filter " + AMQPFilterTypes.REPLAY_PERIOD.toString());
return;
}
- final long startingFrom = System.currentTimeMillis() -
(1000l * period);
+ final long startingFrom = System.currentTimeMillis() -
(1000L * period);
if(filterManager == null)
{
filterManager = new FilterManager();
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
index c32bf4ec36..5dae7d101f 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
@@ -106,7 +106,7 @@ public class ServerSessionTest extends UnitTestBase
public void testOverlargeMessageTest() throws Exception
{
final Broker<?> broker = mock(Broker.class);
- when(broker.getContextValue(eq(Long.class),
eq(Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT))).thenReturn(0l);
+ when(broker.getContextValue(eq(Long.class),
eq(Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT))).thenReturn(0L);
AmqpPort port = createMockPort();
@@ -130,7 +130,7 @@ public class ServerSessionTest extends UnitTestBase
final Subject subject =
new Subject(false, Collections.singleton(principal),
Collections.emptySet(), Collections.emptySet());
when(modelConnection.getSubject()).thenReturn(subject);
- when(modelConnection.getMaxMessageSize()).thenReturn(1024l);
+ when(modelConnection.getMaxMessageSize()).thenReturn(1024L);
when(modelConnection.getCreatedTime()).thenReturn(new Date());
ServerConnection connection = new ServerConnection(1, broker, port,
Transport.TCP, modelConnection);
connection.setVirtualHost(_virtualHost);
diff --git
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
index d9ac43d8a5..05b9398123 100644
---
a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
+++
b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/WindowCreditManagerTest.java
@@ -44,7 +44,7 @@ public class WindowCreditManagerTest extends UnitTestBase
_protocolEngine = mock(ProtocolEngine.class);
when(_protocolEngine.isTransportBlockedForWriting()).thenReturn(false);
- _creditManager = new WindowCreditManager(0l, 0l);
+ _creditManager = new WindowCreditManager(0L, 0L);
}
/**
diff --git
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index 46b1109241..c379f7cd8e 100644
---
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
@@ -667,7 +667,7 @@ public class AMQChannel extends
AbstractAMQPSession<AMQChannel, ConsumerTarget_0
throw new AMQInvalidArgumentException("Cannot parse value
" + value + " as a number for filter " +
AMQPFilterTypes.REPLAY_PERIOD.toString());
}
- final long startingFrom = System.currentTimeMillis() - (1000l
* period);
+ final long startingFrom = System.currentTimeMillis() - (1000L
* period);
if(filterManager == null)
{
filterManager = new FilterManager();
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 75efa7a24e..d07132f800 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
@@ -622,7 +622,7 @@ public class BasicContentHeaderProperties
public synchronized void setExpiration(long expiration)
{
- if(expiration == 0l)
+ if(expiration == 0L)
{
_propertyFlags &= (~EXPIRATION_MASK);
}
diff --git
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/CompositeAMQDataBlock.java
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/CompositeAMQDataBlock.java
index 03bbb1bdd7..019ea7e00f 100644
---
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/CompositeAMQDataBlock.java
+++
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/CompositeAMQDataBlock.java
@@ -53,7 +53,7 @@ public class CompositeAMQDataBlock extends AMQDataBlock
implements EncodableAMQD
@Override
public long writePayload(final ByteBufferSender sender)
{
- long size = 0l;
+ long size = 0L;
for (int i = 0; i < _blocks.length; i++)
{
size += _blocks[i].writePayload(sender);
diff --git
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentBody.java
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentBody.java
index 0cf042397a..4f0449d018 100644
---
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentBody.java
+++
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentBody.java
@@ -76,7 +76,7 @@ public class ContentBody implements AMQBody
}
else
{
- return 0l;
+ return 0L;
}
}
diff --git
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/HeartbeatBody.java
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/HeartbeatBody.java
index b76f8a156e..1aa1ab2ace 100644
---
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/HeartbeatBody.java
+++
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/HeartbeatBody.java
@@ -62,7 +62,7 @@ public class HeartbeatBody implements AMQBody
@Override
public long writePayload(final ByteBufferSender sender)
{
- return 0l;
+ return 0L;
}
@Override
diff --git
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolInitiation.java
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolInitiation.java
index 7fa6254c3a..6c607c42ff 100644
---
a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolInitiation.java
+++
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolInitiation.java
@@ -92,7 +92,7 @@ public class ProtocolInitiation extends AMQDataBlock
implements EncodableAMQData
data[6] = _protocolMajor;
data[7] = _protocolMinor;
sender.send(QpidByteBuffer.wrap(data));
- return 8l;
+ return 8L;
}
@Override
diff --git
a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
index ac2f035f0e..1c9a2dcfa5 100644
---
a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
+++
b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
@@ -92,13 +92,13 @@ public class AMQChannelTest extends UnitTestBase
_broker = mock(Broker.class);
when(_broker.getEventLogger()).thenReturn(mock(EventLogger.class));
- when(_broker.getContextValue(Long.class,
Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT)).thenReturn(1l);
+ when(_broker.getContextValue(Long.class,
Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT)).thenReturn(1L);
_messageStore = mock(MessageStore.class);
_virtualHost = mock(QueueManagingVirtualHost.class);
when(_virtualHost.getContextValue(Integer.class,
Broker.MESSAGE_COMPRESSION_THRESHOLD_SIZE)).thenReturn(1);
- when(_virtualHost.getContextValue(Long.class,
Connection.MAX_UNCOMMITTED_IN_MEMORY_SIZE)).thenReturn(1l);
+ when(_virtualHost.getContextValue(Long.class,
Connection.MAX_UNCOMMITTED_IN_MEMORY_SIZE)).thenReturn(1L);
when(_virtualHost.getContextValue(Boolean.class,
Broker.BROKER_MSG_AUTH)).thenReturn(false);
when(_virtualHost.getPrincipal()).thenReturn(mock(Principal.class));
when(_virtualHost.getEventLogger()).thenReturn(mock(EventLogger.class));
@@ -172,7 +172,7 @@ public class AMQChannelTest extends UnitTestBase
{
when(_virtualHost.getDefaultDestination()).thenReturn(mock(MessageDestination.class));
- long maximumMessageSize = 1024l;
+ long maximumMessageSize = 1024L;
when(_amqConnection.getMaxMessageSize()).thenReturn(maximumMessageSize);
AMQChannel channel = new AMQChannel(_amqConnection, 1,
_virtualHost.getMessageStore());
diff --git
a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
index 1edaac0439..14e9c29405 100644
---
a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
+++
b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java
@@ -111,7 +111,7 @@ public class AMQPConnection_0_8Test extends UnitTestBase
when(_broker.getTaskExecutor()).thenReturn(_taskExecutor);
when(_broker.getChildExecutor()).thenReturn(_taskExecutor);
when(_broker.getEventLogger()).thenReturn(value);
- when(_broker.getContextValue(eq(Long.class),
eq(Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT))).thenReturn(0l);
+ when(_broker.getContextValue(eq(Long.class),
eq(Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT))).thenReturn(0L);
_virtualHostNode = mock(VirtualHostNode.class);
when(_virtualHostNode.getParent()).thenReturn(_broker);
@@ -131,7 +131,7 @@ public class AMQPConnection_0_8Test extends UnitTestBase
when(_virtualHost.getTaskExecutor()).thenReturn(_taskExecutor);
when(_virtualHost.getPrincipal()).thenReturn(virtualHostPrincipal);
when(_virtualHost.getContextValue(Integer.class,
Broker.MESSAGE_COMPRESSION_THRESHOLD_SIZE)).thenReturn(1024);
- when(_virtualHost.getContextValue(Long.class,
Connection.MAX_UNCOMMITTED_IN_MEMORY_SIZE)).thenReturn(1024l);
+ when(_virtualHost.getContextValue(Long.class,
Connection.MAX_UNCOMMITTED_IN_MEMORY_SIZE)).thenReturn(1024L);
when(_virtualHost.getContextValue(Boolean.class,
Broker.BROKER_MSG_AUTH)).thenReturn(false);
when(_virtualHost.authoriseCreateConnection(any(AMQPConnection.class))).thenReturn(true);
when(_virtualHost.getEventLogger()).thenReturn(value);
@@ -154,7 +154,7 @@ public class AMQPConnection_0_8Test extends UnitTestBase
when(_port.getModel()).thenReturn(model);
when(_port.getAuthenticationProvider()).thenReturn(authenticationProvider);
when(_port.getAddressSpace(VIRTUAL_HOST_NAME)).thenReturn(_virtualHost);
- when(_port.getContextValue(Long.class,
Port.CONNECTION_MAXIMUM_AUTHENTICATION_DELAY)).thenReturn(2500l);
+ when(_port.getContextValue(Long.class,
Port.CONNECTION_MAXIMUM_AUTHENTICATION_DELAY)).thenReturn(2500L);
when(_port.getContextValue(Integer.class,
Connection.MAX_MESSAGE_SIZE)).thenReturn(Connection.DEFAULT_MAX_MESSAGE_SIZE);
when(_port.getSubjectCreator(eq(false),
anyString())).thenReturn(subjectCreator);
diff --git
a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java
b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java
index ba25df7c93..206cb1eb5b 100644
---
a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java
+++
b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java
@@ -159,7 +159,7 @@ public class BasicContentHeaderPropertiesTest extends
UnitTestBase
long expiration = 999999999;
_testProperties.setExpiration(expiration);
assertEquals(expiration, _testProperties.getExpiration());
- expiration = 0l;
+ expiration = 0L;
_testProperties.setExpiration(expiration);
assertEquals(expiration, _testProperties.getExpiration());
}
diff --git
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
index ca3b0359de..6d1a37f88c 100644
---
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
+++
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
@@ -88,7 +88,9 @@ public class MessageConverter_Internal_to_v1_0 extends
MessageConverter_to_1_0<I
header.setDurable(serverMessage.isPersistent());
header.setPriority(UnsignedByte.valueOf(serverMessage.getMessageHeader().getPriority()));
- if(serverMessage.getExpiration() != 0l &&
serverMessage.getArrivalTime() !=0l && serverMessage.getExpiration() >=
serverMessage.getArrivalTime())
+ if(serverMessage.getExpiration() != 0L &&
+ serverMessage.getArrivalTime() != 0L &&
+ serverMessage.getExpiration() >=
serverMessage.getArrivalTime())
{
header.setTtl(UnsignedInteger.valueOf(serverMessage.getExpiration()-serverMessage.getArrivalTime()));
}
diff --git
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DecimalConstructor.java
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DecimalConstructor.java
index cf91f99d24..7e07d979dc 100644
---
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DecimalConstructor.java
+++
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DecimalConstructor.java
@@ -102,20 +102,20 @@ public abstract class DecimalConstructor implements
TypeConstructor<BigDecimal>
private static BigDecimal constructFrom128(long high, long low)
{
- int sign = ((high & 0x8000000000000000l) == 0) ? 1 : -1;
+ int sign = ((high & 0x8000000000000000L) == 0) ? 1 : -1;
int exponent = 0;
long significand = high;
- if((high & 0x6000000000000000l) != 0x6000000000000000l)
+ if((high & 0x6000000000000000L) != 0x6000000000000000L)
{
- exponent = ((int) ((high & 0x7FFE000000000000l) >> 49)) - 6176;
- significand = high & 0x0001ffffffffffffl;
+ exponent = ((int) ((high & 0x7FFE000000000000L) >> 49)) - 6176;
+ significand = high & 0x0001ffffffffffffL;
}
- else if((high & 0x7800000000000000l) != 0x7800000000000000l)
+ else if((high & 0x7800000000000000L) != 0x7800000000000000L)
{
- exponent = ((int)((high & 0x1fff800000000000l)>>47)) - 6176;
- significand = (0x00007fffffffffffl & high) | 0x0004000000000000l;
+ exponent = ((int)((high & 0x1fff800000000000L) >> 47)) - 6176;
+ significand = (0x00007fffffffffffL & high) | 0x0004000000000000L;
}
else
{
@@ -133,7 +133,7 @@ public abstract class DecimalConstructor implements
TypeConstructor<BigDecimal>
{
bigDecimal = bigDecimal.add(TWO_TO_THE_SIXTY_FOUR.add(new
BigDecimal(low)));
}
- if(((high & 0x8000000000000000l) != 0))
+ if(((high & 0x8000000000000000L) != 0))
{
bigDecimal = bigDecimal.negate();
}
@@ -144,20 +144,20 @@ public abstract class DecimalConstructor implements
TypeConstructor<BigDecimal>
private static BigDecimal constructFrom64(final long val)
{
- int sign = ((val & 0x8000000000000000l) == 0) ? 1 : -1;
+ int sign = ((val & 0x8000000000000000L) == 0) ? 1 : -1;
int exponent = 0;
long significand = val;
- if((val & 0x6000000000000000l) != 0x6000000000000000l)
+ if((val & 0x6000000000000000L) != 0x6000000000000000L)
{
- exponent = ((int) ((val & 0x7FE0000000000000l) >> 53)) - 398;
- significand = val & 0x001fffffffffffffl;
+ exponent = ((int) ((val & 0x7FE0000000000000L) >> 53)) - 398;
+ significand = val & 0x001fffffffffffffL;
}
- else if((val & 0x7800000000000000l) != 0x7800000000000000l)
+ else if((val & 0x7800000000000000L) != 0x7800000000000000L)
{
- exponent = ((int)((val & 0x1ff8000000000000l)>>51)) - 398;
- significand = (0x0007ffffffffffffl & val) | 0x0020000000000000l;
+ exponent = ((int)((val & 0x1ff8000000000000L) >> 51)) - 398;
+ significand = (0x0007ffffffffffffL & val) | 0x0020000000000000L;
}
else
{
diff --git
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java
index d8708a2231..564ec317a9 100644
---
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java
+++
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java
@@ -62,7 +62,7 @@ public final class UnsignedByte extends Number implements
Comparable<UnsignedByt
@Override
public long longValue()
{
- return ((long) _underlying) & 0xFFl;
+ return ((long) _underlying) & 0xFFL;
}
@Override
diff --git
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java
index 99f312dccf..1afabbd108 100644
---
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java
+++
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java
@@ -55,7 +55,7 @@ public final class UnsignedInteger extends Number implements
Comparable<Unsigned
@Override
public long longValue()
{
- return ((long) _underlying) & 0xFFFFFFFFl;
+ return ((long) _underlying) & 0xFFFFFFFFL;
}
@Override
diff --git
a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java
b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java
index 17b031c6c6..7df98f7c4a 100644
---
a/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java
+++
b/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java
@@ -65,7 +65,7 @@ public abstract class AbstractDerbyMessageStore extends
AbstractJDBCMessageStore
_persistentSizeHighThreshold =
sizeMonitorSettings.getStoreOverfullSize();
_persistentSizeLowThreshold =
sizeMonitorSettings.getStoreUnderfullSize();
- if (_persistentSizeLowThreshold > _persistentSizeHighThreshold ||
_persistentSizeLowThreshold < 0l)
+ if (_persistentSizeLowThreshold > _persistentSizeHighThreshold ||
_persistentSizeLowThreshold < 0L)
{
_persistentSizeLowThreshold = _persistentSizeHighThreshold;
}
@@ -244,7 +244,7 @@ public abstract class AbstractDerbyMessageStore extends
AbstractJDBCMessageStore
stmt = conn.prepareStatement(sizeQuery);
ResultSet rs = null;
- long size = 0l;
+ long size = 0L;
try
{
diff --git
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java
index 895c312c84..1b939299ed 100644
---
a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java
+++
b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java
@@ -216,19 +216,19 @@ public class BrokerLoggerTest extends UnitTestBase
String loggerName = getTestName();
Logger messageLogger = LoggerFactory.getLogger(loggerName);
- assertEquals(0l, _brokerLogger.getWarnCount());
- assertEquals(0l, _brokerLogger.getErrorCount());
+ assertEquals(0L, _brokerLogger.getWarnCount());
+ assertEquals(0L, _brokerLogger.getErrorCount());
attributes =
createBrokerNameAndLevelLogInclusionRuleAttributes(loggerName, LogLevel.WARN);
BrokerLogInclusionRule warnFilter =
_brokerLogger.createChild(BrokerLogInclusionRule.class, attributes);
messageLogger.warn("warn");
- assertEquals(1l, _brokerLogger.getWarnCount());
- assertEquals(0l, _brokerLogger.getErrorCount());
+ assertEquals(1L, _brokerLogger.getWarnCount());
+ assertEquals(0L, _brokerLogger.getErrorCount());
messageLogger.error("error");
- assertEquals(1l, _brokerLogger.getWarnCount());
- assertEquals(1l, _brokerLogger.getErrorCount());
+ assertEquals(1L, _brokerLogger.getWarnCount());
+ assertEquals(1L, _brokerLogger.getErrorCount());
warnFilter.delete();
@@ -236,11 +236,11 @@ public class BrokerLoggerTest extends UnitTestBase
BrokerLogInclusionRule errorFilter =
_brokerLogger.createChild(BrokerLogInclusionRule.class, attributes);
messageLogger.warn("warn");
- assertEquals(1l, _brokerLogger.getWarnCount());
- assertEquals(1l, _brokerLogger.getErrorCount());
+ assertEquals(1L, _brokerLogger.getWarnCount());
+ assertEquals(1L, _brokerLogger.getErrorCount());
messageLogger.error("error");
- assertEquals(1l, _brokerLogger.getWarnCount());
- assertEquals(2l, _brokerLogger.getErrorCount());
+ assertEquals(1L, _brokerLogger.getWarnCount());
+ assertEquals(2L, _brokerLogger.getErrorCount());
errorFilter.delete();
}
diff --git
a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
index 8f88cecdf2..aebf33ede8 100644
---
a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
+++
b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
@@ -71,7 +71,7 @@ public class HttpManagementTest extends UnitTestBase
attributes.put(HttpManagement.HTTP_SASL_AUTHENTICATION_ENABLED, false);
attributes.put(HttpManagement.HTTPS_SASL_AUTHENTICATION_ENABLED, true);
attributes.put(HttpManagement.NAME, getTestName());
- attributes.put(HttpManagement.TIME_OUT, 10000l);
+ attributes.put(HttpManagement.TIME_OUT, 10000L);
attributes.put(ConfiguredObject.ID, _id);
attributes.put(HttpManagement.DESIRED_STATE, State.QUIESCED);
_management = new HttpManagement(attributes, _broker);
@@ -81,7 +81,7 @@ public class HttpManagementTest extends UnitTestBase
@Test
public void testGetSessionTimeout()
{
- assertEquals("Unexpected session timeout", 10000l, (long)
_management.getSessionTimeout());
+ assertEquals("Unexpected session timeout", 10000L, (long)
_management.getSessionTimeout());
}
@Test
diff --git
a/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
b/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
index add348ea6a..faff71a81c 100644
---
a/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
+++
b/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
@@ -68,7 +68,7 @@ public class ConsumerParticipant implements Participant
{
_jmsDelegate = delegate;
_command = command;
- _syncReceiveTimeout = _command.getReceiveTimeout() > 0 ?
_command.getReceiveTimeout() : 50l;
+ _syncReceiveTimeout = _command.getReceiveTimeout() > 0 ?
_command.getReceiveTimeout() : 50L;
_batchSize = _command.getBatchSize();
_batchEnabled = _batchSize > 0;
diff --git
a/perftests/src/test/java/org/apache/qpid/disttest/client/ConsumerParticipantTest.java
b/perftests/src/test/java/org/apache/qpid/disttest/client/ConsumerParticipantTest.java
index 1af6ff39ef..c6c14df4e5 100644
---
a/perftests/src/test/java/org/apache/qpid/disttest/client/ConsumerParticipantTest.java
+++
b/perftests/src/test/java/org/apache/qpid/disttest/client/ConsumerParticipantTest.java
@@ -56,7 +56,7 @@ public class ConsumerParticipantTest extends UnitTestBase
private static final long RECEIVE_TIMEOUT = 100;
private static final String CLIENT_NAME = "CLIENT_NAME";
private static final int PAYLOAD_SIZE_PER_MESSAGE = 1024;
- public static final long MAXIMUM_DURATION = 100l;
+ public static final long MAXIMUM_DURATION = 100L;
private final Message _mockMessage = mock(Message.class);
private final CreateConsumerCommand _command = new CreateConsumerCommand();
diff --git
a/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestInstanceTest.java
b/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestInstanceTest.java
index 0fd709fcb6..ad42d50a23 100644
---
a/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestInstanceTest.java
+++
b/perftests/src/test/java/org/apache/qpid/disttest/controller/config/TestInstanceTest.java
@@ -64,10 +64,10 @@ public class TestInstanceTest extends UnitTestBase
{
_noOpCommand = mock(NoOpCommand.class);
_createProducerCommand = mock(CreateProducerCommand.class);
- when(_createProducerCommand.getMaximumDuration()).thenReturn(1l);
+ when(_createProducerCommand.getMaximumDuration()).thenReturn(1L);
_createConsumerCommand = mock(CreateConsumerCommand.class);
- when(_createConsumerCommand.getMaximumDuration()).thenReturn(1l);
+ when(_createConsumerCommand.getMaximumDuration()).thenReturn(1L);
}
@Test
diff --git
a/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsTestFixture.java
b/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsTestFixture.java
index 2933e937d3..fff40728ec 100644
---
a/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsTestFixture.java
+++
b/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsTestFixture.java
@@ -122,8 +122,8 @@ public class ResultsTestFixture
participantAttributes.put(THROUGHPUT, THROUGHPUT_VALUE);
participantAttributes.put(TIME_TAKEN, 1000);
participantAttributes.put(ERROR_MESSAGE, "error");
- participantAttributes.put(MIN_LATENCY, 2l);
- participantAttributes.put(MAX_LATENCY, 9l);
+ participantAttributes.put(MIN_LATENCY, 2L);
+ participantAttributes.put(MAX_LATENCY, 9L);
participantAttributes.put(AVERAGE_LATENCY, 4.6f);
participantAttributes.put(LATENCY_STANDARD_DEVIATION, 2.0f);
participantAttributes.put(MESSAGE_THROUGHPUT, 2);
diff --git
a/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/SeriesStatisticsTest.java
b/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/SeriesStatisticsTest.java
index 4378fe8a3d..77350ae2cb 100644
---
a/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/SeriesStatisticsTest.java
+++
b/perftests/src/test/java/org/apache/qpid/disttest/results/aggregation/SeriesStatisticsTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertNull;
public class SeriesStatisticsTest extends UnitTestBase
{
- public static Collection<Long> SERIES = Arrays.asList(new Long[] { 2l, 4l,
4l, 4l, 5l, 5l, 7l, 9l, 5l });
+ public static Collection<Long> SERIES = Arrays.asList(new Long[] {2L, 4L,
4L, 4L, 5L, 5L, 7L, 9L, 5L});
@Test
public void testAggregate()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
