#649 - Polishing.

Related ticket: #642.
This commit is contained in:
Oliver Gierke
2017-10-15 09:16:09 +02:00
parent 7570b003d1
commit e412bbb7f0
4 changed files with 31 additions and 46 deletions

View File

@@ -15,11 +15,13 @@
*/
package org.springframework.hateoas.hal;
import java.util.ArrayList;
import lombok.Getter;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.springframework.hateoas.IanaRels;
import org.springframework.hateoas.Link;
@@ -97,9 +99,9 @@ public class DefaultCurieProvider implements CurieProvider {
@Override
public Collection<? extends Object> getCurieInformation(Links links) {
List<Curie> result = new ArrayList<>(curies.size());
curies.forEach((name, template) -> result.add(new Curie(name, getCurieHref(name, template))));
List<Curie> result = curies.entrySet().stream() //
.map(it -> new Curie(it.getKey(), getCurieHref(it.getKey(), it.getValue()))) //
.collect(Collectors.toList());
return Collections.unmodifiableCollection(result);
}
@@ -151,16 +153,12 @@ public class DefaultCurieProvider implements CurieProvider {
private static final long serialVersionUID = 1L;
private final String name;
private final @Getter String name;
public Curie(String name, String href) {
super(href, "curies");
this.name = name;
}
public String getName() {
return name;
}
}
}

View File

@@ -179,7 +179,9 @@ public class Jackson2HalModule extends SimpleModule {
curiedLinkPresent = true;
}
sortedLinks.computeIfAbsent(rel, key -> new ArrayList<>()).add(toHalLink(link));
sortedLinks //
.computeIfAbsent(rel, key -> new ArrayList<>())//
.add(toHalLink(link));
links.add(link);
}