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

src/main/java/com/example/rhizome/EmSpringApplication.java

@@ -8,8 +8,8 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 @EnableAspectJAutoProxy(proxyTargetClass = true)
 public class EmSpringApplication {
 
-    public static void main(String[] args) {
+	public static void main(String[] args) {
-        SpringApplication.run(EmSpringApplication.class, args);
+		SpringApplication.run(EmSpringApplication.class, args);
-    }
+	}
 
 }

src/main/java/com/example/rhizome/app/domain/model/Department.java

@@ -3,19 +3,10 @@ package com.example.rhizome.app.domain.model;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * 部署情報の概念を表現するモデルクラスです。
- */
 @Getter
 @AllArgsConstructor
 public class Department {
-    /**
+	private final Integer idDepartment;
-     * 部署ID
+	private final String nmDepartment;
-     */
-    private final Integer idDepartment;
-    /**
-     * 部署名
-     */
-    private final String nmDepartment;
 
 }

src/main/java/com/example/rhizome/app/domain/model/Employee.java

@@ -3,39 +3,15 @@ package com.example.rhizome.app.domain.model;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * 社員を表現するモデルクラスです
- */
 @Getter
 @AllArgsConstructor
 public class Employee {
-    /**
+	private final Integer idEmployee;
-     * 社員ID
+	private final String nmEmployee;
-     */
+	private final String knEmployee;
-    private final Integer idEmployee;
+	private final String mailAddress;
-    /**
+	private final String password;
-     * 社員名
+	private final Integer adminAuth;
-     */
+	private final Integer idDepartment;
-    private final String nmEmployee;
-    /**
-     * 社員名カナ
-     */
-    private final String knEmployee;
-    /**
-     * メールアドレス
-     */
-    private final String mailAddress;
-    /**
-     * パスワード
-     */
-    private final String password;
-    /**
-     * 管理者権限
-     */
-    private final Integer adminAuth;
-    /**
-     * 部署ID
-     */
-    private final Integer idDepartment;
 
 }

src/main/java/com/example/rhizome/app/domain/model/EmployeeInfo.java

@@ -1,28 +1,14 @@
-/*
- * EmployeeInfo.java
- *   作成	IT-College	2016
- *------------------------------------------------------------
- * Copyright(c) Rhizome Inc. All Rights Reserved.
- */
 package com.example.rhizome.app.domain.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * 社員情報の概念を表現するモデルクラスです。
- */
 @Getter
 @AllArgsConstructor
 public class EmployeeInfo {
 
-    /**
+	private final Employee employee;
-     * 社員情報
+
-     */
+	private final Department department;
-    private final Employee employee;
-    /**
-     * 部署名
-     */
-    private final Department department;
 
 }

src/main/java/com/example/rhizome/app/domain/model/LoginInfo.java

@@ -3,20 +3,12 @@ package com.example.rhizome.app.domain.model;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * ログインを試みる人を表現するモデルクラスです
- */
-
 @Getter
 @AllArgsConstructor
 public class LoginInfo {
-    /**
+
-     * メールアドレス
+	private String mailAddress;
-     */
+
-    private String mailAddress;
+	private String password;
-    /**
-     * パスワード
-     */
-    private String password;
 
 }

src/main/java/com/example/rhizome/app/domain/model/LoginUser.java

@@ -3,49 +3,24 @@ package com.example.rhizome.app.domain.model;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * ログイン者を表現するクラスです
- */
 @Getter
 @AllArgsConstructor
 public class LoginUser {
-    /**
+	private final Integer idEmployee;
-     * 社員ID
-     */
-    private final Integer idEmployee;
-    /**
-     * 社員名
-     */
-    private final String nmEmployee;
-    /**
-     * 社員名カナ
-     */
-    private final String knEmployee;
-    /**
-     * メールアドレス
-     */
-    private final String mailAddress;
-    /**
-     * パスワード
-     */
-    private final String password;
 
-    /**
+	private final String nmEmployee;
-     * 管理者権限
-     */
-    private final Integer adminAuth;
 
-    /**
+	private final String knEmployee;
-     * 部署ID
-     */
-    private final Integer idDepartment;
 
-    /**
+	private final String mailAddress;
-     * ログインユーザが管理者か
+
-     *
+	private final String password;
-     * @return true:管理者 false:一般権限
+
-     */
+	private final Integer adminAuth;
-    public boolean isAdminUser() {
+
-        return getAdminAuth() == 1;
+	private final Integer idDepartment;
-    }
+
+	public boolean isAdminUser() {
+		return getAdminAuth() == 1;
+	}
 }

src/main/java/com/example/rhizome/app/domain/model/SearchConditionDepartment.java

@@ -3,19 +3,11 @@ package com.example.rhizome.app.domain.model;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * 部署情報の検索要件を表現するモデルクラスです。
- */
 @Getter
 @AllArgsConstructor
 public class SearchConditionDepartment {
-    /**
+	private final Integer idDepartment;
-     * 部署ID
+
-     */
+	private final String nmDepartment;
-    private final Integer idDepartment;
-    /**
-     * 部署名
-     */
-    private final String nmDepartment;
 
 }

src/main/java/com/example/rhizome/app/domain/model/SearchConditionEmployee.java

@@ -3,31 +3,13 @@ package com.example.rhizome.app.domain.model;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * 社員情報の検索条件という概念を表現するモデルクラスです
- */
 @Getter
 @AllArgsConstructor
 public class SearchConditionEmployee {
-    /**
+	private final Integer idEmployee;
-     * 社員ID
+	private final String nmEmployee;
-     */
+	private final String knEmployee;
-    private final Integer idEmployee;
+	private final String mailAddress;
-    /**
+	private final Integer idDepartment;
-     * 社員名
-     */
-    private final String nmEmployee;
-    /**
-     * 社員名カナ
-     */
-    private final String knEmployee;
-    /**
-     * メールアドレス
-     */
-    private final String mailAddress;
-    /**
-     * 部署ID
-     */
-    private final Integer idDepartment;
 
 }

src/main/java/com/example/rhizome/app/domain/service/Login.java

@@ -4,7 +4,7 @@ import com.example.rhizome.app.domain.model.LoginInfo;
 import com.example.rhizome.app.domain.model.LoginUser;
 
 public interface Login {
-    LoginUser doLogin(LoginInfo loginInfo);
+	LoginUser doLogin(LoginInfo loginInfo);
 
-    boolean canLogin(LoginInfo loginInfo);
+	boolean canLogin(LoginInfo loginInfo);
 }

src/main/java/com/example/rhizome/app/domain/service/RegisterDepartment.java

@@ -3,5 +3,5 @@ package com.example.rhizome.app.domain.service;
 import com.example.rhizome.app.domain.model.Department;
 
 public interface RegisterDepartment {
-    void registerDepartment(Department department);
+	void registerDepartment(Department department);
 }

src/main/java/com/example/rhizome/app/domain/service/RegisterEmployee.java

@@ -3,5 +3,5 @@ package com.example.rhizome.app.domain.service;
 import com.example.rhizome.app.domain.model.Employee;
 
 public interface RegisterEmployee {
-    void registerEmployee(Employee employee);
+	void registerEmployee(Employee employee);
 }

src/main/java/com/example/rhizome/app/domain/service/SearchEmployeeInfo.java

@@ -1,12 +1,12 @@
 package com.example.rhizome.app.domain.service;
 
+import java.util.List;
+
 import com.example.rhizome.app.domain.model.EmployeeInfo;
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
 
-import java.util.List;
-
 public interface SearchEmployeeInfo {
-    List<EmployeeInfo> selectAll();
+	List<EmployeeInfo> selectAll();
 
-    List<EmployeeInfo> searchBy(SearchConditionEmployee searchConditionEmployee);
+	List<EmployeeInfo> searchBy(SearchConditionEmployee searchConditionEmployee);
 }

src/main/java/com/example/rhizome/app/domain/service/UpdateEmployee.java

@@ -3,6 +3,6 @@ package com.example.rhizome.app.domain.service;
 import com.example.rhizome.app.domain.model.Employee;
 
 public interface UpdateEmployee {
-    void updateEmployee(Employee beforeEmployee, Employee updateEmployee);
+	void updateEmployee(Employee beforeEmployee, Employee updateEmployee);
 
 }

src/main/java/com/example/rhizome/app/domain/service/impl/DeleteEmployeeImpl.java

@@ -1,33 +1,25 @@
 package com.example.rhizome.app.domain.service.impl;
 
-import com.example.rhizome.app.domain.service.DeleteEmployee;
-import com.example.rhizome.app.infra.repository.EmployeeRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-/**
+import com.example.rhizome.app.domain.service.DeleteEmployee;
- * Employee レコード削除関連の機能を持つサービス
+import com.example.rhizome.app.infra.repository.EmployeeRepository;
- */
+
 @Service
 @Transactional
 public class DeleteEmployeeImpl implements DeleteEmployee {
 
-    EmployeeRepository employeeRepository;
+	EmployeeRepository employeeRepository;
 
-    @Autowired
+	@Autowired
-    public DeleteEmployeeImpl(EmployeeRepository employeeRepository) {
+	public DeleteEmployeeImpl(EmployeeRepository employeeRepository) {
-        this.employeeRepository = employeeRepository;
+		this.employeeRepository = employeeRepository;
-    }
+	}
 
-
+	public void deleteEmployee(Integer idEmployee) {
-    /**
+		employeeRepository.deleteById(idEmployee);
-     * idEmployee を元に employee データを削除
+	}
-     *
-     * @param idEmployee 削除対象のidEmployee
-     */
-    public void deleteEmployee(Integer idEmployee) {
-        employeeRepository.deleteById(idEmployee);
-    }
 
 }

src/main/java/com/example/rhizome/app/domain/service/impl/LoginImpl.java

@@ -1,55 +1,38 @@
 package com.example.rhizome.app.domain.service.impl;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.example.rhizome.app.domain.model.LoginInfo;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.Login;
 import com.example.rhizome.app.infra.entity.EmployeeEntity;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-/**
- * ログイン系の機能を集約させるサービスクラスです。
- */
 @Service
 @Transactional
 public class LoginImpl implements Login {
 
-    EmployeeRepository employeeRepository;
+	EmployeeRepository employeeRepository;
 
-    @Autowired
+	@Autowired
-    public LoginImpl(EmployeeRepository employeeRepository) {
+	public LoginImpl(EmployeeRepository employeeRepository) {
-        this.employeeRepository = employeeRepository;
+		this.employeeRepository = employeeRepository;
-    }
+	}
 
+	public LoginUser doLogin(LoginInfo loginInfo) {
+		return employeeRepository
+				.findByMailAddressAndPassword(loginInfo.getMailAddress(), loginInfo.getPassword())
+				.orElse(new EmployeeEntity())
+				.createLoginUser();
 
-    /**
+	}
-     * メールアドレス、パスワードでログイン判定を行う
-     *
-     * @param loginInfo ログインを試みるアカウント
-     * @return loginUser のインスタンス
-     */
-    public LoginUser doLogin(LoginInfo loginInfo) {
-        // ログイン情報を元にログインユーザーを取得
-        return employeeRepository
-                .findByMailAddressAndPassword(loginInfo.getMailAddress(), loginInfo.getPassword())
-                .orElse(new EmployeeEntity())
-                .createLoginUser();
 
-    }
+	public boolean canLogin(LoginInfo loginInfo) {
+		return employeeRepository
+				.findByMailAddressAndPassword(loginInfo.getMailAddress(), loginInfo.getPassword())
+				.isPresent();
 
-    /**
+	}
-     * メールアドレス、パスワードでログイン判定を行う
-     *
-     * @param loginInfo ログインを試みるアカウント
-     * @return loginUser のインスタンス
-     */
-    public boolean canLogin(LoginInfo loginInfo) {
-        // ログイン情報を元にログインユーザーを取得
-        return employeeRepository
-                .findByMailAddressAndPassword(loginInfo.getMailAddress(), loginInfo.getPassword())
-                .isPresent();
-
-    }
 }

src/main/java/com/example/rhizome/app/domain/service/impl/RegisterEmployeeImpl.java

@@ -1,34 +1,26 @@
 package com.example.rhizome.app.domain.service.impl;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.service.RegisterEmployee;
 import com.example.rhizome.app.infra.entity.EmployeeEntity;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-/**
- * Employee テーブルの登録系の機能を集約させるサービスクラスです。
- */
 @Service
 @Transactional
 public class RegisterEmployeeImpl implements RegisterEmployee {
 
-    EmployeeRepository employeeRepository;
+	EmployeeRepository employeeRepository;
 
-    @Autowired
+	@Autowired
-    public RegisterEmployeeImpl(EmployeeRepository employeeRepository) {
+	public RegisterEmployeeImpl(EmployeeRepository employeeRepository) {
-        this.employeeRepository = employeeRepository;
+		this.employeeRepository = employeeRepository;
-    }
+	}
 
-    /**
+	public void registerEmployee(Employee employee) {
-     * employee インスタンスの内容を登録する
+		employeeRepository.save(EmployeeEntity.convertFrom(employee));
-     *
+	}
-     * @param employee 登録対象のデータ
-     */
-    public void registerEmployee(Employee employee) {
-        employeeRepository.save(EmployeeEntity.convertFrom(employee));
-    }
 }

src/main/java/com/example/rhizome/app/domain/service/impl/SearchDepartmentImpl.java

@@ -1,82 +1,75 @@
 package com.example.rhizome.app.domain.service.impl;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.SearchConditionDepartment;
 import com.example.rhizome.app.domain.service.SearchDepartment;
 import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import com.example.rhizome.app.infra.repository.DepartmentRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
-/**
- * 部署情報検索系の機能を集約させるサービスクラスです。
- */
 @Service
 @Transactional
 public class SearchDepartmentImpl implements SearchDepartment {
 
-    DepartmentRepository departmentRepository;
+	DepartmentRepository departmentRepository;
 
-    /**
+	@Autowired
-     * コンストラクタ
+	public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
-     *
+		this.departmentRepository = departmentRepository;
-     * @param departmentRepository DI対象
+	}
-     */
-    @Autowired
-    public SearchDepartmentImpl(DepartmentRepository departmentRepository) {
-        this.departmentRepository = departmentRepository;
-    }
 
-    /**
+	public List<Department> selectAll() {
-     * 部署情報を全件取得する
+		return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
-     *
+	}
-     * @return 取得した部署情報レコード全件
-     */
-    public List<Department> selectAll() {
-        return DepartmentEntity.createDepartmentList(departmentRepository.findAll());
-    }
 
-    /**
+	public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
-     * searchConditionDepartment の情報を元に Department のレコードを取得
+		return DepartmentEntity
-     *
+				.createDepartmentList(
-     * @param searchConditionDepartment 検索条件
+						departmentRepository.findAll(Specification
-     * @return 検索結果のレコード
+								.where(DepartmentRepository
-     */
+										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-    public List<Department> searchBy(SearchConditionDepartment searchConditionDepartment) {
+								.and(DepartmentRepository
-        // 動的に検索条件を絞り込む
+										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
-        // Specification は Criteria API の Predicate をラップしたもの
-        return DepartmentEntity
-                .createDepartmentList(
-                        departmentRepository.findAll(Specification
-                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-                                .and(DepartmentRepository.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))
-                        )
-                );
 
-    }
+	}
 
-    /**
+	public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
-     * searchConditionDepartment の情報を元に Department のレコードを取得
+		return DepartmentEntity
-     * 部分一致検索
+				.createDepartmentList(
-     *
+						departmentRepository.findAll(Specification
-     * @param searchConditionDepartment 検索条件
+								.where(DepartmentRepository
-     * @return 検索結果のレコード
+										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
-     */
+								.and(DepartmentRepository
-    public List<Department> searchByWithLike(SearchConditionDepartment searchConditionDepartment) {
+										.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))));
-        // 動的に検索条件を絞り込む
+
-        // Specification は Criteria API の Predicate をラップしたもの
+	}
-        return DepartmentEntity
+
-                .createDepartmentList(
+	@Override
-                        departmentRepository.findAll(Specification
+	public List<Department> searchByDepartmentName(SearchConditionDepartment searchConditionDepartment) {
-                                .where(DepartmentRepository.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))
+
-                                .and(DepartmentRepository.nmDepartmentLike(searchConditionDepartment.getNmDepartment()))
+		return DepartmentEntity
-                        )
+				.createDepartmentList(
-                );
+						departmentRepository.findAll(Specification
+								.where(DepartmentRepository
+										.nmDepartmentEqual(searchConditionDepartment.getNmDepartment()))));
+
+	}
+
+	@Override
+	public List<Department> searchByDepartmentId(SearchConditionDepartment searchConditionDepartment) {
+
+		return DepartmentEntity
+				.createDepartmentList(
+						departmentRepository.findAll(Specification
+								.where(DepartmentRepository
+										.idDepartmentEqual(searchConditionDepartment.getIdDepartment()))));
+
+	}
 
-    }
 }

src/main/java/com/example/rhizome/app/domain/service/impl/SearchEmployeeImpl.java

@@ -1,70 +1,43 @@
 package com.example.rhizome.app.domain.service.impl;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.service.SearchEmployee;
 import com.example.rhizome.app.infra.entity.EmployeeEntity;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
-/**
- * Employee テーブル検索系の機能を集約させるサービスクラスです。
- */
 @Service
 @Transactional
 public class SearchEmployeeImpl implements SearchEmployee {
 
-    EmployeeRepository employeeRepository;
+	EmployeeRepository employeeRepository;
 
-    @Autowired
+	@Autowired
-    public SearchEmployeeImpl(EmployeeRepository employeeRepository) {
+	public SearchEmployeeImpl(EmployeeRepository employeeRepository) {
-        this.employeeRepository = employeeRepository;
+		this.employeeRepository = employeeRepository;
-    }
+	}
 
+	public List<Employee> searchEmployee(String mailAddress) {
+		return EmployeeEntity.createEmployeeList(employeeRepository.findByMailAddress(mailAddress).stream().toList());
+	}
 
-    /**
+	public LoginUser searchLoginUser(String mailAddress) {
-     * mailAddress を元に Employee Table を検索します。
+		return employeeRepository.findByMailAddress(mailAddress).orElse(new EmployeeEntity()).createLoginUser();
-     *
+	}
-     * @param mailAddress 検索対象の mailAddress
-     * @return Table から取得したレコードの情報
-     */
-    public List<Employee> searchEmployee(String mailAddress) {
-        return EmployeeEntity.createEmployeeList(employeeRepository.findByMailAddress(mailAddress).stream().toList());
-    }
 
-    /**
+	public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
-     * mailAddress を元に ログイン者の情報 を検索します。
+		return EmployeeEntity
-     *
+				.createEmployee(employeeRepository.findByIdEmployee(idEmployee).orElse(new EmployeeEntity()));
-     * @param mailAddress 検索対象の mailAddress
+	}
-     * @return login者の情報
-     */
-    public LoginUser searchLoginUser(String mailAddress) {
-        return employeeRepository.findByMailAddress(mailAddress).orElse(new EmployeeEntity()).createLoginUser();
-    }
 
-    /**
+	@Override
-     * idEmployee を元に Employee Table を検索します。
+	public List<Employee> searchEmployeeByIdDepartment(Integer idDepartment) {
-     *
+		return EmployeeEntity.createEmployeeList(employeeRepository.findByIdDepartment(idDepartment));
-     * @param idEmployee 検索対象の idEmployee
+	}
-     * @return Table から取得したレコードの情報
-     */
-    public Employee searchEmployeeByIdEmployee(Integer idEmployee) {
-        return EmployeeEntity.createEmployee(employeeRepository.findByIdEmployee(idEmployee).orElse(new EmployeeEntity()));
-    }
-
-
-    /**
-     * idDepartment を元に Employee Table を検索します。
-     *
-     * @param idDepartment 部署ID
-     * @return Table から取得したレコードの情報
-     */
-    @Override
-    public List<Employee> searchEmployeeByIdDepartment(Integer idDepartment) {
-        return EmployeeEntity.createEmployeeList(employeeRepository.findByIdDepartment(idDepartment));
-    }
 }

