Rename package ru.mystamps.web.model to ru.mystamps.web.controller.dto

Addressed to #591

No functional changes.

Author: GiBg1aN

src/main/config/checkstyle-suppressions.xml

@@ -6,7 +6,7 @@
 <suppressions>
 
 	<!-- false positives due to Lombok usage -->
-	<suppress checks="HideUtilityClassConstructor" files="ru.mystamps.web.model" />
+	<suppress checks="HideUtilityClassConstructor" files="ru.mystamps.web.controller.dto" />
 
 	<!-- I don't want to rename WebDriverFactory to AbstractWebDriverFactory -->
 	<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.WebDriverFactory" />

src/main/config/findbugs-filter.xml

@@ -8,15 +8,6 @@
 		<Class name="~.*\.dto\..*" />
 		<Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
 	</Match>
-	<Match>
-		<!--
-			Our DTO classes expose it's internal representation.
-			Most of the time because they're using Date class and
-			storing data in byte[].
-		-->
-		<Class name="~.*\.model\..*" />
-		<Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
-	</Match>
 	<Match>
 		<!--
 			It's ok, that we're don't override parent's equals() method.

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

@@ -41,14 +41,14 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.Url;
-import ru.mystamps.web.model.ActivateAccountForm;
-import ru.mystamps.web.model.ActivateAccountForm.ActKeyChecks;
-import ru.mystamps.web.model.ActivateAccountForm.FormChecks;
-import ru.mystamps.web.model.ActivateAccountForm.LoginChecks;
-import ru.mystamps.web.model.ActivateAccountForm.NameChecks;
-import ru.mystamps.web.model.ActivateAccountForm.PasswordChecks;
-import ru.mystamps.web.model.ActivateAccountForm.PasswordConfirmationChecks;
-import ru.mystamps.web.model.RegisterAccountForm;
+import ru.mystamps.web.controller.dto.ActivateAccountForm;
+import ru.mystamps.web.controller.dto.ActivateAccountForm.ActKeyChecks;
+import ru.mystamps.web.controller.dto.ActivateAccountForm.FormChecks;
+import ru.mystamps.web.controller.dto.ActivateAccountForm.LoginChecks;
+import ru.mystamps.web.controller.dto.ActivateAccountForm.NameChecks;
+import ru.mystamps.web.controller.dto.ActivateAccountForm.PasswordChecks;
+import ru.mystamps.web.controller.dto.ActivateAccountForm.PasswordConfirmationChecks;
+import ru.mystamps.web.controller.dto.RegisterAccountForm;
 import ru.mystamps.web.service.UserService;
 import ru.mystamps.web.service.UsersActivationService;
 

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

@@ -42,10 +42,10 @@
 import ru.mystamps.web.Url;
 import ru.mystamps.web.controller.converter.annotation.Category;
 import ru.mystamps.web.controller.converter.annotation.CurrentUser;
+import ru.mystamps.web.controller.dto.AddCategoryForm;
 import ru.mystamps.web.controller.editor.ReplaceRepeatingSpacesEditor;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
-import ru.mystamps.web.model.AddCategoryForm;
 import ru.mystamps.web.service.CategoryService;
 import ru.mystamps.web.service.SeriesService;
 import ru.mystamps.web.util.LocaleUtils;

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

@@ -42,10 +42,10 @@
 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.AddCountryForm;
 import ru.mystamps.web.controller.editor.ReplaceRepeatingSpacesEditor;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
-import ru.mystamps.web.model.AddCountryForm;
 import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.service.SeriesService;
 import ru.mystamps.web.util.LocaleUtils;

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

@@ -30,7 +30,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.Url;
-import ru.mystamps.web.model.AddParticipantForm;
+import ru.mystamps.web.controller.dto.AddParticipantForm;
 import ru.mystamps.web.service.TransactionParticipantService;
 
 import static ru.mystamps.web.controller.ControllerUtils.redirectTo;

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

