CountryService.findIdsByNames(): change argument type.

Follow-up to 1c0d64f commit.

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/dao/CountryDao.java

@@ -19,7 +19,6 @@
 
 import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import ru.mystamps.web.dao.dto.AddCountryDbDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
@@ -35,7 +34,7 @@ public interface CountryDao {
 	long countAddedSince(Date date);
 	long countUntranslatedNamesSince(Date date);
 	List<Object[]> getStatisticsOf(Integer collectionId, String lang);
-	List<Integer> findIdsByNames(Set<String> names);
+	List<Integer> findIdsByNames(List<String> names);
 	List<Integer> findIdsByNamePattern(String pattern);
 	List<LinkEntityDto> findAllAsLinkEntities(String lang);
 	LinkEntityDto findOneAsLinkEntity(String slug, String lang);

src/main/java/ru/mystamps/web/dao/impl/JdbcCountryDao.java

@@ -22,7 +22,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.apache.commons.lang3.Validate;
 
@@ -197,7 +196,7 @@ public List<Object[]> getStatisticsOf(Integer collectionId, String lang) {
 	}
 
 	@Override
-	public List<Integer> findIdsByNames(Set<String> names) {
+	public List<Integer> findIdsByNames(List<String> names) {
 		return jdbcTemplate.query(
 			findIdsByNamesSql,
 			Collections.singletonMap("names", names),

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

@@ -19,15 +19,14 @@
 
 import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.AddCountryDto;
 
 @SuppressWarnings("PMD.TooManyMethods")
 public interface CountryService {
 	String add(AddCountryDto dto, Integer userId);
-	List<Integer> findIdsByNames(Set<String> names);
+	List<Integer> findIdsByNames(List<String> names);
 	List<Integer> findIdsWhenNameStartsWith(String name);
 	List<LinkEntityDto> findAllAsLinkEntities(String lang);
 	LinkEntityDto findOneAsLinkEntity(String slug, String lang);

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

@@ -21,7 +21,6 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
@@ -84,7 +83,7 @@ public String add(AddCountryDto dto, Integer userId) {
 
 	@Override
 	@Transactional(readOnly = true)
-	public List<Integer> findIdsByNames(Set<String> names) {
+	public List<Integer> findIdsByNames(List<String> names) {
 		if (names == null || names.isEmpty()) {
 			return Collections.emptyList();
 		}

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

@@ -20,7 +20,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -117,9 +116,9 @@ protected List<Integer> extractCountry(String fragment) {
 		log.debug("Determining country from a fragment: '{}'", fragment);
 
 		String[] candidates = StringUtils.split(fragment, "\n\t ,");
-		Set<String> uniqueCandidates = Arrays.stream(candidates)
+		List<String> uniqueCandidates = Arrays.stream(candidates)
 			.distinct()
-			.collect(Collectors.toSet());
+			.collect(Collectors.toList());
 
 		log.debug("Possible candidates: {}", uniqueCandidates);
 

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

@@ -146,14 +146,14 @@ class CountryServiceImplTest extends Specification {
 
 	def 'findIdsByNames() should return empty result when no names are specified'() {
 		given:
-			Set<String> names = nullOr(Collections.emptySet())
+			List<String> names = nullOr(Collections.emptyList())
 		expect:
 			service.findIdsByNames(names) == []
 	}
 
 	def 'findIdsByNames() should invoke dao, pass argument and return result from dao'() {
 		given:
-			Set<String> expectedNames = Random.setOfStrings()
+			List<String> expectedNames = Random.listOfStrings()
 			List<Integer> expectedResult = Random.listOfIntegers()
 		when:
 			List<Integer> result = service.findIdsByNames(expectedNames)

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

@@ -126,7 +126,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' ]
+			List<String> expectedCandidates = [ 'Lorem', 'ipsum', 'dolor', 'sit', 'amet' ]
 		and:
 			List<Integer> expectedResult = Random.listOfIntegers()
 		when:
@@ -140,7 +140,7 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
 	def 'extractCountry() should deduplicate candidates'() {
 		given:
 			String fragment = 'foo bar foo'
-			Set<String> expectedCandidates = [ 'foo', 'bar' ]
+			List<String> expectedCandidates = [ 'foo', 'bar' ]
 		when:
 			service.extractCountry(fragment)
 		then:
@@ -154,7 +154,7 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
 			List<Integer> result = service.extractCountry('bar1 bar2')
 		then:
 			// in order to search by prefix, we shouldn't find anything by name
-			1 * countryService.findIdsByNames(_ as Set<String>) >> Collections.emptyList()
+			1 * countryService.findIdsByNames(_ as List<String>) >> Collections.emptyList()
 		and:
 			// the first lookup will find nothing
 			1 * countryService.findIdsWhenNameStartsWith('bar1') >> Collections.emptyList()
@@ -169,7 +169,7 @@ class SeriesInfoExtractorServiceImplTest extends Specification {
 		when:
 			List<Integer> result = service.extractCountry('foo')
 		then:
-			1 * countryService.findIdsByNames(_ as Set<String>) >> Collections.emptyList()
+			1 * countryService.findIdsByNames(_ as List<String>) >> Collections.emptyList()
 		and:
 			1 * countryService.findIdsWhenNameStartsWith(_ as String) >> Collections.emptyList()
 		and:

src/test/java/ru/mystamps/web/tests/Random.java

@@ -184,13 +184,6 @@ public static List<String> listOfStrings() {
 		return sampleMultiple(size, "foo", "bar", "baz");
 	}
 
-	public static Set<String> setOfStrings() {
-		final int minSize = 1;
-		final int maxSize = 3;
-		int size = integer(minSize, maxSize);
-		return new HashSet<>(sampleMultiple(size, "foo", "bar", "baz"));
-	}
-	
 	public static List<Integer> listOfIntegers() {
 		final int minSize = 1;
 		final int maxSize = 3;