Refine Spring Data repositories triggers

This commits changes Spring Data repositories hint triggers to use
more "robust" bean types.

It also moves Log4j hints used for ElasticSearch to Log4jApiHints.

Closes gh-1504
Closes gh-1492

Author: sdeleuze

spring-native-configuration/src/main/java/org/apache/logging/Log4jApiHints.java

@@ -2,9 +2,11 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.message.DefaultFlowMessageFactory;
+import org.apache.logging.log4j.message.ParameterizedMessageFactory;
 import org.apache.logging.log4j.message.ReusableMessageFactory;
 
 import org.springframework.nativex.hint.NativeHint;
+import org.springframework.nativex.hint.TypeAccess;
 import org.springframework.nativex.hint.TypeHint;
 import org.springframework.nativex.type.NativeConfiguration;
 
@@ -16,7 +18,7 @@
 @NativeHint(
 	trigger = LogManager.class,
 	types = @TypeHint(types = {
-		ReusableMessageFactory.class, DefaultFlowMessageFactory.class
+		ReusableMessageFactory.class, DefaultFlowMessageFactory.class, ParameterizedMessageFactory.class, ReusableMessageFactory.class
 	})
 )
 public class Log4jApiHints implements NativeConfiguration {

spring-native-configuration/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesHints.java

@@ -45,7 +45,7 @@
  * @author Christoph Strobl
  * @author Sebastien Deleuze
  */
-@NativeHint(trigger = ElasticsearchRepositoriesAutoConfiguration.class,
+@NativeHint(trigger = ElasticsearchRepositoryFactoryBean.class,
 		types = {
 				@TypeHint(types = {
 						ElasticsearchRepositoryFactoryBean.class,
@@ -62,7 +62,7 @@
 				}, access = { TypeAccess.DECLARED_CONSTRUCTORS, TypeAccess.DECLARED_METHODS, TypeAccess.PUBLIC_METHODS})
 		},
 		resources = @ResourceHint(patterns = "versions.properties"))
-@NativeHint(trigger = ReactiveElasticsearchRepositoriesAutoConfiguration.class,
+@NativeHint(trigger = ReactiveElasticsearchRepositoryFactoryBean.class,
 		imports = SpringDataReactiveHints.class,
 		types = {
 				@TypeHint(
@@ -105,13 +105,8 @@
 )
 
 // org.elasticsearch.client.RestClient - required logging configuration
-@NativeHint(trigger = ElasticsearchRepositoriesAutoConfiguration.class,
+@NativeHint(trigger = ReactiveElasticsearchRepositoryFactoryBean.class,
 		types = {
-				@TypeHint(types = {
-						org.apache.logging.log4j.message.DefaultFlowMessageFactory.class,
-						org.apache.logging.log4j.message.ParameterizedMessageFactory.class,
-						org.apache.logging.log4j.message.ReusableMessageFactory.class
-				}, access = TypeAccess.DECLARED_CONSTRUCTORS),
 				@TypeHint(typeNames = {
 						// those cause a lot of errors and warnings in logs if not present
 						"io.netty.buffer.AbstractByteBufAllocator",

spring-native-configuration/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesHints.java

@@ -29,7 +29,7 @@
 /**
  * @author Christoph Strobl
  */
-@NativeHint(trigger = JdbcRepositoriesAutoConfiguration.class, //
+@NativeHint(trigger = JdbcRepositoryFactoryBean.class,
 		types = {
 		@TypeHint(types = {
 						JdbcRepositoryFactoryBean.class,

spring-native-configuration/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesHints.java

@@ -27,7 +27,7 @@
 import org.springframework.nativex.hint.TypeHint;
 import org.springframework.orm.jpa.SharedEntityManagerCreator;
 
-@NativeHint(trigger = JpaRepositoriesAutoConfiguration.class,
+@NativeHint(trigger = JpaRepositoryFactoryBean.class,
 		resources = @ResourceHint(patterns = "META-INF/jpa-named-queries.properties"),
 		types = @TypeHint(types = {
 				SharedEntityManagerCreator.class, // TODO is this one in the right place?

spring-native-configuration/src/main/java/org/springframework/boot/autoconfigure/data/mongodb/MongoDataHints.java spring-native-configuration/src/main/java/org/springframework/boot/autoconfigure/data/mongodb/MongoRepositoriesHints.java

@@ -26,7 +26,8 @@
 import org.springframework.boot.autoconfigure.data.SpringDataReactiveHints;
 import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.mongo.MongoReactiveDataAutoConfiguration;
-import org.springframework.data.mongodb.config.MongoConfigurationSupport;
+import org.springframework.data.mongodb.core.MongoDatabaseFactorySupport;
+import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
 import org.springframework.data.mongodb.core.mapping.event.AfterConvertCallback;
 import org.springframework.data.mongodb.core.mapping.event.AfterSaveCallback;
 import org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback;
@@ -35,8 +36,6 @@
 import org.springframework.data.mongodb.core.mapping.event.ReactiveAfterSaveCallback;
 import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeConvertCallback;
 import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeSaveCallback;
-import org.springframework.data.mongodb.repository.config.ReactiveMongoRepositoryConfigurationExtension;
-import org.springframework.data.mongodb.repository.support.ReactiveMongoRepositoryFactoryBean;
 import org.springframework.data.mongodb.repository.support.SimpleMongoRepository;
 import org.springframework.data.mongodb.repository.support.SimpleReactiveMongoRepository;
 import org.springframework.nativex.domain.proxies.AotProxyDescriptor;
@@ -53,7 +52,7 @@
 import org.springframework.util.ClassUtils;
 
 
-@NativeHint(trigger = MongoDataAutoConfiguration.class, types = {
+@NativeHint(trigger = MongoDatabaseFactorySupport.class, types = {
 		@TypeHint(types = {
 				SimpleMongoRepository.class,
 				BeforeConvertCallback.class,
@@ -62,7 +61,7 @@
 				AfterConvertCallback.class
 		}, access = { TypeAccess.DECLARED_CONSTRUCTORS, TypeAccess.PUBLIC_METHODS})
 })
-@NativeHint(trigger = MongoReactiveDataAutoConfiguration.class,
+@NativeHint(trigger = SimpleReactiveMongoDatabaseFactory.class,
 		imports = SpringDataReactiveHints.class,
 		types = @TypeHint(types = {
 					SimpleReactiveMongoRepository.class,
@@ -73,7 +72,7 @@
 			}, access = { TypeAccess.DECLARED_CONSTRUCTORS, TypeAccess.PUBLIC_METHODS})
 
 )
-public class MongoDataHints implements NativeConfiguration, TypeSystemNativeConfiguration {
+public class MongoRepositoriesHints implements NativeConfiguration, TypeSystemNativeConfiguration {
 
 	@Override
 	public List<HintDeclaration> computeHints(TypeSystem typeSystem) {

spring-native-configuration/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jReactiveRepositoriesHints.java

@@ -25,14 +25,15 @@
 import org.springframework.data.neo4j.repository.ReactiveNeo4jRepository;
 import org.springframework.data.neo4j.repository.config.ReactiveNeo4jRepositoryConfigurationExtension;
 import org.springframework.data.neo4j.repository.support.Neo4jEvaluationContextExtension;
+import org.springframework.data.neo4j.repository.support.ReactiveNeo4jRepositoryFactoryBean;
 import org.springframework.data.neo4j.repository.support.SimpleReactiveNeo4jRepository;
 import org.springframework.nativex.hint.TypeAccess;
 import org.springframework.nativex.type.NativeConfiguration;
 import org.springframework.nativex.hint.NativeHint;
 import org.springframework.nativex.hint.JdkProxyHint;
 import org.springframework.nativex.hint.TypeHint;
 
-@NativeHint(trigger = Neo4jReactiveRepositoriesAutoConfiguration.class,
+@NativeHint(trigger = ReactiveNeo4jRepositoryFactoryBean.class,
 		options = "--enable-https", types = {
 	@TypeHint(types = {
 			SimpleReactiveNeo4jRepository.class,

spring-native-configuration/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesHints.java

@@ -32,7 +32,7 @@
 import org.springframework.nativex.hint.JdkProxyHint;
 import org.springframework.nativex.hint.TypeHint;
 
-@NativeHint(trigger = Neo4jRepositoriesAutoConfiguration.class, types = {
+@NativeHint(trigger = Neo4jRepositoryFactoryBean.class, types = {
 	@TypeHint(types = {
 			SimpleNeo4jRepository.class,
 			BeforeBindCallback.class,

spring-native-configuration/src/main/java/org/springframework/boot/autoconfigure/data/r2dbc/R2dbcRepositoriesHints.java

@@ -26,7 +26,7 @@
 import org.springframework.nativex.hint.NativeHint;
 import org.springframework.nativex.hint.TypeHint;
 
-@NativeHint(trigger = R2dbcRepositoriesAutoConfiguration.class, types = {
+@NativeHint(trigger = R2dbcRepositoryFactoryBean.class, types = {
 		@TypeHint(types = {
 				R2dbcRepositoryFactoryBean.class,
 				R2dbcRepositoryConfigurationExtension.class,

spring-native-configuration/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisDataSupportHints.java

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.autoconfigure.data.redis;
 
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.repository.support.RedisRepositoryFactoryBean;
 import org.springframework.nativex.hint.TypeAccess;
 import org.springframework.nativex.hint.InitializationHint;
 import org.springframework.nativex.hint.InitializationTime;
@@ -28,7 +30,7 @@
  * @author Christoph Strobl
  * @author Sebastien Deleuze
  */
-@NativeHint(trigger = RedisAutoConfiguration.class,
+@NativeHint(trigger = RedisConnectionFactory.class,
 		types = @TypeHint(types = {
 						org.springframework.data.redis.connection.RedisConnection.class,
 						org.springframework.data.redis.connection.StringRedisConnection.class,
@@ -92,7 +94,7 @@
 				})
 		}
 )
-@NativeHint(trigger = RedisRepositoriesAutoConfiguration.class,
+@NativeHint(trigger = RedisRepositoryFactoryBean.class,
 		types = {
 				@TypeHint(types = {
 						org.springframework.data.keyvalue.annotation.KeySpace.class,

spring-native-configuration/src/main/resources/META-INF/spring.factories

@@ -51,7 +51,7 @@ org.springframework.boot.autoconfigure.aop.AopHints,\
 org.springframework.boot.autoconfigure.data.RepositoriesHints,\
 org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesHints,\
 org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesHints,\
-org.springframework.boot.autoconfigure.data.mongodb.MongoDataHints,\
+org.springframework.boot.autoconfigure.data.mongodb.MongoRepositoriesHints,\
 org.springframework.boot.autoconfigure.data.neo4j.Neo4jRepositoriesHints,\
 org.springframework.boot.autoconfigure.data.neo4j.Neo4jReactiveRepositoriesHints,\
 org.springframework.boot.autoconfigure.data.redis.RedisDataSupportHints,\