Skip to content

Commit 9353f41

Browse files
committed
CategoryService.findAllAsLinkEntities(): change return type to List.
Addressed to #321 No functional changes.
1 parent 7eb5353 commit 9353f41

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

src/main/java/ru/mystamps/web/controller/CategoryController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public String showInfo(
121121
@RequestMapping(Url.LIST_CATEGORIES_PAGE)
122122
public void list(Model model, Locale userLocale) {
123123
String lang = LocaleUtils.getLanguageOrNull(userLocale);
124-
Iterable<LinkEntityDto> categories = categoryService.findAllAsLinkEntities(lang);
124+
List<LinkEntityDto> categories = categoryService.findAllAsLinkEntities(lang);
125125

126126
model.addAttribute("categories", categories);
127127
}

src/main/java/ru/mystamps/web/dao/CategoryDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ public interface CategoryDao {
3333
long countAddedSince(Date date);
3434
List<Object[]> getStatisticsOf(Integer collectionId, String lang);
3535
Iterable<SelectEntityDto> findAllAsSelectEntities(String lang);
36-
Iterable<LinkEntityDto> findAllAsLinkEntities(String lang);
36+
List<LinkEntityDto> findAllAsLinkEntities(String lang);
3737
LinkEntityDto findOneAsLinkEntity(Integer categoryId, String lang);
3838
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public Iterable<SelectEntityDto> findAllAsSelectEntities(String lang) {
171171
}
172172

173173
@Override
174-
public Iterable<LinkEntityDto> findAllAsLinkEntities(String lang) {
174+
public List<LinkEntityDto> findAllAsLinkEntities(String lang) {
175175
return jdbcTemplate.query(
176176
findCategoriesNamesWithSlugSql,
177177
Collections.singletonMap("lang", lang),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public interface CategoryService {
2929
UrlEntityDto add(AddCategoryDto dto, Integer userId);
3030
Iterable<SelectEntityDto> findAllAsSelectEntities(String lang);
31-
Iterable<LinkEntityDto> findAllAsLinkEntities(String lang);
31+
List<LinkEntityDto> findAllAsLinkEntities(String lang);
3232
LinkEntityDto findOneAsLinkEntity(Integer categoryId, String lang);
3333
long countAll();
3434
long countCategoriesOf(Integer collectionId);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public Iterable<SelectEntityDto> findAllAsSelectEntities(String lang) {
8888

8989
@Override
9090
@Transactional(readOnly = true)
91-
public Iterable<LinkEntityDto> findAllAsLinkEntities(String lang) {
91+
public List<LinkEntityDto> findAllAsLinkEntities(String lang) {
9292
return categoryDao.findAllAsLinkEntities(lang);
9393
}
9494

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ class CategoryServiceImplTest extends Specification {
239239
and:
240240
categoryDao.findAllAsLinkEntities(_ as String) >> expectedCategories
241241
when:
242-
Iterable<LinkEntityDto> resultCategories = service.findAllAsLinkEntities('fr')
242+
List<LinkEntityDto> resultCategories = service.findAllAsLinkEntities('fr')
243243
then:
244244
resultCategories == expectedCategories
245245
}

0 commit comments

Comments
 (0)