cleaning up unnecessary condition and adding a comment

uber · Nov 26, 2023 · 79bc579 · 79bc579
1 parent ef844c8
commit 79bc579
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/nullaway/src/main/java/com/uber/nullaway/generics/PreservedAnnotationTreeVisitor.java b/nullaway/src/main/java/com/uber/nullaway/generics/PreservedAnnotationTreeVisitor.java
@@ -170,15 +170,11 @@ public TypeMetadata create(com.sun.tools.javac.util.List<Attribute.TypeCompound>
     @Override
     public Type cloneTypeWithMetaData(Type typeToBeCloned, TypeMetadata metaData) {
       try {
-        Type clonedType = null;
-        if (metaData.getClass().getComponentType() != null) {
-          clonedType = (Type) cloneAddMetadataHandle.invoke(typeToBeCloned, metaData);
-        } else {
-          Type clonedTypeDrop =
-              (Type) cloneDropMetadataHandle.invoke(typeToBeCloned, metaData.getClass());
-          clonedType = (Type) cloneAddMetadataHandle.invoke(clonedTypeDrop, metaData);
-        }
-        return clonedType;
+        // In Jdk21 addMetadata works if there is no metadata associated with the type, so we create
+        // a copy without the existing metadata first and then add it
+        Type clonedTypeWithoutMetadata =
+            (Type) cloneDropMetadataHandle.invoke(typeToBeCloned, metaData.getClass());
+        return (Type) cloneAddMetadataHandle.invoke(clonedTypeWithoutMetadata, metaData);
       } catch (Throwable e) {
         throw new RuntimeException(e);
       }