Handle null for Min Max and IsLeapYear (#869)

finos · Nov 13, 2024 · b26c67e · b26c67e
1 parent d5930e6
commit b26c67e
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 8 deletions.
diff --git a/rosetta-runtime/src/main/java/com/rosetta/model/lib/functions/IsLeapYear.java b/rosetta-runtime/src/main/java/com/rosetta/model/lib/functions/IsLeapYear.java
@@ -21,19 +21,35 @@
 import java.time.chrono.IsoChronology;
 
 public class IsLeapYear {
-	public boolean execute(Integer year) {
-		return execute(year.longValue());
+	public Boolean execute(Integer year) {
+		if (year == null) {
+			return null;
+		}
+		return isLeapYear(year.longValue());
 	}
 
-	public boolean execute(Long year) {
-		return IsoChronology.INSTANCE.isLeapYear(year);
+	public Boolean execute(Long year) {
+		if (year == null) {
+			return null;
+		}
+		return isLeapYear(year.longValue());
 	}
 
-	public boolean execute(BigInteger year) {
-		return execute(year.longValue());
+	public Boolean execute(BigInteger year) {
+		if (year == null) {
+			return null;
+		}
+		return isLeapYear(year.longValue());
 	}
 
-	public boolean execute(BigDecimal year) {
-		return execute(year.longValue());
+	public Boolean execute(BigDecimal year) {
+		if (year == null) {
+			return null;
+		}
+		return isLeapYear(year.longValue());
+	}
+
+	private boolean isLeapYear(long year) {
+		return IsoChronology.INSTANCE.isLeapYear(year);
 	}
 }
diff --git a/rosetta-runtime/src/main/java/com/rosetta/model/lib/functions/Max.java b/rosetta-runtime/src/main/java/com/rosetta/model/lib/functions/Max.java
@@ -22,18 +22,30 @@
 public class Max {
 
 	public Integer execute(Integer x, Integer y) {
+		if (x == null || y == null) {
+			return null;
+		}
 		return Integer.max(x, y);
 	}
 
 	public Long execute(Long x, Long y) {
+		if (x == null || y == null) {
+			return null;
+		}
 		return Long.max(x, y);
 	}
 
 	public BigInteger execute(BigInteger x, BigInteger y) {
+		if (x == null || y == null) {
+			return null;
+		}
 		return x.max(y);
 	}
 
 	public BigDecimal execute(BigDecimal x, BigDecimal y) {
+		if (x == null || y == null) {
+			return null;
+		}
 		return x.max(y);
 	}
 }
diff --git a/rosetta-runtime/src/main/java/com/rosetta/model/lib/functions/Min.java b/rosetta-runtime/src/main/java/com/rosetta/model/lib/functions/Min.java
@@ -22,18 +22,30 @@
 public class Min {
 
 	public Integer execute(Integer x, Integer y) {
+		if (x == null || y == null) {
+			return null;
+		}
 		return Integer.min(x, y);
 	}
 
 	public Long execute(Long x, Long y) {
+		if (x == null || y == null) {
+			return null;
+		}
 		return Long.min(x, y);
 	}
 
 	public BigInteger execute(BigInteger x, BigInteger y) {
+		if (x == null || y == null) {
+			return null;
+		}
 		return x.min(y);
 	}
 
 	public BigDecimal execute(BigDecimal x, BigDecimal y) {
+		if (x == null || y == null) {
+			return null;
+		}
 		return x.min(y);
 	}
 }