Fix format

eddumelendez · Jan 26, 2024 · 8a66735 · 8a66735
1 parent f996f70
commit 8a66735
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 24 deletions.
diff --git a/...ain/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfiguration.java
@@ -85,6 +85,7 @@ public String getUser() {
 		public String getPassword() {
 			return this.properties.getPassword();
 		}
+
 	}
 
 }
diff --git a/...springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java b/...springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java
@@ -68,7 +68,8 @@ static class CachingConnectionFactoryConfiguration {
 
 			@Bean(name = "jmsConnectionFactory")
 			CachingConnectionFactory cachingJmsConnectionFactory(JmsProperties jmsProperties,
-					ArtemisProperties properties, ArtemisConnectionDetails connectionDetails, ListableBeanFactory beanFactory) {
+					ArtemisProperties properties, ArtemisConnectionDetails connectionDetails,
+					ListableBeanFactory beanFactory) {
 				JmsProperties.Cache cacheProperties = jmsProperties.getCache();
 				CachingConnectionFactory connectionFactory = new CachingConnectionFactory(
 						createJmsConnectionFactory(properties, connectionDetails, beanFactory));
@@ -88,8 +89,10 @@ CachingConnectionFactory cachingJmsConnectionFactory(JmsProperties jmsProperties
 	static class PooledConnectionFactoryConfiguration {
 
 		@Bean(destroyMethod = "stop")
-		JmsPoolConnectionFactory jmsConnectionFactory(ListableBeanFactory beanFactory, ArtemisProperties properties, ArtemisConnectionDetails connectionDetails) {
-			ActiveMQConnectionFactory connectionFactory = new ArtemisConnectionFactoryFactory(beanFactory, properties, connectionDetails)
+		JmsPoolConnectionFactory jmsConnectionFactory(ListableBeanFactory beanFactory, ArtemisProperties properties,
+				ArtemisConnectionDetails connectionDetails) {
+			ActiveMQConnectionFactory connectionFactory = new ArtemisConnectionFactoryFactory(beanFactory, properties,
+					connectionDetails)
 				.createConnectionFactory(ActiveMQConnectionFactory.class);
 			return new JmsPoolConnectionFactoryFactory(properties.getPool())
 				.createPooledConnectionFactory(connectionFactory);

diff --git a/...a/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java b/...a/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java
@@ -51,7 +51,8 @@ class ArtemisConnectionFactoryFactory {
 
 	private final ListableBeanFactory beanFactory;
 
-	ArtemisConnectionFactoryFactory(ListableBeanFactory beanFactory, ArtemisProperties properties, ArtemisConnectionDetails connectionDetails) {
+	ArtemisConnectionFactoryFactory(ListableBeanFactory beanFactory, ArtemisProperties properties,
+			ArtemisConnectionDetails connectionDetails) {
 		Assert.notNull(beanFactory, "BeanFactory must not be null");
 		Assert.notNull(properties, "Properties must not be null");
 		Assert.notNull(connectionDetails, "ConnectionDetails must not be null");
@@ -140,8 +141,8 @@ private <T extends ActiveMQConnectionFactory> T createNativeConnectionFactory(Cl
 	}
 
 	private <T extends ActiveMQConnectionFactory> T newNativeConnectionFactory(Class<T> factoryClass) throws Exception {
-		String brokerUrl = StringUtils.hasText(this.connectionDetails.getBrokerUrl()) ? this.connectionDetails.getBrokerUrl()
-				: DEFAULT_BROKER_URL;
+		String brokerUrl = StringUtils.hasText(this.connectionDetails.getBrokerUrl())
+				? this.connectionDetails.getBrokerUrl() : DEFAULT_BROKER_URL;
 		Constructor<T> constructor = factoryClass.getConstructor(String.class);
 		return constructor.newInstance(brokerUrl);
 

diff --git a/...ringframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java b/...ringframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java
@@ -45,13 +45,14 @@ class ArtemisXAConnectionFactoryConfiguration {
 	@Bean(name = { "jmsConnectionFactory", "xaJmsConnectionFactory" })
 	ConnectionFactory jmsConnectionFactory(ListableBeanFactory beanFactory, ArtemisProperties properties,
 			ArtemisConnectionDetails connectionDetails, XAConnectionFactoryWrapper wrapper) throws Exception {
-		return wrapper.wrapConnectionFactory(new ArtemisConnectionFactoryFactory(beanFactory, properties, connectionDetails)
-			.createConnectionFactory(ActiveMQXAConnectionFactory.class));
+		return wrapper
+			.wrapConnectionFactory(new ArtemisConnectionFactoryFactory(beanFactory, properties, connectionDetails)
+				.createConnectionFactory(ActiveMQXAConnectionFactory.class));
 	}
 
 	@Bean
-	ActiveMQXAConnectionFactory nonXaJmsConnectionFactory(ListableBeanFactory beanFactory,
-			ArtemisProperties properties, ArtemisConnectionDetails connectionDetails) {
+	ActiveMQXAConnectionFactory nonXaJmsConnectionFactory(ListableBeanFactory beanFactory, ArtemisProperties properties,
+			ArtemisConnectionDetails connectionDetails) {
 		return new ArtemisConnectionFactoryFactory(beanFactory, properties, connectionDetails)
 			.createConnectionFactory(ActiveMQXAConnectionFactory.class);
 	}

diff --git a/...ava/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java b/...ava/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java
@@ -374,23 +374,23 @@ void cachingConnectionFactoryNotOnTheClasspathAndCacheEnabledThenSimpleConnectio
 
 	@Test
 	void definesPropertiesBasedConnectionDetailsByDefault() {
-		this.contextRunner.run((context) -> assertThat(context)
-				.hasSingleBean(PropertiesArtemisConnectionDetails.class));
+		this.contextRunner
+			.run((context) -> assertThat(context).hasSingleBean(PropertiesArtemisConnectionDetails.class));
 	}
 
 	@Test
 	void testConnectionFactoryWithOverridesWhenUsingCustomConnectionDetails() {
 		this.contextRunner.withClassLoader(new FilteredClassLoader(CachingConnectionFactory.class))
-				.withPropertyValues("spring.artemis.pool.enabled=false", "spring.jms.cache.enabled=false")
-				.withUserConfiguration(TestConnectionDetailsConfiguration.class)
-				.run((context) -> {
-					assertThat(context).hasSingleBean(ArtemisConnectionDetails.class)
-							.doesNotHaveBean(PropertiesArtemisConnectionDetails.class);
-					ActiveMQConnectionFactory connectionFactory = context.getBean(ActiveMQConnectionFactory.class);
-					assertThat(connectionFactory.toURI().toString()).startsWith("tcp://localhost:12345");
-					assertThat(connectionFactory.getUser()).isEqualTo("springuser");
-					assertThat(connectionFactory.getPassword()).isEqualTo("spring");
-				});
+			.withPropertyValues("spring.artemis.pool.enabled=false", "spring.jms.cache.enabled=false")
+			.withUserConfiguration(TestConnectionDetailsConfiguration.class)
+			.run((context) -> {
+				assertThat(context).hasSingleBean(ArtemisConnectionDetails.class)
+					.doesNotHaveBean(PropertiesArtemisConnectionDetails.class);
+				ActiveMQConnectionFactory connectionFactory = context.getBean(ActiveMQConnectionFactory.class);
+				assertThat(connectionFactory.toURI().toString()).startsWith("tcp://localhost:12345");
+				assertThat(connectionFactory.getUser()).isEqualTo("springuser");
+				assertThat(connectionFactory.getPassword()).isEqualTo("spring");
+			});
 	}
 
 	private ConnectionFactory getConnectionFactory(AssertableApplicationContext context) {

diff --git a/...ice/connection/activemq/ArtemisDockerComposeConnectionDetailsFactoryIntegrationTests.java b/...ice/connection/activemq/ArtemisDockerComposeConnectionDetailsFactoryIntegrationTests.java
@@ -18,7 +18,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQConnectionDetails;
 import org.springframework.boot.autoconfigure.jms.artemis.ArtemisConnectionDetails;
 import org.springframework.boot.autoconfigure.jms.artemis.ArtemisMode;
 import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;

diff --git a/.../testcontainers/service/connection/activemq/ArtemisContainerConnectionDetailsFactory.java b/.../testcontainers/service/connection/activemq/ArtemisContainerConnectionDetailsFactory.java
@@ -34,7 +34,8 @@ class ArtemisContainerConnectionDetailsFactory
 		extends ContainerConnectionDetailsFactory<ArtemisContainer, ArtemisConnectionDetails> {
 
 	@Override
-	protected ArtemisConnectionDetails getContainerConnectionDetails(ContainerConnectionSource<ArtemisContainer> source) {
+	protected ArtemisConnectionDetails getContainerConnectionDetails(
+			ContainerConnectionSource<ArtemisContainer> source) {
 		return new ArtemisContainerConnectionDetails(source);
 	}