refactor: move RowMappers::forSitemapInfoDto from series to common subpackage

Part of #1605

Author: php-coder

Diff for: src/main/config/spotbugs-filter.xml

@@ -125,7 +125,7 @@
 		<Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
 	</Match>
 	<Match>
-		<Class name="ru.mystamps.web.feature.series.SitemapInfoDto" />
+		<Class name="ru.mystamps.web.common.SitemapInfoDto" />
 		<Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
 	</Match>
 	<Match>

Diff for: src/main/java/ru/mystamps/web/common/RowMappers.java

@@ -61,5 +61,14 @@ public static LinkEntityDto createLinkEntityDto(
 			rs.getString(nameColumn)
 		);
 	}
+
+	public static SitemapInfoDto forSitemapInfoDto(ResultSet rs, int unused)
+		throws SQLException {
+
+		return new SitemapInfoDto(
+			rs.getString("id"),
+			rs.getTimestamp("updated_at")
+		);
+	}
 
 }

Diff for: src/main/java/ru/mystamps/web/feature/series/SitemapInfoDto.java renamed to src/main/java/ru/mystamps/web/common/SitemapInfoDto.java

@@ -15,7 +15,7 @@
  * 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.feature.series;
+package ru.mystamps.web.common;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

Diff for: src/main/java/ru/mystamps/web/feature/series/JdbcSeriesDao.java

@@ -25,6 +25,7 @@
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import ru.mystamps.web.common.JdbcUtils;
+import ru.mystamps.web.common.SitemapInfoDto;
 
 import java.util.Collections;
 import java.util.Date;
@@ -198,7 +199,7 @@ public List<SitemapInfoDto> findAllForSitemap() {
 		return jdbcTemplate.query(
 			findAllForSitemapSql,
 			Collections.emptyMap(),
-			RowMappers::forSitemapInfoDto
+			ru.mystamps.web.common.RowMappers::forSitemapInfoDto
 		);
 	}
 

Diff for: src/main/java/ru/mystamps/web/feature/series/RowMappers.java

@@ -33,15 +33,6 @@ final class RowMappers {
 	private RowMappers() {
 	}
 
-	/* default */ static SitemapInfoDto forSitemapInfoDto(ResultSet rs, int unused)
-		throws SQLException {
-		
-		return new SitemapInfoDto(
-			rs.getString("id"),
-			rs.getTimestamp("updated_at")
-		);
-	}
-
 	/* default */ static SeriesLinkDto forSeriesLinkDto(ResultSet rs, int unused)
 		throws SQLException {
 

Diff for: src/main/java/ru/mystamps/web/feature/series/SeriesDao.java

@@ -17,6 +17,8 @@
  */
 package ru.mystamps.web.feature.series;
 
+import ru.mystamps.web.common.SitemapInfoDto;
+
 import java.util.Date;
 import java.util.List;
 

Diff for: src/main/java/ru/mystamps/web/feature/series/SeriesService.java

@@ -17,6 +17,8 @@
  */
 package ru.mystamps.web.feature.series;
 
+import ru.mystamps.web.common.SitemapInfoDto;
+
 import javax.validation.constraints.Size;
 import java.math.BigDecimal;
 import java.util.Date;

Diff for: src/main/java/ru/mystamps/web/feature/series/SeriesServiceImpl.java

@@ -23,6 +23,7 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
+import ru.mystamps.web.common.SitemapInfoDto;
 import ru.mystamps.web.feature.image.ImageInfoDto;
 import ru.mystamps.web.feature.image.ImageService;
 import ru.mystamps.web.support.spring.security.HasAuthority;

Diff for: src/main/java/ru/mystamps/web/feature/site/SitemapController.java

@@ -23,9 +23,9 @@
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
+import ru.mystamps.web.common.SitemapInfoDto;
 import ru.mystamps.web.feature.series.SeriesService;
 import ru.mystamps.web.feature.series.SeriesUrl;
-import ru.mystamps.web.feature.series.SitemapInfoDto;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

Diff for: src/test/groovy/ru/mystamps/web/feature/series/SeriesServiceImplTest.groovy

@@ -20,6 +20,7 @@ package ru.mystamps.web.feature.series
 import org.slf4j.helpers.NOPLogger
 import org.springframework.web.multipart.MultipartFile
 import ru.mystamps.web.common.LinkEntityDto
+import ru.mystamps.web.common.SitemapInfoDto
 import ru.mystamps.web.feature.image.ImageInfoDto
 import ru.mystamps.web.feature.image.ImageService
 import ru.mystamps.web.service.TestObjects

Diff for: src/test/java/ru/mystamps/web/service/TestObjects.java

@@ -19,6 +19,7 @@
 
 import ru.mystamps.web.common.EntityWithParentDto;
 import ru.mystamps.web.common.LinkEntityDto;
+import ru.mystamps.web.common.SitemapInfoDto;
 import ru.mystamps.web.common.SlugUtils;
 import ru.mystamps.web.feature.account.AddUserDbDto;
 import ru.mystamps.web.feature.account.UserDetails;
@@ -39,7 +40,6 @@
 import ru.mystamps.web.feature.series.SeriesInGalleryDto;
 import ru.mystamps.web.feature.series.SeriesInfoDto;
 import ru.mystamps.web.feature.series.SeriesLinkDto;
-import ru.mystamps.web.feature.series.SitemapInfoDto;
 import ru.mystamps.web.feature.series.importing.ImportRequestDto;
 import ru.mystamps.web.feature.series.importing.ImportRequestFullInfo;
 import ru.mystamps.web.feature.series.importing.ImportRequestInfo;