@@ -59,13 +59,13 @@
 import ru.mystamps.web.controller.converter.annotation.Category;
 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;
+import ru.mystamps.web.controller.dto.AddSeriesSalesForm;
 import ru.mystamps.web.dao.dto.EntityWithIdDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.PurchaseAndSaleDto;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
-import ru.mystamps.web.model.AddImageForm;
-import ru.mystamps.web.model.AddSeriesForm;
-import ru.mystamps.web.model.AddSeriesSalesForm;
 import ru.mystamps.web.service.CategoryService;
 import ru.mystamps.web.service.CollectionService;
 import ru.mystamps.web.service.CountryService;

src/main/java/ru/mystamps/web/model/ActivateAccountForm.java renamed to src/main/java/ru/mystamps/web/controller/dto/ActivateAccountForm.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.model;
+package ru.mystamps.web.controller.dto;
 
 import javax.validation.GroupSequence;
 import javax.validation.constraints.Pattern;

src/main/java/ru/mystamps/web/model/AddCategoryForm.java renamed to src/main/java/ru/mystamps/web/controller/dto/AddCategoryForm.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.model;
+package ru.mystamps.web.controller.dto;
 
 import javax.validation.GroupSequence;
 import javax.validation.constraints.Pattern;

src/main/java/ru/mystamps/web/model/AddCountryForm.java renamed to src/main/java/ru/mystamps/web/controller/dto/AddCountryForm.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.model;
+package ru.mystamps.web.controller.dto;
 
 import javax.validation.GroupSequence;
 import javax.validation.constraints.Pattern;

src/main/java/ru/mystamps/web/model/AddImageForm.java renamed to src/main/java/ru/mystamps/web/controller/dto/AddImageForm.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.model;
+package ru.mystamps.web.controller.dto;
 
 import javax.validation.GroupSequence;
 import javax.validation.constraints.NotNull;

src/main/java/ru/mystamps/web/model/AddParticipantForm.java renamed to src/main/java/ru/mystamps/web/controller/dto/AddParticipantForm.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.model;
+package ru.mystamps.web.controller.dto;
 
 import javax.validation.constraints.Size;
 

src/main/java/ru/mystamps/web/model/AddSeriesForm.java renamed to src/main/java/ru/mystamps/web/controller/dto/AddSeriesForm.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.model;
+package ru.mystamps.web.controller.dto;
 
 import java.math.BigDecimal;
 

src/main/java/ru/mystamps/web/model/AddSeriesSalesForm.java renamed to src/main/java/ru/mystamps/web/controller/dto/AddSeriesSalesForm.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.model;
+package ru.mystamps.web.controller.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;

