CatalogUtils.parseCatalogNumbers(): implement parsing of a range of numbers.

Required for #694

Author: php-coder

src/main/java/ru/mystamps/web/util/CatalogUtils.java

@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.stream.IntStream;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
@@ -117,9 +118,34 @@ public static Set<String> parseCatalogNumbers(String catalogNumbers) {
 		for (String number : catalogNumbers.split(",")) {
 			Validate.validState(!number.trim().isEmpty(), "Catalog number must be non empty");
 
-			// TODO: parse range of numbers
-			
-			result.add(number);
+			String[] range = StringUtils.split(number, '-');
+			switch (range.length) {
+				case 1:
+					result.add(number);
+					break;
+				case 2:
+					try {
+						Integer begin = Integer.valueOf(range[0]);
+						Integer end   = Integer.valueOf(range[1]);
+						Validate.isTrue(begin < end, "Range must be in an ascending order");
+						
+						// [ 1,2 ] => [ 1,2] => [ "1","2" ]
+						IntStream.rangeClosed(begin, end)
+							.mapToObj(String::valueOf)
+							.forEach(result::add);
+						
+					} catch (NumberFormatException ex) {
+						throw new IllegalArgumentException(
+							"Unexpected a non-numeric range found",
+							ex
+						);
+					}
+					break;
+				default:
+					throw new IllegalArgumentException(
+						"Unexpected number of separators found: expected to have only one"
+					);
+			}
 		}
 
 		return result;

src/test/groovy/ru/mystamps/web/util/CatalogUtilsTest.groovy

@@ -18,6 +18,7 @@
 package ru.mystamps.web.util
 
 import spock.lang.Specification
+import spock.lang.Unroll
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
 class CatalogUtilsTest extends Specification {
@@ -178,4 +179,30 @@ class CatalogUtilsTest extends Specification {
 			thrown IllegalStateException
 	}
 
+	def 'parseCatalogNumbers() should return two elements for a range with two numbers'() {
+		when:
+			Set<String> numbers = CatalogUtils.parseCatalogNumbers('1-2')
+		then:
+			numbers == [ '1', '2' ] as Set
+	}
+	
+	@Unroll
+	def 'parseCatalogNumbers() should throw exception for an invalid value (#numbers)'(
+		String numbers, String message) {
+		
+		when:
+			CatalogUtils.parseCatalogNumbers(numbers)
+		then:
+			IllegalArgumentException ex = thrown()
+			ex.message == message
+		where:
+			numbers   | message
+			'1-2-3'   | 'Unexpected number of separators found: expected to have only one'
+			'1-z'     | 'Unexpected a non-numeric range found'
+			'z-2'     | 'Unexpected a non-numeric range found'
+			' 1 - 2 ' | 'Unexpected a non-numeric range found'
+			'1-1'     | 'Range must be in an ascending order'
+			'2-1'     | 'Range must be in an ascending order'
+	}
+	
 }