fix rebase errors

Author: christophstrobl

src/test/java/org/springframework/data/repository/core/support/RepositoryFactorySupportUnitTests.java

@@ -277,7 +277,7 @@ record Metadata(RepositoryMethodContext context, MethodInvocation methodInvocati
 		}
 
 		when(factory.queryOne.execute(any(Object[].class)))
-				.then(invocation -> new Metadata(RepositoryMethodContext.currentMethod(),
+				.then(invocation -> new Metadata(DefaultRepositoryMethodContext.getInstance(),
 						ExposeInvocationInterceptor.currentInvocation()));
 
 		var repository = factory.getRepository(ObjectRepository.class, new RepositoryMetadataAccess() {});
@@ -287,7 +287,7 @@ record Metadata(RepositoryMethodContext context, MethodInvocation methodInvocati
 
 		Metadata metadata = (Metadata) metadataByLastname;
 		assertThat(metadata.context().getMethod().getName()).isEqualTo("findMetadataByLastname");
-		assertThat(metadata.context().getRepository().getDomainType()).isEqualTo(Object.class);
+		assertThat(metadata.context().getMetadata().getDomainType()).isEqualTo(Object.class);
 		assertThat(metadata.methodInvocation().getMethod().getName()).isEqualTo("findMetadataByLastname");
 	}