diff --git a/pom.xml b/pom.xml
index cca7d653f..2624b8748 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
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<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)
diff --git a/src/main/java/io/getunleash/util/UnleashConfig.java b/src/main/java/io/getunleash/util/UnleashConfig.java
index 1191df519..53428b1cc 100644
--- a/src/main/java/io/getunleash/util/UnleashConfig.java
+++ b/src/main/java/io/getunleash/util/UnleashConfig.java
@@ -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;
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");