Null fix for Min and Max (#870)

* Handle null for Min Max and IsLeapYear * Handle null differently
finos · Nov 14, 2024 · 6f1b774 · 6f1b774
1 parent 93c555b
commit 6f1b774
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
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,29 +22,37 @@
 public class Max {
 
 	public Integer execute(Integer x, Integer y) {
-		if (x == null || y == null) {
-			return null;
+		if (x == null) {
+			return y;
+		} else if (y == null) {
+			return x;
 		}
 		return Integer.max(x, y);
 	}
 
 	public Long execute(Long x, Long y) {
-		if (x == null || y == null) {
-			return null;
+		if (x == null) {
+			return y;
+		} else if (y == null) {
+			return x;
 		}
 		return Long.max(x, y);
 	}
 
 	public BigInteger execute(BigInteger x, BigInteger y) {
-		if (x == null || y == null) {
-			return null;
+		if (x == null) {
+			return y;
+		} else if (y == null) {
+			return x;
 		}
 		return x.max(y);
 	}
 
 	public BigDecimal execute(BigDecimal x, BigDecimal y) {
-		if (x == null || y == null) {
-			return null;
+		if (x == null) {
+			return y;
+		} else if (y == null) {
+			return x;
 		}
 		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,29 +22,37 @@
 public class Min {
 
 	public Integer execute(Integer x, Integer y) {
-		if (x == null || y == null) {
-			return null;
+		if (x == null) {
+			return y;
+		} else if (y == null) {
+			return x;
 		}
 		return Integer.min(x, y);
 	}
 
 	public Long execute(Long x, Long y) {
-		if (x == null || y == null) {
-			return null;
+		if (x == null) {
+			return y;
+		} else if (y == null) {
+			return x;
 		}
 		return Long.min(x, y);
 	}
 
 	public BigInteger execute(BigInteger x, BigInteger y) {
-		if (x == null || y == null) {
-			return null;
+		if (x == null) {
+			return y;
+		} else if (y == null) {
+			return x;
 		}
 		return x.min(y);
 	}
 
 	public BigDecimal execute(BigDecimal x, BigDecimal y) {
-		if (x == null || y == null) {
-			return null;
+		if (x == null) {
+			return y;
+		} else if (y == null) {
+			return x;
 		}
 		return x.min(y);
 	}