Skip to content

Commit fdda882

Browse files
jgrandjajgrandja
committed
Relocate OAuth2TokenFormat
Closes gh-822
1 parent 8aa2213 commit fdda882

15 files changed

+13
-15
lines changed

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/client/JdbcRegisteredClientRepository.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
import org.springframework.security.jackson2.SecurityJackson2Modules;
4040
import org.springframework.security.oauth2.core.AuthorizationGrantType;
4141
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
42-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
4342
import org.springframework.security.oauth2.server.authorization.jackson2.OAuth2AuthorizationServerJackson2Module;
4443
import org.springframework.security.oauth2.server.authorization.settings.ClientSettings;
4544
import org.springframework.security.oauth2.server.authorization.settings.ConfigurationSettingNames;
45+
import org.springframework.security.oauth2.server.authorization.settings.OAuth2TokenFormat;
4646
import org.springframework.security.oauth2.server.authorization.settings.TokenSettings;
4747
import org.springframework.util.Assert;
4848
import org.springframework.util.StringUtils;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2Module.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import com.fasterxml.jackson.databind.module.SimpleModule;
2525

2626
import org.springframework.security.jackson2.SecurityJackson2Modules;
27-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
2827
import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
2928
import org.springframework.security.oauth2.jose.jws.MacAlgorithm;
3029
import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;
30+
import org.springframework.security.oauth2.server.authorization.settings.OAuth2TokenFormat;
3131