src/main/java/com/example/rhizome/app/domain/service/impl/SearchEmployeeInfoImpl.java

@@ -1,62 +1,45 @@
 package com.example.rhizome.app.domain.service.impl;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.example.rhizome.app.domain.model.EmployeeInfo;
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
 import com.example.rhizome.app.domain.service.SearchEmployeeInfo;
 import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
 import com.example.rhizome.app.infra.repository.EmployeeInfoRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
-/**
- * SearchEmployeeInfoImpl (employee join department) 検索系の機能を集約させるサービスクラスです
- */
 @Service
 @Transactional
 public class SearchEmployeeInfoImpl implements SearchEmployeeInfo {
 
-    EmployeeInfoRepository employeeInfoRepository;
+	EmployeeInfoRepository employeeInfoRepository;
 
-    @Autowired
+	@Autowired
-    public SearchEmployeeInfoImpl(EmployeeInfoRepository employeeInfoRepository) {
+	public SearchEmployeeInfoImpl(EmployeeInfoRepository employeeInfoRepository) {
-        this.employeeInfoRepository = employeeInfoRepository;
+		this.employeeInfoRepository = employeeInfoRepository;
-    }
+	}
 
+	public List<EmployeeInfo> selectAll() {
 
-    /**
+		return EmployeeDepartmentEntity.createEmployeeInfoList(employeeInfoRepository.findAll());
-     * EmployeeInfo (employee join department) のレコードを全件取得
-     *
-     * @return 取得したレコード全件
-     */
-    public List<EmployeeInfo> selectAll() {
 
-        return EmployeeDepartmentEntity.createEmployeeInfoList(employeeInfoRepository.findAll());
+	}
 
-    }
+	public List<EmployeeInfo> searchBy(SearchConditionEmployee searchConditionEmployee) {
+		return EmployeeDepartmentEntity
+				.createEmployeeInfoList(
+						employeeInfoRepository.findAll(Specification
+								.where(EmployeeInfoRepository.idEmployeeEqual(searchConditionEmployee.getIdEmployee()))
+								.and(EmployeeInfoRepository.nmEmployeeEqual(searchConditionEmployee.getNmEmployee()))
+								.and(EmployeeInfoRepository.knEmployeeEqual(searchConditionEmployee.getKnEmployee()))
+								.and(EmployeeInfoRepository.mailAddressEqual(searchConditionEmployee.getMailAddress()))
+								.and(EmployeeInfoRepository
+										.idDepartmentEqual(searchConditionEmployee.getIdDepartment()))));
 
-    /**
+	}
-     * SearchConditionEmployee の情報を元に EmployeeInfo (employee join department) のレコードを取得
-     *
-     * @param searchConditionEmployee 検索条件
-     * @return 検索結果のレコードリスト
-     */
-    public List<EmployeeInfo> searchBy(SearchConditionEmployee searchConditionEmployee) {
-        // 動的に検索条件を絞り込む
-        // Specification は Criteria API の Predicate をラップしたもの
-        return EmployeeDepartmentEntity
-                .createEmployeeInfoList(
-                        employeeInfoRepository.findAll(Specification
-                                .where(EmployeeInfoRepository.idEmployeeEqual(searchConditionEmployee.getIdEmployee()))
-                                .and(EmployeeInfoRepository.nmEmployeeEqual(searchConditionEmployee.getNmEmployee()))
-                                .and(EmployeeInfoRepository.knEmployeeEqual(searchConditionEmployee.getKnEmployee()))
-                                .and(EmployeeInfoRepository.mailAddressEqual(searchConditionEmployee.getMailAddress()))
-                                .and(EmployeeInfoRepository.idDepartmentEqual(searchConditionEmployee.getIdDepartment()))
-                        )
-                );
-
-    }
 }

src/main/java/com/example/rhizome/app/domain/service/impl/UpdateEmployeeImpl.java

@@ -1,60 +1,42 @@
 package com.example.rhizome.app.domain.service.impl;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.service.UpdateEmployee;
 import com.example.rhizome.app.infra.entity.EmployeeEntity;
 import com.example.rhizome.app.infra.repository.EmployeeRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-/**
- * employee の更新系の機能を集約させるサービスクラスです。
- */
 @Service
 @Transactional
 public class UpdateEmployeeImpl implements UpdateEmployee {
 
-    EmployeeRepository employeeRepository;
+	EmployeeRepository employeeRepository;
 
-    @Autowired
+	@Autowired
-    public UpdateEmployeeImpl(EmployeeRepository employeeRepository) {
+	public UpdateEmployeeImpl(EmployeeRepository employeeRepository) {
-        this.employeeRepository = employeeRepository;
+		this.employeeRepository = employeeRepository;
-    }
+	}
 
-    /**
+	public void updateEmployee(Employee beforeEmployee, Employee updateEmployee) {
-     * employee の情報を元に employee table のレコードを更新する
-     *
-     * @param beforeEmployee 更新前のデータ
-     * @param updateEmployee 更新後のデータ
-     */
-    public void updateEmployee(Employee beforeEmployee, Employee updateEmployee) {
 
-        employeeRepository.save(EmployeeEntity.convertFrom(mergeEmployee(beforeEmployee, updateEmployee)));
+		employeeRepository.save(EmployeeEntity.convertFrom(mergeEmployee(beforeEmployee, updateEmployee)));
 
-    }
+	}
 
-    /**
+	private Employee mergeEmployee(Employee beforeEmployee, Employee updateEmployee) {
-     * 更新前のデータと更新対象のデータをマージする
+		return new Employee(
-     *
+				updateEmployee.getIdEmployee(),
-     * @param beforeEmployee 更新前のデータ
+				updateEmployee.getNmEmployee(),
-     * @param updateEmployee 更新対象のデータ
+				updateEmployee.getKnEmployee(),
-     * @return マージしたデータ
+				updateEmployee.getMailAddress(),
-     */
+				updateEmployee.getPassword().isBlank() ? beforeEmployee.getPassword() : updateEmployee.getPassword(),
-    private Employee mergeEmployee(Employee beforeEmployee, Employee updateEmployee) {
+				updateEmployee.getAdminAuth() == null ? beforeEmployee.getAdminAuth() : updateEmployee.getAdminAuth(),
-        // 更新対象のデータのパスワードが空文字の場合は、更新前のパスワードを使用する
+				updateEmployee.getIdDepartment() == null ? beforeEmployee.getIdDepartment()
-        // 更新対象のデータの管理者権限が null の場合は、更新前の管理者権限を使用する
+						: updateEmployee.getIdDepartment());
-        // 更新対象のデータの部署IDが null の場合は、更新前の部署IDを使用する
-        return new Employee(
-                updateEmployee.getIdEmployee(),
-                updateEmployee.getNmEmployee(),
-                updateEmployee.getKnEmployee(),
-                updateEmployee.getMailAddress(),
-                updateEmployee.getPassword().isBlank() ? beforeEmployee.getPassword() : updateEmployee.getPassword(),
-                updateEmployee.getAdminAuth() == null ? beforeEmployee.getAdminAuth() : updateEmployee.getAdminAuth(),
-                updateEmployee.getIdDepartment() == null ? beforeEmployee.getIdDepartment() : updateEmployee.getIdDepartment()
-        );
 
-    }
+	}
 
 }

src/main/java/com/example/rhizome/app/infra/entity/DepartmentEntity.java

@@ -1,25 +1,20 @@
-/*
- * Department.java
- *   作成	IT-College	2016
- *------------------------------------------------------------
- * Copyright(c) Rhizome Inc. All Rights Reserved.
- */
 package com.example.rhizome.app.infra.entity;
 
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.example.rhizome.app.domain.model.Department;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Department テーブルの Entity
- *
- * @author IT-College
- */
 @Entity
 @Table(name = "department")
 @Data
@@ -27,46 +22,26 @@ import java.util.List;
 @AllArgsConstructor
 public class DepartmentEntity {
 
-    /**
+	@Id
-     * 部署ID
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
-     */
+	@Column(name = "id_department", nullable = false)
-    @Id
+	private Integer idDepartment;
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "nm_department", nullable = false)
-    @Column(name = "id_department", nullable = false)
+	private String nmDepartment;
-    private Integer idDepartment;
-    /**
-     * 部署名
-     */
-    @Column(name = "nm_department", nullable = false)
-    private String nmDepartment;
 
-    /**
+	public static List<Department> createDepartmentList(List<DepartmentEntity> departmentEntityList) {
-     * DepartmentEntity（DataAccess層依存）から Department（BusinessLogic層依存型）に変換します。
-     *
-     * @param departmentEntityList department Table のリスト
-     * @return List<Department> リスト
-     */
-    public static List<Department> createDepartmentList(List<DepartmentEntity> departmentEntityList) {
 
-        // Stream API を利用するとこうなります。
+		return departmentEntityList
-        return departmentEntityList
+				.stream()
-                .stream()
+				.map(departmentEntity -> new Department(
-                .map(departmentEntity -> new Department(
+						departmentEntity.getIdDepartment(),
-                        departmentEntity.getIdDepartment(),
+						departmentEntity.getNmDepartment()))
-                        departmentEntity.getNmDepartment()
+				.toList();
-                )).toList();
+	}
-    }
 
-    /**
+	public static DepartmentEntity convertFrom(Department department) {
-     * Department（BusinessLogic層依存型） から DepartmentEntity（DataAccess層依存）に変換します。
+		return new DepartmentEntity(
-     *
+				department.getIdDepartment(),
-     * @param department department モデルの値
+				department.getNmDepartment());
-     * @return DepartmentEntity に変換したインスタンス
+	}
-     */
-    public static DepartmentEntity convertFrom(Department department) {
-        return new DepartmentEntity(
-                department.getIdDepartment(),
-                department.getNmDepartment()
-        );
-    }
 }

src/main/java/com/example/rhizome/app/infra/entity/EmployeeDepartmentEntity.java

@@ -1,118 +1,86 @@
 package com.example.rhizome.app.infra.entity;
 
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedEntityGraph;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+
 import com.example.rhizome.app.domain.model.Department;
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.EmployeeInfo;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
 
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Employee + Department の Join 情報を保持するEntity
- *
- * @author IT-College
- */
 @Entity
 @Table(name = "employee")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@NamedEntityGraph(
+@NamedEntityGraph(name = "employee_with_department", includeAllAttributes = true)
-        name = "employee_with_department",
-        includeAllAttributes = true
-)
 public class EmployeeDepartmentEntity {
 
-    /**
+	@Id
-     * 社員ID
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
-     */
+	@Column(name = "id_employee", nullable = false)
-    @Id
+	private Integer idEmployee;
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id_employee", nullable = false)
-    private Integer idEmployee;
 
-    /**
+	@Column(name = "nm_employee", nullable = false)
-     * 社員名
+	private String nmEmployee;
-     */
-    @Column(name = "nm_employee", nullable = false)
-    private String nmEmployee;
 
-    /**
+	@Column(name = "kn_employee", nullable = false)
-     * 社員名カナ
+	private String knEmployee;
-     */
-    @Column(name = "kn_employee", nullable = false)
-    private String knEmployee;
 
-    /**
+	@Column(name = "mail_address", nullable = false)
-     * メールアドレス
+	private String mailAddress;
-     */
-    @Column(name = "mail_address", nullable = false)
-    private String mailAddress;
 
-    /**
+	@Column(name = "password", nullable = false)
-     * パスワード
+	private String password;
-     */
-    @Column(name = "password", nullable = false)
-    private String password;
 
-    /**
+	@Column(name = "admin_auth", nullable = false)
-     * 管理者権限
+	private Integer adminAuth;
-     */
-    @Column(name = "admin_auth", nullable = false)
-    private Integer adminAuth;
 
-    @ManyToOne
+	@ManyToOne
-    @JoinColumn(name = "id_department", referencedColumnName = "id_department", insertable = false, updatable = false)
+	@JoinColumn(name = "id_department", referencedColumnName = "id_department", insertable = false, updatable = false)
-    @Fetch(FetchMode.JOIN)
+	@Fetch(FetchMode.JOIN)
-    private DepartmentEntity department;
+	private DepartmentEntity department;
 
-    /**
+	public static EmployeeInfo createEmployeeInfo(EmployeeDepartmentEntity employeeDepartmentEntity) {
-     * EmployeeDepartmentEntity（DataAccess層依存） を EmployeeInfo（BusinessLogic層依存） に変換します。
-     *
-     * @param employeeDepartmentEntity 　EmployeeDepartmentEntity のインスタンス
-     * @return EmployeeInfo のインスタンス
-     */
-    public static EmployeeInfo createEmployeeInfo(EmployeeDepartmentEntity employeeDepartmentEntity) {
 
-        // コンストラクタを使って書くとSetterを使用するより簡略化出来ます。
+		return new EmployeeInfo(
-        // 混乱してしまう人は落ち着いて EmployeeInfo のフィールドを見に行って、
+				new Employee(
-        // どうしてこの書き方が出来るのかを理解できる様になりましょう。
+						employeeDepartmentEntity.getIdEmployee(),
-        return new EmployeeInfo(
+						employeeDepartmentEntity.getNmEmployee(),
-                new Employee(
+						employeeDepartmentEntity.getKnEmployee(),
-                        employeeDepartmentEntity.getIdEmployee(),
+						employeeDepartmentEntity.getMailAddress(),
-                        employeeDepartmentEntity.getNmEmployee(),
+						employeeDepartmentEntity.getPassword(),
-                        employeeDepartmentEntity.getKnEmployee(),
+						employeeDepartmentEntity.getAdminAuth(),
-                        employeeDepartmentEntity.getMailAddress(),
+						employeeDepartmentEntity.getDepartment() == null ? null
-                        employeeDepartmentEntity.getPassword(),
+								: employeeDepartmentEntity.getDepartment().getIdDepartment()),
-                        employeeDepartmentEntity.getAdminAuth(),
+				new Department(
-                        employeeDepartmentEntity.getDepartment() == null ? null : employeeDepartmentEntity.getDepartment().getIdDepartment()
+						employeeDepartmentEntity.getDepartment() == null ? null
-                ),
+								: employeeDepartmentEntity.getDepartment().getIdDepartment(),
-                new Department(
+						employeeDepartmentEntity.getDepartment() == null ? null
-                        employeeDepartmentEntity.getDepartment() == null ? null : employeeDepartmentEntity.getDepartment().getIdDepartment(),
+								: employeeDepartmentEntity.getDepartment().getNmDepartment()));
-                        employeeDepartmentEntity.getDepartment() == null ? null : employeeDepartmentEntity.getDepartment().getNmDepartment()
-                )
-        );
 
-    }
+	}
 
-    /**
+	public static List<EmployeeInfo> createEmployeeInfoList(
-     * EmployeeDepartmentEntity（DataAccess層依存） を EmployeeInfo（BusinessLogic層依存） に変換します。
+			List<EmployeeDepartmentEntity> employeeDepartmentEntityList) {
-     * （リスト版）
-     *
-     * @param employeeDepartmentEntityList EmployeeDepartmentEntity インスタンスのリスト
-     * @return EmployeeInfo インスタンスのリスト
-     */
-    public static List<EmployeeInfo> createEmployeeInfoList(List<EmployeeDepartmentEntity> employeeDepartmentEntityList) {
 
-        // StreamAPI を使うとこうなります。
+		return employeeDepartmentEntityList.stream().map(EmployeeDepartmentEntity::createEmployeeInfo).toList();
-        return employeeDepartmentEntityList.stream().map(EmployeeDepartmentEntity::createEmployeeInfo).toList();
-
-    }
 
+	}
 
 }

src/main/java/com/example/rhizome/app/infra/entity/EmployeeEntity.java

@@ -1,27 +1,22 @@
-/*
- * Employee.java
- *   作成	IT-College	2016
- *------------------------------------------------------------
- * Copyright(c) Rhizome Inc. All Rights Reserved.
- */
 package com.example.rhizome.app.infra.entity;
 
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.LoginUser;
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * EmployeeテーブルのEntity
- *
- * @author IT-College
- */
 @Entity
 @Table(name = "employee")
 @Data
@@ -29,146 +24,77 @@ import java.util.List;
 @AllArgsConstructor
 public class EmployeeEntity {
 
-    /**
+	@Id
-     * 社員ID
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
-     */
+	@Column(name = "id_employee", nullable = false)
-    @Id
+	private Integer idEmployee;
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id_employee", nullable = false)
-    private Integer idEmployee;
 
-    /**
+	@Column(name = "nm_employee", nullable = false)
-     * 社員名
+	private String nmEmployee;
-     */
-    @Column(name = "nm_employee", nullable = false)
-    private String nmEmployee;
 
-    /**
+	@Column(name = "kn_employee", nullable = false)
-     * 社員名カナ
+	private String knEmployee;
-     */
-    @Column(name = "kn_employee", nullable = false)
-    private String knEmployee;
 
-    /**
+	@Column(name = "mail_address", nullable = false)
-     * メールアドレス
+	private String mailAddress;
-     */
-    @Column(name = "mail_address", nullable = false)
-    private String mailAddress;
 
-    /**
+	@Column(name = "password", nullable = false)
-     * パスワード
+	private String password;
-     */
-    @Column(name = "password", nullable = false)
-    private String password;
 
-    /**
+	@Column(name = "admin_auth", nullable = false)
-     * 管理者権限
+	private Integer adminAuth;
-     */
-    @Column(name = "admin_auth", nullable = false)
-    private Integer adminAuth;
 
-    /**
+	@Column(name = "id_department", nullable = false)
-     * 部署ID
+	private Integer idDepartment;
-     */
-    @Column(name = "id_department", nullable = false)
-    private Integer idDepartment;
 
+	public static EmployeeEntity convertFrom(Employee employee) {
+		return new EmployeeEntity(
+				employee.getIdEmployee(),
+				employee.getNmEmployee(),
+				employee.getKnEmployee(),
+				employee.getMailAddress(),
+				employee.getPassword(),
+				employee.getAdminAuth(),
+				employee.getIdDepartment());
+	}
 
-    /**
+	public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) {
-     * Employee（BusinessLogic 依存）を EmployeeEntity（DataAccess層依存）に変換します。
+		EmployeeEntity employeeEntity = new EmployeeEntity();
-     *
-     * @param employee Employee Table の中身
-     * @return EmployeeEntity のインスタンス（１レコード分）
-     */
-    public static EmployeeEntity convertFrom(Employee employee) {
-        // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
-        return new EmployeeEntity(
-                employee.getIdEmployee(),
-                employee.getNmEmployee(),
-                employee.getKnEmployee(),
-                employee.getMailAddress(),
-                employee.getPassword(),
-                employee.getAdminAuth(),
-                employee.getIdDepartment()
-        );
-    }
 
-    /**
+		employeeEntity.setIdEmployee(searchConditionEmployee.getIdEmployee());
-     * SearchConditionEmployee（BusinessLogic 依存）を EmployeeEntity（DataAccess層依存）に変換します。
+		employeeEntity.setNmEmployee(searchConditionEmployee.getNmEmployee());
-     * (コンストラクタを使用せず、Setterを利用したパターン）
+		employeeEntity.setKnEmployee(searchConditionEmployee.getKnEmployee());
-     *
+		employeeEntity.setMailAddress(searchConditionEmployee.getMailAddress());
-     * @param searchConditionEmployee 検索条件
+		employeeEntity.setIdDepartment(searchConditionEmployee.getIdDepartment());
-     * @return EmployeeEntity のインスタンス（１レコード分）
-     */
-    public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) {
-        EmployeeEntity employeeEntity = new EmployeeEntity();
 
-        employeeEntity.setIdEmployee(searchConditionEmployee.getIdEmployee());
+		return employeeEntity;
-        employeeEntity.setNmEmployee(searchConditionEmployee.getNmEmployee());
-        employeeEntity.setKnEmployee(searchConditionEmployee.getKnEmployee());
-        employeeEntity.setMailAddress(searchConditionEmployee.getMailAddress());
-        employeeEntity.setIdDepartment(searchConditionEmployee.getIdDepartment());
 
+	}
 
