Skip to content

Commit e569e53

Browse files
committed
refactor(SeriesService): move to ru.mystamps.web.feature.series package.
Addressed to #927 No functional changes.
1 parent e798872 commit e569e53

16 files changed

+15
-12
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import ru.mystamps.web.feature.image.ImageService;
4242
import ru.mystamps.web.feature.participant.ParticipantConfig;
4343
import ru.mystamps.web.feature.participant.ParticipantService;
44+
import ru.mystamps.web.feature.series.SeriesService;
4445
// CheckStyle: ignore AvoidStarImportCheck for next 1 line
4546
import ru.mystamps.web.service.*; // NOPMD: UnusedImports
4647
import ru.mystamps.web.support.spring.security.SecurityConfig;

src/main/java/ru/mystamps/web/controller/SiteController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import ru.mystamps.web.feature.category.CategoryService;
3535
import ru.mystamps.web.feature.collection.CollectionService;
3636
import ru.mystamps.web.feature.country.CountryService;
37-
import ru.mystamps.web.service.SeriesService;
37+
import ru.mystamps.web.feature.series.SeriesService;
3838
import ru.mystamps.web.service.SuspiciousActivityService;
3939
import ru.mystamps.web.util.LocaleUtils;
4040
import ru.mystamps.web.util.Pager;

src/main/java/ru/mystamps/web/controller/SitemapController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
import ru.mystamps.web.Url;
3737
import ru.mystamps.web.dao.dto.SitemapInfoDto;
38-
import ru.mystamps.web.service.SeriesService;
38+
import ru.mystamps.web.feature.series.SeriesService;
3939

4040
@Controller
4141
@RequiredArgsConstructor

src/main/java/ru/mystamps/web/feature/category/CategoryConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import lombok.RequiredArgsConstructor;
2727

28-
import ru.mystamps.web.service.SeriesService;
28+
import ru.mystamps.web.feature.series.SeriesService;
2929

3030
/**
3131
* Spring configuration that is required for using categories in an application.

src/main/java/ru/mystamps/web/feature/category/CategoryController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import ru.mystamps.web.controller.editor.ReplaceRepeatingSpacesEditor;
4545
import ru.mystamps.web.dao.dto.LinkEntityDto;
4646
import ru.mystamps.web.dao.dto.SeriesInfoDto;
47-
import ru.mystamps.web.service.SeriesService;
47+
import ru.mystamps.web.feature.series.SeriesService;
4848
import ru.mystamps.web.util.LocaleUtils;
4949

5050
import static ru.mystamps.web.util.ControllerUtils.redirectTo;

src/main/java/ru/mystamps/web/feature/collection/MaxNumberOfStampsValidator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import lombok.RequiredArgsConstructor;
2424

25-
import ru.mystamps.web.service.SeriesService;
25+
import ru.mystamps.web.feature.series.SeriesService;
2626
import ru.mystamps.web.support.beanvalidation.ConstraintViolationUtils;
2727

2828
/**

src/main/java/ru/mystamps/web/feature/country/CountryConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import lombok.RequiredArgsConstructor;
2727

28-
import ru.mystamps.web.service.SeriesService;
28+
import ru.mystamps.web.feature.series.SeriesService;
2929

3030
/**
3131
* Spring configuration that is required for using countries in an application.

src/main/java/ru/mystamps/web/feature/country/CountryController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import ru.mystamps.web.controller.editor.ReplaceRepeatingSpacesEditor;
4545
import ru.mystamps.web.dao.dto.LinkEntityDto;
4646
import ru.mystamps.web.dao.dto.SeriesInfoDto;
47-
import ru.mystamps.web.service.SeriesService;
47+
import ru.mystamps.web.feature.series.SeriesService;
4848
import ru.mystamps.web.util.LocaleUtils;
4949

5050
import static ru.mystamps.web.util.ControllerUtils.redirectTo;

src/main/java/ru/mystamps/web/feature/series/SeriesController.java

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
import ru.mystamps.web.feature.participant.ParticipantService;
7373
import ru.mystamps.web.service.SeriesImportService;
7474
import ru.mystamps.web.service.SeriesSalesService;
75-
import ru.mystamps.web.service.SeriesService;
7675
import ru.mystamps.web.service.dto.DownloadResult;
7776
import ru.mystamps.web.support.spring.security.Authority;
7877
import ru.mystamps.web.support.spring.security.CustomUserDetails;

src/main/java/ru/mystamps/web/service/SeriesService.java renamed to src/main/java/ru/mystamps/web/feature/series/SeriesService.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* along with this program; if not, write to the Free Software
1616
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1717
*/
18-
package ru.mystamps.web.service;
18+
package ru.mystamps.web.feature.series;
1919

