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

#653 - Polishing.

Browse Source 
Consistently add // at manually separated stream steps.
This commit is contained in:
Oliver Gierke
2017-10-16 17:57:18 +02:00
parent d9c53b5eeb
commit b217b6a4ab
11 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/springframework/hateoas/Links.java
View File

@@ -67,9 +67,8 @@ public class Links implements Iterable<Link> {
*/
public Optional<Link> getLink(String rel) {
return links.stream()
.filter(link -> link.getRel().equals(rel))
.findFirst();
return links.stream() //
.filter(link -> link.getRel().equals(rel)).findFirst();
}
/**
@@ -79,9 +78,8 @@ public class Links implements Iterable<Link> {
*/
public List<Link> getLinks(String rel) {
return links.stream()
.filter(link -> link.getRel().endsWith(rel))
.collect(Collectors.toList());
return links.stream() //
.filter(link -> link.getRel().endsWith(rel)).collect(Collectors.toList());
}
/**

3
src/main/java/org/springframework/hateoas/ResourceSupport.java
View File

@@ -147,7 +147,8 @@ public class ResourceSupport implements Identifiable<Link> {
public List<Link> getLinks(String rel) {
return links.stream() //
.filter(link -> link.getRel().equals(rel)).collect(Collectors.toList());
.filter(link -> link.getRel().equals(rel)) //
.collect(Collectors.toList());
}
/*

6
src/main/java/org/springframework/hateoas/TemplateVariable.java
View File

@@ -184,9 +184,9 @@ public final class TemplateVariable implements Serializable {
*/
public static TemplateVariable.VariableType from(String key) {
return Arrays.stream(values())
.filter(type -> type.key.equals(key))
.findFirst()
return Arrays.stream(values()) //
.filter(type -> type.key.equals(key)) //
.findFirst() //
.orElseThrow(() -> new IllegalArgumentException("Unsupported variable type " + key + "!"));
}

7
src/main/java/org/springframework/hateoas/TemplateVariables.java
View File

@@ -85,9 +85,8 @@ public final class TemplateVariables implements Iterable<TemplateVariable>, Seri
List<TemplateVariable> result = new ArrayList<>(this.variables.size() + variables.size());
result.addAll(this.variables);
List<TemplateVariable> filtered = variables.stream()
.filter(variable -> !containsEquivalentFor(variable))
.collect(Collectors.toList());
List<TemplateVariable> filtered = variables.stream() //
.filter(variable -> !containsEquivalentFor(variable)).collect(Collectors.toList());
result.addAll(filtered);
@@ -115,7 +114,7 @@ public final class TemplateVariables implements Iterable<TemplateVariable>, Seri
private boolean containsEquivalentFor(TemplateVariable candidate) {
return this.variables.stream()
return this.variables.stream() //
.anyMatch(variable -> variable.isEquivalent(candidate));
}

13
src/main/java/org/springframework/hateoas/UriTemplate.java
View File

@@ -172,9 +172,8 @@ public class UriTemplate implements Iterable<TemplateVariable>, Serializable {
*/
public List<String> getVariableNames() {
return variables.asList().stream()
.map(TemplateVariable::getName)
.collect(Collectors.toList());
return variables.asList().stream() //
.map(TemplateVariable::getName).collect(Collectors.toList());
}
/**
@@ -252,8 +251,8 @@ public class UriTemplate implements Iterable<TemplateVariable>, Serializable {
private TemplateVariables getOptionalVariables() {
return variables.asList().stream()
.filter(variable -> !variable.isRequired())
return variables.asList().stream() //
.filter(variable -> !variable.isRequired()) //
.collect(Collectors.collectingAndThen(Collectors.toList(), TemplateVariables::new));
}
@@ -269,8 +268,8 @@ public class UriTemplate implements Iterable<TemplateVariable>, Serializable {
if (value == null) {
if (variable.isRequired()) {
throw new IllegalArgumentException(String.format("Template variable %s is required but no value was given!",
variable.getName()));
throw new IllegalArgumentException(
String.format("Template variable %s is required but no value was given!", variable.getName()));
}
return;

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

@@ -149,8 +149,8 @@ public class Traverson {
*/
private static List<MediaType> getHalJsonFlavors(Collection<MediaType> mediaTypes) {
return mediaTypes.stream()
.filter(MediaTypes.HAL_JSON::isCompatibleWith)
return mediaTypes.stream() //
.filter(MediaTypes.HAL_JSON::isCompatibleWith) //
.collect(Collectors.toList());
}
@@ -249,7 +249,7 @@ public class Traverson {
*/
public class TraversalBuilder {
private List<Hop> rels = new ArrayList<>();
private final List<Hop> rels = new ArrayList<>();
private Map<String, Object> templateParameters = new HashMap<>();
private HttpHeaders headers = new HttpHeaders();
@@ -269,6 +269,7 @@ public class Traverson {
for (String rel : rels) {
this.rels.add(Hop.rel(rel));
}
return this;
}

6
src/main/java/org/springframework/hateoas/core/JsonPathLinkDiscoverer.java
View File

@@ -171,8 +171,8 @@ public class JsonPathLinkDiscoverer implements LinkDiscoverer {
JSONArray array = (JSONArray) parseResult;
return array.stream()
.map(element -> new Link(element.toString(), rel))
return array.stream() //
.map(element -> new Link(element.toString(), rel)) //
.collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList));
}
@@ -186,7 +186,7 @@ public class JsonPathLinkDiscoverer implements LinkDiscoverer {
@Override
public boolean supports(MediaType delimiter) {
return this.mediaTypes.stream()
return this.mediaTypes.stream() //
.anyMatch(mediaType -> mediaType.isCompatibleWith(delimiter));
}
}

2
src/main/java/org/springframework/hateoas/hal/Jackson2HalModule.java
View File

@@ -914,7 +914,7 @@ public class Jackson2HalModule extends SimpleModule {
*/
public boolean hasCuriedEmbed(Iterable<?> source) {
return map(source).keySet().stream()
return map(source).keySet().stream() //
.anyMatch(rel -> rel.contains(":"));
}
}

8
src/main/java/org/springframework/hateoas/mvc/ForwardedHeader.java
View File

@@ -52,10 +52,10 @@ class ForwardedHeader {
return NO_HEADER;
}
Map<String, String> elements = Arrays.stream(source.split(";"))
.map(part -> part.split("="))
.filter(keyValue -> keyValue.length == 2)
.collect(Collectors.toMap((it) -> it[0].trim(), (it) -> it[1].trim()));
Map<String, String> elements = Arrays.stream(source.split(";")) //
.map(part -> part.split("=")) //
.filter(keyValue -> keyValue.length == 2) //
.collect(Collectors.toMap(it -> it[0].trim(), it -> it[1].trim()));
Assert.isTrue(!elements.isEmpty(), "At least one forwarded element needs to be present!");

4
src/main/java/org/springframework/hateoas/mvc/IdentifiableResourceAssemblerSupport.java
View File

@@ -80,8 +80,8 @@ public abstract class IdentifiableResourceAssemblerSupport<T extends Identifiabl
*/
private Object[] unwrapIdentifyables(Object[] values) {
return Arrays.stream(values)
.map(element -> element instanceof Identifiable ? ((Identifiable<?>) element).getId() : element)
return Arrays.stream(values) //
.map(element -> element instanceof Identifiable ? ((Identifiable<?>) element).getId() : element) //
.toArray();
}
}

2
src/main/java/org/springframework/hateoas/mvc/ResourceProcessorInvokingHandlerAdapter.java
View File

@@ -85,7 +85,7 @@ public class ResourceProcessorInvokingHandlerAdapter extends RequestMappingHandl
return (HandlerMethodReturnValueHandlerComposite) handlers;
}
return new HandlerMethodReturnValueHandlerComposite()
return new HandlerMethodReturnValueHandlerComposite() //
.addHandlers((List<? extends HandlerMethodReturnValueHandler>) handlers);
}
}