Skip to content

Commit 7c86e70

Browse files
committed
refactor: fix compiler warnings and enable failOnWarning again.
- use annotations from javax.validation.constraints instead of org.hibernate.validator.constraints package - replace WebMvcConfigurerAdapter by WebMvcConfigurer Fix #1197
1 parent 6f5b222 commit 7c86e70

File tree

12 files changed

+13
-14
lines changed

12 files changed

+13
-14
lines changed

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -789,8 +789,7 @@
789789
<showDeprecation>true</showDeprecation>
790790
<showWarnings>true</showWarnings>
791791
<debug>false</debug>
792-
<!-- @todo #869 Fix compilation warnings and enable failOnWarning again -->
793-
<!--<failOnWarning>true</failOnWarning>-->
792+
<failOnWarning>true</failOnWarning>
794793
<!-- Required for ErrorProne -->
795794
<!-- @todo #971 Document ErrorProne tool -->
796795
<compilerArgs>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
3636
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
3737
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
38-
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
38+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
3939
import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
4040
import org.springframework.web.servlet.i18n.SessionLocaleResolver;
4141
import org.springframework.web.servlet.resource.VersionResourceResolver;
@@ -85,7 +85,7 @@
8585
EventsConfig.class,
8686
})
8787
@RequiredArgsConstructor
88-
public class MvcConfig extends WebMvcConfigurerAdapter {
88+
public class MvcConfig implements WebMvcConfigurer {
8989

9090
private final ServicesConfig servicesConfig;
9191
private final CategoryService categoryService;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
import lombok.Getter;
2121
import lombok.Setter;
22-
import org.hibernate.validator.constraints.NotEmpty;
2322
import ru.mystamps.web.support.beanvalidation.FieldsMatch;
2423
import ru.mystamps.web.support.beanvalidation.FieldsMismatch;
2524

2625
import javax.validation.GroupSequence;
26+
import javax.validation.constraints.NotEmpty;
2727
import javax.validation.constraints.Pattern;
2828
import javax.validation.constraints.Size;
2929

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
import lombok.Getter;
2121
import lombok.Setter;
22-
import org.hibernate.validator.constraints.NotEmpty;
2322
import ru.mystamps.web.support.beanvalidation.Email;
2423
import ru.mystamps.web.support.beanvalidation.Group;
2524

2625
import javax.validation.GroupSequence;
26+
import javax.validation.constraints.NotEmpty;
2727
import javax.validation.constraints.Size;
2828

2929
import static ru.mystamps.web.feature.account.AccountValidation.EMAIL_MAX_LENGTH;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
import lombok.Getter;
2121
import lombok.Setter;
22-
import org.hibernate.validator.constraints.NotEmpty;
2322
import ru.mystamps.web.feature.category.UniqueCategoryName.Lang;
2423
import ru.mystamps.web.support.beanvalidation.DenyValues;
2524
import ru.mystamps.web.support.beanvalidation.Group;
2625

2726
import javax.validation.GroupSequence;
27+
import javax.validation.constraints.NotEmpty;
2828
import javax.validation.constraints.Pattern;
2929
import javax.validation.constraints.Size;
3030

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
import lombok.Getter;
2121
import lombok.Setter;
22-
import org.hibernate.validator.constraints.NotEmpty;
2322
import ru.mystamps.web.feature.country.UniqueCountryName.Lang;
2423
import ru.mystamps.web.support.beanvalidation.DenyValues;
2524
import ru.mystamps.web.support.beanvalidation.Group;
2625

2726
import javax.validation.GroupSequence;
27+
import javax.validation.constraints.NotEmpty;
2828
import javax.validation.constraints.Pattern;
2929
import javax.validation.constraints.Size;
3030

src/main/java/ru/mystamps/web/feature/participant/AddParticipantForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
import lombok.Getter;
2121
import lombok.Setter;
22-
import org.hibernate.validator.constraints.NotEmpty;
2322
import org.hibernate.validator.constraints.URL;
2423

24+
import javax.validation.constraints.NotEmpty;
2525
import javax.validation.constraints.NotNull;
2626
import javax.validation.constraints.Size;
2727

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
import lombok.Getter;
2121
import lombok.Setter;
22-
import org.hibernate.validator.constraints.NotEmpty;
2322
import org.hibernate.validator.constraints.URL;
2423
import ru.mystamps.web.support.beanvalidation.Group;
2524

2625
import javax.validation.GroupSequence;
26+
import javax.validation.constraints.NotEmpty;
2727
import javax.validation.constraints.Size;
2828

2929
@Getter

src/main/java/ru/mystamps/web/feature/series/importing/sale/RequestSeriesSaleImportForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919

2020
import lombok.Getter;
2121
import lombok.Setter;
22-
import org.hibernate.validator.constraints.NotEmpty;
2322
import org.hibernate.validator.constraints.URL;
2423
import ru.mystamps.web.feature.series.importing.HasSiteParser;
2524
import ru.mystamps.web.feature.series.importing.RequestImportDto;
2625
import ru.mystamps.web.feature.series.sale.SeriesSalesValidation;
2726
import ru.mystamps.web.support.beanvalidation.Group;
2827

2928
import javax.validation.GroupSequence;
29+
import javax.validation.constraints.NotEmpty;
3030
import javax.validation.constraints.Size;
3131

3232
@Getter

src/main/java/ru/mystamps/web/support/beanvalidation/Email.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* @see <a href="https://hibernate.atlassian.net/browse/HVAL-43">Issue in Hibernate's JIRA</a>
4141
* @author Slava Semushin
4242
*/
43-
@org.hibernate.validator.constraints.Email
43+
@javax.validation.constraints.Email
4444
@Pattern(regexp = ".+@.+\\..+")
4545
@ReportAsSingleViolation
4646
@Target({ METHOD, FIELD, ANNOTATION_TYPE })

0 commit comments

Comments
 (0)