SiteService.logAbout{AbsentPage,FailedAuthentication}(): finally port to JDBC.

Addresed to #120

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/Db.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2009-2016 Slava Semushin <slava.semushin@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package ru.mystamps.web;
+
+public final class Db {
+	
+	public static final class SuspiciousActivity {
+		public static final int PAGE_URL_LENGTH     = 100;
+		public static final int REFERER_PAGE_LENGTH = 255;
+		public static final int USER_AGENT_LENGTH   = 255;
+	}
+	
+}

src/main/java/ru/mystamps/web/controller/ErrorController.java

@@ -29,7 +29,6 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.Url;
-import ru.mystamps.web.entity.User;
 import ru.mystamps.web.service.SiteService;
 import ru.mystamps.web.support.spring.security.CustomUserDetails;
 
@@ -52,12 +51,12 @@ public void notFound(
 		String ip     = request.getRemoteAddr();
 		String method = request.getMethod();
 
-		User currentUser = null;
+		Integer userId = null;
 		if (userDetails != null) {
-			currentUser = userDetails.getUser();
+			userId = userDetails.getUser().getId();
 		}
 
-		siteService.logAboutAbsentPage(page, method, currentUser, ip, referer, agent);
+		siteService.logAboutAbsentPage(page, method, userId, ip, referer, agent);
 	}
 
 	@RequestMapping(Url.INTERNAL_ERROR_PAGE)

src/main/java/ru/mystamps/web/dao/SuspiciousActivityDao.java

@@ -17,8 +17,8 @@
  */
 package ru.mystamps.web.dao;
 
-import ru.mystamps.web.entity.SuspiciousActivity;
+import ru.mystamps.web.dao.dto.AddSuspiciousActivityDbDto;
 
 public interface SuspiciousActivityDao {
-	void add(SuspiciousActivity activity);
+	void add(AddSuspiciousActivityDbDto activity);
 }

src/main/java/ru/mystamps/web/dao/dto/AddSuspiciousActivityDbDto.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2009-2016 Slava Semushin <slava.semushin@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package ru.mystamps.web.dao.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AddSuspiciousActivityDbDto {
+	private String type;
+	private Date occurredAt;
+	private String page;
+	private String method;
+	private Integer userId;
+	private String ip;
+	private String refererPage;
+	private String userAgent;
+}

src/main/java/ru/mystamps/web/dao/impl/JdbcSuspiciousActivityDao.java

