From 48412a4b85f025f409bbca04248c18218ef27d3c Mon Sep 17 00:00:00 2001
From: Gary Turovsky <flyhighplato@gmail.com>
Date: Fri, 31 Oct 2014 08:00:11 -0500
Subject: [PATCH] Fixing BasicMapId constructor

---
 .../repository/support/BasicMapId.java        |  6 ++---
 .../test/unit/mapid/BasicMapIdTest.java       | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/unit/mapid/BasicMapIdTest.java

diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java
index c1fb69def..d9d715d00 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java
@@ -54,10 +54,10 @@ public class BasicMapId implements MapId {
 
 	public BasicMapId() {}
 
-	public BasicMapId(Map<String, Serializable> map) {
+	public BasicMapId(Map<String, Serializable> mapId) {
 
-		Assert.notNull(map);
-		map.putAll(map);
+		Assert.notNull(mapId);
+		map.putAll(mapId);
 	}
 
 	@Override
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/unit/mapid/BasicMapIdTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/unit/mapid/BasicMapIdTest.java
new file mode 100644
index 000000000..7614062a1
--- /dev/null
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/unit/mapid/BasicMapIdTest.java
@@ -0,0 +1,24 @@
+package org.springframework.data.cassandra.test.unit.mapid;
+
+import org.junit.Test;
+import org.springframework.data.cassandra.repository.support.BasicMapId;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class BasicMapIdTest {
+    @Test
+    public void testMapConstructor() {
+        Map<String, Serializable> map = new HashMap<String, Serializable>();
+        map.put("field1", "value1");
+        map.put("field2", 2);
+
+        BasicMapId basicMapId = new BasicMapId(map);
+
+        assertEquals(basicMapId.get("field1"), map.get("field1"));
+        assertEquals(basicMapId.get("field2"), map.get("field2"));
+    }
+}