Skip to content

Commit 0d04e8a

Browse files
cssruphp-coder
authored andcommitted
Move Currency class to dao.dto package.
Fix #458 No functional changes.
1 parent 99c6841 commit 0d04e8a

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

src/main/java/ru/mystamps/web/service/dto/Currency.java renamed to src/main/java/ru/mystamps/web/dao/dto/Currency.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.service.dto;
18+
package ru.mystamps.web.dao.dto;
1919

2020
public enum Currency {
2121
EUR, USD, GBP, RUB

src/main/java/ru/mystamps/web/dao/dto/PurchaseAndSaleDto.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import lombok.Getter;
2424
import lombok.RequiredArgsConstructor;
2525

26-
import ru.mystamps.web.service.dto.Currency;
27-
2826
/**
2927
* @author Sergey Chechenev
3028
*/

src/main/java/ru/mystamps/web/dao/impl/JdbcUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.sql.ResultSet;
2121
import java.sql.SQLException;
2222

23-
import ru.mystamps.web.service.dto.Currency;
23+
import ru.mystamps.web.dao.dto.Currency;
2424

2525
public final class JdbcUtils {
2626

src/main/java/ru/mystamps/web/dao/impl/RowMappers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.Date;
2424

2525
import ru.mystamps.web.dao.dto.CollectionInfoDto;
26+
import ru.mystamps.web.dao.dto.Currency;
2627
import ru.mystamps.web.dao.dto.DbImageDto;
2728
import ru.mystamps.web.dao.dto.ImageInfoDto;
2829
import ru.mystamps.web.dao.dto.LinkEntityDto;
@@ -35,7 +36,6 @@
3536
import ru.mystamps.web.dao.dto.UserDetails;
3637
import ru.mystamps.web.dao.dto.UsersActivationDto;
3738
import ru.mystamps.web.dao.dto.UsersActivationFullDto;
38-
import ru.mystamps.web.service.dto.Currency;
3939

4040
@SuppressWarnings({ "PMD.AvoidDuplicateLiterals", "PMD.TooManyMethods" })
4141
final class RowMappers {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535

3636
import ru.mystamps.web.dao.SeriesDao;
3737
import ru.mystamps.web.dao.dto.AddSeriesDbDto;
38+
import ru.mystamps.web.dao.dto.Currency;
3839
import ru.mystamps.web.dao.dto.PurchaseAndSaleDto;
3940
import ru.mystamps.web.dao.dto.SeriesFullInfoDto;
4041
import ru.mystamps.web.dao.dto.SeriesInfoDto;
4142
import ru.mystamps.web.dao.dto.SitemapInfoDto;
4243
import ru.mystamps.web.service.dto.AddImageDto;
4344
import ru.mystamps.web.service.dto.AddSeriesDto;
44-
import ru.mystamps.web.service.dto.Currency;
4545
import ru.mystamps.web.service.dto.SeriesDto;
4646
import ru.mystamps.web.support.spring.security.HasAuthority;
4747
import ru.mystamps.web.util.CatalogUtils;

src/main/java/ru/mystamps/web/service/dto/CatalogInfoDto.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
import lombok.Getter;
2727

28+
import ru.mystamps.web.dao.dto.Currency;
29+
2830
@Getter
2931
@SuppressWarnings("PMD.SingularField")
3032
public class CatalogInfoDto {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ import spock.lang.Unroll
2424

2525
import ru.mystamps.web.dao.SeriesDao
2626
import ru.mystamps.web.dao.dto.AddSeriesDbDto
27+
import ru.mystamps.web.dao.dto.Currency
2728
import ru.mystamps.web.model.AddImageForm
2829
import ru.mystamps.web.model.AddSeriesForm
2930
import ru.mystamps.web.dao.dto.LinkEntityDto
3031
import ru.mystamps.web.dao.dto.PurchaseAndSaleDto
3132
import ru.mystamps.web.dao.dto.SeriesInfoDto
3233
import ru.mystamps.web.dao.dto.SitemapInfoDto
33-
import ru.mystamps.web.service.dto.Currency
3434
import ru.mystamps.web.tests.DateUtils
3535

3636
class SeriesServiceImplTest extends Specification {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import ru.mystamps.web.dao.dto.AddUserDbDto;
2424
import ru.mystamps.web.dao.dto.CollectionInfoDto;
25+
import ru.mystamps.web.dao.dto.Currency;
2526
import ru.mystamps.web.dao.dto.DbImageDto;
2627
import ru.mystamps.web.dao.dto.ImageInfoDto;
2728
import ru.mystamps.web.dao.dto.LinkEntityDto;
@@ -33,7 +34,6 @@
3334
import ru.mystamps.web.dao.dto.UserDetails;
3435
import ru.mystamps.web.dao.dto.UsersActivationDto;
3536
import ru.mystamps.web.dao.dto.UsersActivationFullDto;
36-
import ru.mystamps.web.service.dto.Currency;
3737

3838
final class TestObjects {
3939
public static final String TEST_ACTIVITY_TYPE = "EventType";

0 commit comments

Comments
 (0)