From cbfb587a1b0fde1eebdaa7ad9555a1365bab0abf Mon Sep 17 00:00:00 2001
From: vasilyeva <vasilyeva@rutarget.ru>
Date: Sat, 19 Aug 2017 17:36:59 +0300
Subject: [PATCH] Issue #4940: fix MultipleReturnPointsPerMethod idea violation

---
 config/intellij-idea-inspections.xml             |  8 +++++---
 .../tools/checkstyle/ConfigurationLoader.java    |  3 ++-
 .../checks/coding/AbstractSuperCheck.java        |  6 +-----
 .../checks/coding/EqualsAvoidNullCheck.java      |  6 ++++--
 .../coding/ExplicitInitializationCheck.java      |  8 +++++---
 .../checks/coding/FallThroughCheck.java          | 16 ++++++----------
 .../checks/coding/HiddenFieldCheck.java          | 11 +++++++----
 .../checks/coding/IllegalInstantiationCheck.java |  5 +++--
 .../coding/MultipleStringLiteralsCheck.java      |  6 ++++--
 .../checks/indentation/ArrayInitHandler.java     | 12 ++++++------
 .../checks/indentation/LineWrappingHandler.java  |  7 +++----
 .../checks/javadoc/JavadocStyleCheck.java        |  1 +
 .../checks/indentation/IndentationCheckTest.java |  6 ++++--
 13 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/config/intellij-idea-inspections.xml b/config/intellij-idea-inspections.xml
index b0c8a749d91..8f1a5a04d64 100644
--- a/config/intellij-idea-inspections.xml
+++ b/config/intellij-idea-inspections.xml
@@ -1487,9 +1487,9 @@ isolated classes and we cannot put them to separate package as it will affect us
     <inspection_tool class="MultipleInjectedConstructorsForClass" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="MultipleMethodDesignatorsInspection" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="MultipleRepositoryUrls" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="MultipleReturnPointsPerMethod" enabled="false" level="ERROR" enabled_by_default="false">
-        <option name="ignoreGuardClauses" value="false" />
-        <option name="ignoreEqualsMethod" value="false" />
+    <inspection_tool class="MultipleReturnPointsPerMethod" enabled="true" level="ERROR" enabled_by_default="true">
+        <option name="ignoreGuardClauses" value="true" />
+        <option name="ignoreEqualsMethod" value="true" />
         <option name="m_limit" value="1" />
     </inspection_tool>
     <inspection_tool class="MultipleTopLevelClassesInFile" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -2149,6 +2149,8 @@ isolated classes and we cannot put them to separate package as it will affect us
                 <option value="UseOfPropertiesAsHashtable" />
                 <!-- till #4861, #4862, #4863, #4864, #4866 -->
                 <option value="ThisEscapedInObjectConstruction" />
+                <!-- it will makes code too complicated in some cases -->
+                <option value="MultipleReturnPointsPerMethod" />
             </list>
         </option>
     </inspection_tool>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
