Series import: extract release year from "2015г" string.

Author: php-coder

src/main/java/ru/mystamps/web/service/SeriesInfoExtractorServiceImpl.java

@@ -47,7 +47,7 @@ public class SeriesInfoExtractorServiceImpl implements SeriesInfoExtractorServic
 
 	// Regular expression matches release year of the stamps (from 1840 till 2099).
 	private static final Pattern RELEASE_YEAR_REGEXP =
-		Pattern.compile("18[4-9][0-9]|19[0-9]{2}|20[0-9]{2}");
+		Pattern.compile("(18[4-9][0-9]|19[0-9]{2}|20[0-9]{2})г?");
 
 	// Regular expression matches number of the stamps in a series (from 1 to 99).
 	private static final Pattern NUMBER_OF_STAMPS_REGEXP = Pattern.compile(
@@ -183,12 +183,13 @@ protected Integer extractReleaseYear(String fragment) {
 
 		String[] candidates = StringUtils.split(fragment);
 		for (String candidate : candidates) {
-			if (!RELEASE_YEAR_REGEXP.matcher(candidate).matches()) {
+			Matcher matcher = RELEASE_YEAR_REGEXP.matcher(candidate);
+			if (!matcher.matches()) {
 				continue;
 			}
 
 			try {
-				Integer year = Integer.valueOf(candidate);
+				Integer year = Integer.valueOf(matcher.group(1));
 				log.debug("Release year is {}", year);
 				return year;
 

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

@@ -239,6 +239,7 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
 			'2010\t\tbrazil'                 | _
 			'2010     brazil'                | _
 			'prehistoric animals 2010 congo' | _
+			'2010г'                          | _
 	}
 
 	@SuppressWarnings('UnnecessaryGetter')