/series/import/request: encode URL to percent encoding prior its persisting.

The quote from URL javadoc:
%
Note, the URI class does perform escaping of its component fields in certain circumstances. The
recommended way to manage the encoding and decoding of URLs is to use URI, and to convert between
these two classes using toURI() and URI.toURL().

The URLEncoder and URLDecoder classes can also be used, but only for HTML form encoding, which is
not the same as the encoding scheme defined in RFC2396.
%

Fix #772

Author: php-coder

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

@@ -17,6 +17,8 @@
  */
 package ru.mystamps.web.service;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Date;
 import java.util.List;
 
@@ -63,12 +65,19 @@ public class SeriesImportServiceImpl implements SeriesImportService {
 	@SuppressWarnings({ "PMD.NPathComplexity", "PMD.ModifiedCyclomaticComplexity" })
 	public Integer addRequest(RequestImportDto dto, Integer userId) {
 		Validate.isTrue(dto != null, "DTO must be non null");
+		Validate.isTrue(dto.getUrl() != null, "URL must be non null");
 		Validate.isTrue(userId != null, "Current user id must be non null");
 
 		ImportSeriesDbDto importRequest = new ImportSeriesDbDto();
-		importRequest.setUrl(dto.getUrl());
 		importRequest.setStatus(SeriesImportRequestStatus.UNPROCESSED);
 
+		try {
+			String encodedUrl = new URI(dto.getUrl()).toASCIIString();
+			importRequest.setUrl(encodedUrl);
+		} catch (URISyntaxException ex) {
+			throw new RuntimeException(ex); // NOPMD: AvoidThrowingRawExceptionTypes
+		}
+		
 		Date now = new Date();
 		importRequest.setUpdatedAt(now);
 		importRequest.setRequestedAt(now);

src/test/groovy/ru/mystamps/web/service/SeriesImportServiceImplTest.groovy

@@ -75,13 +75,33 @@ class SeriesImportServiceImplTest extends Specification {
 			thrown IllegalArgumentException
 	}
 
+	def 'addRequest() should throw exception if url is null'() {
+		given:
+			form.setUrl(null)
+		when:
+			service.addRequest(form, Random.userId())
+		then:
+			thrown IllegalArgumentException
+	}
+	
 	def 'addRequest() should throw exception if user id is null'() {
 		when:
 			service.addRequest(form, null)
 		then:
 			thrown IllegalArgumentException
 	}
 
+	def 'addRequest() should throw exception if url is incorrect'() {
+		given:
+			form.setUrl('http://example.org/текст c пробелами')
+		when:
+			service.addRequest(form, Random.userId())
+		then:
+			RuntimeException ex = thrown()
+		and:
+			ex?.cause?.class == URISyntaxException
+	}
+	
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
 	def 'addRequest() should pass dto to dao and return its result'() {
 		given:
@@ -105,6 +125,37 @@ class SeriesImportServiceImplTest extends Specification {
 			result == expectedResult
 	}
 
+	@SuppressWarnings(['ClosureAsLastMethodParameter', 'LineLength', 'UnnecessaryReturnKeyword'])
+	def 'addRequest() should save url in the encoded form'() {
+		given:
+			String url = 'http://example.org/текст_на_русском'
+			String expectedUrl = 'http://example.org/%D1%82%D0%B5%D0%BA%D1%81%D1%82_%D0%BD%D0%B0_%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%BE%D0%BC'
+		and:
+			form.setUrl(url)
+		when:
+			service.addRequest(form, Random.userId())
+		then:
+			1 * seriesImportDao.add({ ImportSeriesDbDto request ->
+				assert request?.url == expectedUrl
+				return true
+			}) >> Random.id()
+	}
+	
+	@SuppressWarnings(['ClosureAsLastMethodParameter', 'LineLength', 'UnnecessaryReturnKeyword'])
+	def 'addRequest() should not encode url if it is already encoded'() {
+		given:
+			String expectedUrl = 'http://example.org/%D1%82%D0%B5%D0%BA%D1%81%D1%82_%D0%BD%D0%B0_%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%BE%D0%BC'
+		and:
+			form.setUrl(expectedUrl)
+		when:
+			service.addRequest(form, Random.userId())
+		then:
+			1 * seriesImportDao.add({ ImportSeriesDbDto request ->
+				assert request?.url == expectedUrl
+				return true
+			}) >> Random.id()
+	}
+	
 	//
 	// Tests for addSeries()
 	//

src/test/robotframework/series/import/request-logic.robot

@@ -55,7 +55,7 @@ Import series from an external site (in English, use category, country and date
 
 Import series from an external site (in Russian, use description locator)
 	[Documentation]              Verify import from a page in Russian and shared locator
-	Input Text                   id=url  http://localhost:8080/series/2?lang=ru
+	Input Text                   id=url  http://localhost:8080/series/2?lang=ru&str=тест
 	Submit Form                  id=import-series-form
 	${location}=                 Get Location
 	Should Match Regexp          ${location}  /series/import/request/\\d+
@@ -66,7 +66,7 @@ Import series from an external site (in Russian, use description locator)
 	${quantity}=                 Get Value  id=quantity
 	${imageUrl}=                 Get Value  id=image-url
 	${year}=                     Get Selected List Label  id=year
-	Element Text Should Be       id=request-url     http://localhost:8080/series/2?lang=ru
+	Element Text Should Be       id=request-url     http://localhost:8080/series/2?lang=ru&str=%D1%82%D0%B5%D1%81%D1%82
 	Element Text Should Be       id=request-status  ParsingSucceeded
 	Should Be Equal              ${category}        Prehistoric animals
 	Should Be Equal              ${country}         Italy