Address some static code analysis issues

Author: knutwannheden

src/main/java/org/openrewrite/staticanalysis/CombineSemanticallyEqualCatchBlocks.java

@@ -603,7 +603,7 @@ public J.Case visitCase(J.Case _case, J j) {
                         return _case;
                     }
 
-                    this.visit(_case.getPattern(), compareTo.getPattern());
+                    this.visit(_case.getExpressions().get(0), compareTo.getExpressions().get(0));
                     for (int i = 0; i < _case.getStatements().size(); i++) {
                         this.visit(_case.getStatements().get(i), compareTo.getStatements().get(i));
                     }

src/main/java/org/openrewrite/staticanalysis/DeclarationSiteTypeVariance.java

@@ -67,8 +67,8 @@ public String getDescription() {
     }
 
     @Override
-    public Validated validate() {
-        Validated v = super.validate();
+    public Validated<Object> validate() {
+        Validated<Object> v = super.validate();
         v = v.and(Validated.required("variantTypes", variantTypes));
         if (v.isValid()) {
             for (String variantType : variantTypes) {

src/main/java/org/openrewrite/staticanalysis/DefaultComesLastVisitor.java

@@ -186,7 +186,7 @@ private boolean isDefaultCaseLastOrNotPresent(J.Switch switch_) {
     }
 
     private boolean isDefaultCase(J.Case case_) {
-        Expression elem = case_.getPattern();
+        Expression elem = case_.getExpressions().get(0);
         return elem instanceof J.Identifier && ((J.Identifier) elem).getSimpleName().equals("default");
     }
 

src/main/java/org/openrewrite/staticanalysis/OperatorWrap.java

@@ -181,7 +181,7 @@ public J.InstanceOf visitInstanceOf(J.InstanceOf instanceOf, ExecutionContext ct
                 if (Boolean.TRUE.equals(operatorWrapStyle.getLiteralInstanceof())) {
                     if (OperatorWrapStyle.WrapOption.NL == operatorWrapStyle.getWrapOption()) {
                         if (i.getClazz().getPrefix().getWhitespace().contains("\n")) {
-                            i = i.getPadding().withExpr(
+                            i = i.getPadding().withExpression(
                                     i.getPadding().getExpression().withAfter(
                                             i.getClazz().getPrefix()
                                     )
@@ -198,7 +198,7 @@ public J.InstanceOf visitInstanceOf(J.InstanceOf instanceOf, ExecutionContext ct
                                         i.getPadding().getExpression().getAfter()
                                 )
                         );
-                        i = i.getPadding().withExpr(
+                        i = i.getPadding().withExpression(
                                 i.getPadding().getExpression().withAfter(
                                         i.getPadding().getExpression().getAfter().withWhitespace(" ")
                                 )

src/main/java/org/openrewrite/staticanalysis/ReferentialEqualityToObjectEquals.java

@@ -81,7 +81,7 @@ private static J.MethodInvocation asEqualsMethodInvocation(J.Binary binary, Java
                             JavaType.Primitive.Boolean,
                             singletonList("o"),
                             singletonList(TYPE_OBJECT),
-                            null, null, null
+                            null, null, null, null
                     )
             );
         }

src/main/java/org/openrewrite/staticanalysis/RemoveUnusedPrivateFields.java

@@ -34,7 +34,6 @@
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
 
 @Value
 @EqualsAndHashCode(callSuper = false)
@@ -235,7 +234,7 @@ public J visitStatement(Statement s, ExecutionContext ctx) {
             if (s == statement) {
                 Space prefix = s.getPrefix();
                 // If we have at least one comment and there is no newline
-                if (prefix.getComments().size() > 0 && !prefix.getWhitespace().contains("\n")) {
+                if (!prefix.getComments().isEmpty() && !prefix.getWhitespace().contains("\n")) {
                     return s.withPrefix(prefix
                             // Copy suffix to prefix
                             .withWhitespace(prefix.getComments().get(0).getSuffix())
@@ -254,7 +253,7 @@ public J visitClassDeclaration(J.ClassDeclaration c, ExecutionContext ctx) {
             if (statement == null && c == classDeclaration) {
                 Space end = c.getBody().getEnd();
                 // If we have at least one comment and there is no newline
-                if (end.getComments().size() > 0 && !end.getWhitespace().contains("\n")) {
+                if (!end.getComments().isEmpty() && !end.getWhitespace().contains("\n")) {
                     return c.withBody(c.getBody().withEnd(end
                             .withWhitespace(end.getComments().get(0).getSuffix())
                             .withComments(end.getComments().subList(1, end.getComments().size()))

src/main/java/org/openrewrite/staticanalysis/SimplifyConsecutiveAssignments.java

@@ -87,7 +87,7 @@ public J.Block visitBlock(J.Block block, ExecutionContext ctx) {
                 } while (combined != b);
 
                 if (b != block) {
-                    b = (J.Block) new UnnecessaryParenthesesVisitor()
+                    b = (J.Block) new UnnecessaryParenthesesVisitor<>()
                             .visitNonNull(b, ctx, getCursor().getParentOrThrow());
                 }
 

src/main/java/org/openrewrite/staticanalysis/SortedSetStreamToLinkedHashSet.java

@@ -48,7 +48,7 @@ public String getDescription() {
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return Preconditions.check(new UsesMethod<>(COLLECTORS_TO_SET_METHOD_MATCHER), new JavaIsoVisitor<ExecutionContext>() {
-            private JavaTemplate template = JavaTemplate.builder("Collectors.toCollection(LinkedHashSet::new)")
+            private final JavaTemplate template = JavaTemplate.builder("Collectors.toCollection(LinkedHashSet::new)")
                     .imports("java.util.stream.Collectors", "java.util.LinkedHashSet")
                     .build();
 

src/main/java/org/openrewrite/staticanalysis/StringLiteralEquality.java

@@ -95,7 +95,7 @@ private J.MethodInvocation asEqualsMethodInvocation(J.Binary binary) {
                                 JavaType.Primitive.Boolean,
                                 singletonList("o"),
                                 singletonList(JavaType.buildType("java.lang.Object")),
-                                null, null, null
+                                null, null, null, null
                         )
                 );
             }

src/main/java/org/openrewrite/staticanalysis/TernaryOperatorsShouldNotBeNested.java

@@ -261,6 +261,7 @@ private J.Case toDefault(final J.Ternary ternary) {
                             randomId(),
                             Space.EMPTY,
                             Markers.EMPTY,
+                            Collections.emptyList(),
                             "default",
                             null,
                             null