Fix quality flaw: dupicate conditions

Author: benzonico

java-checks/src/main/java/org/sonar/java/closeresource/CloseableVisitor.java

@@ -155,17 +155,21 @@ private static boolean shouldBeIgnored(@Nullable ExpressionTree expression) {
 
   private static boolean usesIgnoredCloseableAsArgument(ExecutionState executionState, List<ExpressionTree> arguments) {
     for (ExpressionTree argument : arguments) {
-      if (isNewClassWithIgnoredArguments(executionState, argument)) {
-        return true;
-      } else if (isMethodInvocationWithIgnoredArguments(executionState, argument)) {
-        return true;
-      } else if (useIgnoredCloseable(executionState, argument) || isSubclassOfInputStreamOrOutputStreamWithoutClose(argument.symbolType())) {
+      if (isIgnoredCloseableArgument(executionState, argument)) {
         return true;
       }
     }
     return false;
   }
 
+  private static boolean isIgnoredCloseableArgument(ExecutionState executionState, ExpressionTree argument) {
+    return isNewClassWithIgnoredArguments(executionState, argument)
+        || isMethodInvocationWithIgnoredArguments(executionState, argument)
+        || useIgnoredCloseable(executionState, argument)
+        || isSubclassOfInputStreamOrOutputStreamWithoutClose(argument.symbolType());
+  }
+
+
   private static boolean isNewClassWithIgnoredArguments(ExecutionState executionState, ExpressionTree argument) {
     return argument.is(Tree.Kind.NEW_CLASS) && usesIgnoredCloseableAsArgument(executionState, ((NewClassTree) argument).arguments());
   }

java-squid/src/main/java/org/sonar/java/ast/visitors/PublicApiChecker.java

@@ -178,7 +178,8 @@ private boolean isPublicApi(ClassTree classTree, MethodTree methodTree) {
     Preconditions.checkNotNull(classTree);
     if (separateAccessorsFromMethods && AccessorsUtils.isAccessor(classTree, methodTree)) {
       return false;
-    } else if (isPublicInterface(classTree)) {
+    }
+    if (isPublicInterface(classTree)) {
       return !hasOverrideAnnotation(methodTree);
     } else if (isEmptyDefaultConstructor(methodTree) || hasOverrideAnnotation(methodTree) || classTree.is(Tree.Kind.INTERFACE, Tree.Kind.ANNOTATION_TYPE)) {
       return false;

java-squid/src/main/java/org/sonar/java/resolve/Resolve.java

@@ -520,9 +520,8 @@ private JavaSymbol selectMostSpecific(JavaSymbol m1, JavaSymbol m2, List<JavaTyp
       return m1;
     } else if (m2SignatureMoreSpecific) {
       return m2;
-    } else {
-      return new AmbiguityErrorJavaSymbol();
     }
+    return new AmbiguityErrorJavaSymbol();
   }
 
   /**

java-squid/src/main/java/org/sonar/java/resolve/SecondPass.java

@@ -127,13 +127,11 @@ private void populateSuperclass(JavaSymbol.TypeJavaSymbol symbol, Resolve.Env en
       Scope enumParameters = ((JavaSymbol.TypeJavaSymbol) symbols.enumType.symbol()).typeParameters();
       JavaType.TypeVariableJavaType enumParameter = (JavaType.TypeVariableJavaType) enumParameters.lookup("E").get(0).type();
       type.supertype = parametrizedTypeCache.getParametrizedTypeType(symbols.enumType.symbol, new TypeSubstitution().add(enumParameter, type));
-    } else if (tree.is(Tree.Kind.CLASS)) {
-      // JLS8 8.1.4: the direct superclass of the class type C<F1,...,Fn> is
+    } else if (tree.is(Tree.Kind.CLASS, Tree.Kind.INTERFACE)) {
+      // For CLASS JLS8 8.1.4: the direct superclass of the class type C<F1,...,Fn> is
       // the type given in the extends clause of the declaration of C
       // if an extends clause is present, or Object otherwise.
-      type.supertype = symbols.objectType;
-    } else if(tree.is(Tree.Kind.INTERFACE)) {
-      // JLS8 9.1.3: While every class is an extension of class Object, there is no single interface of which all interfaces are
+      // For INTERFACE JLS8 9.1.3: While every class is an extension of class Object, there is no single interface of which all interfaces are
       // extensions.
       // but we can call object method on any interface type.
       type.supertype = symbols.objectType;