Extract the method from 4 vars in order to use DbDto object

Author: KrivenkoAlexander

src/main/config/findbugs-filter.xml

@@ -82,6 +82,10 @@
 		<Class name="ru.mystamps.web.feature.series.SitemapInfoDto" />
 		<Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
 	</Match>
+	<Match>
+		<Class name="ru.mystamps.web.feature.series.importing.UpdateImportRequestStatusDbDto" />
+		<Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
+	</Match>
 	<Match>
 		<Class name="ru.mystamps.web.feature.series.importing.ImportSeriesDbDto" />
 		<Or>

src/main/java/ru/mystamps/web/feature/series/importing/JdbcSeriesImportDao.java

@@ -123,21 +123,20 @@ public void setSeriesIdAndChangeStatus(
 		);
 	}
 
-	// @todo #660 JdbcSeriesImportDao.changeStatus(): introduce dao
 	@Override
-	public void changeStatus(Integer requestId, Date date, String oldStatus, String newStatus) {
+	public void changeStatus(UpdateImportRequestStatusDbDto requestStatus) {
 		Map<String, Object> params = new HashMap<>();
-		params.put("id", requestId);
-		params.put("date", date);
-		params.put("old_status", oldStatus);
-		params.put("new_status", newStatus);
+		params.put("id", requestStatus.getRequestId());
+		params.put("date", requestStatus.getDate());
+		params.put("old_status", requestStatus.getOldStatus());
+		params.put("new_status", requestStatus.getNewStatus());
 
 		int affected = jdbcTemplate.update(changeStatusSql, params);
 
 		Validate.validState(
 			affected == 1,
 			"Unexpected number of affected rows after updating status of request #%d: %d",
-			requestId,
+			requestStatus.getRequestId(),
 			affected
 		);
 	}

src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportDao.java

@@ -29,7 +29,7 @@ void setSeriesIdAndChangeStatus(
 		String newStatus,
 		Date updatedAt
 	);
-	void changeStatus(Integer requestId, Date date, String oldStatus, String newStatus);
+	void changeStatus(UpdateImportRequestStatusDbDto requestStatus);
 	ImportRequestDto findById(Integer id);
 	void addRawContent(Integer requestId, Date createdAt, Date updatedAt, String content);
 	String findRawContentByRequestId(Integer requestId);

src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportServiceImpl.java

@@ -30,6 +30,7 @@
 import org.slf4j.Logger;
 
 import org.springframework.context.ApplicationEventPublisher;
+
 import org.springframework.transaction.annotation.Transactional;
 
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -136,8 +137,10 @@ public void changeStatus(Integer requestId, String oldStatus, String newStatus)
 		Validate.isTrue(!oldStatus.equals(newStatus), "Statuses must be different");
 
 		Date now = new Date();
+		UpdateImportRequestStatusDbDto status =
+			new UpdateImportRequestStatusDbDto(requestId, now, oldStatus, newStatus);
 
-		seriesImportDao.changeStatus(requestId, now, oldStatus, newStatus);
+		seriesImportDao.changeStatus(status);
 	}
 
 	@Override

src/main/java/ru/mystamps/web/feature/series/importing/UpdateImportRequestStatusDbDto.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2009-2019 Slava Semushin <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.importing;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
+
+@Getter
+@ToString
+@RequiredArgsConstructor
+public class UpdateImportRequestStatusDbDto {
+	private final Integer requestId;
+	private final Date date;
+	private final String oldStatus;
+	private final String newStatus;
+}

src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesImportServiceImplTest.groovy

@@ -101,7 +101,7 @@ class SeriesImportServiceImplTest extends Specification {
 			ex.message == 'User id must be non null'
 	}
 
-	def 'addRequest() should throw exception if url is incorrect'() {
+		def 'addRequest() should throw exception if url is incorrect'() {
 		given:
 			form.setUrl('http://example.org/текст c пробелами')
 		when:
@@ -318,15 +318,14 @@ class SeriesImportServiceImplTest extends Specification {
 		when:
 			service.changeStatus(expectedRequestId, expectedOldStatus, expectedNewStatus)
 		then:
-			1 * seriesImportDao.changeStatus(
-				expectedRequestId,
-				{ Date date ->
-					assert DateUtils.roughlyEqual(date, new Date())
-					return true
-				},
-				expectedOldStatus,
-				expectedNewStatus
-			)
+			1 * seriesImportDao.changeStatus { UpdateImportRequestStatusDbDto status ->
+				assert status?.requestId == expectedRequestId
+				assert DateUtils.roughlyEqual(status.date, new Date())
+				assert status?.oldStatus == expectedOldStatus
+				assert status?.newStatus == expectedNewStatus
+				return true
+			}
+	
 	}
 
 	//
@@ -367,7 +366,7 @@ class SeriesImportServiceImplTest extends Specification {
 			IllegalArgumentException ex = thrown()
 			ex.message == 'Request id must be non null'
 	}
-	
+
 	@Unroll
 	def "saveDownloadedContent() should throw exception when content is '#content'"(String content) {
 		when:
@@ -410,15 +409,13 @@ class SeriesImportServiceImplTest extends Specification {
 		when:
 			service.saveDownloadedContent(expectedRequestId, between(1, 10).english())
 		then:
-			1 * seriesImportDao.changeStatus(
-				expectedRequestId,
-				{ Date date ->
-					assert DateUtils.roughlyEqual(date, new Date())
+			1 * seriesImportDao.changeStatus { UpdateImportRequestStatusDbDto status  ->
+					assert status?.requestId == expectedRequestId
+					assert DateUtils.roughlyEqual(status.date, new Date())
+					assert status?.oldStatus == SeriesImportRequestStatus.UNPROCESSED
+					assert status?.newStatus == SeriesImportRequestStatus.DOWNLOADING_SUCCEEDED
 					return true
-				},
-				SeriesImportRequestStatus.UNPROCESSED,
-				SeriesImportRequestStatus.DOWNLOADING_SUCCEEDED
-			)
+			}
 	}
 
 	//
@@ -568,15 +565,13 @@ class SeriesImportServiceImplTest extends Specification {
 		when:
 			service.saveParsedData(Random.id(), TestObjects.createEmptySeriesExtractedInfo(), Random.url())
 		then:
-			1 * seriesImportDao.changeStatus(
-				_ as Integer,
-				{ Date date ->
-					assert DateUtils.roughlyEqual(date, new Date())
+			1 * seriesImportDao.changeStatus { UpdateImportRequestStatusDbDto status ->
+					assert DateUtils.roughlyEqual(status.date, new Date())
+					assert status?.oldStatus == SeriesImportRequestStatus.DOWNLOADING_SUCCEEDED
+					assert status?.newStatus == SeriesImportRequestStatus.PARSING_SUCCEEDED
 					return true
-				},
-				SeriesImportRequestStatus.DOWNLOADING_SUCCEEDED,
-				SeriesImportRequestStatus.PARSING_SUCCEEDED
-			)
+			}
+			
 	}
 
 	//