Skip to content

Commit fd2dc1f

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

File tree

10 files changed

+15
-8
lines changed

10 files changed

+15
-8
lines changed

src/main/config/findbugs-filter.xml

+9
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,15 @@
112112
<Method name="setDate" />
113113
</Or>
114114
</Match>
115+
<Match>
116+
<Class name="ru.mystamps.web.feature.series.importing.sale.SeriesSalesParsedDataDbDto" />
117+
<Or>
118+
<Method name="getCreatedAt" />
119+
<Method name="setCreatedAt" />
120+
<Method name="getUpdatedAt" />
121+
<Method name="setUpdatedAt" />
122+
</Or>
123+
</Match>
115124
<Match>
116125
<!--
117126
String[] allowedContentTypes: potentially caller can modify data after passing it to the

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737

3838
import ru.mystamps.web.Db;
3939
import ru.mystamps.web.Db.SeriesImportRequestStatus;
40-
import ru.mystamps.web.dao.dto.SeriesSalesParsedDataDbDto;
4140
import ru.mystamps.web.feature.participant.AddParticipantDto;
4241
import ru.mystamps.web.feature.participant.ParticipantService;
4342
import ru.mystamps.web.feature.series.AddSeriesDto;
4443
import ru.mystamps.web.feature.series.SeriesService;
4544
import ru.mystamps.web.feature.series.importing.event.ParsingFailed;
4645
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportService;
46+
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesParsedDataDbDto;
4747
import ru.mystamps.web.feature.series.sale.AddSeriesSalesDto;
4848
import ru.mystamps.web.feature.series.sale.SeriesSalesService;
4949
import ru.mystamps.web.support.spring.security.HasAuthority;

src/main/java/ru/mystamps/web/feature/series/importing/sale/JdbcSeriesSalesImportDao.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.dto.SeriesSaleParsedDataDto;
36-
import ru.mystamps.web.dao.dto.SeriesSalesParsedDataDbDto;
3736
import ru.mystamps.web.support.jdbc.RowMappers;
3837

3938
@RequiredArgsConstructor

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

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package ru.mystamps.web.feature.series.importing.sale;
1919

2020
import ru.mystamps.web.dao.dto.SeriesSaleParsedDataDto;
21-
import ru.mystamps.web.dao.dto.SeriesSalesParsedDataDbDto;
2221

2322
public interface SeriesSalesImportDao {
2423
void addParsedData(Integer requestId, SeriesSalesParsedDataDbDto data);

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

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package ru.mystamps.web.feature.series.importing.sale;
1919

2020
import ru.mystamps.web.dao.dto.SeriesSaleParsedDataDto;
21-
import ru.mystamps.web.dao.dto.SeriesSalesParsedDataDbDto;
2221

2322
public interface SeriesSalesImportService {
2423
void saveParsedData(Integer requestId, SeriesSalesParsedDataDbDto seriesSalesParsedData);

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

+1-1
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.dao.dto;
18+
package ru.mystamps.web.feature.series.importing.sale;
1919

2020
import java.math.BigDecimal;
2121
import java.util.Date;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import lombok.RequiredArgsConstructor;
2727

2828
import ru.mystamps.web.dao.dto.SeriesSaleParsedDataDto;
29-
import ru.mystamps.web.dao.dto.SeriesSalesParsedDataDbDto;
3029
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportDao;
3130
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportService;
31+
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesParsedDataDbDto;
3232

3333
@RequiredArgsConstructor
3434
public class SeriesSalesImportServiceImpl implements SeriesSalesImportService {

src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesImportServiceImplTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import org.springframework.context.ApplicationEventPublisher
3030

3131
import ru.mystamps.web.feature.series.importing.event.ParsingFailed
3232
import ru.mystamps.web.Db.SeriesImportRequestStatus
33-
import ru.mystamps.web.dao.dto.SeriesSalesParsedDataDbDto
33+
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesParsedDataDbDto
3434
import ru.mystamps.web.feature.participant.AddParticipantDto
3535
import ru.mystamps.web.feature.participant.ParticipantService
3636
import ru.mystamps.web.feature.series.AddSeriesDto

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import spock.lang.Specification
2323

2424
import ru.mystamps.web.feature.series.importing.sale.SeriesSalesImportDao
2525
import ru.mystamps.web.dao.dto.SeriesSaleParsedDataDto
26-
import ru.mystamps.web.dao.dto.SeriesSalesParsedDataDbDto
26+
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
2929

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.SeriesSalesParsedDataDbDto;
5253
import ru.mystamps.web.feature.series.sale.AddSeriesSalesDto;
5354
import ru.mystamps.web.tests.Random;
5455
import ru.mystamps.web.util.SlugUtils;

0 commit comments

Comments
 (0)