This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 22329ee0be Deprecate/forbid constructors for Integer, Long, Float,
Byte, Double, and Short
22329ee0be is described below
commit 22329ee0be7cba8807717ab18f845e1631fa4118
Author: Ekaterina Dimitrova <ekaterina.dimitr...@datastax.com>
AuthorDate: Fri Sep 10 12:26:39 2021 -0400
Deprecate/forbid constructors for Integer, Long, Float, Byte, Double, and
Short
Patch by edimitrova and brandonwilliams; reviewed by bereng for
CASSANDRA-18449
---
checkstyle.xml | 43 ++++++++++++++++++++++
checkstyle_test.xml | 43 ++++++++++++++++++++++
.../cassandra/dht/ByteOrderedPartitioner.java | 4 +-
.../org/apache/cassandra/dht/LocalPartitioner.java | 2 +-
.../apache/cassandra/dht/Murmur3Partitioner.java | 2 +-
.../cassandra/dht/OrderPreservingPartitioner.java | 4 +-
.../apache/cassandra/dht/RandomPartitioner.java | 2 +-
.../org/apache/cassandra/utils/LongBTreeTest.java | 8 ++--
.../db/compaction/CompactionAllocationTest.java | 2 +-
.../test/microbench/btree/BTreeTransformBench.java | 2 +-
.../test/microbench/btree/BTreeUpdateBench.java | 2 +-
.../SizeTieredCompactionStrategyTest.java | 11 +++---
.../apache/cassandra/db/lifecycle/HelpersTest.java | 8 ++--
.../apache/cassandra/db/marshal/TimeTypeTest.java | 7 ++--
.../db/rows/ThrottledUnfilteredIteratorTest.java | 2 +-
.../apache/cassandra/dht/LengthPartitioner.java | 10 ++---
.../diag/store/DiagnosticEventMemoryStoreTest.java | 22 +++++------
.../apache/cassandra/utils/btree/BTreeTest.java | 2 +-
18 files changed, 132 insertions(+), 44 deletions(-)
diff --git a/checkstyle.xml b/checkstyle.xml
index 053cc735ab..f5eb4cf1f4 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -106,6 +106,49 @@
<property name="message" value="Avoid Path#toFile(), as some
implementations may not support it." />
</module>
+ <module name="RegexpSinglelineJava">
+ <!-- block Integer() -->
+ <property name="id" value="blockIntegerInstantiation"/>
+ <property name="format" value="new Integer\("/>
+ <property name="ignoreComments" value="true"/>
+ <property name="message" value="Avoid Integer() and use
Integer.valueOf()" />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <!-- block Long() -->
+ <property name="id" value="blockLongInstantiation"/>
+ <property name="format" value="new Long\("/>
+ <property name="ignoreComments" value="true"/>
+ <property name="message" value="Avoid Long() and use Long.valueOf()" />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <!-- block Float() -->
+ <property name="id" value="blockFloatInstantiation"/>
+ <property name="format" value="new Float\("/>
+ <property name="ignoreComments" value="true"/>
+ <property name="message" value="Avoid Float() and use Float.valueOf()" />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <!-- block Byte() -->
+ <property name="id" value="blockByteInstantiation"/>
+ <property name="format" value="new Byte\("/>
+ <property name="ignoreComments" value="true"/>
+ <property name="message" value="Avoid Byte() and use Byte.valueOf()" />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <!-- block Double() -->
+ <property name="id" value="blockDoubleInstantiation"/>
+ <property name="format" value="new Double\("/>
+ <property name="ignoreComments" value="true"/>
+ <property name="message" value="Avoid Double() and use Double.valueOf()"
/>
+ </module>
+ <module name="RegexpSinglelineJava">
+ <!-- block Short() -->
+ <property name="id" value="blockShortInstantiation"/>
+ <property name="format" value="new Short\("/>
+ <property name="ignoreComments" value="true"/>
+ <property name="message" value="Avoid Short() and use Short.valueOf()" />
+ </module>
+
<module name="RedundantImport"/>
<module name="UnusedImports"/>
</module>
diff --git a/checkstyle_test.xml b/checkstyle_test.xml
index d237827f44..a2f679e5a2 100644
--- a/checkstyle_test.xml
+++ b/checkstyle_test.xml
@@ -57,6 +57,49 @@
<property name="classes" value=""/>
</module>
+ <module name="RegexpSinglelineJava">
+ <!-- block Integer() -->
+ <property name="id" value="blockIntegerInstantiation"/>
+ <property name="format" value="new Integer\("/>
+ <property name="ignoreComments" value="true"/>
+ <property name="message" value="Avoid Integer() and use
Integer.valueOf()" />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <!-- block Long() -->
+ <property name="id" value="blockLongInstantiation"/>
+ <property name="format" value="new Long\("/>
+ <property name="ignoreComments" value="true"/>
+ <property name="message" value="Avoid Long() and use Long.valueOf()" />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <!-- block Float() -->
+ <property name="id" value="blockFloatInstantiation"/>
+ <property name="format" value="new Float\("/>
+ <property name="ignoreComments" value="true"/>
+ <property name="message" value="Avoid Float() and use Float.valueOf()" />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <!-- block Byte() -->
+ <property name="id" value="blockByteInstantiation"/>
+ <property name="format" value="new Byte\("/>
+ <property name="ignoreComments" value="true"/>
+ <property name="message" value="Avoid Byte() and use Byte.valueOf()" />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <!-- block Double() -->
+ <property name="id" value="blockDoubleInstantiation"/>
+ <property name="format" value="new Double\("/>
+ <property name="ignoreComments" value="true"/>
+ <property name="message" value="Avoid Double() and use Double.valueOf()"
/>
+ </module>
+ <module name="RegexpSinglelineJava">
+ <!-- block Short() -->
+ <property name="id" value="blockShortInstantiation"/>
+ <property name="format" value="new Short\("/>
+ <property name="ignoreComments" value="true"/>
+ <property name="message" value="Avoid Short() and use Short.valueOf()" />
+ </module>
+
<module name="RedundantImport"/>
<module name="UnusedImports"/>
</module>
diff --git a/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java
b/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java
index 2b0e2a2861..ae929c8c01 100644
--- a/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java
@@ -301,7 +301,7 @@ public class ByteOrderedPartitioner implements IPartitioner
Token lastToken = sortedTokens.get(sortedTokens.size() - 1);
for (Token node : sortedTokens)
{
- allTokens.put(node, new Float(0.0));
+ allTokens.put(node, 0.0F);
sortedRanges.add(new Range<Token>(lastToken, node));
lastToken = node;
}
@@ -319,7 +319,7 @@ public class ByteOrderedPartitioner implements IPartitioner
}
// Sum every count up and divide count/total for the fractional
ownership.
- Float total = new Float(0.0);
+ Float total = 0.0F;
for (Float f : allTokens.values())
total += f;
for (Map.Entry<Token, Float> row : allTokens.entrySet())
diff --git a/src/java/org/apache/cassandra/dht/LocalPartitioner.java
b/src/java/org/apache/cassandra/dht/LocalPartitioner.java
index 127c5b7ded..74a1264c8d 100644
--- a/src/java/org/apache/cassandra/dht/LocalPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/LocalPartitioner.java
@@ -125,7 +125,7 @@ public class LocalPartitioner implements IPartitioner
public Map<Token, Float> describeOwnership(List<Token> sortedTokens)
{
- return Collections.singletonMap((Token)getMinimumToken(), new
Float(1.0));
+ return Collections.singletonMap((Token)getMinimumToken(), 1.0F);
}
public AbstractType<?> getTokenValidator()
diff --git a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
index 015610fb53..57993a69a6 100644
--- a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
+++ b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
@@ -303,7 +303,7 @@ public class Murmur3Partitioner implements IPartitioner
throw new RuntimeException("No nodes present in the cluster. Has
this node finished starting up?");
// 1-case
if (sortedTokens.size() == 1)
- ownerships.put(i.next(), new Float(1.0));
+ ownerships.put(i.next(), 1.0F);
// n-case
else
{
diff --git a/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
b/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
index 2d4def95d0..2566cbf710 100644
--- a/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
@@ -234,7 +234,7 @@ public class OrderPreservingPartitioner implements
IPartitioner
Token lastToken = sortedTokens.get(sortedTokens.size() - 1);
for (Token node : sortedTokens)
{
- allTokens.put(node, new Float(0.0));
+ allTokens.put(node, 0.0F);
sortedRanges.add(new Range<Token>(lastToken, node));
lastToken = node;
}
@@ -252,7 +252,7 @@ public class OrderPreservingPartitioner implements
IPartitioner
}
// Sum every count up and divide count/total for the fractional
ownership.
- Float total = new Float(0.0);
+ Float total = 0.0F;
for (Float f : allTokens.values())
total += f;
for (Map.Entry<Token, Float> row : allTokens.entrySet())
diff --git a/src/java/org/apache/cassandra/dht/RandomPartitioner.java
b/src/java/org/apache/cassandra/dht/RandomPartitioner.java
index d02cfd58ad..15743016f0 100644
--- a/src/java/org/apache/cassandra/dht/RandomPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/RandomPartitioner.java
@@ -308,7 +308,7 @@ public class RandomPartitioner implements IPartitioner
// 1-case
if (sortedTokens.size() == 1)
{
- ownerships.put(i.next(), new Float(1.0));
+ ownerships.put(i.next(), 1.0F);
}
// n-case
else
diff --git a/test/burn/org/apache/cassandra/utils/LongBTreeTest.java
b/test/burn/org/apache/cassandra/utils/LongBTreeTest.java
index 01b44930b3..c9507f5873 100644
--- a/test/burn/org/apache/cassandra/utils/LongBTreeTest.java
+++ b/test/burn/org/apache/cassandra/utils/LongBTreeTest.java
@@ -190,7 +190,7 @@ public class LongBTreeTest
{
Map<Integer, Integer> update = new
LinkedHashMap<>();
for (Integer i : selection.testKeys)
- update.put(i, new Integer(i));
+ update.put(i, Integer.valueOf(i));
CountingFunction function = new
CountingFunction((x) -> x);
Object[] original = selection.testAsSet.tree();
@@ -210,7 +210,7 @@ public class LongBTreeTest
{
Map<Integer, Integer> update = new
LinkedHashMap<>();
for (Integer i : selection.testKeys)
- update.put(i, new Integer(i));
+ update.put(i, Integer.valueOf(i));
CountingFunction function = new
CountingFunction((x) -> update.getOrDefault(x, x));
Object[] original = selection.testAsSet.tree();
@@ -230,7 +230,7 @@ public class LongBTreeTest
{
Map<Integer, Integer> update = new
LinkedHashMap<>();
for (Integer i : selection.testKeys)
- update.put(i, new Integer(i));
+ update.put(i, Integer.valueOf(i));
CountingFunction function = new
CountingFunction(update::get);
Object[] original = selection.testAsSet.tree();
@@ -249,7 +249,7 @@ public class LongBTreeTest
{
Map<Integer, Integer> update = new
LinkedHashMap<>();
for (Integer i : selection.testKeys)
- update.put(i, new Integer(i));
+ update.put(i, Integer.valueOf(i));
CountingFunction function = new
CountingFunction((x) -> update.containsKey(x) ? null : x);
Object[] original = selection.testAsSet.tree();
diff --git
a/test/memory/org/apache/cassandra/db/compaction/CompactionAllocationTest.java
b/test/memory/org/apache/cassandra/db/compaction/CompactionAllocationTest.java
index 4d652b70fa..e2a4edeca5 100644
---
a/test/memory/org/apache/cassandra/db/compaction/CompactionAllocationTest.java
+++
b/test/memory/org/apache/cassandra/db/compaction/CompactionAllocationTest.java
@@ -393,7 +393,7 @@ public class CompactionAllocationTest
Measurement measurement = createMeasurement();
measurement.start();
for (int i=0; i<numAlloc; i++)
- new Integer(i);
+ Integer.valueOf(i);
measurement.stop();
logger.info(" ** {}", measurement.prettyBytes());
diff --git
a/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeTransformBench.java
b/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeTransformBench.java
index 4f2fa78ed3..a459316b6b 100644
---
a/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeTransformBench.java
+++
b/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeTransformBench.java
@@ -70,7 +70,7 @@ public class BTreeTransformBench extends BTreeBench
setup(2 * dataSize);
data2 = data.clone();
for (int i = 0 ; i < data2.length ; ++i)
- data2[i] = new Integer(data2[i]);
+ data2[i] = Integer.valueOf(data2[i]);
}
@State(Scope.Thread)
diff --git
a/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeUpdateBench.java
b/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeUpdateBench.java
index f2be859924..c7ad81ca09 100644
---
a/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeUpdateBench.java
+++
b/test/microbench/org/apache/cassandra/test/microbench/btree/BTreeUpdateBench.java
@@ -83,7 +83,7 @@ public class BTreeUpdateBench extends BTreeBench
setup(2 * (dataSize + insertSize));
data2 = data.clone();
for (int i = 0 ; i < data2.length ; ++i)
- data2[i] = new Integer(data2[i]);
+ data2[i] = Integer.valueOf(data2[i]);
}
@State(Scope.Thread)
diff --git
a/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java
b/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java
index 0e91b701d6..da017092f1 100644
---
a/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java
+++
b/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java
@@ -94,11 +94,11 @@ public class SizeTieredCompactionStrategyTest
@Test
public void testGetBuckets()
{
- List<Pair<String, Long>> pairs = new ArrayList<Pair<String, Long>>();
+ List<Pair<String, Long>> pairs = new ArrayList<>();
String[] strings = { "a", "bbbb", "cccccccc", "cccccccc", "bbbb", "a"
};
for (String st : strings)
{
- Pair<String, Long> pair = Pair.create(st, new Long(st.length()));
+ Pair<String, Long> pair = Pair.create(st, (long) st.length());
pairs.add(pair);
}
@@ -118,7 +118,7 @@ public class SizeTieredCompactionStrategyTest
String[] strings2 = { "aaa", "bbbbbbbb", "aaa", "bbbbbbbb",
"bbbbbbbb", "aaa" };
for (String st : strings2)
{
- Pair<String, Long> pair = Pair.create(st, new Long(st.length()));
+ Pair<String, Long> pair = Pair.create(st, (long) st.length());
pairs.add(pair);
}
@@ -139,7 +139,7 @@ public class SizeTieredCompactionStrategyTest
String[] strings3 = { "aaa", "bbbbbbbb", "aaa", "bbbbbbbb",
"bbbbbbbb", "aaa" };
for (String st : strings3)
{
- Pair<String, Long> pair = Pair.create(st, new Long(st.length()));
+ Pair<String, Long> pair = Pair.create(st, (long) st.length());
pairs.add(pair);
}
@@ -147,8 +147,9 @@ public class SizeTieredCompactionStrategyTest
assertEquals(1, buckets.size());
}
+ @SuppressWarnings("UnnecessaryLocalVariable")
@Test
- public void testPrepBucket() throws Exception
+ public void testPrepBucket()
{
String ksname = KEYSPACE1;
String cfname = "Standard1";
diff --git a/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java
b/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java
index 1b121c1e14..20af2a0c18 100644
--- a/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java
+++ b/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java
@@ -85,9 +85,9 @@ public class HelpersTest
@Test
public void testIdentityMap()
{
- Integer one = new Integer(1);
- Integer two = new Integer(2);
- Integer three = new Integer(3);
+ Integer one = Integer.valueOf(1);
+ Integer two = Integer.valueOf(2);
+ Integer three = Integer.valueOf(3);
Map<Integer, Integer> identity = Helpers.identityMap(set(one, two,
three));
Assert.assertEquals(3, identity.size());
Assert.assertSame(one, identity.get(1));
@@ -124,7 +124,7 @@ public class HelpersTest
failure = false;
try
{
- Map<Integer, Integer> notIdentity = ImmutableMap.of(1, new
Integer(1), 2, 2, 3, 3);
+ Map<Integer, Integer> notIdentity =
ImmutableMap.of(Integer.MIN_VALUE, Integer.valueOf(Integer.MIN_VALUE), 2, 2, 3,
3);
Helpers.replace(notIdentity, a, b);
}
catch (AssertionError e)
diff --git a/test/unit/org/apache/cassandra/db/marshal/TimeTypeTest.java
b/test/unit/org/apache/cassandra/db/marshal/TimeTypeTest.java
index d61d2c647d..26a2b15c75 100644
--- a/test/unit/org/apache/cassandra/db/marshal/TimeTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/TimeTypeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -29,11 +29,12 @@ import org.apache.cassandra.serializers.TimeSerializer;
public class TimeTypeTest extends CQLTester
{
+ @SuppressWarnings({ "PointlessArithmeticExpression",
"WrapperTypeMayBePrimitive" })
@Test
public void testComparison()
{
Long t1 = TimeSerializer.timeStringToLong("01:00:00.123456789");
- Long t2 = new Long((1L * 60L * 60L * 1000L * 1000L * 1000L) +
123456789);
+ Long t2 = 1L * 60L * 60L * 1000L * 1000L * 1000L + 123456789L;
ByteBuffer b1 = TimeSerializer.instance.serialize(t1);
ByteBuffer b2 = TimeSerializer.instance.serialize(t2);
assert TimeType.instance.compare(b1, b2) == 0 : "Failed == comparison";
@@ -41,7 +42,7 @@ public class TimeTypeTest extends CQLTester
b2 = TimeSerializer.instance.serialize(123456789L);
assert TimeType.instance.compare(b1, b2) > 0 : "Failed > comparison";
- t2 = new Long(2L * 60L * 60L * 1000L * 1000L * 1000L + 123456789);
+ t2 = 2L * 60L * 60L * 1000L * 1000L * 1000L + 123456789L;
b2 = TimeSerializer.instance.serialize(t2);
assert TimeType.instance.compare(b1, b2) < 0 : "Failed < comparison";
diff --git
a/test/unit/org/apache/cassandra/db/rows/ThrottledUnfilteredIteratorTest.java
b/test/unit/org/apache/cassandra/db/rows/ThrottledUnfilteredIteratorTest.java
index 0c4a79d2a1..e3c42cd21a 100644
---
a/test/unit/org/apache/cassandra/db/rows/ThrottledUnfilteredIteratorTest.java
+++
b/test/unit/org/apache/cassandra/db/rows/ThrottledUnfilteredIteratorTest.java
@@ -159,7 +159,7 @@ public class ThrottledUnfilteredIteratorTest extends
CQLTester
UnfilteredRowIterator iterator = throttled.next();
assertFalse(throttled.hasNext());
assertFalse(iterator.hasNext());
-
assertEquals(Int32Type.instance.getSerializer().deserialize(iterator.staticRow().cells().iterator().next().buffer()),
new Integer(160));
+
assertEquals(Int32Type.instance.getSerializer().deserialize(iterator.staticRow().cells().iterator().next().buffer()),
Integer.valueOf(160));
}
// test opt out
diff --git a/test/unit/org/apache/cassandra/dht/LengthPartitioner.java
b/test/unit/org/apache/cassandra/dht/LengthPartitioner.java
index ca6504ced8..9859487e94 100644
--- a/test/unit/org/apache/cassandra/dht/LengthPartitioner.java
+++ b/test/unit/org/apache/cassandra/dht/LengthPartitioner.java
@@ -136,15 +136,15 @@ public class LengthPartitioner implements IPartitioner
public Map<Token, Float> describeOwnership(List<Token> sortedTokens)
{
// allTokens will contain the count and be returned, sorted_ranges is
shorthand for token<->token math.
- Map<Token, Float> allTokens = new HashMap<Token, Float>();
- List<Range<Token>> sortedRanges = new ArrayList<Range<Token>>();
+ Map<Token, Float> allTokens = new HashMap<>();
+ List<Range<Token>> sortedRanges = new ArrayList<>();
// this initializes the counts to 0 and calcs the ranges in order.
Token lastToken = sortedTokens.get(sortedTokens.size() - 1);
for (Token node : sortedTokens)
{
- allTokens.put(node, new Float(0.0));
- sortedRanges.add(new Range<Token>(lastToken, node));
+ allTokens.put(node, 0.0F);
+ sortedRanges.add(new Range<>(lastToken, node));
lastToken = node;
}
@@ -161,7 +161,7 @@ public class LengthPartitioner implements IPartitioner
}
// Sum every count up and divide count/total for the fractional
ownership.
- Float total = new Float(0.0);
+ Float total = 0.0F;
for (Float f : allTokens.values())
total += f;
for (Map.Entry<Token, Float> row : allTokens.entrySet())
diff --git
a/test/unit/org/apache/cassandra/diag/store/DiagnosticEventMemoryStoreTest.java
b/test/unit/org/apache/cassandra/diag/store/DiagnosticEventMemoryStoreTest.java
index 5e897b6637..9647519016 100644
---
a/test/unit/org/apache/cassandra/diag/store/DiagnosticEventMemoryStoreTest.java
+++
b/test/unit/org/apache/cassandra/diag/store/DiagnosticEventMemoryStoreTest.java
@@ -66,15 +66,15 @@ public class DiagnosticEventMemoryStoreTest
assertEquals(3, res.size());
Map.Entry<Long, DiagnosticEvent> entry = res.pollFirstEntry();
- assertEquals(new Long(1), entry.getKey());
+ assertEquals(Long.valueOf(1), entry.getKey());
assertSame(e1, entry.getValue());
entry = res.pollFirstEntry();
- assertEquals(new Long(2), entry.getKey());
+ assertEquals(Long.valueOf(2), entry.getKey());
assertSame(e2, entry.getValue());
entry = res.pollFirstEntry();
- assertEquals(new Long(3), entry.getKey());
+ assertEquals(Long.valueOf(3), entry.getKey());
assertSame(e3, entry.getValue());
}
@@ -95,11 +95,11 @@ public class DiagnosticEventMemoryStoreTest
assertEquals(2, res.size());
Map.Entry<Long, DiagnosticEvent> entry = res.pollFirstEntry();
- assertEquals(new Long(1), entry.getKey());
+ assertEquals(Long.valueOf(1), entry.getKey());
assertSame(e1, entry.getValue());
entry = res.pollLastEntry();
- assertEquals(new Long(2), entry.getKey());
+ assertEquals(Long.valueOf(2), entry.getKey());
assertSame(e2, entry.getValue());
}
@@ -122,11 +122,11 @@ public class DiagnosticEventMemoryStoreTest
assertEquals(2, res.size());
Map.Entry<Long, DiagnosticEvent> entry = res.pollFirstEntry();
- assertEquals(new Long(2), entry.getKey());
+ assertEquals(Long.valueOf(2), entry.getKey());
assertSame(e2, entry.getValue());
entry = res.pollLastEntry();
- assertEquals(new Long(3), entry.getKey());
+ assertEquals(Long.valueOf(3), entry.getKey());
assertSame(e3, entry.getValue());
}
@@ -151,11 +151,11 @@ public class DiagnosticEventMemoryStoreTest
assertEquals(2, res.size());
Map.Entry<Long, DiagnosticEvent> entry = res.pollFirstEntry();
- assertEquals(new Long(4), entry.getKey());
+ assertEquals(Long.valueOf(4), entry.getKey());
assertSame(e2, entry.getValue());
entry = res.pollFirstEntry();
- assertEquals(new Long(5), entry.getKey());
+ assertEquals(Long.valueOf(5), entry.getKey());
assertSame(e3, entry.getValue());
store.store(new TestEvent1()); // 7
@@ -164,7 +164,7 @@ public class DiagnosticEventMemoryStoreTest
res = store.scan(4L, 2);
assertEquals(2, res.size());
- assertEquals(new Long(7), res.pollFirstEntry().getKey());
- assertEquals(new Long(8), res.pollLastEntry().getKey());
+ assertEquals(Long.valueOf(7), res.pollFirstEntry().getKey());
+ assertEquals(Long.valueOf(8), res.pollLastEntry().getKey());
}
}
diff --git a/test/unit/org/apache/cassandra/utils/btree/BTreeTest.java
b/test/unit/org/apache/cassandra/utils/btree/BTreeTest.java
index 73f0ff7787..eba2adc921 100644
--- a/test/unit/org/apache/cassandra/utils/btree/BTreeTest.java
+++ b/test/unit/org/apache/cassandra/utils/btree/BTreeTest.java
@@ -34,7 +34,7 @@ public class BTreeTest
{
System.setProperty("cassandra.btree.branchshift", "2");
for (int i = 0 ; i < ints.length ; i++)
- ints[i] = new Integer(i);
+ ints[i] = Integer.valueOf(i);
}
static final UpdateFunction<Integer, Integer> updateF = new
UpdateFunction<Integer, Integer>()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
