* Add @SerializationHint for messaging types

* Add programmatic scan for `IntegrationNode` impls instead of huge number of
explicit types in `@TypeHint`
* Add `JdbcChannelMessageStore` logic into the sample to cover its serialization functionality
* Add `RedisChannelMessageStore` logic into the sample to cover JSON (un)marshaling feature

Author: artembilan

samples/integration/docker-compose.yml

@@ -1,6 +1,14 @@
 version: '3.1'
 services:
+  redis:
+    image: 'redis:latest'
+    ports:
+      - '6379:6379'
   integration:
     image: integration:0.0.1-SNAPSHOT
     ports:
-      - "8080:8080"
+      - '8080:8080'
+    depends_on:
+      - redis
+    environment:
+      - SPRING_REDIS_HOST=redis

samples/integration/pom.xml

@@ -29,6 +29,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-integration</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webflux</artifactId>
@@ -41,6 +45,10 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-jdbc</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-redis</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-core</artifactId>

samples/integration/src/main/java/com/example/integration/IntegrationApplication.java

@@ -11,6 +11,8 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.integration.annotation.ServiceActivator;
@@ -27,7 +29,9 @@
 import org.springframework.integration.http.config.EnableIntegrationGraphController;
 import org.springframework.integration.jdbc.store.JdbcChannelMessageStore;
 import org.springframework.integration.jdbc.store.channel.H2ChannelMessageStoreQueryProvider;
+import org.springframework.integration.redis.store.RedisChannelMessageStore;
 import org.springframework.integration.scheduling.PollerMetadata;
+import org.springframework.integration.support.json.JacksonJsonUtils;
 import org.springframework.integration.webflux.dsl.WebFlux;
 import org.springframework.messaging.MessageHandler;
 import org.springframework.scheduling.support.PeriodicTrigger;
@@ -89,6 +93,14 @@ JdbcChannelMessageStore jdbcChannelMessageStore(DataSource dataSource) {
 		return jdbcChannelMessageStore;
 	}
 
+	@Bean
+	RedisChannelMessageStore redisChannelMessageStore(RedisConnectionFactory connectionFactory) {
+		RedisChannelMessageStore redisChannelMessageStore = new RedisChannelMessageStore(connectionFactory);
+		redisChannelMessageStore.setValueSerializer(
+				new GenericJackson2JsonRedisSerializer(JacksonJsonUtils.messagingAwareMapper()));
+		return redisChannelMessageStore;
+	}
+
 	@Bean(PollerMetadata.DEFAULT_POLLER)
 	PollerMetadata defaultPoller() {
 		PollerMetadata pollerMetadata = new PollerMetadata();
@@ -97,14 +109,16 @@ PollerMetadata defaultPoller() {
 	}
 
 	@Bean
-	IntegrationFlow printFormattedSecondsFlow(JdbcChannelMessageStore jdbcChannelMessageStore) {
+	IntegrationFlow printFormattedSecondsFlow(JdbcChannelMessageStore jdbcChannelMessageStore,
+			RedisChannelMessageStore redisChannelMessageStore) {
 		return IntegrationFlows
 				.fromSupplier(Date::new,
 						e -> e.id("dateSourceEndpoint")
 								.poller(p -> p.fixedDelay(1000, 1000)))
 				.channel(c -> c.queue("dateChannel", jdbcChannelMessageStore, "dateChannelGroup"))
 				.gateway(subflow -> subflow.convert(Integer.class,
 						e -> e.advice(new RequestHandlerRetryAdvice())))
+				.channel(c -> c.queue(redisChannelMessageStore, "secondsChannelGroup"))
 				.handle(m -> System.out.println("Current seconds: " + m.getPayload()))
 				.get();
 	}

spring-native-configuration/pom.xml

@@ -480,6 +480,11 @@
             <artifactId>spring-integration-xml</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-file</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-ws-core</artifactId>

spring-native-configuration/src/main/java/org/springframework/integration/IntegrationHints.java

@@ -17,15 +17,20 @@
 package org.springframework.integration;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.List;
+import java.util.Properties;
+import java.util.UUID;
 
 import org.springframework.integration.jdbc.store.JdbcMessageStore;
 import org.springframework.nativex.hint.AccessBits;
 import org.springframework.nativex.hint.InitializationHint;
 import org.springframework.nativex.hint.InitializationTime;
-import org.springframework.nativex.hint.NativeHint;
 import org.springframework.nativex.hint.JdkProxyHint;
+import org.springframework.nativex.hint.NativeHint;
 import org.springframework.nativex.hint.ResourceHint;
+import org.springframework.nativex.hint.SerializationHint;
 import org.springframework.nativex.hint.TypeHint;
 import org.springframework.nativex.type.AccessDescriptor;
 import org.springframework.nativex.type.HintDeclaration;
@@ -52,17 +57,12 @@
 								org.springframework.integration.dsl.IntegrationFlow.class,
 								org.springframework.integration.gateway.RequestReplyExchanger.class,
 								org.springframework.integration.graph.Graph.class,
+								org.springframework.integration.graph.LinkNode.class,
 								org.springframework.integration.graph.SendTimers.class,
 								org.springframework.integration.graph.TimerStats.class,
+								org.springframework.integration.graph.ReceiveCounters.class,
 								org.springframework.integration.http.management.IntegrationGraphController.class,
-								org.springframework.integration.handler.AbstractReplyProducingMessageHandler.RequestHandler.class,
-								org.springframework.messaging.support.GenericMessage.class,
-								org.springframework.messaging.support.ErrorMessage.class,
-								org.springframework.integration.message.AdviceMessage.class,
-								org.springframework.integration.support.MutableMessage.class,
-								org.springframework.integration.store.MessageGroupMetadata.class,
-								org.springframework.integration.store.MessageHolder.class,
-								org.springframework.integration.store.MessageMetadata.class
+								org.springframework.integration.handler.AbstractReplyProducingMessageHandler.RequestHandler.class
 						}),
 				@TypeHint(access = AccessBits.CLASS | AccessBits.PUBLIC_METHODS,
 						types = {
@@ -74,6 +74,30 @@
 								org.springframework.integration.core.Pausable.class
 						})
 		},
