From 6a968ea298b76122365857ddcc5c665ea0ba9302 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 9 Sep 2019 15:02:24 +0200 Subject: [PATCH] Polishing. Consistently use plural for customizers and filters. --- .../org/springframework/vault/client/RestTemplateBuilder.java | 2 +- .../java/org/springframework/vault/client/WebClientBuilder.java | 2 +- .../main/java/org/springframework/vault/core/VaultTemplate.java | 2 +- .../ClientCertificateNamespaceIntegrationTests.java | 2 +- .../vault/client/RestTemplateBuilderUnitTests.java | 2 +- .../vault/core/VaultNamespaceSecretIntegrationTests.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-vault-core/src/main/java/org/springframework/vault/client/RestTemplateBuilder.java b/spring-vault-core/src/main/java/org/springframework/vault/client/RestTemplateBuilder.java index b05a792a..073fce16 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/client/RestTemplateBuilder.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/client/RestTemplateBuilder.java @@ -176,7 +176,7 @@ public class RestTemplateBuilder { * @param customizer the template customizers to add. * @return {@code this} {@link RestTemplateBuilder}. */ - public RestTemplateBuilder customizer(RestTemplateCustomizer... customizer) { + public RestTemplateBuilder customizers(RestTemplateCustomizer... customizer) { this.customizers.addAll(Arrays.asList(customizer)); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/client/WebClientBuilder.java b/spring-vault-core/src/main/java/org/springframework/vault/client/WebClientBuilder.java index 4b1ae063..69271758 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/client/WebClientBuilder.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/client/WebClientBuilder.java @@ -150,7 +150,7 @@ public class WebClientBuilder { * @param customizer the client customizers to add. * @return {@code this} {@link WebClientBuilder}. */ - public WebClientBuilder customizer(WebClientCustomizer... customizer) { + public WebClientBuilder customizers(WebClientCustomizer... customizer) { this.customizers.addAll(Arrays.asList(customizer)); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTemplate.java index ed49e90c..ada9c229 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTemplate.java @@ -183,7 +183,7 @@ public class VaultTemplate implements InitializingBean, VaultOperations, Disposa ClientHttpRequestFactory requestFactory) { return RestTemplateBuilder.builder().endpointProvider(endpointProvider) - .requestFactory(requestFactory).customizer(restTemplate -> restTemplate + .requestFactory(requestFactory).customizers(restTemplate -> restTemplate .getInterceptors().add(getSessionInterceptor())) .build(); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateNamespaceIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateNamespaceIntegrationTests.java index e5661174..61db022d 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateNamespaceIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateNamespaceIntegrationTests.java @@ -86,7 +86,7 @@ class ClientCertificateNamespaceIntegrationTests extends IntegrationTestSupport .requestFactory(ClientHttpRequestFactoryFactory .create(new ClientOptions(), Settings.createSslConfiguration())) .endpoint(TestRestTemplateFactory.TEST_VAULT_ENDPOINT) - .customizer(restTemplate -> restTemplate.getInterceptors() + .customizers(restTemplate -> restTemplate.getInterceptors() .add(VaultClients.createNamespaceInterceptor("dev"))); VaultTemplate dev = new VaultTemplate(devRestTemplate, diff --git a/spring-vault-core/src/test/java/org/springframework/vault/client/RestTemplateBuilderUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/client/RestTemplateBuilderUnitTests.java index 043ed136..6229dd56 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/client/RestTemplateBuilderUnitTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/client/RestTemplateBuilderUnitTests.java @@ -55,7 +55,7 @@ class RestTemplateBuilderUnitTests { RestTemplate restTemplate = RestTemplateBuilder.builder() .endpoint(VaultEndpoint.create("localhost", 8200)) - .customizer(it -> it.setErrorHandler(errorHandler)).build(); + .customizers(it -> it.setErrorHandler(errorHandler)).build(); assertThat(restTemplate.getErrorHandler()).isSameAs(errorHandler); } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultNamespaceSecretIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultNamespaceSecretIntegrationTests.java index 0e381a2c..1780b6d4 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultNamespaceSecretIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultNamespaceSecretIntegrationTests.java @@ -91,7 +91,7 @@ class VaultNamespaceSecretIntegrationTests extends IntegrationTestSupport { .requestFactory(ClientHttpRequestFactoryFactory .create(new ClientOptions(), Settings.createSslConfiguration())) .endpoint(TestRestTemplateFactory.TEST_VAULT_ENDPOINT) - .customizer(restTemplate -> restTemplate.getInterceptors() + .customizers(restTemplate -> restTemplate.getInterceptors() .add(VaultClients.createNamespaceInterceptor("dev"))); maketingRestTemplate = RestTemplateBuilder.builder()