Skip to content

Commit 3eb6630

Browse files
committed
refactor(LinkEntityDto): move to ru.mystamps.web.common package.
Addressed to #927 No functional changes.
1 parent 1ce39b8 commit 3eb6630

33 files changed

+31
-42
lines changed

src/main/java/ru/mystamps/web/dao/dto/LinkEntityDto.java renamed to src/main/java/ru/mystamps/web/common/LinkEntityDto.java

Lines changed: 1 addition & 1 deletion
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.common;
1919

2020
import lombok.AllArgsConstructor;
2121
import lombok.Getter;

src/main/java/ru/mystamps/web/controller/converter/LinkEntityDtoGenericConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.slf4j.LoggerFactory;
2323
import org.springframework.core.convert.TypeDescriptor;
2424
import org.springframework.core.convert.converter.ConditionalGenericConverter;
25+
import ru.mystamps.web.common.LinkEntityDto;
2526
import ru.mystamps.web.common.LocaleUtils;
26-
import ru.mystamps.web.dao.dto.LinkEntityDto;
2727
import ru.mystamps.web.feature.category.Category;
2828
import ru.mystamps.web.feature.category.CategoryService;
2929
import ru.mystamps.web.feature.country.Country;

src/main/java/ru/mystamps/web/dao/dto/package-info.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/main/java/ru/mystamps/web/dao/package-info.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
3232
import org.springframework.web.servlet.view.RedirectView;
3333
import ru.mystamps.web.Url;
34+
import ru.mystamps.web.common.LinkEntityDto;
3435
import ru.mystamps.web.common.LocaleUtils;
35-
import ru.mystamps.web.dao.dto.LinkEntityDto;
3636
import ru.mystamps.web.feature.series.SeriesInfoDto;
3737
import ru.mystamps.web.feature.series.SeriesService;
3838
import ru.mystamps.web.support.spring.mvc.ReplaceRepeatingSpacesEditor;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package ru.mystamps.web.feature.category;
1919

2020
import ru.mystamps.web.common.EntityWithParentDto;
21-
import ru.mystamps.web.dao.dto.LinkEntityDto;
21+
import ru.mystamps.web.common.LinkEntityDto;
2222

2323
import java.util.Date;
2424
import java.util.List;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package ru.mystamps.web.feature.category;
1919

2020
import ru.mystamps.web.common.EntityWithParentDto;
21-
import ru.mystamps.web.dao.dto.LinkEntityDto;
21+
import ru.mystamps.web.common.LinkEntityDto;
2222

2323
import java.util.Date;
2424
import java.util.List;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import org.springframework.security.access.prepost.PreAuthorize;
2525
import org.springframework.transaction.annotation.Transactional;
2626
import ru.mystamps.web.common.EntityWithParentDto;
27+
import ru.mystamps.web.common.LinkEntityDto;
2728
import ru.mystamps.web.common.LocaleUtils;
2829
import ru.mystamps.web.common.SlugUtils;
29-
import ru.mystamps.web.dao.dto.LinkEntityDto;
3030
import ru.mystamps.web.support.spring.security.HasAuthority;
3131

3232
import java.util.Collections;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.springframework.jdbc.support.GeneratedKeyHolder;
2727
import org.springframework.jdbc.support.KeyHolder;
2828
import ru.mystamps.web.common.EntityWithParentDto;
29-
import ru.mystamps.web.dao.dto.LinkEntityDto;
29+
import ru.mystamps.web.common.LinkEntityDto;
3030
import ru.mystamps.web.support.jdbc.JdbcUtils;
3131
import ru.mystamps.web.support.jdbc.RowMappers;
3232

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package ru.mystamps.web.feature.collection;
1919

20-
import ru.mystamps.web.dao.dto.LinkEntityDto;
20+
import ru.mystamps.web.common.LinkEntityDto;
2121

2222
import java.util.Date;
2323
import java.util.List;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package ru.mystamps.web.feature.collection;
1919

20-
import ru.mystamps.web.dao.dto.LinkEntityDto;
20+
import ru.mystamps.web.common.LinkEntityDto;
2121

2222
import java.util.Date;
2323
import java.util.List;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.slf4j.Logger;
2424
import org.springframework.security.access.prepost.PreAuthorize;
2525
import org.springframework.transaction.annotation.Transactional;
26+
import ru.mystamps.web.common.LinkEntityDto;
2627
import ru.mystamps.web.common.SlugUtils;
27-
import ru.mystamps.web.dao.dto.LinkEntityDto;
2828
import ru.mystamps.web.support.spring.security.HasAuthority;
2929

