diff --git a/src/main/java/cokr/xit/base/security/AccessContext.java b/src/main/java/cokr/xit/base/security/AccessContext.java index 629a2e3..4b8d10b 100644 --- a/src/main/java/cokr/xit/base/security/AccessContext.java +++ b/src/main/java/cokr/xit/base/security/AccessContext.java @@ -47,7 +47,7 @@ public class AccessContext extends AbstractComponent implements ApplicationConte implicits = authorities.stream() .filter(authority -> Authority.Type.IMPLICIT.equals(authority.type())) - .collect(Collectors.toList()); + .toList(); List authorityActions = authorityMapper.getActionList(); authorityActions.stream() // 권한별 기능그룹 설정 @@ -59,7 +59,7 @@ public class AccessContext extends AbstractComponent implements ApplicationConte .forEach((authID, byAuth) -> { List groupIDs = byAuth.stream() .map(row -> (String)row.get("GRP_ID")) - .collect(Collectors.toList()); + .toList(); Authority authority = authorityIndex.get(authID); if (authority != null) @@ -71,7 +71,7 @@ public class AccessContext extends AbstractComponent implements ApplicationConte .forEach((authID, actions) -> { List actionList = actions.stream() .map(action -> action.string("ACTION")) - .collect(Collectors.toList()); + .toList(); Authority authority = authorityIndex.get(authID); if (authority != null) authority.setActions(actionList); @@ -99,7 +99,7 @@ public class AccessContext extends AbstractComponent implements ApplicationConte return authorityIndex.entrySet().stream() .filter(entry -> authIDs.contains(entry.getKey())) .map(Entry::getValue) - .collect(Collectors.toList()); + .toList(); } /**내재적 권한 목록을 반환한다. @@ -117,6 +117,6 @@ public class AccessContext extends AbstractComponent implements ApplicationConte return getAuthorities(authIDs).stream() .flatMap(authority -> authority.getActions().stream()) .distinct() - .collect(Collectors.toList()); + .toList(); } } \ No newline at end of file diff --git a/src/main/java/cokr/xit/base/security/SecuredUserInfo.java b/src/main/java/cokr/xit/base/security/SecuredUserInfo.java index 18b9491..c97fb17 100644 --- a/src/main/java/cokr/xit/base/security/SecuredUserInfo.java +++ b/src/main/java/cokr/xit/base/security/SecuredUserInfo.java @@ -2,7 +2,6 @@ package cokr.xit.base.security; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; import javax.annotation.Resource; @@ -153,7 +152,7 @@ public class SecuredUserInfo extends UserInfo implements UserDetails { return authorities.stream() .flatMap(auth -> auth.getActions().stream()) .distinct() - .collect(Collectors.toList()); + .toList(); } } diff --git a/src/main/java/cokr/xit/base/security/access/dao/AuthorityMapper.java b/src/main/java/cokr/xit/base/security/access/dao/AuthorityMapper.java index 047d343..e22bd03 100644 --- a/src/main/java/cokr/xit/base/security/access/dao/AuthorityMapper.java +++ b/src/main/java/cokr/xit/base/security/access/dao/AuthorityMapper.java @@ -2,7 +2,6 @@ package cokr.xit.base.security.access.dao; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; @@ -188,7 +187,7 @@ public interface AuthorityMapper extends AbstractMapper { List list = getUserAuths(params().set("userIDs", List.of(userID))); return list.stream() .map(row -> row.string("AUTH_ID")) - .collect(Collectors.toList()); + .toList(); } /**지정하는 권한에 사용자를 추가한다. diff --git a/src/main/java/cokr/xit/base/security/access/web/ActionGroupController.java b/src/main/java/cokr/xit/base/security/access/web/ActionGroupController.java index e752762..9057ff4 100644 --- a/src/main/java/cokr/xit/base/security/access/web/ActionGroupController.java +++ b/src/main/java/cokr/xit/base/security/access/web/ActionGroupController.java @@ -1,7 +1,6 @@ package cokr.xit.base.security.access.web; import java.util.List; -import java.util.stream.Collectors; import javax.annotation.Resource; @@ -71,7 +70,7 @@ public class ActionGroupController extends AbstractController { ModelAndView mav = getActionGroupList(new ActionQuery().setPageNum(1)); mav.setViewName("base/actionGroup/select-actionGroup"); List list = (List)mav.getModel().remove("groupList"); - mav.addObject("groupList", toJson(list.stream().filter(info -> !info.bool("builtIn")).collect(Collectors.toList()))); + mav.addObject("groupList", toJson(list.stream().filter(info -> !info.bool("builtIn")).toList())); return mav; }