Fix another edge case with primitives in RemoveRedundantTypeCast

openrewrite · Nov 2, 2023 · 1e0ca37 · 1e0ca37
1 parent d6dee9d
commit 1e0ca37
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/org/openrewrite/staticanalysis/RemoveRedundantTypeCast.java b/src/main/java/org/openrewrite/staticanalysis/RemoveRedundantTypeCast.java
@@ -101,7 +101,7 @@ public J visitTypeCast(J.TypeCast typeCast, ExecutionContext ctx) {
                 JavaType expressionType = visitedTypeCast.getExpression().getType();
                 JavaType castType = visitedTypeCast.getType();
 
-                if (targetType == null || targetType instanceof JavaType.Primitive && castType != targetType) {
+                if (targetType == null || targetType instanceof JavaType.Primitive && castType != expressionType) {
                     // Not currently supported, this will be more accurate with dataflow analysis.
                     return visitedTypeCast;
                 } else if (!(targetType instanceof JavaType.Array) && TypeUtils.isOfClassType(targetType, "java.lang.Object") ||

diff --git a/src/test/java/org/openrewrite/staticanalysis/RemoveRedundantTypeCastTest.java b/src/test/java/org/openrewrite/staticanalysis/RemoveRedundantTypeCastTest.java
@@ -79,6 +79,7 @@ void primitiveCast() {
               class Test {
                   void m(DataOutputStream out) {
                       out.writeByte((byte) 0xff);
+                      out.writeDouble((double) 42);
                   }
               }
               """