Skip to content

Commit da9634b

Browse files
philwebbphilwebb
committed
Merge pull request #40422 from quaff
* pr/40422: Polishing RabbitAutoConfigurationTests to use kebab-case keys Closes gh-40422
2 parents dc76240 + 6226faa commit da9634b

File tree

1 file changed

+55
-55
lines changed

1 file changed

+55
-55
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java

+55-55
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,10 @@ void testRabbitTemplateMessageConverters() {
329329
void testRabbitTemplateRetry() {
330330
this.contextRunner.withUserConfiguration(TestConfiguration.class)
331331
.withPropertyValues("spring.rabbitmq.template.retry.enabled:true",
332-
"spring.rabbitmq.template.retry.maxAttempts:4",
333-
"spring.rabbitmq.template.retry.initialInterval:2000",
334-
"spring.rabbitmq.template.retry.multiplier:1.5", "spring.rabbitmq.template.retry.maxInterval:5000",
335-
"spring.rabbitmq.template.receiveTimeout:123", "spring.rabbitmq.template.replyTimeout:456")
332+
"spring.rabbitmq.template.retry.max-attempts:4",
333+
"spring.rabbitmq.template.retry.initial-interval:2000",
334+
"spring.rabbitmq.template.retry.multiplier:1.5", "spring.rabbitmq.template.retry.max-interval:5000",
335+
"spring.rabbitmq.template.receive-timeout:123", "spring.rabbitmq.template.reply-timeout:456")
336336
.run((context) -> {
337337
RabbitTemplate rabbitTemplate = context.getBean(RabbitTemplate.class);
338338
assertThat(rabbitTemplate).hasFieldOrPropertyWithValue("receiveTimeout", 123L);
@@ -355,7 +355,7 @@ void testRabbitTemplateRetry() {
355355
void testRabbitTemplateRetryWithCustomizer() {
356356
this.contextRunner.withUserConfiguration(RabbitRetryTemplateCustomizerConfiguration.class)
357357
.withPropertyValues("spring.rabbitmq.template.retry.enabled:true",
358-
"spring.rabbitmq.template.retry.initialInterval:2000")
358+
"spring.rabbitmq.template.retry.initial-interval:2000")
359359
.run((context) -> {
360360
RabbitTemplate rabbitTemplate = context.getBean(RabbitTemplate.class);
361361
RetryTemplate retryTemplate = (RetryTemplate) ReflectionTestUtils.getField(rabbitTemplate,
@@ -477,7 +477,7 @@ void testConnectionFactoryBackOff() {
477477
void testConnectionFactoryCacheSettings() {
478478
this.contextRunner.withUserConfiguration(TestConfiguration.class)
479479
.withPropertyValues("spring.rabbitmq.cache.channel.size=23",
480-
"spring.rabbitmq.cache.channel.checkoutTimeout=1000",
480+
"spring.rabbitmq.cache.channel.checkout-timeout=1000",
481481
"spring.rabbitmq.cache.connection.mode=CONNECTION", "spring.rabbitmq.cache.connection.size=2")
482482
.run((context) -> {
483483
CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);
@@ -539,18 +539,18 @@ void testSimpleRabbitListenerContainerFactoryWithCustomSettings() {
539539
this.contextRunner
540540
.withUserConfiguration(MessageConvertersConfiguration.class, MessageRecoverersConfiguration.class)
541541
.withPropertyValues("spring.rabbitmq.listener.simple.retry.enabled:true",
542-
"spring.rabbitmq.listener.simple.retry.maxAttempts:4",
543-
"spring.rabbitmq.listener.simple.retry.initialInterval:2000",
542+
"spring.rabbitmq.listener.simple.retry.max-attempts:4",
543+
"spring.rabbitmq.listener.simple.retry.initial-interval:2000",
544544
"spring.rabbitmq.listener.simple.retry.multiplier:1.5",
545-
"spring.rabbitmq.listener.simple.retry.maxInterval:5000",
546-
"spring.rabbitmq.listener.simple.autoStartup:false",
547-
"spring.rabbitmq.listener.simple.acknowledgeMode:manual",
545+
"spring.rabbitmq.listener.simple.retry.max-interval:5000",
546+
"spring.rabbitmq.listener.simple.auto-startup:false",
547+
"spring.rabbitmq.listener.simple.acknowledge-mode:manual",
548548
"spring.rabbitmq.listener.simple.concurrency:5",
549-
"spring.rabbitmq.listener.simple.maxConcurrency:10", "spring.rabbitmq.listener.simple.prefetch:40",
550-
"spring.rabbitmq.listener.simple.defaultRequeueRejected:false",
551-
"spring.rabbitmq.listener.simple.idleEventInterval:5",
552-
"spring.rabbitmq.listener.simple.batchSize:20",
553-
"spring.rabbitmq.listener.simple.missingQueuesFatal:false",
549+
"spring.rabbitmq.listener.simple.max-concurrency:10", "spring.rabbitmq.listener.simple.prefetch:40",
550+
"spring.rabbitmq.listener.simple.default-requeue-rejected:false",
551+
"spring.rabbitmq.listener.simple.idle-event-interval:5",
552+
"spring.rabbitmq.listener.simple.batch-size:20",
553+
"spring.rabbitmq.listener.simple.missing-queues-fatal:false",
554554
"spring.rabbitmq.listener.simple.force-stop:true",
555555
"spring.rabbitmq.listener.simple.observation-enabled:true")
556556
.run((context) -> {
@@ -613,17 +613,17 @@ void testDirectRabbitListenerContainerFactoryWithCustomSettings() {
613613
.withUserConfiguration(MessageConvertersConfiguration.class, MessageRecoverersConfiguration.class)
614614
.withPropertyValues("spring.rabbitmq.listener.type:direct",
615615
"spring.rabbitmq.listener.direct.retry.enabled:true",
616-
"spring.rabbitmq.listener.direct.retry.maxAttempts:4",
617-
"spring.rabbitmq.listener.direct.retry.initialInterval:2000",
616+
"spring.rabbitmq.listener.direct.retry.max-attempts:4",
617+
"spring.rabbitmq.listener.direct.retry.initial-interval:2000",
618618
"spring.rabbitmq.listener.direct.retry.multiplier:1.5",
619-
"spring.rabbitmq.listener.direct.retry.maxInterval:5000",
620-
"spring.rabbitmq.listener.direct.autoStartup:false",
621-
"spring.rabbitmq.listener.direct.acknowledgeMode:manual",
619+
"spring.rabbitmq.listener.direct.retry.max-interval:5000",
620+
"spring.rabbitmq.listener.direct.auto-startup:false",
621+
"spring.rabbitmq.listener.direct.acknowledge-mode:manual",
622622
"spring.rabbitmq.listener.direct.consumers-per-queue:5",
623623
"spring.rabbitmq.listener.direct.prefetch:40",
624-
"spring.rabbitmq.listener.direct.defaultRequeueRejected:false",
625-
"spring.rabbitmq.listener.direct.idleEventInterval:5",
626-
"spring.rabbitmq.listener.direct.missingQueuesFatal:true",
624+
"spring.rabbitmq.listener.direct.default-requeue-rejected:false",
625+
"spring.rabbitmq.listener.direct.idle-event-interval:5",
626+
"spring.rabbitmq.listener.direct.missing-queues-fatal:true",
627627
"spring.rabbitmq.listener.direct.force-stop:true",
628628
"spring.rabbitmq.listener.direct.observation-enabled:true")
629629
.run((context) -> {
@@ -652,7 +652,7 @@ void testDirectRabbitListenerContainerFactoryWithDefaultForceStop() {
652652
void testSimpleRabbitListenerContainerFactoryRetryWithCustomizer() {
653653
this.contextRunner.withUserConfiguration(RabbitRetryTemplateCustomizerConfiguration.class)
654654
.withPropertyValues("spring.rabbitmq.listener.simple.retry.enabled:true",
655-
"spring.rabbitmq.listener.simple.retry.maxAttempts:4")
655+
"spring.rabbitmq.listener.simple.retry.max-attempts:4")
656656
.run((context) -> {
657657
SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory = context
658658
.getBean("rabbitListenerContainerFactory", SimpleRabbitListenerContainerFactory.class);
@@ -666,7 +666,7 @@ void testDirectRabbitListenerContainerFactoryRetryWithCustomizer() {
666666
this.contextRunner.withUserConfiguration(RabbitRetryTemplateCustomizerConfiguration.class)
667667
.withPropertyValues("spring.rabbitmq.listener.type:direct",
668668
"spring.rabbitmq.listener.direct.retry.enabled:true",
669-
"spring.rabbitmq.listener.direct.retry.maxAttempts:4")
669+
"spring.rabbitmq.listener.direct.retry.max-attempts:4")
670670
.run((context) -> {
671671
DirectRabbitListenerContainerFactory rabbitListenerContainerFactory = context
672672
.getBean("rabbitListenerContainerFactory", DirectRabbitListenerContainerFactory.class);
@@ -689,7 +689,7 @@ private void assertListenerRetryTemplate(AbstractRabbitListenerContainerFactory<
689689
void testRabbitListenerContainerFactoryConfigurersAreAvailable() {
690690
this.contextRunner.withUserConfiguration(TestConfiguration.class)
691691
.withPropertyValues("spring.rabbitmq.listener.simple.concurrency:5",
692-
"spring.rabbitmq.listener.simple.maxConcurrency:10", "spring.rabbitmq.listener.simple.prefetch:40",
692+
"spring.rabbitmq.listener.simple.max-concurrency:10", "spring.rabbitmq.listener.simple.prefetch:40",
693693
"spring.rabbitmq.listener.direct.consumers-per-queue:5",
694694
"spring.rabbitmq.listener.direct.prefetch:40")
695695
.run((context) -> {
@@ -702,7 +702,7 @@ void testRabbitListenerContainerFactoryConfigurersAreAvailable() {
702702
void testSimpleRabbitListenerContainerFactoryConfigurerUsesConfig() {
703703
this.contextRunner.withUserConfiguration(TestConfiguration.class)
704704
.withPropertyValues("spring.rabbitmq.listener.simple.concurrency:5",
705-
"spring.rabbitmq.listener.simple.maxConcurrency:10", "spring.rabbitmq.listener.simple.prefetch:40")
705+
"spring.rabbitmq.listener.simple.max-concurrency:10", "spring.rabbitmq.listener.simple.prefetch:40")
706706
.run((context) -> {
707707
SimpleRabbitListenerContainerFactoryConfigurer configurer = context
708708
.getBean(SimpleRabbitListenerContainerFactoryConfigurer.class);
@@ -787,7 +787,7 @@ void enableRabbitAutomatically() {
787787
@Test
788788
void customizeRequestedHeartBeat() {
789789
this.contextRunner.withUserConfiguration(TestConfiguration.class)
790-
.withPropertyValues("spring.rabbitmq.requestedHeartbeat:20")
790+
.withPropertyValues("spring.rabbitmq.requested-heartbeat:20")
791791
.run((context) -> {
792792
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(context);
793793
assertThat(rabbitConnectionFactory.getRequestedHeartbeat()).isEqualTo(20);
@@ -797,7 +797,7 @@ void customizeRequestedHeartBeat() {
797797
@Test
798798
void customizeRequestedChannelMax() {
799799
this.contextRunner.withUserConfiguration(TestConfiguration.class)
800-
.withPropertyValues("spring.rabbitmq.requestedChannelMax:12")
800+
.withPropertyValues("spring.rabbitmq.requested-channel-max:12")
801801
.run((context) -> {
802802
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(context);
803803
assertThat(rabbitConnectionFactory.getRequestedChannelMax()).isEqualTo(12);
@@ -860,8 +860,8 @@ void enableSslWithInvalidSslBundleFails() {
860860
// Make sure that we at least attempt to load the store
861861
void enableSslWithNonExistingKeystoreShouldFail() {
862862
this.contextRunner.withUserConfiguration(TestConfiguration.class)
863-
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.keyStore=foo",
864-
"spring.rabbitmq.ssl.keyStorePassword=secret")
863+
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.key-store=foo",
864+
"spring.rabbitmq.ssl.key-store-password=secret")
865865
.run((context) -> {
866866
assertThat(context).hasFailed();
867867
assertThat(context).getFailure().hasMessageContaining("foo");
@@ -873,8 +873,8 @@ void enableSslWithNonExistingKeystoreShouldFail() {
873873
// Make sure that we at least attempt to load the store
874874
void enableSslWithNonExistingTrustStoreShouldFail() {
875875
this.contextRunner.withUserConfiguration(TestConfiguration.class)
876-
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.trustStore=bar",
877-
"spring.rabbitmq.ssl.trustStorePassword=secret")
876+
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.trust-store=bar",
877+
"spring.rabbitmq.ssl.trust-store-password=secret")
878878
.run((context) -> {
879879
assertThat(context).hasFailed();
880880
assertThat(context).getFailure().hasMessageContaining("bar");
@@ -885,8 +885,8 @@ void enableSslWithNonExistingTrustStoreShouldFail() {
885885
@Test
886886
void enableSslWithInvalidKeystoreTypeShouldFail() {
887887
this.contextRunner.withUserConfiguration(TestConfiguration.class)
888-
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.keyStore=foo",
889-
"spring.rabbitmq.ssl.keyStoreType=fooType")
888+
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.key-store=foo",
889+
"spring.rabbitmq.ssl.key-store-type=fooType")
890890
.run((context) -> {
891891
assertThat(context).hasFailed();
892892
assertThat(context).getFailure().hasMessageContaining("fooType");
@@ -897,8 +897,8 @@ void enableSslWithInvalidKeystoreTypeShouldFail() {
897897
@Test
898898
void enableSslWithInvalidTrustStoreTypeShouldFail() {
899899
this.contextRunner.withUserConfiguration(TestConfiguration.class)
900-
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.trustStore=bar",
901-
"spring.rabbitmq.ssl.trustStoreType=barType")
900+
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.trust-store=bar",
901+
"spring.rabbitmq.ssl.trust-store-type=barType")
902902
.run((context) -> {
903903
assertThat(context).hasFailed();
904904
assertThat(context).getFailure().hasMessageContaining("barType");
@@ -923,18 +923,18 @@ void enableSslWithBundle() {
923923
void enableSslWithKeystoreTypeAndTrustStoreTypeShouldWork() {
924924
this.contextRunner.withUserConfiguration(TestConfiguration.class)
925925
.withPropertyValues("spring.rabbitmq.ssl.enabled:true",
926-
"spring.rabbitmq.ssl.keyStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
927-
"spring.rabbitmq.ssl.keyStoreType=jks", "spring.rabbitmq.ssl.keyStorePassword=secret",
928-
"spring.rabbitmq.ssl.trustStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
929-
"spring.rabbitmq.ssl.trustStoreType=jks", "spring.rabbitmq.ssl.trustStorePassword=secret")
926+
"spring.rabbitmq.ssl.key-store=/org/springframework/boot/autoconfigure/amqp/test.jks",
927+
"spring.rabbitmq.ssl.key-store-type=jks", "spring.rabbitmq.ssl.key-store-password=secret",
928+
"spring.rabbitmq.ssl.trust-store=/org/springframework/boot/autoconfigure/amqp/test.jks",
929+
"spring.rabbitmq.ssl.trust-store-type=jks", "spring.rabbitmq.ssl.trust-store-password=secret")
930930
.run((context) -> assertThat(context).hasNotFailed());
931931
}
932932

933933
@Test
934934
void enableSslWithValidateServerCertificateFalse(CapturedOutput output) {
935935
this.contextRunner.withUserConfiguration(TestConfiguration.class)
936936
.withPropertyValues("spring.rabbitmq.ssl.enabled:true",
937-
"spring.rabbitmq.ssl.validateServerCertificate=false")
937+
"spring.rabbitmq.ssl.validate-server-certificate=false")
938938
.run((context) -> {
939939
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(context);
940940
assertThat(rabbitConnectionFactory.isSSL()).isTrue();
@@ -957,22 +957,22 @@ void enableSslWithValidateServerCertificateDefault(CapturedOutput output) {
957957
void enableSslWithValidStoreAlgorithmShouldWork() {
958958
this.contextRunner.withUserConfiguration(TestConfiguration.class)
959959
.withPropertyValues("spring.rabbitmq.ssl.enabled:true",
960-
"spring.rabbitmq.ssl.keyStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
961-
"spring.rabbitmq.ssl.keyStoreType=jks", "spring.rabbitmq.ssl.keyStorePassword=secret",
962-
"spring.rabbitmq.ssl.keyStoreAlgorithm=PKIX",
963-
"spring.rabbitmq.ssl.trustStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
964-
"spring.rabbitmq.ssl.trustStoreType=jks", "spring.rabbitmq.ssl.trustStorePassword=secret",
965-
"spring.rabbitmq.ssl.trustStoreAlgorithm=PKIX")
960+
"spring.rabbitmq.ssl.key-store=/org/springframework/boot/autoconfigure/amqp/test.jks",
961+
"spring.rabbitmq.ssl.key-store-type=jks", "spring.rabbitmq.ssl.key-store-password=secret",
962+
"spring.rabbitmq.ssl.key-store-algorithm=PKIX",
963+
"spring.rabbitmq.ssl.trust-store=/org/springframework/boot/autoconfigure/amqp/test.jks",
964+
"spring.rabbitmq.ssl.trust-store-type=jks", "spring.rabbitmq.ssl.trust-store-password=secret",
965+
"spring.rabbitmq.ssl.trust-store-algorithm=PKIX")
966966
.run((context) -> assertThat(context).hasNotFailed());
967967
}
968968

969969
@Test
970970
void enableSslWithInvalidKeyStoreAlgorithmShouldFail() {
971971
this.contextRunner.withUserConfiguration(TestConfiguration.class)
972972
.withPropertyValues("spring.rabbitmq.ssl.enabled:true",
973-
"spring.rabbitmq.ssl.keyStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
974-
"spring.rabbitmq.ssl.keyStoreType=jks", "spring.rabbitmq.ssl.keyStorePassword=secret",
975-
"spring.rabbitmq.ssl.keyStoreAlgorithm=test-invalid-algo")
973+
"spring.rabbitmq.ssl.key-store=/org/springframework/boot/autoconfigure/amqp/test.jks",
974+
"spring.rabbitmq.ssl.key-store-type=jks", "spring.rabbitmq.ssl.key-store-password=secret",
975+
"spring.rabbitmq.ssl.key-store-algorithm=test-invalid-algo")
976976
.run((context) -> {
977977
assertThat(context).hasFailed();
978978
assertThat(context).getFailure().hasMessageContaining("test-invalid-algo");
@@ -984,9 +984,9 @@ void enableSslWithInvalidKeyStoreAlgorithmShouldFail() {
984984
void enableSslWithInvalidTrustStoreAlgorithmShouldFail() {
985985
this.contextRunner.withUserConfiguration(TestConfiguration.class)
986986
.withPropertyValues("spring.rabbitmq.ssl.enabled:true",
987-
"spring.rabbitmq.ssl.trustStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
988-
"spring.rabbitmq.ssl.trustStoreType=jks", "spring.rabbitmq.ssl.trustStorePassword=secret",
989-
"spring.rabbitmq.ssl.trustStoreAlgorithm=test-invalid-algo")
987+
"spring.rabbitmq.ssl.trust-store=/org/springframework/boot/autoconfigure/amqp/test.jks",
988+
"spring.rabbitmq.ssl.trust-store-type=jks", "spring.rabbitmq.ssl.trust-store-password=secret",
989+
"spring.rabbitmq.ssl.trust-store-algorithm=test-invalid-algo")
990990
.run((context) -> {
991991
assertThat(context).hasFailed();
992992
assertThat(context).getFailure().hasMessageContaining("test-invalid-algo");

0 commit comments

Comments
 (0)