HSEARCH-4331 More lenient parsing for Year

hibernate · Oct 6, 2021 · 1c113d9 · 1c113d9
1 parent 1f94503
commit 1c113d9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/engine/src/main/java/org/hibernate/search/engine/cfg/spi/ParseUtils.java b/engine/src/main/java/org/hibernate/search/engine/cfg/spi/ParseUtils.java
@@ -47,6 +47,7 @@ public final class ParseUtils {
 
 	// The DateTimeFormatter class does not expose a public constant for the ISO format, so we need to do it ourselves.
 	private static final DateTimeFormatter ISO_YEAR = new DateTimeFormatterBuilder()
+			.parseLenient() // Accept "-1" instead of requiring -0001
 			.appendValue( YEAR, 4, 10, SignStyle.EXCEEDS_PAD )
 			.toFormatter();
 
@@ -151,7 +152,7 @@ public static Year parseYear(String value) {
 		DateTimeFormatter formatter = ISO_YEAR;
 
 		try {
-			return Year.parse( value );
+			return Year.parse( value, formatter );
 		}
 		catch (DateTimeParseException e) {
 			throw log.unableToParseTemporal( Year.class, value, formatter, e );

diff --git a/engine/src/test/java/org/hibernate/search/engine/cfg/spi/ParseUtilsTest.java b/engine/src/test/java/org/hibernate/search/engine/cfg/spi/ParseUtilsTest.java
@@ -9,12 +9,30 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import java.time.Year;
+
 import org.hibernate.search.engine.spatial.GeoPoint;
 
 import org.junit.Test;
 
 public class ParseUtilsTest {
 
+	@Test
+	public void parseYear() {
+		assertThat( ParseUtils.parseYear( "2001" ) ).isEqualTo( Year.of( 2001 ) );
+		assertThat( ParseUtils.parseYear( "1999" ) ).isEqualTo( Year.of( 1999 ) );
+		assertThat( ParseUtils.parseYear( "1769" ) ).isEqualTo( Year.of( 1769 ) );
+		assertThat( ParseUtils.parseYear( "-0001" ) ).isEqualTo( Year.of( -1 ) );
+		assertThat( ParseUtils.parseYear( "-2001" ) ).isEqualTo( Year.of( -2001 ) );
+		assertThat( ParseUtils.parseYear( "+454654554" ) ).isEqualTo( Year.of( 454654554 ) );
+		assertThat( ParseUtils.parseYear( "-454654554" ) ).isEqualTo( Year.of( -454654554 ) );
+
+		// Lenient parsing
+		assertThat( ParseUtils.parseYear( "+2001" ) ).isEqualTo( Year.of( 2001 ) );
+		assertThat( ParseUtils.parseYear( "454654554" ) ).isEqualTo( Year.of( 454654554 ) );
+		assertThat( ParseUtils.parseYear( "-1" ) ).isEqualTo( Year.of( -1 ) );
+	}
+
 	@Test
 	public void parseGeoPoint() {
 		GeoPoint geoPoint = ParseUtils.parseGeoPoint( "12.123, -24.234" );