@@ -28,7 +28,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.SuspiciousActivityDao;
-import ru.mystamps.web.entity.SuspiciousActivity;
+import ru.mystamps.web.dao.dto.AddSuspiciousActivityDbDto;
 
 @RequiredArgsConstructor
 public class JdbcSuspiciousActivityDao implements SuspiciousActivityDao {
@@ -39,15 +39,12 @@ public class JdbcSuspiciousActivityDao implements SuspiciousActivityDao {
 	private String addSuspiciousActivitySql;
 
 	@Override
-	public void add(SuspiciousActivity activity) {
+	public void add(AddSuspiciousActivityDbDto activity) {
 		Map<String, Object> params = new HashMap<>();
-		params.put("type", activity.getType().getName());
+		params.put("type", activity.getType());
 		params.put("occurred_at", activity.getOccurredAt());
 		params.put("page", activity.getPage());
-		Integer userId = activity.getUser() != null // NOPMD
-			? activity.getUser().getId()
-			: null;
-		params.put("user_id", userId);
+		params.put("user_id", activity.getUserId());
 		params.put("ip", activity.getIp());
 		params.put("method", activity.getMethod());
 		params.put("referer_page", activity.getRefererPage());

src/main/java/ru/mystamps/web/service/SiteService.java

@@ -19,14 +19,12 @@
 
 import java.util.Date;
 
-import ru.mystamps.web.entity.User;
-
 public interface SiteService {
 	@SuppressWarnings("PMD.UseObjectForClearerAPI")
 	void logAboutAbsentPage(
 		String page,
 		String method,
-		User user,
+		Integer userId,
 		String ip,
 		String referer,
 		String agent
@@ -35,7 +33,7 @@ void logAboutAbsentPage(
 	void logAboutFailedAuthentication(
 		String page,
 		String method,
-		User user,
+		Integer userId,
 		String ip,
 		String referer,
 		String agent,

src/main/java/ru/mystamps/web/service/SiteServiceImpl.java

@@ -30,10 +30,9 @@
 
 import lombok.RequiredArgsConstructor;
 
+import ru.mystamps.web.Db;
 import ru.mystamps.web.dao.SuspiciousActivityDao;
-import ru.mystamps.web.entity.SuspiciousActivity;
-import ru.mystamps.web.entity.SuspiciousActivityType;
-import ru.mystamps.web.entity.User;
+import ru.mystamps.web.dao.dto.AddSuspiciousActivityDbDto;
 
 @RequiredArgsConstructor
 public class SiteServiceImpl implements SiteService {
@@ -54,12 +53,12 @@ public class SiteServiceImpl implements SiteService {
 	public void logAboutAbsentPage(
 			String page,
 			String method,
-			User user,
+			Integer userId,
 			String ip,
 			String referer,
 			String agent) {
 
-		logEvent(PAGE_NOT_FOUND, page, method, user, ip, referer, agent, new Date());
+		logEvent(PAGE_NOT_FOUND, page, method, userId, ip, referer, agent, new Date());
 	}
 
 	@Override
@@ -68,21 +67,21 @@ public void logAboutAbsentPage(
 	public void logAboutFailedAuthentication(
 			String page,
 			String method,
-			User user,
+			Integer userId,
 			String ip,
 			String referer,
 			String agent,
 			Date date) {
 
-		logEvent(AUTHENTICATION_FAILED, page, method, user, ip, referer, agent, date);
+		logEvent(AUTHENTICATION_FAILED, page, method, userId, ip, referer, agent, date);
 	}
 
 	@SuppressWarnings({"PMD.UseObjectForClearerAPI", "checkstyle:parameternumber"})
 	private void logEvent(
 			String type,
 			String page,
 			String method,
-			User user,
+			Integer userId,
 			String ip,
 			String referer,
 			String agent,
@@ -91,19 +90,13 @@ private void logEvent(
 		Validate.isTrue(type != null, "Type of suspicious activity was not set");
 		Validate.isTrue(page != null, "Page should be non null");
 
-		SuspiciousActivity activity = new SuspiciousActivity();
-		
-		// TODO: replace entity with DTO and replace SuspiciousActivityType by String
-		SuspiciousActivityType activityType = new SuspiciousActivityType();
-		activityType.setName(type);
-		activity.setType(activityType);
+		AddSuspiciousActivityDbDto activity = new AddSuspiciousActivityDbDto();
 
+		activity.setType(type);
 		activity.setOccurredAt(date == null ? new Date() : date);
 		activity.setPage(abbreviatePage(page));
 		activity.setMethod(method);
-		
-		activity.setUser(user);
-		
+		activity.setUserId(userId);
 		activity.setIp(StringUtils.defaultString(ip));
 		activity.setRefererPage(StringUtils.stripToNull(abbreviateRefererPage(referer)));
 		activity.setUserAgent(StringUtils.stripToNull(abbreviateUserAgent(agent)));
@@ -112,17 +105,23 @@ private void logEvent(
 	}
 
 	private static String abbreviatePage(String page) {
-		return abbreviateIfLengthGreaterThan(page, SuspiciousActivity.PAGE_URL_LENGTH, "page");
+		return abbreviateIfLengthGreaterThan(page, Db.SuspiciousActivity.PAGE_URL_LENGTH, "page");
 	}
 
 	private static String abbreviateRefererPage(String referer) {
-		// CheckStyle: ignore LineLength for next 1 lines
-		return abbreviateIfLengthGreaterThan(referer, SuspiciousActivity.REFERER_PAGE_LENGTH, "referer_page");
+		return abbreviateIfLengthGreaterThan(
+			referer,
+			Db.SuspiciousActivity.REFERER_PAGE_LENGTH,
+			"referer_page"
+		);
 	}
 
 	private static String abbreviateUserAgent(String agent) {
-		// CheckStyle: ignore LineLength for next 1 lines
-		return abbreviateIfLengthGreaterThan(agent, SuspiciousActivity.USER_AGENT_LENGTH, "user_agent");
+		return abbreviateIfLengthGreaterThan(
+			agent,
+			Db.SuspiciousActivity.USER_AGENT_LENGTH,
+			"user_agent"
+		);
 	}
 
 	// CheckStyle: ignore LineLength for next 1 lines