-        return employeeEntity;
+	public static Employee createEmployee(EmployeeEntity employeeEntity) {
+		return new Employee(
+				employeeEntity.getIdEmployee(),
+				employeeEntity.getNmEmployee(),
+				employeeEntity.getKnEmployee(),
+				employeeEntity.getMailAddress(),
+				employeeEntity.getPassword(),
+				employeeEntity.getAdminAuth(),
+				employeeEntity.getIdDepartment());
+	}
 
-    }
+	public static List<Employee> createEmployeeList(List<EmployeeEntity> employeeEntityList) {
+		return employeeEntityList.stream().map(EmployeeEntity::createEmployee).toList();
+	}
 
-    /**
+	public LoginUser createLoginUser() {
-     * EmployeeEntity（DataAccess層依存）から Employee (BusinessLogic層依存型）に変換します。
+		return new LoginUser(
-     *
+				getIdEmployee(),
-     * @param employeeEntity Employee Table のインスタンス
+				getNmEmployee(),
-     * @return employee インスタンス
+				getKnEmployee(),
-     */
+				getMailAddress(),
-    public static Employee createEmployee(EmployeeEntity employeeEntity) {
+				getPassword(),
-        // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
+				getAdminAuth(),
-        return new Employee(
+				getIdDepartment());
-                employeeEntity.getIdEmployee(),
+	}
-                employeeEntity.getNmEmployee(),
-                employeeEntity.getKnEmployee(),
-                employeeEntity.getMailAddress(),
-                employeeEntity.getPassword(),
-                employeeEntity.getAdminAuth(),
-                employeeEntity.getIdDepartment()
-        );
-    }
-
-    /**
-     * EmployeeEntity（DataAccess層依存） から Employee (BusinessLogic層依存型）に変換します。（リスト版）
-     *
-     * @param employeeEntityList EmployeeEntity インスタンスのリスト
-     * @return Employee インスタンスのリスト
-     */
-    public static List<Employee> createEmployeeList(List<EmployeeEntity> employeeEntityList) {
-        /* 従来の書き方
-        List<Employee> employeeList = new ArrayList<>();
-        for(EmployeeEntity employeeEntity:employeeEntityList){
-            Employee employee = EmployeeEntity.createEmployee(employeeEntity);
-            employeeList.add(employee);
-        }
-        return employeeList;
-        */
-
-        // Stream APIを使用すると1行で書けます。
-        return employeeEntityList.stream().map(EmployeeEntity::createEmployee).toList();
-    }
-
-    /**
-     * EmployeeEntity（DataAccess層依存） から LoginUser (BusinessLogic層依存型）情報を作成します。
-     *
-     * @return loginUser （ログイン者の情報） インスタンス
-     */
-    public LoginUser createLoginUser() {
-        // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。
-        return new LoginUser(
-                getIdEmployee(),
-                getNmEmployee(),
-                getKnEmployee(),
-                getMailAddress(),
-                getPassword(),
-                getAdminAuth(),
-                getIdDepartment()
-        );
-    }
 
 }

src/main/java/com/example/rhizome/app/infra/repository/DepartmentRepository.java

@@ -1,50 +1,31 @@
 package com.example.rhizome.app.infra.repository;
 
-import com.example.rhizome.app.infra.entity.DepartmentEntity;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
+import com.example.rhizome.app.infra.entity.DepartmentEntity;
 
-/**
- * Specification:
- * 関数型インターフェースです。
- * JPAの一部として提供されていて、エンティティの情報を元に動的にクエリを生成し、DBからデータを取得します。
- * 使い方：
- * toPredicate をOverrideして使います。
- * パラメータ：
- * Root<T>：ルートエンティティを指します。<T>に指定したエンティティ（今回はDepartmentEntity）を用いてメンバにアクセスします。
- * CriteriaQuery<\?>：サブクエリを作成する際に使用します。※今回は使用しません
- * CriteriaBuilder:条件式（Where句以降の条件）の部分のクエリを作るためのビルダーです。
- * 戻り値はクエリを格納しているPredicateオブジェクトとなります。
- */
 @Repository
-public interface DepartmentRepository extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
+public interface DepartmentRepository
+		extends JpaRepository<DepartmentEntity, Integer>, JpaSpecificationExecutor<DepartmentEntity> {
 
+	static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
+		return idDepartment == null ? null
+				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
+						.equal(root.get("idDepartment"), idDepartment);
+	}
 
-    static Specification<DepartmentEntity> idDepartmentEqual(Integer idDepartment) {
+	static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
-        return idDepartment == null ?
+		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
-                null :
+				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
-                // 戻り値の型 Specification<DepartmentEntity> にキャスト
+						.like(root.get("nmDepartment"), nmDepartment);
-                (Specification<DepartmentEntity>)
+	}
-                        // ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idDepartment' = idDepartment(変数)"
-                        // を作成している
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idDepartment"), idDepartment);
-    }
 
-    static Specification<DepartmentEntity> nmDepartmentEqual(String nmDepartment) {
+	static Specification<DepartmentEntity> nmDepartmentLike(String nmDepartment) {
-        return (nmDepartment == null || nmDepartment.isEmpty()) ?
+		return (nmDepartment == null || nmDepartment.isEmpty()) ? null
-                null :
+				: (Specification<DepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
-                (Specification<DepartmentEntity>)
+						.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), nmDepartment);
+	}
-    }
-
-
-    static Specification<DepartmentEntity> nmDepartmentLike(String nmDepartment) {
-        return (nmDepartment == null || nmDepartment.isEmpty()) ?
-                null :
-                (Specification<DepartmentEntity>)
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmDepartment"), "%" + nmDepartment + "%");
-    }
 }

src/main/java/com/example/rhizome/app/infra/repository/EmployeeInfoRepository.java

@@ -1,61 +1,42 @@
 package com.example.rhizome.app.infra.repository;
 
-import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-/**
+import com.example.rhizome.app.infra.entity.EmployeeDepartmentEntity;
- * ワンポイント情報（ここで登場する関数型インターフェース Specification について解説します）
+
- * Specification:
- * 関数型インターフェースです。
- * JPAの一部として提供されていて、エンティティの情報を元に動的にクエリを生成し、DBからデータを取得します。
- * 使い方：
- * toPredicate をOverrideして使います。
- * パラメータ：
- * Root<T>：ルートエンティティを指します。<T>に指定したエンティティ（今回はDepartmentEntity）を用いてメンバにアクセスします。
- * CriteriaQuery<\?>：サブクエリを作成する際に使用します。※今回は使用しません
- * CriteriaBuilder:条件式（Where句以降の条件）の部分のクエリを作るためのビルダーです。
- * 戻り値はクエリを格納しているPredicateオブジェクトとなります。
- */
 @Repository
-public interface EmployeeInfoRepository extends JpaRepository<EmployeeDepartmentEntity, Integer>, JpaSpecificationExecutor<EmployeeDepartmentEntity> {
+public interface EmployeeInfoRepository
+		extends JpaRepository<EmployeeDepartmentEntity, Integer>, JpaSpecificationExecutor<EmployeeDepartmentEntity> {
 
-    static Specification<EmployeeDepartmentEntity> idEmployeeEqual(Integer idEmployee) {
+	static Specification<EmployeeDepartmentEntity> idEmployeeEqual(Integer idEmployee) {
-        return idEmployee == null ?
+		return idEmployee == null ? null
-                null :
+				: (Specification<EmployeeDepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
-                // 戻り値の型 Specification<EmployeeDepartmentEntity> にキャスト
+						.equal(root.get("idEmployee"), idEmployee);
-                (Specification<EmployeeDepartmentEntity>)
+	}
-                        // ラムダ式で記載しているが書いてあることは criteriaBuilder を使って Where句の後の "'idEmployee' = idEmployee(変数)"
-                        // を作成している
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.equal(root.get("idEmployee"), idEmployee);
-    }
 
-    static Specification<EmployeeDepartmentEntity> nmEmployeeEqual(String nmEmployee) {
+	static Specification<EmployeeDepartmentEntity> nmEmployeeEqual(String nmEmployee) {
-        return (nmEmployee == null || nmEmployee.isEmpty()) ?
+		return (nmEmployee == null || nmEmployee.isEmpty()) ? null
-                null :
+				: (Specification<EmployeeDepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
-                (Specification<EmployeeDepartmentEntity>)
+						.like(root.get("nmEmployee"), "%" + nmEmployee + "%");
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("nmEmployee"), "%" + nmEmployee + "%");
+	}
-    }
 
-    static Specification<EmployeeDepartmentEntity> knEmployeeEqual(String knEmployee) {
+	static Specification<EmployeeDepartmentEntity> knEmployeeEqual(String knEmployee) {
-        return (knEmployee == null || knEmployee.isEmpty()) ?
+		return (knEmployee == null || knEmployee.isEmpty()) ? null
-                null :
+				: (Specification<EmployeeDepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
-                (Specification<EmployeeDepartmentEntity>)
+						.like(root.get("knEmployee"), "%" + knEmployee + "%");
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("knEmployee"), "%" + knEmployee + "%");
+	}
-    }
 
-    static Specification<EmployeeDepartmentEntity> mailAddressEqual(String mailAddress) {
+	static Specification<EmployeeDepartmentEntity> mailAddressEqual(String mailAddress) {
-        return (mailAddress == null || mailAddress.isEmpty()) ?
+		return (mailAddress == null || mailAddress.isEmpty()) ? null
-                null :
+				: (Specification<EmployeeDepartmentEntity>) (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder
-                (Specification<EmployeeDepartmentEntity>)
+						.like(root.get("mailAddress"), "%" + mailAddress + "%");
-                        (root, criteriaQuery, criteriaBuilder) -> criteriaBuilder.like(root.get("mailAddress"), "%" + mailAddress + "%");
+	}
-    }
 
-    static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer idDepartment) {
+	static Specification<EmployeeDepartmentEntity> idDepartmentEqual(Integer idDepartment) {
-        return (root, query, criteriaBuilder) ->
+		return (root, query, criteriaBuilder) -> idDepartment == null ? null
-                idDepartment == null ? null :
+				: criteriaBuilder.equal(root.join("department").get("idDepartment"), idDepartment);
-                        criteriaBuilder.equal(root.join("department").get("idDepartment"), idDepartment);
+	}
-    }
 }

src/main/java/com/example/rhizome/app/infra/repository/EmployeeRepository.java

@@ -1,28 +1,20 @@
 package com.example.rhizome.app.infra.repository;
 
-import com.example.rhizome.app.infra.entity.EmployeeEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
 import java.util.List;
 import java.util.Optional;
 
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.example.rhizome.app.infra.entity.EmployeeEntity;
+
 @Repository
 public interface EmployeeRepository extends JpaRepository<EmployeeEntity, Integer> {
-    Optional<EmployeeEntity> findByMailAddressAndPassword(String mailAddress, String password);
+	Optional<EmployeeEntity> findByMailAddressAndPassword(String mailAddress, String password);
 
-    /**
+	Optional<EmployeeEntity> findByMailAddress(String mail);
-     * メールアドレスで検索
-     **/
-    Optional<EmployeeEntity> findByMailAddress(String mail);
 
-    /**
+	Optional<EmployeeEntity> findByIdEmployee(Integer idEmployee);
-     * IDで検索
-     **/
-    Optional<EmployeeEntity> findByIdEmployee(Integer idEmployee);
 
-    /**
+	List<EmployeeEntity> findByIdDepartment(Integer idDepartment);
-     * IDで検索
-     **/
-    List<EmployeeEntity> findByIdDepartment(Integer idDepartment);
 }

src/main/java/com/example/rhizome/app/presentation/controller/DeleteEmployeeController.java

@@ -1,5 +1,19 @@
 package com.example.rhizome.app.presentation.controller;
 
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
@@ -12,110 +26,66 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.servlet.http.HttpSession;
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DELETE_EMPLOYEE;
-
-/**
- * 削除処理のコントロータ
- */
 @Controller
 public class DeleteEmployeeController {
 
-    // ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(DeleteEmployeeController.class.getName());
-    private final static Logger LOGGER = Logger.getLogger(DeleteEmployeeController.class.getName());
 
-    // エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    HttpSession httpSession;
+	HttpSession httpSession;
-    DeleteEmployee deleteEmployee;
+	DeleteEmployee deleteEmployee;
-    SearchDepartment searchDepartment;
+	SearchDepartment searchDepartment;
 
-    @Autowired
+	@Autowired
-    public DeleteEmployeeController(DeleteEmployee deleteEmployee, SearchDepartment searchDepartment, HttpSession httpSession) {
+	public DeleteEmployeeController(DeleteEmployee deleteEmployee, SearchDepartment searchDepartment,
-        this.httpSession = httpSession;
+			HttpSession httpSession) {
-        this.deleteEmployee = deleteEmployee;
+		this.httpSession = httpSession;
-        this.searchDepartment = searchDepartment;
+		this.deleteEmployee = deleteEmployee;
-    }
+		this.searchDepartment = searchDepartment;
+	}
 
-    /**
+	@PermissionCheck
-     * 削除処理のコントローラ
+	@SessionCheck
-     *
+	@RequestMapping(value = DELETE_EMPLOYEE, method = RequestMethod.POST)
-     * @param idEmployee 削除対象のemployeeId
+	public String deleteEmployee(@RequestParam("idEmployee") Integer idEmployee, Model model) {
-     * @param model      ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = DELETE_EMPLOYEE, method = RequestMethod.POST)
-    public String deleteEmployee(@RequestParam("idEmployee") Integer idEmployee, Model model) {
 
-        try {
+		try {
-            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			model.addAttribute(
-            // 作成した部署一覧をセット
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-            model.addAttribute(
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
-                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
-            );
 
-            // 削除処理実施
+			deleteExec(
-            deleteExec(
+					model,
-                    model,
+					idEmployee,
-                    idEmployee,
+					LoginUserForm.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER)));
-                    LoginUserForm.convertTo((LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER)));
 
-            // 検索画面に遷移
+			return "forward:" + TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO_FORM_EMPTY;
-            return "forward:" + TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO_FORM_EMPTY;
 
-        } catch (Exception e) {
+		} catch (Exception e) {
-            // ログイン情報の破棄
+			httpSession.invalidate();
-            httpSession.invalidate();
 
-            e.printStackTrace();
+			e.printStackTrace();
-            // エラーログ出力
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
-            // エラー画面遷移
+		}
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
+	}
-        }
-    }
 
-    /**
+	private void deleteExec(Model model, Integer idEmployee, LoginUser loginUser) {
-     * 削除処理実施
-     *
-     * @param model      ビューにデータを渡すためのコンテナ
-     * @param idEmployee 削除対象のemployeeId
-     * @param loginUser  ログインユーザー情報
-     */
-    private void deleteExec(Model model, Integer idEmployee, LoginUser loginUser) {
 
-        final String DELETE_TARGET_ID_CAN_NOT_DELETE = "ログイン者自身は削除出来ません。";
+		final String DELETE_TARGET_ID_CAN_NOT_DELETE = "ログイン者自身は削除出来ません。";
-        final String DELETE_COMPLETE = "削除しました。";
+		final String DELETE_COMPLETE = "削除しました。";
 
-        // ログインしている人が、削除対象かチェック
+		if (Objects.equals(loginUser.getIdEmployee(), idEmployee)) {
-        if (Objects.equals(loginUser.getIdEmployee(), idEmployee)) {
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-            // 削除対象だった場合
+					new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
-            // エラーメッセージをセット
+			return;
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DELETE_TARGET_ID_CAN_NOT_DELETE));
+		}
-            // 検索画面に遷移
-            return;
-        }
 
-        // 削除を実施
+		deleteEmployee.deleteEmployee(idEmployee);
-        deleteEmployee.deleteEmployee(idEmployee);
 
-        // 削除完了したメッセージをセット
+		model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
-        model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(DELETE_COMPLETE));
 
-    }
+	}
 }

src/main/java/com/example/rhizome/app/presentation/controller/IndexController.java

@@ -1,50 +1,42 @@
 package com.example.rhizome.app.presentation.controller;
 
-import com.example.rhizome.app.domain.service.impl.LoginImpl;
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+
-import com.example.rhizome.app.presentation.form.LoginUserForm;
+import javax.servlet.http.HttpSession;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import javax.servlet.http.HttpSession;
+import com.example.rhizome.app.domain.service.impl.LoginImpl;
-
+import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+import com.example.rhizome.app.presentation.form.LoginUserForm;
 
 @Controller
 public class IndexController {
 
-    HttpSession httpSession;
+	HttpSession httpSession;
 
-    @Autowired
+	@Autowired
-    public IndexController(HttpSession httpSession, LoginImpl loginImpl) {
+	public IndexController(HttpSession httpSession, LoginImpl loginImpl) {
-        this.httpSession = httpSession;
+		this.httpSession = httpSession;
-    }
+	}
 
-    @ModelAttribute
+	@ModelAttribute
-    public LoginUserForm loginUserForm() {
+	public LoginUserForm loginUserForm() {
-        return new LoginUserForm();
+		return new LoginUserForm();
-    }
+	}
 
-    /**
+	@RequestMapping(value = { INDEX_BLANK, INDEX_SLASH, INDEX_LOGIN })
-     * ログイン画面表示処理
+	public String index(Model model) {
-     *
+		if (httpSession != null) {
-     * @param model ビューにデータを渡すためのコンテナ
+			httpSession.invalidate();
-     * @return 遷移先の画面
+		}
-     */
-    @RequestMapping(value = {INDEX_BLANK, INDEX_SLASH, INDEX_LOGIN})
-    public String index(Model model) {
-        // セッション情報を破棄
-        if (httpSession != null) {
-            httpSession.invalidate();
-        }
 
-        // 空のFormをSessionに用意
+		model.addAttribute(PageReturnAttributeKeyword.LOGIN_INFO_FORM, loginUserForm());
-        model.addAttribute(PageReturnAttributeKeyword.LOGIN_INFO_FORM, loginUserForm());
 
-        // ログイン画面に遷移
+		return LOGIN_HTML;
-        return LOGIN_HTML;
+	}
-    }
 }

