Updated Branches: refs/heads/trunk 91c45d445 -> e86469ee0
Fix test compilation after 3689 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e86469ee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e86469ee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e86469ee Branch: refs/heads/trunk Commit: e86469ee058fb73acebbae5f0ff64e5eae55e613 Parents: 91c45d4 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Jan 19 17:34:44 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Jan 19 17:35:12 2012 -0600 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/SchemaLoader.java | 6 +++--- .../cassandra/db/marshal/CompositeTypeTest.java | 2 +- .../db/marshal/DynamicCompositeTypeTest.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e86469ee/test/unit/org/apache/cassandra/SchemaLoader.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java index 198cb5f..59c8ac5 100644 --- a/test/unit/org/apache/cassandra/SchemaLoader.java +++ b/test/unit/org/apache/cassandra/SchemaLoader.java @@ -92,11 +92,11 @@ public class SchemaLoader ColumnFamilyType su = ColumnFamilyType.Super; AbstractType bytes = BytesType.instance; - AbstractType composite = CompositeType.getInstance(Arrays.asList(new AbstractType[]{BytesType.instance, TimeUUIDType.instance, IntegerType.instance})); - Map<Byte, AbstractType> aliases = new HashMap<Byte, AbstractType>(); + AbstractType<?> composite = CompositeType.getInstance(Arrays.asList(new AbstractType<?>[]{BytesType.instance, TimeUUIDType.instance, IntegerType.instance})); + Map<Byte, AbstractType<?>> aliases = new HashMap<Byte, AbstractType<?>>(); aliases.put((byte)'b', BytesType.instance); aliases.put((byte)'t', TimeUUIDType.instance); - AbstractType dynamicComposite = DynamicCompositeType.getInstance(aliases); + AbstractType<?> dynamicComposite = DynamicCompositeType.getInstance(aliases); // these column definitions will will be applied to the jdbc utf and integer column familes respectively. Map<ByteBuffer, ColumnDefinition> integerColumn = new HashMap<ByteBuffer, ColumnDefinition>(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/e86469ee/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java index 284c98d..fa2e876 100644 --- a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java @@ -42,7 +42,7 @@ public class CompositeTypeTest extends CleanupHelper private static final CompositeType comparator; static { - List<AbstractType> subComparators = new ArrayList<AbstractType>(); + List<AbstractType<?>> subComparators = new ArrayList<AbstractType<?>>(); subComparators.add(BytesType.instance); subComparators.add(TimeUUIDType.instance); subComparators.add(IntegerType.instance); http://git-wip-us.apache.org/repos/asf/cassandra/blob/e86469ee/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java index e453705..f3b0ec7 100644 --- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java @@ -42,7 +42,7 @@ public class DynamicCompositeTypeTest extends CleanupHelper private static final DynamicCompositeType comparator; static { - Map<Byte, AbstractType> aliases = new HashMap<Byte, AbstractType>(); + Map<Byte, AbstractType<?>> aliases = new HashMap<Byte, AbstractType<?>>(); aliases.put((byte)'b', BytesType.instance); aliases.put((byte)'t', TimeUUIDType.instance); comparator = DynamicCompositeType.getInstance(aliases);
