YearMonthTypeDescriptor failed to wrap null value from database in use case of YearMonthIntegerType vladmihalcea#113

vladmihalcea · vladmihalcea · commit bd95810c9fe4 · 2020-10-07T16:23:26.000+03:00
diff --git a/hibernate-types-52/src/main/java/com/vladmihalcea/hibernate/type/basic/internal/YearMonthTypeDescriptor.java b/hibernate-types-52/src/main/java/com/vladmihalcea/hibernate/type/basic/internal/YearMonthTypeDescriptor.java
@@ -69,9 +69,13 @@ public <X> YearMonth wrap(X value, WrapperOptions options) {
         }
         if (value instanceof Number) {
             int numericValue = ((Number) (value)).intValue();
-            int year = numericValue / 100;
-            int month = numericValue % 100;
-            return YearMonth.of(year, month);
+            if(numericValue > 0) {
+                int year = numericValue / 100;
+                int month = numericValue % 100;
+                return YearMonth.of(year, month);
+            } else {
+                return null;
+            }
         }
         if (value instanceof Date) {
             Date date = (Date) value;
diff --git a/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/MySQLYearMonthDateTest.java b/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/MySQLYearMonthDateTest.java
@@ -11,6 +11,7 @@
 import java.util.TimeZone;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Vlad Mihalcea
@@ -74,6 +75,25 @@ public void test() {
         });
     }
 
+    @Test
+    public void testNull() {
+        doInJPA(entityManager -> {
+            Book book = new Book();
+            book.setIsbn("123-456");
+            book.setPublishedOn(null);
+
+            entityManager.persist(book);
+        });
+
+        doInJPA(entityManager -> {
+            Book book = entityManager
+                .unwrap(Session.class)
+                .bySimpleNaturalId(Book.class)
+                .load("123-456");
+
+            assertNull(book.getPublishedOn());
+        });
+    }
 
     @Entity(name = "Book")
     @Table(name = "book")
diff --git a/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/MySQLYearMonthIntegerTest.java b/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/MySQLYearMonthIntegerTest.java
@@ -10,6 +10,7 @@
 import java.time.YearMonth;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Vlad Mihalcea
@@ -59,6 +60,25 @@ public void test() {
         });
     }
 
+    @Test
+    public void testNull() {
+        doInJPA(entityManager -> {
+            Book book = new Book();
+            book.setIsbn("123-456");
+            book.setPublishedOn(null);
+
+            entityManager.persist(book);
+        });
+
+        doInJPA(entityManager -> {
+            Book book = entityManager
+                .unwrap(Session.class)
+                .bySimpleNaturalId(Book.class)
+                .load("123-456");
+
+            assertNull(book.getPublishedOn());
+        });
+    }
 
     @Entity(name = "Book")
     @Table(name = "book")
diff --git a/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/PostgreSQLYearMonthDateTest.java b/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/PostgreSQLYearMonthDateTest.java
@@ -10,6 +10,7 @@
 import java.time.YearMonth;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Vlad Mihalcea
@@ -59,6 +60,25 @@ public void test() {
         });
     }
 
+    @Test
+    public void testNull() {
+        doInJPA(entityManager -> {
+            Book book = new Book();
+            book.setIsbn("123-456");
+            book.setPublishedOn(null);
+
+            entityManager.persist(book);
+        });
+
+        doInJPA(entityManager -> {
+            Book book = entityManager
+                .unwrap(Session.class)
+                .bySimpleNaturalId(Book.class)
+                .load("123-456");
+
+            assertNull(book.getPublishedOn());
+        });
+    }
 
     @Entity(name = "Book")
     @Table(name = "book")
diff --git a/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/PostgreSQLYearMonthEpochTest.java b/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/PostgreSQLYearMonthEpochTest.java
@@ -16,6 +16,7 @@
 import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Vlad Mihalcea
@@ -70,6 +71,26 @@ public void test() {
         });
     }
 