src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeConfirmController.java

@@ -1,5 +1,20 @@
 package com.example.rhizome.app.presentation.controller;
 
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.model.Employee;
@@ -12,122 +27,73 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.servlet.http.HttpSession;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM;
-
-/**
- * 新規登録者情報チェック用のコントローラ
- */
 @Controller
 public class InsertEmployeeConfirmController {
 
-    // ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName());
-    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeConfirmController.class.getName());
 
-    // エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    HttpSession httpSession;
+	HttpSession httpSession;
-    SearchDepartment searchDepartment;
+	SearchDepartment searchDepartment;
-    SearchEmployee searchEmployee;
+	SearchEmployee searchEmployee;
 
-    @Autowired
+	@Autowired
-    public InsertEmployeeConfirmController(
+	public InsertEmployeeConfirmController(
-            HttpSession httpSession,
+			HttpSession httpSession,
-            SearchDepartmentImpl searchDepartment,
+			SearchDepartmentImpl searchDepartment,
-            SearchEmployeeImpl searchEmployee
+			SearchEmployeeImpl searchEmployee) {
-    ) {
+		this.httpSession = httpSession;
-        this.httpSession = httpSession;
+		this.searchDepartment = searchDepartment;
-        this.searchDepartment = searchDepartment;
+		this.searchEmployee = searchEmployee;
-        this.searchEmployee = searchEmployee;
+	}
-    }
 
-    @ModelAttribute
+	@ModelAttribute
-    public InsertEmployeeForm insertEmployeeForm() {
+	public InsertEmployeeForm insertEmployeeForm() {
-        return new InsertEmployeeForm();
+		return new InsertEmployeeForm();
-    }
+	}
 
-    /**
+	@PermissionCheck
-     * 登録情報のチェックを行う
+	@SessionCheck
-     *
+	@RequestMapping(value = INSERT_EMPLOYEE_CONFIRM, method = RequestMethod.POST)
-     * @param insertEmployeeForm 登録情報
+	public String insertEmployeeConfirm(InsertEmployeeForm insertEmployeeForm, Model model) {
-     * @param model              ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = INSERT_EMPLOYEE_CONFIRM, method = RequestMethod.POST)
-    public String insertEmployeeConfirm(InsertEmployeeForm insertEmployeeForm, Model model) {
 
-        try {
+		try {
-            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			model.addAttribute(
-            // 作成した部署一覧をセット
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-            model.addAttribute(
+					DepartmentForm.convertFrom(
-                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+							searchDepartment.selectAll()));
-                    DepartmentForm.convertFrom(
-                            searchDepartment.selectAll()
-                    ));
 
-            // 登録用パラメータチェック
+			List<String> error = insertEmployeeForm.validateParameter();
-            List<String> error = insertEmployeeForm.validateParameter();
 
-            // 入力内容に誤りがあるか
+			if (!error.isEmpty()) {
-            if (!error.isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-                // 誤りがあった場合
+						new MessageForm(String.join(", ", error) + "が不正です。"));
-                // 誤りがあった箇所のエラーメッセージを表示
+				model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
+				return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-                // 画面に返す為の登録情報をセット
+			}
-                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-                // 登録画面に遷移
-                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-            }
 
-            final String DUPLICATION = "既に登録済みのメールアドレスです。";
+			final String DUPLICATION = "既に登録済みのメールアドレスです。";
 
-            // 登録対象のメールアドレスを元に検索
+			List<Employee> employeeList = searchEmployee.searchEmployee(insertEmployeeForm.getMailAddress());
-            List<Employee> employeeList = searchEmployee.searchEmployee(insertEmployeeForm.getMailAddress());
 
-            // 検索結果があるか
+			if (!employeeList.isEmpty()) {
-            if (!employeeList.isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-                // 検索した結果0件ではない場合
+				model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-                // 重複を許さないため、エラー処理
+				return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+			}
-                // 画面に返す為の登録情報をセット
-                model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-                // 登録画面に遷移
-                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-            }
 
-            // 登録確認ページに遷移
+			model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-            model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
+			return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM_HTML;
-            // 登録確認画面に遷移
-            return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_CONFIRM_HTML;
 
+		} catch (Exception e) {
+			httpSession.invalidate();
 
-        } catch (Exception e) {
+			e.printStackTrace();
-            // ログイン情報の破棄
-            httpSession.invalidate();
 
-            e.printStackTrace();
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
-            // エラーログ出力
+		}
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+	}
-            // エラー画面遷移
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
-    }
 }
-
-
-

src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeController.java

@@ -1,5 +1,21 @@
 package com.example.rhizome.app.presentation.controller;
 
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.RegisterEmployee;
@@ -11,188 +27,120 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.servlet.http.HttpSession;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE;
-
-/**
- * 新規登録用のコントローラ
- */
 @Controller
 public class InsertEmployeeController {
 
-    // ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(InsertEmployeeController.class.getName());
-    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeController.class.getName());
 
-    // エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    HttpSession httpSession;
+	HttpSession httpSession;
-    RegisterEmployee registerEmployee;
+	RegisterEmployee registerEmployee;
-    SearchDepartment searchDepartment;
+	SearchDepartment searchDepartment;
 
-    @Autowired
+	@Autowired
-    public InsertEmployeeController(HttpSession httpSession, RegisterEmployeeImpl registerEmployee, SearchDepartmentImpl searchDepartment) {
+	public InsertEmployeeController(HttpSession httpSession, RegisterEmployeeImpl registerEmployee,
-        this.httpSession = httpSession;
+			SearchDepartmentImpl searchDepartment) {
-        this.registerEmployee = registerEmployee;
+		this.httpSession = httpSession;
-        this.searchDepartment = searchDepartment;
+		this.registerEmployee = registerEmployee;
-    }
+		this.searchDepartment = searchDepartment;
+	}
 
-    @ModelAttribute
+	@ModelAttribute
-    public InsertEmployeeForm insertEmployeeForm() {
+	public InsertEmployeeForm insertEmployeeForm() {
-        return new InsertEmployeeForm();
+		return new InsertEmployeeForm();
-    }
+	}
 
-    /**
+	@PermissionCheck
-     * 新規登録画面表示処理
+	@SessionCheck
-     *
+	@RequestMapping(value = INSERT_EMPLOYEE, method = RequestMethod.POST)
-     * @param insertEmployeeForm 登録情報
+	public String insertEmployee(InsertEmployeeForm insertEmployeeForm, Model model) {
-     * @param model              ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = INSERT_EMPLOYEE, method = RequestMethod.POST)
-    public String insertEmployee(InsertEmployeeForm insertEmployeeForm, Model model) {
 
-        try {
+		try {
-            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			model.addAttribute(
-            // 作成した部署一覧をセット
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-            model.addAttribute(
+					DepartmentForm.convertFrom(
-                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+							searchDepartment.selectAll()));
-                    DepartmentForm.convertFrom(
-                            searchDepartment.selectAll()
-                    ));
 
-            // Confirm画面から渡ってきた値をチェック
+			List<String> error = validateParameter(
-            List<String> error = validateParameter(
+					insertEmployeeForm.getNmEmployee(),
-                    insertEmployeeForm.getNmEmployee(),
+					insertEmployeeForm.getKnEmployee(),
-                    insertEmployeeForm.getKnEmployee(),
+					insertEmployeeForm.getMailAddress(),
-                    insertEmployeeForm.getMailAddress(),
+					insertEmployeeForm.getPassword(),
-                    insertEmployeeForm.getPassword(),
+					insertEmployeeForm.getAdminAuth(),
-                    insertEmployeeForm.getAdminAuth(),
+					insertEmployeeForm.getIdDepartment());
-                    insertEmployeeForm.getIdDepartment()
-            );
 
-            // エラーが1件以上有る場合
+			if (!error.isEmpty()) {
-            if (!error.isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-                // エラー内容を画面に表示
+						new MessageForm(String.join(", ", error) + "が不正です。"));
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(String.join(", ", error) + "が不正です。"));
+				return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-                // 登録画面に遷移
+			}
-                return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-            }
 
-            // 登録処理
+			registerEmployee.registerEmployee(InsertEmployeeForm.convertTo(insertEmployeeForm));
-            registerEmployee.registerEmployee(InsertEmployeeForm.convertTo(insertEmployeeForm));
+			return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_RESULT_HTML;
-            // 登録結果画面に遷移
-            return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_RESULT_HTML;
 
-        } catch (Exception e) {
+		} catch (Exception e) {
-            // ログイン情報の破棄
+			httpSession.invalidate();
-            httpSession.invalidate();
 
-            e.printStackTrace();
+			e.printStackTrace();
 
-            // エラーログ出力
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
-            // エラー画面遷移
+		}
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
+	}
-        }
-    }
 
-    /**
+	private List<String> validateParameter(
-     * @param employeeName 登録対象の名前
+			String employeeName,
-     * @param employeeKana 登録対象のカナ
+			String employeeKana,
-     * @param mailAddress  登録対象のメールアドレス
+			String mailAddress,
-     * @param password     登録対象のパスワード
+			String password,
-     * @param management   システム権限
+			Integer management,
-     * @param departmentId 部署ID
+			Integer departmentId) {
-     * @return エラーが有った場合はエラー文言、無ければ空のリストが返る
-     */
-    private List<String> validateParameter(
-            String employeeName,
-            String employeeKana,
-            String mailAddress,
-            String password,
-            Integer management,
-            Integer departmentId
-    ) {
 
-        final String EMPLOYEE_NAME_NULL_BLANK = "社員名";
+		final String EMPLOYEE_NAME_NULL_BLANK = "社員名";
-        final String EMPLOYEE_KANA_NULL_BLANK = "社員名フリガナ";
+		final String EMPLOYEE_KANA_NULL_BLANK = "社員名フリガナ";
-        final String MAIL_ADDRESS_NULL_BLANK = "メールアドレス";
+		final String MAIL_ADDRESS_NULL_BLANK = "メールアドレス";
-        final String PASSWORD_NULL_BLANK = "パスワード";
+		final String PASSWORD_NULL_BLANK = "パスワード";
-        final String MANAGEMENT_ERROR = "管理者権限指定";
+		final String MANAGEMENT_ERROR = "管理者権限指定";
-        final String DEPARTMENT_ID_NULL_BLANK = "所属部署";
+		final String DEPARTMENT_ID_NULL_BLANK = "所属部署";
 
-        List<String> error = new ArrayList<>();
+		List<String> error = new ArrayList<>();
 
-        // null or 空文字判定
+		if (isNullOrBlank(employeeName)) {
-        if (isNullOrBlank(employeeName)) {
+			error.add(EMPLOYEE_NAME_NULL_BLANK);
-            // エラー内容を追加
+		}
-            error.add(EMPLOYEE_NAME_NULL_BLANK);
-        }
 
-        // null or 空文字判定
+		if (isNullOrBlank(employeeKana)) {
-        if (isNullOrBlank(employeeKana)) {
+			error.add(EMPLOYEE_KANA_NULL_BLANK);
-            // エラー内容を追加
+		}
-            error.add(EMPLOYEE_KANA_NULL_BLANK);
-        }
 
-        // null or 空文字判定
+		if (isNullOrBlank(mailAddress)) {
-        if (isNullOrBlank(mailAddress)) {
+			error.add(MAIL_ADDRESS_NULL_BLANK);
-            // エラー内容を追加
+		}
-            error.add(MAIL_ADDRESS_NULL_BLANK);
-        }
 
-        // null or 空文字判定
+		if (isNullOrBlank(password)) {
-        if (isNullOrBlank(password)) {
+			error.add(PASSWORD_NULL_BLANK);
-            // エラー内容を追加
+		}
-            error.add(PASSWORD_NULL_BLANK);
-        }
 
-        // 管理者権限の値が不正か
+		if (management == null) {
-        if (management == null) {
+			error.add(MANAGEMENT_ERROR);
-            // エラー内容を追加
+		}
-            error.add(MANAGEMENT_ERROR);
-        }
 
-        // 所属部署の値が不正か
+		if (departmentId == null) {
-        if (departmentId == null) {
+			error.add(DEPARTMENT_ID_NULL_BLANK);
-            // エラー内容を追加
+		}
-            error.add(DEPARTMENT_ID_NULL_BLANK);
-        }
 
-        return error;
+		return error;
 
-    }
+	}
 
-    /**
+	private static boolean isNullOrBlank(String str) {
-     * 仮引数を null or 空 判定する
+		if (null == str) {
-     *
+			return true;
-     * @param str 判定対象の文字列
+		}
-     * @return true:null or 空 false:null or 空 では無い
-     */
-    private static boolean isNullOrBlank(String str) {
-        if (null == str) {
-            return true;
-        }
 
-        return str.isBlank();
+		return str.isBlank();
-    }
+	}
 
 }
-
-
-

src/main/java/com/example/rhizome/app/presentation/controller/InsertEmployeeInputController.java

