Merge pull request #14830 from dreis2211

* pr/14830:
  Polish "Remove usages of BasicAuthorizationInterceptor"
  Remove usages of BasicAuthorizationInterceptor

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -5914,7 +5914,7 @@ The following code shows a typical example:
 
 TIP: `RestTemplateBuilder` includes a number of useful methods that can be used to
 quickly configure a `RestTemplate`. For example, to add BASIC auth support, you can use
-`builder.basicAuthorization("user", "password").build()`.
+`builder.basicAuthentication("user", "password").build()`.
 
 
 

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java

@@ -51,7 +51,7 @@ import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.client.InterceptingClientHttpRequestFactory;
-import org.springframework.http.client.support.BasicAuthorizationInterceptor;
+import org.springframework.http.client.support.BasicAuthenticationInterceptor;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.web.client.DefaultResponseErrorHandler;
@@ -172,8 +172,8 @@ public class TestRestTemplate {
 			interceptors = Collections.emptyList();
 		}
 		interceptors = new ArrayList<>(interceptors);
-		interceptors.removeIf(BasicAuthorizationInterceptor.class::isInstance);
-		interceptors.add(new BasicAuthorizationInterceptor(username, password));
+		interceptors.removeIf(BasicAuthenticationInterceptor.class::isInstance);
+		interceptors.add(new BasicAuthenticationInterceptor(username, password));
 		restTemplate.setInterceptors(interceptors);
 	}
 

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java

@@ -39,7 +39,7 @@ import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.client.InterceptingClientHttpRequestFactory;
 import org.springframework.http.client.OkHttp3ClientHttpRequestFactory;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
-import org.springframework.http.client.support.BasicAuthorizationInterceptor;
+import org.springframework.http.client.support.BasicAuthenticationInterceptor;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.mock.http.client.MockClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpResponse;
@@ -371,7 +371,7 @@ public class TestRestTemplateTests {
 						"interceptors");
 		assertThat(requestFactoryInterceptors).hasSize(1);
 		ClientHttpRequestInterceptor interceptor = requestFactoryInterceptors.get(0);
-		assertThat(interceptor).isInstanceOf(BasicAuthorizationInterceptor.class);
+		assertThat(interceptor).isInstanceOf(BasicAuthenticationInterceptor.class);
 		assertThat(interceptor).hasFieldOrPropertyWithValue("username", username);
 		assertThat(interceptor).hasFieldOrPropertyWithValue("password", password);
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java

@@ -34,7 +34,7 @@ import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.client.InterceptingClientHttpRequestFactory;
 import org.springframework.http.client.OkHttp3ClientHttpRequestFactory;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
-import org.springframework.http.client.support.BasicAuthorizationInterceptor;
+import org.springframework.http.client.support.BasicAuthenticationInterceptor;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.ResourceHttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
@@ -321,10 +321,21 @@ public class RestTemplateBuilderTests {
 	}
 
 	@Test
+	public void basicAuthenticationShouldApply() {
+		RestTemplate template = this.builder.basicAuthentication("spring", "boot")
+				.build();
+		ClientHttpRequestInterceptor interceptor = template.getInterceptors().get(0);
+		assertThat(interceptor).isInstanceOf(BasicAuthenticationInterceptor.class);
+		assertThat(interceptor).extracting("username").containsExactly("spring");
+		assertThat(interceptor).extracting("password").containsExactly("boot");
+	}
+
+	@Test
+	@Deprecated
 	public void basicAuthorizationShouldApply() {
 		RestTemplate template = this.builder.basicAuthorization("spring", "boot").build();
 		ClientHttpRequestInterceptor interceptor = template.getInterceptors().get(0);
-		assertThat(interceptor).isInstanceOf(BasicAuthorizationInterceptor.class);
+		assertThat(interceptor).isInstanceOf(BasicAuthenticationInterceptor.class);
 		assertThat(interceptor).extracting("username").containsExactly("spring");
 		assertThat(interceptor).extracting("password").containsExactly("boot");
 	}
@@ -400,11 +411,11 @@ public class RestTemplateBuilderTests {
 		ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
 		this.builder.interceptors(this.interceptor)
 				.messageConverters(this.messageConverter).rootUri("http://localhost:8080")
-				.errorHandler(errorHandler).basicAuthorization("spring", "boot")
+				.errorHandler(errorHandler).basicAuthentication("spring", "boot")
 				.requestFactory(() -> requestFactory).customizers((restTemplate) -> {
 					assertThat(restTemplate.getInterceptors()).hasSize(2)
 							.contains(this.interceptor).anyMatch(
-									(ic) -> ic instanceof BasicAuthorizationInterceptor);
+									(ic) -> ic instanceof BasicAuthenticationInterceptor);
 					assertThat(restTemplate.getMessageConverters())
 							.contains(this.messageConverter);
 					assertThat(restTemplate.getUriTemplateHandler())