Jdbc{Category,Country}DaoImpl: simplify code by adding row mapper for SelectEntityDto.

No functional changes.

Author: php-coder

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

@@ -19,7 +19,6 @@
 
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -116,21 +115,12 @@ public Map<String, Integer> getStatisticsOf(Integer collectionId, String lang) {
 	}
 
 	@Override
-	@SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
 	public Iterable<SelectEntityDto> findAllAsSelectEntries(String lang) {
-		// TODO: find a better way of extracting results
-		List<Pair<String, Integer>> rawResult = jdbcTemplate.query(
+		return jdbcTemplate.query(
 			findCategoriesNamesWithIdsSql,
 			Collections.singletonMap("lang", lang),
-			RowMappers.forNameAndId()
+			RowMappers::forSelectEntityDto
 		);
-		
-		List<SelectEntityDto> result = new LinkedList<>();
-		for (Pair<String, Integer> pair : rawResult) {
-			result.add(new SelectEntityDto(pair.getSecond(), pair.getFirst()));
-		}
-		
-		return result;
 	}
 
 	@Override

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

@@ -19,7 +19,6 @@
 
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -116,21 +115,12 @@ public Map<String, Integer> getStatisticsOf(Integer collectionId, String lang) {
 	}
 
 	@Override
-	@SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
 	public Iterable<SelectEntityDto> findAllAsSelectEntries(String lang) {
-		// TODO: find a better way of extracting results
-		List<Pair<String, Integer>> rawResult = jdbcTemplate.query(
+		return jdbcTemplate.query(
 			findCountriesNamesWithIdsSql,
 			Collections.singletonMap("lang", lang),
-			RowMappers.forNameAndId()
+			RowMappers::forSelectEntityDto
 		);
-		
-		List<SelectEntityDto> result = new LinkedList<>();
-		for (Pair<String, Integer> pair : rawResult) {
-			result.add(new SelectEntityDto(pair.getSecond(), pair.getFirst()));
-		}
-		
-		return result;
 	}
 
 	@Override

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

@@ -17,10 +17,14 @@
  */
 package ru.mystamps.web.dao.impl;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
 import org.springframework.jdbc.core.RowMapper;
 
 import ru.mystamps.web.entity.UsersActivation;
 import ru.mystamps.web.service.dto.LinkEntityDto;
+import ru.mystamps.web.service.dto.SelectEntityDto;
 import ru.mystamps.web.service.dto.SeriesInfoDto;
 import ru.mystamps.web.service.dto.SitemapInfoDto;
 
@@ -63,6 +67,13 @@ public static RowMapper<SitemapInfoDto> forSitemapInfoDto() {
 		return SITEMAP_INFO_DTO_ROW_MAPPER;
 	}
 
+	public static SelectEntityDto forSelectEntityDto(ResultSet rs, int i) throws SQLException {
+		return new SelectEntityDto(
+			rs.getInt("id"),
+			rs.getString("name")
+		);
+	}
+	
 	public static RowMapper<SeriesInfoDto> forSeriesInfoDto() {
 		return SERIES_INFO_DTO_ROW_MAPPER;
 	}