Skip to content

Commit b288d82

Browse files
onobconobc
committed
Fix formatting
1 parent aa2df46 commit b288d82

File tree

4 files changed

+34
-35
lines changed

4 files changed

+34
-35
lines changed

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,11 @@ public class PulsarAutoConfiguration {
8989
@ConditionalOnMissingBean(PulsarProducerFactory.class)
9090
@ConditionalOnProperty(name = "spring.pulsar.producer.cache.enabled", havingValue = "false")
9191
DefaultPulsarProducerFactory<?> pulsarProducerFactory(PulsarClient pulsarClient, TopicResolver topicResolver,
92-
ObjectProvider<ProducerBuilderCustomizer<?>> customizersProvider,
93-
PulsarTopicBuilder topicBuilder) {
92+
ObjectProvider<ProducerBuilderCustomizer<?>> customizersProvider, PulsarTopicBuilder topicBuilder) {
9493
List<ProducerBuilderCustomizer<Object>> lambdaSafeCustomizers = lambdaSafeProducerBuilderCustomizers(
9594
customizersProvider);
96-
DefaultPulsarProducerFactory<?> producerFactory = new DefaultPulsarProducerFactory<>(pulsarClient, this.properties.getProducer().getTopicName(),
97-
lambdaSafeCustomizers, topicResolver);
95+
DefaultPulsarProducerFactory<?> producerFactory = new DefaultPulsarProducerFactory<>(pulsarClient,
96+
this.properties.getProducer().getTopicName(), lambdaSafeCustomizers, topicResolver);
9897
producerFactory.setTopicBuilder(topicBuilder);
9998
return producerFactory;
10099
}
@@ -103,14 +102,14 @@ DefaultPulsarProducerFactory<?> pulsarProducerFactory(PulsarClient pulsarClient,
103102
@ConditionalOnMissingBean(PulsarProducerFactory.class)
104103
@ConditionalOnProperty(name = "spring.pulsar.producer.cache.enabled", havingValue = "true", matchIfMissing = true)
105104
CachingPulsarProducerFactory<?> cachingPulsarProducerFactory(PulsarClient pulsarClient, TopicResolver topicResolver,
106-
ObjectProvider<ProducerBuilderCustomizer<?>> customizersProvider,
107-
PulsarTopicBuilder topicBuilder) {
105+
ObjectProvider<ProducerBuilderCustomizer<?>> customizersProvider, PulsarTopicBuilder topicBuilder) {
108106
PulsarProperties.Producer.Cache cacheProperties = this.properties.getProducer().getCache();
109107
List<ProducerBuilderCustomizer<Object>> lambdaSafeCustomizers = lambdaSafeProducerBuilderCustomizers(
110108
customizersProvider);
111-
CachingPulsarProducerFactory<?> producerFactory = new CachingPulsarProducerFactory<>(pulsarClient, this.properties.getProducer().getTopicName(),
112-
lambdaSafeCustomizers, topicResolver, cacheProperties.getExpireAfterAccess(),
113-
cacheProperties.getMaximumSize(), cacheProperties.getInitialCapacity());
109+
CachingPulsarProducerFactory<?> producerFactory = new CachingPulsarProducerFactory<>(pulsarClient,
110+
this.properties.getProducer().getTopicName(), lambdaSafeCustomizers, topicResolver,
111+
cacheProperties.getExpireAfterAccess(), cacheProperties.getMaximumSize(),
112+
cacheProperties.getInitialCapacity());
114113
producerFactory.setTopicBuilder(topicBuilder);
115114
return producerFactory;
116115
}
@@ -145,14 +144,14 @@ PulsarTemplate<?> pulsarTemplate(PulsarProducerFactory<?> pulsarProducerFactory,
145144
@Bean
146145
@ConditionalOnMissingBean(PulsarConsumerFactory.class)
147146
DefaultPulsarConsumerFactory<?> pulsarConsumerFactory(PulsarClient pulsarClient,
148-
ObjectProvider<ConsumerBuilderCustomizer<?>> customizersProvider,
149-
PulsarTopicBuilder topicBuilder) {
147+
ObjectProvider<ConsumerBuilderCustomizer<?>> customizersProvider, PulsarTopicBuilder topicBuilder) {
150148
List<ConsumerBuilderCustomizer<?>> customizers = new ArrayList<>();
151149
customizers.add(this.propertiesMapper::customizeConsumerBuilder);
152150
customizers.addAll(customizersProvider.orderedStream().toList());
153151
List<ConsumerBuilderCustomizer<Object>> lambdaSafeCustomizers = List
154152
.of((builder) -> applyConsumerBuilderCustomizers(customizers, builder));
155-
DefaultPulsarConsumerFactory<?> consumerFactory = new DefaultPulsarConsumerFactory<>(pulsarClient, lambdaSafeCustomizers);
153+
DefaultPulsarConsumerFactory<?> consumerFactory = new DefaultPulsarConsumerFactory<>(pulsarClient,
154+
lambdaSafeCustomizers);
156155
consumerFactory.setTopicBuilder(topicBuilder);
157156
return consumerFactory;
158157
}
@@ -191,14 +190,14 @@ ConcurrentPulsarListenerContainerFactory<?> pulsarListenerContainerFactory(
191190
@Bean
192191
@ConditionalOnMissingBean(PulsarReaderFactory.class)
193192
DefaultPulsarReaderFactory<?> pulsarReaderFactory(PulsarClient pulsarClient,
194-
ObjectProvider<ReaderBuilderCustomizer<?>> customizersProvider,
195-
PulsarTopicBuilder topicBuilder) {
193+
ObjectProvider<ReaderBuilderCustomizer<?>> customizersProvider, PulsarTopicBuilder topicBuilder) {
196194
List<ReaderBuilderCustomizer<?>> customizers = new ArrayList<>();
197195
customizers.add(this.propertiesMapper::customizeReaderBuilder);
198196
customizers.addAll(customizersProvider.orderedStream().toList());
199197
List<ReaderBuilderCustomizer<Object>> lambdaSafeCustomizers = List
200198
.of((builder) -> applyReaderBuilderCustomizers(customizers, builder));
201-
DefaultPulsarReaderFactory<?> readerFactory = new DefaultPulsarReaderFactory<>(pulsarClient, lambdaSafeCustomizers);
199+
DefaultPulsarReaderFactory<?> readerFactory = new DefaultPulsarReaderFactory<>(pulsarClient,
200+
lambdaSafeCustomizers);
202201
readerFactory.setTopicBuilder(topicBuilder);
203202
return readerFactory;
204203
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ DefaultReactivePulsarConsumerFactory<?> reactivePulsarConsumerFactory(
146146
customizers.addAll(customizersProvider.orderedStream().toList());
147147
List<ReactiveMessageConsumerBuilderCustomizer<Object>> lambdaSafeCustomizers = List
148148
.of((builder) -> applyMessageConsumerBuilderCustomizers(customizers, builder));
149-
DefaultReactivePulsarConsumerFactory<?> consumerFactory =
150-
new DefaultReactivePulsarConsumerFactory<>(pulsarReactivePulsarClient, lambdaSafeCustomizers);
149+
DefaultReactivePulsarConsumerFactory<?> consumerFactory = new DefaultReactivePulsarConsumerFactory<>(
150+
pulsarReactivePulsarClient, lambdaSafeCustomizers);
151151
consumerFactory.setTopicBuilder(topicBuilder);
152152
return consumerFactory;
153153
}
@@ -181,7 +181,8 @@ DefaultReactivePulsarReaderFactory<?> reactivePulsarReaderFactory(ReactivePulsar
181181
customizers.addAll(customizersProvider.orderedStream().toList());
182182
List<ReactiveMessageReaderBuilderCustomizer<Object>> lambdaSafeCustomizers = List
183183
.of((builder) -> applyMessageReaderBuilderCustomizers(customizers, builder));
184-
DefaultReactivePulsarReaderFactory<?> readerFactory = new DefaultReactivePulsarReaderFactory<>(reactivePulsarClient, lambdaSafeCustomizers);
184+
DefaultReactivePulsarReaderFactory<?> readerFactory = new DefaultReactivePulsarReaderFactory<>(
185+
reactivePulsarClient, lambdaSafeCustomizers);
185186
readerFactory.setTopicBuilder(topicBuilder);
186187
return readerFactory;
187188
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ class TopicBuilderTests {
330330
void whenHasUserDefinedBeanDoesNotAutoConfigureBean() {
331331
PulsarTopicBuilder topicBuilder = mock(PulsarTopicBuilder.class);
332332
this.contextRunner.withBean("customPulsarTopicBuilder", PulsarTopicBuilder.class, () -> topicBuilder)
333-
.run((context) -> assertThat(context).getBean(PulsarTopicBuilder.class).isSameAs(topicBuilder));
333+
.run((context) -> assertThat(context).getBean(PulsarTopicBuilder.class).isSameAs(topicBuilder));
334334
}
335335

336336
@Test
@@ -339,16 +339,16 @@ void whenHasDefaultsTenantAndNamespaceAppliedToTopicBuilder() {
339339
properties.add("spring.pulsar.defaults.tenant=my-tenant");
340340
properties.add("spring.pulsar.defaults.namespace=my-namespace");
341341
this.contextRunner.withPropertyValues(properties.toArray(String[]::new))
342-
.run((context) -> assertThat(context).getBean(PulsarTopicBuilder.class)
343-
.asInstanceOf(InstanceOfAssertFactories.type(PulsarTopicBuilder.class))
344-
.satisfies((topicBuilder -> {
345-
assertThat(topicBuilder).hasFieldOrPropertyWithValue("defaultTenant", "my-tenant");
346-
assertThat(topicBuilder).hasFieldOrPropertyWithValue("defaultNamespace", "my-namespace");
347-
})));
342+
.run((context) -> assertThat(context).getBean(PulsarTopicBuilder.class)
343+
.asInstanceOf(InstanceOfAssertFactories.type(PulsarTopicBuilder.class))
344+
.satisfies((topicBuilder -> {
345+
assertThat(topicBuilder).hasFieldOrPropertyWithValue("defaultTenant", "my-tenant");
346+
assertThat(topicBuilder).hasFieldOrPropertyWithValue("defaultNamespace", "my-namespace");
347+
})));
348348
}
349349

350350
}
351-
351+
352352
@Nested
353353
class FunctionAdministrationTests {
354354

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ void injectsExpectedBeans() {
179179
.extracting("topicResolver", InstanceOfAssertFactories.type(TopicResolver.class))
180180
.isSameAs(context.getBean(TopicResolver.class));
181181
assertThat(senderFactory)
182-
.extracting("topicBuilder", InstanceOfAssertFactories.type(PulsarTopicBuilder.class))
183-
.isSameAs(context.getBean(PulsarTopicBuilder.class));
182+
.extracting("topicBuilder", InstanceOfAssertFactories.type(PulsarTopicBuilder.class))
183+
.isSameAs(context.getBean(PulsarTopicBuilder.class));
184184
});
185185
}
186186

@@ -257,18 +257,17 @@ class ConsumerFactoryTests {
257257
void injectsExpectedBeans() {
258258
ReactivePulsarClient client = mock(ReactivePulsarClient.class);
259259
PulsarTopicBuilder topicBuilder = mock(PulsarTopicBuilder.class);
260-
this.contextRunner
261-
.withBean("customReactivePulsarClient", ReactivePulsarClient.class, () -> client)
262-
.withBean("customTopicBuilder", PulsarTopicBuilder.class, () -> topicBuilder)
260+
this.contextRunner.withBean("customReactivePulsarClient", ReactivePulsarClient.class, () -> client)
261+
.withBean("customTopicBuilder", PulsarTopicBuilder.class, () -> topicBuilder)
263262
.run((context) -> {
264263
ReactivePulsarConsumerFactory<?> consumerFactory = context
265264
.getBean(DefaultReactivePulsarConsumerFactory.class);
266265
assertThat(consumerFactory)
267266
.extracting("reactivePulsarClient", InstanceOfAssertFactories.type(ReactivePulsarClient.class))
268267
.isSameAs(client);
269268
assertThat(consumerFactory)
270-
.extracting("topicBuilder", InstanceOfAssertFactories.type(PulsarTopicBuilder.class))
271-
.isSameAs(topicBuilder);
269+
.extracting("topicBuilder", InstanceOfAssertFactories.type(PulsarTopicBuilder.class))
270+
.isSameAs(topicBuilder);
272271
});
273272
}
274273

@@ -383,8 +382,8 @@ void injectsExpectedBeans() {
383382
.extracting("reactivePulsarClient", InstanceOfAssertFactories.type(ReactivePulsarClient.class))
384383
.isSameAs(client);
385384
assertThat(readerFactory)
386-
.extracting("topicBuilder", InstanceOfAssertFactories.type(PulsarTopicBuilder.class))
387-
.isSameAs(topicBuilder);
385+
.extracting("topicBuilder", InstanceOfAssertFactories.type(PulsarTopicBuilder.class))
386+
.isSameAs(topicBuilder);
388387
});
389388
}
390389

0 commit comments

Comments
 (0)