Skip to content

Commit 750c597

Browse files
philwebbphilwebb
committed
Polish 'Add Pulsar ConnectionDetails support'
See gh-37197
1 parent 089fef0 commit 750c597

File tree

13 files changed

+74
-98
lines changed

13 files changed

+74
-98
lines changed

‎spring-boot-project/spring-boot-autoconfigure/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -277,5 +277,4 @@ tasks.named("checkSpringConfigurationMetadata").configure {
277277

278278
test {
279279
jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
280-
jvmArgs += "--add-opens=java.base/sun.net=ALL-UNNAMED"
281280
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ class PropertiesPulsarConnectionDetails implements PulsarConnectionDetails {
3030
}
3131

3232
@Override
33-
public String getPulsarBrokerUrl() {
33+
public String getBrokerUrl() {
3434
return this.pulsarProperties.getClient().getServiceUrl();
3535
}
3636

3737
@Override
38-
public String getPulsarAdminUrl() {
38+
public String getAdminUrl() {
3939
return this.pulsarProperties.getAdmin().getServiceUrl();
4040
}
4141

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

+2-16
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,13 @@ PropertiesPulsarConnectionDetails pulsarConnectionDetails() {
8282
DefaultPulsarClientFactory pulsarClientFactory(PulsarConnectionDetails connectionDetails,
8383
ObjectProvider<PulsarClientBuilderCustomizer> customizersProvider) {
8484
List<PulsarClientBuilderCustomizer> allCustomizers = new ArrayList<>();
85-
allCustomizers.add(this.propertiesMapper::customizeClientBuilder);
86-
allCustomizers.add((clientBuilder) -> this.applyConnectionDetails(connectionDetails, clientBuilder));
85+
allCustomizers.add((builder) -> this.propertiesMapper.customizeClientBuilder(builder, connectionDetails));
8786
allCustomizers.addAll(customizersProvider.orderedStream().toList());
8887
DefaultPulsarClientFactory clientFactory = new DefaultPulsarClientFactory(
8988
(clientBuilder) -> applyClientBuilderCustomizers(allCustomizers, clientBuilder));
9089
return clientFactory;
9190
}
9291

93-
private void applyConnectionDetails(PulsarConnectionDetails connectionDetails, ClientBuilder clientBuilder) {
94-
if (connectionDetails.getPulsarBrokerUrl() != null) {
95-
clientBuilder.serviceUrl(connectionDetails.getPulsarBrokerUrl());
96-
}
97-
}
98-
9992
private void applyClientBuilderCustomizers(List<PulsarClientBuilderCustomizer> customizers,
10093
ClientBuilder clientBuilder) {
10194
customizers.forEach((customizer) -> customizer.customize(clientBuilder));
@@ -112,18 +105,11 @@ PulsarClient pulsarClient(PulsarClientFactory clientFactory) throws PulsarClient
112105
PulsarAdministration pulsarAdministration(PulsarConnectionDetails connectionDetails,
113106
ObjectProvider<PulsarAdminBuilderCustomizer> pulsarAdminBuilderCustomizers) {
114107
List<PulsarAdminBuilderCustomizer> allCustomizers = new ArrayList<>();
115-
allCustomizers.add(this.propertiesMapper::customizeAdminBuilder);
116-
allCustomizers.add((adminBuilder) -> this.applyConnectionDetails(connectionDetails, adminBuilder));
108+
allCustomizers.add((builder) -> this.propertiesMapper.customizeAdminBuilder(builder, connectionDetails));
117109
allCustomizers.addAll(pulsarAdminBuilderCustomizers.orderedStream().toList());
118110
return new PulsarAdministration((adminBuilder) -> applyAdminBuilderCustomizers(allCustomizers, adminBuilder));
119111
}
120112

121-
private void applyConnectionDetails(PulsarConnectionDetails connectionDetails, PulsarAdminBuilder adminBuilder) {
122-
if (connectionDetails.getPulsarAdminUrl() != null) {
123-
adminBuilder.serviceHttpUrl(connectionDetails.getPulsarAdminUrl());
124-
}
125-
}
126-
127113
private void applyAdminBuilderCustomizers(List<PulsarAdminBuilderCustomizer> customizers,
128114
PulsarAdminBuilder adminBuilder) {
129115
customizers.forEach((customizer) -> customizer.customize(adminBuilder));

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
public interface PulsarConnectionDetails extends ConnectionDetails {
2828

2929
/**
30-
* Returns the Pulsar service URL for the broker.
31-
* @return the Pulsar service URL for the broker
30+
* URL used to connect to the broker.
31+
* @return the service URL
3232
*/
33-
String getPulsarBrokerUrl();
33+
String getBrokerUrl();
3434

3535
/**
36-
* Returns the Pulsar web URL for the admin endpoint.
37-
* @return the Pulsar web URL for the admin endpoint
36+
* URL user to connect to the admin endpoint.
37+
* @return the admin URL
3838
*/
39-
String getPulsarAdminUrl();
39+
String getAdminUrl();
4040

4141
}

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,20 @@ final class PulsarPropertiesMapper {
4949
this.properties = properties;
5050
}
5151

52-
void customizeClientBuilder(ClientBuilder clientBuilder) {
52+
void customizeClientBuilder(ClientBuilder clientBuilder, PulsarConnectionDetails connectionDetails) {
5353
PulsarProperties.Client properties = this.properties.getClient();
5454
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
55-
map.from(properties::getServiceUrl).to(clientBuilder::serviceUrl);
56-
55+
map.from(connectionDetails::getBrokerUrl).to(clientBuilder::serviceUrl);
5756
map.from(properties::getConnectionTimeout).to(timeoutProperty(clientBuilder::connectionTimeout));
5857
map.from(properties::getOperationTimeout).to(timeoutProperty(clientBuilder::operationTimeout));
5958
map.from(properties::getLookupTimeout).to(timeoutProperty(clientBuilder::lookupTimeout));
6059
customizeAuthentication(clientBuilder::authentication, properties.getAuthentication());
6160
}
6261

63-
void customizeAdminBuilder(PulsarAdminBuilder adminBuilder) {
62+
void customizeAdminBuilder(PulsarAdminBuilder adminBuilder, PulsarConnectionDetails connectionDetails) {
6463
PulsarProperties.Admin properties = this.properties.getAdmin();
6564
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
66-
map.from(properties::getServiceUrl).to(adminBuilder::serviceHttpUrl);
65+
map.from(connectionDetails::getAdminUrl).to(adminBuilder::serviceHttpUrl);
6766
map.from(properties::getConnectionTimeout).to(timeoutProperty(adminBuilder::connectionTimeout));
6867
map.from(properties::getReadTimeout).to(timeoutProperty(adminBuilder::readTimeout));
6968
map.from(properties::getRequestTimeout).to(timeoutProperty(adminBuilder::requestTimeout));

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PropertiesPulsarConnectionDetailsTests.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@
2828
class PropertiesPulsarConnectionDetailsTests {
2929

3030
@Test
31-
void pulsarBrokerUrlIsObtainedFromPulsarProperties() {
32-
var pulsarProps = new PulsarProperties();
33-
pulsarProps.getClient().setServiceUrl("foo");
34-
var connectionDetails = new PropertiesPulsarConnectionDetails(pulsarProps);
35-
assertThat(connectionDetails.getPulsarBrokerUrl()).isEqualTo("foo");
31+
void getClientServiceUrlReturnsValueFromProperties() {
32+
PulsarProperties properties = new PulsarProperties();
33+
properties.getClient().setServiceUrl("foo");
34+
PulsarConnectionDetails connectionDetails = new PropertiesPulsarConnectionDetails(properties);
35+
assertThat(connectionDetails.getBrokerUrl()).isEqualTo("foo");
3636
}
3737

3838
@Test
39-
void pulsarAdminUrlIsObtainedFromPulsarProperties() {
40-
var pulsarProps = new PulsarProperties();
41-
pulsarProps.getAdmin().setServiceUrl("foo");
42-
var connectionDetails = new PropertiesPulsarConnectionDetails(pulsarProps);
43-
assertThat(connectionDetails.getPulsarAdminUrl()).isEqualTo("foo");
39+
void getAdminServiceHttpUrlReturnsValueFromProperties() {
40+
PulsarProperties properties = new PulsarProperties();
41+
properties.getAdmin().setServiceUrl("foo");
42+
PulsarConnectionDetails connectionDetails = new PropertiesPulsarConnectionDetails(properties);
43+
assertThat(connectionDetails.getAdminUrl()).isEqualTo("foo");
4444
}
4545

4646
}

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarConfigurationTests.java

+7-38
Original file line numberDiff line numberDiff line change
@@ -96,36 +96,20 @@ void whenHasUserDefinedClientBeanDoesNotAutoConfigureBean() {
9696
.run((context) -> assertThat(context).getBean(PulsarClient.class).isSameAs(customClient));
9797
}
9898

99-
@Test
100-
void whenConnectionDetailsAreNullTheyAreNotApplied() {
101-
PulsarConnectionDetails connectionDetails = mock(PulsarConnectionDetails.class);
102-
given(connectionDetails.getPulsarBrokerUrl()).willReturn(null);
103-
PulsarConfigurationTests.this.contextRunner.withBean(PulsarConnectionDetails.class, () -> connectionDetails)
104-
.withPropertyValues("spring.pulsar.client.service-url=fromPropsCustomizer")
105-
.run((context) -> {
106-
DefaultPulsarClientFactory clientFactory = context.getBean(DefaultPulsarClientFactory.class);
107-
Customizers<PulsarClientBuilderCustomizer, ClientBuilder> customizers = Customizers
108-
.of(ClientBuilder.class, PulsarClientBuilderCustomizer::customize);
109-
assertThat(customizers.fromField(clientFactory, "customizer"))
110-
.callsInOrder(ClientBuilder::serviceUrl, "fromPropsCustomizer");
111-
});
112-
}
113-
11499
@Test
115100
void whenHasUserDefinedCustomizersAppliesInCorrectOrder() {
116101
PulsarConnectionDetails connectionDetails = mock(PulsarConnectionDetails.class);
117-
given(connectionDetails.getPulsarBrokerUrl()).willReturn("fromConnectionDetailsCustomizer");
102+
given(connectionDetails.getBrokerUrl()).willReturn("connectiondetails");
118103
PulsarConfigurationTests.this.contextRunner
119104
.withUserConfiguration(PulsarClientBuilderCustomizersConfig.class)
120105
.withBean(PulsarConnectionDetails.class, () -> connectionDetails)
121-
.withPropertyValues("spring.pulsar.client.service-url=fromPropsCustomizer")
106+
.withPropertyValues("spring.pulsar.client.service-url=properties")
122107
.run((context) -> {
123108
DefaultPulsarClientFactory clientFactory = context.getBean(DefaultPulsarClientFactory.class);
124109
Customizers<PulsarClientBuilderCustomizer, ClientBuilder> customizers = Customizers
125110
.of(ClientBuilder.class, PulsarClientBuilderCustomizer::customize);
126111
assertThat(customizers.fromField(clientFactory, "customizer")).callsInOrder(
127-
ClientBuilder::serviceUrl, "fromPropsCustomizer", "fromConnectionDetailsCustomizer",
128-
"fromCustomizer1", "fromCustomizer2");
112+
ClientBuilder::serviceUrl, "connectiondetails", "fromCustomizer1", "fromCustomizer2");
129113
});
130114
}
131115

@@ -162,35 +146,20 @@ void whenHasUserDefinedBeanDoesNotAutoConfigureBean() {
162146
.isSameAs(pulsarAdministration));
163147
}
164148

165-
@Test
166-
void whenConnectionDetailsAreNullTheyAreNotApplied() {
167-
PulsarConnectionDetails connectionDetails = mock(PulsarConnectionDetails.class);
168-
given(connectionDetails.getPulsarAdminUrl()).willReturn(null);
169-
PulsarConfigurationTests.this.contextRunner.withBean(PulsarConnectionDetails.class, () -> connectionDetails)
170-
.withPropertyValues("spring.pulsar.admin.service-url=fromPropsCustomizer")
171-
.run((context) -> {
172-
PulsarAdministration pulsarAdmin = context.getBean(PulsarAdministration.class);
173-
Customizers<PulsarAdminBuilderCustomizer, PulsarAdminBuilder> customizers = Customizers
174-
.of(PulsarAdminBuilder.class, PulsarAdminBuilderCustomizer::customize);
175-
assertThat(customizers.fromField(pulsarAdmin, "adminCustomizers"))
176-
.callsInOrder(PulsarAdminBuilder::serviceHttpUrl, "fromPropsCustomizer");
177-
});
178-
}
179-
180149
@Test
181150
void whenHasUserDefinedCustomizersAppliesInCorrectOrder() {
182151
PulsarConnectionDetails connectionDetails = mock(PulsarConnectionDetails.class);
183-
given(connectionDetails.getPulsarAdminUrl()).willReturn("fromConnectionDetailsCustomizer");
152+
given(connectionDetails.getAdminUrl()).willReturn("connectiondetails");
184153
this.contextRunner.withUserConfiguration(PulsarAdminBuilderCustomizersConfig.class)
185154
.withBean(PulsarConnectionDetails.class, () -> connectionDetails)
186-
.withPropertyValues("spring.pulsar.admin.service-url=fromPropsCustomizer")
155+
.withPropertyValues("spring.pulsar.admin.service-url=property")
187156
.run((context) -> {
188157
PulsarAdministration pulsarAdmin = context.getBean(PulsarAdministration.class);
189158
Customizers<PulsarAdminBuilderCustomizer, PulsarAdminBuilder> customizers = Customizers
190159
.of(PulsarAdminBuilder.class, PulsarAdminBuilderCustomizer::customize);
191160
assertThat(customizers.fromField(pulsarAdmin, "adminCustomizers")).callsInOrder(
192-
PulsarAdminBuilder::serviceHttpUrl, "fromPropsCustomizer",
193-
"fromConnectionDetailsCustomizer", "fromCustomizer1", "fromCustomizer2");
161+
PulsarAdminBuilder::serviceHttpUrl, "connectiondetails", "fromCustomizer1",
162+
"fromCustomizer2");
194163
});
195164
}
196165

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesMapperTests.java

+31-4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.springframework.pulsar.listener.PulsarContainerProperties;
4242

4343
import static org.assertj.core.api.Assertions.assertThat;
44+
import static org.mockito.BDDMockito.given;
4445
import static org.mockito.BDDMockito.then;
4546
import static org.mockito.Mockito.mock;
4647

@@ -60,7 +61,8 @@ void customizeClientBuilderWhenHasNoAuthentication() {
6061
properties.getClient().setOperationTimeout(Duration.ofSeconds(2));
6162
properties.getClient().setLookupTimeout(Duration.ofSeconds(3));
6263
ClientBuilder builder = mock(ClientBuilder.class);
63-
new PulsarPropertiesMapper(properties).customizeClientBuilder(builder);
64+
new PulsarPropertiesMapper(properties).customizeClientBuilder(builder,
65+
new PropertiesPulsarConnectionDetails(properties));
6466
then(builder).should().serviceUrl("https://example.com");
6567
then(builder).should().connectionTimeout(1000, TimeUnit.MILLISECONDS);
6668
then(builder).should().operationTimeout(2000, TimeUnit.MILLISECONDS);
@@ -74,10 +76,22 @@ void customizeClientBuilderWhenHasAuthentication() throws UnsupportedAuthenticat
7476
properties.getClient().getAuthentication().setPluginClassName("myclass");
7577
properties.getClient().getAuthentication().setParam(params);
7678
ClientBuilder builder = mock(ClientBuilder.class);
77-
new PulsarPropertiesMapper(properties).customizeClientBuilder(builder);
79+
new PulsarPropertiesMapper(properties).customizeClientBuilder(builder,
80+
new PropertiesPulsarConnectionDetails(properties));
7881
then(builder).should().authentication("myclass", params);
7982
}
8083

84+
@Test
85+
void customizeClientBuilderWhenHasConnectionDetails() {
86+
PulsarProperties properties = new PulsarProperties();
87+
properties.getClient().setServiceUrl("https://ignored.example.com");
88+
ClientBuilder builder = mock(ClientBuilder.class);
89+
PulsarConnectionDetails connectionDetails = mock(PulsarConnectionDetails.class);
90+
given(connectionDetails.getBrokerUrl()).willReturn("https://used.example.com");
91+
new PulsarPropertiesMapper(properties).customizeClientBuilder(builder, connectionDetails);
92+
then(builder).should().serviceUrl("https://used.example.com");
93+
}
94+
8195
@Test
8296
void customizeAdminBuilderWhenHasNoAuthentication() {
8397
PulsarProperties properties = new PulsarProperties();
@@ -86,7 +100,8 @@ void customizeAdminBuilderWhenHasNoAuthentication() {
86100
properties.getAdmin().setReadTimeout(Duration.ofSeconds(2));
87101
properties.getAdmin().setRequestTimeout(Duration.ofSeconds(3));
88102
PulsarAdminBuilder builder = mock(PulsarAdminBuilder.class);
89-
new PulsarPropertiesMapper(properties).customizeAdminBuilder(builder);
103+
new PulsarPropertiesMapper(properties).customizeAdminBuilder(builder,
104+
new PropertiesPulsarConnectionDetails(properties));
90105
then(builder).should().serviceHttpUrl("https://example.com");
91106
then(builder).should().connectionTimeout(1000, TimeUnit.MILLISECONDS);
92107
then(builder).should().readTimeout(2000, TimeUnit.MILLISECONDS);
@@ -100,10 +115,22 @@ void customizeAdminBuilderWhenHasAuthentication() throws UnsupportedAuthenticati
100115
properties.getAdmin().getAuthentication().setPluginClassName("myclass");
101116
properties.getAdmin().getAuthentication().setParam(params);
102117
PulsarAdminBuilder builder = mock(PulsarAdminBuilder.class);
103-
new PulsarPropertiesMapper(properties).customizeAdminBuilder(builder);
118+
new PulsarPropertiesMapper(properties).customizeAdminBuilder(builder,
119+
new PropertiesPulsarConnectionDetails(properties));
104120
then(builder).should().authentication("myclass", params);
105121
}
106122

123+
@Test
124+
void customizeAdminBuilderWhenHasConnectionDetails() {
125+
PulsarProperties properties = new PulsarProperties();
126+
properties.getAdmin().setServiceUrl("https://ignored.example.com");
127+
PulsarAdminBuilder builder = mock(PulsarAdminBuilder.class);
128+
PulsarConnectionDetails connectionDetails = mock(PulsarConnectionDetails.class);
129+
given(connectionDetails.getAdminUrl()).willReturn("https://used.example.com");
130+
new PulsarPropertiesMapper(properties).customizeAdminBuilder(builder, connectionDetails);
131+
then(builder).should().serviceHttpUrl("https://used.example.com");
132+
}
133+
107134
@Test
108135
@SuppressWarnings("unchecked")
109136
void customizeProducerBuilder() {

‎spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/pulsar/PulsarDockerComposeConnectionDetailsFactory.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.boot.docker.compose.service.connection.pulsar;
1818

1919
import org.springframework.boot.autoconfigure.pulsar.PulsarConnectionDetails;
20+
import org.springframework.boot.docker.compose.core.ConnectionPorts;
2021
import org.springframework.boot.docker.compose.core.RunningService;
2122
import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionDetailsFactory;
2223
import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionSource;
@@ -30,9 +31,9 @@
3031
class PulsarDockerComposeConnectionDetailsFactory
3132
extends DockerComposeConnectionDetailsFactory<PulsarConnectionDetails> {
3233

33-
private static final int PULSAR_BROKER_PORT = 6650;
34+
private static final int BROKER_PORT = 6650;
3435

35-
private static final int PULSAR_ADMIN_PORT = 8080;
36+
private static final int ADMIN_PORT = 8080;
3637

3738
PulsarDockerComposeConnectionDetailsFactory() {
3839
super("apachepulsar/pulsar");
@@ -55,17 +56,18 @@ static class PulsarDockerComposeConnectionDetails extends DockerComposeConnectio
5556

5657
PulsarDockerComposeConnectionDetails(RunningService service) {
5758
super(service);
58-
this.brokerUrl = "pulsar://%s:%s".formatted(service.host(), service.ports().get(PULSAR_BROKER_PORT));
59-
this.adminUrl = "http://%s:%s".formatted(service.host(), service.ports().get(PULSAR_ADMIN_PORT));
59+
ConnectionPorts ports = service.ports();
60+
this.brokerUrl = "pulsar://%s:%s".formatted(service.host(), ports.get(BROKER_PORT));
61+
this.adminUrl = "http://%s:%s".formatted(service.host(), ports.get(ADMIN_PORT));
6062
}
6163

6264
@Override
63-
public String getPulsarBrokerUrl() {
65+
public String getBrokerUrl() {
6466
return this.brokerUrl;
6567
}
6668

6769
@Override
68-
public String getPulsarAdminUrl() {
70+
public String getAdminUrl() {
6971
return this.adminUrl;
7072
}
7173

‎spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/pulsar/PulsarDockerComposeConnectionDetailsFactoryIntegrationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ class PulsarDockerComposeConnectionDetailsFactoryIntegrationTests extends Abstra
3939
void runCreatesConnectionDetails() {
4040
PulsarConnectionDetails connectionDetails = run(PulsarConnectionDetails.class);
4141
assertThat(connectionDetails).isNotNull();
42-
assertThat(connectionDetails.getPulsarBrokerUrl()).matches("^pulsar:\\/\\/\\S+:\\d+");
43-
assertThat(connectionDetails.getPulsarAdminUrl()).matches("^http:\\/\\/\\S+:\\d+");
42+
assertThat(connectionDetails.getBrokerUrl()).matches("^pulsar:\\/\\/\\S+:\\d+");
43+
assertThat(connectionDetails.getAdminUrl()).matches("^http:\\/\\/\\S+:\\d+");
4444
}
4545

4646
}

‎spring-boot-project/spring-boot-testcontainers/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,3 @@ dependencies {
5656

5757
testRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc")
5858
}
59-
60-
test {
61-
jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
62-
jvmArgs += "--add-opens=java.base/sun.net=ALL-UNNAMED"
63-
}

‎spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/pulsar/PulsarContainerConnectionDetailsFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ private PulsarContainerConnectionDetails(ContainerConnectionSource<PulsarContain
4848
}
4949

5050
@Override
51-
public String getPulsarBrokerUrl() {
51+
public String getBrokerUrl() {
5252
return getContainer().getPulsarBrokerUrl();
5353
}
5454

5555
@Override
56-
public String getPulsarAdminUrl() {
56+
public String getAdminUrl() {
5757
return getContainer().getHttpServiceUrl();
5858
}
5959

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/src/test/java/smoketest/pulsar/SamplePulsarApplicationTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ class SamplePulsarApplicationTests {
4444

4545
@Container
4646
@ServiceConnection
47-
@SuppressWarnings("unused")
4847
static final PulsarContainer container = new PulsarContainer(DockerImageNames.pulsar()).withStartupAttempts(2)
4948
.withStartupTimeout(Duration.ofMinutes(3));
5049

0 commit comments

Comments
 (0)