Merge pull request #876 from uhafner/no-newline-start-end

Add CheckStyle checks to ensure no empty lines
uhafner · Dec 8, 2023 · 7da021a · 7da021a
2 parents b4e293a + 4423cb7
commit 7da021a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/etc/checkstyle-configuration.xml b/etc/checkstyle-configuration.xml
@@ -8,6 +8,14 @@
         "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
 <module name="Checker">
   <property name="severity" value="warning"/>
+  <module name="RegexpMultiline">
+    <property name="format" value="\{\s*\R\s*\R"/>
+    <property name="message" value="No empty lines after opening curly braces allowed" />
+  </module>
+  <module name="RegexpMultiline">
+    <property name="format" value="\R\s*\R\s*\}"/>
+    <property name="message" value="No empty lines before closing curly braces allowed" />
+  </module>
   <module name="TreeWalker">
     <module name="SuppressWarningsHolder" />
 

diff --git a/src/main/java/edu/hm/hafner/util/Ensure.java b/src/main/java/edu/hm/hafner/util/Ensure.java
@@ -653,7 +653,6 @@ public void isInstanceOf(final Class<?> type, final String explanation, final Ob
             if (!type.isInstance(value)) {
                 throwException(explanation, args);
             }
-
         }
     }
 

diff --git a/src/main/java/edu/hm/hafner/util/PathUtil.java b/src/main/java/edu/hm/hafner/util/PathUtil.java
@@ -174,7 +174,6 @@ public String getRelativePath(final Path base, final Path path) {
                 return makeUnixPath(normalizedBase.relativize(normalize(path)).toString());
             }
             return makeUnixPath(normalizedBase.relativize(normalize(base.resolve(path))).toString());
-
         }
         catch (IOException | IllegalArgumentException ignored) {
             // ignore and return the path as such

diff --git a/src/test/java/edu/hm/hafner/util/ArchitectureRules.java b/src/test/java/edu/hm/hafner/util/ArchitectureRules.java
@@ -165,7 +165,6 @@ public boolean test(final JavaCall<?> input) {
         private boolean isVisibleForTesting(final CanBeAnnotated target) {
             return target.isAnnotatedWith(VisibleForTesting.class);
         }
-
     }
 
     /**
@@ -200,7 +199,6 @@ public boolean test(final JavaConstructorCall javaConstructorCall) {
         private boolean isPermittedException(final JavaClass owner) {
             return allowedExceptions.stream().anyMatch(owner::isAssignableTo);
         }
-
     }
 
     private static class ShouldBeProtectedCondition extends ArchCondition<JavaMethod> {