Fix npe if money is null

Closed vladmihalceagh-465
ugrave · Aug 3, 2022 · 73c5f29 · 73c5f29
1 parent 697c7a6
commit 73c5f29
Show file tree

Hide file tree

Showing 8 changed files with 224 additions and 8 deletions.
diff --git a/...nate-types-52/src/main/java/com/vladmihalcea/hibernate/type/money/MonetaryAmountType.java b/...nate-types-52/src/main/java/com/vladmihalcea/hibernate/type/money/MonetaryAmountType.java
@@ -75,14 +75,14 @@ public int hashCode(Object x) throws HibernateException {
 
     @Override
     public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException {
-        if (rs.wasNull()) {
-            return null;
-        }
-
         String amountColumnName = names[0];
         String currencyColumnName = names[1];
 
         BigDecimal amount = rs.getBigDecimal(amountColumnName);
+        if(amount == null) {
+            return null;
+        }
+
         String currency = rs.getString(currencyColumnName);
 
         return Money.of(amount, currency);

diff --git a/...s-52/src/test/java/com/vladmihalcea/hibernate/type/money/MySQLMonetaryAmountTypeTest.java b/...s-52/src/test/java/com/vladmihalcea/hibernate/type/money/MySQLMonetaryAmountTypeTest.java
@@ -12,6 +12,7 @@
 import java.math.BigDecimal;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Piotr Olaszewski
@@ -64,6 +65,31 @@ public void testSearchByMoney() {
         });
     }
 
+    @Test
+    public void testReturnNullMoney() {
+        long _id = doInJPA(entityManager -> {
+            Salary salary = new Salary();
+            entityManager.persist(salary);
+            return salary.getId();
+        });
+
+        doInJPA(entityManager -> {
+            Salary salary = entityManager.createQuery("select s from Salary s where s.id = :id", Salary.class)
+                .setParameter("id", _id)
+                .getSingleResult();
+
+            assertNull(salary.getSalary());
+        });
+
+        doInJPA(entityManager -> {
+            MonetaryAmount money = entityManager.createQuery("select s.salary from Salary s where s.id = :id", MonetaryAmount.class)
+                .setParameter("id", _id)
+                .getSingleResult();
+
+            assertNull(money);
+        });
+    }
+
     @Entity(name = "Salary")
     @Table(name = "salary")
     @TypeDef(name = "monetary-amount-currency", typeClass = MonetaryAmountType.class, defaultForType = MonetaryAmount.class)
@@ -72,6 +98,8 @@ public static class Salary {
         @GeneratedValue
         private Long id;
 
+        private String other;
+
         @Columns(columns = {
                 @Column(name = "salary_amount"),
                 @Column(name = "salary_currency")
@@ -94,5 +122,13 @@ public MonetaryAmount getSalary() {
         public void setSalary(MonetaryAmount salary) {
             this.salary = salary;
         }
+
+        public String getOther() {
+            return other;
+        }
+
+        public void setOther(String other) {
+            this.other = other;
+        }
     }
 }
diff --git a/...src/test/java/com/vladmihalcea/hibernate/type/money/PostgreSQLMonetaryAmountTypeTest.java b/...src/test/java/com/vladmihalcea/hibernate/type/money/PostgreSQLMonetaryAmountTypeTest.java
@@ -12,6 +12,7 @@
 import java.math.BigDecimal;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Piotr Olaszewski
@@ -64,6 +65,31 @@ public void testSearchByMoney() {
         });
     }
 
