SONARPY-21194 Prevent the creation of ObjectType[UnknownType] when co…

…nverting VariableDescriptor
SonarSource · Oct 23, 2024 · 29e98b3 · 29e98b3
1 parent 1e93b5c
commit 29e98b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.../java/org/sonar/python/semantic/v2/converter/VariableDescriptorToPythonTypeConverter.java b/.../java/org/sonar/python/semantic/v2/converter/VariableDescriptorToPythonTypeConverter.java
@@ -24,15 +24,14 @@
 import org.sonar.python.index.VariableDescriptor;
 import org.sonar.python.types.v2.ObjectType;
 import org.sonar.python.types.v2.PythonType;
-import org.sonar.python.types.v2.TypeWrapper;
 
 public class VariableDescriptorToPythonTypeConverter implements DescriptorToPythonTypeConverter {
 
   public PythonType convert(ConversionContext ctx, VariableDescriptor from) {
-    var typeWrapper = Optional.ofNullable(from.annotatedType())
+    return Optional.ofNullable(from.annotatedType())
       .map(fqn -> ctx.lazyTypesContext().getOrCreateLazyTypeWrapper(fqn))
-      .orElse(TypeWrapper.UNKNOWN_TYPE_WRAPPER);
-    return new ObjectType(typeWrapper);
+      .map(t -> (PythonType) new ObjectType(t))
+      .orElse(PythonType.UNKNOWN);
   }
 
   @Override

diff --git a/python-frontend/src/test/java/org/sonar/python/types/v2/UnresolvedImportTypeTest.java b/python-frontend/src/test/java/org/sonar/python/types/v2/UnresolvedImportTypeTest.java
@@ -66,7 +66,7 @@ void imported_unknown2() {
     var etreeType = ((ModuleType) ((ExpressionStatement) fileInput.statements().statements().get(1)).expressions().get(0).typeV2());
     assertThat(etreeType.name()).isEqualTo("xml");
     assertThat(etreeType.resolveSubmodule("etree")).isEmpty();
-    assertThat(etreeType.resolveMember("etree").get().unwrappedType()).isInstanceOf(UnknownType.UnknownTypeImpl.class);
+    assertThat(etreeType.resolveMember("etree").get()).isInstanceOf(UnknownType.UnknownTypeImpl.class);
   }
 
   @Test