Replace User by Integer in controllers' arguments.

Addressed to #120

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/config/MvcConfig.java

@@ -43,7 +43,7 @@
 
 import ru.mystamps.web.Url;
 import ru.mystamps.web.controller.converter.LinkEntityDtoGenericConverter;
-import ru.mystamps.web.support.spring.security.UserArgumentResolver;
+import ru.mystamps.web.support.spring.security.CurrentUserArgumentResolver;
 
 @Configuration
 @EnableScheduling
@@ -93,7 +93,7 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 
 	@Override
 	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-		argumentResolvers.add(new UserArgumentResolver());
+		argumentResolvers.add(new CurrentUserArgumentResolver());
 	}
 
 	@Override

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

@@ -39,7 +39,7 @@
 
 import ru.mystamps.web.Url;
 import ru.mystamps.web.controller.converter.annotation.Category;
-import ru.mystamps.web.entity.User;
+import ru.mystamps.web.controller.converter.annotation.CurrentUser;
 import ru.mystamps.web.model.AddCategoryForm;
 import ru.mystamps.web.service.CategoryService;
 import ru.mystamps.web.service.SeriesService;
@@ -70,14 +70,14 @@ public AddCategoryForm showForm() {
 	public String processInput(
 		@Valid AddCategoryForm form,
 		BindingResult result,
-		User currentUser,
+		@CurrentUser Integer currentUserId,
 		RedirectAttributes redirectAttributes) {
 
 		if (result.hasErrors()) {
 			return null;
 		}
 
-		UrlEntityDto categoryUrl = categoryService.add(form, currentUser.getId());
+		UrlEntityDto categoryUrl = categoryService.add(form, currentUserId);
 
 		String dstUrl = UriComponentsBuilder.fromUriString(Url.INFO_CATEGORY_PAGE)
 			.buildAndExpand(categoryUrl.getId(), categoryUrl.getSlug())

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

@@ -39,7 +39,7 @@
 
 import ru.mystamps.web.Url;
 import ru.mystamps.web.controller.converter.annotation.Country;
-import ru.mystamps.web.entity.User;
+import ru.mystamps.web.controller.converter.annotation.CurrentUser;
 import ru.mystamps.web.model.AddCountryForm;
 import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.service.SeriesService;
@@ -70,14 +70,14 @@ public AddCountryForm showForm() {
 	public String processInput(
 		@Valid AddCountryForm form,
 		BindingResult result,
-		User currentUser,
+		@CurrentUser Integer currentUserId,
 		RedirectAttributes redirectAttributes) {
 
 		if (result.hasErrors()) {
 			return null;
 		}
 
-		UrlEntityDto countryUrl = countryService.add(form, currentUser.getId());
+		UrlEntityDto countryUrl = countryService.add(form, currentUserId);
 
 		String dstUrl = UriComponentsBuilder.fromUriString(Url.INFO_COUNTRY_PAGE)
 			.buildAndExpand(countryUrl.getId(), countryUrl.getSlug())

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

@@ -29,7 +29,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.Url;
-import ru.mystamps.web.entity.User;
+import ru.mystamps.web.controller.converter.annotation.CurrentUser;
 import ru.mystamps.web.service.SiteService;
 
 @Controller
@@ -42,7 +42,7 @@ public class ErrorController {
 	@RequestMapping(Url.NOT_FOUND_PAGE)
 	public void notFound(
 			HttpServletRequest request,
-			User currentUser,
+			@CurrentUser Integer currentUserId,
 			@RequestHeader(value = "referer", required = false) String referer,
 			@RequestHeader(value = "user-agent", required = false) String agent) {
 
@@ -51,12 +51,7 @@ public void notFound(
 		String ip     = request.getRemoteAddr();
 		String method = request.getMethod();
 
-		Integer userId = null;
-		if (currentUser != null) {
-			userId = currentUser.getId();
-		}
-		
-		siteService.logAboutAbsentPage(page, method, userId, ip, referer, agent);
+		siteService.logAboutAbsentPage(page, method, currentUserId, ip, referer, agent);
 	}
 
 	@RequestMapping(Url.INTERNAL_ERROR_PAGE)

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

@@ -52,7 +52,7 @@
 import ru.mystamps.web.Url;
 import ru.mystamps.web.controller.converter.annotation.Category;
 import ru.mystamps.web.controller.converter.annotation.Country;
-import ru.mystamps.web.entity.User;
+import ru.mystamps.web.controller.converter.annotation.CurrentUser;
 import ru.mystamps.web.model.AddImageForm;
 import ru.mystamps.web.model.AddSeriesForm;
 import ru.mystamps.web.service.CategoryService;
@@ -162,7 +162,7 @@ public String processInput(
 			AddSeriesForm.ImageChecks.class }) AddSeriesForm form,
 		BindingResult result,
 		HttpServletRequest request,
-		User currentUser) {
+		@CurrentUser Integer currentUserId) {
 
 		if (result.hasErrors()) {
 			// don't try to re-display file upload field
@@ -172,7 +172,7 @@ public String processInput(
 
 		boolean userCanAddComments =
 			SecurityContextUtils.hasAuthority(request, "ADD_COMMENTS_TO_SERIES");
-		Integer seriesId = seriesService.add(form, currentUser.getId(), userCanAddComments);
+		Integer seriesId = seriesService.add(form, currentUserId, userCanAddComments);
 
 		return redirectTo(Url.INFO_SERIES_PAGE, seriesId);
 	}
@@ -181,7 +181,7 @@ public String processInput(
 	public String showInfo(
 		@PathVariable("id") Integer seriesId,
 		Model model,
-		User currentUser,
+		@CurrentUser Integer currentUserId,
 		Locale userLocale,
 		HttpServletResponse response)
 		throws IOException {
@@ -209,9 +209,9 @@ public String showInfo(
 
 		model.addAttribute(
 			"isSeriesInCollection",
-			currentUser == null
+			currentUserId == null
 			? false
-			: collectionService.isSeriesInCollection(currentUser.getId(), series.getId())
+			: collectionService.isSeriesInCollection(currentUserId, series.getId())
 		);
 
 		model.addAttribute(
@@ -230,7 +230,7 @@ public String processImage(
 			BindingResult result,
 			@PathVariable("id") Integer seriesId,
 			Model model,
-			User currentUser,
+			@CurrentUser Integer currentUserId,
 			Locale userLocale,
 			HttpServletResponse response)
 			throws IOException {
@@ -257,7 +257,7 @@ public String processImage(
 
 		model.addAttribute(
 			"isSeriesInCollection",
-			collectionService.isSeriesInCollection(currentUser.getId(), series.getId())
+			collectionService.isSeriesInCollection(currentUserId, series.getId())
 		);
 
 		model.addAttribute(
@@ -274,7 +274,7 @@ public String processImage(
 			return "series/info";
 		}
 
-		seriesService.addImageToSeries(form, series.getId(), currentUser.getId());
+		seriesService.addImageToSeries(form, series.getId(), currentUserId);
 
 		return redirectTo(Url.INFO_SERIES_PAGE, series.getId());
 	}
@@ -286,7 +286,7 @@ public String processImage(
 	)
 	public String addToCollection(
 		@PathVariable("id") Integer seriesId,
-		User currentUser,
+		@CurrentUser Integer currentUserId,
 		RedirectAttributes redirectAttributes,
 		HttpServletResponse response)
 		throws IOException {
@@ -302,7 +302,7 @@ public String addToCollection(
 			return null;
 		}
 
-		UrlEntityDto collection = collectionService.addToCollection(currentUser.getId(), seriesId);
+		UrlEntityDto collection = collectionService.addToCollection(currentUserId, seriesId);
 
 		redirectAttributes.addFlashAttribute("justAddedSeries", true);
 		redirectAttributes.addFlashAttribute("justAddedSeriesId", seriesId);
@@ -317,7 +317,7 @@ public String addToCollection(
 	)
 	public String removeFromCollection(
 		@PathVariable("id") Integer seriesId,
-		User currentUser,
+		@CurrentUser Integer currentUserId,
 		RedirectAttributes redirectAttributes,
 		HttpServletResponse response)
 		throws IOException {
@@ -333,8 +333,7 @@ public String removeFromCollection(
 			return null;
 		}
 
-		UrlEntityDto collection =
-			collectionService.removeFromCollection(currentUser.getId(), seriesId);
+		UrlEntityDto collection = collectionService.removeFromCollection(currentUserId, seriesId);
 
 		redirectAttributes.addFlashAttribute("justRemovedSeries", true);
 

src/main/java/ru/mystamps/web/controller/converter/annotation/CurrentUser.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2009-2016 Slava Semushin <[email protected]>
+ *
+ * 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.controller.converter.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface CurrentUser {
+}

src/main/java/ru/mystamps/web/support/spring/security/UserArgumentResolver.java renamed to src/main/java/ru/mystamps/web/support/spring/security/CurrentUserArgumentResolver.java

@@ -23,13 +23,14 @@
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import ru.mystamps.web.entity.User;
+import ru.mystamps.web.controller.converter.annotation.CurrentUser;
 
-public class UserArgumentResolver implements HandlerMethodArgumentResolver {
+public class CurrentUserArgumentResolver implements HandlerMethodArgumentResolver {
 
 	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
-		return User.class.isAssignableFrom(parameter.getParameterType());
+		return parameter.getParameterType().isAssignableFrom(Integer.class)
+			&& parameter.hasParameterAnnotation(CurrentUser.class);
 	}
 
 	@Override
@@ -39,8 +40,7 @@ public Object resolveArgument(
 		NativeWebRequest webRequest,
 		WebDataBinderFactory binderFactory) {
 
-		return SecurityContextUtils.getUser();
+		return SecurityContextUtils.getUserId();
 	}
 
 }
-

src/main/java/ru/mystamps/web/support/spring/security/SecurityContextUtils.java

@@ -36,22 +36,17 @@ public static boolean hasAuthority(HttpServletRequest request, String authority)
 		return new SecurityContextHolderAwareRequestWrapper(request, null).isUserInRole(authority);
 	}
 
-	public static User getUser() {
+	/**
+	 * @author Sergey Chechenev
+	 * @author Slava Semushin
+	 */
+	public static Integer getUserId() {
 		return Optional
 			.ofNullable(SecurityContextHolder.getContext().getAuthentication())
 			.map(Authentication::getPrincipal)
 			.filter(CustomUserDetails.class::isInstance)
 			.map(CustomUserDetails.class::cast)
 			.map(CustomUserDetails::getUser)
-			.orElse(null);
-	}
-	
-	/**
-	 * @author Sergey Chechenev
-	 * @author Slava Semushin
-	 */
-	public static Integer getUserId() {
-		return Optional.ofNullable(getUser())
 			.map(User::getId)
 			.orElse(null);
 	}