Series import: recognize category/country with trailing comma.

Fix #816

Author: php-coder

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

@@ -79,7 +79,7 @@ protected List<Integer> extractCategory(String fragment) {
 
 		log.debug("Determining category from a fragment: '{}'", fragment);
 
-		String[] candidates = StringUtils.split(fragment);
+		String[] candidates = StringUtils.split(fragment, "\n\t ,");
 		Set<String> uniqueCandidates = new HashSet<>();
 		Collections.addAll(uniqueCandidates, candidates);
 
@@ -112,7 +112,7 @@ protected List<Integer> extractCountry(String fragment) {
 
 		log.debug("Determining country from a fragment: '{}'", fragment);
 
-		String[] candidates = StringUtils.split(fragment);
+		String[] candidates = StringUtils.split(fragment, "\n\t ,");
 		Set<String> uniqueCandidates = new HashSet<>();
 		Collections.addAll(uniqueCandidates, candidates);
 

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

@@ -61,7 +61,7 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
 	def 'extractCategory() should try to search by category names'() {
 		given:
 			String fragment = 'Lorem ipsum   dolor\tsit\namet,'
-			Set<String> expectedCandidates = [ 'Lorem', 'ipsum', 'dolor', 'sit', 'amet,' ]
+			Set<String> expectedCandidates = [ 'Lorem', 'ipsum', 'dolor', 'sit', 'amet' ]
 		and:
 			List<Integer> expectedResult = Random.listOfIntegers()
 		when:
@@ -135,7 +135,7 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
 	def 'extractCountry() should try to search by country names'() {
 		given:
 			String fragment = 'Lorem ipsum   dolor\tsit\namet,'
-			Set<String> expectedCandidates = [ 'Lorem', 'ipsum', 'dolor', 'sit', 'amet,' ]
+			Set<String> expectedCandidates = [ 'Lorem', 'ipsum', 'dolor', 'sit', 'amet' ]
 		and:
 			List<Integer> expectedResult = Random.listOfIntegers()
 		when: