Merge pull request #32 from support-project/develop

Develop

Author: koda-masaru

config/stylecheck.xml

@@ -29,7 +29,10 @@ Slightly modified version of Sun Checks that better matches the default code for
     <module name="LocalFinalVariableName"/>
     <module name="LocalVariableName"/>
     <module name="MemberName"/>
-    <module name="MethodName"/>
+    <module name="MethodName">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
     <module name="PackageName"/>
     <module name="ParameterName"/>
     <module name="StaticVariableName"/>
@@ -41,7 +44,10 @@ Slightly modified version of Sun Checks that better matches the default code for
     <module name="LineLength">
       <property name="max" value="150"/>
     </module>
-    <module name="MethodLength"/>
+    <module name="MethodLength">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
     <module name="ParameterNumber"/>
     <module name="EmptyForIteratorPad"/>
     <module name="GenericWhitespace"/>

src/main/java/org/support/project/web/control/Control.java

@@ -12,9 +12,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.arnx.jsonic.JSON;
-import net.arnx.jsonic.JSONException;
-
 import org.support.project.common.bean.ValidateError;
 import org.support.project.common.config.CommonBaseParameter;
 import org.support.project.common.config.Resources;
@@ -43,6 +40,10 @@
 import org.support.project.web.config.MessageStatus;
 import org.support.project.web.control.service.Get;
 import org.support.project.web.exception.InvalidParamException;
+import org.support.project.web.logic.impl.DefaultAuthenticationLogicImpl;
+
+import net.arnx.jsonic.JSON;
+import net.arnx.jsonic.JSONException;
 
 /**
  * Controlの基底クラス
@@ -69,9 +70,9 @@ public abstract class Control {
 
 	/** リソース */
 	protected Resources resources = Resources.getInstance(CommonBaseParameter.APP_RESOURCE);
-	
+	/** Viewのベースパス */
 	public static final String BASE_PATH = "/WEB-INF/views";
-	
+	/** HTMLエスケープして送信するかのフラグ */
 	private boolean sendEscapeHtml = true;
 
 	/**
@@ -158,7 +159,7 @@ protected String getForwardDir() {
 			if (StringUtils.isNotEmpty(subPackageName)) {
 				if (subPackageName.indexOf("\\.") != -1) {
 					String[] packages = StringUtils.split(subPackageName, ".");
-					for (int i = packages.length -1; i <= 0; i--) {
+					for (int i = packages.length - 1; i <= 0; i--) {
 						String string = packages[i];
 						builder.append(string).append("/");
 					}
@@ -443,6 +444,17 @@ protected String[] getPathInfos() {
 	public LoginedUser getLoginedUser() {
 		return (LoginedUser) request.getSession().getAttribute(CommonWebParameter.LOGIN_USER_INFO_SESSION_KEY);
 	}
+	/**
+	 * ログインユーザ情報を最新の情報で更新
+	 */
+	public void updateLoginInfo() {
+		DefaultAuthenticationLogicImpl authenticationLogic = Container.getComp(DefaultAuthenticationLogicImpl.class);
+		LoginedUser loginedUser = getLoginedUser();
+		if (loginedUser != null) {
+			authenticationLogic.clearSession(request);
+			authenticationLogic.setSession(loginedUser.getLoginUser().getUserKey(), request);
+		}
+	}
 
 	/**
 	 * ログインユーザのIDを取得
@@ -456,35 +468,73 @@ public Integer getLoginUserId() {
 		return loginedUser.getLoginUser().getUserId();
 	}
 
-	
+	/**
+	 * request を取得
+	 * @return
+	 */
 	public HttpServletRequest getRequest() {
 		return request;
 	}
+	/**
+	 * request をセット
+	 * @return
+	 */
 	public void setRequest(HttpServletRequest request) {
 		this.request = request;
 	}
+	/**
+	 * response を取得
+	 * @return
+	 */
 	public HttpServletResponse getResponse() {
 		return response;
 	}
+	/**
+	 * response をセット
+	 * @return
+	 */
 	public void setResponse(HttpServletResponse response) {
 		this.response = response;
 	}
+	/**
+	 * invokeTarget を取得
+	 * @return
+	 */
 	public InvokeTarget getInvokeTarget() {
 		return invokeTarget;
 	}
-
+	/**
+	 * invokeTarget をセット
+	 * @return
+	 */
 	public void setInvokeTarget(InvokeTarget invokeTarget) {
 		this.invokeTarget = invokeTarget;
 	}
+	/**
+	 * path を取得
+	 * @return
+	 */
 	public String getPath() {
 		return path;
 	}
+	/**
+	 * path をセット
+	 * @return
+	 */
 	public void setPath(String path) {
 		this.path = path;
 	}
+	/**
+	 * pathInfo を取得
+	 * @return
+	 */
 	public String getPathInfo() {
 		return pathInfo;
 	}
+	/**
+	 * pathInfo をセット
+	 * @return
+	 */
 	public void setPathInfo(String pathInfo) {
 		this.pathInfo = pathInfo;
 	}
@@ -611,23 +661,35 @@ protected String getParamWithDefault(String paramName, String defaultval) {
 		}
 	}
 
-	
+	/**
+	 * パラメータを取得
+	 * @param paramName
+	 * @param type
+	 * @return
+	 */
 	protected <T> T getParam(String paramName, Class<? extends T> type) {
 		try {
 			return HttpUtil.getParameter(request, paramName, type);
 		} catch (InvalidParamException e) {
 			throw new SystemException(e);
 		}
 	}
-	
+	/**
+	 * パラメータを取得
+	 * @param type
+	 * @return
+	 */
 	protected <T> T getParams(Class<? extends T> type) {
 		try {
 			return HttpUtil.parseRequest(request, type);
 		} catch (InstantiationException | IllegalAccessException | JSONException | IOException | InvalidParamException e) {
 			throw new SystemException(e);
 		}
 	}
-	
+	/**
+	 * パラメータをマップで取得
+	 * @return
+	 */
 	protected Map<String, String> getParams() {
 		Map<String, String> map = new HashMap<>();
 		Enumeration<String> enumeration = request.getParameterNames();
@@ -653,6 +715,16 @@ public void setSendEscapeHtml(boolean sendEscapeHtml) {
 		this.sendEscapeHtml = sendEscapeHtml;
 	}
 
+	/**
+	 * パラメータをオブジェクトにセットして取得
+	 * @param type
+	 * @return
+	 * @throws InstantiationException
+	 * @throws IllegalAccessException
+	 * @throws JSONException
+	 * @throws IOException
+	 * @throws InvalidParamException
+	 */
 	public <T> T getParamOnProperty(final Class<? extends T> type) 
 			throws InstantiationException, IllegalAccessException, JSONException, IOException, InvalidParamException {
 		return HttpUtil.parseRequest(request, type);

src/main/java/org/support/project/web/logic/SanitizingLogic.java

@@ -176,7 +176,7 @@ public boolean apply(String s) {
 			.onElements("colgroup", "col")
 			.allowElements("a", "label", "noscript", "h1", "h2", "h3", "h4", "h5", "h6", "p", "i", "b", "u", "strong", "em", "small", "big", "pre",
 					"code", "cite", "samp", "sub", "sup", "strike", "center", "blockquote", "hr", "br", "col", "font", "map", "span", "div", "img",
-					"ul", "ol", "li", "dd", "dt", "dl", "tbody", "thead", "tfoot", "table", "td", "th", "tr", "colgroup", "fieldset", "legend")
+					"ul", "ol", "li", "dd", "dt", "dl", "tbody", "thead", "tfoot", "table", "td", "th", "tr", "colgroup", "fieldset", "legend", "del")
 			.toFactory();