src/main/java/ru/mystamps/web/model/Group.java renamed to src/main/java/ru/mystamps/web/controller/dto/Group.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.model;
+package ru.mystamps.web.controller.dto;
 
 final class Group {
 

src/main/java/ru/mystamps/web/model/RegisterAccountForm.java renamed to src/main/java/ru/mystamps/web/controller/dto/RegisterAccountForm.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.model;
+package ru.mystamps.web.controller.dto;
 
 import javax.validation.GroupSequence;
 import javax.validation.constraints.Size;

src/main/java/ru/mystamps/web/model/package-info.java renamed to src/main/java/ru/mystamps/web/controller/dto/package-info.java

@@ -3,4 +3,4 @@
  * classes that are representing values from site forms and being used by
  * controllers as input values.
  */
-package ru.mystamps.web.model;
+package ru.mystamps.web.controller.dto;

src/test/groovy/ru/mystamps/web/service/CategoryServiceImplTest.groovy

@@ -22,7 +22,7 @@ import spock.lang.Unroll
 
 import ru.mystamps.web.dao.CategoryDao
 import ru.mystamps.web.dao.dto.AddCategoryDbDto
-import ru.mystamps.web.model.AddCategoryForm
+import ru.mystamps.web.controller.dto.AddCategoryForm
 import ru.mystamps.web.dao.dto.LinkEntityDto
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.util.SlugUtils

src/test/groovy/ru/mystamps/web/service/CountryServiceImplTest.groovy

@@ -22,7 +22,7 @@ import spock.lang.Unroll
 
 import ru.mystamps.web.dao.CountryDao
 import ru.mystamps.web.dao.dto.AddCountryDbDto
-import ru.mystamps.web.model.AddCountryForm
+import ru.mystamps.web.controller.dto.AddCountryForm
 import ru.mystamps.web.dao.dto.LinkEntityDto
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.util.SlugUtils

src/test/groovy/ru/mystamps/web/service/SeriesSalesServiceImplTest.groovy

@@ -23,7 +23,7 @@ import spock.lang.Unroll
 import ru.mystamps.web.dao.SeriesSalesDao
 import ru.mystamps.web.dao.dto.AddSeriesSalesDbDto
 import ru.mystamps.web.dao.dto.Currency
-import ru.mystamps.web.model.AddSeriesSalesForm
+import ru.mystamps.web.controller.dto.AddSeriesSalesForm
 import ru.mystamps.web.tests.DateUtils
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])

src/test/groovy/ru/mystamps/web/service/SeriesServiceImplTest.groovy

@@ -27,8 +27,8 @@ import ru.mystamps.web.dao.dto.AddSeriesDbDto
 import ru.mystamps.web.dao.dto.Currency
 import ru.mystamps.web.dao.dto.ImageInfoDto
 import ru.mystamps.web.dao.dto.SeriesFullInfoDto
-import ru.mystamps.web.model.AddImageForm
-import ru.mystamps.web.model.AddSeriesForm
+import ru.mystamps.web.controller.dto.AddImageForm
+import ru.mystamps.web.controller.dto.AddSeriesForm
 import ru.mystamps.web.dao.dto.LinkEntityDto
 import ru.mystamps.web.dao.dto.PurchaseAndSaleDto
 import ru.mystamps.web.dao.dto.SeriesInfoDto

src/test/groovy/ru/mystamps/web/service/TransactionParticipantServiceImplTest.groovy

@@ -22,7 +22,7 @@ import spock.lang.Specification
 import ru.mystamps.web.dao.TransactionParticipantDao
 import ru.mystamps.web.dao.dto.AddParticipantDbDto
 import ru.mystamps.web.dao.dto.EntityWithIdDto
-import ru.mystamps.web.model.AddParticipantForm
+import ru.mystamps.web.controller.dto.AddParticipantForm
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
 class TransactionParticipantServiceImplTest extends Specification {

src/test/groovy/ru/mystamps/web/service/UserServiceImplTest.groovy

@@ -25,7 +25,7 @@ import ru.mystamps.web.dao.UserDao
 import ru.mystamps.web.dao.dto.AddUserDbDto
 import ru.mystamps.web.dao.dto.UserDetails
 import ru.mystamps.web.dao.dto.UsersActivationDto
-import ru.mystamps.web.model.ActivateAccountForm
+import ru.mystamps.web.controller.dto.ActivateAccountForm
 import ru.mystamps.web.tests.DateUtils
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])

src/test/groovy/ru/mystamps/web/service/UsersActivationServiceImplTest.groovy

@@ -24,7 +24,7 @@ import ru.mystamps.web.dao.UsersActivationDao
 import ru.mystamps.web.dao.dto.AddUsersActivationDbDto
 import ru.mystamps.web.dao.dto.UsersActivationDto
 import ru.mystamps.web.dao.dto.UsersActivationFullDto
-import ru.mystamps.web.model.RegisterAccountForm
+import ru.mystamps.web.controller.dto.RegisterAccountForm
 import ru.mystamps.web.service.dto.SendUsersActivationDto
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.validation.ValidationRules