Entity.createFromDiscriminatorValue incorrectly deserializes #microsoft.graph.user as com.microsoft.graph.beta.models.security.User

Describe the bug

In current beta version, when trying to deserialize a #microsoft.graph.user from JSON using KiotaJsonSerialization.deserialize(json, Entity::createFromDiscriminatorValue), it's returned as a com.microsoft.graph.beta.models.security.User instance.

This is because only one of com.microsoft.graph.beta.models.User and com.microsoft.graph.beta.models.security.User is imported the latter), and classes are referenced without fully qualified name.

See https://github.com/microsoftgraph/msgraph-beta-sdk-java/blob/3612a3a8958cc35b0be7626b966008ea99a031af/src/main/java/com/microsoft/graph/beta/generated/models/Entity.java#L2075 and https://github.com/microsoftgraph/msgraph-beta-sdk-java/blob/3612a3a8958cc35b0be7626b966008ea99a031af/src/main/java/com/microsoft/graph/beta/generated/models/Entity.java#L2326

There are probably other cases like this one.

Expected behavior

KiotaJsonSerialization.deserialize(json, Entity::createFromDiscriminatorValue) should return a com.microsoft.graph.beta.models.User instance for #microsoft.graph.user objects.

How to reproduce

This test

//passes
assertEquals(com.microsoft.graph.beta.models.User.class, KiotaJsonSerialization.deserialize("""
        {
            "@odata.type": "#microsoft.graph.user"
        }
        """, DirectoryObject::createFromDiscriminatorValue).getClass());
//KO
assertEquals(com.microsoft.graph.beta.models.User.class, KiotaJsonSerialization.deserialize("""
        {
            "@odata.type": "#microsoft.graph.user"
        }
        """, Entity::createFromDiscriminatorValue).getClass());

will fail with

org.opentest4j.AssertionFailedError: 
Expected :class com.microsoft.graph.beta.models.User
Actual   :class com.microsoft.graph.beta.models.security.User

SDK Version

6.51.0

Latest version known to work for scenario above?

No response

Known Workarounds

Pass a more precise ParsableFactory, like DirectoryObject::createFromDiscriminatorValue, like in the reproduction test.

Debug output

Configuration

No response

Other information

I found an old bug in Kiota that might be related (it was marked as fixed though): https://github.com/microsoft/kiota/issues/1801

Beginne mit der Discriminator-Factory in den generierten models/Entity.java an den referenzierten Zeilen und vergleiche ihre Imports und Typzuordnungen mit DirectoryObject::createFromDiscriminatorValue. Führe die bereitgestellte KiotaJsonSerialization-Reproduktion aus, füge anschließend eine Regressionstestabdeckung für #microsoft.graph.user hinzu und prüfe, ob andere Discriminator-Zuordnungen dieselbe Mehrdeutigkeit aufweisen.