@@ -1,5 +1,19 @@
 package com.example.rhizome.app.presentation.controller;
 
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.RegisterEmployee;
@@ -8,83 +22,51 @@ import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAt
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.InsertEmployeeForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.servlet.http.HttpSession;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT;
-
-/**
- * 登録画面表示用コントローラ
- */
 @Controller
 public class InsertEmployeeInputController {
 
-    // ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(InsertEmployeeInputController.class.getName());
-    private final static Logger LOGGER = Logger.getLogger(InsertEmployeeInputController.class.getName());
 
-    // エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    HttpSession httpSession;
+	HttpSession httpSession;
-    RegisterEmployee registerEmployee;
+	RegisterEmployee registerEmployee;
-    SearchDepartment searchDepartment;
+	SearchDepartment searchDepartment;
 
-    @Autowired
+	@Autowired
-    public InsertEmployeeInputController(HttpSession httpSession, RegisterEmployee registerEmployee, SearchDepartment searchDepartment) {
+	public InsertEmployeeInputController(HttpSession httpSession, RegisterEmployee registerEmployee,
-        this.httpSession = httpSession;
+			SearchDepartment searchDepartment) {
-        this.registerEmployee = registerEmployee;
+		this.httpSession = httpSession;
-        this.searchDepartment = searchDepartment;
+		this.registerEmployee = registerEmployee;
-    }
+		this.searchDepartment = searchDepartment;
+	}
 
-    @ModelAttribute
+	@ModelAttribute
-    public InsertEmployeeForm insertEmployeeForm() {
+	public InsertEmployeeForm insertEmployeeForm() {
-        return new InsertEmployeeForm();
+		return new InsertEmployeeForm();
-    }
+	}
 
+	@SessionCheck
+	@PermissionCheck
+	@RequestMapping(value = INSERT_EMPLOYEE_INPUT, method = RequestMethod.POST)
+	public String insertInput(InsertEmployeeForm insertEmployeeForm, Model model) {
 
-    /**
+		try {
-     * 登録画面表示処理
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-     *
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
-     * @param insertEmployeeForm 登録画面のフォーム
-     * @param model              ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
-    @SessionCheck
-    @PermissionCheck
-    @RequestMapping(value = INSERT_EMPLOYEE_INPUT, method = RequestMethod.POST)
-    public String insertInput(InsertEmployeeForm insertEmployeeForm, Model model) {
 
-        try {
+			model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
-            // 部署コードリストを作成し、画面に返す値としてセット
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-            // パラメータをセット
+			return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
-            model.addAttribute(PageReturnAttributeKeyword.INSERT_EMPLOYEE_FORM, insertEmployeeForm);
 
-            // 登録画面に遷移
+		} catch (Exception e) {
-            return TransitionTargetPageNameKeyword.INSERT_EMPLOYEE_INPUT_HTML;
+			httpSession.invalidate();
 
-        } catch (Exception e) {
+			e.printStackTrace();
-            // ログイン情報の破棄
-            httpSession.invalidate();
 
-            e.printStackTrace();
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
-            // エラーログ出力
+		}
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+	}
-            // エラー画面遷移
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
-    }
 }
-
-
-

src/main/java/com/example/rhizome/app/presentation/controller/LoginController.java

@@ -1,5 +1,18 @@
 package com.example.rhizome.app.presentation.controller;
 
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.example.rhizome.app.domain.model.LoginInfo;
 import com.example.rhizome.app.domain.model.LoginUser;
@@ -11,138 +24,81 @@ import com.example.rhizome.app.presentation.form.LoginInfoForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdatePersonalUserForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.servlet.http.HttpSession;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.DO_LOGIN;
-
-/**
- * ログイン関連のコントローラ
- */
 @Controller
 public class LoginController {
 
-    // ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(LoginController.class.getName());
-    private final static Logger LOGGER = Logger.getLogger(LoginController.class.getName());
 
-    // エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    HttpSession httpSession;
+	HttpSession httpSession;
-    Login login;
+	Login login;
 
-    @Autowired
+	@Autowired
-    public LoginController(HttpSession httpSession, Login login) {
+	public LoginController(HttpSession httpSession, Login login) {
-        this.httpSession = httpSession;
+		this.httpSession = httpSession;
-        this.login = login;
+		this.login = login;
-    }
+	}
 
-    @ModelAttribute
+	@ModelAttribute
-    public LoginUserForm loginUserForm() {
+	public LoginUserForm loginUserForm() {
-        return new LoginUserForm();
+		return new LoginUserForm();
-    }
+	}
 
-    /**
+	@RequestMapping(value = DO_LOGIN, method = RequestMethod.POST)
-     * 画面から渡ってきたパラメータのチェックを行う
+	public String doLogin(LoginInfoForm loginInfoForm, Model model) {
-     *
-     * @param loginInfoForm mailAddress, password を保持したインスタンス
-     * @param model         ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
-    @RequestMapping(value = DO_LOGIN, method = RequestMethod.POST)
-    public String doLogin(LoginInfoForm loginInfoForm, Model model) {
 
-        // ログに出力する
+		final String MAIL_ADDRESS_PASSWORD_ERROR = "メールアドレス、パスワードの入力内容に誤りがあります";
-        final String MAIL_ADDRESS_PASSWORD_ERROR = "メールアドレス、パスワードの入力内容に誤りがあります";
+		final String LOGIN_ERROR = "IDまたはパスワードが間違っています";
-        // 発生しうるErrorに対するメッセージ
-        final String LOGIN_ERROR = "IDまたはパスワードが間違っています";
 
-        try {
+		try {
-            // mailAddress, password の入力に誤りがあるかチェック
+			if (!LoginUserForm.checkParameter(loginInfoForm)) {
-            if (!LoginUserForm.checkParameter(loginInfoForm)) {
 
-                // mail,passwordが仕様を満たしていない場合
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(MAIL_ADDRESS_PASSWORD_ERROR));
+						new MessageForm(MAIL_ADDRESS_PASSWORD_ERROR));
 
-                // エラーだった場合に login.html に処理を戻す。mailAddress, password を login.htmlに表示するために
+				model.addAttribute(PageReturnAttributeKeyword.LOGIN_INFO_FORM, loginInfoForm);
-                // ここで addAttribute する
+				return TransitionTargetPageNameKeyword.LOGIN_HTML;
-                model.addAttribute(PageReturnAttributeKeyword.LOGIN_INFO_FORM, loginInfoForm);
+			}
-                // login.html に遷移する様に設定
-                return TransitionTargetPageNameKeyword.LOGIN_HTML;
-            }
 
-            // Login者情報インスタンスを作成
+			LoginInfo loginInfo = createLoginInfo(httpSession, loginInfoForm);
-            LoginInfo loginInfo = createLoginInfo(httpSession, loginInfoForm);
 
-            // login 可能かチェック
+			if (!login.canLogin(loginInfo)) {
-            if (!login.canLogin(loginInfo)) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(LOGIN_ERROR));
-                // ログイン不可の場合、エラーメッセージをセットして入力された値とともに login.html を再表示
+				model.addAttribute(PageReturnAttributeKeyword.LOGIN_INFO_FORM, loginInfoForm);
-                // 画面に表示するエラーメッセージをセット
+				return TransitionTargetPageNameKeyword.LOGIN_HTML;
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(LOGIN_ERROR));
+			}
-                // 画面に表示する mailAddress, password をセット
-                model.addAttribute(PageReturnAttributeKeyword.LOGIN_INFO_FORM, loginInfoForm);
-                // login.html に遷移
-                return TransitionTargetPageNameKeyword.LOGIN_HTML;
-            }
 
-            // ログイン（インスタンス作成）
+			LoginUser loginUser = login.doLogin(loginInfo);
-            LoginUser loginUser = login.doLogin(loginInfo);
 
-            // ログイン者の情報をセッション情報に格納
+			httpSession.setAttribute(SessionKeyword.LOGIN_USER, LoginUserForm.convertFrom(loginUser));
-            // セッションに loginUser 情報を保持し続ける = ログイン中として扱う
-            httpSession.setAttribute(SessionKeyword.LOGIN_USER, LoginUserForm.convertFrom(loginUser));
 
-            // 管理者かチェック
+			if (!loginUser.isAdminUser()) {
-            if (!loginUser.isAdminUser()) {
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM,
-                // 管理者ではない場合直で自分の情報を更新するページに遷移する
+						UpdatePersonalUserForm.convertFrom(loginUser));
-                // 編集対象のログイン者の情報を画面に渡す値にセット
+				return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, UpdatePersonalUserForm.convertFrom(loginUser));
+			}
-                // 個人の情報更新ページに遷移
-                return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
-            }
 
-            // メニュー画面に遷移
+			return TransitionTargetPageNameKeyword.MENU_HTML;
-            return TransitionTargetPageNameKeyword.MENU_HTML;
 
-        } catch (Exception e) {
+		} catch (Exception e) {
-            // ログイン情報の破棄
+			httpSession.invalidate();
-            httpSession.invalidate();
+			e.printStackTrace();
-            e.printStackTrace();
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラーログ出力
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+		}
-            // エラー画面に遷移
+	}
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
-    }
 
-    /**
+	private static LoginInfo createLoginInfo(HttpSession httpSession, LoginInfoForm loginInfoForm) {
-     * ログイン者情報のインスタンスを作成
+		LoginUserForm loginUserForm = (LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER);
-     *
-     * @param httpSession   セッション情報
-     * @param loginInfoForm mailAddress, password を保持したインスタンス
-     */
-    private static LoginInfo createLoginInfo(HttpSession httpSession, LoginInfoForm loginInfoForm) {
-        // セッションからログイン者情報を取得
-        LoginUserForm loginUserForm = (LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER);
 
-        // セッションにログイン者情報があるか
+		if (loginUserForm != null) {
-        if (loginUserForm != null) {
+			return new LoginInfo(loginUserForm.getMailAddress(), loginUserForm.getPassword());
-            // セッションにログイン者情報がある場合
+		}
-            return new LoginInfo(loginUserForm.getMailAddress(), loginUserForm.getPassword());
-        }
 
-        // セッションにない場合は画面からの input 値 を取得
+		return new LoginInfo(
-        return new LoginInfo(
+				loginInfoForm.getMailAddress(),
-                loginInfoForm.getMailAddress(),
+				loginInfoForm.getPassword());
-                loginInfoForm.getPassword()
+	}
-        );
-    }
 }

src/main/java/com/example/rhizome/app/presentation/controller/LogoutController.java

@@ -1,10 +1,12 @@
 package com.example.rhizome.app.presentation.controller;
 
-import com.example.rhizome.aop.aspect.PermissionCheck;
+import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.*;
-import com.example.rhizome.aop.aspect.SessionCheck;
+
-import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import java.util.logging.Level;
-import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import java.util.logging.Logger;
-import com.example.rhizome.app.presentation.form.LoginUserForm;
+
+import javax.servlet.http.HttpSession;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -12,62 +14,46 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.servlet.http.HttpSession;
+import com.example.rhizome.aop.aspect.PermissionCheck;
-import java.util.logging.Level;
+import com.example.rhizome.aop.aspect.SessionCheck;
-import java.util.logging.Logger;
+import com.example.rhizome.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
+import com.example.rhizome.app.presentation.form.LoginUserForm;
 
-import static com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword.LOGOUT;
-
-/**
- * ログアウト処理のコントローラ
- */
 @Controller
 public class LogoutController {
 
-    // ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(LogoutController.class.getName());
-    private final static Logger LOGGER = Logger.getLogger(LogoutController.class.getName());
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-    // エラーメッセージ用の定数フィールド
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    HttpSession httpSession;
+	HttpSession httpSession;
 
-    @Autowired
+	@Autowired
-    public LogoutController(HttpSession httpSession) {
+	public LogoutController(HttpSession httpSession) {
-        this.httpSession = httpSession;
+		this.httpSession = httpSession;
-    }
+	}
 
-    @ModelAttribute
+	@ModelAttribute
-    public LoginUserForm loginUserForm() {
+	public LoginUserForm loginUserForm() {
-        return new LoginUserForm();
+		return new LoginUserForm();
-    }
+	}
 
-    /**
+	@PermissionCheck
-     * ログアウト処理
+	@SessionCheck
-     *
+	@RequestMapping(value = LOGOUT, method = RequestMethod.POST)
-     * @param model ビューにデータを渡すためのコンテナ
+	public String doLogout(Model model) {
-     * @return 遷移先の画面
+		try {
-     */
+			httpSession.invalidate();
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = LOGOUT, method = RequestMethod.POST)
-    public String doLogout(Model model) {
-        try {
-            // セッション情報の破棄
-            httpSession.invalidate();
 
-            // ログイン画面に遷移するための情報を設定
+			model.addAttribute(PageReturnAttributeKeyword.LOGIN_INFO_FORM, loginUserForm());
-            model.addAttribute(PageReturnAttributeKeyword.LOGIN_INFO_FORM, loginUserForm());
+			return TransitionTargetPageNameKeyword.LOGIN_HTML;
-            // login.html に遷移
-            return TransitionTargetPageNameKeyword.LOGIN_HTML;
 
-        } catch (Exception e) {
+		} catch (Exception e) {
 
-            // エラーログ出力
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
-            // エラーページに遷移
+		}
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
 
-    }
+	}
 
 }

src/main/java/com/example/rhizome/app/presentation/controller/MenuController.java

@@ -1,33 +1,27 @@
 package com.example.rhizome.app.presentation.controller;
 
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.rhizome.app.presentation.form.MessageForm;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
 
-/**
- * メニュー画面表示用コントローラ
- */
 @Controller
 public class MenuController {
 
-    @ModelAttribute
+	@ModelAttribute
-    public MessageForm messageForm() {
+	public MessageForm messageForm() {
-        return new MessageForm();
+		return new MessageForm();
-    }
+	}
 
-    /**
+	@PermissionCheck
-     * メニュー画面に遷移
+	@SessionCheck
-     */
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_MENU)
-    @PermissionCheck
+	public String showMenu() {
-    @SessionCheck
+		return TransitionTargetPageNameKeyword.MENU_HTML;
-    @RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_MENU)
+	}
-    public String showMenu() {
-        // メニュー画面遷移
-        return TransitionTargetPageNameKeyword.MENU_HTML;
-    }
 
 }

src/main/java/com/example/rhizome/app/presentation/controller/SelectEmployeeController.java

@@ -1,5 +1,17 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.service.SearchDepartment;
@@ -9,113 +21,66 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.EmployeeInfoForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.servlet.http.HttpSession;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * 社員検索画面用コントローラ　リスト全件表示、検索表示、更新、削除が可能
- */
 @Controller
 public class SelectEmployeeController {
 
-    // ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(SelectEmployeeController.class.getName());
-    private final static Logger LOGGER = Logger.getLogger(SelectEmployeeController.class.getName());
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-    // エラーメッセージ用の定数フィールド
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    HttpSession httpSession;
+	HttpSession httpSession;
-    SearchDepartment searchDepartment;
+	SearchDepartment searchDepartment;
-    SearchEmployeeInfo searchEmployeeInfo;
+	SearchEmployeeInfo searchEmployeeInfo;
 
-    @Autowired
+	@Autowired
-    public SelectEmployeeController(HttpSession httpSession, SearchDepartment searchDepartment, SearchEmployeeInfo searchEmployeeInfo) {
+	public SelectEmployeeController(HttpSession httpSession, SearchDepartment searchDepartment,
-        this.httpSession = httpSession;
+			SearchEmployeeInfo searchEmployeeInfo) {
-        this.searchDepartment = searchDepartment;
+		this.httpSession = httpSession;
-        this.searchEmployeeInfo = searchEmployeeInfo;
+		this.searchDepartment = searchDepartment;
-    }
+		this.searchEmployeeInfo = searchEmployeeInfo;
+	}
 
-    @ModelAttribute
+	@ModelAttribute
-    public SearchConditionEmployeeForm searchConditionEmployeeForm() {
+	public SearchConditionEmployeeForm searchConditionEmployeeForm() {
-        return new SearchConditionEmployeeForm();
+		return new SearchConditionEmployeeForm();
-    }
+	}
 
-    /**
+	@PermissionCheck
-     * 社員検索画面表示処理コントローラ
+	@SessionCheck
-     *
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO, method = RequestMethod.POST)
-     * @param searchConditionEmployeeForm 検索画面のフォーム
+	public String select(SearchConditionEmployeeForm searchConditionEmployeeForm, Model model) {
-     * @param model                       ビューにデータを渡すためのコンテナ
+		try {
-     * @return 遷移先の画面
-     */
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO, method = RequestMethod.POST)
-    public String select(SearchConditionEmployeeForm searchConditionEmployeeForm, Model model) {
 
-        try {
+			model.addAttribute(
+					PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-            // 部署一覧を取得し、画面に返す用のクラスに詰め替える
+			model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(
-            // 作成した部署一覧をセット
+					searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
-            model.addAttribute(
+			return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
-                    PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                    DepartmentForm.convertFrom(searchDepartment.selectAll())
-            );
 
-            // 検索条件を元に検索を実施
+		} catch (Exception e) {
-            // 取得した EmployeeInfo（ employee + department ）の情報を画面に返す用の型に詰め替えてセット
+			httpSession.invalidate();
-            model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST, EmployeeInfoForm.convertFrom(searchEmployeeInfo.searchBy(SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm))));
-            // 検索ページに遷移
-            return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
 
+			e.printStackTrace();
 
-        } catch (Exception e) {
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // ログイン情報の破棄
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
-            httpSession.invalidate();
+		}
 
-            e.printStackTrace();
+	}
 
-            // エラーログ出力
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO_FORM_EMPTY, method = RequestMethod.POST)
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+	public String select(Model model) {
-            // エラー画面遷移
+		model.addAttribute(
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
+				PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-        }
+				DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-    }
+		model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST,
+				EmployeeInfoForm.convertFrom(
+						searchEmployeeInfo.searchBy(
+								SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm()))));
 
-    /**
+		return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
-     * 社員検索画面表示処理コントローラ
+	}
-     * 検索条件無しの状態を作るため、空の検索条件で検索した結果を画面に返す
-     *
-     * @param model ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO_FORM_EMPTY, method = RequestMethod.POST)
-    public String select(Model model) {
-
-        // 部署一覧を取得し、画面に返す用のクラスに詰め替える
-        // 作成した部署一覧をセット
-        model.addAttribute(
-                PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-                DepartmentForm.convertFrom(searchDepartment.selectAll())
-        );
-
-        // 検索条件を元に検索を実施
-        model.addAttribute(PageReturnAttributeKeyword.EMPLOYEE_INFO_FORM_LIST,
-                EmployeeInfoForm.convertFrom(
-                        searchEmployeeInfo.searchBy(
-                                SearchConditionEmployeeForm.convertTo(searchConditionEmployeeForm())
-                        )));
-
-        // 検索ページに遷移
-        return TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_HTML;
-    }
 }

src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeController.java

@@ -1,5 +1,19 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
 import com.example.rhizome.app.domain.model.EmployeeInfo;
@@ -12,96 +26,66 @@ import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.SearchConditionEmployeeForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.servlet.http.HttpSession;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * 更新対象の employee が存在するか確認する為のコントローラ
- */
 @Controller
 public class UpdateEmployeeController {
 
-    // ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
-    private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-    // エラーメッセージ用の定数フィールド
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    HttpSession httpSession;
+	HttpSession httpSession;
-    SearchDepartment searchDepartment;
+	SearchDepartment searchDepartment;
-    SearchEmployeeInfo searchEmployeeInfo;
+	SearchEmployeeInfo searchEmployeeInfo;
 
-    @Autowired
+	@Autowired
-    public UpdateEmployeeController(HttpSession httpSession, SearchDepartment searchDepartment, SearchEmployeeInfo searchEmployeeInfo) {
+	public UpdateEmployeeController(HttpSession httpSession, SearchDepartment searchDepartment,
-        this.httpSession = httpSession;
+			SearchEmployeeInfo searchEmployeeInfo) {
-        this.searchDepartment = searchDepartment;
+		this.httpSession = httpSession;
-        this.searchEmployeeInfo = searchEmployeeInfo;
+		this.searchDepartment = searchDepartment;
-    }
+		this.searchEmployeeInfo = searchEmployeeInfo;
+	}
 
-    @ModelAttribute
+	@ModelAttribute
-    public SearchConditionEmployeeForm searchConditionEmployeeForm() {
+	public SearchConditionEmployeeForm searchConditionEmployeeForm() {
-        return new SearchConditionEmployeeForm();
+		return new SearchConditionEmployeeForm();
-    }
+	}
 
-    /**
+	@PermissionCheck
-     * 更新対象の employee が存在するか確認する為のコントローラ
+	@SessionCheck
-     *
+	@RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_EMPLOYEE, method = RequestMethod.POST)
-     * @param idEmployee 更新対象の employee の id
+	public String showUpdateEmployee(@RequestParam("idEmployee") Integer idEmployee, Model model) {
-     * @param model      ビューにデータを渡すためのコンテナ
+		final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
-     * @return 遷移先の画面
-     */
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = TransitionTargetPageNameKeyword.SHOW_UPDATE_EMPLOYEE, method = RequestMethod.POST)
-    public String showUpdateEmployee(@RequestParam("idEmployee") Integer idEmployee, Model model) {
-        final String UPDATE_TARGET_ID_NOT_FOUND = "更新対象のデータが見つかりません。";
 
-        try {
+		try {
-            // 部署一覧を取得し画面に返す値としてセット
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-            // id を条件に更新対象のレコードを検索、取得する
+			List<EmployeeInfo> employeeInfoList = searchEmployeeInfo.searchBy(
-            List<EmployeeInfo> employeeInfoList = searchEmployeeInfo.searchBy(
+					new SearchConditionEmployee(idEmployee,
-                    new SearchConditionEmployee(idEmployee,
+							null,
-                            null,
+							null,
-                            null,
+							null,
-                            null,
+							null));
-                            null));
 
-            // DBに更新対象のデータがあるか
+			if (employeeInfoList.isEmpty()) {
-            if (employeeInfoList.isEmpty()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR,
-                // ない場合はエラーメッセージをセットして検索画面に戻る
+						new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(UPDATE_TARGET_ID_NOT_FOUND));
+				return "forward:" + TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO;
-                return "forward:" + TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO;
+			}
-            }
 
-            // 更新画面に遷移
+			model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM,
-            model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, UpdateEmployeeInfoForm.convertFrom(employeeInfoList.get(0)));
+					UpdateEmployeeInfoForm.convertFrom(employeeInfoList.get(0)));
 
-            // Update画面に遷移
+			return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
-            return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
 
+		} catch (Exception e) {
+			httpSession.invalidate();
 
-        } catch (Exception e) {
+			e.printStackTrace();
-            // ログイン情報の破棄
-            httpSession.invalidate();
 
-            e.printStackTrace();
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
 
-            // エラーログ出力
+		}
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+	}
-            // エラー画面遷移
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-
-        }
-    }
 }

src/main/java/com/example/rhizome/app/presentation/controller/UpdateEmployeeResultController.java

@@ -1,5 +1,18 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
@@ -15,192 +28,126 @@ import com.example.rhizome.app.presentation.form.DepartmentForm;
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdateEmployeeInfoForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.servlet.http.HttpSession;
-import java.util.List;
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * employee を更新して結果を返す為のコントローラ
- */
 @Controller
 public class UpdateEmployeeResultController {
 
-    // ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
-    private final static Logger LOGGER = Logger.getLogger(UpdateEmployeeController.class.getName());
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-    // エラーメッセージ用の定数フィールド
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    HttpSession httpSession;
+	HttpSession httpSession;
-    SearchDepartment searchDepartment;
+	SearchDepartment searchDepartment;
-    SearchEmployee searchEmployee;
+	SearchEmployee searchEmployee;
-    UpdateEmployee updateEmployee;
+	UpdateEmployee updateEmployee;
 
-    @Autowired
+	@Autowired
-    public UpdateEmployeeResultController(HttpSession httpSession, SearchDepartment searchDepartment, SearchEmployee searchEmployee, UpdateEmployee updateEmployee) {
+	public UpdateEmployeeResultController(HttpSession httpSession, SearchDepartment searchDepartment,
-        this.httpSession = httpSession;
+			SearchEmployee searchEmployee, UpdateEmployee updateEmployee) {
-        this.searchDepartment = searchDepartment;
+		this.httpSession = httpSession;
-        this.searchEmployee = searchEmployee;
+		this.searchDepartment = searchDepartment;
-        this.updateEmployee = updateEmployee;
+		this.searchEmployee = searchEmployee;
-    }
+		this.updateEmployee = updateEmployee;
+	}
 
-    /**
+	private static boolean checkDuplicateMailAddress(List<Employee> employeeList,
-     * メールアドレスの重複チェック
+			UpdateEmployeeInfoForm updateEmployeeInfoForm) {
-     *
+		if (!employeeList.isEmpty()) {
-     * @param employeeList           元の employeeList
+			return Objects.equals(employeeList.get(0).getIdEmployee(), updateEmployeeInfoForm.getIdEmployee());
-     * @param updateEmployeeInfoForm 更新対象のデータ
+		}
-     * @return true:重複無し  false:重複あり
+		return true;
-     */
+	}
-    private static boolean checkDuplicateMailAddress(List<Employee> employeeList, UpdateEmployeeInfoForm updateEmployeeInfoForm) {
-        // メールアドレスが既に使われていた場合
-        if (!employeeList.isEmpty()) {
-            // 重複が有った場合に、同一人物のものであれば上書きOKとする
-            return Objects.equals(employeeList.get(0).getIdEmployee(), updateEmployeeInfoForm.getIdEmployee());
-        }
-        return true;
-    }
 
