diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java index 548d6ef35..589ba6aba 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java @@ -17,12 +17,12 @@ import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; -import org.ballcat.security.oauth2.authentication.OAuth2UserAuthenticationToken; -import org.ballcat.security.oauth2.jackson2.LongMixin; -import org.ballcat.security.oauth2.jackson2.OAuth2UserAuthenticationTokenMixin; -import org.ballcat.security.oauth2.jackson2.UserMixin; -import org.ballcat.security.oauth2.userdetails.User; -import org.ballcat.security.oauth2.util.PasswordUtils; +import org.ballcat.springsecurity.oauth2.authentication.OAuth2UserAuthenticationToken; +import org.ballcat.springsecurity.oauth2.jackson2.LongMixin; +import org.ballcat.springsecurity.oauth2.jackson2.OAuth2UserAuthenticationTokenMixin; +import org.ballcat.springsecurity.oauth2.jackson2.UserMixin; +import org.ballcat.springsecurity.oauth2.userdetails.User; +import org.ballcat.springsecurity.util.PasswordUtils; import lombok.RequiredArgsConstructor; import org.ballcat.springsecurity.oauth2.server.authorization.OAuth2AuthorizationObjectMapperCustomizer; import org.ballcat.springsecurity.oauth2.server.authorization.config.BallcatOAuth2AuthorizationServerSecurityFilterChainBuilder; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java index 8d83f6d72..4ee9cb1e2 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java @@ -15,9 +15,9 @@ */ package org.ballcat.springsecurity.oauth2.server.authorization.token; -import org.ballcat.security.oauth2.constant.TokenAttributeNameConstants; -import org.ballcat.security.oauth2.constant.UserInfoFiledNameConstants; -import org.ballcat.security.oauth2.userdetails.User; +import org.ballcat.springsecurity.oauth2.constant.TokenAttributeNameConstants; +import org.ballcat.springsecurity.oauth2.constant.UserInfoFiledNameConstants; +import org.ballcat.springsecurity.oauth2.userdetails.User; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.server.authorization.authentication.OAuth2ClientAuthenticationToken; import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenClaimsContext; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java index 281df7717..b4bf18e39 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java @@ -18,7 +18,7 @@ import cn.hutool.core.text.CharSequenceUtil; import org.ballcat.common.model.result.R; import org.ballcat.common.model.result.SystemResultCode; -import org.ballcat.security.oauth2.ScopeNames; +import org.ballcat.springsecurity.oauth2.ScopeNames; import org.ballcat.common.util.JsonUtils; import lombok.RequiredArgsConstructor; import org.ballcat.security.captcha.CaptchaValidateResult; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java index a25edeac9..f28fca03a 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java @@ -18,8 +18,8 @@ import org.ballcat.common.core.request.wrapper.ModifyParamMapRequestWrapper; import org.ballcat.common.model.result.R; import org.ballcat.common.model.result.SystemResultCode; -import org.ballcat.security.oauth2.ScopeNames; -import org.ballcat.security.oauth2.util.PasswordUtils; +import org.ballcat.springsecurity.oauth2.ScopeNames; +import org.ballcat.springsecurity.util.PasswordUtils; import org.ballcat.common.util.JsonUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/TestOAuth2Authorizations.java b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/TestOAuth2Authorizations.java index 7b31abe9f..a9ca869c0 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/TestOAuth2Authorizations.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/TestOAuth2Authorizations.java @@ -15,7 +15,7 @@ */ package org.ballcat.springsecurity.oauth2.server.authorization; -import org.ballcat.security.oauth2.userdetails.User; +import org.ballcat.springsecurity.oauth2.userdetails.User; import org.ballcat.springsecurity.oauth2.server.authorization.client.TestRegisteredClients; import org.ballcat.springsecurity.oauth2.server.authorization.user.TestUsers; import org.springframework.security.authentication.TestingAuthenticationToken; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/authentication/OAuth2ResourceOwnerPasswordAuthenticationProviderTests.java b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/authentication/OAuth2ResourceOwnerPasswordAuthenticationProviderTests.java index a37a5b495..b3fced270 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/authentication/OAuth2ResourceOwnerPasswordAuthenticationProviderTests.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/authentication/OAuth2ResourceOwnerPasswordAuthenticationProviderTests.java @@ -15,7 +15,7 @@ */ package org.ballcat.springsecurity.oauth2.server.authorization.authentication; -import org.ballcat.security.oauth2.userdetails.User; +import org.ballcat.springsecurity.oauth2.userdetails.User; import org.ballcat.springsecurity.oauth2.server.authorization.client.TestRegisteredClients; import org.ballcat.springsecurity.oauth2.server.authorization.context.TestAuthorizationServerContext; import org.ballcat.springsecurity.oauth2.server.authorization.user.TestUsers; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizerTests.java b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizerTests.java index 947daa9ff..99da99ddc 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizerTests.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizerTests.java @@ -15,9 +15,9 @@ */ package org.ballcat.springsecurity.oauth2.server.authorization.token; -import org.ballcat.security.oauth2.constant.TokenAttributeNameConstants; -import org.ballcat.security.oauth2.constant.UserInfoFiledNameConstants; -import org.ballcat.security.oauth2.userdetails.User; +import org.ballcat.springsecurity.oauth2.constant.TokenAttributeNameConstants; +import org.ballcat.springsecurity.oauth2.constant.UserInfoFiledNameConstants; +import org.ballcat.springsecurity.oauth2.userdetails.User; import org.ballcat.springsecurity.oauth2.server.authorization.authentication.OAuth2ResourceOwnerPasswordAuthenticationToken; import org.ballcat.springsecurity.oauth2.server.authorization.client.TestRegisteredClients; import org.ballcat.springsecurity.oauth2.server.authorization.context.TestAuthorizationServerContext; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/user/TestUsers.java b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/user/TestUsers.java index e91356e65..73fcb20ec 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/user/TestUsers.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/user/TestUsers.java @@ -15,8 +15,8 @@ */ package org.ballcat.springsecurity.oauth2.server.authorization.user; -import org.ballcat.security.oauth2.constant.UserAttributeNameConstants; -import org.ballcat.security.oauth2.userdetails.User; +import org.ballcat.springsecurity.oauth2.constant.UserAttributeNameConstants; +import org.ballcat.springsecurity.oauth2.userdetails.User; import org.springframework.security.core.authority.SimpleGrantedAuthority; import java.util.Collection; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/component/CustomPermissionEvaluator.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/component/CustomPermissionEvaluator.java similarity index 97% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/component/CustomPermissionEvaluator.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/component/CustomPermissionEvaluator.java index 172709fbb..15034d579 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/component/CustomPermissionEvaluator.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/component/CustomPermissionEvaluator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.component; +package org.ballcat.springsecurity.component; import cn.hutool.core.text.CharSequenceUtil; import lombok.extern.slf4j.Slf4j; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/ScopeNames.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/ScopeNames.java similarity index 95% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/ScopeNames.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/ScopeNames.java index e26dbbda1..4be8c8003 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/ScopeNames.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/ScopeNames.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2; +package org.ballcat.springsecurity.oauth2; /** * @author hccake diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/authentication/OAuth2UserAuthenticationToken.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/authentication/OAuth2UserAuthenticationToken.java similarity index 96% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/authentication/OAuth2UserAuthenticationToken.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/authentication/OAuth2UserAuthenticationToken.java index eef03a31c..4ef7dd237 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/authentication/OAuth2UserAuthenticationToken.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/authentication/OAuth2UserAuthenticationToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.authentication; +package org.ballcat.springsecurity.oauth2.authentication; import lombok.EqualsAndHashCode; import org.springframework.security.authentication.AbstractAuthenticationToken; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/TokenAttributeNameConstants.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/constant/TokenAttributeNameConstants.java similarity index 95% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/TokenAttributeNameConstants.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/constant/TokenAttributeNameConstants.java index 309741306..7c7e51a34 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/TokenAttributeNameConstants.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/constant/TokenAttributeNameConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.constant; +package org.ballcat.springsecurity.oauth2.constant; /** * @author hccake diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/UserAttributeNameConstants.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/constant/UserAttributeNameConstants.java similarity index 95% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/UserAttributeNameConstants.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/constant/UserAttributeNameConstants.java index f4eff56a7..dd452f7c6 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/UserAttributeNameConstants.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/constant/UserAttributeNameConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.constant; +package org.ballcat.springsecurity.oauth2.constant; /** * @author hccake diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/UserInfoFiledNameConstants.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/constant/UserInfoFiledNameConstants.java similarity index 96% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/UserInfoFiledNameConstants.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/constant/UserInfoFiledNameConstants.java index 5e5558ed5..bab67cd71 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/UserInfoFiledNameConstants.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/constant/UserInfoFiledNameConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.constant; +package org.ballcat.springsecurity.oauth2.constant; /** * @author hccake diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/LongMixin.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/LongMixin.java similarity index 94% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/LongMixin.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/LongMixin.java index 0cecaf4d0..59cc28313 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/LongMixin.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/LongMixin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.jackson2; +package org.ballcat.springsecurity.oauth2.jackson2; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/OAuth2UserAuthenticationTokenDeserializer.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/OAuth2UserAuthenticationTokenDeserializer.java similarity index 93% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/OAuth2UserAuthenticationTokenDeserializer.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/OAuth2UserAuthenticationTokenDeserializer.java index 60434add9..7d2a78993 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/OAuth2UserAuthenticationTokenDeserializer.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/OAuth2UserAuthenticationTokenDeserializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.jackson2; +package org.ballcat.springsecurity.oauth2.jackson2; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -22,8 +22,8 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.ballcat.security.oauth2.authentication.OAuth2UserAuthenticationToken; -import org.ballcat.security.oauth2.userdetails.User; +import org.ballcat.springsecurity.oauth2.authentication.OAuth2UserAuthenticationToken; +import org.ballcat.springsecurity.oauth2.userdetails.User; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/OAuth2UserAuthenticationTokenMixin.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/OAuth2UserAuthenticationTokenMixin.java similarity index 96% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/OAuth2UserAuthenticationTokenMixin.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/OAuth2UserAuthenticationTokenMixin.java index 2f75f52d6..38615cad2 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/OAuth2UserAuthenticationTokenMixin.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/OAuth2UserAuthenticationTokenMixin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.jackson2; +package org.ballcat.springsecurity.oauth2.jackson2; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/UserDeserializer.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/UserDeserializer.java similarity index 97% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/UserDeserializer.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/UserDeserializer.java index a94125e44..ce5188039 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/UserDeserializer.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/UserDeserializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.jackson2; +package org.ballcat.springsecurity.oauth2.jackson2; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.MissingNode; -import org.ballcat.security.oauth2.userdetails.User; +import org.ballcat.springsecurity.oauth2.userdetails.User; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/UserMixin.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/UserMixin.java similarity index 95% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/UserMixin.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/UserMixin.java index 79c8ff8df..29553d7d9 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/UserMixin.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/jackson2/UserMixin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.jackson2; +package org.ballcat.springsecurity.oauth2.jackson2; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/userdetails/ClientPrincipal.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/userdetails/ClientPrincipal.java similarity index 97% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/userdetails/ClientPrincipal.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/userdetails/ClientPrincipal.java index 62f1c58fd..517fa13b4 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/userdetails/ClientPrincipal.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/userdetails/ClientPrincipal.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.userdetails; +package org.ballcat.springsecurity.oauth2.userdetails; import org.springframework.lang.NonNull; import org.springframework.security.core.GrantedAuthority; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/userdetails/User.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/userdetails/User.java similarity index 97% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/userdetails/User.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/userdetails/User.java index 63a3a9459..034fbc9be 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/userdetails/User.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/oauth2/userdetails/User.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.userdetails; +package org.ballcat.springsecurity.oauth2.userdetails; import lombok.Builder; import lombok.Getter; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/util/PasswordUtils.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/util/PasswordUtils.java similarity index 99% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/util/PasswordUtils.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/util/PasswordUtils.java index 8b8b0f7a6..75b4b95b8 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/util/PasswordUtils.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/util/PasswordUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.util; +package org.ballcat.springsecurity.util; import cn.hutool.core.codec.Base64; import cn.hutool.crypto.Mode; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/util/SecurityUtils.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/util/SecurityUtils.java similarity index 91% rename from security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/util/SecurityUtils.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/util/SecurityUtils.java index 5fe0fbfe4..618594307 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/util/SecurityUtils.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/springsecurity/util/SecurityUtils.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.util; +package org.ballcat.springsecurity.util; -import org.ballcat.security.oauth2.userdetails.ClientPrincipal; -import org.ballcat.security.oauth2.userdetails.User; +import org.ballcat.springsecurity.oauth2.userdetails.ClientPrincipal; +import org.ballcat.springsecurity.oauth2.userdetails.User; import lombok.experimental.UtilityClass; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/security/ballcat-spring-security-oauth2-core/src/test/java/org/ballcat/security/oauth2/test/PasswordTest.java b/security/ballcat-spring-security-oauth2-core/src/test/java/org/ballcat/springsecurity/oauth2/test/PasswordTest.java similarity index 95% rename from security/ballcat-spring-security-oauth2-core/src/test/java/org/ballcat/security/oauth2/test/PasswordTest.java rename to security/ballcat-spring-security-oauth2-core/src/test/java/org/ballcat/springsecurity/oauth2/test/PasswordTest.java index 9a8f85534..0f4780156 100644 --- a/security/ballcat-spring-security-oauth2-core/src/test/java/org/ballcat/security/oauth2/test/PasswordTest.java +++ b/security/ballcat-spring-security-oauth2-core/src/test/java/org/ballcat/springsecurity/oauth2/test/PasswordTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ballcat.security.oauth2.test; +package org.ballcat.springsecurity.oauth2.test; -import org.ballcat.security.oauth2.util.PasswordUtils; +import org.ballcat.springsecurity.util.PasswordUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java index 946df1b41..c2ed0a29f 100644 --- a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java +++ b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java @@ -15,7 +15,7 @@ */ package org.ballcat.springsecurity.oauth2.server.resource; -import org.ballcat.security.oauth2.component.CustomPermissionEvaluator; +import org.ballcat.springsecurity.component.CustomPermissionEvaluator; import org.ballcat.springsecurity.oauth2.server.resource.configurer.BallcatOauth2ResourceServerSecurityFilterChainBuilder; import org.ballcat.springsecurity.oauth2.server.resource.configurer.OAuth2ResourceServerConfigurerCustomizer; import org.ballcat.springsecurity.oauth2.server.resource.configurer.OAuth2ResourceServerExtensionConfigurer; diff --git a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java index e3c461dce..7653df31c 100644 --- a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java +++ b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java @@ -16,11 +16,11 @@ package org.ballcat.springsecurity.oauth2.server.resource.introspection; import cn.hutool.core.collection.CollUtil; -import org.ballcat.security.oauth2.constant.TokenAttributeNameConstants; -import org.ballcat.security.oauth2.constant.UserAttributeNameConstants; -import org.ballcat.security.oauth2.constant.UserInfoFiledNameConstants; -import org.ballcat.security.oauth2.userdetails.ClientPrincipal; -import org.ballcat.security.oauth2.userdetails.User; +import org.ballcat.springsecurity.oauth2.constant.TokenAttributeNameConstants; +import org.ballcat.springsecurity.oauth2.constant.UserAttributeNameConstants; +import org.ballcat.springsecurity.oauth2.constant.UserInfoFiledNameConstants; +import org.ballcat.springsecurity.oauth2.userdetails.ClientPrincipal; +import org.ballcat.springsecurity.oauth2.userdetails.User; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.ParameterizedTypeReference; diff --git a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java index e925c1151..9f5510430 100644 --- a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java +++ b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java @@ -16,7 +16,7 @@ package org.ballcat.springsecurity.oauth2.server.resource.introspection; import cn.hutool.core.collection.CollUtil; -import org.ballcat.security.oauth2.userdetails.ClientPrincipal; +import org.ballcat.springsecurity.oauth2.userdetails.ClientPrincipal; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.GrantedAuthority;