Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/config/checkstyle-suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
9 changes: 0 additions & 9 deletions src/main/config/findbugs-filter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -27,11 +27,12 @@
import lombok.Setter;

import ru.mystamps.web.service.dto.ActivateAccountDto;
import ru.mystamps.web.support.beanvalidation.ExistingActivationKey;
import ru.mystamps.web.support.beanvalidation.FieldsMatch;
import ru.mystamps.web.support.beanvalidation.FieldsMismatch;
import ru.mystamps.web.support.beanvalidation.UniqueLogin;
import ru.mystamps.web.validation.ValidationRules;
import ru.mystamps.web.validation.jsr303.ExistingActivationKey;
import ru.mystamps.web.validation.jsr303.FieldsMatch;
import ru.mystamps.web.validation.jsr303.FieldsMismatch;
import ru.mystamps.web.validation.jsr303.UniqueLogin;

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed this extra blank line in eede8a2 commit.


@Getter
@Setter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -27,10 +27,10 @@
import lombok.Setter;

import ru.mystamps.web.service.dto.AddCategoryDto;
import ru.mystamps.web.validation.jsr303.DenyValues;
import ru.mystamps.web.validation.jsr303.UniqueCategoryName;
import ru.mystamps.web.validation.jsr303.UniqueCategoryName.Lang;
import ru.mystamps.web.validation.jsr303.UniqueCategorySlug;
import ru.mystamps.web.support.beanvalidation.DenyValues;
import ru.mystamps.web.support.beanvalidation.UniqueCategoryName;
import ru.mystamps.web.support.beanvalidation.UniqueCategoryName.Lang;
import ru.mystamps.web.support.beanvalidation.UniqueCategorySlug;

import static ru.mystamps.web.validation.ValidationRules.CATEGORY_NAME_EN_REGEXP;
import static ru.mystamps.web.validation.ValidationRules.CATEGORY_NAME_MAX_LENGTH;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -27,10 +27,10 @@
import lombok.Setter;

import ru.mystamps.web.service.dto.AddCountryDto;
import ru.mystamps.web.validation.jsr303.DenyValues;
import ru.mystamps.web.validation.jsr303.UniqueCountryName;
import ru.mystamps.web.validation.jsr303.UniqueCountryName.Lang;
import ru.mystamps.web.validation.jsr303.UniqueCountrySlug;
import ru.mystamps.web.support.beanvalidation.DenyValues;
import ru.mystamps.web.support.beanvalidation.UniqueCountryName;
import ru.mystamps.web.support.beanvalidation.UniqueCountryName.Lang;
import ru.mystamps.web.support.beanvalidation.UniqueCountrySlug;

import static ru.mystamps.web.validation.ValidationRules.COUNTRY_NAME_EN_REGEXP;
import static ru.mystamps.web.validation.ValidationRules.COUNTRY_NAME_MAX_LENGTH;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -26,11 +26,11 @@
import lombok.Setter;

import ru.mystamps.web.service.dto.AddImageDto;
import ru.mystamps.web.validation.jsr303.ImageFile;
import ru.mystamps.web.validation.jsr303.MaxFileSize;
import ru.mystamps.web.validation.jsr303.MaxFileSize.Unit;
import ru.mystamps.web.validation.jsr303.NotEmptyFile;
import ru.mystamps.web.validation.jsr303.NotEmptyFilename;
import ru.mystamps.web.support.beanvalidation.ImageFile;
import ru.mystamps.web.support.beanvalidation.MaxFileSize;
import ru.mystamps.web.support.beanvalidation.MaxFileSize.Unit;
import ru.mystamps.web.support.beanvalidation.NotEmptyFile;
import ru.mystamps.web.support.beanvalidation.NotEmptyFilename;

