GH-8642: Revise executors in the project (#8647)
* GH-8642: Revise executors in the project Fixes https://github.com/spring-projects/spring-integration/issues/8642 * Rework some `Executors.newSingleThreadExecutor()` to `ExecutorServiceAdapter(new SimpleAsyncTaskExecutor())` * Expose `TaskExecutor` setters; deprecate `ExecutorService`-based * Some other code clean up in the effected classes: `LogAccessor`, no `synchronized` in critical blocks * Give a meaningful prefix for default threads in the context of components, e.g. `SubscribableRedisChannel` - `getBeanName() + "-"` * * Fix `PostgresChannelMessageTableSubscriberTests` for `PostgresSubscribableChannel` initialization to let it create its internal `Executor` * Use an `AsyncTaskExecutor` injection instead of `ExecutorServiceAdapter` wrapping * Fix `LockRegistryLeaderInitiatorTests` for `taskExecutor` injection * Bring back `LockRegistryLeaderInitiator.setExecutorService()` as an accident after property auto-renaming
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2022 the original author or authors.
|
||||
* Copyright 2002-2023 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -67,10 +67,9 @@ public class SubscribableRedisChannel extends AbstractMessageChannel
|
||||
|
||||
private final String topicName;
|
||||
|
||||
private final BroadcastingDispatcher dispatcher = new BroadcastingDispatcher(true);
|
||||
private Executor taskExecutor;
|
||||
|
||||
// defaults
|
||||
private Executor taskExecutor = new SimpleAsyncTaskExecutor();
|
||||
private final BroadcastingDispatcher dispatcher = new BroadcastingDispatcher(true);
|
||||
|
||||
private RedisSerializer<?> serializer = new StringRedisSerializer();
|
||||
|
||||
@@ -148,6 +147,11 @@ public class SubscribableRedisChannel extends AbstractMessageChannel
|
||||
((BeanFactoryAware) this.messageConverter).setBeanFactory(beanFactory);
|
||||
}
|
||||
this.container.setConnectionFactory(this.connectionFactory);
|
||||
|
||||
if (this.taskExecutor == null) {
|
||||
this.taskExecutor = new SimpleAsyncTaskExecutor(getBeanName() + "-");
|
||||
}
|
||||
|
||||
if (!(this.taskExecutor instanceof ErrorHandlingTaskExecutor)) {
|
||||
ErrorHandler errorHandler = ChannelUtils.getErrorHandler(beanFactory);
|
||||
this.taskExecutor = new ErrorHandlingTaskExecutor(this.taskExecutor, errorHandler);
|
||||
|
||||
Reference in New Issue
Block a user