Skip to content

Commit 52498c7

Browse files
php-coderphp-coder
committed
Fix PrivateFieldCouldBeFinal warnings from CodeNarc.
@see http://codenarc.sourceforge.net/codenarc-rules-design.html#PrivateFieldCouldBeFinal No functional changes.
1 parent b712aab commit 52498c7

16 files changed

+58
-56
lines changed

‎src/test/groovy/ru/mystamps/web/service/CategoryServiceImplTest.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import ru.mystamps.web.util.SlugUtils
3030
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
3131
class CategoryServiceImplTest extends Specification {
3232

33-
private AddCategoryForm form
34-
private Integer userId = 123
33+
private final Integer userId = 123
34+
private final CategoryDao categoryDao = Mock()
35+
private final CategoryService service = new CategoryServiceImpl(categoryDao)
3536

36-
private CategoryDao categoryDao = Mock()
37-
private CategoryService service = new CategoryServiceImpl(categoryDao)
37+
private AddCategoryForm form
3838

3939
def setup() {
4040
form = new AddCategoryForm()

‎src/test/groovy/ru/mystamps/web/service/CollectionServiceImplTest.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ import ru.mystamps.web.util.SlugUtils
2828

2929
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
3030
class CollectionServiceImplTest extends Specification {
31-
private CollectionDao collectionDao = Mock()
31+
32+
private final CollectionDao collectionDao = Mock()
3233

3334
private CollectionService service
3435

‎src/test/groovy/ru/mystamps/web/service/CountryServiceImplTest.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import ru.mystamps.web.util.SlugUtils
3030
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
3131
class CountryServiceImplTest extends Specification {
3232

33-
private AddCountryForm form
34-
private Integer userId = 321
33+
private final Integer userId = 321
34+
private final CountryDao countryDao = Mock()
35+
private final CountryService service = new CountryServiceImpl(countryDao)
3536

36-
private CountryDao countryDao = Mock()
37-
private CountryService service = new CountryServiceImpl(countryDao)
37+
private AddCountryForm form
3838

3939
def setup() {
4040
form = new AddCountryForm()

‎src/test/groovy/ru/mystamps/web/service/CronServiceImplTest.groovy

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ import ru.mystamps.web.service.dto.AdminDailyReport
2525
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
2626
class CronServiceImplTest extends Specification {
2727

28-
private CategoryService categoryService = Mock()
29-
private CountryService countryService = Mock()
30-
private SeriesService seriesService = Mock()
31-
private SuspiciousActivityService suspiciousActivityService = Mock()
32-
private MailService mailService = Mock()
33-
private UserService userService = Mock()
34-
private UsersActivationService usersActivationService = Mock()
35-
36-
private CronService service = new CronServiceImpl(
28+
private final CategoryService categoryService = Mock()
29+
private final CountryService countryService = Mock()
30+
private final SeriesService seriesService = Mock()
31+
private final SuspiciousActivityService suspiciousActivityService = Mock()
32+
private final MailService mailService = Mock()
33+
private final UserService userService = Mock()
34+
private final UsersActivationService usersActivationService = Mock()
35+
36+
private final CronService service = new CronServiceImpl(
3737
categoryService,
3838
countryService,
3939
seriesService,

‎src/test/groovy/ru/mystamps/web/service/DatabaseImagePersistenceStrategyTest.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import ru.mystamps.web.service.exception.ImagePersistenceException
3030
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
3131
class DatabaseImagePersistenceStrategyTest extends Specification {
3232

33-
private ImageDataDao imageDataDao = Mock()
34-
private MultipartFile multipartFile = Mock()
35-
private ImageInfoDto imageInfoDto = TestObjects.createImageInfoDto()
33+
private final ImageDataDao imageDataDao = Mock()
34+
private final MultipartFile multipartFile = Mock()
35+
private final ImageInfoDto imageInfoDto = TestObjects.createImageInfoDto()
3636

37-
private ImagePersistenceStrategy strategy = new DatabaseImagePersistenceStrategy(imageDataDao)
37+
private final ImagePersistenceStrategy strategy = new DatabaseImagePersistenceStrategy(imageDataDao)
3838

3939
//
4040
// Tests for save()

‎src/test/groovy/ru/mystamps/web/service/FilesystemImagePersistenceStrategyTest.groovy

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ import java.nio.file.Path
3131
class FilesystemImagePersistenceStrategyTest extends Specification {
3232
private static final STORAGE_DIR = File.separator + 'tmp'
3333

34-
private MultipartFile multipartFile = Mock()
35-
private ImageInfoDto imageInfoDto = TestObjects.createImageInfoDto()
36-
private Path mockFile = Mock(Path)
34+
private final MultipartFile multipartFile = Mock()
35+
private final ImageInfoDto imageInfoDto = TestObjects.createImageInfoDto()
36+
private final Path mockFile = Mock(Path)
3737

38-
private ImagePersistenceStrategy strategy = Spy(FilesystemImagePersistenceStrategy, constructorArgs:[STORAGE_DIR])
38+
private final ImagePersistenceStrategy strategy =
39+
Spy(FilesystemImagePersistenceStrategy, constructorArgs:[STORAGE_DIR])
3940

4041
//
4142
// Tests for save()

‎src/test/groovy/ru/mystamps/web/service/GibbonsCatalogServiceImplTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import ru.mystamps.web.dao.StampsCatalogDao
2424
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
2525
class GibbonsCatalogServiceImplTest extends Specification {
2626

27-
private StampsCatalogDao gibbonsCatalogDao = Mock()
27+
private final StampsCatalogDao gibbonsCatalogDao = Mock()
2828

29-
private StampsCatalogService service = new GibbonsCatalogServiceImpl(gibbonsCatalogDao)
29+
private final StampsCatalogService service = new GibbonsCatalogServiceImpl(gibbonsCatalogDao)
3030

3131
//
3232
// Tests for findBySeriesId()

‎src/test/groovy/ru/mystamps/web/service/ImageServiceImplTest.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import ru.mystamps.web.service.exception.ImagePersistenceException
3030
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
3131
class ImageServiceImplTest extends Specification {
3232

33-
private ImageDao imageDao = Mock()
34-
private MultipartFile multipartFile = Mock()
35-
private ImagePersistenceStrategy imagePersistenceStrategy = Mock()
33+
private final ImageDao imageDao = Mock()
34+
private final MultipartFile multipartFile = Mock()
35+
private final ImagePersistenceStrategy imagePersistenceStrategy = Mock()
3636

37-
private ImageService service = new ImageServiceImpl(imagePersistenceStrategy, imageDao)
37+
private final ImageService service = new ImageServiceImpl(imagePersistenceStrategy, imageDao)
3838

3939
def setup() {
4040
multipartFile.size >> 1024L

‎src/test/groovy/ru/mystamps/web/service/MichelCatalogServiceImplTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import ru.mystamps.web.dao.StampsCatalogDao
2424
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
2525
class MichelCatalogServiceImplTest extends Specification {
2626

27-
private StampsCatalogDao michelCatalogDao = Mock()
27+
private final StampsCatalogDao michelCatalogDao = Mock()
2828

29-
private StampsCatalogService service = new MichelCatalogServiceImpl(michelCatalogDao)
29+
private final StampsCatalogService service = new MichelCatalogServiceImpl(michelCatalogDao)
3030

3131
//
3232
// Tests for findBySeriesId()

‎src/test/groovy/ru/mystamps/web/service/ScottCatalogServiceImplTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import ru.mystamps.web.dao.StampsCatalogDao
2424
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
2525
class ScottCatalogServiceImplTest extends Specification {
2626

27-
private StampsCatalogDao scottCatalogDao = Mock()
27+
private final StampsCatalogDao scottCatalogDao = Mock()
2828

29-
private StampsCatalogService service = new ScottCatalogServiceImpl(scottCatalogDao)
29+
private final StampsCatalogService service = new ScottCatalogServiceImpl(scottCatalogDao)
3030

3131
//
3232
// Tests for findBySeriesId()

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ class SeriesServiceImplTest extends Specification {
3838
private static final BigDecimal ANY_PRICE = new BigDecimal('17')
3939
private static final Integer ANY_IMAGE_ID = 18
4040

41-
private ImageService imageService = Mock()
42-
private SeriesDao seriesDao = Mock()
43-
private StampsCatalogService michelCatalogService = Mock()
44-
private StampsCatalogService scottCatalogService = Mock()
45-
private StampsCatalogService yvertCatalogService = Mock()
46-
private StampsCatalogService gibbonsCatalogService = Mock()
47-
private MultipartFile multipartFile = Mock()
41+
private final ImageService imageService = Mock()
42+
private final SeriesDao seriesDao = Mock()
43+
private final StampsCatalogService michelCatalogService = Mock()
44+
private final StampsCatalogService scottCatalogService = Mock()
45+
private final StampsCatalogService yvertCatalogService = Mock()
46+
private final StampsCatalogService gibbonsCatalogService = Mock()
47+
private final MultipartFile multipartFile = Mock()
4848

4949
private SeriesService service
5050
private AddSeriesForm form

‎src/test/groovy/ru/mystamps/web/service/SiteServiceImplTest.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ class SiteServiceImplTest extends Specification {
3434
private static final String TEST_REFERER_PAGE = TestObjects.TEST_ACTIVITY_REFERER
3535
private static final String TEST_USER_AGENT = TestObjects.TEST_ACTIVITY_AGENT
3636

37-
private SuspiciousActivityDao suspiciousActivityDao = Mock()
37+
private final SuspiciousActivityDao suspiciousActivityDao = Mock()
38+
3839
private SiteServiceImpl serviceImpl
3940

4041
def setup() {

‎src/test/groovy/ru/mystamps/web/service/SuspiciousActivityServiceImplTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import ru.mystamps.web.dao.dto.SuspiciousActivityDto
2626
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
2727
class SuspiciousActivityServiceImplTest extends Specification {
2828

29-
private SuspiciousActivityDao suspiciousActivityDao = Mock()
29+
private final SuspiciousActivityDao suspiciousActivityDao = Mock()
3030

31-
private SuspiciousActivityService service = new SuspiciousActivityServiceImpl(suspiciousActivityDao)
31+
private final SuspiciousActivityService service = new SuspiciousActivityServiceImpl(suspiciousActivityDao)
3232

3333
//
3434
// Tests for countAll()

‎src/test/groovy/ru/mystamps/web/service/UserServiceImplTest.groovy

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ import ru.mystamps.web.tests.DateUtils
3131
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
3232
class UserServiceImplTest extends Specification {
3333

34-
private static Integer ANY_USER_ID = TestObjects.TEST_USER_ID
34+
private static final Integer ANY_USER_ID = TestObjects.TEST_USER_ID
3535

36-
private UserDao userDao = Mock()
37-
private UsersActivationService usersActivationService = Mock()
38-
private CollectionService collectionService = Mock()
39-
private PasswordEncoder encoder = Mock()
36+
private final UserDao userDao = Mock()
37+
private final UsersActivationService usersActivationService = Mock()
38+
private final CollectionService collectionService = Mock()
39+
private final PasswordEncoder encoder = Mock()
4040

4141
private UserService service
4242
private ActivateAccountForm activationForm

‎src/test/groovy/ru/mystamps/web/service/UsersActivationServiceImplTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import ru.mystamps.web.validation.ValidationRules
3131
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
3232
class UsersActivationServiceImplTest extends Specification {
3333

34-
private UsersActivationDao usersActivationDao = Mock()
35-
private MailService mailService = Mock()
34+
private final UsersActivationDao usersActivationDao = Mock()
35+
private final MailService mailService = Mock()
3636

3737
private UsersActivationService service
3838
private RegisterAccountForm registrationForm

‎src/test/groovy/ru/mystamps/web/service/YvertCatalogServiceImplTest.groovy

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ import ru.mystamps.web.dao.StampsCatalogDao
2424
@SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
2525
class YvertCatalogServiceImplTest extends Specification {
2626

27-
private StampsCatalogDao yvertCatalogDao = Mock()
28-
29-
private StampsCatalogService service = new YvertCatalogServiceImpl(yvertCatalogDao)
27+
private final StampsCatalogDao yvertCatalogDao = Mock()
28+
private final StampsCatalogService service = new YvertCatalogServiceImpl(yvertCatalogDao)
3029

3130
//
3231
// Tests for findBySeriesId()

0 commit comments

Comments
 (0)