Skip to content

Commit

Permalink
CountryService: move to ru.mystamps.web.feature.country package.
Browse files Browse the repository at this point in the history 
Addressed to #927

No functional changes.
  • Loading branch information
@php-coder
php-coder committed Jul 19, 2018
1 parent 1bab4c8 commit 7224fae
Show file tree
Hide file tree
Showing 16 changed files with 15 additions and 10 deletions.
1 change: 1 addition & 0 deletions src/main/java/ru/mystamps/web/config/ServicesConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

import ru.mystamps.web.feature.category.CategoryConfig;
import ru.mystamps.web.feature.category.CategoryService;
import ru.mystamps.web.feature.country.CountryService;
// CheckStyle: ignore AvoidStarImportCheck for next 1 line
import ru.mystamps.web.service.*; // NOPMD: UnusedImports
import ru.mystamps.web.support.spring.security.SecurityConfig;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ru/mystamps/web/controller/CollectionController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
import ru.mystamps.web.dao.dto.SeriesInCollectionDto;
import ru.mystamps.web.dao.dto.SeriesInCollectionWithPriceDto;
import ru.mystamps.web.feature.category.CategoryService;
import ru.mystamps.web.feature.country.CountryService;
import ru.mystamps.web.service.CollectionService;
import ru.mystamps.web.service.CountryService;
import ru.mystamps.web.service.SeriesService;
import ru.mystamps.web.util.LocaleUtils;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ru/mystamps/web/controller/SeriesController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
import ru.mystamps.web.feature.category.Category;
import ru.mystamps.web.feature.category.CategoryService;
import ru.mystamps.web.feature.country.Country;
import ru.mystamps.web.feature.country.CountryService;
import ru.mystamps.web.service.CollectionService;
import ru.mystamps.web.service.CountryService;
import ru.mystamps.web.service.SeriesImportService;
import ru.mystamps.web.service.SeriesSalesService;
import ru.mystamps.web.service.SeriesService;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ru/mystamps/web/controller/SiteController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import ru.mystamps.web.dao.dto.SeriesLinkDto;
import ru.mystamps.web.dao.dto.SuspiciousActivityDto;
import ru.mystamps.web.feature.category.CategoryService;
import ru.mystamps.web.feature.country.CountryService;
import ru.mystamps.web.service.CollectionService;
import ru.mystamps.web.service.CountryService;
import ru.mystamps.web.service.SeriesService;
import ru.mystamps.web.service.SuspiciousActivityService;
import ru.mystamps.web.util.LocaleUtils;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ru/mystamps/web/controller/SuggestionController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import ru.mystamps.web.Url;
import ru.mystamps.web.controller.converter.annotation.CurrentUser;
import ru.mystamps.web.service.CountryService;
import ru.mystamps.web.feature.country.CountryService;

@Controller
@RequiredArgsConstructor
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ru/mystamps/web/controller/converter/LinkEntityDtoGenericConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import ru.mystamps.web.feature.category.Category;
import ru.mystamps.web.feature.category.CategoryService;
import ru.mystamps.web.feature.country.Country;
import ru.mystamps.web.service.CountryService;
import ru.mystamps.web.feature.country.CountryService;
import ru.mystamps.web.util.LocaleUtils;

@RequiredArgsConstructor
Expand Down
1 change: 0 additions & 1 deletion src/main/java/ru/mystamps/web/feature/country/CountryController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import ru.mystamps.web.controller.editor.ReplaceRepeatingSpacesEditor;
import ru.mystamps.web.dao.dto.LinkEntityDto;
import ru.mystamps.web.dao.dto.SeriesInfoDto;
import ru.mystamps.web.service.CountryService;
import ru.mystamps.web.service.SeriesService;
import ru.mystamps.web.util.LocaleUtils;

Expand Down
3 changes: 1 addition & 2 deletions .../mystamps/web/service/CountryService.java → ...s/web/feature/country/CountryService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package ru.mystamps.web.service;
package ru.mystamps.web.feature.country;

import java.util.Date;
import java.util.List;

import ru.mystamps.web.dao.dto.LinkEntityDto;
import ru.mystamps.web.feature.country.AddCountryDto;

@SuppressWarnings("PMD.TooManyMethods")
public interface CountryService {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/ru/mystamps/web/service/CountryServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import ru.mystamps.web.dao.dto.AddCountryDbDto;
import ru.mystamps.web.dao.dto.LinkEntityDto;
import ru.mystamps.web.feature.country.AddCountryDto;
import ru.mystamps.web.feature.country.CountryService;
import ru.mystamps.web.support.spring.security.HasAuthority;
import ru.mystamps.web.util.LocaleUtils;
import ru.mystamps.web.util.SlugUtils;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/ru/mystamps/web/service/CronServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

import ru.mystamps.web.dao.dto.UsersActivationFullDto;
import ru.mystamps.web.feature.category.CategoryService;
import ru.mystamps.web.feature.country.CountryService;
import ru.mystamps.web.service.dto.AdminDailyReport;
import ru.mystamps.web.support.spring.security.HasAuthority;

Expand Down
1 change: 1 addition & 0 deletions src/main/java/ru/mystamps/web/service/SeriesInfoExtractorServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

import ru.mystamps.web.dao.dto.Currency;
import ru.mystamps.web.feature.category.CategoryService;
import ru.mystamps.web.feature.country.CountryService;
import ru.mystamps.web.service.dto.RawParsedDataDto;
import ru.mystamps.web.service.dto.SeriesExtractedInfo;
import ru.mystamps.web.validation.ValidationRules;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountryNameValidator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import lombok.RequiredArgsConstructor;

import ru.mystamps.web.service.CountryService;
import ru.mystamps.web.feature.country.CountryService;
import ru.mystamps.web.support.beanvalidation.UniqueCountryName.Lang;

@RequiredArgsConstructor
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountrySlugValidator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import lombok.RequiredArgsConstructor;

import ru.mystamps.web.service.CountryService;
import ru.mystamps.web.feature.country.CountryService;
import ru.mystamps.web.util.SlugUtils;

@RequiredArgsConstructor
Expand Down
1 change: 1 addition & 0 deletions src/test/groovy/ru/mystamps/web/service/CountryServiceImplTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import ru.mystamps.web.dao.CountryDao
import ru.mystamps.web.dao.dto.AddCountryDbDto
import ru.mystamps.web.dao.dto.LinkEntityDto
import ru.mystamps.web.feature.country.AddCountryForm
import ru.mystamps.web.feature.country.CountryService
import ru.mystamps.web.tests.DateUtils
import ru.mystamps.web.tests.Random
import ru.mystamps.web.util.SlugUtils
Expand Down
1 change: 1 addition & 0 deletions src/test/groovy/ru/mystamps/web/service/CronServiceImplTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import spock.lang.Specification

import ru.mystamps.web.dao.dto.UsersActivationFullDto
import ru.mystamps.web.feature.category.CategoryService
import ru.mystamps.web.feature.country.CountryService
import ru.mystamps.web.service.dto.AdminDailyReport

@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
Expand Down
1 change: 1 addition & 0 deletions src/test/groovy/ru/mystamps/web/service/SeriesInfoExtractorServiceImplTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import spock.lang.Specification
import spock.lang.Unroll

import ru.mystamps.web.feature.category.CategoryService
import ru.mystamps.web.feature.country.CountryService
import ru.mystamps.web.tests.Random
import ru.mystamps.web.validation.ValidationRules

Expand Down

0 comments on commit 7224fae

Please sign in to comment.