refactor(LocaleUtils): move with tests to ru.mystamps.web.common package.

Addressed to #927

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/util/LocaleUtils.java renamed to src/main/java/ru/mystamps/web/common/LocaleUtils.java

@@ -15,7 +15,7 @@
  * 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.util;
+package ru.mystamps.web.common;
 
 import org.springframework.context.i18n.LocaleContext;
 import org.springframework.context.i18n.LocaleContextHolder;

src/main/java/ru/mystamps/web/controller/converter/LinkEntityDtoGenericConverter.java

@@ -22,12 +22,12 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.ConditionalGenericConverter;
+import ru.mystamps.web.common.LocaleUtils;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.feature.category.Category;
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.country.Country;
 import ru.mystamps.web.feature.country.CountryService;
-import ru.mystamps.web.util.LocaleUtils;
 
 import java.util.HashSet;
 import java.util.Set;

src/main/java/ru/mystamps/web/feature/account/UsersActivationServiceImpl.java

@@ -23,9 +23,9 @@
 import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.springframework.transaction.annotation.Transactional;
+import ru.mystamps.web.common.LocaleUtils;
 import ru.mystamps.web.feature.site.MailService;
 import ru.mystamps.web.support.togglz.Features;
-import ru.mystamps.web.util.LocaleUtils;
 
 import java.util.Date;
 import java.util.List;

src/main/java/ru/mystamps/web/feature/category/CategoryController.java

@@ -31,12 +31,12 @@
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.servlet.view.RedirectView;
 import ru.mystamps.web.Url;
+import ru.mystamps.web.common.LocaleUtils;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.feature.series.SeriesInfoDto;
 import ru.mystamps.web.feature.series.SeriesService;
 import ru.mystamps.web.support.spring.mvc.ReplaceRepeatingSpacesEditor;
 import ru.mystamps.web.support.spring.security.CurrentUser;
-import ru.mystamps.web.util.LocaleUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;

src/main/java/ru/mystamps/web/feature/category/CategoryServiceImpl.java

@@ -23,10 +23,10 @@
 import org.slf4j.Logger;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
+import ru.mystamps.web.common.LocaleUtils;
 import ru.mystamps.web.dao.dto.EntityWithParentDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.support.spring.security.HasAuthority;
-import ru.mystamps.web.util.LocaleUtils;
 import ru.mystamps.web.util.SlugUtils;
 
 import java.util.Collections;

src/main/java/ru/mystamps/web/feature/collection/CollectionController.java

@@ -27,9 +27,9 @@
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.view.RedirectView;
 import ru.mystamps.web.Url;
+import ru.mystamps.web.common.LocaleUtils;
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.country.CountryService;
-import ru.mystamps.web.util.LocaleUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

src/main/java/ru/mystamps/web/feature/country/CountryController.java

@@ -31,12 +31,12 @@
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.servlet.view.RedirectView;
 import ru.mystamps.web.Url;
+import ru.mystamps.web.common.LocaleUtils;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.feature.series.SeriesInfoDto;
 import ru.mystamps.web.feature.series.SeriesService;
 import ru.mystamps.web.support.spring.mvc.ReplaceRepeatingSpacesEditor;
 import ru.mystamps.web.support.spring.security.CurrentUser;
-import ru.mystamps.web.util.LocaleUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;

src/main/java/ru/mystamps/web/feature/country/CountryServiceImpl.java

@@ -23,9 +23,9 @@
 import org.slf4j.Logger;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
+import ru.mystamps.web.common.LocaleUtils;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.support.spring.security.HasAuthority;
-import ru.mystamps.web.util.LocaleUtils;
 import ru.mystamps.web.util.SlugUtils;
 
 import java.util.Collections;

src/main/java/ru/mystamps/web/feature/series/SeriesController.java

@@ -36,6 +36,7 @@
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.servlet.view.RedirectView;
 import ru.mystamps.web.Url;
+import ru.mystamps.web.common.LocaleUtils;
 import ru.mystamps.web.dao.dto.EntityWithParentDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.feature.category.Category;
@@ -55,7 +56,6 @@
 import ru.mystamps.web.support.spring.security.SecurityContextUtils;
 import ru.mystamps.web.support.thymeleaf.GroupByParent;
 import ru.mystamps.web.support.togglz.Features;
-import ru.mystamps.web.util.LocaleUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportController.java

@@ -29,6 +29,7 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import ru.mystamps.web.Url;
+import ru.mystamps.web.common.LocaleUtils;
 import ru.mystamps.web.feature.participant.EntityWithIdDto;
 import ru.mystamps.web.feature.participant.ParticipantService;
 import ru.mystamps.web.feature.series.CatalogUtils;
@@ -37,7 +38,6 @@
 import ru.mystamps.web.feature.series.importing.sale.SeriesSaleParsedDataDto;
 import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportService;
 import ru.mystamps.web.support.spring.security.CurrentUser;
-import ru.mystamps.web.util.LocaleUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

src/main/java/ru/mystamps/web/feature/site/SiteController.java

@@ -23,13 +23,13 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import ru.mystamps.web.Url;
+import ru.mystamps.web.common.LocaleUtils;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.feature.category.CategoryService;
 import ru.mystamps.web.feature.collection.CollectionService;
 import ru.mystamps.web.feature.country.CountryService;
 import ru.mystamps.web.feature.series.SeriesLinkDto;
 import ru.mystamps.web.feature.series.SeriesService;
-import ru.mystamps.web.util.LocaleUtils;
 import ru.mystamps.web.util.Pager;
 
 import java.util.List;

src/test/groovy/ru/mystamps/web/util/LocaleUtilsTest.groovy renamed to src/test/groovy/ru/mystamps/web/common/LocaleUtilsTest.groovy

@@ -15,7 +15,7 @@
  * 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.util
+package ru.mystamps.web.common
 
 import spock.lang.Specification
 import spock.lang.Unroll