root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.2.x' 

Closes gh-39424
This commit is contained in:
Moritz Halbritter 2024-02-06 13:26:04 +01:00
parent cc2233a7d9 36d850db0c
commit 22de896339
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import java.util.TreeMap;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.stream.Collectors;
import org.apache.pulsar.client.admin.PulsarAdminBuilder; import org.apache.pulsar.client.admin.PulsarAdminBuilder;
import org.apache.pulsar.client.api.Authentication; import org.apache.pulsar.client.api.Authentication;
@ -36,7 +37,6 @@ import org.apache.pulsar.client.api.PulsarClientException.UnsupportedAuthenticat
import org.apache.pulsar.client.api.ReaderBuilder; import org.apache.pulsar.client.api.ReaderBuilder;
import org.apache.pulsar.client.api.ServiceUrlProvider; import org.apache.pulsar.client.api.ServiceUrlProvider;
import org.apache.pulsar.client.impl.AutoClusterFailover.AutoClusterFailoverBuilderImpl; import org.apache.pulsar.client.impl.AutoClusterFailover.AutoClusterFailoverBuilderImpl;
import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.springframework.boot.context.properties.PropertyMapper; import org.springframework.boot.context.properties.PropertyMapper;
import org.springframework.pulsar.listener.PulsarContainerProperties; import org.springframework.pulsar.listener.PulsarContainerProperties;
@ -133,7 +133,10 @@ final class PulsarPropertiesMapper {
private String getAuthenticationParamsJson(Map<String, String> params) { private String getAuthenticationParamsJson(Map<String, String> params) {
Map<String, String> sortedParams = new TreeMap<>(params); Map<String, String> sortedParams = new TreeMap<>(params);
try { try {
return ObjectMapperFactory.create().writeValueAsString(sortedParams); return sortedParams.entrySet()
.stream()
.map((e) -> "\"%s\":\"%s\"".formatted(e.getKey(), e.getValue()))
.collect(Collectors.joining(",", "{", "}"));
} }
catch (Exception ex) { catch (Exception ex) {
throw new IllegalStateException("Could not convert auth parameters to encoded string", ex); throw new IllegalStateException("Could not convert auth parameters to encoded string", ex);