Fix generic types caching (#2619)

1 files changed, 37 insertions, 0 deletions

diff --git a/plugins/base/src/test/kotlin/model/JavaTest.kt b/plugins/base/src/test/kotlin/model/JavaTest.kt
index 0abaf1b1..47a25943 100644
--- a/plugins/base/src/test/kotlin/model/JavaTest.kt
+++ b/plugins/base/src/test/kotlin/model/JavaTest.kt
@@ -143,6 +143,43 @@ class JavaTest : AbstractModelTest("/src/main/kotlin/java/Test.java", "java") {
         ) {
             with((this / "java" / "Foo").cast<DClass>()) {
                 generics counts 1
+                generics[0].dri.classNames equals "Foo"
+                (functions[0].type as? TypeParameter)?.dri?.run {
+                    packageName equals "java"
+                    name equals "Foo"
+                    callable?.name equals "foo"
+                }
+            }
+        }
+    }
+
+    @Test
+    fun typeParameterIntoDifferentClasses2596() {
+        inlineModelTest(
+            """
+            |class GenericDocument { }
+            |public interface DocumentClassFactory<T> {
+            |    String getSchemaName();
+            |    GenericDocument toGenericDocument(T document);
+            |    T fromGenericDocument(GenericDocument genericDoc);
+            |}
+            |
+            |public final class DocumentClassFactoryRegistry {
+            |    public <T> DocumentClassFactory<T> getOrCreateFactory(T documentClass) {
+            |        return null;
+            |    }
+            |}
+            """, configuration = configuration
+        ) {
+            with((this / "java" / "DocumentClassFactory").cast<DInterface>()) {
+                generics counts 1
+                generics[0].dri.classNames equals "DocumentClassFactory"
+            }
+            with((this / "java" / "DocumentClassFactoryRegistry").cast<DClass>()) {
+                functions.forEach {
+                    (it.type as GenericTypeConstructor).dri.classNames equals "DocumentClassFactory"
+                    ((it.type as GenericTypeConstructor).projections[0] as TypeParameter).dri.classNames equals "DocumentClassFactoryRegistry"
+                }
             }
         }
     }