You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2021/06/08 10:24:16 UTC
[qpid-broker-j] branch main updated: QPID-8537: replace use of
constructors marked deprecated-for-removal
This is an automated email from the ASF dual-hosted git repository.
robbie 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 42abe9f QPID-8537: replace use of constructors marked deprecated-for-removal
42abe9f is described below
commit 42abe9fdd53e758574ddd68a6c0a88e05c88d214
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue Jun 8 11:22:50 2021 +0100
QPID-8537: replace use of constructors marked deprecated-for-removal
---
.../store/berkeleydb/BDBHAVirtualHostNodeTest.java | 2 +-
.../upgrade/AbstractUpgradeTestCase.java | 2 +-
.../berkeleydb/upgrade/MapJsonSerializerTest.java | 4 +-
.../berkeleydb/replication/MultiNodeTest.java | 6 +-
.../qpid/server/filter/ConstantExpression.java | 2 +-
.../qpid/server/queue/AbstractQueueTestBase.java | 88 +++++++++++-----------
.../org/apache/qpid/server/store/TestRecord.java | 2 +-
.../apache/qpid/server/protocol/v0_8/AMQType.java | 2 +-
.../management/amqp/ManagementInputConverter.java | 12 +--
.../src/main/markdown/code-guide.md | 2 +-
.../qpid/disttest/client/MessageProviderTest.java | 6 +-
.../client/property/ListPropertyValueTest.java | 26 +++----
.../client/property/RandomPropertyValueTest.java | 4 +-
.../client/property/RangePropertyValueTest.java | 6 +-
.../client/property/SimplePropertyValueTest.java | 22 +-----
.../qpid/disttest/message/JsonHandlerTest.java | 2 +-
16 files changed, 87 insertions(+), 101 deletions(-)
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 1609c7c..9e457f5 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
@@ -829,7 +829,7 @@ public class BDBHAVirtualHostNodeTest extends UnitTestBase
Thread.sleep(100l);
}
assertEquals("Last transaction was not replicated",
- new Long(remote.getLastKnownReplicationTransactionId()),
+ Long.valueOf(remote.getLastKnownReplicationTransactionId()),
node1.getLastKnownReplicationTransactionId());
}
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
index 30dc494..e261cab 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
@@ -177,7 +177,7 @@ public abstract class AbstractUpgradeTestCase extends UnitTestBase
@Override
public Long call(Database sourceDatabase, Database targetDatabase, Transaction transaction)
{
- return new Long(sourceDatabase.count());
+ return Long.valueOf(sourceDatabase.count());
}
};
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
index 744ea72..3ac34b1 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
@@ -46,8 +46,8 @@ public class MapJsonSerializerTest extends UnitTestBase
{
Map<String, Object> testMap = new HashMap<>();
testMap.put("string", "Test String");
- testMap.put("integer", new Integer(10));
- testMap.put("long", new Long(Long.MAX_VALUE));
+ testMap.put("integer", Integer.valueOf(10));
+ testMap.put("long", Long.valueOf(Long.MAX_VALUE));
testMap.put("boolean", Boolean.TRUE);
String jsonString = _serializer.serialize(testMap);
diff --git a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
index 1776ea8..91f8b45 100644
--- a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
+++ b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
@@ -577,7 +577,7 @@ public class MultiNodeTest extends GroupJmsTestBase
LOGGER.info("Active connection port {}", activeBrokerPort);
List<Integer> inactivePorts = new ArrayList<>(ports);
- inactivePorts.remove(new Integer(activeBrokerPort));
+ inactivePorts.remove(Integer.valueOf(activeBrokerPort));
final CountDownLatch latch = new CountDownLatch(inactivePorts.size());
for (int port : inactivePorts)
@@ -718,14 +718,14 @@ public class MultiNodeTest extends GroupJmsTestBase
Map<String, Object> attributes = getBrokerAdmin().getNodeAttributes(activeBrokerPort);
assertEquals("Broker has unexpected quorum override",
- new Integer(0),
+ Integer.valueOf(0),
attributes.get(BDBHAVirtualHostNode.QUORUM_OVERRIDE));
getBrokerAdmin().setNodeAttributes(activeBrokerPort,
Collections.singletonMap(BDBHAVirtualHostNode.QUORUM_OVERRIDE, 1));
attributes = getBrokerAdmin().getNodeAttributes(activeBrokerPort);
assertEquals("Broker has unexpected quorum override",
- new Integer(1),
+ Integer.valueOf(1),
attributes.get(BDBHAVirtualHostNode.QUORUM_OVERRIDE));
_failoverListener.awaitFailoverCompletion(FAILOVER_COMPLETION_TIMEOUT);
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java b/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
index 95f7da6..35b2f52 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
@@ -125,7 +125,7 @@ public class ConstantExpression<T> implements Expression<T>
public static <E> ConstantExpression<E> createFloat(String text)
{
- Number value = new Double(text);
+ Number value = Double.valueOf(text);
return new ConstantExpression<>(value);
}
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 833bde0..04c98b9 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
@@ -183,7 +183,7 @@ abstract class AbstractQueueTestBase extends UnitTestBase
@Test
public void testRegisterConsumerThenEnqueueMessage() throws Exception
{
- ServerMessage messageA = createMessage(new Long(24));
+ ServerMessage messageA = createMessage(Long.valueOf(24));
// Check adding a consumer adds it to the queue
_consumer = (QueueConsumer<?,?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
@@ -205,7 +205,7 @@ abstract class AbstractQueueTestBase extends UnitTestBase
assertFalse("Queue still has consumer", 1 == _queue.getConsumerCount());
assertFalse("Queue still has active consumer", 1 == _queue.getConsumerCountWithCredit());
- ServerMessage messageB = createMessage(new Long (25));
+ ServerMessage messageB = createMessage(Long.valueOf(25));
_queue.enqueue(messageB, null, null);
assertNull(_consumer.getQueueContext());
}
@@ -213,7 +213,7 @@ abstract class AbstractQueueTestBase extends UnitTestBase
@Test
public void testEnqueueMessageThenRegisterConsumer() throws Exception, InterruptedException
{
- ServerMessage messageA = createMessage(new Long(24));
+ ServerMessage messageA = createMessage(Long.valueOf(24));
_queue.enqueue(messageA, null, null);
_consumer = (QueueConsumer<?,?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
EnumSet.of(ConsumerOption.ACQUIRES,
@@ -230,8 +230,8 @@ abstract class AbstractQueueTestBase extends UnitTestBase
@Test
public void testEnqueueTwoMessagesThenRegisterConsumer() throws Exception
{
- ServerMessage messageA = createMessage(new Long(24));
- ServerMessage messageB = createMessage(new Long(25));
+ ServerMessage messageA = createMessage(Long.valueOf(24));
+ ServerMessage messageB = createMessage(Long.valueOf(25));
_queue.enqueue(messageA, null, null);
_queue.enqueue(messageB, null, null);
_consumer = (QueueConsumer<?,?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
@@ -254,7 +254,7 @@ abstract class AbstractQueueTestBase extends UnitTestBase
_queue = _virtualHost.createChild(Queue.class, attributes);
- ServerMessage messageA = createMessage(new Long(24));
+ ServerMessage messageA = createMessage(Long.valueOf(24));
AMQMessageHeader messageHeader = messageA.getMessageHeader();
when(messageHeader.getNotValidBefore()).thenReturn(System.currentTimeMillis()+20000L);
_queue.enqueue(messageA, null, null);
@@ -285,7 +285,7 @@ abstract class AbstractQueueTestBase extends UnitTestBase
_queue = _virtualHost.createChild(Queue.class, attributes);
- ServerMessage messageA = createMessage(new Long(24));
+ ServerMessage messageA = createMessage(Long.valueOf(24));
AMQMessageHeader messageHeader = messageA.getMessageHeader();
when(messageHeader.getNotValidBefore()).thenReturn(System.currentTimeMillis()+20000L);
_queue.enqueue(messageA, null, null);
@@ -310,11 +310,11 @@ abstract class AbstractQueueTestBase extends UnitTestBase
_queue = _virtualHost.createChild(Queue.class, attributes);
- ServerMessage messageA = createMessage(new Long(24));
+ ServerMessage messageA = createMessage(Long.valueOf(24));
AMQMessageHeader messageHeader = messageA.getMessageHeader();
when(messageHeader.getNotValidBefore()).thenReturn(System.currentTimeMillis()+20000L);
_queue.enqueue(messageA, null, null);
- ServerMessage messageB = createMessage(new Long(25));
+ ServerMessage messageB = createMessage(Long.valueOf(25));
_queue.enqueue(messageB, null, null);
_consumer = (QueueConsumer<?,?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
@@ -347,9 +347,9 @@ abstract class AbstractQueueTestBase extends UnitTestBase
public void testReleasedMessageIsResentToSubscriber() throws Exception
{
- ServerMessage messageA = createMessage(new Long(24));
- ServerMessage messageB = createMessage(new Long(25));
- ServerMessage messageC = createMessage(new Long(26));
+ ServerMessage messageA = createMessage(Long.valueOf(24));
+ ServerMessage messageB = createMessage(Long.valueOf(25));
+ ServerMessage messageC = createMessage(Long.valueOf(26));
_consumer = (QueueConsumer<?,?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
@@ -398,7 +398,7 @@ abstract class AbstractQueueTestBase extends UnitTestBase
@Test
public void testReleaseMessageThatBecomesExpiredIsNotRedelivered() throws Exception
{
- ServerMessage messageA = createMessage(new Long(24));
+ ServerMessage messageA = createMessage(Long.valueOf(24));
final CountDownLatch sendIndicator = new CountDownLatch(1);
_consumerTarget = new TestConsumerTarget()
{
@@ -496,9 +496,9 @@ abstract class AbstractQueueTestBase extends UnitTestBase
public void testReleasedOutOfComparableOrderAreRedelivered() throws Exception
{
- ServerMessage messageA = createMessage(new Long(24));
- ServerMessage messageB = createMessage(new Long(25));
- ServerMessage messageC = createMessage(new Long(26));
+ ServerMessage messageA = createMessage(Long.valueOf(24));
+ ServerMessage messageB = createMessage(Long.valueOf(25));
+ ServerMessage messageC = createMessage(Long.valueOf(26));
_consumer = (QueueConsumer<?,?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
EnumSet.of(ConsumerOption.ACQUIRES,
@@ -547,8 +547,8 @@ abstract class AbstractQueueTestBase extends UnitTestBase
@Test
public void testReleaseForQueueWithMultipleConsumers() throws Exception
{
- ServerMessage messageA = createMessage(new Long(24));
- ServerMessage messageB = createMessage(new Long(25));
+ ServerMessage messageA = createMessage(Long.valueOf(24));
+ ServerMessage messageB = createMessage(Long.valueOf(25));
TestConsumerTarget target1 = new TestConsumerTarget();
TestConsumerTarget target2 = new TestConsumerTarget();
@@ -596,7 +596,7 @@ abstract class AbstractQueueTestBase extends UnitTestBase
@Test
public void testExclusiveConsumer() throws Exception
{
- ServerMessage messageA = createMessage(new Long(24));
+ ServerMessage messageA = createMessage(Long.valueOf(24));
// Check adding an exclusive consumer adds it to the queue
_consumer = (QueueConsumer<?,?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
@@ -682,11 +682,11 @@ abstract class AbstractQueueTestBase extends UnitTestBase
{
assertFalse("Message with id " + dequeueMessageIndex
+ " was dequeued and should not be returned by method getMessagesOnTheQueue!",
- new Long(expectedId).equals(id));
+ Long.valueOf(expectedId).equals(id));
expectedId++;
}
assertEquals("Expected message with id " + expectedId + " but got message with id " + id,
- new Long(expectedId),
+ Long.valueOf(expectedId),
id);
expectedId++;
}
@@ -734,11 +734,11 @@ abstract class AbstractQueueTestBase extends UnitTestBase
{
assertFalse("Message with id " + dequeueMessageIndex
+ " was dequeued and should not be returned by method getMessagesOnTheQueue!",
- new Long(expectedId).equals(id));
+ Long.valueOf(expectedId).equals(id));
expectedId++;
}
assertEquals("Expected message with id " + expectedId + " but got message with id " + id,
- new Long(expectedId),
+ Long.valueOf(expectedId),
id);
expectedId++;
}
@@ -780,10 +780,10 @@ abstract class AbstractQueueTestBase extends UnitTestBase
_queue.setAttributes(Collections.<String, Object>singletonMap(Queue.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES,
Integer.valueOf(2)));
- _queue.enqueue(createMessage(new Long(24)), null, null);
+ _queue.enqueue(createMessage(Long.valueOf(24)), null, null);
verifyNoInteractions(listener);
- _queue.enqueue(createMessage(new Long(25)), null, null);
+ _queue.enqueue(createMessage(Long.valueOf(25)), null, null);
verify(listener, atLeastOnce()).notifyClients(eq(NotificationCheck.MESSAGE_COUNT_ALERT), eq(_queue), contains("Maximum count on queue threshold"));
}
@@ -793,9 +793,9 @@ abstract class AbstractQueueTestBase extends UnitTestBase
{
QueueNotificationListener listener = mock(QueueNotificationListener .class);
- _queue.enqueue(createMessage(new Long(24)), null, null);
- _queue.enqueue(createMessage(new Long(25)), null, null);
- _queue.enqueue(createMessage(new Long(26)), null, null);
+ _queue.enqueue(createMessage(Long.valueOf(24)), null, null);
+ _queue.enqueue(createMessage(Long.valueOf(25)), null, null);
+ _queue.enqueue(createMessage(Long.valueOf(26)), null, null);
_queue.setNotificationListener(listener);
_queue.setAttributes(Collections.<String, Object>singletonMap(Queue.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES,
@@ -901,13 +901,13 @@ abstract class AbstractQueueTestBase extends UnitTestBase
Queue<?> queue = getQueue();
queue.setAttributes(attributes);
- ServerMessage message = createMessage(new Long(24), 50, 50);
+ ServerMessage message = createMessage(Long.valueOf(24), 50, 50);
when(message.getArrivalTime()).thenReturn(10l);
queue.enqueue(message, null, null);
- message = createMessage(new Long(25), 50, 50);
+ message = createMessage(Long.valueOf(25), 50, 50);
when(message.getArrivalTime()).thenReturn(50l);
queue.enqueue(message, null, null);
- message = createMessage(new Long(26), 50, 50);
+ message = createMessage(Long.valueOf(26), 50, 50);
when(message.getArrivalTime()).thenReturn(200l);
queue.enqueue(message, null, null);
@@ -928,19 +928,19 @@ abstract class AbstractQueueTestBase extends UnitTestBase
Queue<?> queue = getQueue();
queue.setAttributes(attributes);
- ServerMessage message = createMessage(new Long(24), 10, 10);
+ ServerMessage message = createMessage(Long.valueOf(24), 10, 10);
when(message.getArrivalTime()).thenReturn(10l);
queue.enqueue(message, null, null);
- message = createMessage(new Long(25), 10, 10);
+ message = createMessage(Long.valueOf(25), 10, 10);
when(message.getArrivalTime()).thenReturn(50l);
queue.enqueue(message, null, null);
- message = createMessage(new Long(26), 10, 10);
+ message = createMessage(Long.valueOf(26), 10, 10);
when(message.getArrivalTime()).thenReturn(200l);
queue.enqueue(message, null, null);
- message = createMessage(new Long(27), 10, 10);
+ message = createMessage(Long.valueOf(27), 10, 10);
when(message.getArrivalTime()).thenReturn(500l);
queue.enqueue(message, null, null);
- message = createMessage(new Long(28), 10, 10);
+ message = createMessage(Long.valueOf(28), 10, 10);
when(message.getArrivalTime()).thenReturn(1000l);
queue.enqueue(message, null, null);
@@ -962,23 +962,23 @@ abstract class AbstractQueueTestBase extends UnitTestBase
Queue<?> queue = getQueue();
queue.setAttributes(attributes);
- ServerMessage message = createMessage(new Long(24), 10, 10);
+ ServerMessage message = createMessage(Long.valueOf(24), 10, 10);
when(message.getArrivalTime()).thenReturn(10l);
queue.enqueue(message, null, null);
- message = createMessage(new Long(25), 10, 10);
+ message = createMessage(Long.valueOf(25), 10, 10);
when(message.getArrivalTime()).thenReturn(50l);
queue.enqueue(message, null, null);
- message = createMessage(new Long(26), 20, 10);
+ message = createMessage(Long.valueOf(26), 20, 10);
when(message.getArrivalTime()).thenReturn(200l);
queue.enqueue(message, null, null);
- message = createMessage(new Long(27), 20, 10);
+ message = createMessage(Long.valueOf(27), 20, 10);
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(new Long(27), 20, 10);
+ message = createMessage(Long.valueOf(27), 20, 10);
when(message.getArrivalTime()).thenReturn(500l);
queue.enqueue(message, null, null);
@@ -1002,7 +1002,7 @@ abstract class AbstractQueueTestBase extends UnitTestBase
ServerMessage message;
RoutingResult result;
- message = createMessage(new Long(27), 20, 10);
+ message = createMessage(Long.valueOf(27), 20, 10);
result = queue.route(message, message.getInitialRoutingAddress(), null);
assertTrue("Result should include not accepting route", result.isRejected());
@@ -1015,7 +1015,7 @@ abstract class AbstractQueueTestBase extends UnitTestBase
attributes.put(Queue.MAXIMUM_QUEUE_DEPTH_BYTES, 10);
queue.setAttributes(attributes);
- message = createMessage(new Long(id), headerSize, payloadSize);
+ message = createMessage(Long.valueOf(id), headerSize, payloadSize);
result = queue.route(message, message.getInitialRoutingAddress(), null);
assertTrue("Result should include not accepting route", result.isRejected());
}
@@ -1546,7 +1546,7 @@ abstract class AbstractQueueTestBase extends UnitTestBase
protected ServerMessage createMessage(Long id, final int headerSize, final int payloadSize)
{
ServerMessage message = createMessage(id);
- when(message.getSizeIncludingHeader()).thenReturn(new Long(headerSize + payloadSize));
+ when(message.getSizeIncludingHeader()).thenReturn(Long.valueOf(headerSize + payloadSize));
return message;
}
diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/TestRecord.java b/broker-core/src/test/java/org/apache/qpid/server/store/TestRecord.java
index 0ede362..dd63ffd 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/store/TestRecord.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/store/TestRecord.java
@@ -54,7 +54,7 @@ public class TestRecord implements EnqueueRecord, Transaction.DequeueRecord, Mes
{
final int prime = 31;
int result = 1;
- result = prime * result + ((_message == null) ? 0 : new Long(_message.getMessageNumber()).hashCode());
+ result = prime * result + ((_message == null) ? 0 : Long.valueOf(_message.getMessageNumber()).hashCode());
result = prime * result + ((_queue == null) ? 0 : _queue.getId().hashCode());
return result;
}
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java
index 42dd0aa..442a2c5 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java
@@ -158,7 +158,7 @@ public enum AMQType
{
BigDecimal bd = (BigDecimal) value;
- byte places = new Integer(bd.scale()).byteValue();
+ byte places = Integer.valueOf(bd.scale()).byteValue();
int unscaled = bd.intValue();
diff --git a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementInputConverter.java b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementInputConverter.java
index a582545..043f4e3 100644
--- a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementInputConverter.java
+++ b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementInputConverter.java
@@ -93,27 +93,27 @@ class ManagementInputConverter
{
if (clazz == Byte.class || clazz == Byte.TYPE)
{
- return (N) new Byte(number.byteValue());
+ return (N) Byte.valueOf(number.byteValue());
}
else if (clazz == Short.class || clazz == Short.TYPE)
{
- return (N) new Short(number.shortValue());
+ return (N) Short.valueOf(number.shortValue());
}
else if (clazz == Integer.class || clazz == Integer.TYPE)
{
- return (N) new Integer(number.intValue());
+ return (N) Integer.valueOf(number.intValue());
}
else if (clazz == Long.class || clazz == Long.TYPE)
{
- return (N) new Long(number.longValue());
+ return (N) Long.valueOf(number.longValue());
}
else if (clazz == Float.class || clazz == Float.TYPE)
{
- return (N) new Float(number.floatValue());
+ return (N) Float.valueOf(number.floatValue());
}
else if (clazz == Double.class || clazz == Double.TYPE)
{
- return (N) new Double(number.doubleValue());
+ return (N) Double.valueOf(number.doubleValue());
}
else
{
diff --git a/doc/developer-guide/src/main/markdown/code-guide.md b/doc/developer-guide/src/main/markdown/code-guide.md
index 1360f81..76f1a98 100644
--- a/doc/developer-guide/src/main/markdown/code-guide.md
+++ b/doc/developer-guide/src/main/markdown/code-guide.md
@@ -447,7 +447,7 @@ This section gives general guidance on the use of exceptions when programming in
```java
try
{
- propertySet.setProperty("thingy", new Integer(10));
+ propertySet.setProperty("thingy", Integer.valueOf(10));
}
catch (UnknownPropertyException ignore)
{
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java b/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
index 9988a0d..b911fa7 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/client/MessageProviderTest.java
@@ -105,10 +105,10 @@ public class MessageProviderTest extends UnitTestBase
{
Map<String, PropertyValue> properties = new HashMap<String, PropertyValue>();
properties.put("test1", new SimplePropertyValue("testValue1"));
- properties.put("test2", new SimplePropertyValue(new Integer(1)));
- properties.put("priority", new SimplePropertyValue(new Integer(2)));
+ properties.put("test2", new SimplePropertyValue(Integer.valueOf(1)));
+ properties.put("priority", new SimplePropertyValue(Integer.valueOf(2)));
List<PropertyValue> listItems = new ArrayList<PropertyValue>();
- listItems.add(new SimplePropertyValue(new Double(2.0)));
+ listItems.add(new SimplePropertyValue(Double.valueOf(2.0)));
ListPropertyValue list = new ListPropertyValue();
list.setItems(listItems);
properties.put("test3", list);
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java b/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java
index a73f0a7..74d004d 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/client/property/ListPropertyValueTest.java
@@ -50,13 +50,13 @@ public class ListPropertyValueTest extends UnitTestBase
{
_generator = new ListPropertyValue();
_items = new ArrayList<PropertyValue>();
- _items.add(new SimplePropertyValue(new Integer(1)));
- _items.add(new SimplePropertyValue(new Double(2.1)));
- _items.add(new SimplePropertyValue(new Boolean(true)));
+ _items.add(new SimplePropertyValue(Integer.valueOf(1)));
+ _items.add(new SimplePropertyValue(Double.valueOf(2.1)));
+ _items.add(new SimplePropertyValue(Boolean.valueOf(true)));
ListPropertyValue innerList = new ListPropertyValue();
List<PropertyValue> innerListItems = new ArrayList<PropertyValue>();
innerListItems.add(new SimplePropertyValue("test"));
- innerListItems.add(new SimplePropertyValue(new Integer(2)));
+ innerListItems.add(new SimplePropertyValue(Integer.valueOf(2)));
innerList.setItems(innerListItems);
_items.add(innerList);
_generator.setItems(_items);
@@ -74,16 +74,16 @@ public class ListPropertyValueTest extends UnitTestBase
{
for (int i = 0; i < 2; i++)
{
- assertEquals("Unexpected first item", new Integer(1), _generator.getValue());
- assertEquals("Unexpected second item", new Double(2.1), _generator.getValue());
- assertEquals("Unexpected third item", new Boolean(true), _generator.getValue());
+ assertEquals("Unexpected first item", Integer.valueOf(1), _generator.getValue());
+ assertEquals("Unexpected second item", Double.valueOf(2.1), _generator.getValue());
+ assertEquals("Unexpected third item", Boolean.valueOf(true), _generator.getValue());
if (i == 0)
{
assertEquals("Unexpected forth item", "test", _generator.getValue());
}
else
{
- assertEquals("Unexpected forth item", new Integer(2), _generator.getValue());
+ assertEquals("Unexpected forth item", Integer.valueOf(2), _generator.getValue());
}
}
}
@@ -93,12 +93,12 @@ public class ListPropertyValueTest extends UnitTestBase
{
_generator.setCyclic(false);
assertFalse("Generator should not be cyclic", _generator.isCyclic());
- assertEquals("Unexpected first item", new Integer(1), _generator.getValue());
- assertEquals("Unexpected second item", new Double(2.1), _generator.getValue());
- assertEquals("Unexpected third item", new Boolean(true), _generator.getValue());
+ assertEquals("Unexpected first item", Integer.valueOf(1), _generator.getValue());
+ assertEquals("Unexpected second item", Double.valueOf(2.1), _generator.getValue());
+ assertEquals("Unexpected third item", Boolean.valueOf(true), _generator.getValue());
assertEquals("Unexpected forth item", "test", _generator.getValue());
- assertEquals("Unexpected fifth item", new Integer(2), _generator.getValue());
+ assertEquals("Unexpected fifth item", Integer.valueOf(2), _generator.getValue());
assertEquals("Unexpected sixs item", "test", _generator.getValue());
- assertEquals("Unexpected sevens item", new Integer(2), _generator.getValue());
+ assertEquals("Unexpected sevens item", Integer.valueOf(2), _generator.getValue());
}
}
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java b/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java
index fdf6970..bd699d9 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/client/property/RandomPropertyValueTest.java
@@ -53,8 +53,8 @@ public class RandomPropertyValueTest extends UnitTestBase
@Test
public void testGetters()
{
- assertEquals("Unexpected upper boundary", new Double(20.0), (Object) _generator.getUpper());
- assertEquals("Unexpected lower boundary", new Double(10.0), (Object) _generator.getLower());
+ assertEquals("Unexpected upper boundary", Double.valueOf(20.0), (Object) _generator.getUpper());
+ assertEquals("Unexpected lower boundary", Double.valueOf(10.0), (Object) _generator.getLower());
assertEquals("Unexpected type", "double", _generator.getType());
}
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java b/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java
index ce2025d..1deb7e4 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/client/property/RangePropertyValueTest.java
@@ -54,9 +54,9 @@ public class RangePropertyValueTest extends UnitTestBase
@Test
public void testGetters()
{
- assertEquals("Unexpected upper boundary", new Double(10.0), (Object) _generator.getUpper());
- assertEquals("Unexpected lower boundary", new Double(0.0), (Object) _generator.getLower());
- assertEquals("Unexpected step", new Double(2.0), (Object) _generator.getStep());
+ assertEquals("Unexpected upper boundary", Double.valueOf(10.0), (Object) _generator.getUpper());
+ assertEquals("Unexpected lower boundary", Double.valueOf(0.0), (Object) _generator.getLower());
+ assertEquals("Unexpected step", Double.valueOf(2.0), (Object) _generator.getStep());
assertEquals("Unexpected type", "double", _generator.getType());
assertTrue("Unexpected cyclic", _generator.isCyclic());
}
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/client/property/SimplePropertyValueTest.java b/perftests/src/test/java/org/apache/qpid/disttest/client/property/SimplePropertyValueTest.java
index aa8ca5f..2f3a71b 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/client/property/SimplePropertyValueTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/client/property/SimplePropertyValueTest.java
@@ -18,31 +18,17 @@
*/
package org.apache.qpid.disttest.client.property;
-import org.junit.Assert;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
import org.apache.qpid.test.utils.UnitTestBase;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import org.junit.Test;
public class SimplePropertyValueTest extends UnitTestBase
{
@Test
public void testGetValue()
{
- SimplePropertyValue value = new SimplePropertyValue(new Integer(1));
- assertEquals("Unexpected value", new Integer(1), value.getValue());
+ SimplePropertyValue value = new SimplePropertyValue(Integer.valueOf(1));
+ assertEquals("Unexpected value", Integer.valueOf(1), value.getValue());
}
}
diff --git a/perftests/src/test/java/org/apache/qpid/disttest/message/JsonHandlerTest.java b/perftests/src/test/java/org/apache/qpid/disttest/message/JsonHandlerTest.java
index 766793a..107c7d4 100644
--- a/perftests/src/test/java/org/apache/qpid/disttest/message/JsonHandlerTest.java
+++ b/perftests/src/test/java/org/apache/qpid/disttest/message/JsonHandlerTest.java
@@ -123,7 +123,7 @@ public class JsonHandlerTest extends UnitTestBase
assertEquals("Unexpected generator value", "first", generator.getValue());
for (int i = 0; i < 10; i++)
{
- assertEquals("Unexpected generator value", new Integer(i), generator.getValue());
+ assertEquals("Unexpected generator value", Integer.valueOf(i), generator.getValue());
}
String newJson =_jsonHandler.marshall(unmarshalledCommand);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org