From dfeaac52922ad3ab31dfca7c490bb0d0a6517b81 Mon Sep 17 00:00:00 2001 From: vran Date: Wed, 2 Mar 2022 20:11:15 +0800 Subject: [PATCH] fix: checkstyle --- ...oller.java => OpenAuth2AppController.java} | 24 +++++------ .../databasir/api/config/SecurityConfig.java | 4 +- .../oauth2/DatabasirOauth2LoginFilter.java | 10 ++--- .../java/com/databasir/common/JsonData.java | 1 - ...ppService.java => OpenAuthAppService.java} | 40 +++++++++---------- ...andler.java => GithubOpenAuthHandler.java} | 11 +++-- ...OAuthHandler.java => OpenAuthHandler.java} | 2 +- .../domain/login/service/LoginService.java | 6 ++- .../{OAuthAppDao.java => OauthAppDao.java} | 4 +- 9 files changed, 51 insertions(+), 51 deletions(-) rename api/src/main/java/com/databasir/api/{OAuth2AppController.java => OpenAuth2AppController.java} (77%) rename core/src/main/java/com/databasir/core/domain/app/{OAuthAppService.java => OpenAuthAppService.java} (73%) rename core/src/main/java/com/databasir/core/domain/app/handler/{GithubOauthHandler.java => GithubOpenAuthHandler.java} (91%) rename core/src/main/java/com/databasir/core/domain/app/handler/{OAuthHandler.java => OpenAuthHandler.java} (85%) rename dao/src/main/java/com/databasir/dao/impl/{OAuthAppDao.java => OauthAppDao.java} (93%) diff --git a/api/src/main/java/com/databasir/api/OAuth2AppController.java b/api/src/main/java/com/databasir/api/OpenAuth2AppController.java similarity index 77% rename from api/src/main/java/com/databasir/api/OAuth2AppController.java rename to api/src/main/java/com/databasir/api/OpenAuth2AppController.java index 0c67cde..d3bbf2c 100644 --- a/api/src/main/java/com/databasir/api/OAuth2AppController.java +++ b/api/src/main/java/com/databasir/api/OpenAuth2AppController.java @@ -1,9 +1,9 @@ package com.databasir.api; import com.databasir.common.JsonData; -import com.databasir.core.domain.app.OAuthAppService; +import com.databasir.core.domain.app.OpenAuthAppService; import com.databasir.core.domain.app.data.*; -import com.databasir.core.domain.app.handler.OAuthHandler; +import com.databasir.core.domain.app.handler.OpenAuthHandler; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -19,11 +19,11 @@ import static org.springframework.data.domain.Sort.Direction.DESC; @Controller @RequiredArgsConstructor -public class OAuth2AppController { +public class OpenAuth2AppController { - private final OAuthHandler oAuthHandler; + private final OpenAuthHandler openAuthHandler; - private final OAuthAppService oAuthAppService; + private final OpenAuthAppService openAuthAppService; /** * 无需授权 @@ -31,7 +31,7 @@ public class OAuth2AppController { @GetMapping("/oauth2/authorization/{registrationId}") @ResponseBody public JsonData authorization(@PathVariable String registrationId) { - String authorization = oAuthHandler.authorization(registrationId); + String authorization = openAuthHandler.authorization(registrationId); return JsonData.ok(authorization); } @@ -41,7 +41,7 @@ public class OAuth2AppController { @GetMapping("/oauth2/apps") @ResponseBody public JsonData> listApps() { - return JsonData.ok(oAuthAppService.listAll()); + return JsonData.ok(openAuthAppService.listAll()); } @GetMapping(Routes.OAuth2App.LIST_PAGE) @@ -50,14 +50,14 @@ public class OAuth2AppController { public JsonData> listPage(@PageableDefault(sort = "id", direction = DESC) Pageable page, OAuthAppPageCondition condition) { - return JsonData.ok(oAuthAppService.listPage(page, condition)); + return JsonData.ok(openAuthAppService.listPage(page, condition)); } @GetMapping(Routes.OAuth2App.GET_ONE) @PreAuthorize("hasAnyAuthority('SYS_OWNER')") @ResponseBody public JsonData getOne(@PathVariable Integer id) { - return JsonData.ok(oAuthAppService.getOne(id)); + return JsonData.ok(openAuthAppService.getOne(id)); } @@ -65,7 +65,7 @@ public class OAuth2AppController { @PreAuthorize("hasAnyAuthority('SYS_OWNER')") @ResponseBody public JsonData create(@RequestBody @Valid OAuthAppCreateRequest request) { - Integer id = oAuthAppService.create(request); + Integer id = openAuthAppService.create(request); return JsonData.ok(id); } @@ -73,7 +73,7 @@ public class OAuth2AppController { @PreAuthorize("hasAnyAuthority('SYS_OWNER')") @ResponseBody public JsonData updateById(@RequestBody @Valid OAuthAppUpdateRequest request) { - oAuthAppService.updateById(request); + openAuthAppService.updateById(request); return JsonData.ok(); } @@ -81,7 +81,7 @@ public class OAuth2AppController { @PreAuthorize("hasAnyAuthority('SYS_OWNER')") @ResponseBody public JsonData deleteById(@PathVariable Integer id) { - oAuthAppService.deleteById(id); + openAuthAppService.deleteById(id); return JsonData.ok(); } } diff --git a/api/src/main/java/com/databasir/api/config/SecurityConfig.java b/api/src/main/java/com/databasir/api/config/SecurityConfig.java index d65279c..7eb3d2d 100644 --- a/api/src/main/java/com/databasir/api/config/SecurityConfig.java +++ b/api/src/main/java/com/databasir/api/config/SecurityConfig.java @@ -1,7 +1,6 @@ package com.databasir.api.config; import com.databasir.api.Routes; -import com.databasir.api.config.oauth2.DatabasirOauth2LoginFilter; import com.databasir.api.config.security.*; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; @@ -46,7 +45,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .and() .authorizeRequests() .antMatchers("/login", Routes.Login.REFRESH_ACCESS_TOKEN).permitAll() - .antMatchers("/oauth2/apps", "/oauth2/failure", "/oauth2/authorization/*", "/oauth2/login/*").permitAll() + .antMatchers("/oauth2/apps", "/oauth2/failure", "/oauth2/authorization/*", "/oauth2/login/*") + .permitAll() .antMatchers("/", "/*.html", "/js/**", "/css/**", "/img/**", "/*.ico").permitAll() .anyRequest().authenticated() .and() diff --git a/api/src/main/java/com/databasir/api/config/oauth2/DatabasirOauth2LoginFilter.java b/api/src/main/java/com/databasir/api/config/oauth2/DatabasirOauth2LoginFilter.java index 4dd5140..5152fa9 100644 --- a/api/src/main/java/com/databasir/api/config/oauth2/DatabasirOauth2LoginFilter.java +++ b/api/src/main/java/com/databasir/api/config/oauth2/DatabasirOauth2LoginFilter.java @@ -2,7 +2,7 @@ package com.databasir.api.config.oauth2; import com.databasir.api.config.security.DatabasirUserDetailService; import com.databasir.core.domain.user.data.UserDetailResponse; -import com.databasir.core.domain.app.OAuthAppService; +import com.databasir.core.domain.app.OpenAuthAppService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationManager; @@ -28,16 +28,16 @@ public class DatabasirOauth2LoginFilter extends AbstractAuthenticationProcessing public static final String OAUTH_LOGIN_URI = "/oauth2/login/*"; @Autowired - private OAuthAppService oAuthAppService; + private OpenAuthAppService openAuthAppService; @Autowired private DatabasirUserDetailService databasirUserDetailService; public DatabasirOauth2LoginFilter(AuthenticationManager authenticationManager, - OAuth2AuthenticationSuccessHandler oAuth2AuthenticationSuccessHandler, + OAuth2AuthenticationSuccessHandler auth2AuthenticationSuccessHandler, AuthenticationFailureHandler authenticationFailureHandler) { super(OAUTH_LOGIN_URI, authenticationManager); - this.setAuthenticationSuccessHandler(oAuth2AuthenticationSuccessHandler); + this.setAuthenticationSuccessHandler(auth2AuthenticationSuccessHandler); this.setAuthenticationFailureHandler(authenticationFailureHandler); } @@ -46,7 +46,7 @@ public class DatabasirOauth2LoginFilter extends AbstractAuthenticationProcessing throws AuthenticationException, IOException, ServletException { Map params = request.getParameterMap(); String registrationId = new AntPathMatcher().extractPathWithinPattern(OAUTH_LOGIN_URI, request.getRequestURI()); - UserDetailResponse userDetailResponse = oAuthAppService.oauthCallback(registrationId, params); + UserDetailResponse userDetailResponse = openAuthAppService.oauthCallback(registrationId, params); UserDetails details = databasirUserDetailService.loadUserByUsername(userDetailResponse.getUsername()); DatabasirOAuth2Authentication authentication = new DatabasirOAuth2Authentication(details); if (!userDetailResponse.getEnabled()) { diff --git a/common/src/main/java/com/databasir/common/JsonData.java b/common/src/main/java/com/databasir/common/JsonData.java index bc65a88..754e132 100644 --- a/common/src/main/java/com/databasir/common/JsonData.java +++ b/common/src/main/java/com/databasir/common/JsonData.java @@ -38,7 +38,6 @@ public class JsonData { return jsonData; } - public static JsonData error(String errorCode, String errMessage) { JsonData jsonData = new JsonData<>(); jsonData.setErrCode(errorCode); diff --git a/core/src/main/java/com/databasir/core/domain/app/OAuthAppService.java b/core/src/main/java/com/databasir/core/domain/app/OpenAuthAppService.java similarity index 73% rename from core/src/main/java/com/databasir/core/domain/app/OAuthAppService.java rename to core/src/main/java/com/databasir/core/domain/app/OpenAuthAppService.java index f71259b..d25ffcb 100644 --- a/core/src/main/java/com/databasir/core/domain/app/OAuthAppService.java +++ b/core/src/main/java/com/databasir/core/domain/app/OpenAuthAppService.java @@ -4,13 +4,13 @@ import com.databasir.core.domain.DomainErrors; import com.databasir.core.domain.app.converter.OAuthAppPojoConverter; import com.databasir.core.domain.app.converter.OAuthAppResponseConverter; import com.databasir.core.domain.app.data.*; -import com.databasir.core.domain.app.handler.OAuthHandler; +import com.databasir.core.domain.app.handler.OpenAuthHandler; import com.databasir.core.domain.app.handler.OAuthProcessContext; import com.databasir.core.domain.app.handler.OAuthProcessResult; import com.databasir.core.domain.user.data.UserCreateRequest; import com.databasir.core.domain.user.data.UserDetailResponse; import com.databasir.core.domain.user.service.UserService; -import com.databasir.dao.impl.OAuthAppDao; +import com.databasir.dao.impl.OauthAppDao; import com.databasir.dao.tables.pojos.OauthAppPojo; import lombok.RequiredArgsConstructor; import org.springframework.dao.DuplicateKeyException; @@ -27,23 +27,23 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor -public class OAuthAppService { +public class OpenAuthAppService { - private final List oAuthHandlers; + private final List openAuthHandlers; - private final OAuthAppDao oAuthAppDao; + private final OauthAppDao oauthAppDao; private final UserService userService; - private final OAuthAppResponseConverter oAuthAppResponseConverter; + private final OAuthAppResponseConverter oauthAppResponseConverter; - private final OAuthAppPojoConverter oAuthAppPojoConverter; + private final OAuthAppPojoConverter oauthAppPojoConverter; public UserDetailResponse oauthCallback(String registrationId, Map params) { // match handler - OauthAppPojo app = oAuthAppDao.selectByRegistrationId(registrationId); - OAuthHandler oAuthHandler = oAuthHandlers.stream() + OauthAppPojo app = oauthAppDao.selectByRegistrationId(registrationId); + OpenAuthHandler openAuthHandler = openAuthHandlers.stream() .filter(handler -> handler.support(app.getAppType())) .findFirst() .orElseThrow(() -> new UsernameNotFoundException("暂不支持该类型登陆")); @@ -53,7 +53,7 @@ public class OAuthAppService { .callbackParameters(params) .registrationId(registrationId) .build(); - OAuthProcessResult result = oAuthHandler.process(context); + OAuthProcessResult result = openAuthHandler.process(context); // get or create new user return userService.get(result.getEmail()) @@ -71,41 +71,41 @@ public class OAuthAppService { } public List listAll() { - List apps = oAuthAppDao.selectAll(); + List apps = oauthAppDao.selectAll(); return apps.stream() - .map(oAuthAppResponseConverter::to) + .map(oauthAppResponseConverter::to) .collect(Collectors.toList()); } public void deleteById(Integer id) { - if (oAuthAppDao.existsById(id)) { - oAuthAppDao.deleteById(id); + if (oauthAppDao.existsById(id)) { + oauthAppDao.deleteById(id); } } public void updateById(OAuthAppUpdateRequest request) { - OauthAppPojo pojo = oAuthAppPojoConverter.of(request); + OauthAppPojo pojo = oauthAppPojoConverter.of(request); try { - oAuthAppDao.updateById(pojo); + oauthAppDao.updateById(pojo); } catch (DuplicateKeyException e) { throw DomainErrors.REGISTRATION_ID_DUPLICATE.exception(); } } public Integer create(OAuthAppCreateRequest request) { - OauthAppPojo pojo = oAuthAppPojoConverter.of(request); + OauthAppPojo pojo = oauthAppPojoConverter.of(request); try { - return oAuthAppDao.insertAndReturnId(pojo); + return oauthAppDao.insertAndReturnId(pojo); } catch (DuplicateKeyException e) { throw DomainErrors.REGISTRATION_ID_DUPLICATE.exception(); } } public Page listPage(Pageable page, OAuthAppPageCondition condition) { - return oAuthAppDao.selectByPage(page, condition.toCondition()).map(oAuthAppPojoConverter::toPageResponse); + return oauthAppDao.selectByPage(page, condition.toCondition()).map(oauthAppPojoConverter::toPageResponse); } public Optional getOne(Integer id) { - return oAuthAppDao.selectOptionalById(id).map(oAuthAppPojoConverter::toDetailResponse); + return oauthAppDao.selectOptionalById(id).map(oauthAppPojoConverter::toDetailResponse); } } diff --git a/core/src/main/java/com/databasir/core/domain/app/handler/GithubOauthHandler.java b/core/src/main/java/com/databasir/core/domain/app/handler/GithubOpenAuthHandler.java similarity index 91% rename from core/src/main/java/com/databasir/core/domain/app/handler/GithubOauthHandler.java rename to core/src/main/java/com/databasir/core/domain/app/handler/GithubOpenAuthHandler.java index 71ad828..79d58ec 100644 --- a/core/src/main/java/com/databasir/core/domain/app/handler/GithubOauthHandler.java +++ b/core/src/main/java/com/databasir/core/domain/app/handler/GithubOpenAuthHandler.java @@ -1,11 +1,10 @@ package com.databasir.core.domain.app.handler; - import com.databasir.core.domain.DomainErrors; import com.databasir.core.domain.app.exception.DatabasirAuthenticationException; import com.databasir.core.infrastructure.remote.github.GithubRemoteService; import com.databasir.dao.enums.OAuthAppType; -import com.databasir.dao.impl.OAuthAppDao; +import com.databasir.dao.impl.OauthAppDao; import com.databasir.dao.tables.pojos.OauthAppPojo; import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; @@ -18,11 +17,11 @@ import java.util.Map; @Component @RequiredArgsConstructor -public class GithubOauthHandler implements OAuthHandler { +public class GithubOpenAuthHandler implements OpenAuthHandler { private final GithubRemoteService githubRemoteService; - private final OAuthAppDao oAuthAppDao; + private final OauthAppDao oauthAppDao; @Override public boolean support(String oauthAppType) { @@ -31,7 +30,7 @@ public class GithubOauthHandler implements OAuthHandler { @Override public String authorization(String registrationId) { - OauthAppPojo app = oAuthAppDao.selectByRegistrationId(registrationId); + OauthAppPojo app = oauthAppDao.selectByRegistrationId(registrationId); String authUrl = app.getAuthUrl(); String clientId = app.getClientId(); String authorizeUrl = authUrl + "/login/oauth/authorize"; @@ -46,7 +45,7 @@ public class GithubOauthHandler implements OAuthHandler { @Override public OAuthProcessResult process(OAuthProcessContext context) { - OauthAppPojo authApp = oAuthAppDao.selectByRegistrationId(context.getRegistrationId()); + OauthAppPojo authApp = oauthAppDao.selectByRegistrationId(context.getRegistrationId()); String clientId = authApp.getClientId(); String clientSecret = authApp.getClientSecret(); String baseUrl = authApp.getResourceUrl(); diff --git a/core/src/main/java/com/databasir/core/domain/app/handler/OAuthHandler.java b/core/src/main/java/com/databasir/core/domain/app/handler/OpenAuthHandler.java similarity index 85% rename from core/src/main/java/com/databasir/core/domain/app/handler/OAuthHandler.java rename to core/src/main/java/com/databasir/core/domain/app/handler/OpenAuthHandler.java index d8287a7..a99f401 100644 --- a/core/src/main/java/com/databasir/core/domain/app/handler/OAuthHandler.java +++ b/core/src/main/java/com/databasir/core/domain/app/handler/OpenAuthHandler.java @@ -1,6 +1,6 @@ package com.databasir.core.domain.app.handler; -public interface OAuthHandler { +public interface OpenAuthHandler { boolean support(String oauthAppType); diff --git a/core/src/main/java/com/databasir/core/domain/login/service/LoginService.java b/core/src/main/java/com/databasir/core/domain/login/service/LoginService.java index dd108c6..dc7a7ab 100644 --- a/core/src/main/java/com/databasir/core/domain/login/service/LoginService.java +++ b/core/src/main/java/com/databasir/core/domain/login/service/LoginService.java @@ -111,10 +111,12 @@ public class LoginService { data.setUsername(user.getUsername()); data.setAccessToken(login.getAccessToken()); data.setAvatar(user.getAvatar()); - long expireAt = login.getAccessTokenExpireAt().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli(); + long expireAt = login.getAccessTokenExpireAt() + .atZone(ZoneId.systemDefault()).toInstant().toEpochMilli(); data.setAccessTokenExpireAt(expireAt); data.setRefreshToken(login.getRefreshToken()); - List rolePojoList = userRoleDao.selectByUserIds(Collections.singletonList(user.getId())); + List rolePojoList = + userRoleDao.selectByUserIds(Collections.singletonList(user.getId())); List roles = rolePojoList .stream() .map(ur -> { diff --git a/dao/src/main/java/com/databasir/dao/impl/OAuthAppDao.java b/dao/src/main/java/com/databasir/dao/impl/OauthAppDao.java similarity index 93% rename from dao/src/main/java/com/databasir/dao/impl/OAuthAppDao.java rename to dao/src/main/java/com/databasir/dao/impl/OauthAppDao.java index ad619f7..bd7450b 100644 --- a/dao/src/main/java/com/databasir/dao/impl/OAuthAppDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/OauthAppDao.java @@ -12,13 +12,13 @@ import java.util.Optional; import static com.databasir.dao.Tables.OAUTH_APP; @Repository -public class OAuthAppDao extends BaseDao { +public class OauthAppDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; - public OAuthAppDao() { + public OauthAppDao() { super(OAUTH_APP, OauthAppPojo.class); }