refactor: use a separate class for a form for requesting an import of a sale of a series.

Fix #1026

Author: php-coder

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

@@ -37,13 +37,8 @@
 })
 public class RequestSeriesImportForm implements RequestImportDto {
 
-	// @todo #995 Series sale import: use its own interface and form
 	@NotEmpty(groups = Group.Level1.class)
 	@Size(
-		// For series sales a max length is SERIES_SALES_URL_MAX_LENGTH but since they are equal,
-		// we use IMPORT_REQUEST_URL_MAX_LENGTH here.
-		// Also, as the import saves nothing, this check actually isn't required. Perhaps,
-		// we shouldn't validate on this stage and let it fail later, during a sale creation.
 		max = SeriesImportValidation.IMPORT_REQUEST_URL_MAX_LENGTH,
 		message = "{value.too-long}",
 		groups = Group.Level2.class

src/main/java/ru/mystamps/web/feature/series/importing/sale/RequestSeriesSaleImportForm.java

@@ -0,0 +1,54 @@
+/*
+ * 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.sale;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.NotEmpty;
+import org.hibernate.validator.constraints.URL;
+import ru.mystamps.web.feature.series.importing.HasSiteParser;
+import ru.mystamps.web.feature.series.importing.RequestImportDto;
+import ru.mystamps.web.feature.series.sale.SeriesSalesValidation;
+import ru.mystamps.web.support.beanvalidation.Group;
+
+import javax.validation.GroupSequence;
+import javax.validation.constraints.Size;
+
+@Getter
+@Setter
+@GroupSequence({
+	RequestSeriesSaleImportForm.class,
+	Group.Level1.class,
+	Group.Level2.class,
+	Group.Level3.class,
+	Group.Level4.class
+})
+public class RequestSeriesSaleImportForm implements RequestImportDto {
+	
+	@NotEmpty(groups = Group.Level1.class)
+	@Size(
+		// Because the import saves nothing, this check actually isn't required. Perhaps,
+		// we shouldn't validate on this stage and let it fail later, during a sale creation.
+		max = SeriesSalesValidation.SERIES_SALES_URL_MAX_LENGTH,
+		message = "{value.too-long}",
+		groups = Group.Level2.class
+	)
+	@URL(groups = Group.Level3.class)
+	@HasSiteParser(groups = Group.Level4.class)
+	private String url;
+}

src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleImportController.java

@@ -25,7 +25,6 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import ru.mystamps.web.feature.series.importing.RequestSeriesImportForm;
 
 import javax.validation.Valid;
 
@@ -39,7 +38,7 @@ public class SeriesSaleImportController {
 
 	@PostMapping(SeriesSalesImportUrl.IMPORT_SERIES_SALES)
 	public ResponseEntity<SeriesSaleExtractedInfo> downloadAndParse(
-		@RequestBody @Valid RequestSeriesImportForm form) {
+		@RequestBody @Valid RequestSeriesSaleImportForm form) {
 
 		String url = form.getUrl();
 

src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesValidation.java

@@ -19,10 +19,9 @@
 
 import ru.mystamps.web.feature.series.sale.SeriesSalesDb.SeriesSales;
 
-@SuppressWarnings("PMD.CommentDefaultAccessModifier")
-final class SeriesSalesValidation {
+public final class SeriesSalesValidation {
 
-	static final int SERIES_SALES_URL_MAX_LENGTH = SeriesSales.TRANSACTION_URL_LENGTH;
+	public static final int SERIES_SALES_URL_MAX_LENGTH = SeriesSales.TRANSACTION_URL_LENGTH;
 
 	private SeriesSalesValidation() {
 	}