cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [1/2] Clean up generics in dht package
Date Mon, 03 Nov 2014 19:09:50 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 623aa6fe7 -> ad84e4d7e


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad84e4d7/test/unit/org/apache/cassandra/dht/RandomPartitionerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/dht/RandomPartitionerTest.java b/test/unit/org/apache/cassandra/dht/RandomPartitionerTest.java
index 90501ab..09a1d65 100644
--- a/test/unit/org/apache/cassandra/dht/RandomPartitionerTest.java
+++ b/test/unit/org/apache/cassandra/dht/RandomPartitionerTest.java
@@ -20,7 +20,7 @@ package org.apache.cassandra.dht;
  *
  */
 
-public class RandomPartitionerTest extends PartitionerTestCase<BigIntegerToken>
+public class RandomPartitionerTest extends PartitionerTestCase
 {
     public void initPartitioner()
     {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad84e4d7/test/unit/org/apache/cassandra/dht/RangeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/dht/RangeTest.java b/test/unit/org/apache/cassandra/dht/RangeTest.java
index aa35c0a..906396c 100644
--- a/test/unit/org/apache/cassandra/dht/RangeTest.java
+++ b/test/unit/org/apache/cassandra/dht/RangeTest.java
@@ -179,7 +179,7 @@ public class RangeTest
         assert not.intersects(twowrap);
     }
 
-    static <T extends RingPosition> void assertIntersection(Range one, Range two, Range<T>
... ranges)
+    static <T extends RingPosition<T>> void assertIntersection(Range one, Range
two, Range<T> ... ranges)
     {
         Set<Range<T>> correct = Range.rangeSet(ranges);
         Set<Range> result1 = one.intersectionWith(two);
@@ -466,7 +466,7 @@ public class RangeTest
         checkDifference(oldRange, newTokens6, expected6);
     }
 
-    private <T extends RingPosition> void assertNormalize(List<Range<T>>
input, List<Range<T>> expected)
+    private <T extends RingPosition<T>> void assertNormalize(List<Range<T>>
input, List<Range<T>> expected)
     {
         List<Range<T>> result = Range.normalize(input);
         assert result.equals(expected) : "Expecting " + expected + " but got " + result;


Mime
View raw message