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

#1322 - Rename Links.and(boolean, …) to ….andIf(boolean, …).

Browse Source
This commit is contained in:
Oliver Drotbohm
2020-07-29 09:48:50 +02:00
parent 6453d25263
commit a14e592bfa
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,7 +142,7 @@ public class Links implements Iterable<Link> {
* links = links.and(…);
* }
* </code> as <code>
* links = link.and(a > 3, …);
* links = link.andIf(a > 3, …);
* </code>
*
* @param condition
@@ -150,17 +150,13 @@ public class Links implements Iterable<Link> {
* @return
*/
@SafeVarargs
public final Links and(boolean condition, Supplier<Link>... links) {
public final Links andIf(boolean condition, Supplier<Link>... links) {
Assert.notNull(links, "Links must not be null!");
if (!condition) {
return this;
}
return and(Arrays.stream(links) //
.map(Supplier::get) //
.collect(Collectors.toList()));
return condition //
? and(Arrays.stream(links).map(Supplier::get).collect(Collectors.toList())) //
: this;
}
/**

4
src/test/java/org/springframework/hateoas/LinksUnitTest.java
View File

@@ -139,7 +139,7 @@ class LinksUnitTest {
@Test // #1322
void conditionallyAddsLink() {
Links links = Links.NONE.and(true, () -> Link.of("/foo"));
Links links = Links.NONE.andIf(true, () -> Link.of("/foo"));
assertThat(links.getRequiredLink(IanaLinkRelations.SELF).getHref()).isEqualTo("/foo");
}
@@ -147,7 +147,7 @@ class LinksUnitTest {
@Test // #1322
void doesNotEvaluateSupplierIfAddConditionIsFalse() {
assertThatCode(() -> Links.NONE.and(false, () -> {
assertThatCode(() -> Links.NONE.andIf(false, () -> {
throw new IllegalStateException();
})).doesNotThrowAnyException();
}