Skip to content

Commit 561f2e7

Browse files
committed
JdbcImageDataDao and JdbcImageDataDaoImpl renamed to ImageDataDao and JdbcImageDataDao.
Addressed to #120 No functional changes.
1 parent 63e1ec5 commit 561f2e7

File tree

6 files changed

+10
-12
lines changed

6 files changed

+10
-12
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public ImageDao getImageDao() {
5858
}
5959

6060
@Bean
61-
public JdbcImageDataDao getJdbcImageDataDao() {
62-
return new JdbcImageDataDaoImpl(jdbcTemplate);
61+
public ImageDataDao getImageDataDao() {
62+
return new JdbcImageDataDao(jdbcTemplate);
6363
}
6464

6565
@Bean

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ class DbStrategiesConfig implements StrategiesConfig {
4141
@Bean
4242
@Override
4343
public ImagePersistenceStrategy getImagePersistenceStrategy() {
44-
return new DatabaseImagePersistenceStrategy(
45-
daoConfig.getJdbcImageDataDao()
46-
);
44+
return new DatabaseImagePersistenceStrategy(daoConfig.getImageDataDao());
4745
}
4846

4947
}

src/main/java/ru/mystamps/web/dao/JdbcImageDataDao.java renamed to src/main/java/ru/mystamps/web/dao/ImageDataDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import ru.mystamps.web.dao.dto.AddImageDataDbDto;
2121
import ru.mystamps.web.dao.dto.DbImageDto;
2222

23-
public interface JdbcImageDataDao {
23+
public interface ImageDataDao {
2424
DbImageDto findByImageId(Integer imageId);
2525
Integer add(AddImageDataDbDto imageData);
2626
}

src/main/java/ru/mystamps/web/dao/impl/JdbcImageDataDaoImpl.java renamed to src/main/java/ru/mystamps/web/dao/impl/JdbcImageDataDao.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232

3333
import lombok.RequiredArgsConstructor;
3434

35-
import ru.mystamps.web.dao.JdbcImageDataDao;
35+
import ru.mystamps.web.dao.ImageDataDao;
3636
import ru.mystamps.web.dao.dto.AddImageDataDbDto;
3737
import ru.mystamps.web.dao.dto.DbImageDto;
3838

3939
@RequiredArgsConstructor
40-
public class JdbcImageDataDaoImpl implements JdbcImageDataDao {
40+
public class JdbcImageDataDao implements ImageDataDao {
4141

4242
private final NamedParameterJdbcTemplate jdbcTemplate;
4343

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
import lombok.RequiredArgsConstructor;
3030

31-
import ru.mystamps.web.dao.JdbcImageDataDao;
31+
import ru.mystamps.web.dao.ImageDataDao;
3232
import ru.mystamps.web.dao.dto.AddImageDataDbDto;
3333
import ru.mystamps.web.dao.dto.DbImageDto;
3434
import ru.mystamps.web.dao.dto.ImageDto;
@@ -40,7 +40,7 @@ public class DatabaseImagePersistenceStrategy implements ImagePersistenceStrateg
4040
private static final Logger LOG =
4141
LoggerFactory.getLogger(DatabaseImagePersistenceStrategy.class);
4242

43-
private final JdbcImageDataDao imageDataDao;
43+
private final ImageDataDao imageDataDao;
4444

4545
@PostConstruct
4646
public void init() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ import org.springframework.web.multipart.MultipartFile
2121

2222
import spock.lang.Specification
2323

24-
import ru.mystamps.web.dao.JdbcImageDataDao
24+
import ru.mystamps.web.dao.ImageDataDao
2525
import ru.mystamps.web.dao.dto.AddImageDataDbDto
2626
import ru.mystamps.web.dao.dto.ImageDto
2727
import ru.mystamps.web.dao.dto.ImageInfoDto
2828
import ru.mystamps.web.service.exception.ImagePersistenceException
2929

3030
class DatabaseImagePersistenceStrategyTest extends Specification {
3131

32-
private JdbcImageDataDao imageDataDao = Mock()
32+
private ImageDataDao imageDataDao = Mock()
3333
private MultipartFile multipartFile = Mock()
3434
private ImageInfoDto imageInfoDto = TestObjects.createImageInfoDto()
3535

0 commit comments

Comments
 (0)