-    /**
+	@PermissionCheck
-     * 更新結果画面表示処理
+	@SessionCheck
-     *
+	@RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_RESULT, method = RequestMethod.POST)
-     * @param updateEmployeeInfoForm 更新画面のフォーム
+	public String employeeUpdateResult(@ModelAttribute UpdateEmployeeInfoForm updateEmployeeInfoForm, Model model) {
-     * @param model                  ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_RESULT, method = RequestMethod.POST)
-    public String employeeUpdateResult(@ModelAttribute UpdateEmployeeInfoForm updateEmployeeInfoForm, Model model) {
 
-        final String DUPLICATION = "既に登録済みのメールアドレスです。";
+		final String DUPLICATION = "既に登録済みのメールアドレスです。";
-        final String NOTHING = "項目が空欄です。";
+		final String NOTHING = "項目が空欄です。";
-        final String ADMIN_USER = "更新対象者がログイン者のため、管理者権限を変更できません。";
+		final String ADMIN_USER = "更新対象者がログイン者のため、管理者権限を変更できません。";
-        final String NO_TARGET = "更新対象のデータが見つかりません。";
+		final String NO_TARGET = "更新対象のデータが見つかりません。";
 
-        final String UPDATE_COMPLETE = "更新が完了しました。";
+		final String UPDATE_COMPLETE = "更新が完了しました。";
 
+		try {
 
-        try {
+			model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST,
+					DepartmentForm.convertFrom(searchDepartment.selectAll()));
 
-            // 部署一覧取得
+			String error = UpdateEmployeeInfoForm.validatePassword(
-            model.addAttribute(PageReturnAttributeKeyword.DEPARTMENT_FORM_LIST, DepartmentForm.convertFrom(searchDepartment.selectAll()));
+					updateEmployeeInfoForm.getPassword(),
+					updateEmployeeInfoForm.getPasswordConfirm());
 
-            // パスワードが仕様を満たしているか確認
+			if (!error.isBlank()) {
-            String error = UpdateEmployeeInfoForm.validatePassword(
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(error));
-                    updateEmployeeInfoForm.getPassword(),
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
-                    updateEmployeeInfoForm.getPasswordConfirm()
-            );
 
-            // エラーが存在するか
+				return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
-            if (!error.isBlank()) {
+			}
-                // エラーが存在する場合、更新画面に遷移
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(error));
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
 
-                return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
+			List<Employee> employeeList = searchEmployee.searchEmployee(updateEmployeeInfoForm.getMailAddress());
-            }
 
-            // メールアドレスを元に検索
+			if (!checkDuplicateMailAddress(employeeList, updateEmployeeInfoForm)) {
-            List<Employee> employeeList = searchEmployee.searchEmployee(updateEmployeeInfoForm.getMailAddress());
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
 
-            // 既に登録済みのメールアドレスが存在するか
+				return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
-            if (!checkDuplicateMailAddress(employeeList, updateEmployeeInfoForm)) {
+			}
-                // 存在する場合はエラーメッセージを設定して更新入力画面に遷移
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
 
-                return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
+			LoginUserForm loginUserForm = (LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER);
-            }
 
-            // session 情報からログイン者の情報を取得
+			if (isUpdateTargetLoginUserAdminToNormal(updateEmployeeInfoForm, loginUserForm)) {
-            LoginUserForm loginUserForm = (LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER);
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(ADMIN_USER));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
+				return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
+			}
 
-            // ログイン者が更新対象で、権限を管理者権限から一般権限に変更しようとしているかチェック
+			if (!UpdateEmployeeInfoForm.hasErrorParameter(updateEmployeeInfoForm)) {
-            if (isUpdateTargetLoginUserAdminToNormal(updateEmployeeInfoForm, loginUserForm)) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
-                // 存在する場合はエラーメッセージを設定して更新入力画面に遷移
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(ADMIN_USER));
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
-                return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
-            }
 
-            //　画面から渡ってきた値が必須を満たしているか
+				return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
-            if (!UpdateEmployeeInfoForm.hasErrorParameter(updateEmployeeInfoForm)) {
+			}
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
 
-                return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
+			Employee beforeEmployee = searchEmployee.searchEmployeeByIdEmployee(updateEmployeeInfoForm.getIdEmployee());
-            }
+			if (beforeEmployee.getIdEmployee() == null) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
 
-            // 更新前のデータを取得
+				return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
-            Employee beforeEmployee = searchEmployee.searchEmployeeByIdEmployee(updateEmployeeInfoForm.getIdEmployee());
+			}
-            if (beforeEmployee.getIdEmployee() == null) {
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NO_TARGET));
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_EMPLOYEE_INFO_FORM, updateEmployeeInfoForm);
 
-                return TransitionTargetPageNameKeyword.UPDATE_EMPLOYEE_INPUT_HTML;
+			updateEmployee.updateEmployee(beforeEmployee, UpdateEmployeeInfoForm.convertTo(updateEmployeeInfoForm));
-            }
 
-            // 画面用の型からビジネスロジック用のモデルに変換し、Updateを実行
+			LoginUser updatedTargetEmployee = searchEmployee.searchLoginUser(updateEmployeeInfoForm.getMailAddress());
-            updateEmployee.updateEmployee(beforeEmployee, UpdateEmployeeInfoForm.convertTo(updateEmployeeInfoForm));
 
-            // Update後の情報を再取得
+			if (Objects.equals(updatedTargetEmployee.getIdEmployee(), loginUserForm.getIdEmployee())) {
-            LoginUser updatedTargetEmployee = searchEmployee.searchLoginUser(updateEmployeeInfoForm.getMailAddress());
+				httpSession.setAttribute(SessionKeyword.LOGIN_USER, LoginUserForm.convertFrom(updatedTargetEmployee));
+			}
 
-            // ログイン者と更新した対象が同じアカウントだった場合、session情報を更新
+			model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
-            if (Objects.equals(updatedTargetEmployee.getIdEmployee(), loginUserForm.getIdEmployee())) {
-                // ログイン者の情報をセッション情報に格納
-                httpSession.setAttribute(SessionKeyword.LOGIN_USER, LoginUserForm.convertFrom(updatedTargetEmployee));
-            }
 
-            // 更新結果のメッセージを画面にセットし一覧画面に遷移
+			return "forward:" + TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO_FORM_EMPTY;
-            model.addAttribute(PageReturnAttributeKeyword.MESSAGE_INFO, new MessageForm(UPDATE_COMPLETE));
 
-            // forward 先で不用意な動作をしないために UpdateEmployeeInfoForm をクリア
+		} catch (Exception e) {
-            return "forward:" + TransitionTargetPageNameKeyword.SELECT_EMPLOYEE_INFO_FORM_EMPTY;
+			httpSession.invalidate();
 
+			e.printStackTrace();
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
+		}
 
-        } catch (Exception e) {
+	}
-            // ログイン情報の破棄
-            httpSession.invalidate();
 
-            e.printStackTrace();
+	private boolean isUpdateTargetLoginUserAdminToNormal(UpdateEmployeeInfoForm updateEmployeeInfoForm,
-            // エラーログ出力
+			LoginUserForm loginUserForm) {
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            // エラー画面遷移
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
-        }
 
-    }
+		if (!Objects.equals(updateEmployeeInfoForm.getIdEmployee(), loginUserForm.getIdEmployee())) {
+			return false;
+		}
 
-    /**
+		return updateEmployeeInfoForm.getAdminAuth().equals(0);
-     * ログイン者がログイン者自身を更新する際
-     * 管理者権限から一般権限に変更する内容も含まれているかチェックする
-     *
-     * @param updateEmployeeInfoForm 更新対象データ
-     * @param loginUserForm          ログイン者情報
-     * @return true:ログイン者自身のデータをUpdate管理者→一般に権限変更しようとしている。
-     * false:Update対象者がログイン者自身ではない or 管理者権限 → 一般権限 への更新は含まれていない
-     */
-    private boolean isUpdateTargetLoginUserAdminToNormal(UpdateEmployeeInfoForm updateEmployeeInfoForm, LoginUserForm loginUserForm) {
-
-        // ログイン者が今回の更新対象か
-        if (!Objects.equals(updateEmployeeInfoForm.getIdEmployee(), loginUserForm.getIdEmployee())) {
-            // 今回の対象者はログイン者ではない
-            return false;
-        }
-
-        // 管理者から一般権限への変更があるか
-        return updateEmployeeInfoForm.getAdminAuth().equals(0);
-
-    }
 
+	}
 
 }

src/main/java/com/example/rhizome/app/presentation/controller/UpdatePersonalEmployeeResultController.java

@@ -1,5 +1,18 @@
 package com.example.rhizome.app.presentation.controller;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.example.rhizome.aop.aspect.PermissionCheck;
 import com.example.rhizome.aop.aspect.SessionCheck;
@@ -12,152 +25,103 @@ import com.example.rhizome.app.presentation.controller.pageproperty.TransitionTa
 import com.example.rhizome.app.presentation.form.LoginUserForm;
 import com.example.rhizome.app.presentation.form.MessageForm;
 import com.example.rhizome.app.presentation.form.UpdatePersonalUserForm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.servlet.http.HttpSession;
-import java.util.List;
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * 個人情報更新用コントローラ
- */
 @Controller
 public class UpdatePersonalEmployeeResultController {
 
-    // ログ出力用インスタンス
+	private final static Logger LOGGER = Logger.getLogger(UpdatePersonalEmployeeResultController.class.getName());
-    private final static Logger LOGGER = Logger.getLogger(UpdatePersonalEmployeeResultController.class.getName());
 
-    // エラーメッセージ用の定数フィールド
+	private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
-    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
 
-    HttpSession httpSession;
+	HttpSession httpSession;
-    SearchEmployee searchEmployee;
+	SearchEmployee searchEmployee;
-    UpdateEmployee updateEmployee;
+	UpdateEmployee updateEmployee;
 
-    @Autowired
+	@Autowired
-    public UpdatePersonalEmployeeResultController(HttpSession httpSession, SearchEmployee searchEmployee, UpdateEmployee updateEmployee) {
+	public UpdatePersonalEmployeeResultController(HttpSession httpSession, SearchEmployee searchEmployee,
-        this.httpSession = httpSession;
+			UpdateEmployee updateEmployee) {
-        this.searchEmployee = searchEmployee;
+		this.httpSession = httpSession;
-        this.updateEmployee = updateEmployee;
+		this.searchEmployee = searchEmployee;
-    }
+		this.updateEmployee = updateEmployee;
+	}
 
-    /**
+	private static boolean checkDuplicateMailAddress(List<Employee> employeeList,
-     * メールアドレスの重複チェック
+			UpdatePersonalUserForm updatePersonalUserForm) {
-     *
+		if (!employeeList.isEmpty()) {
-     * @param employeeList           元の employeeList
+			return Objects.equals(employeeList.get(0).getIdEmployee(), updatePersonalUserForm.getIdEmployee());
-     * @param updatePersonalUserForm 更新対象のデータ
+		}
-     * @return true:重複無し  false:重複あり
+		return true;
-     */
+	}
-    private static boolean checkDuplicateMailAddress(List<Employee> employeeList, UpdatePersonalUserForm updatePersonalUserForm) {
-        // メールアドレスが既に使われていた場合
-        if (!employeeList.isEmpty()) {
-            // 更新対象のデータと同じIDの場合は重複していないとみなす
-            return Objects.equals(employeeList.get(0).getIdEmployee(), updatePersonalUserForm.getIdEmployee());
-        }
-        return true;
-    }
 
-    @ModelAttribute
+	@ModelAttribute
-    public UpdatePersonalUserForm personalUpdateUserForm() {
+	public UpdatePersonalUserForm personalUpdateUserForm() {
-        return new UpdatePersonalUserForm();
+		return new UpdatePersonalUserForm();
-    }
+	}
 
-    /**
+	@PermissionCheck
-     * 個人情報更新結果画面表示処理
+	@SessionCheck
-     *
+	@RequestMapping(value = TransitionTargetPageNameKeyword.PERSONAL_UPDATE_RESULT, method = RequestMethod.POST)
-     * @param updatePersonalUserForm 個人情報更新画面のフォーム
+	public String personalEmployeeUpdateResult(UpdatePersonalUserForm updatePersonalUserForm, Model model) {
-     * @param model                  ビューにデータを渡すためのコンテナ
-     * @return 遷移先の画面
-     */
-    @PermissionCheck
-    @SessionCheck
-    @RequestMapping(value = TransitionTargetPageNameKeyword.PERSONAL_UPDATE_RESULT, method = RequestMethod.POST)
-    public String personalEmployeeUpdateResult(UpdatePersonalUserForm updatePersonalUserForm, Model model) {
 
-        final String NOTHING = "項目が空欄です。";
+		final String NOTHING = "項目が空欄です。";
-        final String DUPLICATION = "既に登録済みのメールアドレスです。";
+		final String DUPLICATION = "既に登録済みのメールアドレスです。";
 
-        try {
+		try {
 
-            // 更新完了画面からの遷移の場合
+			if (updatePersonalUserForm.getIdEmployee() == null) {
-            if (updatePersonalUserForm.getIdEmployee() == null) {
+				LoginUserForm loginUserForm = (LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER);
-                // ログイン者の情報を取得
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, UpdatePersonalUserForm
-                LoginUserForm loginUserForm = (LoginUserForm) httpSession.getAttribute(SessionKeyword.LOGIN_USER);
+						.convertFrom(searchEmployee.searchLoginUser(loginUserForm.getMailAddress())));
-                // ログイン者の情報を元に個人情報更新画面の初期表示用のインスタンスを作成
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, UpdatePersonalUserForm.convertFrom(searchEmployee.searchLoginUser(loginUserForm.getMailAddress())));
 
-                return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
+				return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
-            }
+			}
 
-            // パスワードが仕様を満たしているかチェック
+			String error = UpdatePersonalUserForm.validatePassword(
-            String error = UpdatePersonalUserForm.validatePassword(
+					updatePersonalUserForm.getPassword(),
-                    updatePersonalUserForm.getPassword(),
+					updatePersonalUserForm.getPasswordConfirm());
-                    updatePersonalUserForm.getPasswordConfirm()
-            );
 
-            // エラーがあるか
+			if (!error.isBlank()) {
-            if (!error.isBlank()) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(error));
-                // エラーが有る場合メッセージをセットして個人情報更新入力画面に遷移
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM,
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(error));
+						updatePersonalUserForm);
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, updatePersonalUserForm);
 
-                return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
+				return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
-            }
+			}
 
-            // 入力必須を満たしているか
+			if (!UpdatePersonalUserForm.hasErrorParameter(updatePersonalUserForm)) {
-            if (!UpdatePersonalUserForm.hasErrorParameter(updatePersonalUserForm)) {
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
-                // 満たしていない場合、メッセージをセットして個人情報更新入力画面に遷移
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM,
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(NOTHING));
+						updatePersonalUserForm);
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, updatePersonalUserForm);
 
-                return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
+				return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
-            }
+			}
 
-            // メールアドレス重複チェック
+			if (!checkDuplicateMailAddress(
-            if (!checkDuplicateMailAddress(
+					searchEmployee.searchEmployee(updatePersonalUserForm.getMailAddress()),
-                    searchEmployee.searchEmployee(updatePersonalUserForm.getMailAddress()),
+					updatePersonalUserForm)) {
-                    updatePersonalUserForm)
+				model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-            ) {
+				model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM,
-                // メールアドレスが既に使われていた場合
+						updatePersonalUserForm);
-                // 個人情報更新ページに遷移
-                model.addAttribute(PageReturnAttributeKeyword.MESSAGE_ERROR, new MessageForm(DUPLICATION));
-                model.addAttribute(PageReturnAttributeKeyword.UPDATE_PERSONAL_EMPLOYEE_USER_FORM, updatePersonalUserForm);
 
-                return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
+				return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_EMPLOYEE_INPUT_HTML;
-            }
+			}
 
-            //更新前のEmployeeの情報を取得
+			updateEmployee.updateEmployee(
-            // 画面用のインスタンスから更新用のインスタンスに変換し、Update実施
+					searchEmployee.searchEmployeeByIdEmployee(updatePersonalUserForm.getIdEmployee()),
-            updateEmployee.updateEmployee(
+					UpdatePersonalUserForm.convertTo(updatePersonalUserForm));
-                    searchEmployee.searchEmployeeByIdEmployee(updatePersonalUserForm.getIdEmployee()),
-                    UpdatePersonalUserForm.convertTo(updatePersonalUserForm)
-            );
 
-            // ログイン者の情報をセッション情報に格納
+			httpSession.setAttribute(
-            httpSession.setAttribute(
+					SessionKeyword.LOGIN_USER,
-                    SessionKeyword.LOGIN_USER,
+					LoginUserForm.convertFrom(
-                    LoginUserForm.convertFrom(
+							searchEmployee.searchLoginUser(updatePersonalUserForm.getMailAddress())));
-                            searchEmployee.searchLoginUser(updatePersonalUserForm.getMailAddress()))
-            );
 
-            // 更新結果画面に遷移
+			return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_RESULT_HTML;
-            return TransitionTargetPageNameKeyword.UPDATE_PERSONAL_RESULT_HTML;
 
-        } catch (Exception e) {
+		} catch (Exception e) {
-            // ログイン情報の破棄
+			httpSession.invalidate();
-            httpSession.invalidate();
 
-            // エラーログ出力
+			LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
-            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+			return TransitionTargetPageNameKeyword.ERROR_HTML;
-            // エラー画面遷移
+		}
-            return TransitionTargetPageNameKeyword.ERROR_HTML;
+	}
-        }
-    }
 }

src/main/java/com/example/rhizome/app/presentation/controller/pageproperty/SessionKeyword.java

@@ -1,9 +1,5 @@
 package com.example.rhizome.app.presentation.controller.pageproperty;
 
-/**
- * Sessionキーを管理する
- */
 public class SessionKeyword {
-    // SESSION情報として格納したいログイン者の情報
+	public static final String LOGIN_USER = "loginUser";
-    public static final String LOGIN_USER = "loginUser";
 }

src/main/java/com/example/rhizome/app/presentation/form/DepartmentForm.java

@@ -1,47 +1,25 @@
 package com.example.rhizome.app.presentation.form;
 
+import java.util.List;
+
 import com.example.rhizome.app.domain.model.Department;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
-/**
- * 画面の表示に使う部署コード管理用のクラス
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class DepartmentForm {
-    /**
+	private Integer idDepartment;
-     * 部署ID
+	private String nmDepartment;
-     */
-    private Integer idDepartment;
-    /**
-     * 部署名
-     */
-    private String nmDepartment;
 