+		serializables = {
+				@SerializationHint(
+						types = {
+								Number.class,
+								ArrayList.class,
+								HashMap.class,
+								Properties.class,
+								Hashtable.class,
+								Exception.class,
+								UUID.class,
+								org.springframework.messaging.support.GenericMessage.class,
+								org.springframework.messaging.support.ErrorMessage.class,
+								org.springframework.messaging.MessageHeaders.class,
+								org.springframework.integration.message.AdviceMessage.class,
+								org.springframework.integration.support.MutableMessage.class,
+								org.springframework.integration.support.MutableMessageHeaders.class,
+								org.springframework.integration.store.MessageGroupMetadata.class,
+								org.springframework.integration.store.MessageHolder.class,
+								org.springframework.integration.store.MessageMetadata.class,
+								org.springframework.integration.history.MessageHistory.class,
+								org.springframework.integration.history.MessageHistory.Entry.class,
+								org.springframework.integration.handler.DelayHandler.DelayedMessageWrapper.class
+						})
+		},
 		jdkProxies = {
 				@JdkProxyHint(
 						types = {
@@ -113,6 +137,12 @@
 						kotlin.Unit.class
 				},
 				access = AccessBits.CLASS | AccessBits.PUBLIC_METHODS))
+@NativeHint(trigger = org.springframework.integration.file.splitter.FileSplitter.class,
+		serializables =
+		@SerializationHint(types = {
+				org.springframework.integration.file.splitter.FileSplitter.FileMarker.class,
+				org.springframework.integration.file.splitter.FileSplitter.FileMarker.Mark.class,
+		}))
 @NativeHint(trigger = org.springframework.integration.xml.transformer.XsltPayloadTransformer.class,
 		types =
 		@TypeHint(types = org.springframework.web.context.support.ServletContextResource.class,
@@ -157,8 +187,8 @@ public List<HintDeclaration> computeHints(TypeSystem typeSystem) {
 		hints.addAll(computeMessagingGatewayHints(typeSystem));
 		hints.addAll(computeAbstractEndpointHints(typeSystem));
 		hints.addAll(computeIntegrationNodeHints(typeSystem));
-//		TODO Fails with 'Unable to find class file for org/springframework/web/server/WebFilter' on 'spring-aot-maven-plugin:test-generate'
-//		hints.addAll(computeMessageHints(typeSystem));
+		//		TODO Fails with 'Unable to find class file for org/springframework/web/server/WebFilter' on 'spring-aot-maven-plugin:test-generate'
+		//		hints.addAll(computeMessageHints(typeSystem));
 		return hints;
 	}
 
@@ -188,8 +218,8 @@ private static List<HintDeclaration> computeAbstractEndpointHints(TypeSystem typ
 				.skipConstructorInspection()
 				.filter(type -> type.extendsClass(ABSTRACT_ENDPOINT_TYPE))
 				.onTypeDiscovered((type, context) ->
-					context.addReflectiveAccess(type,
-							new AccessDescriptor(AccessBits.CLASS | AccessBits.PUBLIC_METHODS)))
+						context.addReflectiveAccess(type,
+								new AccessDescriptor(AccessBits.CLASS | AccessBits.PUBLIC_METHODS)))
 				.use(typeSystem)
 				.processTypes();
 	}