Skip to content

Commit e908c93

Browse files
committed
refactor(SeriesSaleParsedDataDto): move to ru.mystamps.web.feature.series.importing.sale package.
Addressed to #927 No functional changes.
1 parent fd2dc1f commit e908c93

File tree

9 files changed

+8
-9
lines changed

9 files changed

+8
-9
lines changed

src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
import ru.mystamps.web.Url;
4343
import ru.mystamps.web.controller.converter.annotation.CurrentUser;
4444
import ru.mystamps.web.dao.dto.EntityWithIdDto;
45-
import ru.mystamps.web.dao.dto.SeriesSaleParsedDataDto;
4645
import ru.mystamps.web.feature.participant.ParticipantService;
4746
import ru.mystamps.web.feature.series.SeriesController;
4847
import ru.mystamps.web.feature.series.importing.event.ImportRequestCreated;
48+
import ru.mystamps.web.feature.series.importing.sale.SeriesSaleParsedDataDto;
4949
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportService;
5050
import ru.mystamps.web.util.CatalogUtils;
5151
import ru.mystamps.web.util.LocaleUtils;

src/main/java/ru/mystamps/web/feature/series/importing/sale/JdbcSeriesSalesImportDao.java

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
import lombok.RequiredArgsConstructor;
3434

35-
import ru.mystamps.web.dao.dto.SeriesSaleParsedDataDto;
3635
import ru.mystamps.web.support.jdbc.RowMappers;
3736

3837
@RequiredArgsConstructor

src/main/java/ru/mystamps/web/dao/dto/SeriesSaleParsedDataDto.java renamed to src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleParsedDataDto.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
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.importing.sale;
1919

2020
import java.math.BigDecimal;
2121

2222
import lombok.Getter;
2323
import lombok.RequiredArgsConstructor;
2424

25+
import ru.mystamps.web.dao.dto.Currency;
26+
2527
@Getter
2628
@RequiredArgsConstructor
2729
public class SeriesSaleParsedDataDto {

src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportDao.java

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
*/
1818
package ru.mystamps.web.feature.series.importing.sale;
1919

20-
import ru.mystamps.web.dao.dto.SeriesSaleParsedDataDto;
21-
2220
public interface SeriesSalesImportDao {
2321
void addParsedData(Integer requestId, SeriesSalesParsedDataDbDto data);
2422
SeriesSaleParsedDataDto findParsedDataByRequestId(Integer requestId);

src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportService.java

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
*/
1818
package ru.mystamps.web.feature.series.importing.sale;
1919

20-
import ru.mystamps.web.dao.dto.SeriesSaleParsedDataDto;
21-
2220
public interface SeriesSalesImportService {
2321
void saveParsedData(Integer requestId, SeriesSalesParsedDataDbDto seriesSalesParsedData);
2422
SeriesSaleParsedDataDto getParsedData(Integer requestId);

src/main/java/ru/mystamps/web/service/SeriesSalesImportServiceImpl.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.dao.dto.SeriesSaleParsedDataDto;
28+
import ru.mystamps.web.feature.series.importing.sale.SeriesSaleParsedDataDto;
2929
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportDao;
3030
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportService;
3131
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesParsedDataDbDto;

src/main/java/ru/mystamps/web/support/jdbc/RowMappers.java

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import ru.mystamps.web.feature.series.SeriesInfoDto;
3030
import ru.mystamps.web.feature.series.SeriesLinkDto;
3131
import ru.mystamps.web.feature.series.SitemapInfoDto;
32+
import ru.mystamps.web.feature.series.importing.sale.SeriesSaleParsedDataDto;
3233

3334
@SuppressWarnings({
3435
"PMD.AvoidDuplicateLiterals",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import org.slf4j.helpers.NOPLogger
2222
import spock.lang.Specification
2323

2424
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportDao
25-
import ru.mystamps.web.dao.dto.SeriesSaleParsedDataDto
25+
import ru.mystamps.web.feature.series.importing.sale.SeriesSaleParsedDataDto
2626
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesParsedDataDbDto
2727
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportService
2828
import ru.mystamps.web.tests.Random

src/test/java/ru/mystamps/web/service/TestObjects.java

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import ru.mystamps.web.feature.series.importing.RawParsedDataDto;
5050
import ru.mystamps.web.feature.series.importing.SeriesExtractedInfo;
5151
import ru.mystamps.web.feature.series.importing.SeriesParsedDataDto;
52+
import ru.mystamps.web.feature.series.importing.sale.SeriesSaleParsedDataDto;
5253
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesParsedDataDbDto;
5354
import ru.mystamps.web.feature.series.sale.AddSeriesSalesDto;
5455
import ru.mystamps.web.tests.Random;

0 commit comments

Comments
 (0)