+    @Test
+    public void testReturnNullMoney() {
+        long _id = doInJPA(entityManager -> {
+            Salary salary = new Salary();
+            entityManager.persist(salary);
+            return salary.getId();
+        });
+
+        doInJPA(entityManager -> {
+            Salary salary = entityManager.createQuery("select s from Salary s where s.id = :id", Salary.class)
+                .setParameter("id", _id)
+                .getSingleResult();
+
+            assertNull(salary.getSalary());
+        });
+
+        doInJPA(entityManager -> {
+            MonetaryAmount money = entityManager.createQuery("select s.salary from Salary s where s.id = :id", MonetaryAmount.class)
+                .setParameter("id", _id)
+                .getSingleResult();
+
+            assertNull(money);
+        });
+    }
+
     @Entity(name = "Salary")
     @Table(name = "salary")
     @TypeDef(name = "monetary-amount-currency", typeClass = MonetaryAmountType.class, defaultForType = MonetaryAmount.class)
@@ -72,6 +98,8 @@ public static class Salary {
         @GeneratedValue
         private Long id;
 
+        private String other;
+
         @Columns(columns = {
                 @Column(name = "salary_amount"),
                 @Column(name = "salary_currency")
@@ -94,5 +122,13 @@ public MonetaryAmount getSalary() {
         public void setSalary(MonetaryAmount salary) {
             this.salary = salary;
         }
+
+        public String getOther() {
+            return other;
+        }
+
+        public void setOther(String other) {
+            this.other = other;
+        }
     }
 }
diff --git a/...nate-types-55/src/main/java/com/vladmihalcea/hibernate/type/money/MonetaryAmountType.java b/...nate-types-55/src/main/java/com/vladmihalcea/hibernate/type/money/MonetaryAmountType.java
@@ -75,14 +75,14 @@ public int hashCode(Object x) throws HibernateException {
 
     @Override
     public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException {
-        if (rs.wasNull()) {
-            return null;
-        }
-
         String amountColumnName = names[0];
         String currencyColumnName = names[1];
 
         BigDecimal amount = rs.getBigDecimal(amountColumnName);
+        if(amount == null) {
+            return null;
+        }
+
         String currency = rs.getString(currencyColumnName);
 
         return Money.of(amount, currency);

diff --git a/...s-55/src/test/java/com/vladmihalcea/hibernate/type/money/MySQLMonetaryAmountTypeTest.java b/...s-55/src/test/java/com/vladmihalcea/hibernate/type/money/MySQLMonetaryAmountTypeTest.java
@@ -12,6 +12,7 @@
 import java.math.BigDecimal;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Piotr Olaszewski
@@ -64,6 +65,31 @@ public void testSearchByMoney() {
         });
     }
 
+    @Test
+    public void testReturnNullMoney() {
+        long _id = doInJPA(entityManager -> {
+            Salary salary = new Salary();
+            entityManager.persist(salary);
+            return salary.getId();
+        });
+
+        doInJPA(entityManager -> {
+            Salary salary = entityManager.createQuery("select s from Salary s where s.id = :id", Salary.class)
+                .setParameter("id", _id)
+                .getSingleResult();
+
+            assertNull(salary.getSalary());
+        });
+
+        doInJPA(entityManager -> {
+            MonetaryAmount money = entityManager.createQuery("select s.salary from Salary s where s.id = :id", MonetaryAmount.class)
+                .setParameter("id", _id)
+                .getSingleResult();
+
+            assertNull(money);
+        });
+    }
+
     @Entity(name = "Salary")
     @Table(name = "salary")
     @TypeDef(name = "monetary-amount-currency", typeClass = MonetaryAmountType.class, defaultForType = MonetaryAmount.class)
@@ -72,6 +98,8 @@ public static class Salary {
         @GeneratedValue
         private Long id;
 
+        private String other;
+
         @Columns(columns = {
                 @Column(name = "salary_amount"),
                 @Column(name = "salary_currency")
@@ -94,5 +122,13 @@ public MonetaryAmount getSalary() {
         public void setSalary(MonetaryAmount salary) {
             this.salary = salary;
         }
+
+        public String getOther() {
+            return other;
+        }
+
+        public void setOther(String other) {
+            this.other = other;
+        }
     }
 }
diff --git a/...src/test/java/com/vladmihalcea/hibernate/type/money/PostgreSQLMonetaryAmountTypeTest.java b/...src/test/java/com/vladmihalcea/hibernate/type/money/PostgreSQLMonetaryAmountTypeTest.java
@@ -12,6 +12,7 @@
 import java.math.BigDecimal;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Piotr Olaszewski
@@ -64,6 +65,31 @@ public void testSearchByMoney() {
         });
     }
 
+    @Test
+    public void testReturnNullMoney() {
+        long _id = doInJPA(entityManager -> {
+            Salary salary = new Salary();
+            entityManager.persist(salary);
+            return salary.getId();
+        });
+
+        doInJPA(entityManager -> {
+            Salary salary = entityManager.createQuery("select s from Salary s where s.id = :id", Salary.class)
+                .setParameter("id", _id)
+                .getSingleResult();
+
+            assertNull(salary.getSalary());
+        });
+
+        doInJPA(entityManager -> {
+            MonetaryAmount money = entityManager.createQuery("select s.salary from Salary s where s.id = :id", MonetaryAmount.class)
+                .setParameter("id", _id)
+                .getSingleResult();
+
+            assertNull(money);
+        });
+    }
+
     @Entity(name = "Salary")
     @Table(name = "salary")
     @TypeDef(name = "monetary-amount-currency", typeClass = MonetaryAmountType.class, defaultForType = MonetaryAmount.class)
@@ -72,6 +98,8 @@ public static class Salary {
         @GeneratedValue
         private Long id;
 
+        private String other;
+
         @Columns(columns = {
                 @Column(name = "salary_amount"),
                 @Column(name = "salary_currency")
@@ -94,5 +122,13 @@ public MonetaryAmount getSalary() {
         public void setSalary(MonetaryAmount salary) {
             this.salary = salary;
         }
+
+        public String getOther() {
+            return other;
+        }
+
+        public void setOther(String other) {
+            this.other = other;
+        }
     }
 }
diff --git a/...s-60/src/test/java/com/vladmihalcea/hibernate/type/money/MySQLMonetaryAmountTypeTest.java b/...s-60/src/test/java/com/vladmihalcea/hibernate/type/money/MySQLMonetaryAmountTypeTest.java
@@ -10,6 +10,7 @@
 import java.math.BigDecimal;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Piotr Olaszewski
@@ -62,13 +63,40 @@ public void testSearchByMoney() {
         });
     }
 
+    @Test
+    public void testReturnNullMoney() {
+        long _id = doInJPA(entityManager -> {
+            Salary salary = new Salary();
+            entityManager.persist(salary);
+            return salary.getId();
+        });
+
+        doInJPA(entityManager -> {
+            Salary salary = entityManager.createQuery("select s from Salary s where s.id = :id", Salary.class)
+                .setParameter("id", _id)
+                .getSingleResult();
+
+            assertNull(salary.getSalary());
+        });
+
+        doInJPA(entityManager -> {
+            MonetaryAmount money = entityManager.createQuery("select s.salary from Salary s where s.id = :id", MonetaryAmount.class)
+                .setParameter("id", _id)
+                .getSingleResult();
+
+            assertNull(money);
+        });
+    }
+
     @Entity(name = "Salary")
     @Table(name = "salary")
     public static class Salary {
         @Id
         @GeneratedValue
         private Long id;
 
+        private String other;
+
         @AttributeOverride(name = "amount", column = @Column(name = "salary_amount"))
         @AttributeOverride(name = "currency", column = @Column(name = "salary_currency"))
         @CompositeType(MonetaryAmountType.class)
@@ -89,5 +117,13 @@ public MonetaryAmount getSalary() {
         public void setSalary(MonetaryAmount salary) {
             this.salary = salary;
         }
+
+        public String getOther() {
+            return other;
+        }
+
+        public void setOther(String other) {
+            this.other = other;
+        }
     }
 }