Issue #3735: added lambdas to NeedBraces for checkstyle config

7 files changed, 26 insertions, 18 deletions

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.java
index 8ed29f094..7191d06a4 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.java
@@ -158,9 +158,9 @@ public class EqualsHashCodeCheck
     @Override
     public void finishTree(DetailAST rootAST) {
         objBlockWithEquals
-            .entrySet().stream().filter(detailASTDetailASTEntry ->
-                objBlockWithHashCode.remove(detailASTDetailASTEntry.getKey()) == null)
-            .forEach(detailASTDetailASTEntry -> {
+            .entrySet().stream().filter(detailASTDetailASTEntry -> {
+                return objBlockWithHashCode.remove(detailASTDetailASTEntry.getKey()) == null;
+            }).forEach(detailASTDetailASTEntry -> {
                 final DetailAST equalsAST = detailASTDetailASTEntry.getValue();
                 log(equalsAST.getLineNo(), equalsAST.getColumnNo(), MSG_KEY_HASHCODE);
             });
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java
index fb4d9ef5a..66b7b6c08 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java
@@ -377,9 +377,9 @@ public final class ModifiedControlVariableCheck extends AbstractCheck {
         final DetailAST forUpdateListAST = forIteratorAST.findFirstToken(TokenTypes.ELIST);
 
         findChildrenOfExpressionType(forUpdateListAST).stream()
-            .filter(iteratingExpressionAST ->
-                MUTATION_OPERATIONS.contains(iteratingExpressionAST.getType()))
-            .forEach(iteratingExpressionAST -> {
+            .filter(iteratingExpressionAST -> {
+                return MUTATION_OPERATIONS.contains(iteratingExpressionAST.getType());
+            }).forEach(iteratingExpressionAST -> {
                 final DetailAST oneVariableOperatorChild = iteratingExpressionAST.getFirstChild();
                 if (oneVariableOperatorChild.getType() == TokenTypes.IDENT) {
                     iteratorVariables.add(oneVariableOperatorChild.getText());
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java
index fdb7b34b5..b74a61454 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java
@@ -184,11 +184,12 @@ public class DesignForExtensionCheck extends AbstractCheck {
         final DetailAST methodImplOpenBrace = ast.findFirstToken(TokenTypes.SLIST);
         if (methodImplOpenBrace != null) {
             final DetailAST methodImplCloseBrace = methodImplOpenBrace.getLastChild();
-            final Predicate<DetailAST> predicate = currentNode ->
-                currentNode != null
+            final Predicate<DetailAST> predicate = currentNode -> {
+                return currentNode != null
                     && currentNode != methodImplCloseBrace
                     && currentNode.getLineNo() <= methodImplCloseBrace.getLineNo()
                     && !TokenUtils.isCommentType(currentNode.getType());
+            };
             final Optional<DetailAST> methodBody =
                 TokenUtils.findFirstTokenByPredicate(methodImplOpenBrace, predicate);
             if (methodBody.isPresent()) {
@@ -237,9 +238,11 @@ public class DesignForExtensionCheck extends AbstractCheck {
         boolean containsAnnotation = false;
         if (modifiers.branchContains(TokenTypes.ANNOTATION)) {
             final Optional<DetailAST> annotation = TokenUtils.findFirstTokenByPredicate(modifiers,
-                currentToken -> currentToken != null
-                    && currentToken.getType() == TokenTypes.ANNOTATION
-                    && annotationName.equals(getAnnotationName(currentToken)));
+                currentToken -> {
+                    return currentToken != null
+                        && currentToken.getType() == TokenTypes.ANNOTATION
+                        && annotationName.equals(getAnnotationName(currentToken));
+                });
             if (annotation.isPresent()) {
                 containsAnnotation = true;
             }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java
index 3b0f53519..932bf4d26 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java
@@ -724,8 +724,10 @@ public class VisibilityModifierCheck
      */
     private boolean areImmutableTypeArguments(List<String> typeArgsClassNames) {
         return !typeArgsClassNames.stream().filter(
-            typeName -> !immutableClassShortNames.contains(typeName)
-                && !immutableClassCanonicalNames.contains(typeName)).findFirst().isPresent();
+            typeName -> {
+                return !immutableClassShortNames.contains(typeName)
+                    && !immutableClassCanonicalNames.contains(typeName);
+            }).findFirst().isPresent();
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java
index 68581ded8..2b6f27b17 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java
@@ -43,8 +43,9 @@ class ListToTreeSelectionModelWrapper extends DefaultTreeSelectionModel {
      */
     ListToTreeSelectionModelWrapper(JTreeTable jTreeTable) {
         treeTable = jTreeTable;
-        getListSelectionModel().addListSelectionListener(event ->
-            updateSelectedPathsFromSelectedRows());
+        getListSelectionModel().addListSelectionListener(event -> {
+            updateSelectedPathsFromSelectedRows();
+        });
     }
 
     /**
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/DetailASTTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/DetailASTTest.java
index ad1134aae..b3d3a48c0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/DetailASTTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/DetailASTTest.java
@@ -122,9 +122,11 @@ public class DetailASTTest {
     }
 
     private static void checkDir(File dir) throws Exception {
-        final File[] files = dir.listFiles(file -> (file.getName().endsWith(".java")
+        final File[] files = dir.listFiles(file -> {
+            return (file.getName().endsWith(".java")
                 || file.isDirectory())
-            && !file.getName().endsWith("InputGrammar.java"));
+                && !file.getName().endsWith("InputGrammar.java");
+        });
         for (File file : files) {
             if (file.isFile()) {
                 checkFile(file.getCanonicalPath());
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java
index 842b20cd3..adb04f46f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java
@@ -183,7 +183,7 @@ public class AllChecksTest extends BaseCheckTestSupport {
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("NeedBraces", Stream.of(
                 // we prefer no braces here as it looks unusual even though they help avoid sharing
                 // scope of variables
-                "LITERAL_DEFAULT", "LITERAL_CASE", "LAMBDA").collect(Collectors.toSet()));
+                "LITERAL_DEFAULT", "LITERAL_CASE").collect(Collectors.toSet()));
         CHECKSTYLE_TOKENS_IN_CONFIG_TO_IGNORE.put("FinalParameters", Stream.of(
                 // we prefer these to be effectively final as to not damage readability
                 "FOR_EACH_CLAUSE", "LITERAL_CATCH").collect(Collectors.toSet()));