2026_09_5H_Spring_KIZAKI/EM-Spring
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[STYLE] aspectの無駄な改行やスペースなどの削除

Browse Source
This commit is contained in:
s-choi
2026-09-10 15:55:25 +09:00
parent 71b8503c07
commit fc84fc3fda
4 changed files with 65 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/example/rhizome/aop/aspect/PermissionCheck.java
View File

@@ -5,10 +5,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
/**
* SessionCheckアノテーション
* セッションチェックを行うメソッドに付与する
*/
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
public @interface PermissionCheck { public @interface PermissionCheck {

128
src/main/java/com/example/rhizome/aop/aspect/PermissionCheckAspect.java
View File

@@ -1,114 +1,76 @@
package com.example.rhizome.aop.aspect; package com.example.rhizome.aop.aspect;
import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword; import javax.servlet.http.HttpServletRequest;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.LoginUserForm;
import com.example.rhizome.exception.InsufficientPermissionException;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.annotation.Pointcut;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest; import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.rhizome.app.presentation.form.LoginUserForm;
import com.example.rhizome.exception.InsufficientPermissionException;
/**
* 権限チェック用のAOP
*/
@Aspect @Aspect
@Component @Component
public class PermissionCheckAspect { public class PermissionCheckAspect {
HttpServletRequest request; HttpServletRequest request;
@Autowired @Autowired
public PermissionCheckAspect(HttpServletRequest request) { public PermissionCheckAspect(HttpServletRequest request) {
this.request = request; this.request = request;
} }
// Aspectのフックを定義（今回はPermissionCheckアノテーションが定義されているメソッドが動作するタイミング） @Pointcut("@annotation(com.example.rhizome.aop.aspect.PermissionCheck)")
@Pointcut("@annotation(com.example.rhizome.aop.aspect.PermissionCheck)") public void permissionCheckMethod() {
public void permissionCheckMethod() { }
}
/** @Before("permissionCheckMethod()")
* 権限チェック public void checkPermission() {
*/ LoginUserForm loginUserForm = (LoginUserForm) request.getSession().getAttribute(SessionKeyword.LOGIN_USER);
@Before("permissionCheckMethod()")
public void checkPermission() {
// ログインユーザの取得
LoginUserForm loginUserForm = (LoginUserForm) request.getSession().getAttribute(SessionKeyword.LOGIN_USER);
// ログインユーザが取得できない場合、または権限がない場合はエラー画面に遷移 if (loginUserForm == null || !hasRequiredPermission(request.getRequestURI(), loginUserForm)) {
if (loginUserForm == null || !hasRequiredPermission(request.getRequestURI(), loginUserForm)) { throw new InsufficientPermissionException("不正な遷移です");
throw new InsufficientPermissionException("不正な遷移です"); }
}
} }
/** private boolean hasRequiredPermission(String targetURL, LoginUserForm loginUserForm) {
* 遷移先のURLとログインユーザの権限から、遷移可否を判定する
*
* @param targetURL 遷移したいURL
* @param loginUserForm リクエスト元のユーザ
* @return true:遷移可 false:遷移不可
*/
private boolean hasRequiredPermission(String targetURL, LoginUserForm loginUserForm) {
// 管理者権限 if (isAdminTransition(targetURL, loginUserForm)) {
if (isAdminTransition(targetURL, loginUserForm)) { return true;
return true; }
}
// 一般権限 if (isUserTransition(targetURL, loginUserForm)) {
if (isUserTransition(targetURL, loginUserForm)) { return true;
return true; }
}
// アクセス不許可の場合の処理（不正アクセス画面に遷移） return false;
return false;
} }
/** private boolean isAdminTransition(String targetURL, LoginUserForm loginUserForm) {
* 管理者用のアカウントで管理者向けのページアクセスか
*
* @param targetURL 遷移したいURL
* @param loginUserForm リクエスト元のユーザ
* @return true:遷移可 false:遷移不可
*/
private boolean isAdminTransition(String targetURL, LoginUserForm loginUserForm) {
// 管理者か if (!loginUserForm.isAdminUser()) {
if (!loginUserForm.isAdminUser()) { return false;
return false; }
} if (!TransitionTargetPageNameKeyword.getAdminPageList().contains(targetURL)) {
return false;
}
// 管理者向けのページ遷移か return true;
if (!TransitionTargetPageNameKeyword.getAdminPageList().contains(targetURL)) { }
return false;
}
return true; private boolean isUserTransition(String targetURL, LoginUserForm loginUserForm) {
}
/** if (loginUserForm.isAdminUser()) {
* 一般ユーザ用のアカウントで一般ユーザ向けのページアクセスか return false;
* }
* @param targetURL 遷移したいURL
* @param loginUserForm リクエスト元のユーザ
* @return true:遷移可 false:遷移不可
*/
private boolean isUserTransition(String targetURL, LoginUserForm loginUserForm) {
// 管理者か return TransitionTargetPageNameKeyword.getUserPageList().contains(targetURL);
if (loginUserForm.isAdminUser()) {
return false;
}
// 一般ユーザ向けのページ遷移か }
return TransitionTargetPageNameKeyword.getUserPageList().contains(targetURL);
}
} }

4
src/main/java/com/example/rhizome/aop/aspect/SessionCheck.java
View File

@@ -5,10 +5,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
/**
* SessionCheckアノテーション
* セッションチェックを行うメソッドに付与する
*/
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
public @interface SessionCheck { public @interface SessionCheck {

47
src/main/java/com/example/rhizome/aop/aspect/SessionCheckAspect.java
View File

@@ -1,47 +1,40 @@
package com.example.rhizome.aop.aspect; package com.example.rhizome.aop.aspect;
import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword; import javax.servlet.http.HttpServletRequest;
import com.example.rhizome.exception.NoSessionException; import javax.servlet.http.HttpSession;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.annotation.Pointcut;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest; import com.example.rhizome.app.presentation.controller.pageproperty.SessionKeyword;
import javax.servlet.http.HttpSession; import com.example.rhizome.exception.NoSessionException;
/**
* セッションチェック用のAOP
*/
@Aspect @Aspect
@Component @Component
public class SessionCheckAspect { public class SessionCheckAspect {
HttpServletRequest request; HttpServletRequest request;
@Autowired @Autowired
public SessionCheckAspect(HttpServletRequest request) { public SessionCheckAspect(HttpServletRequest request) {
this.request = request; this.request = request;
} }
@Pointcut("@annotation(com.example.rhizome.aop.aspect.SessionCheck)") @Pointcut("@annotation(com.example.rhizome.aop.aspect.SessionCheck)")
public void sessionCheckMethod() { public void sessionCheckMethod() {
} }
/** @Before("sessionCheckMethod()")
* セッションチェック public void checkSession() {
*/ HttpSession session = request.getSession(false);
@Before("sessionCheckMethod()")
public void checkSession() {
// セッションの取得
HttpSession session = request.getSession(false);
// セッションが取得できない場合はエラー画面に遷移 if (session == null || session.getAttribute(SessionKeyword.LOGIN_USER) == null) {
if (session == null || session.getAttribute(SessionKeyword.LOGIN_USER) == null) { throw new NoSessionException("不正なログインです");
throw new NoSessionException("不正なログインです"); }
}
} }
} }