-
Notifications
You must be signed in to change notification settings - Fork 41.6k
Add Rabbit connection factory configurers #26982
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
61 changes: 61 additions & 0 deletions
61
...java/org/springframework/boot/autoconfigure/amqp/AbstractConnectionFactoryConfigurer.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| package org.springframework.boot.autoconfigure.amqp; | ||
|
|
||
| import org.springframework.amqp.rabbit.connection.AbstractConnectionFactory; | ||
| import org.springframework.amqp.rabbit.connection.ConnectionNameStrategy; | ||
| import org.springframework.boot.context.properties.PropertyMapper; | ||
| import org.springframework.util.Assert; | ||
|
|
||
| /** | ||
| * Configures {@link AbstractConnectionFactory Rabbit ConnectionFactory} with sensible | ||
| * defaults. | ||
| * | ||
| * @param <T> the connection factory type. | ||
| * @author Chris Bono | ||
| * @since 2.6.0 | ||
| */ | ||
| public abstract class AbstractConnectionFactoryConfigurer<T extends AbstractConnectionFactory> { | ||
|
|
||
| private RabbitProperties rabbitProperties; | ||
|
|
||
| private ConnectionNameStrategy connectionNameStrategy; | ||
|
|
||
| public RabbitProperties getRabbitProperties() { | ||
| return rabbitProperties; | ||
| } | ||
onobc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| public void setRabbitProperties(RabbitProperties rabbitProperties) { | ||
| this.rabbitProperties = rabbitProperties; | ||
| } | ||
|
|
||
| public ConnectionNameStrategy getConnectionNameStrategy() { | ||
| return connectionNameStrategy; | ||
| } | ||
|
|
||
| public void setConnectionNameStrategy(ConnectionNameStrategy connectionNameStrategy) { | ||
| this.connectionNameStrategy = connectionNameStrategy; | ||
| } | ||
|
|
||
| /** | ||
| * Configure the specified Rabbit connection factory - delegating to | ||
| * {@link #configureSpecific} for the connection factory implementation specific | ||
| * settings. The factory can be further tuned and default settings can be overridden. | ||
| * @param connectionFactory the connection factory instance to configure | ||
| */ | ||
| public void configure(T connectionFactory) { | ||
| Assert.notNull(connectionFactory, "ConnectionFactory must not be null"); | ||
| PropertyMapper map = PropertyMapper.get(); | ||
| map.from(this.rabbitProperties::determineAddresses).to(connectionFactory::setAddresses); | ||
| map.from(this.rabbitProperties::getAddressShuffleMode).whenNonNull() | ||
| .to(connectionFactory::setAddressShuffleMode); | ||
| map.from(connectionNameStrategy).whenNonNull().to(connectionFactory::setConnectionNameStrategy); | ||
| configureSpecific(connectionFactory); | ||
| } | ||
|
|
||
| /** | ||
| * Configure the specified Rabbit connection factory with implementation specific | ||
| * settings. | ||
| * @param connectionFactory the connection factory instance to configure | ||
| */ | ||
| protected abstract void configureSpecific(T connectionFactory); | ||
onobc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| } | ||
38 changes: 38 additions & 0 deletions
38
.../java/org/springframework/boot/autoconfigure/amqp/CachingConnectionFactoryConfigurer.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package org.springframework.boot.autoconfigure.amqp; | ||
|
|
||
| import java.time.Duration; | ||
|
|
||
| import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; | ||
| import org.springframework.boot.context.properties.PropertyMapper; | ||
|
|
||
| /** | ||
| * Configures {@link CachingConnectionFactory Rabbit CachingConnectionFactory} with | ||
| * sensible defaults. | ||
| * | ||
| * @author Chris Bono | ||
| * @since 2.6.0 | ||
| */ | ||
| public class CachingConnectionFactoryConfigurer extends AbstractConnectionFactoryConfigurer<CachingConnectionFactory> { | ||
|
|
||
| /** | ||
| * Configure the specified Rabbit caching connection factory with implementation | ||
| * specific settings. | ||
| * @param connectionFactory the {@link CachingConnectionFactory} instance to configure | ||
| */ | ||
| @Override | ||
| public void configureSpecific(CachingConnectionFactory connectionFactory) { | ||
| PropertyMapper map = PropertyMapper.get(); | ||
| RabbitProperties rabbitProperties = getRabbitProperties(); | ||
| map.from(rabbitProperties::isPublisherReturns).to(connectionFactory::setPublisherReturns); | ||
| map.from(rabbitProperties::getPublisherConfirmType).whenNonNull() | ||
| .to(connectionFactory::setPublisherConfirmType); | ||
| RabbitProperties.Cache.Channel channel = rabbitProperties.getCache().getChannel(); | ||
| map.from(channel::getSize).whenNonNull().to(connectionFactory::setChannelCacheSize); | ||
| map.from(channel::getCheckoutTimeout).whenNonNull().as(Duration::toMillis) | ||
| .to(connectionFactory::setChannelCheckoutTimeout); | ||
| RabbitProperties.Cache.Connection connection = rabbitProperties.getCache().getConnection(); | ||
| map.from(connection::getMode).whenNonNull().to(connectionFactory::setCacheMode); | ||
| map.from(connection::getSize).whenNonNull().to(connectionFactory::setConnectionCacheSize); | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
...va/org/springframework/boot/autoconfigure/amqp/RabbitConnectionFactoryBeanConfigurer.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package org.springframework.boot.autoconfigure.amqp; | ||
|
|
||
| import java.time.Duration; | ||
|
|
||
| import com.rabbitmq.client.impl.CredentialsProvider; | ||
| import com.rabbitmq.client.impl.CredentialsRefreshService; | ||
|
|
||
| import org.springframework.amqp.rabbit.connection.RabbitConnectionFactoryBean; | ||
| import org.springframework.boot.context.properties.PropertyMapper; | ||
| import org.springframework.core.io.ResourceLoader; | ||
| import org.springframework.util.Assert; | ||
|
|
||
| /** | ||
| * Configures {@link RabbitConnectionFactoryBean} with sensible defaults. | ||
| * | ||
| * @author Chris Bono | ||
| * @since 2.6.0 | ||
| */ | ||
| public class RabbitConnectionFactoryBeanConfigurer { | ||
|
|
||
| private RabbitProperties rabbitProperties; | ||
|
|
||
| private ResourceLoader resourceLoader; | ||
|
|
||
| private CredentialsProvider credentialsProvider; | ||
|
|
||
| private CredentialsRefreshService credentialsRefreshService; | ||
|
|
||
| public RabbitProperties getRabbitProperties() { | ||
| return rabbitProperties; | ||
| } | ||
|
|
||
| public void setRabbitProperties(RabbitProperties rabbitProperties) { | ||
| this.rabbitProperties = rabbitProperties; | ||
| } | ||
|
|
||
| public ResourceLoader getResourceLoader() { | ||
| return resourceLoader; | ||
| } | ||
|
|
||
| public void setResourceLoader(ResourceLoader resourceLoader) { | ||
| this.resourceLoader = resourceLoader; | ||
| } | ||
|
|
||
| public CredentialsProvider getCredentialsProvider() { | ||
| return credentialsProvider; | ||
| } | ||
|
|
||
| public void setCredentialsProvider(CredentialsProvider credentialsProvider) { | ||
| this.credentialsProvider = credentialsProvider; | ||
| } | ||
|
|
||
| public CredentialsRefreshService getCredentialsRefreshService() { | ||
| return credentialsRefreshService; | ||
| } | ||
|
|
||
| public void setCredentialsRefreshService(CredentialsRefreshService credentialsRefreshService) { | ||
| this.credentialsRefreshService = credentialsRefreshService; | ||
| } | ||
|
|
||
| /** | ||
| * Configure the specified rabbit connection factory bean. The factory bean can be | ||
| * further tuned and default settings can be overridden. It is the repsonsiblity of | ||
| * the caller to invoke {@link RabbitConnectionFactoryBean#afterPropertiesSet()} | ||
| * though. | ||
| * @param factory the {@link RabbitConnectionFactoryBean} instance to configure | ||
| */ | ||
| public void configure(RabbitConnectionFactoryBean factory) { | ||
| Assert.notNull(factory, "RabbitConnectionFactoryBean must not be null"); | ||
| factory.setResourceLoader(resourceLoader); | ||
| PropertyMapper map = PropertyMapper.get(); | ||
| map.from(this.rabbitProperties::determineHost).whenNonNull().to(factory::setHost); | ||
| map.from(this.rabbitProperties::determinePort).to(factory::setPort); | ||
| map.from(this.rabbitProperties::determineUsername).whenNonNull().to(factory::setUsername); | ||
| map.from(this.rabbitProperties::determinePassword).whenNonNull().to(factory::setPassword); | ||
| map.from(this.rabbitProperties::determineVirtualHost).whenNonNull().to(factory::setVirtualHost); | ||
| map.from(this.rabbitProperties::getRequestedHeartbeat).whenNonNull().asInt(Duration::getSeconds) | ||
| .to(factory::setRequestedHeartbeat); | ||
| map.from(this.rabbitProperties::getRequestedChannelMax).to(factory::setRequestedChannelMax); | ||
| RabbitProperties.Ssl ssl = this.rabbitProperties.getSsl(); | ||
| if (ssl.determineEnabled()) { | ||
| factory.setUseSSL(true); | ||
| map.from(ssl::getAlgorithm).whenNonNull().to(factory::setSslAlgorithm); | ||
| map.from(ssl::getKeyStoreType).to(factory::setKeyStoreType); | ||
| map.from(ssl::getKeyStore).to(factory::setKeyStore); | ||
| map.from(ssl::getKeyStorePassword).to(factory::setKeyStorePassphrase); | ||
| map.from(ssl::getKeyStoreAlgorithm).whenNonNull().to(factory::setKeyStoreAlgorithm); | ||
| map.from(ssl::getTrustStoreType).to(factory::setTrustStoreType); | ||
| map.from(ssl::getTrustStore).to(factory::setTrustStore); | ||
| map.from(ssl::getTrustStorePassword).to(factory::setTrustStorePassphrase); | ||
| map.from(ssl::getTrustStoreAlgorithm).whenNonNull().to(factory::setTrustStoreAlgorithm); | ||
| map.from(ssl::isValidateServerCertificate) | ||
| .to((validate) -> factory.setSkipServerCertificateValidation(!validate)); | ||
| map.from(ssl::getVerifyHostname).to(factory::setEnableHostnameVerification); | ||
| } | ||
| map.from(this.rabbitProperties::getConnectionTimeout).whenNonNull().asInt(Duration::toMillis) | ||
| .to(factory::setConnectionTimeout); | ||
| map.from(this.rabbitProperties::getChannelRpcTimeout).whenNonNull().asInt(Duration::toMillis) | ||
| .to(factory::setChannelRpcTimeout); | ||
| map.from(credentialsProvider).whenNonNull().to(factory::setCredentialsProvider); | ||
| map.from(credentialsRefreshService).whenNonNull().to(factory::setCredentialsRefreshService); | ||
| } | ||
|
|
||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.