Skip to content

Commit 69a34bc

Browse files
jgrandjajgrandja
committed
Fix package tangles
1 parent 7652d0e commit 69a34bc

File tree

33 files changed

+47
-55
lines changed

33 files changed

+47
-55
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
3434
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
3535
import org.springframework.security.config.annotation.web.configurers.ExceptionHandlingConfigurer;
36-
import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenCustomizer;
36+
import org.springframework.security.oauth2.server.authorization.OAuth2TokenCustomizer;
3737
import org.springframework.security.oauth2.jwt.JwtEncoder;
38-
import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext;
38+
import org.springframework.security.oauth2.server.authorization.JwtEncodingContext;
3939
import org.springframework.security.oauth2.jwt.NimbusJwsEncoder;
4040
import org.springframework.security.oauth2.server.authorization.InMemoryOAuth2AuthorizationService;
4141
import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationService;

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/core/OAuth2TokenType.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import java.io.Serializable;
1919

20-
import org.springframework.security.oauth2.server.authorization.Version;
2120
import org.springframework.util.Assert;
2221

2322
/**

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/Version.java renamed to oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/core/Version.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020 the original author or authors.
2+
* Copyright 2020-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.security.oauth2.server.authorization;
16+
package org.springframework.security.oauth2.core;
1717

1818
/**
1919
* Internal class used for serialization across Spring Security Authorization Server classes.

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/core/oidc/OidcProviderConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.springframework.security.oauth2.core.oidc;
1717

1818
import org.springframework.security.oauth2.jose.jws.JwsAlgorithm;
19-
import org.springframework.security.oauth2.server.authorization.Version;
19+
import org.springframework.security.oauth2.core.Version;
2020
import org.springframework.util.Assert;
2121

2222
import java.io.Serializable;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.security.oauth2.core.OAuth2RefreshToken;
2727
import org.springframework.security.oauth2.core.OAuth2TokenType;
2828
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
29-
import org.springframework.security.oauth2.server.authorization.token.OAuth2AuthorizationCode;
3029
import org.springframework.util.Assert;
3130

3231
/**

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/JwtEncodingContext.java renamed to oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JwtEncodingContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.security.oauth2.server.authorization.token;
16+
package org.springframework.security.oauth2.server.authorization;
1717

1818
import java.util.Map;
1919
import java.util.function.Consumer;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.function.Consumer;
2525

2626
import org.springframework.lang.Nullable;
27+
import org.springframework.security.oauth2.core.Version;
2728
import org.springframework.security.oauth2.core.AbstractOAuth2Token;
2829
import org.springframework.security.oauth2.core.AuthorizationGrantType;
2930
import org.springframework.security.oauth2.core.OAuth2AccessToken;

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2AuthorizationCode.java renamed to oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationCode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.security.oauth2.server.authorization.token;
16+
package org.springframework.security.oauth2.server.authorization;
1717

1818
import org.springframework.security.oauth2.core.AbstractOAuth2Token;
1919

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenContext.java renamed to oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenContext.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.security.oauth2.server.authorization.token;
16+
package org.springframework.security.oauth2.server.authorization;
1717

1818
import java.util.Collections;
1919
import java.util.HashMap;
@@ -26,8 +26,6 @@
2626
import org.springframework.security.oauth2.core.AuthorizationGrantType;
2727
import org.springframework.security.oauth2.core.OAuth2TokenType;
2828
import org.springframework.security.oauth2.core.context.Context;
29-
import org.springframework.security.oauth2.server.authorization.OAuth2Authorization;
30-
import org.springframework.security.oauth2.server.authorization.authentication.OAuth2AuthorizationGrantAuthenticationToken;
3129
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
3230
import org.springframework.util.Assert;
3331

@@ -65,7 +63,7 @@ default AuthorizationGrantType getAuthorizationGrantType() {
6563
return get(AuthorizationGrantType.class);
6664
}
6765

68-
default <T extends OAuth2AuthorizationGrantAuthenticationToken> T getAuthorizationGrant() {
66+
default <T extends Authentication> T getAuthorizationGrant() {
6967
return get(AbstractBuilder.AUTHORIZATION_GRANT_AUTHENTICATION_KEY);
7068
}
7169

@@ -100,7 +98,7 @@ public B authorizationGrantType(AuthorizationGrantType authorizationGrantType) {
10098
return put(AuthorizationGrantType.class, authorizationGrantType);
10199
}
102100

103-
public B authorizationGrant(OAuth2AuthorizationGrantAuthenticationToken authorizationGrant) {
101+
public B authorizationGrant(Authentication authorizationGrant) {
104102
return put(AUTHORIZATION_GRANT_AUTHENTICATION_KEY, authorizationGrant);
105103
}
106104

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/OAuth2TokenCustomizer.java renamed to oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenCustomizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.security.oauth2.server.authorization.token;
16+
package org.springframework.security.oauth2.server.authorization;
1717

1818
/**
1919
* @author Joe Grandja

0 commit comments

Comments
 (0)