Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACASS-179: merged pull request & scrubbed

Browse Source
This commit is contained in:
Matthew Adams
2014-10-31 08:48:05 -05:00
parent 48412a4b85
commit a60cdad85f
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java
View File

@@ -54,10 +54,10 @@ public class BasicMapId implements MapId {
public BasicMapId() {}
public BasicMapId(Map<String, Serializable> mapId) {
public BasicMapId(Map<String, Serializable> map) {
Assert.notNull(mapId);
map.putAll(mapId);
Assert.notNull(map);
this.map.putAll(map);
}
@Override

18
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/unit/mapid/BasicMapIdTest.java
View File

@@ -10,15 +10,15 @@ 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);
@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);
BasicMapId basicMapId = new BasicMapId(map);
assertEquals(basicMapId.get("field1"), map.get("field1"));
assertEquals(basicMapId.get("field2"), map.get("field2"));
}
assertEquals(basicMapId.get("field1"), map.get("field1"));
assertEquals(basicMapId.get("field2"), map.get("field2"));
}
}