3030
import java.util.Date;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2828
import org.springframework.jdbc.support.GeneratedKeyHolder;
2929
import org.springframework.jdbc.support.KeyHolder;
30-
import ru.mystamps.web.dao.dto.LinkEntityDto;
30+
import ru.mystamps.web.common.LinkEntityDto;
3131
import ru.mystamps.web.support.jdbc.JdbcUtils;
3232

3333
import java.util.Collections;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
3232
import org.springframework.web.servlet.view.RedirectView;
3333
import ru.mystamps.web.Url;
34+
import ru.mystamps.web.common.LinkEntityDto;
3435
import ru.mystamps.web.common.LocaleUtils;
35-
import ru.mystamps.web.dao.dto.LinkEntityDto;
3636
import ru.mystamps.web.feature.series.SeriesInfoDto;
3737
import ru.mystamps.web.feature.series.SeriesService;
3838
import ru.mystamps.web.support.spring.mvc.ReplaceRepeatingSpacesEditor;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package ru.mystamps.web.feature.country;
1919

20-
import ru.mystamps.web.dao.dto.LinkEntityDto;
20+
import ru.mystamps.web.common.LinkEntityDto;
2121

2222
import java.util.Date;
2323
import java.util.List;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package ru.mystamps.web.feature.country;
1919

20-
import ru.mystamps.web.dao.dto.LinkEntityDto;
20+
import ru.mystamps.web.common.LinkEntityDto;
2121

2222
import java.util.Date;
2323
import java.util.List;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import org.slf4j.Logger;
2424
import org.springframework.security.access.prepost.PreAuthorize;
2525
import org.springframework.transaction.annotation.Transactional;
26+
import ru.mystamps.web.common.LinkEntityDto;
2627
import ru.mystamps.web.common.LocaleUtils;
2728
import ru.mystamps.web.common.SlugUtils;
28-
import ru.mystamps.web.dao.dto.LinkEntityDto;
2929
import ru.mystamps.web.support.spring.security.HasAuthority;
3030

3131
import java.util.Collections;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
2626
import org.springframework.jdbc.support.GeneratedKeyHolder;
2727
import org.springframework.jdbc.support.KeyHolder;
28-
import ru.mystamps.web.dao.dto.LinkEntityDto;
28+
import ru.mystamps.web.common.LinkEntityDto;
2929
import ru.mystamps.web.support.jdbc.JdbcUtils;
3030
import ru.mystamps.web.support.jdbc.RowMappers;
3131

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package ru.mystamps.web.feature.series;
1919

2020
import org.springframework.web.multipart.MultipartFile;
21-
import ru.mystamps.web.dao.dto.LinkEntityDto;
21+
import ru.mystamps.web.common.LinkEntityDto;
2222

2323
import java.math.BigDecimal;
2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.hibernate.validator.constraints.Range;
2424
import org.hibernate.validator.constraints.URL;
2525
import org.springframework.web.multipart.MultipartFile;
26-
import ru.mystamps.web.dao.dto.LinkEntityDto;
26+
import ru.mystamps.web.common.LinkEntityDto;
2727
import ru.mystamps.web.feature.category.Category;
2828
import ru.mystamps.web.feature.country.Country;
2929
import ru.mystamps.web.support.beanvalidation.CatalogNumbers;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import org.springframework.web.servlet.view.RedirectView;
3838
import ru.mystamps.web.Url;
3939
import ru.mystamps.web.common.EntityWithParentDto;
40+
import ru.mystamps.web.common.LinkEntityDto;
4041
import ru.mystamps.web.common.LocaleUtils;
41-
import ru.mystamps.web.dao.dto.LinkEntityDto;
4242
import ru.mystamps.web.feature.category.Category;
4343
import ru.mystamps.web.feature.category.CategoryService;
4444
import ru.mystamps.web.feature.collection.AddToCollectionForm;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package ru.mystamps.web.feature.series;
1919

2020
import lombok.Getter;
21-
import ru.mystamps.web.dao.dto.LinkEntityDto;
21+
import ru.mystamps.web.common.LinkEntityDto;
2222

2323
import java.util.List;
2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import lombok.Getter;
2121
import lombok.RequiredArgsConstructor;
22-
import ru.mystamps.web.dao.dto.LinkEntityDto;
22+
import ru.mystamps.web.common.LinkEntityDto;
2323

2424
import java.math.BigDecimal;
2525

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package ru.mystamps.web.feature.series;
1919

2020
import lombok.Getter;
21-
import ru.mystamps.web.dao.dto.LinkEntityDto;
21+
import ru.mystamps.web.common.LinkEntityDto;
2222

