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

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -70,9 +70,9 @@ public String showInfo(
 		model.addAttribute("seriesOfCollection", seriesOfCollection);
 
 		if (seriesOfCollection.iterator().hasNext()) {
-			// CheckStyle: ignore LineLength for next 1 line
+			// CheckStyle: ignore LineLength for next 2 line
 			model.addAttribute("categoryCounter", categoryService.countCategoriesOf(collection.getId()));
-			model.addAttribute("countryCounter", countryService.countCountriesOf(collection));
+			model.addAttribute("countryCounter", countryService.countCountriesOf(collection.getId()));
 			model.addAttribute("seriesCounter", seriesService.countSeriesOf(collectionId));
 			model.addAttribute("stampsCounter", seriesService.countStampsOf(collectionId));
 

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

@@ -31,7 +31,7 @@ public interface CountryService {
 	Iterable<SelectEntityDto> findAllAsSelectEntities(String lang);
 	Iterable<LinkEntityDto> findAllAsLinkEntities(String lang);
 	long countAll();
-	long countCountriesOf(Collection collection);
+	long countCountriesOf(Integer collectionId);
 	long countByName(String name);
 	long countByNameRu(String name);
 	Map<String, Integer> getStatisticsOf(Collection collection, String lang);

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

@@ -101,11 +101,10 @@ public long countAll() {
 
 	@Override
 	@Transactional(readOnly = true)
-	public long countCountriesOf(Collection collection) {
-		Validate.isTrue(collection != null, "Collection must be non null");
-		Validate.isTrue(collection.getId() != null, "Collection id must be non null");
+	public long countCountriesOf(Integer collectionId) {
+		Validate.isTrue(collectionId != null, "Collection id must be non null");
 
-		return countryDao.countCountriesOfCollection(collection.getId());
+		return countryDao.countCountriesOfCollection(collectionId);
 	}
 
 	@Override

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

@@ -278,31 +278,18 @@ class CountryServiceImplTest extends Specification {
 	// Tests for countCountriesOf()
 	//
 
-	def "countCountriesOf() should throw exception when collection is null"() {
-		when:
-			service.countCountriesOf(null)
-		then:
-			thrown IllegalArgumentException
-	}
-	
 	def "countCountriesOf() should throw exception when collection id is null"() {
-		given:
-			Collection collection = Mock()
-			collection.getId() >> null
 		when:
-			service.countCountriesOf(collection)
+			service.countCountriesOf(null)
 		then:
 			thrown IllegalArgumentException
 	}
 
 	def "countCountriesOf() should pass arguments to dao"() {
 		given:
 			Integer expectedCollectionId = 9
-		and:
-			Collection expectedCollection = Mock()
-			expectedCollection.getId() >> expectedCollectionId
 		when:
-			service.countCountriesOf(expectedCollection)
+			service.countCountriesOf(expectedCollectionId)
 		then:
 			1 * countryDao.countCountriesOfCollection({ Integer collectionId ->
 				assert expectedCollectionId == collectionId