Skip to content

Commit e50bbf7

Browse files
committed
fix: roll back spotless to 2.28 to still support java 8
1 parent 95bc59d commit e50bbf7

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
<plugin>
335335
<groupId>com.diffplug.spotless</groupId>
336336
<artifactId>spotless-maven-plugin</artifactId>
337-
<version>2.40.0</version>
337+
<version>2.28.0</version>
338338
<configuration>
339339
<formats>
340340
<format>

src/main/java/io/getunleash/util/ConstraintMerger.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ public static List<Constraint> mergeConstraints(
1717
Optional.ofNullable(strategy.getConstraints())
1818
.orElseGet(Collections::emptyList),
1919
Optional.ofNullable(strategy.getSegments())
20-
.orElseGet(Collections::emptyList)
21-
.stream()
20+
.orElseGet(Collections::emptyList).stream()
2221
.map(repository::getSegment)
2322
.map(s -> s == null ? DENY_SEGMENT : s)
2423
.map(Segment::getConstraints)

src/main/java/io/getunleash/util/UnleashConfig.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,9 +528,7 @@ public Builder sendMetricsInterval(long sendMetricsInterval) {
528528
return this;
529529
}
530530

531-
/***
532-
* Don't poll for feature toggle updates
533-
*/
531+
/** * Don't poll for feature toggle updates */
534532
public Builder disablePolling() {
535533
this.disablePolling = true;
536534
return this;

src/test/java/io/getunleash/util/IpAddressMatcherTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919

2020
import org.junit.jupiter.api.Test;
2121

22-
/**
23-
* @author Luke Taylor
24-
*/
22+
/** @author Luke Taylor */
2523
class IpAddressMatcherTest {
2624
private final IpAddressMatcher v6matcher = new IpAddressMatcher("fe80::21f:5bff:fe33:bd68");
2725
private final IpAddressMatcher v4matcher = new IpAddressMatcher("192.168.1.104");

0 commit comments

Comments
 (0)