-    /**
+	public static DepartmentForm convertFrom(Department department) {
-     * business 層の Department クラスから画面用（presentation 層）の DepartmentForm に
+		return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment());
-     * 変換します。
+	}
-     *
-     * @param department business 層の Department インスタンス
-     * @return 画面用（presentation 層）の DepartmentForm インスタンス
-     */
-    public static DepartmentForm convertFrom(Department department) {
-        return new DepartmentForm(department.getIdDepartment(), department.getNmDepartment());
-    }
 
-    /**
+	public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
-     * business 層の Department クラスから画面用（presentation 層）の DepartmentForm に
+		return departmentList.stream().map(DepartmentForm::convertFrom).toList();
-     * 変換します。（リスト版）
+	}
-     *
-     * @param departmentList business 層の Department インスタンスのリスト
-     * @return 画面用（presentation 層）の DepartmentForm インスタンスのリスト
-     */
-    public static List<DepartmentForm> convertFrom(List<Department> departmentList) {
-        return departmentList.stream().map(DepartmentForm::convertFrom).toList();
-    }
 }

src/main/java/com/example/rhizome/app/presentation/form/EmployeeInfoForm.java

@@ -1,82 +1,40 @@
 package com.example.rhizome.app.presentation.form;
 
+import java.util.List;
 
 import com.example.rhizome.app.domain.model.EmployeeInfo;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
-/**
- * 画面に表示するために employee と department を Join した構造を扱うクラス
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class EmployeeInfoForm {
 
-    /**
+	private Integer idEmployee;
-     * 社員ID
+	private String nmEmployee;
-     */
+	private String knEmployee;
-    private Integer idEmployee;
+	private String mailAddress;
-    /**
+	private String password;
-     * 社員名
+	private Integer adminAuth;
-     */
+	private Integer idDepartment;
-    private String nmEmployee;
+	private String nmDepartment;
-    /**
-     * 社員名カナ
-     */
-    private String knEmployee;
-    /**
-     * メールアドレス
-     */
-    private String mailAddress;
-    /**
-     * パスワード
-     */
-    private String password;
-    /**
-     * パスワード
-     */
-    private Integer adminAuth;
-    /**
-     * 部署ID
-     */
-    private Integer idDepartment;
-    /**
-     * 部署名
-     */
-    private String nmDepartment;
 
-    /**
+	public static EmployeeInfoForm convertFrom(EmployeeInfo employeeInfo) {
-     * business 層の EmployeeInfo クラスから画面用（presentation 層）の EmployeeInfoForm に
+		return new EmployeeInfoForm(
-     * 変換します。
+				employeeInfo.getEmployee().getIdEmployee(),
-     *
+				employeeInfo.getEmployee().getNmEmployee(),
-     * @param employeeInfo business 層の EmployeeInfo インスタンス
+				employeeInfo.getEmployee().getKnEmployee(),
-     * @return クラスから画面用（presentation 層）の EmployeeInfoForm インスタンス
+				employeeInfo.getEmployee().getMailAddress(),
-     */
+				employeeInfo.getEmployee().getPassword(),
-    public static EmployeeInfoForm convertFrom(EmployeeInfo employeeInfo) {
+				employeeInfo.getEmployee().getAdminAuth(),
-        return new EmployeeInfoForm(
+				employeeInfo.getDepartment().getIdDepartment(),
-                employeeInfo.getEmployee().getIdEmployee(),
+				employeeInfo.getDepartment().getNmDepartment());
-                employeeInfo.getEmployee().getNmEmployee(),
+	}
-                employeeInfo.getEmployee().getKnEmployee(),
-                employeeInfo.getEmployee().getMailAddress(),
-                employeeInfo.getEmployee().getPassword(),
-                employeeInfo.getEmployee().getAdminAuth(),
-                employeeInfo.getDepartment().getIdDepartment(),
-                employeeInfo.getDepartment().getNmDepartment()
-        );
-    }
 
-    /**
+	public static List<EmployeeInfoForm> convertFrom(List<EmployeeInfo> employeeInfoList) {
-     * business 層の EmployeeInfo クラスから画面用（presentation 層）の EmployeeInfoForm に
+		return employeeInfoList.stream().map(EmployeeInfoForm::convertFrom).toList();
-     * 変換します。（リスト版）
+	}
-     *
-     * @param employeeInfoList business 層の EmployeeInfo インスタンスのリスト
-     * @return クラスから画面用（presentation 層）の EmployeeInfoForm インスタンスのリスト
-     */
-    public static List<EmployeeInfoForm> convertFrom(List<EmployeeInfo> employeeInfoList) {
-        return employeeInfoList.stream().map(EmployeeInfoForm::convertFrom).toList();
-    }
 }

src/main/java/com/example/rhizome/app/presentation/form/InsertEmployeeForm.java

@@ -1,152 +1,102 @@
 package com.example.rhizome.app.presentation.form;
 
-import com.example.rhizome.app.domain.model.Employee;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.util.ArrayList;
 import java.util.List;
 
-/**
+import com.example.rhizome.app.domain.model.Employee;
- * 画面から渡ってきた登録内容をまとめ、再度画面に表示する為のクラス
+
- */
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class InsertEmployeeForm {
 
-    /**
+	private String nmEmployee;
-     * 社員名
-     */
-    private String nmEmployee;
 
-    /**
+	private String knEmployee;
-     * 社員名カナ
-     */
-    private String knEmployee;
 
-    /**
+	private String mailAddress;
-     * メールアドレス
-     */
-    private String mailAddress;
 
-    /**
+	private String password;
-     * パスワード
-     */
-    private String password;
 
-    /**
+	private String passwordConfirm;
-     * 確認用パスワード
-     */
-    private String passwordConfirm;
 
-    /**
+	private Integer adminAuth;
-     * 管理者権限
-     */
-    private Integer adminAuth;
 
-    /**
+	private Integer idDepartment;
-     * 部署ID
-     */
-    private Integer idDepartment;
 
-    /**
+	private static void checkPassword(String password, String passwordConfirm, List<String> error) {
-     * パスワードのValidation
+		final String PASSWORD_NULL_BLANK = "パスワード が未入力です。";
-     * チェック対象にエラーが有った場合エラーリストに文言を追加する
+		final String PASSWORD_CONFIRM_NULL_BLANK = "パスワード確認用 が未入力です。";
-     *
+		final String PASSWORD_MISMATCH = "パスワード と パスワード確認用 が一致しません。";
-     * @param password        登録対象のパスワード
-     * @param passwordConfirm 登録対象のパスワード再入力
-     * @param error           エラーリスト
-     */
-    private static void checkPassword(String password, String passwordConfirm, List<String> error) {
-        final String PASSWORD_NULL_BLANK = "パスワード が未入力です。";
-        final String PASSWORD_CONFIRM_NULL_BLANK = "パスワード確認用 が未入力です。";
-        final String PASSWORD_MISMATCH = "パスワード と パスワード確認用 が一致しません。";
 
-        if (isNullOrBlank(password)) {
+		if (isNullOrBlank(password)) {
-            error.add(PASSWORD_NULL_BLANK);
+			error.add(PASSWORD_NULL_BLANK);
-            return;
+			return;
-        }
+		}
-        if (isNullOrBlank(passwordConfirm)) {
+		if (isNullOrBlank(passwordConfirm)) {
-            error.add(PASSWORD_CONFIRM_NULL_BLANK);
+			error.add(PASSWORD_CONFIRM_NULL_BLANK);
-            return;
+			return;
-        }
+		}
 
-        if (!password.equals(passwordConfirm)) {
+		if (!password.equals(passwordConfirm)) {
-            error.add(PASSWORD_MISMATCH);
+			error.add(PASSWORD_MISMATCH);
-        }
+		}
-    }
+	}
 
-    /**
+	private static boolean isNullOrBlank(String str) {
-     * 仮引数を null or 空 判定する
+		if (null == str) {
-     *
+			return true;
-     * @param str 判定対象の文字列
+		}
-     * @return true:null or 空 false:null or 空 では無い
-     */
-    private static boolean isNullOrBlank(String str) {
-        if (null == str) {
-            return true;
-        }
 
-        return str.isBlank();
+		return str.isBlank();
-    }
+	}
 
-    /**
+	public static Employee convertTo(InsertEmployeeForm insertEmployeeForm) {
-     * 画面から渡ってきた登録内容をまとめ、ビジネスモデルに変換
+		return new Employee(
-     *
+				null,
-     * @param insertEmployeeForm 画面から渡ってきた登録内容
+				insertEmployeeForm.getNmEmployee(),
-     * @return ビジネスモデルのインスタンス
+				insertEmployeeForm.getKnEmployee(),
-     */
+				insertEmployeeForm.getMailAddress(),
-    public static Employee convertTo(InsertEmployeeForm insertEmployeeForm) {
+				insertEmployeeForm.getPassword(),
-        return new Employee(
+				insertEmployeeForm.getAdminAuth(),
-                null,
+				insertEmployeeForm.getIdDepartment());
-                insertEmployeeForm.getNmEmployee(),
+	}
-                insertEmployeeForm.getKnEmployee(),
-                insertEmployeeForm.getMailAddress(),
-                insertEmployeeForm.getPassword(),
-                insertEmployeeForm.getAdminAuth(),
-                insertEmployeeForm.getIdDepartment()
-        );
-    }
 
-    /**
+	public List<String> validateParameter() {
-     * 登録データのValidationを行う
+		final String EMPLOYEE_NAME_NULL_BLANK = "社員名";
-     *
+		final String EMPLOYEE_KANA_NULL_BLANK = "社員名フリガナ";
-     * @return エラーが有った場合はエラー文言、無ければ空のリストが返る
+		final String MAIL_ADDRESS_NULL_BLANK = "メールアドレス";
-     */
+		final String MANAGEMENT_ERROR = "管理者権限指定";
-    public List<String> validateParameter() {
+		final String DEPARTMENT_ID_NULL_BLANK = "所属部署";
-        final String EMPLOYEE_NAME_NULL_BLANK = "社員名";
-        final String EMPLOYEE_KANA_NULL_BLANK = "社員名フリガナ";
-        final String MAIL_ADDRESS_NULL_BLANK = "メールアドレス";
-        final String MANAGEMENT_ERROR = "管理者権限指定";
-        final String DEPARTMENT_ID_NULL_BLANK = "所属部署";
 
-        List<String> error = new ArrayList<>();
+		List<String> error = new ArrayList<>();
 
-        if (isNullOrBlank(nmEmployee)) {
+		if (isNullOrBlank(nmEmployee)) {
-            error.add(EMPLOYEE_NAME_NULL_BLANK);
+			error.add(EMPLOYEE_NAME_NULL_BLANK);
-        }
+		}
-        if (isNullOrBlank(knEmployee)) {
+		if (isNullOrBlank(knEmployee)) {
-            error.add(EMPLOYEE_KANA_NULL_BLANK);
+			error.add(EMPLOYEE_KANA_NULL_BLANK);
-        }
+		}
-        if (isNullOrBlank(mailAddress)) {
+		if (isNullOrBlank(mailAddress)) {
-            error.add(MAIL_ADDRESS_NULL_BLANK);
+			error.add(MAIL_ADDRESS_NULL_BLANK);
-        }
+		}
 
-        // パスワードが仕様を満たしているか確認
+		checkPassword(password, passwordConfirm, error);
-        checkPassword(password, passwordConfirm, error);
 
-        if (adminAuth == null) {
+		if (adminAuth == null) {
-            error.add(MANAGEMENT_ERROR);
+			error.add(MANAGEMENT_ERROR);
-        }
+		}
 
-        if (idDepartment == null) {
+		if (idDepartment == null) {
-            error.add(DEPARTMENT_ID_NULL_BLANK);
+			error.add(DEPARTMENT_ID_NULL_BLANK);
-        }
+		}
 
-        return error;
+		return error;
 
-    }
+	}
 
 }

src/main/java/com/example/rhizome/app/presentation/form/LoginInfoForm.java

@@ -4,20 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * ログインを試みる人を表現するモデルクラスです
- */
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class LoginInfoForm {
-    /**
+	private String mailAddress;
-     * メールアドレス
+	private String password;
-     */
-    private String mailAddress;
-    /**
-     * パスワード
-     */
-    private String password;
 }

src/main/java/com/example/rhizome/app/presentation/form/LoginUserForm.java

@@ -1,7 +1,7 @@
 package com.example.rhizome.app.presentation.form;
 
-
 import com.example.rhizome.app.domain.model.LoginUser;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,104 +10,56 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class LoginUserForm {
-    /**
+	private Integer idEmployee;
-     * 社員ID
+	private String nmEmployee;
-     */
+	private String knEmployee;
-    private Integer idEmployee;
+	private String mailAddress;
-    /**
+	private String password;
-     * 社員名
-     */
-    private String nmEmployee;
-    /**
-     * 社員名カナ
-     */
-    private String knEmployee;
-    /**
-     * メールアドレス
-     */
-    private String mailAddress;
-    /**
-     * パスワード
-     */
-    private String password;
 
-    /**
+	private Integer adminAuth;
-     * 管理者権限
-     */
-    private Integer adminAuth;
 
-    /**
+	private Integer idDepartment;
-     * 部署ID
-     */
-    private Integer idDepartment;
 
-    /**
+	public static LoginUserForm convertFrom(LoginUser loginUser) {
-     * business 層の LoginUser クラスから画面用（presentation 層）の LoginUserForm に
+		return new LoginUserForm(
-     * 変換します。
+				loginUser.getIdEmployee(),
-     *
+				loginUser.getNmEmployee(),
-     * @param loginUser business 層の LoginUser インスタンス
+				loginUser.getKnEmployee(),
-     * @return クラスから画面用（presentation 層）の LoginUserForm
+				loginUser.getMailAddress(),
-     */
+				loginUser.getPassword(),
-    public static LoginUserForm convertFrom(LoginUser loginUser) {
+				loginUser.getAdminAuth(),
-        return new LoginUserForm(
+				loginUser.getIdDepartment());
-                loginUser.getIdEmployee(),
+	}
-                loginUser.getNmEmployee(),
-                loginUser.getKnEmployee(),
-                loginUser.getMailAddress(),
-                loginUser.getPassword(),
-                loginUser.getAdminAuth(),
-                loginUser.getIdDepartment()
-        );
-    }
 
-    /**
+	public static LoginUser convertTo(LoginUserForm loginUserForm) {
-     * 画面用（presentation 層）の LoginUserForm クラスから business 層の LoginUser クラスに
+		return new LoginUser(
-     * 変換します。
+				loginUserForm.getIdEmployee(),
-     *
+				loginUserForm.getNmEmployee(),
-     * @param loginUserForm 画面用（presentation 層）の LoginUserForm インスタンス
+				loginUserForm.getKnEmployee(),
-     * @return business 層の LoginUser インスタンス
+				loginUserForm.getMailAddress(),
-     */
+				loginUserForm.getPassword(),
-    public static LoginUser convertTo(LoginUserForm loginUserForm) {
+				loginUserForm.getAdminAuth(),
-        return new LoginUser(
+				loginUserForm.getIdDepartment());
-                loginUserForm.getIdEmployee(),
+	}
-                loginUserForm.getNmEmployee(),
-                loginUserForm.getKnEmployee(),
-                loginUserForm.getMailAddress(),
-                loginUserForm.getPassword(),
-                loginUserForm.getAdminAuth(),
-                loginUserForm.getIdDepartment()
-        );
-    }
 
-    /**
+	public static boolean checkParameter(LoginInfoForm loginInfoForm) {
-     * 画面から渡ってきた必須の値が仕様を満たしているか確認
+		if (null == loginInfoForm.getMailAddress()) {
-     *
+			return false;
-     * @param loginInfoForm 画面から渡ってきた mailAddress, password を格納しているインスタンス
+		}
-     * @return true:仕様を満たしている , false:仕様を満たしていない
-     */
-    public static boolean checkParameter(LoginInfoForm loginInfoForm) {
-        if (null == loginInfoForm.getMailAddress()) {
-            return false;
-        }
 
-        if (loginInfoForm.getMailAddress().isBlank()) {
+		if (loginInfoForm.getMailAddress().isBlank()) {
-            return false;
+			return false;
-        }
+		}
 
-        if (null == loginInfoForm.getPassword()) {
+		if (null == loginInfoForm.getPassword()) {
-            return false;
+			return false;
-        }
+		}
 
-        return !loginInfoForm.getPassword().isBlank();
+		return !loginInfoForm.getPassword().isBlank();
 
-    }
+	}
 
-    /**
+	public boolean isAdminUser() {
-     * 管理者権限を持っているか確認
+		return getAdminAuth() == 1;
-     *
+	}
-     * @return true:管理者権限を持っている , false:管理者権限を持っていない
-     */
-    public boolean isAdminUser() {
-        return getAdminAuth() == 1;
-    }
 }

src/main/java/com/example/rhizome/app/presentation/form/MessageForm.java

@@ -4,12 +4,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 画面に表示するエラーメッセージを管理するクラスです。
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class MessageForm {
-    private String message;
+	private String message;
 }

src/main/java/com/example/rhizome/app/presentation/form/SearchConditionEmployeeForm.java

@@ -1,70 +1,37 @@
 package com.example.rhizome.app.presentation.form;
 
 import com.example.rhizome.app.domain.model.SearchConditionEmployee;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 画面から渡ってきた検索条件をまとめ、再度画面に表示する為のクラス
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class SearchConditionEmployeeForm {
 
-    /**
+	private Integer idEmployee;
-     * 社員ID
+	private String nmEmployee;
-     */
+	private String knEmployee;
-    private Integer idEmployee;
+	private String mailAddress;
-    /**
+	private Integer idDepartment;
-     * 社員名
-     */
-    private String nmEmployee;
-    /**
-     * 社員名カナ
-     */
-    private String knEmployee;
-    /**
-     * メールアドレス
-     */
-    private String mailAddress;
-    /**
-     * 部署ID
-     */
-    private Integer idDepartment;
 
-    /**
+	public static SearchConditionEmployeeForm convertFrom(SearchConditionEmployee searchConditionEmployee) {
-     * business 層の SearchConditionEmployee クラスから画面用（presentation 層）の SearchConditionEmployeeForm に
+		return new SearchConditionEmployeeForm(
-     * 変換します。
+				searchConditionEmployee.getIdEmployee(),
-     *
+				searchConditionEmployee.getNmEmployee(),
-     * @param searchConditionEmployee business 層の SearchConditionEmployee インスタンス
+				searchConditionEmployee.getKnEmployee(),
-     * @return 画面用（presentation 層）の SearchConditionEmployeeForm インスタンス
+				searchConditionEmployee.getMailAddress(),
-     */
+				searchConditionEmployee.getIdDepartment());
-    public static SearchConditionEmployeeForm convertFrom(SearchConditionEmployee searchConditionEmployee) {
+	}
-        return new SearchConditionEmployeeForm(
-                searchConditionEmployee.getIdEmployee(),
-                searchConditionEmployee.getNmEmployee(),
-                searchConditionEmployee.getKnEmployee(),
-                searchConditionEmployee.getMailAddress(),
-                searchConditionEmployee.getIdDepartment()
-        );
-    }
 
