/series/add: sort countries by name.

Author: php-coder

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

@@ -17,10 +17,10 @@
  */
 package ru.mystamps.web.dao;
 
-import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
 
 import ru.mystamps.web.entity.Country;
 
-public interface CountryDao extends CrudRepository<Country, Integer> {
+public interface CountryDao extends PagingAndSortingRepository<Country, Integer> {
 	int countByName(String name);
 }

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

@@ -21,6 +21,7 @@
 
 import java.util.Date;
 
+import org.springframework.data.domain.Sort;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -37,6 +38,8 @@
 public class CountryServiceImpl implements CountryService {
 	private static final Logger LOG = LoggerFactory.getLogger(CountryServiceImpl.class);
 
+	private static final Sort SORT_BY_NAME = new Sort("name");
+	
 	private final CountryDao countryDao;
 
 	@Inject
@@ -71,7 +74,7 @@ public Country add(AddCountryDto dto, User user) {
 	@Override
 	@Transactional(readOnly = true)
 	public Iterable<Country> findAll() {
-		return countryDao.findAll();
+		return countryDao.findAll(SORT_BY_NAME);
 	}
 
 	@Override

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

@@ -17,6 +17,8 @@
  */
 package ru.mystamps.web.service
 
+import org.springframework.data.domain.Sort
+
 import spock.lang.Specification
 
 import ru.mystamps.web.dao.CountryDao
@@ -144,7 +146,7 @@ class CountryServiceTest extends Specification {
 		and:
 			List<Country> expectedCountries = [ country1, country2 ]
 		and:
-			countryDao.findAll() >> expectedCountries
+			countryDao.findAll(_ as Sort) >> expectedCountries
 		when:
 			Iterable<Country> resultCountries = service.findAll()
 		then: