Skip to content

Commit cd6fd8a

Browse files
committed
SeriesService.findByCollectionId(): change return type to List.
Addressed to #321 No functional changes.
1 parent 4d7da78 commit cd6fd8a

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public String showInfo(
7373
model.addAttribute("ownerName", owner);
7474

7575
String lang = LocaleUtils.getLanguageOrNull(userLocale);
76-
Iterable<SeriesInfoDto> seriesOfCollection =
76+
List<SeriesInfoDto> seriesOfCollection =
7777
seriesService.findByCollectionId(collectionId, lang);
7878
model.addAttribute("seriesOfCollection", seriesOfCollection);
7979

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public interface SeriesDao {
3636
List<SeriesInfoDto> findByIdsAsSeriesInfo(List<Integer> seriesIds, String lang);
3737
List<SeriesInfoDto> findByCategoryIdAsSeriesInfo(Integer categoryId, String lang);
3838
List<SeriesInfoDto> findByCountryIdAsSeriesInfo(Integer countryId, String lang);
39-
Iterable<SeriesInfoDto> findByCollectionIdAsSeriesInfo(Integer collectionId, String lang);
39+
List<SeriesInfoDto> findByCollectionIdAsSeriesInfo(Integer collectionId, String lang);
4040
long countAll();
4141
long countAllStamps();
4242
long countSeriesOfCollection(Integer collectionId);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,7 @@ public List<SeriesInfoDto> findByCountryIdAsSeriesInfo(Integer countryId, String
241241
}
242242

243243
@Override
244-
// CheckStyle: ignore LineLength for next 1 line
245-
public Iterable<SeriesInfoDto> findByCollectionIdAsSeriesInfo(Integer collectionId, String lang) {
244+
public List<SeriesInfoDto> findByCollectionIdAsSeriesInfo(Integer collectionId, String lang) {
246245
Map<String, Object> params = new HashMap<>();
247246
params.put("collection_id", collectionId);
248247
params.put("lang", lang);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public interface SeriesService {
4848

4949
List<SeriesInfoDto> findByCategoryId(Integer categoryId, String lang);
5050
List<SeriesInfoDto> findByCountryId(Integer countryId, String lang);
51-
Iterable<SeriesInfoDto> findByCollectionId(Integer collectionId, String lang);
51+
List<SeriesInfoDto> findByCollectionId(Integer collectionId, String lang);
5252
Iterable<SeriesInfoDto> findRecentlyAdded(int quantity, String lang);
5353
Iterable<SitemapInfoDto> findAllForSitemap();
5454
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ public List<SeriesInfoDto> findByCountryId(Integer countryId, String lang) {
329329

330330
@Override
331331
@Transactional(readOnly = true)
332-
public Iterable<SeriesInfoDto> findByCollectionId(Integer collectionId, String lang) {
332+
public List<SeriesInfoDto> findByCollectionId(Integer collectionId, String lang) {
333333
Validate.isTrue(collectionId != null, "Collection id must be non null");
334334

335335
return seriesDao.findByCollectionIdAsSeriesInfo(collectionId, lang);

0 commit comments

Comments
 (0)