Fix caching of RepositoryMethodKey

Author: dstepanov

data-jdbc/src/test/groovy/io/micronaut/data/jdbc/h2/H2RepositoryScopeSpec.groovy

@@ -15,7 +15,10 @@
  */
 package io.micronaut.data.jdbc.h2
 
+import groovy.transform.Memoized
 import io.micronaut.context.BeanContext
+import io.micronaut.context.annotation.Prototype
+import io.micronaut.data.runtime.intercept.DataInterceptorResolver
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import jakarta.inject.Inject
 import spock.lang.Shared
@@ -43,4 +46,66 @@ class H2RepositoryScopeSpec extends Specification {
         then:
             instance1.is(instance2)
     }
+
+    void "test no memory leak 1"() {
+        when:
+            def dataInterceptor = getDataInterceptor()
+            def instance = beanContext.getBean(H2BookRepository)
+        then:
+            instance.deleteAll()
+            if (i % 1000 == 0) {
+                System.gc()
+            }
+            dataInterceptor.@interceptors.size() < 10000
+        where:
+            i << (1..30000)
+    }
+
+    void "test no memory leak 2"() {
+        when:
+            def dataInterceptor = getDataInterceptor()
+            def instance = bookRepository
+        then:
+            instance.deleteAll()
+            if (i % 1000 == 0) {
+                System.gc()
+            }
+            dataInterceptor.@interceptors.size() < 10000
+        where:
+            i << (1..30000)
+    }
+
+    void "test no memory leak 3"() {
+        when:
+            def dataInterceptor = getDataInterceptor()
+            def myService = beanContext.getBean(MyPrototypeService)
+        then:
+            myService.bookRepository.deleteAll()
+            if (i % 1000 == 0) {
+                System.gc()
+            }
+            dataInterceptor.@interceptors.size() < 10000
+        where:
+            i << (1..30000)
+    }
+
+    @Memoized
+    private DataInterceptorResolver getDataInterceptor() {
+        return beanContext.getBean(DataInterceptorResolver)
+    }
+
+    @Memoized
+    H2BookRepository getBookRepository() {
+        beanContext.getBean(H2BookRepository)
+    }
+
+    @Prototype
+    static class MyPrototypeService {
+
+        final H2BookRepository bookRepository
+
+        MyPrototypeService(H2BookRepository bookRepository) {
+            this.bookRepository = bookRepository
+        }
+    }
 }

data-model/src/main/java/io/micronaut/data/intercept/RepositoryMethodKey.java

@@ -16,8 +16,10 @@
 package io.micronaut.data.intercept;
 
 import io.micronaut.core.annotation.Internal;
+import io.micronaut.core.type.Argument;
 import io.micronaut.inject.ExecutableMethod;
 
+import java.util.Arrays;
 import java.util.Objects;
 
 /**
@@ -28,44 +30,36 @@
  */
 @Internal
 public final class RepositoryMethodKey {
-    private final Object repository;
-    private final ExecutableMethod<?, ?> method;
+    private final Class<?> repositoryClass;
+    private final String repositoryMethodName;
+    private final Argument<?>[] repositoryMethodArguments;
     private final int hashCode;
 
     /**
      * @param repository The repository instance
      * @param method     The method
      */
     public RepositoryMethodKey(Object repository, ExecutableMethod<?, ?> method) {
-        this.repository = repository;
-        this.method = method;
-        this.hashCode = Objects.hash(repository, method);
+        this.repositoryClass = repository.getClass();
+        this.repositoryMethodName = method.getName();
+        this.repositoryMethodArguments = method.getArguments();
+        this.hashCode = Objects.hash(repositoryClass, repositoryMethodName, repositoryMethodArguments.length);
     }
 
-    public Object repository() {
-        return repository;
-    }
-
-    public ExecutableMethod<?, ?> method() {
-        return method;
-    }
 
     @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        }
-        if (obj == null || obj.getClass() != this.getClass()) {
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        var that = (RepositoryMethodKey) obj;
-        return Objects.equals(this.repository, that.repository) &&
-                Objects.equals(this.method, that.method);
+        RepositoryMethodKey that = (RepositoryMethodKey) o;
+        return Objects.equals(repositoryClass, that.repositoryClass)
+            && Objects.equals(repositoryMethodName, that.repositoryMethodName)
+            && Objects.deepEquals(repositoryMethodArguments, that.repositoryMethodArguments);
     }
 
     @Override
     public int hashCode() {
         return hashCode;
     }
-
 }

data-runtime/src/main/java/io/micronaut/data/runtime/intercept/DataInterceptorResolver.java

@@ -49,7 +49,7 @@
  */
 @Internal
 @Singleton
-final class DataInterceptorResolver {
+public final class DataInterceptorResolver {
 
     private final RepositoryOperationsRegistry repositoryOperationsRegistry;
     @Nullable