Skip to content

Commit cc557f9

Browse files
committed
Use Year class for getting the current year.
Addressed to #493 No functional changes.
1 parent cee66fd commit cc557f9

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
package ru.mystamps.web.controller;
1919

2020
import java.io.IOException;
21-
import java.util.Calendar;
21+
import java.time.Year;
2222
import java.util.Collections;
2323
import java.util.Date;
24-
import java.util.GregorianCalendar;
2524
import java.util.HashMap;
2625
import java.util.LinkedHashMap;
2726
import java.util.List;
@@ -93,7 +92,7 @@
9392
@SuppressWarnings({ "PMD.AvoidDuplicateLiterals", "PMD.TooManyMethods", "PMD.GodClass" })
9493
public class SeriesController {
9594

96-
private static final Integer CURRENT_YEAR = new GregorianCalendar().get(Calendar.YEAR);
95+
private static final Integer CURRENT_YEAR = Integer.valueOf(Year.now().getValue());
9796

9897
private static final Map<Integer, Integer> YEARS;
9998

src/test/java/ru/mystamps/web/tests/cases/WhenUserAddSeries.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121

2222
import java.io.File;
2323
import java.net.URISyntaxException;
24-
import java.util.Calendar;
25-
import java.util.GregorianCalendar;
24+
import java.time.Year;
2625
import java.util.List;
2726
import java.util.ArrayList;
2827

@@ -47,7 +46,7 @@
4746
public class WhenUserAddSeries extends WhenAnyUserAtAnyPageWithForm<AddSeriesPage> {
4847

4948
private static final int SINCE_YEAR = 1840;
50-
private static final int CURRENT_YEAR = new GregorianCalendar().get(Calendar.YEAR);
49+
private static final int CURRENT_YEAR = Year.now().getValue();
5150

5251
private static final List<String> EXPECTED_YEARS =
5352
new ArrayList<>(CURRENT_YEAR - SINCE_YEAR + 1);

0 commit comments

Comments
 (0)