Enable secure connections via 'spring.rabbitmq.ssl.enabled' will be considered now (#394)

Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
This commit is contained in:
Dominic Schabel
2016-12-19 11:48:26 +01:00
committed by Kai Zimmermann
parent 92dd6a1a0e
commit ccc23bf634

View File

@@ -8,6 +8,7 @@
*/ */
package org.eclipse.hawkbit.amqp; package org.eclipse.hawkbit.amqp;
import java.security.GeneralSecurityException;
import java.time.Duration; import java.time.Duration;
import java.util.Map; import java.util.Map;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@@ -113,15 +114,22 @@ public class AmqpConfiguration {
* @param config * @param config
* with standard {@link RabbitProperties} * with standard {@link RabbitProperties}
* @return {@link ConnectionFactory} * @return {@link ConnectionFactory}
* @throws GeneralSecurityException
* in case of problems with enabled SSL connections
*/ */
@Bean @Bean
public ConnectionFactory rabbitConnectionFactory(final RabbitProperties config) { public ConnectionFactory rabbitConnectionFactory(final RabbitProperties config)
throws GeneralSecurityException {
final CachingConnectionFactory factory = new CachingConnectionFactory(); final CachingConnectionFactory factory = new CachingConnectionFactory();
factory.setRequestedHeartBeat(amqpProperties.getRequestedHeartBeat()); factory.setRequestedHeartBeat(amqpProperties.getRequestedHeartBeat());
factory.setExecutor(threadPoolExecutor); factory.setExecutor(threadPoolExecutor);
factory.getRabbitConnectionFactory().setHeartbeatExecutor(scheduledExecutorService); factory.getRabbitConnectionFactory().setHeartbeatExecutor(scheduledExecutorService);
factory.setPublisherConfirms(true); factory.setPublisherConfirms(true);
if (config.getSsl().isEnabled()) {
factory.getRabbitConnectionFactory().useSslProtocol();
}
final String addresses = config.getAddresses(); final String addresses = config.getAddresses();
factory.setAddresses(addresses); factory.setAddresses(addresses);
if (config.getHost() != null) { if (config.getHost() != null) {