SeriesService.findBy(Collection): renamed to findByCollectionId() to replace usage of Collection entity.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -64,11 +64,12 @@ public String showInfo(
 		model.addAttribute("ownerName", collection.getOwner().getName());
 
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
-		Iterable<SeriesInfoDto> seriesOfCollection = seriesService.findBy(collection, lang);
+		Integer collectionId = collection.getId();
+		Iterable<SeriesInfoDto> seriesOfCollection =
+			seriesService.findByCollectionId(collectionId, lang);
 		model.addAttribute("seriesOfCollection", seriesOfCollection);
 
 		if (seriesOfCollection.iterator().hasNext()) {
-			Integer collectionId = collection.getId();
 			model.addAttribute("categoryCounter", categoryService.countCategoriesOf(collection));
 			model.addAttribute("countryCounter", countryService.countCountriesOf(collection));
 			model.addAttribute("seriesCounter", seriesService.countSeriesOf(collectionId));

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

@@ -19,7 +19,6 @@
 
 import java.util.Optional;
 
-import ru.mystamps.web.entity.Collection;
 import ru.mystamps.web.entity.Country;
 import ru.mystamps.web.entity.Series;
 import ru.mystamps.web.entity.User;
@@ -50,7 +49,7 @@ public interface SeriesService {
 
 	Iterable<SeriesInfoDto> findByCategoryId(Integer categoryId, String lang);
 	Iterable<SeriesInfoDto> findBy(Country country, String lang);
-	Iterable<SeriesInfoDto> findBy(Collection collection, String lang);
+	Iterable<SeriesInfoDto> findByCollectionId(Integer collectionId, String lang);
 	Iterable<SeriesInfoDto> findRecentlyAdded(int quantity, String lang);
 	Iterable<SitemapInfoDto> findAllForSitemap();
 }

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

@@ -35,7 +35,6 @@
 import ru.mystamps.web.dao.JdbcSeriesDao;
 import ru.mystamps.web.dao.SeriesDao;
 import ru.mystamps.web.entity.Country;
-import ru.mystamps.web.entity.Collection;
 import ru.mystamps.web.entity.Currency;
 import ru.mystamps.web.entity.GibbonsCatalog;
 import ru.mystamps.web.entity.Image;
@@ -270,11 +269,10 @@ public Iterable<SeriesInfoDto> findBy(Country country, String lang) {
 
 	@Override
 	@Transactional(readOnly = true)
-	public Iterable<SeriesInfoDto> findBy(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 Iterable<SeriesInfoDto> findByCollectionId(Integer collectionId, String lang) {
+		Validate.isTrue(collectionId != null, "Collection id must be non null");
 
-		return jdbcSeriesDao.findByCollectionIdAsSeriesInfo(collection.getId(), lang);
+		return jdbcSeriesDao.findByCollectionIdAsSeriesInfo(collectionId, lang);
 	}
 
 	@Override

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

@@ -26,7 +26,6 @@ import ru.mystamps.web.dao.JdbcSeriesDao
 import ru.mystamps.web.dao.SeriesDao
 import ru.mystamps.web.entity.Category
 import ru.mystamps.web.entity.Country
-import ru.mystamps.web.entity.Collection
 import ru.mystamps.web.entity.Currency
 import ru.mystamps.web.entity.GibbonsCatalog
 import ru.mystamps.web.entity.Image
@@ -768,36 +767,23 @@ class SeriesServiceImplTest extends Specification {
 	}
 
 	//
-	// Tests for findBy(Collection)
+	// Tests for findByCollectionId()
 	//
 
-	def "findBy(Collection) should throw exception when collection is null"() {
+	def "findByCollectionId() should throw exception when collection id is null"() {
 		when:
-			service.findBy(null as Collection, 'whatever')
+			service.findByCollectionId(null, 'whatever')
 		then:
 			thrown IllegalArgumentException
 	}
 
-	def "findBy(Collection) should throw exception when collection id is null"() {
-		given:
-			Collection collection = Mock()
-			collection.getId() >> null
-		when:
-			service.findBy(collection, 'whatever')
-		then:
-			thrown IllegalArgumentException
-	}
-	
-	def "findBy(Collection) should pass arguments to dao"() {
+	def "findByCollectionId() should pass arguments to dao"() {
 		given:
 			Integer expectedCollectionId = 16
 		and:
 			String expectedLang = 'expected'
-		and:
-			Collection expectedCollection = Mock()
-			expectedCollection.getId() >> expectedCollectionId
 		when:
-			service.findBy(expectedCollection, expectedLang)
+			service.findByCollectionId(expectedCollectionId, expectedLang)
 		then:
 			1 * jdbcSeriesDao.findByCollectionIdAsSeriesInfo(
 				{ Integer collectionId ->