2323
@Getter
2424
public class SeriesInfoDto {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import lombok.Setter;
2222
import org.hibernate.validator.constraints.URL;
2323
import org.springframework.web.multipart.MultipartFile;
24-
import ru.mystamps.web.dao.dto.LinkEntityDto;
24+
import ru.mystamps.web.common.LinkEntityDto;
2525
import ru.mystamps.web.feature.category.Category;
2626
import ru.mystamps.web.feature.country.Country;
2727
import ru.mystamps.web.feature.series.AddSeriesDto;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package ru.mystamps.web.feature.series.importing;
1919

20-
import ru.mystamps.web.dao.dto.LinkEntityDto;
20+
import ru.mystamps.web.common.LinkEntityDto;
2121
import ru.mystamps.web.support.jdbc.JdbcUtils;
2222

2323
import java.sql.ResultSet;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import lombok.Getter;
2121
import lombok.RequiredArgsConstructor;
22-
import ru.mystamps.web.dao.dto.LinkEntityDto;
22+
import ru.mystamps.web.common.LinkEntityDto;
2323

2424
@Getter
2525
@RequiredArgsConstructor

src/main/java/ru/mystamps/web/feature/site/SiteController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import org.springframework.web.bind.annotation.GetMapping;
2424
import org.springframework.web.bind.annotation.RequestParam;
2525
import ru.mystamps.web.Url;
26+
import ru.mystamps.web.common.LinkEntityDto;
2627
import ru.mystamps.web.common.LocaleUtils;
2728
import ru.mystamps.web.common.Pager;
28-
import ru.mystamps.web.dao.dto.LinkEntityDto;
2929
import ru.mystamps.web.feature.category.CategoryService;
3030
import ru.mystamps.web.feature.collection.CollectionService;
3131
import ru.mystamps.web.feature.country.CountryService;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import ru.mystamps.web.common.Currency;
2121
import ru.mystamps.web.common.EntityWithParentDto;
22-
import ru.mystamps.web.dao.dto.LinkEntityDto;
22+
import ru.mystamps.web.common.LinkEntityDto;
2323
import ru.mystamps.web.feature.participant.EntityWithIdDto;
2424
import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
2525
import ru.mystamps.web.feature.series.SeriesFullInfoDto;

src/test/groovy/ru/mystamps/web/feature/category/CategoryServiceImplTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package ru.mystamps.web.feature.category
1919

2020
import org.slf4j.helpers.NOPLogger
2121
import ru.mystamps.web.common.EntityWithParentDto
22+
import ru.mystamps.web.common.LinkEntityDto
2223
import ru.mystamps.web.common.SlugUtils
23-
import ru.mystamps.web.dao.dto.LinkEntityDto
2424
import ru.mystamps.web.service.TestObjects
2525
import ru.mystamps.web.tests.DateUtils
2626
import ru.mystamps.web.tests.Random

src/test/groovy/ru/mystamps/web/feature/country/CountryServiceImplTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
package ru.mystamps.web.feature.country
1919

2020
import org.slf4j.helpers.NOPLogger
21+
import ru.mystamps.web.common.LinkEntityDto
2122
import ru.mystamps.web.common.SlugUtils
22-
import ru.mystamps.web.dao.dto.LinkEntityDto
2323
import ru.mystamps.web.service.TestObjects
2424
import ru.mystamps.web.tests.DateUtils
2525
import ru.mystamps.web.tests.Random

src/test/groovy/ru/mystamps/web/feature/series/SeriesServiceImplTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package ru.mystamps.web.feature.series
1919

2020
import org.slf4j.helpers.NOPLogger
2121
import org.springframework.web.multipart.MultipartFile
22-
import ru.mystamps.web.dao.dto.LinkEntityDto
22+
import ru.mystamps.web.common.LinkEntityDto
2323
import ru.mystamps.web.feature.image.ImageInfoDto
2424
import ru.mystamps.web.feature.image.ImageService
2525
import ru.mystamps.web.service.TestObjects

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
package ru.mystamps.web.service;
1919

2020
import ru.mystamps.web.common.EntityWithParentDto;
21+
import ru.mystamps.web.common.LinkEntityDto;
2122
import ru.mystamps.web.common.SlugUtils;
22-
import ru.mystamps.web.dao.dto.LinkEntityDto;
2323
import ru.mystamps.web.feature.account.AddUserDbDto;
2424
import ru.mystamps.web.feature.account.UserDetails;
2525
import ru.mystamps.web.feature.account.UsersActivationDto;

0 commit comments

Comments
 (0)