diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcColumnTypes.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcColumnTypes.java index 0c678ef975..e12867fdb0 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcColumnTypes.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcColumnTypes.java @@ -18,6 +18,7 @@ import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.OffsetDateTime; +import java.time.Year; import java.time.ZonedDateTime; import java.time.temporal.Temporal; import java.util.LinkedHashMap; @@ -40,6 +41,7 @@ public enum JdbcColumnTypes { private final ConcurrentLruCache, Class> cache = new ConcurrentLruCache<>(64, this::doResolve); + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public Class resolvePrimitiveType(Class type) { return cache.get(type); @@ -62,6 +64,7 @@ private Class doResolve(Class type) { javaToDbType.put(ZonedDateTime.class, String.class); javaToDbType.put(OffsetDateTime.class, OffsetDateTime.class); javaToDbType.put(LocalDateTime.class, LocalDateTime.class); + javaToDbType.put(Year.class, Integer.class); javaToDbType.put(Temporal.class, Timestamp.class); } diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/JdbcColumnTypesUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/JdbcColumnTypesUnitTests.java new file mode 100644 index 0000000000..590cabc552 --- /dev/null +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/JdbcColumnTypesUnitTests.java @@ -0,0 +1,35 @@ +/* + * Copyright 2025 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.jdbc.core.convert; + +import static org.assertj.core.api.Assertions.*; + +import java.time.Year; + +import org.junit.jupiter.api.Test; + +/** + * Unit tests for {@link JdbcColumnTypes}. + * + * @author Oliver Drotbohm + */ +class JdbcColumnTypesUnitTests { + + @Test + void usesIntegerForYear() { + assertThat(JdbcColumnTypes.INSTANCE.resolvePrimitiveType(Year.class)).isEqualTo(Integer.class); + } +}