+    @Test
+    public void testNull() {
+        doInJPA(entityManager -> {
+            Book book = new Book();
+            book.setIsbn("123-456");
+            book.setPublishedOn(null);
+
+            entityManager.persist(book);
+        });
+
+        doInJPA(entityManager -> {
+            Book book = entityManager
+                .unwrap(Session.class)
+                .bySimpleNaturalId(Book.class)
+                .load("123-456");
+
+            assertNull(book.getPublishedOn());
+        });
+    }
+
     @Test
     @Ignore
     public void testIndexing() {
diff --git a/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/PostgreSQLYearMonthIntegerTest.java b/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/PostgreSQLYearMonthIntegerTest.java
@@ -16,6 +16,8 @@
 import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Vlad Mihalcea
@@ -56,20 +58,40 @@ public void test() {
 
         doInJPA(entityManager -> {
             Book book = entityManager
-                    .createQuery(
-                            "select b " +
-                                    "from Book b " +
-                                    "where " +
-                                    "   b.title = :title and " +
-                                    "   b.publishedOn = :publishedOn", Book.class)
-                    .setParameter("title", "High-Performance Java Persistence")
-                    .setParameter("publishedOn", YearMonth.of(2016, 10))
-                    .getSingleResult();
+                .createQuery(
+                    "select b " +
+                    "from Book b " +
+                    "where " +
+                    "   b.title = :title and " +
+                    "   b.publishedOn = :publishedOn", Book.class)
+                .setParameter("title", "High-Performance Java Persistence")
+                .setParameter("publishedOn", YearMonth.of(2016, 10))
+                .getSingleResult();
 
             assertEquals("978-9730228236", book.getIsbn());
         });
     }
 
+    @Test
+    public void testNull() {
+        doInJPA(entityManager -> {
+            Book book = new Book();
+            book.setIsbn("123-456");
+            book.setPublishedOn(null);
+
+            entityManager.persist(book);
+        });
+
+        doInJPA(entityManager -> {
+            Book book = entityManager
+                .unwrap(Session.class)
+                .bySimpleNaturalId(Book.class)
+                .load("123-456");
+
+            assertNull(book.getPublishedOn());
+        });
+    }
+
     @Test
     @Ignore
     public void testIndexing() {
diff --git a/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/PostgreSQLYearMonthTimestampTest.java b/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/PostgreSQLYearMonthTimestampTest.java
@@ -14,6 +14,7 @@
 import java.time.YearMonth;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Vlad Mihalcea
@@ -63,6 +64,25 @@ public void test() {
         });
     }
 
+    @Test
+    public void testNull() {
+        doInJPA(entityManager -> {
+            Book book = new Book();
+            book.setIsbn("123-456");
+            book.setPublishedOn(null);
+
+            entityManager.persist(book);
+        });
+
+        doInJPA(entityManager -> {
+            Book book = entityManager
+                .unwrap(Session.class)
+                .bySimpleNaturalId(Book.class)
+                .load("123-456");
+
+            assertNull(book.getPublishedOn());
+        });
+    }
 
     @Entity(name = "Book")
     @Table(name = "book")
diff --git a/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/YearAndMonthTest.java b/hibernate-types-52/src/test/java/com/vladmihalcea/hibernate/type/basic/YearAndMonthTest.java
@@ -1,7 +1,6 @@
 package com.vladmihalcea.hibernate.type.basic;
 
 import com.vladmihalcea.hibernate.type.util.AbstractMySQLIntegrationTest;
-import com.vladmihalcea.hibernate.type.util.AbstractPostgreSQLIntegrationTest;
 import org.hibernate.Session;
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.annotations.TypeDef;
@@ -10,7 +9,6 @@
 import javax.persistence.*;
 import java.time.Month;
 import java.time.Year;
-import java.time.YearMonth;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,7 +20,7 @@ public class YearAndMonthTest extends AbstractMySQLIntegrationTest {
     @Override
     protected Class<?>[] entities() {
         return new Class<?>[]{
-                Publisher.class
+            Publisher.class
         };
     }
 
@@ -39,31 +37,30 @@ public void test() {
 
         doInJPA(entityManager -> {
             Publisher publisher = entityManager
-            .unwrap(Session.class)
-            .bySimpleNaturalId(Publisher.class)
-            .load("vladmihalcea.com");
+                .unwrap(Session.class)
+                .bySimpleNaturalId(Publisher.class)
+                .load("vladmihalcea.com");
 
             assertEquals(Year.of(2013), publisher.getEstYear());
             assertEquals(Month.NOVEMBER, publisher.getSalesMonth());
         });
 
         doInJPA(entityManager -> {
             Publisher book = entityManager
-            .createQuery(
-                "select p " +
-                "from Publisher p " +
-                "where " +
-                "   p.estYear = :estYear and " +
-                "   p.salesMonth = :salesMonth", Publisher.class)
-            .setParameter("estYear", Year.of(2013))
-            .setParameter("salesMonth", Month.NOVEMBER)
-            .getSingleResult();
+                .createQuery(
+                    "select p " +
+                        "from Publisher p " +
+                        "where " +
+                        "   p.estYear = :estYear and " +
+                        "   p.salesMonth = :salesMonth", Publisher.class)
+                .setParameter("estYear", Year.of(2013))
+                .setParameter("salesMonth", Month.NOVEMBER)
+                .getSingleResult();
 
             assertEquals("vladmihalcea.com", book.getName());
         });
     }
 
-
     @Entity(name = "Publisher")
     @Table(name = "publisher")
     @TypeDef(typeClass = YearType.class, defaultForType = Year.class)
diff --git a/test.bat b/test.bat
@@ -1,3 +1,3 @@
 @echo off
 
-mvn -Ptest clean test
+mvn -Ptest clean test %*

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`@echo off`
`2`	`2`
`3`		`-mvn -Ptest clean test`
	`3`	`+mvn -Ptest clean test %*`