index 34f2f3398a9..de84f2dbd09 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
@@ -487,7 +487,8 @@ private static String replaceProperties(
                 fragment = props.resolve(propertyName);
                 if (fragment == null) {
                     if (defaultValue != null) {
-                        return defaultValue;
+                        sb.replace(0, sb.length(), defaultValue);
+                        break;
                     }
                     throw new CheckstyleException(
                         "Property ${" + propertyName + "} has not been set");
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java
index e6390b06f0f..61468a24a80 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java
@@ -154,11 +154,7 @@ private boolean isSameNameMethod(DetailAST ast) {
             && sibling.getType() == TokenTypes.TYPE_ARGUMENTS) {
             sibling = sibling.getNextSibling();
         }
-        if (sibling == null) {
-            return true;
-        }
-        final String name = sibling.getText();
-        return !getMethodName().equals(name);
+        return sibling == null || !getMethodName().equals(sibling.getText());
     }
 
     @Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java
index beb5622eb93..ed7ec258c35 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java
@@ -605,12 +605,14 @@ public void addMethodCall(DetailAST methodCall) {
          * @return true if this FieldFrame contains instance field field.
          */
         public DetailAST findField(String name) {
+            DetailAST resultField = null;
             for (DetailAST field: fields) {
                 if (getFieldName(field).equals(name)) {
-                    return field;
+                    resultField = field;
+                    break;
                 }
             }
-            return null;
+            return resultField;
         }
 
         /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java
index 2f46c314d96..db3ced83b29 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java
@@ -192,16 +192,18 @@ private static boolean isNumericType(int type) {
      */
     private static boolean isZero(DetailAST expr) {
         final int type = expr.getType();
+        final boolean isZero;
         switch (type) {
             case TokenTypes.NUM_FLOAT:
             case TokenTypes.NUM_DOUBLE:
             case TokenTypes.NUM_INT:
             case TokenTypes.NUM_LONG:
                 final String text = expr.getText();
-                return Double.compare(
-                    CheckUtils.parseDouble(text, type), 0.0) == 0;
+                isZero = Double.compare(CheckUtils.parseDouble(text, type), 0.0) == 0;
+                break;
             default:
-                return false;
+                isZero = false;
         }
+        return isZero;
     }
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java
index 0a4236cfdf1..9064c03a6b6 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java
@@ -371,19 +371,15 @@ private boolean hasFallThroughComment(DetailAST currentCase, DetailAST nextCase)
      * @param lineNo The line number in the file.
      * @return True if a match was found inside a comment.
      */
-    private boolean matchesComment(Pattern pattern, String line, int lineNo
-    ) {
+    private boolean matchesComment(Pattern pattern, String line, int lineNo) {
         final Matcher matcher = pattern.matcher(line);
+        boolean matches = false;
 
-        final boolean hit = matcher.find();
-
-        if (hit) {
-            final int startMatch = matcher.start();
+        if (matcher.find()) {
             // -1 because it returns the char position beyond the match
-            final int endMatch = matcher.end() - 1;
-            return getFileContents().hasIntersectionWithComment(lineNo,
-                    startMatch, lineNo, endMatch);
+            matches = getFileContents().hasIntersectionWithComment(lineNo, matcher.start(),
+                    lineNo, matcher.end() - 1);
         }
-        return false;
+        return matches;
     }
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java
index c07eabc72f0..e41d7ba6422 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheck.java
@@ -402,16 +402,17 @@ else if (parent.getType() == TokenTypes.METHOD_DEF
      *     ignoreSetter is true and ast is the parameter of a setter method.
      */
     private boolean isIgnoredSetterParam(DetailAST ast, String name) {
+        boolean isIgnoredSetterParam = false;
         if (ignoreSetter && ast.getType() == TokenTypes.PARAMETER_DEF) {
             final DetailAST parametersAST = ast.getParent();
             final DetailAST methodAST = parametersAST.getParent();
             if (parametersAST.getChildCount() == 1
                 && methodAST.getType() == TokenTypes.METHOD_DEF
                 && isSetterMethod(methodAST, name)) {
-                return true;
+                isIgnoredSetterParam = true;
             }
         }
-        return false;
+        return isIgnoredSetterParam;
     }
 
     /**
@@ -653,13 +654,15 @@ public FieldFrame getParent() {
          */
         private boolean isEmbeddedIn(String classOrEnumName) {
             FieldFrame currentFrame = this;
+            boolean isEmbeddedIn = false;
             while (currentFrame != null) {
                 if (Objects.equals(currentFrame.frameName, classOrEnumName)) {
-                    return true;
+                    isEmbeddedIn = true;
+                    break;
                 }
                 currentFrame = currentFrame.parent;
             }
-            return false;
+            return isEmbeddedIn;
         }
     }
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java
index f809edba6ae..b6cbcc7987f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheck.java
@@ -326,6 +326,7 @@ private boolean isSamePackage(String className) {
      * @return true if type is standard
      */
     private boolean isStandardClass(String className, String illegal) {
+        boolean isStandardCalss = false;
         // class from java.lang
         if (illegal.length() - JAVA_LANG.length() == className.length()
             && illegal.endsWith(className)
@@ -340,10 +341,10 @@ private boolean isStandardClass(String className, String illegal) {
             final boolean isSamePackage = isSamePackage(className);
 
             if (!isSameFile && !isSamePackage) {
-                return true;
+                isStandardCalss = true;
             }
         }
-        return false;
+        return isStandardCalss;
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java
index 300481671bf..6812b374dbf 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java
@@ -152,15 +152,17 @@ public void visitToken(DetailAST ast) {
      *     token type in {@link #ignoreOccurrenceContext}.
      */
     private boolean isInIgnoreOccurrenceContext(DetailAST ast) {
+        boolean isInIgnoreOccurrenceContext = false;
         for (DetailAST token = ast;
              token.getParent() != null;
              token = token.getParent()) {
             final int type = token.getType();
             if (ignoreOccurrenceContext.get(type)) {
-                return true;
+                isInIgnoreOccurrenceContext = true;
+                break;
             }
         }
-        return false;
+        return isInIgnoreOccurrenceContext;
     }
 
     @Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.java
index 23c55bcabd5..e21d51044bc 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/ArrayInitHandler.java
@@ -45,14 +45,16 @@ public ArrayInitHandler(IndentationCheck indentCheck,
     protected IndentLevel getIndentImpl() {
         final DetailAST parentAST = getMainAst().getParent();
         final int type = parentAST.getType();
+        final IndentLevel indentLevel;
         if (type == TokenTypes.LITERAL_NEW || type == TokenTypes.ASSIGN) {
             // note: assumes new or assignment is line to align with
-            return new IndentLevel(getLineStart(parentAST));
+            indentLevel = new IndentLevel(getLineStart(parentAST));
         }
         else {
             // at this point getParent() is instance of BlockParentHandler
-            return ((BlockParentHandler) getParent()).getChildrenExpectedIndent();
+            indentLevel = ((BlockParentHandler) getParent()).getChildrenExpectedIndent();
         }
+        return indentLevel;
     }
 
     @Override
@@ -126,11 +128,9 @@ private int getNextFirstNonBlankOnLineAfter(int lineNo, int columnNo) {
         }
 
         if (realColumnNo == lineLength) {
-            return -1;
-        }
-        else {
-            return realColumnNo;
+            realColumnNo = -1;
         }
+        return realColumnNo;
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.java
index 1b891aa046d..f8af0a77844 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/LineWrappingHandler.java
@@ -59,12 +59,11 @@ public enum LineWrappingOptions {
          * @noinspection BooleanParameter
          */
         public static LineWrappingOptions ofBoolean(boolean val) {
+            LineWrappingOptions option = NONE;
             if (val) {
-                return IGNORE_FIRST_LINE;
-            }
-            else {
-                return NONE;
+                option = IGNORE_FIRST_LINE;
             }
+            return option;
         }
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java
index 58a66974810..0da1de8f409 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java
@@ -342,6 +342,7 @@ else if (index > 0 && builder.charAt(index) == '/'
      * @param ast the node with the Javadoc
      * @param comment the {@code TextBlock} which represents
      *                 the Javadoc comment.
+     * @noinspection MethodWithMultipleReturnPoints
      */
     // -@cs[ReturnCount] Too complex to break apart.
     private void checkHtmlTags(final DetailAST ast, final TextBlock comment) {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java
index 110a929cd46..e019fda3c07 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java
@@ -136,12 +136,14 @@ private static boolean isCommentConsistent(IndentComment comment) {
     }
 
     private static int getLineStart(String line, final int tabWidth) {
+        int lineStart = 0;
         for (int index = 0; index < line.length(); ++index) {
             if (!Character.isWhitespace(line.charAt(index))) {
-                return CommonUtils.lengthExpandedTabs(line, index, tabWidth);
+                lineStart = CommonUtils.lengthExpandedTabs(line, index, tabWidth);
+                break;
             }
         }
-        return 0;
+        return lineStart;
     }
 
     private void verifyWarns(Configuration config, String filePath,