import static ru.mystamps.web.validation.ValidationRules.MAX_IMAGE_SIZE;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -36,15 +36,15 @@
import ru.mystamps.web.controller.converter.annotation.Country;
import ru.mystamps.web.dao.dto.LinkEntityDto;
import ru.mystamps.web.service.dto.AddSeriesDto;
import ru.mystamps.web.validation.jsr303.CatalogNumbers;
import ru.mystamps.web.validation.jsr303.ImageFile;
import ru.mystamps.web.validation.jsr303.MaxFileSize;
import ru.mystamps.web.validation.jsr303.MaxFileSize.Unit;
import ru.mystamps.web.validation.jsr303.NotEmptyFile;
import ru.mystamps.web.validation.jsr303.NotEmptyFilename;
import ru.mystamps.web.validation.jsr303.NotNullIfFirstField;
import ru.mystamps.web.validation.jsr303.Price;
import ru.mystamps.web.validation.jsr303.ReleaseDateIsNotInFuture;
import ru.mystamps.web.support.beanvalidation.CatalogNumbers;
import ru.mystamps.web.support.beanvalidation.ImageFile;
import ru.mystamps.web.support.beanvalidation.MaxFileSize;
import ru.mystamps.web.support.beanvalidation.MaxFileSize.Unit;
import ru.mystamps.web.support.beanvalidation.NotEmptyFile;
import ru.mystamps.web.support.beanvalidation.NotEmptyFilename;
import ru.mystamps.web.support.beanvalidation.NotNullIfFirstField;
import ru.mystamps.web.support.beanvalidation.Price;
import ru.mystamps.web.support.beanvalidation.ReleaseDateIsNotInFuture;

import static ru.mystamps.web.validation.ValidationRules.MAX_DAYS_IN_MONTH;
import static ru.mystamps.web.validation.ValidationRules.MAX_IMAGE_SIZE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -26,7 +26,7 @@
import lombok.Setter;

import ru.mystamps.web.service.dto.RegisterAccountDto;
import ru.mystamps.web.validation.jsr303.Email;
import ru.mystamps.web.support.beanvalidation.Email;

import static ru.mystamps.web.validation.ValidationRules.EMAIL_MAX_LENGTH;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -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.validation.jsr303;
package ru.mystamps.web.support.beanvalidation;

import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
Expand All @@ -40,7 +40,7 @@
@Constraint(validatedBy = {})
@Documented
public @interface CatalogNumbers {
String message() default "{ru.mystamps.web.validation.jsr303.CatalogNumbers.message}";
String message() default "{ru.mystamps.web.support.beanvalidation.CatalogNumbers.message}";
Class<?>[] groups() default {};
Class<? extends Payload>[] payload() default {};
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.validation.jsr303;
package ru.mystamps.web.support.beanvalidation;

import javax.validation.ConstraintValidatorContext;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.validation.jsr303;
package ru.mystamps.web.support.beanvalidation;

import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
Expand All @@ -37,7 +37,7 @@
@Constraint(validatedBy = DenyValuesValidator.class)
@Documented
public @interface DenyValues {
String message() default "{ru.mystamps.web.validation.jsr303.DenyValues.message}";
String message() default "{ru.mystamps.web.support.beanvalidation.DenyValues.message}";
Class<?>[] groups() default {};
Class<? extends Payload>[] payload() default {};
String[] value();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.validation.jsr303;
package ru.mystamps.web.support.beanvalidation;

import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.validation.jsr303;
package ru.mystamps.web.support.beanvalidation;

import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
Expand Down Expand Up @@ -49,7 +49,7 @@
@Constraint(validatedBy = {})
@Documented
public @interface Email {
String message() default "{ru.mystamps.web.validation.jsr303.Email.message}";
String message() default "{ru.mystamps.web.support.beanvalidation.Email.message}";
Class<?>[] groups() default {};
Class<? extends Payload>[] payload() default {};
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.validation.jsr303;
package ru.mystamps.web.support.beanvalidation;

import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
Expand All @@ -34,7 +34,8 @@
@Constraint(validatedBy = ExistingActivationKeyValidator.class)
@Documented
public @interface ExistingActivationKey {
String message() default "{ru.mystamps.web.validation.jsr303.ExistingActivationKey.message}";
// CheckStyle: ignore LineLength for next 1 line
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed indentation in 348d637 commit.

String message() default "{ru.mystamps.web.support.beanvalidation.ExistingActivationKey.message}";
Class<?>[] groups() default {};
Class<? extends Payload>[] payload() default {};
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.validation.jsr303;
package ru.mystamps.web.support.beanvalidation;

import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
Expand Down
Loading