diff --git a/pom.xml b/pom.xml index da3c1b7bd..89a0b9042 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ 9.2.4-SNAPSHOT - 2.0.9 + 2.0.13 5.10.3 4.12.0 UTF-8 5.1.5 2.17.2 - 1.5.6 + 1.3.14 2.11.0 @@ -112,13 +112,13 @@ org.mockito mockito-core - 5.12.0 + 4.8.1 test com.github.tomakehurst wiremock-jre8 - 3.0.1 + 2.35.2 test @@ -320,7 +320,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.43.0 + 2.30.0 diff --git a/src/main/java/io/getunleash/util/ConstraintMerger.java b/src/main/java/io/getunleash/util/ConstraintMerger.java index 7440decb7..28db759e2 100644 --- a/src/main/java/io/getunleash/util/ConstraintMerger.java +++ b/src/main/java/io/getunleash/util/ConstraintMerger.java @@ -17,8 +17,7 @@ public static List mergeConstraints( Optional.ofNullable(strategy.getConstraints()) .orElseGet(Collections::emptyList), Optional.ofNullable(strategy.getSegments()) - .orElseGet(Collections::emptyList) - .stream() + .orElseGet(Collections::emptyList).stream() .map(repository::getSegment) .map(s -> s == null ? DENY_SEGMENT : s) .map(Segment::getConstraints) diff --git a/src/test/java/io/getunleash/util/IpAddressMatcherTest.java b/src/test/java/io/getunleash/util/IpAddressMatcherTest.java index 8b2bf5cba..f9d48f37c 100644 --- a/src/test/java/io/getunleash/util/IpAddressMatcherTest.java +++ b/src/test/java/io/getunleash/util/IpAddressMatcherTest.java @@ -19,9 +19,7 @@ import org.junit.jupiter.api.Test; -/** - * @author Luke Taylor - */ +/** @author Luke Taylor */ class IpAddressMatcherTest { private final IpAddressMatcher v6matcher = new IpAddressMatcher("fe80::21f:5bff:fe33:bd68"); private final IpAddressMatcher v4matcher = new IpAddressMatcher("192.168.1.104");