JdbcCountryDao and JdbcCountryDaoImpl renamed to CountryDao and JdbcCountryDao.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -38,8 +38,8 @@ public CategoryDao getCategoryDao() {
 	}
 
 	@Bean
-	public JdbcCountryDao getJdbcCountryDao() {
-		return new JdbcCountryDaoImpl(jdbcTemplate);
+	public CountryDao getCountryDao() {
+		return new JdbcCountryDao(jdbcTemplate);
 	}
 
 	@Bean

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

@@ -58,7 +58,7 @@ public SuspiciousActivityService getSuspiciousActivityService() {
 
 	@Bean
 	public CountryService getCountryService() {
-		return new CountryServiceImpl(daoConfig.getJdbcCountryDao());
+		return new CountryServiceImpl(daoConfig.getCountryDao());
 	}
 
 	@Bean

src/main/java/ru/mystamps/web/dao/JdbcCountryDao.java renamed to src/main/java/ru/mystamps/web/dao/CountryDao.java

@@ -23,7 +23,7 @@
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.SelectEntityDto;
 
-public interface JdbcCountryDao {
+public interface CountryDao {
 	Integer add(AddCountryDbDto country);
 	long countAll();
 	long countByName(String name);

src/main/java/ru/mystamps/web/dao/impl/JdbcCountryDaoImpl.java renamed to src/main/java/ru/mystamps/web/dao/impl/JdbcCountryDao.java

@@ -33,14 +33,14 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.dao.JdbcCountryDao;
+import ru.mystamps.web.dao.CountryDao;
 import ru.mystamps.web.dao.dto.AddCountryDbDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.SelectEntityDto;
 
 @RequiredArgsConstructor
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
-public class JdbcCountryDaoImpl implements JdbcCountryDao {
+public class JdbcCountryDao implements CountryDao {
 
 	private final NamedParameterJdbcTemplate jdbcTemplate;
 

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

@@ -32,7 +32,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-import ru.mystamps.web.dao.JdbcCountryDao;
+import ru.mystamps.web.dao.CountryDao;
 import ru.mystamps.web.dao.dto.AddCountryDbDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.UrlEntityDto;
@@ -44,7 +44,7 @@
 public class CountryServiceImpl implements CountryService {
 	private static final Logger LOG = LoggerFactory.getLogger(CountryServiceImpl.class);
 
-	private final JdbcCountryDao countryDao;
+	private final CountryDao countryDao;
 
 	@Override
 	@Transactional

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

@@ -20,7 +20,7 @@ package ru.mystamps.web.service
 import spock.lang.Specification
 import spock.lang.Unroll
 
-import ru.mystamps.web.dao.JdbcCountryDao
+import ru.mystamps.web.dao.CountryDao
 import ru.mystamps.web.dao.dto.AddCountryDbDto
 import ru.mystamps.web.model.AddCountryForm
 import ru.mystamps.web.dao.dto.LinkEntityDto
@@ -33,7 +33,7 @@ class CountryServiceImplTest extends Specification {
 	private AddCountryForm form
 	private Integer userId = 321
 
-	private JdbcCountryDao countryDao = Mock()
+	private CountryDao countryDao = Mock()
 	private CountryService service = new CountryServiceImpl(countryDao)
 
 	def setup() {