Skip to content

Commit

Permalink
fix: roll back spotless to 2.28 to still support java 8
Browse files Browse the repository at this point in the history
  • Loading branch information
chriswk committed Oct 30, 2023
1 parent 95bc59d commit e50bbf7
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.40.0</version>
<version>2.28.0</version>
<configuration>
<formats>
<format>
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/io/getunleash/util/ConstraintMerger.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ public static List<Constraint> 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)
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/io/getunleash/util/UnleashConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -528,9 +528,7 @@ public Builder sendMetricsInterval(long sendMetricsInterval) {
return this;
}

/***
* Don't poll for feature toggle updates
*/
/** * Don't poll for feature toggle updates */
public Builder disablePolling() {
this.disablePolling = true;
return this;
Expand Down
4 changes: 1 addition & 3 deletions src/test/java/io/getunleash/util/IpAddressMatcherTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit e50bbf7

Please sign in to comment.