Skip to content

Commit c83acac

Browse files
committed
SeriesServiceImpl: extract method.
Fix warning from PMD about deep nested if-s. No functional changes.
1 parent b9bff13 commit c83acac

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

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

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,9 @@ public Series add(AddSeriesDto dto, User user, boolean userCanAddComments) {
6969
if (dto.getCountry() != null) {
7070
series.setCountry(dto.getCountry());
7171
}
72-
73-
if (dto.getYear() != null) {
74-
series.setReleaseYear(dto.getYear());
7572

76-
if (dto.getMonth() != null) {
77-
series.setReleaseMonth(dto.getMonth());
73+
setDateOfReleaseIfProvided(dto, series);
7874

79-
if (dto.getDay() != null) {
80-
series.setReleaseDay(dto.getDay());
81-
}
82-
}
83-
}
84-
8575
series.setCategory(dto.getCategory());
8676
series.setQuantity(dto.getQuantity());
8777
series.setPerforated(dto.getPerforated());
@@ -191,6 +181,21 @@ public Iterable<SeriesInfoDto> findBy(Country country, String lang) {
191181
return seriesDao.findByAsSeriesInfo(country, lang);
192182
}
193183

184+
private static void setDateOfReleaseIfProvided(AddSeriesDto dto, Series series) {
185+
if (dto.getYear() == null) {
186+
return;
187+
}
188+
189+
series.setReleaseYear(dto.getYear());
190+
191+
if (dto.getMonth() == null) {
192+
return;
193+
}
194+
195+
series.setReleaseMonth(dto.getMonth());
196+
series.setReleaseDay(dto.getDay()); // even if day is null it won't change anything
197+
}
198+
194199
private void setMichelNumbersIfProvided(AddSeriesDto dto, Series series) {
195200
Set<MichelCatalog> michelNumbers =
196201
CatalogUtils.fromString(dto.getMichelNumbers(), MichelCatalog.class);

0 commit comments

Comments
 (0)