Release v1.0.0

Author: suninformation

ymate-module-oauth-client/src/main/java/net/ymate/module/oauth/client/OAuthClients.java

@@ -34,7 +34,7 @@ public class OAuthClients implements IModule, IOAuthClients {
 
     private static final Log _LOG = LogFactory.getLog(OAuthClients.class);
 
-    public static final Version VERSION = new Version(1, 0, 0, OAuthClients.class.getPackage().getImplementationVersion(), Version.VersionType.Alpha);
+    public static final Version VERSION = new Version(1, 0, 0, OAuthClients.class.getPackage().getImplementationVersion(), Version.VersionType.Release);
 
     private static volatile IOAuthClients __instance;
 

ymate-module-oauth-impl/src/main/java/net/ymate/module/oauth/impl/DefaultOAuthStorageAdapter.java

@@ -116,12 +116,10 @@ protected <T> T __getCacheElement(CacheDataType dataType, String targetId) {
     protected void __putCacheElement(CacheDataType dataType, OAuthTokenBean tokenBean) {
         if (dataType != null && tokenBean != null) {
             String _targetId;
-            switch (dataType) {
-                case CLIENT:
-                    _targetId = tokenBean.getClientId();
-                    break;
-                default:
-                    _targetId = ((OAuthClientUserBean) tokenBean).getOpenId();
+            if (CacheDataType.CLIENT.equals(dataType)) {
+                _targetId = tokenBean.getClientId();
+            } else {
+                _targetId = ((OAuthClientUserBean) tokenBean).getOpenId();
             }
             if (StringUtils.isNotBlank(_targetId)) {
                 String _cacheName = dataType.name().concat(_targetId);

ymate-module-oauth-impl/src/main/java/net/ymate/module/oauth/web/controller/OAuthController.java

@@ -84,13 +84,10 @@ public IView authorize(@RequestParam(defaultValue = "false") Boolean authorized)
             HttpServletRequest _request = WebContext.getRequest();
             ResponseType _responseType = ResponseType.valueOf(StringUtils.upperCase(StringUtils.trimToEmpty(_request.getParameter(org.apache.oltu.oauth2.common.OAuth.OAUTH_RESPONSE_TYPE))));
             GrantType _grantType;
-            switch (_responseType) {
-                case CODE:
-                    _grantType = GrantType.AUTHORIZATION_CODE;
-                    break;
-                default:
-                    _grantType = GrantType.IMPLICIT;
-                    break;
+            if (ResponseType.CODE.equals(_responseType)) {
+                _grantType = GrantType.AUTHORIZATION_CODE;
+            } else {
+                _grantType = GrantType.IMPLICIT;
             }
             if (OAuth.get().getModuleCfg().getAllowGrantTypes().contains(_grantType)) {
                 IOAuthGrantProcessor _processor = new ImplicitGrantProcessor(OAuth.get(), _responseType)

ymate-module-oauth-model/src/main/java/net/ymate/module/oauth/model/OAuthClient.java

@@ -98,39 +98,13 @@ public class OAuthClient extends BaseEntity<OAuthClient, java.lang.String> {
     public OAuthClient() {
     }
 
-    /**
-     * 构造器
-     *
-     * @param id
-     * @param name
-     * @param secretKey
-     * @param createTime
-     */
     public OAuthClient(java.lang.String id, java.lang.String name, java.lang.String secretKey, java.lang.Long createTime) {
         this.id = id;
         this.name = name;
         this.secretKey = secretKey;
         this.createTime = createTime;
     }
 
-    /**
-     * 构造器
-     *
-     * @param id
-     * @param name
-     * @param domain
-     * @param iconUrl
-     * @param secretKey
-     * @param description
-     * @param accessToken
-     * @param lastAccessToken
-     * @param expiresIn
-     * @param ipWhiteList
-     * @param type
-     * @param status
-     * @param createTime
-     * @param lastModifyTime
-     */
     public OAuthClient(java.lang.String id, java.lang.String name, java.lang.String domain, java.lang.String iconUrl, java.lang.String secretKey, java.lang.String description, java.lang.String accessToken, java.lang.String lastAccessToken, java.lang.Integer expiresIn, java.lang.String ipWhiteList, java.lang.Integer type, java.lang.Integer status, java.lang.Long createTime, java.lang.Long lastModifyTime) {
         this.id = id;
         this.name = name;

ymate-module-oauth-model/src/main/java/net/ymate/module/oauth/model/OAuthUser.java

@@ -90,37 +90,13 @@ public class OAuthUser extends BaseEntity<OAuthUser, java.lang.String> {
     public OAuthUser() {
     }
 
-    /**
-     * 构造器
-     *
-     * @param id
-     * @param uid
-     * @param clientId
-     * @param createTime
-     */
     public OAuthUser(java.lang.String id, java.lang.String uid, java.lang.String clientId, java.lang.Long createTime) {
         this.id = id;
         this.uid = uid;
         this.clientId = clientId;
         this.createTime = createTime;
     }
 
-    /**
-     * 构造器
-     *
-     * @param id
-     * @param uid
-     * @param clientId
-     * @param isAuthorized
-     * @param accessToken
-     * @param lastAccessToken
-     * @param refreshToken
-     * @param refreshCount
-     * @param expiresIn
-     * @param scope
-     * @param createTime
-     * @param lastModifyTime
-     */
     public OAuthUser(java.lang.String id, java.lang.String uid, java.lang.String clientId, java.lang.Integer isAuthorized, java.lang.String accessToken, java.lang.String lastAccessToken, java.lang.String refreshToken, java.lang.Integer refreshCount, java.lang.Integer expiresIn, java.lang.String scope, java.lang.Long createTime, java.lang.Long lastModifyTime) {
         this.id = id;
         this.uid = uid;

ymate-module-oauth/src/main/java/net/ymate/module/oauth/OAuth.java

@@ -50,7 +50,7 @@ public class OAuth implements IModule, IOAuth {
 
     private static final Log _LOG = LogFactory.getLog(OAuth.class);
 
-    public static final Version VERSION = new Version(1, 0, 0, OAuth.class.getPackage().getImplementationVersion(), Version.VersionType.Alpha);
+    public static final Version VERSION = new Version(1, 0, 0, OAuth.class.getPackage().getImplementationVersion(), Version.VersionType.Release);
 
     private static volatile IOAuth __instance;