-    /**
+	public static SearchConditionEmployee convertTo(SearchConditionEmployeeForm searchConditionEmployeeForm) {
-     * 画面用（presentation 層）の SearchConditionEmployeeForm クラスから business 層の SearchConditionEmployee クラスに
+		return new SearchConditionEmployee(
-     * 変換します。
+				searchConditionEmployeeForm.getIdEmployee(),
-     *
+				searchConditionEmployeeForm.getNmEmployee(),
-     * @param searchConditionEmployeeForm 画面用（presentation 層）の SearchConditionEmployeeForm インスタンス
+				searchConditionEmployeeForm.getKnEmployee(),
-     * @return business 層の SearchConditionEmployee インスタンス
+				searchConditionEmployeeForm.getMailAddress(),
-     */
+				searchConditionEmployeeForm.getIdDepartment());
-    public static SearchConditionEmployee convertTo(SearchConditionEmployeeForm searchConditionEmployeeForm) {
+	}
-        return new SearchConditionEmployee(
-                searchConditionEmployeeForm.getIdEmployee(),
-                searchConditionEmployeeForm.getNmEmployee(),
-                searchConditionEmployeeForm.getKnEmployee(),
-                searchConditionEmployeeForm.getMailAddress(),
-                searchConditionEmployeeForm.getIdDepartment()
-        );
-    }
 }

src/main/java/com/example/rhizome/app/presentation/form/UpdateEmployeeInfoForm.java

@@ -1,192 +1,104 @@
 package com.example.rhizome.app.presentation.form;
 
+import java.util.List;
+
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.EmployeeInfo;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
-/**
- * 画面から渡ってきた更新内容をまとめ、再度画面に表示する為のクラス
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class UpdateEmployeeInfoForm {
 
-    /**
+	private Integer idEmployee;
-     * 社員ID
+	private String nmEmployee;
-     */
+	private String knEmployee;
-    private Integer idEmployee;
+	private String mailAddress;
-    /**
+	private String password;
-     * 社員名
+	private String passwordConfirm;
-     */
+	private Integer adminAuth;
-    private String nmEmployee;
+	private Integer idDepartment;
-    /**
-     * 社員名カナ
-     */
-    private String knEmployee;
-    /**
-     * メールアドレス
-     */
-    private String mailAddress;
-    /**
-     * パスワード
-     */
-    private String password;
-    /**
-     * パスワード確認用
-     */
-    private String passwordConfirm;
-    /**
-     * 管理者権限
-     */
-    private Integer adminAuth;
-    /**
-     * 部署ID
-     */
-    private Integer idDepartment;
 
-    /**
+	public static UpdateEmployeeInfoForm convertFrom(EmployeeInfo employeeInfo) {
-     * business 層の EmployeeInfo クラスから画面用（presentation 層）の UpdateEmployeeInfoForm に
+		return new UpdateEmployeeInfoForm(
-     * 変換します。
+				employeeInfo.getEmployee().getIdEmployee(),
-     *
+				employeeInfo.getEmployee().getNmEmployee(),
-     * @param employeeInfo business 層の EmployeeInfo インスタンス
+				employeeInfo.getEmployee().getKnEmployee(),
-     * @return 画面用（presentation 層）の UpdateEmployeeInfoForm インスタンス
+				employeeInfo.getEmployee().getMailAddress(),
-     */
+				employeeInfo.getEmployee().getPassword(),
-    public static UpdateEmployeeInfoForm convertFrom(EmployeeInfo employeeInfo) {
+				null,
-        return new UpdateEmployeeInfoForm(
+				employeeInfo.getEmployee().getAdminAuth(),
-                employeeInfo.getEmployee().getIdEmployee(),
+				employeeInfo.getDepartment().getIdDepartment());
-                employeeInfo.getEmployee().getNmEmployee(),
+	}
-                employeeInfo.getEmployee().getKnEmployee(),
-                employeeInfo.getEmployee().getMailAddress(),
-                employeeInfo.getEmployee().getPassword(),
-                null,
-                employeeInfo.getEmployee().getAdminAuth(),
-                employeeInfo.getDepartment().getIdDepartment()
-        );
-    }
 
-    /**
+	public static List<UpdateEmployeeInfoForm> convertFrom(List<EmployeeInfo> employeeInfoList) {
-     * business 層の EmployeeInfo クラスから画面用（presentation 層）の UpdateEmployeeInfoForm に
+		return employeeInfoList.stream().map(UpdateEmployeeInfoForm::convertFrom).toList();
-     * 変換します。（リスト版）
+	}
-     *
-     * @param employeeInfoList business 層の EmployeeInfo インスタンスのリスト
-     * @return 画面用（presentation 層）の UpdateEmployeeInfoForm インスタンスのリスト
-     */
-    public static List<UpdateEmployeeInfoForm> convertFrom(List<EmployeeInfo> employeeInfoList) {
-        return employeeInfoList.stream().map(UpdateEmployeeInfoForm::convertFrom).toList();
-    }
 
-    /**
+	public static Employee convertTo(UpdateEmployeeInfoForm updateEmployeeInfoForm) {
-     * 画面用（presentation 層）の UpdateEmployeeInfoForm クラスから business 層の Employee クラスに
+		return new Employee(
-     * 変換します。
+				updateEmployeeInfoForm.getIdEmployee(),
-     *
+				updateEmployeeInfoForm.getNmEmployee(),
-     * @param updateEmployeeInfoForm 画面用（presentation 層）の UpdateEmployeeInfoForm インスタンス
+				updateEmployeeInfoForm.getKnEmployee(),
-     * @return business 層の Employee インスタンス
+				updateEmployeeInfoForm.getMailAddress(),
-     */
+				updateEmployeeInfoForm.getPassword(),
-    public static Employee convertTo(UpdateEmployeeInfoForm updateEmployeeInfoForm) {
+				updateEmployeeInfoForm.getAdminAuth(),
-        return new Employee(
+				updateEmployeeInfoForm.getIdDepartment());
-                updateEmployeeInfoForm.getIdEmployee(),
+	}
-                updateEmployeeInfoForm.getNmEmployee(),
-                updateEmployeeInfoForm.getKnEmployee(),
-                updateEmployeeInfoForm.getMailAddress(),
-                updateEmployeeInfoForm.getPassword(),
-                updateEmployeeInfoForm.getAdminAuth(),
-                updateEmployeeInfoForm.getIdDepartment()
-        );
-    }
 
-    /**
+	public static boolean hasErrorParameter(UpdateEmployeeInfoForm updateEmployeeInfoForm) {
-     * 画面から渡ってきたパラメータのチェック
-     *
-     * @param updateEmployeeInfoForm 画面から渡ってきたパラメータ
-     * @return true: エラー無し　false:エラーあり（必須を満たしていない）
-     */
-    public static boolean hasErrorParameter(UpdateEmployeeInfoForm updateEmployeeInfoForm) {
 
-        boolean errorFlag = !isNullOrBlank(updateEmployeeInfoForm.getNmEmployee());
+		boolean errorFlag = !isNullOrBlank(updateEmployeeInfoForm.getNmEmployee());
 
-        if (!isNullOrBlank(updateEmployeeInfoForm.getKnEmployee())) {
+		if (!isNullOrBlank(updateEmployeeInfoForm.getKnEmployee())) {
-            errorFlag = true;
+			errorFlag = true;
-        }
+		}
-        if (!isNullOrBlank(updateEmployeeInfoForm.getMailAddress())) {
+		if (!isNullOrBlank(updateEmployeeInfoForm.getMailAddress())) {
-            errorFlag = true;
+			errorFlag = true;
-        }
+		}
-        if (!isNullOrBlank(updateEmployeeInfoForm.getPassword())) {
+		if (!isNullOrBlank(updateEmployeeInfoForm.getPassword())) {
-            errorFlag = true;
+			errorFlag = true;
-        }
+		}
 
+		return errorFlag;
+	}
 
-        return errorFlag;
+	public static String validatePassword(String password, String passwordConfirm) {
-    }
 
-    /**
+		final String ERROR = "パスワードが一致していません";
-     * パスワードの仕様チェック
-     * パスワードが仕様を満たしてないか確認
-     *
-     * @param password        更新対象のパスワード
-     * @param passwordConfirm 更新対象の確認用パスワード
-     * @return 空文字: エラー無し　それ以外:エラー内容
-     */
-    public static String validatePassword(String password, String passwordConfirm) {
 
-        final String ERROR = "パスワードが一致していません";
+		if (areBothBlank(password, passwordConfirm)) {
+			return "";
+		}
 
-        if (areBothBlank(password, passwordConfirm)) {
+		if (isEitherBlank(password, passwordConfirm)) {
-            // どちらもnullまたは空白の場合はOK
+			return ERROR;
-            return "";
+		}
-        }
 
-        // どちらかがnullまたは空白の場合のエラーハンドリング
+		if (!password.equals(passwordConfirm)) {
-        if (isEitherBlank(password, passwordConfirm)) {
+			return ERROR;
-            return ERROR;
+		}
-        }
+		return "";
 
-        // 値が異なった場合はエラーハンドリング
+	}
-        if (!password.equals(passwordConfirm)) {
-            return ERROR;
-        }
-        return "";
 
-    }
+	private static boolean isNullOrBlank(String str) {
+		if (null == str) {
+			return true;
+		}
+		return str.isBlank();
+	}
 
-    /**
+	private static boolean areBothBlank(String password, String passwordConfirm) {
-     * 仮引数を null or 空 判定する
+		return (password == null || password.isBlank()) && (passwordConfirm == null || passwordConfirm.isBlank());
-     *
+	}
-     * @param str 判定対象の文字列
-     * @return true:null or 空 false:null or 空 では無い
-     */
-    private static boolean isNullOrBlank(String str) {
-        if (null == str) {
-            return true;
-        }
-        return str.isBlank();
-    }
 
-    /**
+	private static boolean isEitherBlank(String password, String passwordConfirm) {
-     * パスワードが今回更新対象に含まれているかチェック
+		return password == null || password.isBlank() || passwordConfirm == null || passwordConfirm.isBlank();
-     *
+	}
-     * @param password        更新対象のパスワード
-     * @param passwordConfirm 更新対象の確認用パスワード
-     * @return true:どちらもnullまたは空白の場合 false:それ以外
-     */
-    private static boolean areBothBlank(String password, String passwordConfirm) {
-        return (password == null || password.isBlank()) && (passwordConfirm == null || passwordConfirm.isBlank());
-    }
-
-    /**
-     * パスワードが今回更新対象に含まれているかチェック　その2
-     *
-     * @param password        更新対象のパスワード
-     * @param passwordConfirm 更新対象の確認用パスワード
-     * @return true: 問題なし false:どちらかがnullまたは空白の場合
-     */
-    // どちらかがnullまたは空白の場合のエラーハンドリング
-    private static boolean isEitherBlank(String password, String passwordConfirm) {
-        return password == null || password.isBlank() || passwordConfirm == null || passwordConfirm.isBlank();
-    }
 
 }

src/main/java/com/example/rhizome/app/presentation/form/UpdatePersonalUserForm.java

@@ -2,184 +2,101 @@ package com.example.rhizome.app.presentation.form;
 
 import com.example.rhizome.app.domain.model.Employee;
 import com.example.rhizome.app.domain.model.LoginUser;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * 個人情報更新画面のフォームクラスです。
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class UpdatePersonalUserForm {
-    /**
+	private Integer idEmployee;
-     * 社員ID
+	private String nmEmployee;
-     */
+	private String knEmployee;
-    private Integer idEmployee;
+	private String mailAddress;
-    /**
+	private String password;
-     * 社員名
+	private String passwordConfirm;
-     */
-    private String nmEmployee;
-    /**
-     * 社員名カナ
-     */
-    private String knEmployee;
-    /**
-     * メールアドレス
-     */
-    private String mailAddress;
-    /**
-     * パスワード
-     */
-    private String password;
-    /**
-     * パスワード確認用
-     */
-    private String passwordConfirm;
 
+	public static Employee convertTo(UpdatePersonalUserForm updatePersonalUserForm) {
+		return new Employee(
+				updatePersonalUserForm.getIdEmployee(),
+				updatePersonalUserForm.getNmEmployee(),
+				updatePersonalUserForm.getKnEmployee(),
+				updatePersonalUserForm.getMailAddress(),
+				updatePersonalUserForm.getPassword(),
+				null,
+				null);
+	}
 
-    /**
+	public static UpdatePersonalUserForm convertFrom(Employee employee) {
-     * 画面用（presentation 層）の UpdatePersonalUserForm クラスから business 層の Employee クラスに
+		return new UpdatePersonalUserForm(
-     * 変換します。
+				employee.getIdEmployee(),
-     *
+				employee.getNmEmployee(),
-     * @param updatePersonalUserForm 画面用（presentation 層）の UpdatePersonalUserForm インスタンス
+				employee.getKnEmployee(),
-     * @return business 層の Employee インスタンス
+				employee.getMailAddress(),
-     */
+				employee.getPassword(),
-    public static Employee convertTo(UpdatePersonalUserForm updatePersonalUserForm) {
+				null);
-        return new Employee(
+	}
-                updatePersonalUserForm.getIdEmployee(),
-                updatePersonalUserForm.getNmEmployee(),
-                updatePersonalUserForm.getKnEmployee(),
-                updatePersonalUserForm.getMailAddress(),
-                updatePersonalUserForm.getPassword(),
-                null,
-                null
-        );
-    }
 
-    /**
+	public static UpdatePersonalUserForm convertFrom(LoginUser loginUser) {
-     * business 層の Employee クラスから画面用（presentation 層）の UpdatePersonalUserForm に
+		return new UpdatePersonalUserForm(
-     * 変換します。（リスト版）
+				loginUser.getIdEmployee(),
-     *
+				loginUser.getNmEmployee(),
-     * @param employee business 層の employee インスタンスのリスト
+				loginUser.getKnEmployee(),
-     * @return クラスから画面用（presentation 層）の UpdatePersonalUserForm インスタンスのリスト
+				loginUser.getMailAddress(),
-     */
+				loginUser.getPassword(),
-    public static UpdatePersonalUserForm convertFrom(Employee employee) {
+				null);
-        return new UpdatePersonalUserForm(
+	}
-                employee.getIdEmployee(),
-                employee.getNmEmployee(),
-                employee.getKnEmployee(),
-                employee.getMailAddress(),
-                employee.getPassword(),
-                null
-        );
-    }
 
-    /**
+	public static boolean hasErrorParameter(UpdatePersonalUserForm updatePersonalUserForm) {
-     * business 層の Employee クラスから画面用（presentation 層）の UpdatePersonalUserForm に
-     * 変換します。（リスト版）
-     *
-     * @param loginUser business 層の loginUser インスタンスのリスト
-     * @return クラスから画面用（presentation 層）の UpdatePersonalUserForm インスタンスのリスト
-     */
-    public static UpdatePersonalUserForm convertFrom(LoginUser loginUser) {
-        return new UpdatePersonalUserForm(
-                loginUser.getIdEmployee(),
-                loginUser.getNmEmployee(),
-                loginUser.getKnEmployee(),
-                loginUser.getMailAddress(),
-                loginUser.getPassword(),
-                null
-        );
-    }
 
-    /**
+		boolean errorFlag = !isNullOrBlank(updatePersonalUserForm.getNmEmployee());
-     * 画面から渡ってきたパラメータのチェック
-     *
-     * @param updatePersonalUserForm 画面から渡ってきたパラメータ
-     * @return true: エラー無し　false:エラーあり（必須を満たしていない）
-     */
-    public static boolean hasErrorParameter(UpdatePersonalUserForm updatePersonalUserForm) {
 
-        boolean errorFlag = !isNullOrBlank(updatePersonalUserForm.getNmEmployee());
+		if (!isNullOrBlank(updatePersonalUserForm.getKnEmployee())) {
+			errorFlag = true;
+		}
+		if (!isNullOrBlank(updatePersonalUserForm.getMailAddress())) {
+			errorFlag = true;
+		}
+		if (!isNullOrBlank(updatePersonalUserForm.getPassword())) {
+			errorFlag = true;
+		}
 
-        if (!isNullOrBlank(updatePersonalUserForm.getKnEmployee())) {
+		return errorFlag;
-            errorFlag = true;
+	}
-        }
-        if (!isNullOrBlank(updatePersonalUserForm.getMailAddress())) {
-            errorFlag = true;
-        }
-        if (!isNullOrBlank(updatePersonalUserForm.getPassword())) {
-            errorFlag = true;
-        }
 
+	public static String validatePassword(String password, String passwordConfirm) {
 
-        return errorFlag;
+		final String ERROR = "パスワードが一致していません";
-    }
 
-    /**
+		if (areBothBlank(password, passwordConfirm)) {
-     * パスワードの仕様チェック
+			return "";
-     * パスワードが仕様を満たしてないか確認
+		}
-     *
-     * @param password        更新対象のパスワード
-     * @param passwordConfirm 更新対象の確認用パスワード
-     * @return 空文字: エラー無し　それ以外:エラー内容
-     */
-    public static String validatePassword(String password, String passwordConfirm) {
 
-        final String ERROR = "パスワードが一致していません";
+		if (isEitherBlank(password, passwordConfirm)) {
+			return ERROR;
+		}
 
-        if (areBothBlank(password, passwordConfirm)) {
+		if (!password.equals(passwordConfirm)) {
-            // どちらもnullまたは空白の場合はOK
+			return ERROR;
-            return "";
+		}
-        }
+		return "";
 
-        // どちらかがnullまたは空白の場合のエラーハンドリング
+	}
-        if (isEitherBlank(password, passwordConfirm)) {
-            return ERROR;
-        }
 
-        // 値が異なった場合はエラーハンドリング
+	private static boolean isNullOrBlank(String str) {
-        if (!password.equals(passwordConfirm)) {
+		if (null == str) {
-            return ERROR;
+			return true;
-        }
+		}
-        return "";
+		return str.isBlank();
+	}
 
-    }
+	private static boolean areBothBlank(String password, String passwordConfirm) {
+		return (password == null || password.isBlank()) && (passwordConfirm == null || passwordConfirm.isBlank());
+	}
 
-    /**
+	private static boolean isEitherBlank(String password, String passwordConfirm) {
-     * 仮引数を null or 空 判定する
+		return password == null || password.isBlank() || passwordConfirm == null || passwordConfirm.isBlank();
-     *
+	}
-     * @param str 判定対象の文字列
-     * @return true:null or 空 false:null or 空 では無い
-     */
-    private static boolean isNullOrBlank(String str) {
-        if (null == str) {
-            return true;
-        }
-        return str.isBlank();
-    }
-
-    /**
-     * パスワードが今回更新対象に含まれているかチェック
-     *
-     * @param password        更新対象のパスワード
-     * @param passwordConfirm 更新対象の確認用パスワード
-     * @return true:どちらもnullまたは空白の場合 false:それ以外
-     */
-    private static boolean areBothBlank(String password, String passwordConfirm) {
-        return (password == null || password.isBlank()) && (passwordConfirm == null || passwordConfirm.isBlank());
-    }
-
-    /**
-     * パスワードが今回更新対象に含まれているかチェック　その2
-     *
-     * @param password        更新対象のパスワード
-     * @param passwordConfirm 更新対象の確認用パスワード
-     * @return true: 問題なし false:どちらかがnullまたは空白の場合
-     */
-    private static boolean isEitherBlank(String password, String passwordConfirm) {
-        return password == null || password.isBlank() || passwordConfirm == null || passwordConfirm.isBlank();
-    }
 }