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

#831 - Polishing.

Browse Source
This commit is contained in:
Greg Turnquist
2019-03-11 21:44:34 -05:00
parent 520fdc8d91
commit 122391e60d
8 changed files with 48 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/springframework/hateoas/client/JsonPathLinkDiscoverer.java
View File

@@ -15,8 +15,6 @@
*/
package org.springframework.hateoas.client;
import net.minidev.json.JSONArray;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
@@ -27,6 +25,7 @@ import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import net.minidev.json.JSONArray;
import org.springframework.hateoas.Link;
import org.springframework.hateoas.LinkRelation;
import org.springframework.hateoas.Links;
@@ -166,12 +165,12 @@ public class JsonPathLinkDiscoverer implements LinkDiscoverer {
JSONArray jsonArray = (JSONArray) parseResult;
return jsonArray.stream() //
.flatMap(it -> it instanceof JSONArray ? ((JSONArray) it).stream() : Stream.of(it)) //
.flatMap(it -> JSONArray.class.isInstance(it) ? ((JSONArray) it).stream() : Stream.of(it)) //
.map(it -> extractLink(it, rel)) //
.collect(Collectors.collectingAndThen(Collectors.toList(), Links::of));
}
return Links.of(parseResult instanceof Map //
return Links.of(Map.class.isInstance(parseResult) //
? extractLink(parseResult, rel) //
: new Link(parseResult.toString(), rel));
}