Skip to content

Commit b17ab61

Browse files
committed
ImageServiceImpl: use NOPLogger for unit tests to reduce output to console.
No functional changes.
1 parent 7f4ba12 commit b17ab61

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ public CronService getCronService() {
9090
@Bean
9191
public ImageService getImageService() {
9292
return new ImageServiceImpl(
93+
LoggerFactory.getLogger(ImageServiceImpl.class),
9394
strategiesConfig.getImagePersistenceStrategy(),
9495
new TimedImagePreviewStrategy(new ThumbnailatorImagePreviewStrategy()),
9596
daoConfig.getImageDao()

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.apache.commons.lang3.Validate;
2424

2525
import org.slf4j.Logger;
26-
import org.slf4j.LoggerFactory;
2726

2827
import org.springframework.transaction.annotation.Transactional;
2928
import org.springframework.web.multipart.MultipartFile;
@@ -46,8 +45,8 @@
4645

4746
@RequiredArgsConstructor
4847
public class ImageServiceImpl implements ImageService {
49-
private static final Logger LOG = LoggerFactory.getLogger(ImageServiceImpl.class);
5048

49+
private final Logger log;
5150
private final ImagePersistenceStrategy imagePersistenceStrategy;
5251
private final ImagePreviewStrategy imagePreviewStrategy;
5352
private final ImageDao imageDao;
@@ -77,7 +76,7 @@ public ImageInfoDto save(MultipartFile file) {
7776
}
7877

7978
ImageInfoDto imageInfo = new ImageInfoDto(imageId, imageType);
80-
LOG.info("Image info has been saved to database ({})", imageInfo);
79+
log.info("Image info has been saved to database ({})", imageInfo);
8180

8281
imagePersistenceStrategy.save(file, imageInfo);
8382

@@ -134,7 +133,7 @@ public void addToSeries(Integer seriesId, Integer imageId) {
134133

135134
imageDao.addToSeries(seriesId, imageId);
136135

137-
LOG.info("Series #{}: image #{} was added", seriesId, imageId);
136+
log.info("Series #{}: image #{} was added", seriesId, imageId);
138137
}
139138

140139
@Override
@@ -161,7 +160,7 @@ private ImageDto createPreview(ImageInfoDto previewInfo, byte[] image) {
161160
return new DbImageDto("jpeg", preview);
162161

163162
} catch (CreateImagePreviewException | ImagePersistenceException ex) {
164-
LOG.warn(
163+
log.warn(
165164
String.format("Image #%d: couldn't create/save preview", previewInfo.getId()),
166165
ex
167166
);

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import org.springframework.web.multipart.MultipartFile
2222
import spock.lang.Specification
2323
import spock.lang.Unroll
2424

25+
import org.slf4j.helpers.NOPLogger
26+
2527
import ru.mystamps.web.dao.ImageDao
2628
import ru.mystamps.web.dao.dto.ImageDto
2729
import ru.mystamps.web.dao.dto.ImageInfoDto
@@ -35,8 +37,12 @@ class ImageServiceImplTest extends Specification {
3537
private final ImagePreviewStrategy imagePreviewStrategy = Mock()
3638
private final ImagePersistenceStrategy imagePersistenceStrategy = Mock()
3739

38-
private final ImageService service =
39-
new ImageServiceImpl(imagePersistenceStrategy, imagePreviewStrategy, imageDao)
40+
private final ImageService service = new ImageServiceImpl(
41+
NOPLogger.NOP_LOGGER,
42+
imagePersistenceStrategy,
43+
imagePreviewStrategy,
44+
imageDao
45+
)
4046

4147
def setup() {
4248
multipartFile.size >> 1024L

0 commit comments

Comments
 (0)