2020
import java.util.Date;
2121
import java.util.List;
@@ -24,9 +24,6 @@
2424
import ru.mystamps.web.dao.dto.SeriesInfoDto;
2525
import ru.mystamps.web.dao.dto.SeriesLinkDto;
2626
import ru.mystamps.web.dao.dto.SitemapInfoDto;
27-
import ru.mystamps.web.feature.series.AddImageDto;
28-
import ru.mystamps.web.feature.series.AddSeriesDto;
29-
import ru.mystamps.web.feature.series.SeriesDto;
3027

3128
// TODO: move stamps related methods to separate interface (#88)
3229
@SuppressWarnings("PMD.TooManyMethods")

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

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import ru.mystamps.web.feature.category.CategoryService;
3838
import ru.mystamps.web.feature.collection.CollectionService;
3939
import ru.mystamps.web.feature.country.CountryService;
40+
import ru.mystamps.web.feature.series.SeriesService;
4041
import ru.mystamps.web.service.dto.AdminDailyReport;
4142
import ru.mystamps.web.support.spring.security.HasAuthority;
4243

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

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import ru.mystamps.web.feature.participant.ParticipantService;
5151
import ru.mystamps.web.feature.series.AddSeriesDto;
5252
import ru.mystamps.web.feature.series.AddSeriesSalesDto;
53+
import ru.mystamps.web.feature.series.SeriesService;
5354
import ru.mystamps.web.service.dto.RawParsedDataDto;
5455
import ru.mystamps.web.service.dto.RequestImportDto;
5556
import ru.mystamps.web.service.dto.SeriesExtractedInfo;

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

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import ru.mystamps.web.feature.series.AddImageDto;
4545
import ru.mystamps.web.feature.series.AddSeriesDto;
4646
import ru.mystamps.web.feature.series.SeriesDto;
47+
import ru.mystamps.web.feature.series.SeriesService;
4748
import ru.mystamps.web.support.spring.security.HasAuthority;
4849
import ru.mystamps.web.util.CatalogUtils;
4950

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

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import ru.mystamps.web.dao.dto.UsersActivationFullDto
2525
import ru.mystamps.web.feature.category.CategoryService
2626
import ru.mystamps.web.feature.collection.CollectionService
2727
import ru.mystamps.web.feature.country.CountryService
28+
import ru.mystamps.web.feature.series.SeriesService
2829
import ru.mystamps.web.service.dto.AdminDailyReport
2930

3031
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])

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

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import ru.mystamps.web.feature.participant.AddParticipantDto
4343
import ru.mystamps.web.feature.participant.ParticipantService
4444
import ru.mystamps.web.feature.series.AddSeriesDto
4545
import ru.mystamps.web.feature.series.AddSeriesSalesDto
46+
import ru.mystamps.web.feature.series.SeriesService
4647
import ru.mystamps.web.service.dto.RawParsedDataDto
4748
import ru.mystamps.web.service.dto.SeriesExtractedInfo
4849
import ru.mystamps.web.tests.DateUtils

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

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import ru.mystamps.web.dao.dto.SeriesInfoDto
4141
import ru.mystamps.web.dao.dto.SitemapInfoDto
4242
import ru.mystamps.web.feature.image.ImageService
4343
import ru.mystamps.web.feature.series.SeriesDto
44+
import ru.mystamps.web.feature.series.SeriesService
4445
import ru.mystamps.web.tests.DateUtils
4546
import ru.mystamps.web.tests.Random
4647

0 commit comments

Comments
 (0)