Skip to content

Commit d521f1d

Browse files
committed
refactor(EntityWithParentDto): move to ru.mystamps.web.common package.
Addressed to #927 No functional changes.
1 parent ac210c1 commit d521f1d

File tree

16 files changed

+16
-16
lines changed

16 files changed

+16
-16
lines changed

src/main/java/ru/mystamps/web/dao/dto/EntityWithParentDto.java renamed to src/main/java/ru/mystamps/web/common/EntityWithParentDto.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.Getter;
2121
import lombok.RequiredArgsConstructor;

src/main/java/ru/mystamps/web/feature/category/CategoryDao.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.category;
1919

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

2323
import java.util.Date;

src/main/java/ru/mystamps/web/feature/category/CategoryService.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.category;
1919

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

2323
import java.util.Date;

src/main/java/ru/mystamps/web/feature/category/CategoryServiceImpl.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.EntityWithParentDto;
2627
import ru.mystamps.web.common.LocaleUtils;
2728
import ru.mystamps.web.common.SlugUtils;
28-
import ru.mystamps.web.dao.dto.EntityWithParentDto;
2929
import ru.mystamps.web.dao.dto.LinkEntityDto;
3030
import ru.mystamps.web.support.spring.security.HasAuthority;
3131

src/main/java/ru/mystamps/web/feature/category/JdbcCategoryDao.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.EntityWithParentDto;
28+
import ru.mystamps.web.common.EntityWithParentDto;
2929
import ru.mystamps.web.dao.dto.LinkEntityDto;
3030
import ru.mystamps.web.support.jdbc.JdbcUtils;
3131
import ru.mystamps.web.support.jdbc.RowMappers;

src/main/java/ru/mystamps/web/feature/participant/JdbcParticipantDao.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.EntityWithParentDto;
28+
import ru.mystamps.web.common.EntityWithParentDto;
2929
import ru.mystamps.web.support.jdbc.JdbcUtils;
3030
import ru.mystamps.web.support.jdbc.RowMappers;
3131

src/main/java/ru/mystamps/web/feature/participant/ParticipantDao.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.participant;
1919

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

2222
import java.util.List;
2323

src/main/java/ru/mystamps/web/feature/participant/ParticipantService.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.participant;
1919

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

2222
import java.util.List;
2323

src/main/java/ru/mystamps/web/feature/participant/ParticipantServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
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.dao.dto.EntityWithParentDto;
26+
import ru.mystamps.web.common.EntityWithParentDto;
2727
import ru.mystamps.web.support.spring.security.HasAuthority;
2828

2929
import java.util.List;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
3737
import org.springframework.web.servlet.view.RedirectView;
3838
import ru.mystamps.web.Url;
39+
import ru.mystamps.web.common.EntityWithParentDto;
3940
import ru.mystamps.web.common.LocaleUtils;
40-
import ru.mystamps.web.dao.dto.EntityWithParentDto;
4141
import ru.mystamps.web.dao.dto.LinkEntityDto;
4242
import ru.mystamps.web.feature.category.Category;
4343
import ru.mystamps.web.feature.category.CategoryService;

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

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

20+
import ru.mystamps.web.common.EntityWithParentDto;
2021
import ru.mystamps.web.dao.dto.Currency;
21-
import ru.mystamps.web.dao.dto.EntityWithParentDto;
2222
import ru.mystamps.web.dao.dto.LinkEntityDto;
2323
import ru.mystamps.web.feature.participant.EntityWithIdDto;
2424
import ru.mystamps.web.feature.series.PurchaseAndSaleDto;

src/main/java/ru/mystamps/web/support/thymeleaf/GroupByParent.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.support.thymeleaf;
1919

20-
import ru.mystamps.web.dao.dto.EntityWithParentDto;
20+
import ru.mystamps.web.common.EntityWithParentDto;
2121
import ru.mystamps.web.feature.series.SelectItem;
2222

2323
import java.util.ArrayList;

src/test/groovy/ru/mystamps/web/feature/category/CategoryServiceImplTest.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.category
1919

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

src/test/groovy/ru/mystamps/web/feature/participant/ParticipantServiceImplTest.groovy

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

2020
import org.slf4j.helpers.NOPLogger
21-
import ru.mystamps.web.dao.dto.EntityWithParentDto
21+
import ru.mystamps.web.common.EntityWithParentDto
2222
import ru.mystamps.web.tests.Random
2323
import spock.lang.Specification
2424

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

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

20+
import ru.mystamps.web.common.EntityWithParentDto;
2021
import ru.mystamps.web.common.SlugUtils;
21-
import ru.mystamps.web.dao.dto.EntityWithParentDto;
2222
import ru.mystamps.web.dao.dto.LinkEntityDto;
2323
import ru.mystamps.web.feature.account.AddUserDbDto;
2424
import ru.mystamps.web.feature.account.UserDetails;

src/test/java/ru/mystamps/web/tests/Random.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import io.qala.datagen.RandomElements;
2121
import io.qala.datagen.RandomShortApi;
2222
import org.apache.commons.lang3.StringUtils;
23+
import ru.mystamps.web.common.EntityWithParentDto;
2324
import ru.mystamps.web.common.SlugUtils;
2425
import ru.mystamps.web.dao.dto.Currency;
25-
import ru.mystamps.web.dao.dto.EntityWithParentDto;
2626
import ru.mystamps.web.feature.account.AccountValidation;
2727
import ru.mystamps.web.feature.category.CategoryValidation;
2828
import ru.mystamps.web.feature.country.CountryValidation;

0 commit comments

Comments
 (0)