JdbcCollectionDao and JdbcCollectionDaoImpl renamed to CollectionDao and JdbcCollectionDao.

Addressed to #120

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/config/DaoConfig.java

@@ -43,8 +43,8 @@ public CountryDao getCountryDao() {
 	}
 
 	@Bean
-	public JdbcCollectionDao getJdbcCollectionDao() {
-		return new JdbcCollectionDaoImpl(jdbcTemplate);
+	public CollectionDao getCollectionDao() {
+		return new JdbcCollectionDao(jdbcTemplate);
 	}
 
 	@Bean

src/main/java/ru/mystamps/web/config/ServicesConfig.java

@@ -68,7 +68,7 @@ public CategoryService getCategoryService() {
 
 	@Bean
 	public CollectionService getCollectionService() {
-		return new CollectionServiceImpl(daoConfig.getJdbcCollectionDao());
+		return new CollectionServiceImpl(daoConfig.getCollectionDao());
 	}
 
 	@Bean

src/main/java/ru/mystamps/web/dao/JdbcCollectionDao.java renamed to src/main/java/ru/mystamps/web/dao/CollectionDao.java

@@ -22,7 +22,7 @@
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.UrlEntityDto;
 
-public interface JdbcCollectionDao {
+public interface CollectionDao {
 	Iterable<LinkEntityDto> findLastCreated(int quantity);
 	long countCollectionsOfUsers();
 	Integer add(AddCollectionDbDto collection);

src/main/java/ru/mystamps/web/dao/impl/JdbcCollectionDaoImpl.java renamed to src/main/java/ru/mystamps/web/dao/impl/JdbcCollectionDao.java

@@ -34,16 +34,16 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.dao.JdbcCollectionDao;
+import ru.mystamps.web.dao.CollectionDao;
 import ru.mystamps.web.dao.dto.AddCollectionDbDto;
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.UrlEntityDto;
 
 @RequiredArgsConstructor
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
-public class JdbcCollectionDaoImpl implements JdbcCollectionDao {
-	private static final Logger LOG = LoggerFactory.getLogger(JdbcCollectionDaoImpl.class);
+public class JdbcCollectionDao implements CollectionDao {
+	private static final Logger LOG = LoggerFactory.getLogger(JdbcCollectionDao.class);
 
 	private final NamedParameterJdbcTemplate jdbcTemplate;
 

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

@@ -29,7 +29,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.dao.JdbcCollectionDao;
+import ru.mystamps.web.dao.CollectionDao;
 import ru.mystamps.web.dao.dto.AddCollectionDbDto;
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
@@ -41,7 +41,7 @@
 public class CollectionServiceImpl implements CollectionService {
 	private static final Logger LOG = LoggerFactory.getLogger(CollectionServiceImpl.class);
 
-	private final JdbcCollectionDao collectionDao;
+	private final CollectionDao collectionDao;
 
 	@Override
 	@Transactional

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

@@ -20,13 +20,13 @@ package ru.mystamps.web.service
 import spock.lang.Specification
 import spock.lang.Unroll
 
-import ru.mystamps.web.dao.JdbcCollectionDao
+import ru.mystamps.web.dao.CollectionDao
 import ru.mystamps.web.dao.dto.AddCollectionDbDto
 import ru.mystamps.web.dao.dto.UrlEntityDto
 import ru.mystamps.web.util.SlugUtils
 
 class CollectionServiceImplTest extends Specification {
-	private JdbcCollectionDao collectionDao = Mock()
+	private CollectionDao collectionDao = Mock()
 
 	private CollectionService service