Country: move to ru.mystamps.web.feature.country package.

Addressed to #927

No functional changes.

Author: php-coder

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

@@ -55,7 +55,6 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.Url;
-import ru.mystamps.web.controller.converter.annotation.Country;
 import ru.mystamps.web.controller.converter.annotation.CurrentUser;
 import ru.mystamps.web.controller.dto.AddImageForm;
 import ru.mystamps.web.controller.dto.AddSeriesForm;
@@ -71,6 +70,7 @@
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
 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.service.CollectionService;
 import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.service.SeriesImportService;

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

@@ -28,10 +28,10 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.controller.converter.annotation.Country;
 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.service.CountryService;
 import ru.mystamps.web.util.LocaleUtils;
 

src/main/java/ru/mystamps/web/controller/dto/AddSeriesForm.java

@@ -35,9 +35,9 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import ru.mystamps.web.controller.converter.annotation.Country;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.feature.category.Category;
+import ru.mystamps.web.feature.country.Country;
 import ru.mystamps.web.service.dto.AddSeriesDto;
 import ru.mystamps.web.support.beanvalidation.CatalogNumbers;
 import ru.mystamps.web.support.beanvalidation.HasImageOrImageUrl;

src/main/java/ru/mystamps/web/controller/dto/ImportSeriesForm.java

@@ -31,9 +31,9 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import ru.mystamps.web.controller.converter.annotation.Country;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.feature.category.Category;
+import ru.mystamps.web.feature.country.Country;
 import ru.mystamps.web.service.dto.AddSeriesDto;
 import ru.mystamps.web.support.beanvalidation.CatalogNumbers;
 

src/main/java/ru/mystamps/web/controller/converter/annotation/Country.java renamed to src/main/java/ru/mystamps/web/feature/country/Country.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.controller.converter.annotation;
+package ru.mystamps.web.feature.country;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

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

@@ -40,7 +40,6 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.Url;
-import ru.mystamps.web.controller.converter.annotation.Country;
 import ru.mystamps.web.controller.converter.annotation.CurrentUser;
 import ru.mystamps.web.controller.editor.ReplaceRepeatingSpacesEditor;
 import ru.mystamps.web.dao.dto.LinkEntityDto;