CountryService.getStatisticsOf(): change argument from Collection to Integer.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -82,7 +82,7 @@ public String showInfo(
 			);
 			model.addAttribute(
 				"statOfCollectionByCountries",
-				getCountriesStatistics(collection, lang)
+				getCountriesStatistics(collection.getId(), lang)
 			);
 		}
 
@@ -91,8 +91,8 @@ public String showInfo(
 
 	// false positive
 	@SuppressWarnings("PMD.UnusedPrivateMethod")
-	private Map<String, Integer> getCountriesStatistics(Collection collection, String lang) {
-		Map<String, Integer> countriesStat = countryService.getStatisticsOf(collection, lang);
+	private Map<String, Integer> getCountriesStatistics(Integer collectionId, String lang) {
+		Map<String, Integer> countriesStat = countryService.getStatisticsOf(collectionId, lang);
 
 		// manually localize "Unknown" country's name
 		if (countriesStat.containsKey("Unknown")) {

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

@@ -19,7 +19,6 @@
 
 import java.util.Map;
 
-import ru.mystamps.web.entity.Collection;
 import ru.mystamps.web.entity.User;
 import ru.mystamps.web.service.dto.AddCountryDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
@@ -34,5 +33,5 @@ public interface CountryService {
 	long countCountriesOf(Integer collectionId);
 	long countByName(String name);
 	long countByNameRu(String name);
-	Map<String, Integer> getStatisticsOf(Collection collection, String lang);
+	Map<String, Integer> getStatisticsOf(Integer collectionId, String lang);
 }

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

@@ -33,7 +33,6 @@
 
 import ru.mystamps.web.dao.JdbcCountryDao;
 import ru.mystamps.web.dao.dto.AddCountryDbDto;
-import ru.mystamps.web.entity.Collection;
 import ru.mystamps.web.entity.User;
 import ru.mystamps.web.service.dto.AddCountryDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
@@ -123,11 +122,10 @@ public long countByNameRu(String name) {
 
 	@Override
 	@Transactional(readOnly = true)
-	public Map<String, Integer> getStatisticsOf(Collection collection, String lang) {
-		Validate.isTrue(collection != null, "Collection must be non null");
-		Validate.isTrue(collection.getId() != null, "Collection id must be non null");
+	public Map<String, Integer> getStatisticsOf(Integer collectionId, String lang) {
+		Validate.isTrue(collectionId != null, "Collection id must be non null");
 
-		return countryDao.getStatisticsOf(collection.getId(), lang);
+		return countryDao.getStatisticsOf(collectionId, lang);
 	}
 
 }

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

@@ -22,7 +22,6 @@ import spock.lang.Unroll
 
 import ru.mystamps.web.dao.JdbcCountryDao
 import ru.mystamps.web.dao.dto.AddCountryDbDto
-import ru.mystamps.web.entity.Collection
 import ru.mystamps.web.entity.User
 import ru.mystamps.web.model.AddCountryForm
 import ru.mystamps.web.service.dto.LinkEntityDto
@@ -361,19 +360,9 @@ class CountryServiceImplTest extends Specification {
 	// Tests for getStatisticsOf()
 	//
 
-	def "getStatisticsOf() should throw exception when collection is null"() {
-		when:
-			service.getStatisticsOf(null, 'whatever')
-		then:
-			thrown IllegalArgumentException
-	}
-	
 	def "getStatisticsOf() should throw exception when collection id is null"() {
-		given:
-			Collection collection = Mock()
-			collection.getId() >> null
 		when:
-			service.getStatisticsOf(collection, 'whatever')
+			service.getStatisticsOf(null, 'whatever')
 		then:
 			thrown IllegalArgumentException
 	}
@@ -383,11 +372,8 @@ class CountryServiceImplTest extends Specification {
 			Integer expectedCollectionId = 17
 		and:
 			String expectedLang = 'expected'
-		and:
-			Collection expectedCollection = Mock()
-			expectedCollection.getId() >> expectedCollectionId
 		when:
-			service.getStatisticsOf(expectedCollection, expectedLang)
+			service.getStatisticsOf(expectedCollectionId, expectedLang)
 		then:
 			1 * countryDao.getStatisticsOf(
 				{ Integer collectionId ->