diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/common/LoginController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/common/LoginController.java index 09b116d..f4d3324 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/common/LoginController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/common/LoginController.java @@ -41,17 +41,13 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor public class LoginController { - @NonNull - private LoginService loginService; + private final LoginService loginService; - @NonNull - private MenuApplicationService menuApplicationService; + private final MenuApplicationService menuApplicationService; - @NonNull - private UserApplicationService userApplicationService; + private final UserApplicationService userApplicationService; - @NonNull - private AgileBootConfig agileBootConfig; + private final AgileBootConfig agileBootConfig; /** * 访问首页，提示语 diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/MonitorController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/MonitorController.java index 0236ec7..194c232 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/MonitorController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/MonitorController.java @@ -33,8 +33,7 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor public class MonitorController extends BaseController { - @NonNull - private MonitorApplicationService monitorApplicationService; + private final MonitorApplicationService monitorApplicationService; @Operation(summary = "Redis信息") @PreAuthorize("@permission.has('monitor:cache:list')") diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysConfigController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysConfigController.java index e323fe8..78965df 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysConfigController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysConfigController.java @@ -37,8 +37,7 @@ import org.springframework.web.bind.annotation.RestController; @Tag(name = "配置API", description = "配置相关的增删查改") public class SysConfigController extends BaseController { - @NonNull - private ConfigApplicationService configApplicationService; + private final ConfigApplicationService configApplicationService; /** * 获取参数配置列表 diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysDeptController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysDeptController.java index f42e1b3..f46f03b 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysDeptController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysDeptController.java @@ -39,8 +39,7 @@ import org.springframework.web.bind.annotation.RestController; @Tag(name = "部门API", description = "部门相关的增删查改") public class SysDeptController extends BaseController { - @NonNull - private DeptApplicationService deptApplicationService; + private final DeptApplicationService deptApplicationService; /** * 获取部门列表 diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysMenuController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysMenuController.java index 1fad35c..d40a7ca 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysMenuController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysMenuController.java @@ -43,8 +43,7 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor public class SysMenuController extends BaseController { - @NonNull - MenuApplicationService menuApplicationService; + private final MenuApplicationService menuApplicationService; /** * 获取菜单列表 diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysNoticeController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysNoticeController.java index a6efd3e..079f4bf 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysNoticeController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysNoticeController.java @@ -45,8 +45,7 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor public class SysNoticeController extends BaseController { - @NonNull - private NoticeApplicationService noticeApplicationService; + private final NoticeApplicationService noticeApplicationService; /** * 获取通知公告列表 diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java index f17038c..ea89268 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java @@ -41,8 +41,7 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor public class SysPostController extends BaseController { - @NonNull - private PostApplicationService postApplicationService; + private final PostApplicationService postApplicationService; /** * 获取岗位列表 diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysProfileController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysProfileController.java index 620bf40..c64c2cc 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysProfileController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysProfileController.java @@ -40,8 +40,7 @@ import org.springframework.web.multipart.MultipartFile; @RequiredArgsConstructor public class SysProfileController extends BaseController { - @NonNull - private UserApplicationService userApplicationService; + private final UserApplicationService userApplicationService; /** * 个人信息 diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysRoleController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysRoleController.java index 2d10547..5155c11 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysRoleController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysRoleController.java @@ -46,8 +46,7 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor public class SysRoleController extends BaseController { - @NonNull - private RoleApplicationService roleApplicationService; + private final RoleApplicationService roleApplicationService; @Operation(summary = "角色列表") @PreAuthorize("@permission.has('system:role:list')") diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java index 9c795f0..e4cf6b1 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java @@ -47,8 +47,7 @@ import org.springframework.web.multipart.MultipartFile; @RequiredArgsConstructor public class SysUserController extends BaseController { - @NonNull - private UserApplicationService userApplicationService; + private final UserApplicationService userApplicationService; /** * 获取用户列表 diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/config/JwtAuthenticationTokenFilter.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/config/JwtAuthenticationTokenFilter.java index 2903eee..d3a70fc 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/config/JwtAuthenticationTokenFilter.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/config/JwtAuthenticationTokenFilter.java @@ -27,8 +27,7 @@ import org.springframework.web.filter.OncePerRequestFilter; @RequiredArgsConstructor public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { - @NonNull - private TokenService tokenService; + private final TokenService tokenService; @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/config/SecurityConfig.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/config/SecurityConfig.java index e5f6088..2c0584e 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/config/SecurityConfig.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/config/SecurityConfig.java @@ -47,26 +47,21 @@ import org.springframework.web.filter.CorsFilter; @RequiredArgsConstructor public class SecurityConfig { - @NonNull - private TokenService tokenService; + private final TokenService tokenService; - @NonNull - private RedisCacheService redisCache; + private final RedisCacheService redisCache; /** * token认证过滤器 */ - @NonNull - private JwtAuthenticationTokenFilter jwtTokenFilter; + private final JwtAuthenticationTokenFilter jwtTokenFilter; - @NonNull - private UserDetailsService userDetailsService; + private final UserDetailsService userDetailsService; /** * 跨域过滤器 */ - @NonNull - private CorsFilter corsFilter; + private final CorsFilter corsFilter; /** diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/LoginService.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/LoginService.java index 118bcbc..2bcde15 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/LoginService.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/LoginService.java @@ -54,17 +54,13 @@ import org.springframework.util.FastByteArrayOutputStream; @RequiredArgsConstructor public class LoginService { - @NonNull - private TokenService tokenService; + private final TokenService tokenService; - @NonNull - private RedisCacheService redisCache; + private final RedisCacheService redisCache; - @NonNull - private GuavaCacheService guavaCache; + private final GuavaCacheService guavaCache; - @NonNull - private AuthenticationManager authenticationManager; + private final AuthenticationManager authenticationManager; @Resource(name = "captchaProducer") private Producer captchaProducer; diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/TokenService.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/TokenService.java index 49cfd82..c9fd5fc 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/TokenService.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/TokenService.java @@ -55,8 +55,7 @@ public class TokenService { @Value("${token.autoRefreshTime}") private long autoRefreshTime; - @NonNull - private RedisCacheService redisCache; + private final RedisCacheService redisCache; /** * 获取用户身份信息 diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/UserDetailsServiceImpl.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/UserDetailsServiceImpl.java index b8750da..6950c1f 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/UserDetailsServiceImpl.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/UserDetailsServiceImpl.java @@ -44,17 +44,13 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class UserDetailsServiceImpl implements UserDetailsService { - @NonNull - private SysUserService userService; + private final SysUserService userService; - @NonNull - private SysMenuService menuService; + private final SysMenuService menuService; - @NonNull - private SysRoleService roleService; + private final SysRoleService roleService; - @NonNull - private TokenService tokenService; + private final TokenService tokenService; @Override diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionService.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionService.java index 2d45de4..0e75f0a 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionService.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionService.java @@ -20,8 +20,7 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class DataPermissionService { - @NonNull - private SysUserService userService; + private final SysUserService userService; /** * 通过userId 校验当前用户 对 目标用户是否有操作权限 diff --git a/agileboot-api/src/main/java/com/agileboot/api/customize/config/SecurityConfig.java b/agileboot-api/src/main/java/com/agileboot/api/customize/config/SecurityConfig.java index 0abba92..973861a 100644 --- a/agileboot-api/src/main/java/com/agileboot/api/customize/config/SecurityConfig.java +++ b/agileboot-api/src/main/java/com/agileboot/api/customize/config/SecurityConfig.java @@ -31,15 +31,13 @@ public class SecurityConfig { /** * token认证过滤器 */ - @NonNull - private JwtAuthenticationFilter jwtTokenFilter; + private final JwtAuthenticationFilter jwtTokenFilter; /** * 跨域过滤器 */ - @NonNull - private CorsFilter corsFilter; + private final CorsFilter corsFilter; /** diff --git a/agileboot-api/src/main/java/com/agileboot/api/customize/service/JwtTokenService.java b/agileboot-api/src/main/java/com/agileboot/api/customize/service/JwtTokenService.java index 918ffe5..d4bfe0d 100644 --- a/agileboot-api/src/main/java/com/agileboot/api/customize/service/JwtTokenService.java +++ b/agileboot-api/src/main/java/com/agileboot/api/customize/service/JwtTokenService.java @@ -44,8 +44,7 @@ public class JwtTokenService { @Value("${token.secret}") private String secret; - @NonNull - private RedisCacheService redisCache; + private final RedisCacheService redisCache; /** * 获取用户身份信息 diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/GuavaCacheService.java b/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/GuavaCacheService.java index 3c5764c..620b9a4 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/GuavaCacheService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/GuavaCacheService.java @@ -18,11 +18,9 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class GuavaCacheService { - @NonNull - private SysConfigService configService; + private final SysConfigService configService; - @NonNull - private SysDeptService deptService; + private final SysDeptService deptService; public final AbstractGuavaCacheTemplate configCache = new AbstractGuavaCacheTemplate() { @Override diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/RedisCacheService.java b/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/RedisCacheService.java index 4c3d75b..e92ceb6 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/RedisCacheService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/common/cache/RedisCacheService.java @@ -24,8 +24,7 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class RedisCacheService { - @NonNull - private RedisUtil redisUtil; + private final RedisUtil redisUtil; public RedisCacheTemplate captchaCache; public RedisCacheTemplate loginUserCache; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigApplicationService.java index 025d310..d45fb56 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigApplicationService.java @@ -21,13 +21,11 @@ import org.springframework.stereotype.Service; */ @Service @RequiredArgsConstructor -public class ConfigApplicationService { +public class ConfigApplicationService { - @NonNull - private ConfigModelFactory configModelFactory; + private final ConfigModelFactory configModelFactory; - @NonNull - private SysConfigService configService; + private final SysConfigService configService; public PageDTO getConfigList(ConfigQuery query) { Page page = configService.page(query.toPage(), query.toQueryWrapper()); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModelFactory.java index 24d4608..8e471b7 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModelFactory.java @@ -16,8 +16,7 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ConfigModelFactory { - @NonNull - private SysConfigService configService; + private final SysConfigService configService; public ConfigModel loadById(Long configId) { SysConfigEntity byId = configService.getById(configId); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptApplicationService.java index cf992d1..a509cb0 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptApplicationService.java @@ -25,14 +25,11 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class DeptApplicationService { - @NonNull - private SysDeptService deptService; + private final SysDeptService deptService; - @NonNull - private SysRoleService roleService; + private final SysRoleService roleService; - @NonNull - private DeptModelFactory deptModelFactory; + private final DeptModelFactory deptModelFactory; public List getDeptList(DeptQuery query) { diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptServiceImpl.java index 0ae8ff6..567c677 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptServiceImpl.java @@ -20,8 +20,7 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class SysDeptServiceImpl extends ServiceImpl implements SysDeptService { - @NonNull - private SysUserMapper userMapper; + private final SysUserMapper userMapper; @Override diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModelFactory.java index 64d2d71..c1256cc 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModelFactory.java @@ -17,8 +17,7 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class DeptModelFactory { - @NonNull - private SysDeptService deptService; + private final SysDeptService deptService; public DeptModel loadById(Long deptId) { SysDeptEntity byId = deptService.getById(deptId); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/LogApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/LogApplicationService.java index d55579f..bfb9c1e 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/log/LogApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/log/LogApplicationService.java @@ -26,11 +26,9 @@ import org.springframework.stereotype.Service; public class LogApplicationService { // TODO 命名到时候统一改成叫LoginLog - @NonNull - private SysLoginInfoService loginInfoService; + private final SysLoginInfoService loginInfoService; - @NonNull - private SysOperationLogService operationLogService; + private final SysOperationLogService operationLogService; public PageDTO getLoginInfoList(LoginLogQuery query) { Page page = loginInfoService.page(query.toPage(), query.toQueryWrapper()); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuApplicationService.java index d020558..09df60a 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuApplicationService.java @@ -32,11 +32,9 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class MenuApplicationService { - @NonNull - private SysMenuService menuService; + private final SysMenuService menuService; - @NonNull - private MenuModelFactory menuModelFactory; + private final MenuModelFactory menuModelFactory; public List getMenuList(MenuQuery query) { diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuServiceImpl.java index 57ec0b7..48a371a 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuServiceImpl.java @@ -21,8 +21,7 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class SysMenuServiceImpl extends ServiceImpl implements SysMenuService { - @NonNull - private SysRoleMenuMapper roleMenuMapper; + private final SysRoleMenuMapper roleMenuMapper; /** diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModelFactory.java index 160ee0d..02a097c 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModelFactory.java @@ -16,8 +16,7 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class MenuModelFactory { - @NonNull - private SysMenuService menuService; + private final SysMenuService menuService; public MenuModel loadById(Long menuId) { SysMenuEntity byId = menuService.getById(menuId); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/MonitorApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/MonitorApplicationService.java index 56f0e0c..cdc427d 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/MonitorApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/MonitorApplicationService.java @@ -31,8 +31,7 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class MonitorApplicationService { - @NonNull - private RedisTemplate redisTemplate; + private final RedisTemplate redisTemplate; public RedisCacheInfoDTO getRedisCacheInfo() { Properties info = (Properties) redisTemplate.execute((RedisCallback) RedisServerCommands::info); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeApplicationService.java index 1a5e3e7..f84130f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeApplicationService.java @@ -24,11 +24,9 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class NoticeApplicationService { - @NonNull - private SysNoticeService noticeService; + private final SysNoticeService noticeService; - @NonNull - private NoticeModelFactory noticeModelFactory; + private final NoticeModelFactory noticeModelFactory; public PageDTO getNoticeList(NoticeQuery query) { Page page = noticeService.getNoticeList(query.toPage(), query.toQueryWrapper()); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModelFactory.java index b7cf838..c3b2204 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModelFactory.java @@ -16,8 +16,7 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class NoticeModelFactory { - @NonNull - private SysNoticeService noticeService; + private final SysNoticeService noticeService; public NoticeModel loadById(Long noticeId) { SysNoticeEntity byId = noticeService.getById(noticeId); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java index e9f42c8..3b78da9 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java @@ -24,11 +24,9 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class PostApplicationService { - @NonNull - private PostModelFactory postModelFactory; + private final PostModelFactory postModelFactory; - @NonNull - private SysPostService postService; + private final SysPostService postService; public PageDTO getPostList(PostQuery query) { Page page = postService.page(query.toPage(), query.toQueryWrapper()); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostServiceImpl.java index 758f552..0b8abaf 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostServiceImpl.java @@ -20,8 +20,7 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class SysPostServiceImpl extends ServiceImpl implements SysPostService { - @NonNull - private SysUserMapper userMapper; + private final SysUserMapper userMapper; /** * 校验岗位名称是否唯一 diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModelFactory.java index e98b717..cc0fc82 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModelFactory.java @@ -15,8 +15,7 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class PostModelFactory { - @NonNull - private SysPostService postService; + private final SysPostService postService; public PostModel loadById(Long postId) { SysPostEntity byId = postService.getById(postId); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java index 7d84fc9..da89652 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java @@ -37,20 +37,15 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class RoleApplicationService { - @NonNull - private RoleModelFactory roleModelFactory; + private final RoleModelFactory roleModelFactory; - @NonNull - private UserModelFactory userModelFactory; + private final UserModelFactory userModelFactory; - @NonNull - private SysRoleService roleService; + private final SysRoleService roleService; - @NonNull - private SysUserService userService; + private final SysUserService userService; - @NonNull - private SysMenuService menuService; + private final SysMenuService menuService; public PageDTO getRoleList(RoleQuery query) { diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleServiceImpl.java index 4abac93..0f4612a 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleServiceImpl.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleServiceImpl.java @@ -22,8 +22,7 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { - @NonNull - private SysUserMapper userMapper; + private final SysUserMapper userMapper; @Override public boolean isRoleNameDuplicated(Long roleId, String roleName) { diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModelFactory.java index c18dcb6..065183b 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModelFactory.java @@ -23,11 +23,9 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class RoleModelFactory { - @NonNull - private SysRoleService roleService; + private final SysRoleService roleService; - @NonNull - private SysRoleMenuService roleMenuService; + private final SysRoleMenuService roleMenuService; public RoleModel loadById(Long roleId) { SysRoleEntity byId = roleService.getById(roleId); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserApplicationService.java index 80091cd..b1f52ea 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserApplicationService.java @@ -43,17 +43,13 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class UserApplicationService { - @NonNull - private SysUserService userService; + private final SysUserService userService; - @NonNull - private SysRoleService roleService; + private final SysRoleService roleService; - @NonNull - private SysPostService postService; + private final SysPostService postService; - @NonNull - private UserModelFactory userModelFactory; + private final UserModelFactory userModelFactory; public PageDTO getUserList(SearchUserQuery query) { diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModelFactory.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModelFactory.java index 5b420f9..ca26bb6 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModelFactory.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModelFactory.java @@ -19,17 +19,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class UserModelFactory { - @NonNull - private SysUserService userService; + private final SysUserService userService; - @NonNull - private PostModelFactory postModelFactory; + private final PostModelFactory postModelFactory; - @NonNull - private DeptModelFactory deptModelFactory; + private final DeptModelFactory deptModelFactory; - @NonNull - private RoleModelFactory roleModelFactory; + private final RoleModelFactory roleModelFactory; public UserModel loadById(Long userId) { SysUserEntity byId = userService.getById(userId); diff --git a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/annotations/ratelimit/RateLimiterAspect.java b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/annotations/ratelimit/RateLimiterAspect.java index 426ffbb..62e3a4a 100644 --- a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/annotations/ratelimit/RateLimiterAspect.java +++ b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/annotations/ratelimit/RateLimiterAspect.java @@ -25,11 +25,9 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class RateLimiterAspect { - @NonNull - private RedisRateLimitChecker redisRateLimitChecker; + private final RedisRateLimitChecker redisRateLimitChecker; - @NonNull - private MapRateLimitChecker mapRateLimitChecker; + private final MapRateLimitChecker mapRateLimitChecker; @Before("@annotation(rateLimiter)") diff --git a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/annotations/ratelimit/implementation/RedisRateLimitChecker.java b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/annotations/ratelimit/implementation/RedisRateLimitChecker.java index 748266e..b694187 100644 --- a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/annotations/ratelimit/implementation/RedisRateLimitChecker.java +++ b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/annotations/ratelimit/implementation/RedisRateLimitChecker.java @@ -20,8 +20,7 @@ import org.springframework.stereotype.Component; @Slf4j public class RedisRateLimitChecker extends AbstractRateLimitChecker{ - @NonNull - private RedisTemplate redisTemplate; + private final RedisTemplate redisTemplate; private final RedisScript limitScript = new DefaultRedisScript<>(limitScriptText(), Long.class); diff --git a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/annotations/unrepeatable/UnrepeatableInterceptor.java b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/annotations/unrepeatable/UnrepeatableInterceptor.java index bf9a530..608cf21 100644 --- a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/annotations/unrepeatable/UnrepeatableInterceptor.java +++ b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/annotations/unrepeatable/UnrepeatableInterceptor.java @@ -27,8 +27,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestBodyAdviceAd @RequiredArgsConstructor public class UnrepeatableInterceptor extends RequestBodyAdviceAdapter { - @NonNull - private RedisUtil redisUtil; + private final RedisUtil redisUtil; @Override public boolean supports(MethodParameter methodParameter, Type targetType, diff --git a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/cache/RedisUtil.java b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/cache/RedisUtil.java index c00473b..f2715aa 100644 --- a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/cache/RedisUtil.java +++ b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/cache/RedisUtil.java @@ -23,8 +23,7 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class RedisUtil { - @NonNull - public RedisTemplate redisTemplate; + public final RedisTemplate redisTemplate; /** * 缓存基本的对象，Integer、String、实体类等 diff --git a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/cache/aop/RedisCacheBean.java b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/cache/aop/RedisCacheBean.java index c7ffb79..8e45f1d 100644 --- a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/cache/aop/RedisCacheBean.java +++ b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/cache/aop/RedisCacheBean.java @@ -18,8 +18,7 @@ public class RedisCacheBean implements Cache { /** * 缓存仓库 */ - @NonNull - private RedisUtil redisUtil; + private final RedisUtil redisUtil; @Override public String getName() { diff --git a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/config/GlobalTransactionConfig.java b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/config/GlobalTransactionConfig.java index 6d83b1b..934bb6d 100644 --- a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/config/GlobalTransactionConfig.java +++ b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/config/GlobalTransactionConfig.java @@ -35,8 +35,7 @@ public class GlobalTransactionConfig { /** * 注入事务管理器 */ - @NonNull - private TransactionManager transactionManager; + private final TransactionManager transactionManager; /** * 配置事务拦截器