Skip to content

Commit c1c4e02

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

File tree

13 files changed

+11
-11
lines changed

13 files changed

+11
-11
lines changed

Diff for: src/main/java/ru/mystamps/web/dao/SeriesDao.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import java.util.Date;
2121
import java.util.List;
2222

23-
import ru.mystamps.web.dao.dto.SeriesInfoDto;
2423
import ru.mystamps.web.dao.dto.SeriesLinkDto;
2524
import ru.mystamps.web.dao.dto.SitemapInfoDto;
2625
import ru.mystamps.web.feature.series.AddSeriesDbDto;
2726
import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
2827
import ru.mystamps.web.feature.series.SeriesFullInfoDto;
28+
import ru.mystamps.web.feature.series.SeriesInfoDto;
2929

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

Diff for: src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesDao.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
import lombok.RequiredArgsConstructor;
3636

3737
import ru.mystamps.web.dao.SeriesDao;
38-
import ru.mystamps.web.dao.dto.SeriesInfoDto;
3938
import ru.mystamps.web.dao.dto.SeriesLinkDto;
4039
import ru.mystamps.web.dao.dto.SitemapInfoDto;
4140
import ru.mystamps.web.feature.series.AddSeriesDbDto;
4241
import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
4342
import ru.mystamps.web.feature.series.SeriesFullInfoDto;
43+
import ru.mystamps.web.feature.series.SeriesInfoDto;
4444
import ru.mystamps.web.support.jdbc.RowMappers;
4545

4646
// TODO: move stamps related methods to separate interface (#88)

Diff for: src/main/java/ru/mystamps/web/feature/category/CategoryController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import ru.mystamps.web.controller.converter.annotation.CurrentUser;
4444
import ru.mystamps.web.controller.editor.ReplaceRepeatingSpacesEditor;
4545
import ru.mystamps.web.dao.dto.LinkEntityDto;
46-
import ru.mystamps.web.dao.dto.SeriesInfoDto;
46+
import ru.mystamps.web.feature.series.SeriesInfoDto;
4747
import ru.mystamps.web.feature.series.SeriesService;
4848
import ru.mystamps.web.util.LocaleUtils;
4949

Diff for: src/main/java/ru/mystamps/web/feature/collection/SeriesInCollectionDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import lombok.Getter;
2121

2222
import ru.mystamps.web.dao.dto.LinkEntityDto;
23-
import ru.mystamps.web.dao.dto.SeriesInfoDto;
23+
import ru.mystamps.web.feature.series.SeriesInfoDto;
2424

2525
@Getter
2626
public class SeriesInCollectionDto extends SeriesInfoDto {

Diff for: src/main/java/ru/mystamps/web/feature/country/CountryController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import ru.mystamps.web.controller.converter.annotation.CurrentUser;
4444
import ru.mystamps.web.controller.editor.ReplaceRepeatingSpacesEditor;
4545
import ru.mystamps.web.dao.dto.LinkEntityDto;
46-
import ru.mystamps.web.dao.dto.SeriesInfoDto;
46+
import ru.mystamps.web.feature.series.SeriesInfoDto;
4747
import ru.mystamps.web.feature.series.SeriesService;
4848
import ru.mystamps.web.util.LocaleUtils;
4949

Diff for: src/main/java/ru/mystamps/web/feature/series/SeriesController.java

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
import ru.mystamps.web.dao.dto.EntityWithParentDto;
6262
import ru.mystamps.web.dao.dto.ImportRequestInfo;
6363
import ru.mystamps.web.dao.dto.LinkEntityDto;
64-
import ru.mystamps.web.dao.dto.SeriesInfoDto;
6564
import ru.mystamps.web.feature.category.Category;
6665
import ru.mystamps.web.feature.category.CategoryService;
6766
import ru.mystamps.web.feature.collection.AddToCollectionForm;

Diff for: src/main/java/ru/mystamps/web/dao/dto/SeriesInfoDto.java renamed to src/main/java/ru/mystamps/web/feature/series/SeriesInfoDto.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
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.dao.dto;
18+
package ru.mystamps.web.feature.series;
1919

2020
import lombok.Getter;
2121

22+
import ru.mystamps.web.dao.dto.LinkEntityDto;
23+
2224
@Getter
2325
public class SeriesInfoDto {
2426
private final Integer id;

Diff for: src/main/java/ru/mystamps/web/feature/series/SeriesService.java

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Date;
2121
import java.util.List;
2222

23-
import ru.mystamps.web.dao.dto.SeriesInfoDto;
2423
import ru.mystamps.web.dao.dto.SeriesLinkDto;
2524
import ru.mystamps.web.dao.dto.SitemapInfoDto;
2625

Diff for: src/main/java/ru/mystamps/web/feature/series/SeriesServiceImpl.java

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import lombok.RequiredArgsConstructor;
3434

3535
import ru.mystamps.web.dao.SeriesDao;
36-
import ru.mystamps.web.dao.dto.SeriesInfoDto;
3736
import ru.mystamps.web.dao.dto.SeriesLinkDto;
3837
import ru.mystamps.web.dao.dto.SitemapInfoDto;
3938
import ru.mystamps.web.feature.image.ImageInfoDto;

Diff for: src/main/java/ru/mystamps/web/support/jdbc/RowMappers.java

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import ru.mystamps.web.feature.image.ImageInfoDto;
3232
import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
3333
import ru.mystamps.web.feature.series.SeriesFullInfoDto;
34+
import ru.mystamps.web.feature.series.SeriesInfoDto;
3435

3536
@SuppressWarnings({
3637
"PMD.AvoidDuplicateLiterals",

Diff for: src/test/groovy/ru/mystamps/web/feature/series/SeriesServiceImplTest.groovy

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import org.slf4j.helpers.NOPLogger
3232
import ru.mystamps.web.dao.SeriesDao
3333
import ru.mystamps.web.feature.image.ImageInfoDto
3434
import ru.mystamps.web.dao.dto.LinkEntityDto
35-
import ru.mystamps.web.dao.dto.SeriesInfoDto
3635
import ru.mystamps.web.dao.dto.SitemapInfoDto
3736
import ru.mystamps.web.feature.image.ImageService
3837
import ru.mystamps.web.service.StampsCatalogService

Diff for: src/test/java/ru/mystamps/web/service/TestObjects.java

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import ru.mystamps.web.feature.series.AddSeriesSalesDto;
3939
import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
4040
import ru.mystamps.web.feature.series.SeriesFullInfoDto;
41+
import ru.mystamps.web.feature.series.SeriesInfoDto;
4142
import ru.mystamps.web.service.dto.RawParsedDataDto;
4243
import ru.mystamps.web.service.dto.SeriesExtractedInfo;
4344
import ru.mystamps.web.tests.Random;

Diff for: src/test/java/ru/mystamps/web/tests/Random.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import ru.mystamps.web.dao.dto.EntityWithIdDto;
3939
import ru.mystamps.web.dao.dto.EntityWithParentDto;
4040
import ru.mystamps.web.dao.dto.ImportRequestFullInfo;
41-
import ru.mystamps.web.dao.dto.SeriesInfoDto;
41+
import ru.mystamps.web.feature.series.SeriesInfoDto;
4242
import ru.mystamps.web.service.TestObjects;
4343
import ru.mystamps.web.util.SlugUtils;
4444
import ru.mystamps.web.validation.ValidationRules;

0 commit comments

Comments
 (0)