Skip to content

Commit cb0fdef

Browse files
rwinchrwinch
committed
Remove MediaType.APPLICATION_JSON_UTF
Closes gh-17050
1 parent 5abbcec commit cb0fdef

12 files changed

+63
-16
lines changed

‎oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/DefaultOAuth2TokenRequestHeadersConverter.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.springframework.http.HttpHeaders;
2525
import org.springframework.http.MediaType;
2626
import org.springframework.http.RequestEntity;
27+
import org.springframework.security.http.MediaTypes;
2728
import org.springframework.security.oauth2.client.registration.ClientRegistration;
2829
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
2930

@@ -41,9 +42,6 @@
4142
public final class DefaultOAuth2TokenRequestHeadersConverter<T extends AbstractOAuth2AuthorizationGrantRequest>
4243
implements Converter<T, HttpHeaders> {
4344

44-
private static final MediaType APPLICATION_JSON_UTF8 = new MediaType(MediaType.APPLICATION_JSON,
45-
StandardCharsets.UTF_8);
46-
4745
private static final MediaType APPLICATION_FORM_URLENCODED_UTF8 = new MediaType(
4846
MediaType.APPLICATION_FORM_URLENCODED, StandardCharsets.UTF_8);
4947

@@ -101,7 +99,7 @@ public void setEncodeClientCredentials(boolean encodeClientCredentials) {
10199
*/
102100
static <T extends AbstractOAuth2AuthorizationGrantRequest> DefaultOAuth2TokenRequestHeadersConverter<T> withCharsetUtf8() {
103101
DefaultOAuth2TokenRequestHeadersConverter<T> converter = new DefaultOAuth2TokenRequestHeadersConverter<>();
104-
converter.accept = List.of(APPLICATION_JSON_UTF8);
102+
converter.accept = List.of(MediaTypes.APPLICATION_JSON_UTF8);
105103
converter.contentType = APPLICATION_FORM_URLENCODED_UTF8;
106104
return converter;
107105
}

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/DefaultAuthorizationCodeTokenResponseClientTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.springframework.http.HttpHeaders;
3434
import org.springframework.http.HttpMethod;
3535
import org.springframework.http.MediaType;
36+
import org.springframework.security.http.MediaTypes;
3637
import org.springframework.security.oauth2.client.registration.ClientRegistration;
3738
import org.springframework.security.oauth2.client.registration.TestClientRegistrations;
3839
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
@@ -118,7 +119,7 @@ public void getTokenResponseWhenSuccessResponseThenReturnAccessTokenResponse() t
118119
Instant expiresAtAfter = Instant.now().plusSeconds(3600);
119120
RecordedRequest recordedRequest = this.server.takeRequest();
120121
assertThat(recordedRequest.getMethod()).isEqualTo(HttpMethod.POST.toString());
121-
assertThat(recordedRequest.getHeader(HttpHeaders.ACCEPT)).isEqualTo(MediaType.APPLICATION_JSON_UTF8_VALUE);
122+
assertThat(recordedRequest.getHeader(HttpHeaders.ACCEPT)).isEqualTo(MediaTypes.APPLICATION_JSON_UTF8_VALUE);
122123
assertThat(recordedRequest.getHeader(HttpHeaders.CONTENT_TYPE))
123124
.isEqualTo(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8");
124125
String formParameters = recordedRequest.getBody().readUtf8();

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/DefaultClientCredentialsTokenResponseClientTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.springframework.http.HttpHeaders;
3434
import org.springframework.http.HttpMethod;
3535
import org.springframework.http.MediaType;
36+
import org.springframework.security.http.MediaTypes;
3637
import org.springframework.security.oauth2.client.registration.ClientRegistration;
3738
import org.springframework.security.oauth2.client.registration.TestClientRegistrations;
3839
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
@@ -121,7 +122,7 @@ public void getTokenResponseWhenSuccessResponseThenReturnAccessTokenResponse() t
121122
Instant expiresAtAfter = Instant.now().plusSeconds(3600);
122123
RecordedRequest recordedRequest = this.server.takeRequest();
123124
assertThat(recordedRequest.getMethod()).isEqualTo(HttpMethod.POST.toString());
124-
assertThat(recordedRequest.getHeader(HttpHeaders.ACCEPT)).isEqualTo(MediaType.APPLICATION_JSON_UTF8_VALUE);
125+
assertThat(recordedRequest.getHeader(HttpHeaders.ACCEPT)).isEqualTo(MediaTypes.APPLICATION_JSON_UTF8_VALUE);
125126
assertThat(recordedRequest.getHeader(HttpHeaders.CONTENT_TYPE))
126127
.isEqualTo(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8");
127128
String formParameters = recordedRequest.getBody().readUtf8();

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/DefaultJwtBearerTokenResponseClientTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.springframework.http.HttpHeaders;
3030
import org.springframework.http.HttpMethod;
3131
import org.springframework.http.MediaType;
32+
import org.springframework.security.http.MediaTypes;
3233
import org.springframework.security.oauth2.client.registration.ClientRegistration;
3334
import org.springframework.security.oauth2.client.registration.TestClientRegistrations;
3435
import org.springframework.security.oauth2.core.AuthorizationGrantType;
@@ -115,7 +116,7 @@ public void getTokenResponseWhenSuccessResponseThenReturnAccessTokenResponse() t
115116
Instant expiresAtAfter = Instant.now().plusSeconds(3600);
116117
RecordedRequest recordedRequest = this.server.takeRequest();
117118
assertThat(recordedRequest.getMethod()).isEqualTo(HttpMethod.POST.toString());
118-
assertThat(recordedRequest.getHeader(HttpHeaders.ACCEPT)).isEqualTo(MediaType.APPLICATION_JSON_UTF8_VALUE);
119+
assertThat(recordedRequest.getHeader(HttpHeaders.ACCEPT)).isEqualTo(MediaTypes.APPLICATION_JSON_UTF8_VALUE);
119120
assertThat(recordedRequest.getHeader(HttpHeaders.CONTENT_TYPE))
120121
.isEqualTo(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8");
121122
String formParameters = recordedRequest.getBody().readUtf8();

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/DefaultPasswordTokenResponseClientTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.springframework.http.HttpHeaders;
3434
import org.springframework.http.HttpMethod;
3535
import org.springframework.http.MediaType;
36+
import org.springframework.security.http.MediaTypes;
3637
import org.springframework.security.oauth2.client.registration.ClientRegistration;
3738
import org.springframework.security.oauth2.client.registration.TestClientRegistrations;
3839
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
@@ -115,7 +116,7 @@ public void getTokenResponseWhenSuccessResponseThenReturnAccessTokenResponse() t
115116
Instant expiresAtAfter = Instant.now().plusSeconds(3600);
116117
RecordedRequest recordedRequest = this.server.takeRequest();
117118
assertThat(recordedRequest.getMethod()).isEqualTo(HttpMethod.POST.toString());
118-
assertThat(recordedRequest.getHeader(HttpHeaders.ACCEPT)).isEqualTo(MediaType.APPLICATION_JSON_UTF8_VALUE);
119+
assertThat(recordedRequest.getHeader(HttpHeaders.ACCEPT)).isEqualTo(MediaTypes.APPLICATION_JSON_UTF8_VALUE);
119120
assertThat(recordedRequest.getHeader(HttpHeaders.CONTENT_TYPE))
120121
.isEqualTo(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8");
121122
String formParameters = recordedRequest.getBody().readUtf8();

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/DefaultRefreshTokenTokenResponseClientTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.springframework.http.HttpHeaders;
3535
import org.springframework.http.HttpMethod;
3636
import org.springframework.http.MediaType;
37+
import org.springframework.security.http.MediaTypes;
3738
import org.springframework.security.oauth2.client.registration.ClientRegistration;
3839
import org.springframework.security.oauth2.client.registration.TestClientRegistrations;
3940
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
@@ -117,7 +118,7 @@ public void getTokenResponseWhenSuccessResponseThenReturnAccessTokenResponse() t
117118
Instant expiresAtAfter = Instant.now().plusSeconds(3600);
118119
RecordedRequest recordedRequest = this.server.takeRequest();
119120
assertThat(recordedRequest.getMethod()).isEqualTo(HttpMethod.POST.toString());
120-
assertThat(recordedRequest.getHeader(HttpHeaders.ACCEPT)).isEqualTo(MediaType.APPLICATION_JSON_UTF8_VALUE);
121+
assertThat(recordedRequest.getHeader(HttpHeaders.ACCEPT)).isEqualTo(MediaTypes.APPLICATION_JSON_UTF8_VALUE);
121122
assertThat(recordedRequest.getHeader(HttpHeaders.CONTENT_TYPE))
122123
.isEqualTo(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8");
123124
assertThat(recordedRequest.getHeader(HttpHeaders.AUTHORIZATION)).startsWith("Basic ");

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/JwtBearerGrantRequestEntityConverterTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.springframework.http.HttpMethod;
2626
import org.springframework.http.MediaType;
2727
import org.springframework.http.RequestEntity;
28+
import org.springframework.security.http.MediaTypes;
2829
import org.springframework.security.oauth2.client.registration.ClientRegistration;
2930
import org.springframework.security.oauth2.client.registration.TestClientRegistrations;
3031
import org.springframework.security.oauth2.core.AuthorizationGrantType;
@@ -134,7 +135,7 @@ public void convertWhenGrantRequestValidThenConverts() {
134135
assertThat(requestEntity.getUrl().toASCIIString())
135136
.isEqualTo(clientRegistration.getProviderDetails().getTokenUri());
136137
HttpHeaders headers = requestEntity.getHeaders();
137-
assertThat(headers.getAccept()).contains(MediaType.valueOf(MediaType.APPLICATION_JSON_UTF8_VALUE));
138+
assertThat(headers.getAccept()).contains(MediaType.valueOf(MediaTypes.APPLICATION_JSON_UTF8_VALUE));
138139
assertThat(headers.getContentType())
139140
.isEqualTo(MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8"));
140141
assertThat(headers.getFirst(HttpHeaders.AUTHORIZATION)).startsWith("Basic ");

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/OAuth2AuthorizationCodeGrantRequestEntityConverterTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.springframework.http.HttpMethod;
2929
import org.springframework.http.MediaType;
3030
import org.springframework.http.RequestEntity;
31+
import org.springframework.security.http.MediaTypes;
3132
import org.springframework.security.oauth2.client.registration.ClientRegistration;
3233
import org.springframework.security.oauth2.client.registration.TestClientRegistrations;
3334
import org.springframework.security.oauth2.core.AuthorizationGrantType;
@@ -138,7 +139,7 @@ public void convertWhenGrantRequestValidThenConverts() {
138139
assertThat(requestEntity.getUrl().toASCIIString())
139140
.isEqualTo(clientRegistration.getProviderDetails().getTokenUri());
140141
HttpHeaders headers = requestEntity.getHeaders();
141-
assertThat(headers.getAccept()).contains(MediaType.APPLICATION_JSON_UTF8);
142+
assertThat(headers.getAccept()).contains(MediaTypes.APPLICATION_JSON_UTF8);
142143
assertThat(headers.getContentType())
143144
.isEqualTo(MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8"));
144145
assertThat(headers.getFirst(HttpHeaders.AUTHORIZATION)).isEqualTo("Basic Y2xpZW50SWQ6Y2xpZW50U2VjcmV0JTNE");
@@ -177,7 +178,7 @@ public void convertWhenPkceGrantRequestValidThenConverts() {
177178
assertThat(requestEntity.getUrl().toASCIIString())
178179
.isEqualTo(clientRegistration.getProviderDetails().getTokenUri());
179180
HttpHeaders headers = requestEntity.getHeaders();
180-
assertThat(headers.getAccept()).contains(MediaType.APPLICATION_JSON_UTF8);
181+
assertThat(headers.getAccept()).contains(MediaTypes.APPLICATION_JSON_UTF8);
181182
assertThat(headers.getContentType())
182183
.isEqualTo(MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8"));
183184
assertThat(headers.getFirst(HttpHeaders.AUTHORIZATION)).isNull();

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/OAuth2ClientCredentialsGrantRequestEntityConverterTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.springframework.http.HttpMethod;
3131
import org.springframework.http.MediaType;
3232
import org.springframework.http.RequestEntity;
33+
import org.springframework.security.http.MediaTypes;
3334
import org.springframework.security.oauth2.client.registration.ClientRegistration;
3435
import org.springframework.security.oauth2.client.registration.TestClientRegistrations;
3536
import org.springframework.security.oauth2.core.AuthorizationGrantType;
@@ -123,7 +124,7 @@ public void convertWhenGrantRequestValidThenConverts() {
123124
assertThat(requestEntity.getUrl().toASCIIString())
124125
.isEqualTo(clientRegistration.getProviderDetails().getTokenUri());
125126
HttpHeaders headers = requestEntity.getHeaders();
126-
assertThat(headers.getAccept()).contains(MediaType.APPLICATION_JSON_UTF8);
127+
assertThat(headers.getAccept()).contains(MediaTypes.APPLICATION_JSON_UTF8);
127128
assertThat(headers.getContentType())
128129
.isEqualTo(MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8"));
129130
assertThat(headers.getFirst(HttpHeaders.AUTHORIZATION)).startsWith("Basic ");
@@ -152,7 +153,7 @@ public void convertWhenSpecialCharactersThenConvertsWithEncodedClientCredentials
152153
assertThat(requestEntity.getUrl().toASCIIString())
153154
.isEqualTo(clientRegistration.getProviderDetails().getTokenUri());
154155
HttpHeaders headers = requestEntity.getHeaders();
155-
assertThat(headers.getAccept()).contains(MediaType.APPLICATION_JSON_UTF8);
156+
assertThat(headers.getAccept()).contains(MediaTypes.APPLICATION_JSON_UTF8);
156157
assertThat(headers.getContentType())
157158
.isEqualTo(MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8"));
158159
String urlEncodedClientCredential = URLEncoder.encode(clientCredentialWithAnsiKeyboardSpecialCharacters,

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/OAuth2PasswordGrantRequestEntityConverterTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.springframework.http.HttpMethod;
2626
import org.springframework.http.MediaType;
2727
import org.springframework.http.RequestEntity;
28+
import org.springframework.security.http.MediaTypes;
2829
import org.springframework.security.oauth2.client.registration.ClientRegistration;
2930
import org.springframework.security.oauth2.client.registration.TestClientRegistrations;
3031
import org.springframework.security.oauth2.core.AuthorizationGrantType;
@@ -118,7 +119,7 @@ public void convertWhenGrantRequestValidThenConverts() {
118119
assertThat(requestEntity.getUrl().toASCIIString())
119120
.isEqualTo(clientRegistration.getProviderDetails().getTokenUri());
120121
HttpHeaders headers = requestEntity.getHeaders();
121-
assertThat(headers.getAccept()).contains(MediaType.APPLICATION_JSON_UTF8);
122+
assertThat(headers.getAccept()).contains(MediaTypes.APPLICATION_JSON_UTF8);
122123
assertThat(headers.getContentType())
123124
.isEqualTo(MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8"));
124125
assertThat(headers.getFirst(HttpHeaders.AUTHORIZATION)).startsWith("Basic ");

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/OAuth2RefreshTokenGrantRequestEntityConverterTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.springframework.http.HttpMethod;
2828
import org.springframework.http.MediaType;
2929
import org.springframework.http.RequestEntity;
30+
import org.springframework.security.http.MediaTypes;
3031
import org.springframework.security.oauth2.client.registration.ClientRegistration;
3132
import org.springframework.security.oauth2.client.registration.TestClientRegistrations;
3233
import org.springframework.security.oauth2.core.AuthorizationGrantType;
@@ -130,7 +131,7 @@ public void convertWhenGrantRequestValidThenConverts() {
130131
assertThat(requestEntity.getUrl().toASCIIString())
131132
.isEqualTo(clientRegistration.getProviderDetails().getTokenUri());
132133
HttpHeaders headers = requestEntity.getHeaders();
133-
assertThat(headers.getAccept()).contains(MediaType.APPLICATION_JSON_UTF8);
134+
assertThat(headers.getAccept()).contains(MediaTypes.APPLICATION_JSON_UTF8);
134135
assertThat(headers.getContentType())
135136
.isEqualTo(MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=UTF-8"));
136137
assertThat(headers.getFirst(HttpHeaders.AUTHORIZATION)).startsWith("Basic ");

‎web/src/main/java/org/springframework/security/http/MediaTypes.java

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* Copyright 2002-2021 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.security.http;
18+
19+
import java.nio.charset.StandardCharsets;
20+
21+
import org.springframework.http.MediaType;
22+
23+
/**
24+
* This is a placeholder to allow an incremental update to Spring Framework 7.0.
25+
*
26+
* @deprecated For removal
27+
*/
28+
@Deprecated(since = "7.0.0", forRemoval = true)
29+
public final class MediaTypes {
30+
31+
public static final MediaType APPLICATION_JSON_UTF8 = new MediaType(MediaType.APPLICATION_JSON,
32+
StandardCharsets.UTF_8);
33+
34+
public static final String APPLICATION_JSON_UTF8_VALUE = APPLICATION_JSON_UTF8.toString();
35+
36+
private MediaTypes() {
37+
}
38+
39+
}

0 commit comments

Comments
 (0)