[PR requested change] Config props reduction (~50% reduction)

Author: onobc

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

@@ -16,25 +16,19 @@
 
 package org.springframework.boot.autoconfigure.pulsar;
 
-import java.net.InetSocketAddress;
-import java.net.URI;
 import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.pulsar.client.api.ClientBuilder;
-import org.apache.pulsar.client.api.ProxyProtocol;
 import org.apache.pulsar.client.api.PulsarClientException;
-import org.apache.pulsar.client.api.SizeUnit;
 
 import org.springframework.boot.autoconfigure.pulsar.PulsarProperties.Client;
 import org.springframework.boot.context.properties.PropertyMapper;
-import org.springframework.boot.context.properties.source.MutuallyExclusiveConfigurationPropertiesException;
 import org.springframework.boot.util.LambdaSafe;
 import org.springframework.pulsar.core.PulsarClientBuilderCustomizer;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
-import org.springframework.util.unit.DataSize;
 
 /**
  * Configure Pulsar {@link ClientBuilder} with sensible defaults and apply a list of
@@ -76,16 +70,15 @@ protected void applyProperties(PulsarProperties pulsarProperties, ClientBuilder
 		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 		Client clientProperties = pulsarProperties.getClient();
 		map.from(clientProperties::getServiceUrl).to(clientBuilder::serviceUrl);
-		map.from(clientProperties::getListenerName).to(clientBuilder::listenerName);
-		map.from(clientProperties::getNumIoThreads).to(clientBuilder::ioThreads);
-		map.from(clientProperties::getNumListenerThreads).to(clientBuilder::listenerThreads);
-		map.from(clientProperties::getNumConnectionsPerBroker).to(clientBuilder::connectionsPerBroker);
-		map.from(clientProperties::getMaxConcurrentLookupRequest).to(clientBuilder::maxConcurrentLookupRequests);
-		map.from(clientProperties::getMaxLookupRequest).to(clientBuilder::maxLookupRequests);
-		map.from(clientProperties::getMaxLookupRedirects).to(clientBuilder::maxLookupRedirects);
-		map.from(clientProperties::getMaxNumberOfRejectedRequestPerConnection)
-			.to(clientBuilder::maxNumberOfRejectedRequestPerConnection);
-		map.from(clientProperties::getUseTcpNoDelay).to(clientBuilder::enableTcpNoDelay);
+		map.from(clientProperties::getConnectionTimeout)
+			.asInt(Duration::toMillis)
+			.to(clientBuilder, (cb, val) -> cb.connectionTimeout(val, TimeUnit.MILLISECONDS));
+		map.from(clientProperties::getOperationTimeout)
+			.asInt(Duration::toMillis)
+			.to(clientBuilder, (cb, val) -> cb.operationTimeout(val, TimeUnit.MILLISECONDS));
+		map.from(clientProperties::getLookupTimeout)
+			.asInt(Duration::toMillis)
+			.to(clientBuilder, (cb, val) -> cb.lookupTimeout(val, TimeUnit.MILLISECONDS));
 
 		// Authentication properties
 		applyAuthentication(clientProperties, clientBuilder);
@@ -104,52 +97,12 @@ protected void applyProperties(PulsarProperties pulsarProperties, ClientBuilder
 		map.from(clientProperties::getTlsTrustStorePassword).to(clientBuilder::tlsTrustStorePassword);
 		map.from(clientProperties::getTlsCiphers).to(clientBuilder::tlsCiphers);
 		map.from(clientProperties::getTlsProtocols).to(clientBuilder::tlsProtocols);
-
-		map.from(clientProperties::getStatsInterval)
-			.as(Duration::toSeconds)
-			.to(clientBuilder, (cb, val) -> cb.statsInterval(val, TimeUnit.SECONDS));
-		map.from(clientProperties::getKeepAliveInterval)
-			.asInt(Duration::toMillis)
-			.to(clientBuilder, (cb, val) -> cb.keepAliveInterval(val, TimeUnit.MILLISECONDS));
-		map.from(clientProperties::getConnectionTimeout)
-			.asInt(Duration::toMillis)
-			.to(clientBuilder, (cb, val) -> cb.connectionTimeout(val, TimeUnit.MILLISECONDS));
-		map.from(clientProperties::getOperationTimeout)
-			.asInt(Duration::toMillis)
-			.to(clientBuilder, (cb, val) -> cb.operationTimeout(val, TimeUnit.MILLISECONDS));
-		map.from(clientProperties::getLookupTimeout)
-			.asInt(Duration::toMillis)
-			.to(clientBuilder, (cb, val) -> cb.lookupTimeout(val, TimeUnit.MILLISECONDS));
-		map.from(clientProperties::getInitialBackoffInterval)
-			.as(Duration::toMillis)
-			.to(clientBuilder, (cb, val) -> cb.startingBackoffInterval(val, TimeUnit.MILLISECONDS));
-		map.from(clientProperties::getMaxBackoffInterval)
-			.as(Duration::toMillis)
-			.to(clientBuilder, (cb, val) -> cb.maxBackoffInterval(val, TimeUnit.MILLISECONDS));
-		map.from(clientProperties::getEnableBusyWait).to(clientBuilder::enableBusyWait);
-		map.from(clientProperties::getMemoryLimit)
-			.as(DataSize::toBytes)
-			.to(clientBuilder, (cb, val) -> cb.memoryLimit(val, SizeUnit.BYTES));
-		map.from(clientProperties::getEnableTransaction).to(clientBuilder::enableTransaction);
-		map.from(clientProperties::getProxyServiceUrl)
-			.to((proxyUrl) -> clientBuilder.proxyServiceUrl(proxyUrl, ProxyProtocol.SNI));
-		map.from(clientProperties::getDnsLookupBindAddress)
-			.to((bindAddr) -> clientBuilder.dnsLookupBind(bindAddr, clientProperties.getDnsLookupBindPort()));
-		map.from(clientProperties::getSocks5ProxyAddress)
-			.as(this::parseSocketAddress)
-			.to(clientBuilder::socks5ProxyAddress);
-		map.from(clientProperties::getSocks5ProxyUsername).to(clientBuilder::socks5ProxyUsername);
-		map.from(clientProperties::getSocks5ProxyPassword).to(clientBuilder::socks5ProxyPassword);
 	}
 
 	private void applyAuthentication(Client clientProperties, ClientBuilder clientBuilder) {
-		MutuallyExclusiveConfigurationPropertiesException.throwIfMultipleNonNullValuesIn((entries) -> {
-			entries.put("spring.pulsar.client.auth-params", clientProperties.getAuthParams());
-			entries.put("spring.pulsar.client.authentication.*", clientProperties.getAuthentication());
-		});
 		String authPluginClass = clientProperties.getAuthPluginClassName();
 		if (StringUtils.hasText(authPluginClass)) {
-			String authParams = clientProperties.getAuthParams();
+			String authParams = null;
 			if (clientProperties.getAuthentication() != null) {
 				authParams = AuthParameterUtils.maybeConvertToEncodedParamString(clientProperties.getAuthentication());
 			}
@@ -162,16 +115,6 @@ private void applyAuthentication(Client clientProperties, ClientBuilder clientBu
 		}
 	}
 
-	private InetSocketAddress parseSocketAddress(String address) {
-		try {
-			URI uri = URI.create(address);
-			return new InetSocketAddress(uri.getHost(), uri.getPort());
-		}
-		catch (Exception ex) {
-			throw new IllegalArgumentException("Invalid socket address", ex);
-		}
-	}
-
 	protected void applyCustomizers(List<PulsarClientBuilderCustomizer> clientBuilderCustomizers,
 			ClientBuilder clientBuilder) {
 		LambdaSafe.callbacks(PulsarClientBuilderCustomizer.class, clientBuilderCustomizers, clientBuilder)