Skip to content

Commit ec92060

Browse files
quaffquaff
committed
Polishing RabbitAutoConfigurationTests to use kebab-case keys
1 parent d55eb5b commit ec92060

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

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,10 @@ void testRabbitTemplateMessageConverters() {
321321
void testRabbitTemplateRetry() {
322322
this.contextRunner.withUserConfiguration(TestConfiguration.class)
323323
.withPropertyValues("spring.rabbitmq.template.retry.enabled:true",
324-
"spring.rabbitmq.template.retry.maxAttempts:4",
325-
"spring.rabbitmq.template.retry.initialInterval:2000",
326-
"spring.rabbitmq.template.retry.multiplier:1.5", "spring.rabbitmq.template.retry.maxInterval:5000",
327-
"spring.rabbitmq.template.receiveTimeout:123", "spring.rabbitmq.template.replyTimeout:456")
324+
"spring.rabbitmq.template.retry.max-attempts:4",
325+
"spring.rabbitmq.template.retry.initial-interval:2000",
326+
"spring.rabbitmq.template.retry.multiplier:1.5", "spring.rabbitmq.template.retry.max-interval:5000",
327+
"spring.rabbitmq.template.receive-timeout:123", "spring.rabbitmq.template.reply-timeout:456")
328328
.run((context) -> {
329329
RabbitTemplate rabbitTemplate = context.getBean(RabbitTemplate.class);
330330
assertThat(rabbitTemplate).hasFieldOrPropertyWithValue("receiveTimeout", 123L);
@@ -347,7 +347,7 @@ void testRabbitTemplateRetry() {
347347
void testRabbitTemplateRetryWithCustomizer() {
348348
this.contextRunner.withUserConfiguration(RabbitRetryTemplateCustomizerConfiguration.class)
349349
.withPropertyValues("spring.rabbitmq.template.retry.enabled:true",
350-
"spring.rabbitmq.template.retry.initialInterval:2000")
350+
"spring.rabbitmq.template.retry.initial-interval:2000")
351351
.run((context) -> {
352352
RabbitTemplate rabbitTemplate = context.getBean(RabbitTemplate.class);
353353
RetryTemplate retryTemplate = (RetryTemplate) ReflectionTestUtils.getField(rabbitTemplate,
@@ -469,7 +469,7 @@ void testConnectionFactoryBackOff() {
469469
void testConnectionFactoryCacheSettings() {
470470
this.contextRunner.withUserConfiguration(TestConfiguration.class)
471471
.withPropertyValues("spring.rabbitmq.cache.channel.size=23",
472-
"spring.rabbitmq.cache.channel.checkoutTimeout=1000",
472+
"spring.rabbitmq.cache.channel.checkout-timeout=1000",
473473
"spring.rabbitmq.cache.connection.mode=CONNECTION", "spring.rabbitmq.cache.connection.size=2")
474474
.run((context) -> {
475475
CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class);
@@ -531,18 +531,18 @@ void testSimpleRabbitListenerContainerFactoryWithCustomSettings() {
531531
this.contextRunner
532532
.withUserConfiguration(MessageConvertersConfiguration.class, MessageRecoverersConfiguration.class)
533533
.withPropertyValues("spring.rabbitmq.listener.simple.retry.enabled:true",
534-
"spring.rabbitmq.listener.simple.retry.maxAttempts:4",
535-
"spring.rabbitmq.listener.simple.retry.initialInterval:2000",
534+
"spring.rabbitmq.listener.simple.retry.max-attempts:4",
535+
"spring.rabbitmq.listener.simple.retry.initial-interval:2000",
536536
"spring.rabbitmq.listener.simple.retry.multiplier:1.5",
537-
"spring.rabbitmq.listener.simple.retry.maxInterval:5000",
538-
"spring.rabbitmq.listener.simple.autoStartup:false",
539-
"spring.rabbitmq.listener.simple.acknowledgeMode:manual",
537+
"spring.rabbitmq.listener.simple.retry.max-interval:5000",
538+
"spring.rabbitmq.listener.simple.auto-startup:false",
539+
"spring.rabbitmq.listener.simple.acknowledge-mode:manual",
540540
"spring.rabbitmq.listener.simple.concurrency:5",
541-
"spring.rabbitmq.listener.simple.maxConcurrency:10", "spring.rabbitmq.listener.simple.prefetch:40",
542-
"spring.rabbitmq.listener.simple.defaultRequeueRejected:false",
543-
"spring.rabbitmq.listener.simple.idleEventInterval:5",
544-
"spring.rabbitmq.listener.simple.batchSize:20",
545-
"spring.rabbitmq.listener.simple.missingQueuesFatal:false",
541+
"spring.rabbitmq.listener.simple.max-concurrency:10", "spring.rabbitmq.listener.simple.prefetch:40",
542+
"spring.rabbitmq.listener.simple.default-requeue-rejected:false",
543+
"spring.rabbitmq.listener.simple.idle-event-interval:5",
544+
"spring.rabbitmq.listener.simple.batch-size:20",
545+
"spring.rabbitmq.listener.simple.missing-queues-fatal:false",
546546
"spring.rabbitmq.listener.simple.force-stop:true",
547547
"spring.rabbitmq.listener.simple.observation-enabled:true")
548548
.run((context) -> {
@@ -605,17 +605,17 @@ void testDirectRabbitListenerContainerFactoryWithCustomSettings() {
605605
.withUserConfiguration(MessageConvertersConfiguration.class, MessageRecoverersConfiguration.class)
606606
.withPropertyValues("spring.rabbitmq.listener.type:direct",
607607
"spring.rabbitmq.listener.direct.retry.enabled:true",
608-
"spring.rabbitmq.listener.direct.retry.maxAttempts:4",
609-
"spring.rabbitmq.listener.direct.retry.initialInterval:2000",
608+
"spring.rabbitmq.listener.direct.retry.max-attempts:4",
609+
"spring.rabbitmq.listener.direct.retry.initial-interval:2000",
610610
"spring.rabbitmq.listener.direct.retry.multiplier:1.5",
611-
"spring.rabbitmq.listener.direct.retry.maxInterval:5000",
612-
"spring.rabbitmq.listener.direct.autoStartup:false",
613-
"spring.rabbitmq.listener.direct.acknowledgeMode:manual",
611+
"spring.rabbitmq.listener.direct.retry.max-interval:5000",
612+
"spring.rabbitmq.listener.direct.auto-startup:false",
613+
"spring.rabbitmq.listener.direct.acknowledge-mode:manual",
614614
"spring.rabbitmq.listener.direct.consumers-per-queue:5",
615615
"spring.rabbitmq.listener.direct.prefetch:40",
616-
"spring.rabbitmq.listener.direct.defaultRequeueRejected:false",
617-
"spring.rabbitmq.listener.direct.idleEventInterval:5",
618-
"spring.rabbitmq.listener.direct.missingQueuesFatal:true",
616+
"spring.rabbitmq.listener.direct.default-requeue-rejected:false",
617+
"spring.rabbitmq.listener.direct.idle-event-interval:5",
618+
"spring.rabbitmq.listener.direct.missing-queues-fatal:true",
619619
"spring.rabbitmq.listener.direct.force-stop:true",
620620
"spring.rabbitmq.listener.direct.observation-enabled:true")
621621
.run((context) -> {
@@ -644,7 +644,7 @@ void testDirectRabbitListenerContainerFactoryWithDefaultForceStop() {
644644
void testSimpleRabbitListenerContainerFactoryRetryWithCustomizer() {
645645
this.contextRunner.withUserConfiguration(RabbitRetryTemplateCustomizerConfiguration.class)
646646
.withPropertyValues("spring.rabbitmq.listener.simple.retry.enabled:true",
647-
"spring.rabbitmq.listener.simple.retry.maxAttempts:4")
647+
"spring.rabbitmq.listener.simple.retry.max-attempts:4")
648648
.run((context) -> {
649649
SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory = context
650650
.getBean("rabbitListenerContainerFactory", SimpleRabbitListenerContainerFactory.class);
@@ -658,7 +658,7 @@ void testDirectRabbitListenerContainerFactoryRetryWithCustomizer() {
658658
this.contextRunner.withUserConfiguration(RabbitRetryTemplateCustomizerConfiguration.class)
659659
.withPropertyValues("spring.rabbitmq.listener.type:direct",
660660
"spring.rabbitmq.listener.direct.retry.enabled:true",
661-
"spring.rabbitmq.listener.direct.retry.maxAttempts:4")
661+
"spring.rabbitmq.listener.direct.retry.max-attempts:4")
662662
.run((context) -> {
663663
DirectRabbitListenerContainerFactory rabbitListenerContainerFactory = context
664664
.getBean("rabbitListenerContainerFactory", DirectRabbitListenerContainerFactory.class);
@@ -681,7 +681,7 @@ private void assertListenerRetryTemplate(AbstractRabbitListenerContainerFactory<
681681
void testRabbitListenerContainerFactoryConfigurersAreAvailable() {
682682
this.contextRunner.withUserConfiguration(TestConfiguration.class)
683683
.withPropertyValues("spring.rabbitmq.listener.simple.concurrency:5",
684-
"spring.rabbitmq.listener.simple.maxConcurrency:10", "spring.rabbitmq.listener.simple.prefetch:40",
684+
"spring.rabbitmq.listener.simple.max-concurrency:10", "spring.rabbitmq.listener.simple.prefetch:40",
685685
"spring.rabbitmq.listener.direct.consumers-per-queue:5",
686686
"spring.rabbitmq.listener.direct.prefetch:40")
687687
.run((context) -> {
@@ -694,7 +694,7 @@ void testRabbitListenerContainerFactoryConfigurersAreAvailable() {
694694
void testSimpleRabbitListenerContainerFactoryConfigurerUsesConfig() {
695695
this.contextRunner.withUserConfiguration(TestConfiguration.class)
696696
.withPropertyValues("spring.rabbitmq.listener.simple.concurrency:5",
697-
"spring.rabbitmq.listener.simple.maxConcurrency:10", "spring.rabbitmq.listener.simple.prefetch:40")
697+
"spring.rabbitmq.listener.simple.max-concurrency:10", "spring.rabbitmq.listener.simple.prefetch:40")
698698
.run((context) -> {
699699
SimpleRabbitListenerContainerFactoryConfigurer configurer = context
700700
.getBean(SimpleRabbitListenerContainerFactoryConfigurer.class);
@@ -779,7 +779,7 @@ void enableRabbitAutomatically() {
779779
@Test
780780
void customizeRequestedHeartBeat() {
781781
this.contextRunner.withUserConfiguration(TestConfiguration.class)
782-
.withPropertyValues("spring.rabbitmq.requestedHeartbeat:20")
782+
.withPropertyValues("spring.rabbitmq.requested-heartbeat:20")
783783
.run((context) -> {
784784
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(context);
785785
assertThat(rabbitConnectionFactory.getRequestedHeartbeat()).isEqualTo(20);
@@ -789,7 +789,7 @@ void customizeRequestedHeartBeat() {
789789
@Test
790790
void customizeRequestedChannelMax() {
791791
this.contextRunner.withUserConfiguration(TestConfiguration.class)
792-
.withPropertyValues("spring.rabbitmq.requestedChannelMax:12")
792+
.withPropertyValues("spring.rabbitmq.requested-channel-max:12")
793793
.run((context) -> {
794794
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(context);
795795
assertThat(rabbitConnectionFactory.getRequestedChannelMax()).isEqualTo(12);
@@ -831,8 +831,8 @@ void enableSslWithInvalidSslBundleFails() {
831831
// Make sure that we at least attempt to load the store
832832
void enableSslWithNonExistingKeystoreShouldFail() {
833833
this.contextRunner.withUserConfiguration(TestConfiguration.class)
834-
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.keyStore=foo",
835-
"spring.rabbitmq.ssl.keyStorePassword=secret")
834+
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.key-store=foo",
835+
"spring.rabbitmq.ssl.key-store-password=secret")
836836
.run((context) -> {
837837
assertThat(context).hasFailed();
838838
assertThat(context).getFailure().hasMessageContaining("foo");
@@ -844,8 +844,8 @@ void enableSslWithNonExistingKeystoreShouldFail() {
844844
// Make sure that we at least attempt to load the store
845845
void enableSslWithNonExistingTrustStoreShouldFail() {
846846
this.contextRunner.withUserConfiguration(TestConfiguration.class)
847-
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.trustStore=bar",
848-
"spring.rabbitmq.ssl.trustStorePassword=secret")
847+
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.trust-store=bar",
848+
"spring.rabbitmq.ssl.trust-store-password=secret")
849849
.run((context) -> {
850850
assertThat(context).hasFailed();
851851
assertThat(context).getFailure().hasMessageContaining("bar");
@@ -856,8 +856,8 @@ void enableSslWithNonExistingTrustStoreShouldFail() {
856856
@Test
857857
void enableSslWithInvalidKeystoreTypeShouldFail() {
858858
this.contextRunner.withUserConfiguration(TestConfiguration.class)
859-
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.keyStore=foo",
860-
"spring.rabbitmq.ssl.keyStoreType=fooType")
859+
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.key-store=foo",
860+
"spring.rabbitmq.ssl.key-store-type=fooType")
861861
.run((context) -> {
862862
assertThat(context).hasFailed();
863863
assertThat(context).getFailure().hasMessageContaining("fooType");
@@ -868,8 +868,8 @@ void enableSslWithInvalidKeystoreTypeShouldFail() {
868868
@Test
869869
void enableSslWithInvalidTrustStoreTypeShouldFail() {
870870
this.contextRunner.withUserConfiguration(TestConfiguration.class)
871-
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.trustStore=bar",
872-
"spring.rabbitmq.ssl.trustStoreType=barType")
871+
.withPropertyValues("spring.rabbitmq.ssl.enabled:true", "spring.rabbitmq.ssl.trust-store=bar",
872+
"spring.rabbitmq.ssl.trust-store-type=barType")
873873
.run((context) -> {
874874
assertThat(context).hasFailed();
875875
assertThat(context).getFailure().hasMessageContaining("barType");
@@ -894,18 +894,18 @@ void enableSslWithBundle() {
894894
void enableSslWithKeystoreTypeAndTrustStoreTypeShouldWork() {
895895
this.contextRunner.withUserConfiguration(TestConfiguration.class)
896896
.withPropertyValues("spring.rabbitmq.ssl.enabled:true",
897-
"spring.rabbitmq.ssl.keyStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
898-
"spring.rabbitmq.ssl.keyStoreType=jks", "spring.rabbitmq.ssl.keyStorePassword=secret",
899-
"spring.rabbitmq.ssl.trustStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
900-
"spring.rabbitmq.ssl.trustStoreType=jks", "spring.rabbitmq.ssl.trustStorePassword=secret")
897+
"spring.rabbitmq.ssl.key-store=/org/springframework/boot/autoconfigure/amqp/test.jks",
898+
"spring.rabbitmq.ssl.key-store-type=jks", "spring.rabbitmq.ssl.key-store-password=secret",
899+
"spring.rabbitmq.ssl.trust-store=/org/springframework/boot/autoconfigure/amqp/test.jks",
900+
"spring.rabbitmq.ssl.trust-store-type=jks", "spring.rabbitmq.ssl.trustStorePassword=secret")
901901
.run((context) -> assertThat(context).hasNotFailed());
902902
}
903903

904904
@Test
905905
void enableSslWithValidateServerCertificateFalse(CapturedOutput output) {
906906
this.contextRunner.withUserConfiguration(TestConfiguration.class)
907907
.withPropertyValues("spring.rabbitmq.ssl.enabled:true",
908-
"spring.rabbitmq.ssl.validateServerCertificate=false")
908+
"spring.rabbitmq.ssl.validate-server-certificate=false")
909909
.run((context) -> {
910910
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(context);
911911
assertThat(rabbitConnectionFactory.isSSL()).isTrue();
@@ -928,22 +928,22 @@ void enableSslWithValidateServerCertificateDefault(CapturedOutput output) {
928928
void enableSslWithValidStoreAlgorithmShouldWork() {
929929
this.contextRunner.withUserConfiguration(TestConfiguration.class)
930930
.withPropertyValues("spring.rabbitmq.ssl.enabled:true",
931-
"spring.rabbitmq.ssl.keyStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
932-
"spring.rabbitmq.ssl.keyStoreType=jks", "spring.rabbitmq.ssl.keyStorePassword=secret",
933-
"spring.rabbitmq.ssl.keyStoreAlgorithm=PKIX",
934-
"spring.rabbitmq.ssl.trustStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
935-
"spring.rabbitmq.ssl.trustStoreType=jks", "spring.rabbitmq.ssl.trustStorePassword=secret",
936-
"spring.rabbitmq.ssl.trustStoreAlgorithm=PKIX")
931+
"spring.rabbitmq.ssl.key-store=/org/springframework/boot/autoconfigure/amqp/test.jks",
932+
"spring.rabbitmq.ssl.key-store-type=jks", "spring.rabbitmq.ssl.key-store-password=secret",
933+
"spring.rabbitmq.ssl.key-store-algorithm=PKIX",
934+
"spring.rabbitmq.ssl.trust-store=/org/springframework/boot/autoconfigure/amqp/test.jks",
935+
"spring.rabbitmq.ssl.trust-store-type=jks", "spring.rabbitmq.ssl.trustStorePassword=secret",
936+
"spring.rabbitmq.ssl.trust-store-algorithm=PKIX")
937937
.run((context) -> assertThat(context).hasNotFailed());
938938
}
939939

940940
@Test
941941
void enableSslWithInvalidKeyStoreAlgorithmShouldFail() {
942942
this.contextRunner.withUserConfiguration(TestConfiguration.class)
943943
.withPropertyValues("spring.rabbitmq.ssl.enabled:true",
944-
"spring.rabbitmq.ssl.keyStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
945-
"spring.rabbitmq.ssl.keyStoreType=jks", "spring.rabbitmq.ssl.keyStorePassword=secret",
946-
"spring.rabbitmq.ssl.keyStoreAlgorithm=test-invalid-algo")
944+
"spring.rabbitmq.ssl.key-store=/org/springframework/boot/autoconfigure/amqp/test.jks",
945+
"spring.rabbitmq.ssl.key-store-type=jks", "spring.rabbitmq.ssl.key-store-password=secret",
946+
"spring.rabbitmq.ssl.key-store-algorithm=test-invalid-algo")
947947
.run((context) -> {
948948
assertThat(context).hasFailed();
949949
assertThat(context).getFailure().hasMessageContaining("test-invalid-algo");
@@ -955,9 +955,9 @@ void enableSslWithInvalidKeyStoreAlgorithmShouldFail() {
955955
void enableSslWithInvalidTrustStoreAlgorithmShouldFail() {
956956
this.contextRunner.withUserConfiguration(TestConfiguration.class)
957957
.withPropertyValues("spring.rabbitmq.ssl.enabled:true",
958-
"spring.rabbitmq.ssl.trustStore=/org/springframework/boot/autoconfigure/amqp/test.jks",
959-
"spring.rabbitmq.ssl.trustStoreType=jks", "spring.rabbitmq.ssl.trustStorePassword=secret",
960-
"spring.rabbitmq.ssl.trustStoreAlgorithm=test-invalid-algo")
958+
"spring.rabbitmq.ssl.trust-store=/org/springframework/boot/autoconfigure/amqp/test.jks",
959+
"spring.rabbitmq.ssl.trust-store-type=jks", "spring.rabbitmq.ssl.trustStorePassword=secret",
960+
"spring.rabbitmq.ssl.trust-store-algorithm=test-invalid-algo")
961961
.run((context) -> {
962962
assertThat(context).hasFailed();
963963
assertThat(context).getFailure().hasMessageContaining("test-invalid-algo");

0 commit comments

Comments
 (0)