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

#110 - Fixed the collection of values in HalEmbeddedBuilder.

Browse Source 
HalEmbeddedBuilder now favors the collection rel to lookup already registered embeddeds.
This commit is contained in:
Oliver Gierke
2013-12-19 13:02:37 +01:00
parent 137e7c390f
commit 5c737d4b53
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/springframework/hateoas/hal/HalEmbeddedBuilder.java
View File

@@ -62,16 +62,21 @@ class HalEmbeddedBuilder {
return;
}
String singleRel = getDefaultedRelFor(type, false);
List<Object> currentValue = embeddeds.get(singleRel);
String rel = getDefaultedRelFor(type, true);
if (!embeddeds.containsKey(rel)) {
rel = getDefaultedRelFor(type, false);
}
List<Object> currentValue = embeddeds.get(rel);
if (currentValue == null) {
ArrayList<Object> arrayList = new ArrayList<Object>();
arrayList.add(value);
embeddeds.put(singleRel, arrayList);
embeddeds.put(rel, arrayList);
} else if (currentValue.size() == 1) {
currentValue.add(value);
embeddeds.remove(singleRel);
embeddeds.remove(rel);
embeddeds.put(getDefaultedRelFor(type, true), currentValue);
} else {
currentValue.add(value);

14
src/test/java/org/springframework/hateoas/hal/HalEmbeddedBuilderUnitTest.java
View File

@@ -63,6 +63,20 @@ public class HalEmbeddedBuilderUnitTest {
assertThat(map.get("long"), Matchers.<List<Object>> allOf(hasSize(1), hasItem(1L)));
}
/**
* @see #110
*/
@Test
public void correctlyPilesUpResourcesInCollectionRel() {
Map<String, List<Object>> map = setUpBuilder("foo", "bar", "foobar", 1L);
assertThat(map.containsKey("string"), is(false));
assertThat(map.get("strings"),
Matchers.<List<Object>> allOf(hasSize(3), Matchers.<Object> hasItems("foo", "bar", "foobar")));
assertThat(map.get("long"), Matchers.<List<Object>> allOf(hasSize(1), hasItem(1L)));
}
/**
* @see #81, #83
*/