3232
/**
3333
* Jackson {@code Module} for {@code spring-authorization-server}, that registers the

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2TokenFormatMixin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.fasterxml.jackson.annotation.JsonProperty;
2121
import com.fasterxml.jackson.annotation.JsonTypeInfo;
2222

23-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
23+
import org.springframework.security.oauth2.server.authorization.settings.OAuth2TokenFormat;
2424

2525
/**
2626
* This mixin class is used to serialize/deserialize {@link OAuth2TokenFormat}.

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/ConfigurationSettingNames.java

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.springframework.security.oauth2.server.authorization.settings;
1717

1818
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
19-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
2019
import org.springframework.security.oauth2.core.oidc.OidcIdToken;
2120
import org.springframework.security.oauth2.jose.jws.JwsAlgorithm;
2221
import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/core/OAuth2TokenFormat.java renamed to ‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/OAuth2TokenFormat.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.security.oauth2.core;
16+
package org.springframework.security.oauth2.server.authorization.settings;
1717

1818
import java.io.Serializable;
1919

20+
import org.springframework.security.oauth2.core.Version;
2021
import org.springframework.util.Assert;
2122

2223
/**

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/settings/TokenSettings.java

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.time.Duration;
1919
import java.util.Map;
2020

21-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
2221
import org.springframework.security.oauth2.core.oidc.OidcIdToken;
2322
import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;
2423
import org.springframework.util.Assert;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/JwtGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.lang.Nullable;
2323
import org.springframework.security.oauth2.core.AuthorizationGrantType;
2424
import org.springframework.security.oauth2.core.OAuth2AccessToken;
25-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
2625
import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
2726
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
2827
import org.springframework.security.oauth2.core.oidc.IdTokenClaimNames;
@@ -36,6 +35,7 @@
3635
import org.springframework.security.oauth2.jwt.JwtEncoderParameters;
3736
import org.springframework.security.oauth2.server.authorization.OAuth2TokenType;
3837
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
38+
import org.springframework.security.oauth2.server.authorization.settings.OAuth2TokenFormat;
3939
import org.springframework.util.Assert;
4040
import org.springframework.util.CollectionUtils;
4141
import org.springframework.util.StringUtils;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2AccessTokenGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
import org.springframework.security.crypto.keygen.StringKeyGenerator;
2828
import org.springframework.security.oauth2.core.ClaimAccessor;
2929
import org.springframework.security.oauth2.core.OAuth2AccessToken;
30-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
3130
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
3231
import org.springframework.security.oauth2.server.authorization.OAuth2TokenType;
3332
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
33+
import org.springframework.security.oauth2.server.authorization.settings.OAuth2TokenFormat;
3434
import org.springframework.util.Assert;
3535
import org.springframework.util.CollectionUtils;
3636
import org.springframework.util.StringUtils;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationProviderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
3737
import org.springframework.security.oauth2.core.OAuth2ErrorCodes;
3838
import org.springframework.security.oauth2.core.OAuth2Token;
39-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
4039
import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
4140
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
4241
import org.springframework.security.oauth2.core.oidc.OidcIdToken;
@@ -57,6 +56,7 @@
5756
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
5857
import org.springframework.security.oauth2.server.authorization.context.ProviderContext;
5958
import org.springframework.security.oauth2.server.authorization.context.ProviderContextHolder;
59+
import org.springframework.security.oauth2.server.authorization.settings.OAuth2TokenFormat;
6060
import org.springframework.security.oauth2.server.authorization.settings.ProviderSettings;
6161
import org.springframework.security.oauth2.server.authorization.settings.TokenSettings;
6262
import org.springframework.security.oauth2.server.authorization.token.DelegatingOAuth2TokenGenerator;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationProviderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
3333
import org.springframework.security.oauth2.core.OAuth2ErrorCodes;
3434
import org.springframework.security.oauth2.core.OAuth2Token;
35-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
3635
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
3736
import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;
3837
import org.springframework.security.oauth2.jwt.JoseHeaderNames;
@@ -45,6 +44,7 @@
4544
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
4645
import org.springframework.security.oauth2.server.authorization.context.ProviderContext;
4746
import org.springframework.security.oauth2.server.authorization.context.ProviderContextHolder;
47+
import org.springframework.security.oauth2.server.authorization.settings.OAuth2TokenFormat;
4848
import org.springframework.security.oauth2.server.authorization.settings.ProviderSettings;
4949
import org.springframework.security.oauth2.server.authorization.settings.TokenSettings;
5050
import org.springframework.security.oauth2.server.authorization.token.DelegatingOAuth2TokenGenerator;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProviderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.springframework.security.oauth2.core.OAuth2ErrorCodes;
3838
import org.springframework.security.oauth2.core.OAuth2RefreshToken;
3939
import org.springframework.security.oauth2.core.OAuth2Token;
40-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
4140
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
4241
import org.springframework.security.oauth2.core.oidc.OidcIdToken;
4342
import org.springframework.security.oauth2.core.oidc.OidcScopes;
@@ -54,6 +53,7 @@
5453
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
5554
import org.springframework.security.oauth2.server.authorization.context.ProviderContext;
5655
import org.springframework.security.oauth2.server.authorization.context.ProviderContextHolder;
56+
import org.springframework.security.oauth2.server.authorization.settings.OAuth2TokenFormat;
5757
import org.springframework.security.oauth2.server.authorization.settings.ProviderSettings;
5858
import org.springframework.security.oauth2.server.authorization.settings.TokenSettings;
5959
import org.springframework.security.oauth2.server.authorization.token.DelegatingOAuth2TokenGenerator;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenIntrospectionTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
import org.springframework.security.oauth2.core.OAuth2AccessToken;
6060
import org.springframework.security.oauth2.core.OAuth2RefreshToken;
6161
import org.springframework.security.oauth2.core.OAuth2Token;
62-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
6362
import org.springframework.security.oauth2.core.OAuth2TokenIntrospectionClaimNames;
6463
import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse;
6564
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
@@ -83,6 +82,7 @@
8382
import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
8483
import org.springframework.security.oauth2.server.authorization.http.converter.OAuth2TokenIntrospectionHttpMessageConverter;
8584
import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
85+
import org.springframework.security.oauth2.server.authorization.settings.OAuth2TokenFormat;
8686
import org.springframework.security.oauth2.server.authorization.settings.ProviderSettings;
8787
import org.springframework.security.oauth2.server.authorization.settings.TokenSettings;
8888
import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenClaimsContext;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/settings/TokenSettingsTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.junit.Test;
2121

22-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
2322
import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;
2423

2524
import static org.assertj.core.api.Assertions.assertThat;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/token/JwtGeneratorTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.springframework.security.core.Authentication;
3030
import org.springframework.security.oauth2.core.AuthorizationGrantType;
3131
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
32-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
3332
import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
3433
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
3534
import org.springframework.security.oauth2.core.oidc.IdTokenClaimNames;
@@ -48,6 +47,7 @@
4847
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
4948
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
5049
import org.springframework.security.oauth2.server.authorization.context.ProviderContext;
50+
import org.springframework.security.oauth2.server.authorization.settings.OAuth2TokenFormat;
5151
import org.springframework.security.oauth2.server.authorization.settings.ProviderSettings;
5252
import org.springframework.security.oauth2.server.authorization.settings.TokenSettings;
5353

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/token/OAuth2AccessTokenGeneratorTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.springframework.security.oauth2.core.ClaimAccessor;
3030
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
3131
import org.springframework.security.oauth2.core.OAuth2AccessToken;
32-
import org.springframework.security.oauth2.core.OAuth2TokenFormat;
3332
import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
3433
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
3534
import org.springframework.security.oauth2.server.authorization.OAuth2Authorization;
@@ -40,6 +39,7 @@
4039
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
4140
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
4241
import org.springframework.security.oauth2.server.authorization.context.ProviderContext;
42+
import org.springframework.security.oauth2.server.authorization.settings.OAuth2TokenFormat;
4343
import org.springframework.security.oauth2.server.authorization.settings.ProviderSettings;
4444
import org.springframework.security.oauth2.server.authorization.settings.TokenSettings;
4545

0 commit comments

Comments
 (0)