Use streams

Author: tomasz-tylenda-sonarsource

java-checks/src/main/java/org/sonar/java/checks/DiamondOperatorCheck.java

@@ -16,8 +16,10 @@
  */
 package org.sonar.java.checks;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Stream;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import org.sonar.check.Rule;
@@ -54,20 +56,20 @@
 @Rule(key = "S2293")
 public class DiamondOperatorCheck extends SubscriptionVisitor implements JavaVersionAwareVisitor {
 
+  /** Nodes to check in Java 7. */
   private static final Tree.Kind[] JAVA_7_KINDS = new Tree.Kind[] {
     Tree.Kind.VARIABLE,
     Tree.Kind.TYPE_CAST,
     Tree.Kind.RETURN_STATEMENT,
     Tree.Kind.ASSIGNMENT
   };
 
-  private static final Tree.Kind[] JAVA_8_KINDS = new Tree.Kind[] {
-    Tree.Kind.VARIABLE,
-    Tree.Kind.TYPE_CAST,
-    Tree.Kind.RETURN_STATEMENT,
-    Tree.Kind.ASSIGNMENT,
-    Tree.Kind.CONDITIONAL_EXPRESSION
-  };
+  /** Nodes to check in Java 8 and up. */
+  private static final Tree.Kind[] JAVA_8_KINDS =
+    Stream.concat(
+      Arrays.stream(JAVA_7_KINDS),
+      Stream.of(Tree.Kind.CONDITIONAL_EXPRESSION)
+    ).toArray(Tree.Kind[]::new);
 
   private Tree.Kind[] expressionKindsToCheck = JAVA_7_KINDS;