Polish

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfigurationTests.java

@@ -233,7 +233,7 @@ private static final class SpanTagAnnotationHandlerConfiguration {
 
 		@Bean
 		SpanTagAnnotationHandler spanTagAnnotationHandler() {
-			return new SpanTagAnnotationHandler((aClass) -> null, (aClass) -> null);
+			return new SpanTagAnnotationHandler((valueResolverClass) -> null, (valueExpressionResolverClass) -> null);
 		}
 
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java

@@ -115,13 +115,13 @@ public void setObservationRegistry(ObservationRegistry observationRegistry) {
 	public void configure(DefaultJmsListenerContainerFactory factory, ConnectionFactory connectionFactory) {
 		Assert.notNull(factory, "Factory must not be null");
 		Assert.notNull(connectionFactory, "ConnectionFactory must not be null");
-		factory.setConnectionFactory(connectionFactory);
-		factory.setPubSubDomain(this.jmsProperties.isPubSubDomain());
-		factory.setSubscriptionDurable(this.jmsProperties.isSubscriptionDurable());
-		factory.setClientId(this.jmsProperties.getClientId());
 		JmsProperties.Listener listenerProperties = this.jmsProperties.getListener();
 		Session sessionProperties = listenerProperties.getSession();
+		factory.setConnectionFactory(connectionFactory);
 		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
+		map.from(this.jmsProperties::isPubSubDomain).to(factory::setPubSubDomain);
+		map.from(this.jmsProperties::isSubscriptionDurable).to(factory::setSubscriptionDurable);
+		map.from(this.jmsProperties::getClientId).to(factory::setClientId);
 		map.from(this.transactionManager).to(factory::setTransactionManager);
 		map.from(this.destinationResolver).to(factory::setDestinationResolver);
 		map.from(this.messageConverter).to(factory::setMessageConverter);

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesMapper.java

@@ -64,7 +64,7 @@ void customizeClientBuilder(ClientBuilder clientBuilder, PulsarConnectionDetails
 		map.from(properties::getConnectionTimeout).to(timeoutProperty(clientBuilder::connectionTimeout));
 		map.from(properties::getOperationTimeout).to(timeoutProperty(clientBuilder::operationTimeout));
 		map.from(properties::getLookupTimeout).to(timeoutProperty(clientBuilder::lookupTimeout));
-		customizeAuthentication(clientBuilder::authentication, properties.getAuthentication());
+		customizeAuthentication(properties.getAuthentication(), clientBuilder::authentication);
 		customizeServiceUrlProviderBuilder(clientBuilder::serviceUrl, clientBuilder::serviceUrlProvider, properties,
 				connectionDetails);
 	}
@@ -77,21 +77,11 @@ private void customizeServiceUrlProviderBuilder(Consumer<String> serviceUrlConsu
 			serviceUrlConsumer.accept(connectionDetails.getBrokerUrl());
 			return;
 		}
-		Map<String, Authentication> secondaryAuths = new LinkedHashMap<>();
-		failoverProperties.getBackupClusters().forEach((cluster) -> {
-			PulsarProperties.Authentication authentication = cluster.getAuthentication();
-			if (authentication.getPluginClassName() == null) {
-				secondaryAuths.put(cluster.getServiceUrl(), null);
-			}
-			else {
-				customizeAuthentication((authPluginClassName, authParams) -> secondaryAuths.put(cluster.getServiceUrl(),
-						AuthenticationFactory.create(authPluginClassName, authParams)), authentication);
-			}
-		});
+		Map<String, Authentication> secondaryAuths = getSecondaryAuths(failoverProperties);
 		AutoClusterFailoverBuilder autoClusterFailoverBuilder = new AutoClusterFailoverBuilderImpl();
 		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 		map.from(connectionDetails::getBrokerUrl).to(autoClusterFailoverBuilder::primary);
-		map.from(new ArrayList<>(secondaryAuths.keySet())).to(autoClusterFailoverBuilder::secondary);
+		map.from(secondaryAuths::keySet).as(ArrayList::new).to(autoClusterFailoverBuilder::secondary);
 		map.from(failoverProperties::getFailoverPolicy).to(autoClusterFailoverBuilder::failoverPolicy);
 		map.from(failoverProperties::getFailOverDelay).to(timeoutProperty(autoClusterFailoverBuilder::failoverDelay));
 		map.from(failoverProperties::getSwitchBackDelay)
@@ -101,22 +91,38 @@ private void customizeServiceUrlProviderBuilder(Consumer<String> serviceUrlConsu
 		serviceUrlProviderConsumer.accept(autoClusterFailoverBuilder.build());
 	}
 
+	private Map<String, Authentication> getSecondaryAuths(PulsarProperties.Failover properties) {
+		Map<String, Authentication> secondaryAuths = new LinkedHashMap<>();
+		properties.getBackupClusters().forEach((backupCluster) -> {
+			PulsarProperties.Authentication authenticationProperties = backupCluster.getAuthentication();
+			if (authenticationProperties.getPluginClassName() == null) {
+				secondaryAuths.put(backupCluster.getServiceUrl(), null);
+			}
+			else {
+				customizeAuthentication(authenticationProperties, (authPluginClassName, authParams) -> {
+					Authentication authentication = AuthenticationFactory.create(authPluginClassName, authParams);
+					secondaryAuths.put(backupCluster.getServiceUrl(), authentication);
+				});
+			}
+		});
+		return secondaryAuths;
+	}
+
 	void customizeAdminBuilder(PulsarAdminBuilder adminBuilder, PulsarConnectionDetails connectionDetails) {
 		PulsarProperties.Admin properties = this.properties.getAdmin();
 		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 		map.from(connectionDetails::getAdminUrl).to(adminBuilder::serviceHttpUrl);
 		map.from(properties::getConnectionTimeout).to(timeoutProperty(adminBuilder::connectionTimeout));
 		map.from(properties::getReadTimeout).to(timeoutProperty(adminBuilder::readTimeout));
 		map.from(properties::getRequestTimeout).to(timeoutProperty(adminBuilder::requestTimeout));
-		customizeAuthentication(adminBuilder::authentication, properties.getAuthentication());
+		customizeAuthentication(properties.getAuthentication(), adminBuilder::authentication);
 	}
 
-	private void customizeAuthentication(AuthenticationConsumer authentication,
-			PulsarProperties.Authentication properties) {
-		if (StringUtils.hasText(properties.getPluginClassName())) {
+	private void customizeAuthentication(PulsarProperties.Authentication properties, AuthenticationConsumer action) {
+		String pluginClassName = properties.getPluginClassName();
+		if (StringUtils.hasText(pluginClassName)) {
 			try {
-				authentication.accept(properties.getPluginClassName(),
-						getAuthenticationParamsJson(properties.getParam()));
+				action.accept(pluginClassName, getAuthenticationParamsJson(properties.getParam()));
 			}
 			catch (UnsupportedAuthenticationException ex) {
 				throw new IllegalStateException("Unable to configure Pulsar authentication", ex);

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

@@ -332,7 +332,7 @@ public static class Session {
 			/**
 			 * The maximum number of sessions that can be stored.
 			 */
-			private int maxSessions = 10_000;
+			private int maxSessions = 10000;
 
 			@NestedConfigurationProperty
 			private final Cookie cookie = new Cookie();