Skip to content

Commit 84cdf82

Browse files
WalidElljgrandja
WalidEll
authored and
jgrandja
committed
Rename and move SpringSecurityCoreVersion2 to Version
Closes gh-116
1 parent 45283b4 commit 84cdf82

File tree

11 files changed

+24
-24
lines changed

11 files changed

+24
-24
lines changed

‎oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/ManagedKey.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.springframework.security.crypto.keys;
1717

1818
import org.springframework.lang.Nullable;
19-
import org.springframework.security.core.SpringSecurityCoreVersion2;
19+
import org.springframework.security.oauth2.server.authorization.Version;
2020
import org.springframework.util.Assert;
2121

2222
import javax.crypto.SecretKey;
@@ -35,7 +35,7 @@
3535
* @see KeyManager
3636
*/
3737
public final class ManagedKey implements Serializable {
38-
private static final long serialVersionUID = SpringSecurityCoreVersion2.SERIAL_VERSION_UID;
38+
private static final long serialVersionUID = Version.SERIAL_VERSION_UID;
3939
private Key key;
4040
private PublicKey publicKey;
4141
private String keyId;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.springframework.security.oauth2.server.authorization;
1717

1818
import org.springframework.lang.Nullable;
19-
import org.springframework.security.core.SpringSecurityCoreVersion2;
19+
import org.springframework.security.oauth2.server.authorization.Version;
2020
import org.springframework.util.Assert;
2121

2222
import java.io.Serializable;
@@ -73,7 +73,7 @@ private boolean hasToken(OAuth2Authorization authorization, String token, TokenT
7373
}
7474

7575
private static class OAuth2AuthorizationId implements Serializable {
76-
private static final long serialVersionUID = SpringSecurityCoreVersion2.SERIAL_VERSION_UID;
76+
private static final long serialVersionUID = Version.SERIAL_VERSION_UID;
7777
private final String registeredClientId;
7878
private final String principalName;
7979

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.security.oauth2.server.authorization;
1717

18-
import org.springframework.security.core.SpringSecurityCoreVersion2;
18+
import org.springframework.security.oauth2.server.authorization.Version;
1919
import org.springframework.security.oauth2.core.OAuth2AccessToken;
2020
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
2121
import org.springframework.util.Assert;
@@ -39,7 +39,7 @@
3939
* @see OAuth2AccessToken
4040
*/
4141
public class OAuth2Authorization implements Serializable {
42-
private static final long serialVersionUID = SpringSecurityCoreVersion2.SERIAL_VERSION_UID;
42+
private static final long serialVersionUID = Version.SERIAL_VERSION_UID;
4343
private String registeredClientId;
4444
private String principalName;
4545
private OAuth2AccessToken accessToken;
@@ -146,7 +146,7 @@ public static Builder from(OAuth2Authorization authorization) {
146146
* A builder for {@link OAuth2Authorization}.
147147
*/
148148
public static class Builder implements Serializable {
149-
private static final long serialVersionUID = SpringSecurityCoreVersion2.SERIAL_VERSION_UID;
149+
private static final long serialVersionUID = Version.SERIAL_VERSION_UID;
150150
private String registeredClientId;
151151
private String principalName;
152152
private OAuth2AccessToken accessToken;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.security.oauth2.server.authorization;
1717

18-
import org.springframework.security.core.SpringSecurityCoreVersion2;
18+
import org.springframework.security.oauth2.server.authorization.Version;
1919
import org.springframework.util.Assert;
2020

2121
import java.io.Serializable;
@@ -24,7 +24,7 @@
2424
* @author Joe Grandja
2525
*/
2626
public final class TokenType implements Serializable {
27-
private static final long serialVersionUID = SpringSecurityCoreVersion2.SERIAL_VERSION_UID;
27+
private static final long serialVersionUID = Version.SERIAL_VERSION_UID;
2828
public static final TokenType ACCESS_TOKEN = new TokenType("access_token");
2929
public static final TokenType AUTHORIZATION_CODE = new TokenType("authorization_code");
3030
private final String value;

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

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

1818
/**
1919
* Internal class used for serialization across Spring Security Authorization Server classes.
2020
*
2121
* @author Anoop Garlapati
2222
* @since 0.0.1
2323
*/
24-
public final class SpringSecurityCoreVersion2 {
24+
public final class Version {
2525
private static final int MAJOR = 0;
2626
private static final int MINOR = 0;
2727
private static final int PATCH = 2;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import org.springframework.security.authentication.AbstractAuthenticationToken;
1919
import org.springframework.security.core.Authentication;
20-
import org.springframework.security.core.SpringSecurityCoreVersion2;
20+
import org.springframework.security.oauth2.server.authorization.Version;
2121
import org.springframework.security.oauth2.core.OAuth2AccessToken;
2222
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
2323
import org.springframework.util.Assert;
@@ -37,7 +37,7 @@
3737
* @see OAuth2ClientAuthenticationToken
3838
*/
3939
public class OAuth2AccessTokenAuthenticationToken extends AbstractAuthenticationToken {
40-
private static final long serialVersionUID = SpringSecurityCoreVersion2.SERIAL_VERSION_UID;
40+
private static final long serialVersionUID = Version.SERIAL_VERSION_UID;
4141
private final RegisteredClient registeredClient;
4242
private final Authentication clientPrincipal;
4343
private final OAuth2AccessToken accessToken;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.springframework.lang.Nullable;
1919
import org.springframework.security.authentication.AbstractAuthenticationToken;
2020
import org.springframework.security.core.Authentication;
21-
import org.springframework.security.core.SpringSecurityCoreVersion2;
21+
import org.springframework.security.oauth2.server.authorization.Version;
2222
import org.springframework.util.Assert;
2323

2424
import java.util.Collections;
@@ -36,7 +36,7 @@
3636
* @see OAuth2ClientAuthenticationToken
3737
*/
3838
public class OAuth2AuthorizationCodeAuthenticationToken extends AbstractAuthenticationToken {
39-
private static final long serialVersionUID = SpringSecurityCoreVersion2.SERIAL_VERSION_UID;
39+
private static final long serialVersionUID = Version.SERIAL_VERSION_UID;
4040
private final String code;
4141
private final Authentication clientPrincipal;
4242
private final String redirectUri;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.springframework.lang.Nullable;
1919
import org.springframework.security.authentication.AbstractAuthenticationToken;
2020
import org.springframework.security.core.Authentication;
21-
import org.springframework.security.core.SpringSecurityCoreVersion2;
21+
import org.springframework.security.oauth2.server.authorization.Version;
2222
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
2323
import org.springframework.util.Assert;
2424

@@ -36,7 +36,7 @@
3636
* @see OAuth2ClientAuthenticationProvider
3737
*/
3838
public class OAuth2ClientAuthenticationToken extends AbstractAuthenticationToken {
39-
private static final long serialVersionUID = SpringSecurityCoreVersion2.SERIAL_VERSION_UID;
39+
private static final long serialVersionUID = Version.SERIAL_VERSION_UID;
4040
private String clientId;
4141
private String clientSecret;
4242
private Map<String, Object> additionalParameters;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import org.springframework.security.authentication.AbstractAuthenticationToken;
1919
import org.springframework.security.core.Authentication;
20-
import org.springframework.security.core.SpringSecurityCoreVersion2;
20+
import org.springframework.security.oauth2.server.authorization.Version;
2121
import org.springframework.util.Assert;
2222

2323
import java.util.Collections;
@@ -34,7 +34,7 @@
3434
* @see OAuth2ClientAuthenticationToken
3535
*/
3636
public class OAuth2ClientCredentialsAuthenticationToken extends AbstractAuthenticationToken {
37-
private static final long serialVersionUID = SpringSecurityCoreVersion2.SERIAL_VERSION_UID;
37+
private static final long serialVersionUID = Version.SERIAL_VERSION_UID;
3838
private final Authentication clientPrincipal;
3939
private final Set<String> scopes;
4040

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.security.oauth2.server.authorization.client;
1717

18-
import org.springframework.security.core.SpringSecurityCoreVersion2;
18+
import org.springframework.security.oauth2.server.authorization.Version;
1919
import org.springframework.security.oauth2.core.AuthorizationGrantType;
2020
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
2121
import org.springframework.security.oauth2.server.authorization.config.ClientSettings;
@@ -40,7 +40,7 @@
4040
* @since 0.0.1
4141
*/
4242
public class RegisteredClient implements Serializable {
43-
private static final long serialVersionUID = SpringSecurityCoreVersion2.SERIAL_VERSION_UID;
43+
private static final long serialVersionUID = Version.SERIAL_VERSION_UID;
4444
private String id;
4545
private String clientId;
4646
private String clientSecret;
@@ -174,7 +174,7 @@ public static Builder withRegisteredClient(RegisteredClient registeredClient) {
174174
* A builder for {@link RegisteredClient}.
175175
*/
176176
public static class Builder implements Serializable {
177-
private static final long serialVersionUID = SpringSecurityCoreVersion2.SERIAL_VERSION_UID;
177+
private static final long serialVersionUID = Version.SERIAL_VERSION_UID;
178178
private String id;
179179
private String clientId;
180180
private String clientSecret;

0 commit comments

Comments
 (0)