Ignore Number-derived types

Benjamin Muskalla · Benjamin Muskalla · commit 2d4176bec0fa · 2021-11-10T16:30:27.000+01:00
diff --git a/java/ql/src/utils/model-generator/CaptureSummaryModels.ql b/java/ql/src/utils/model-generator/CaptureSummaryModels.ql
@@ -259,7 +259,7 @@ predicate isRelevantType(Type t) {
   not t instanceof EnumType and
   not t instanceof PrimitiveType and
   not t instanceof BoxedType and
-  not t.(RefType).hasQualifiedName("java.math", "BigInteger") and
+  not t.(RefType).getAnAncestor().hasQualifiedName("java.lang", "Number") and
   (
     not t.(Array).getElementType() instanceof PrimitiveType or
     isPrimitiveTypeUsedForBulkData(t.(Array).getElementType())
diff --git a/java/ql/test/utils/model-generator/p/Pojo.java b/java/ql/test/utils/model-generator/p/Pojo.java
@@ -1,5 +1,6 @@
 package p;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Collection;
@@ -86,6 +87,10 @@ public BigInteger getBigInt() {
         return BigInteger.valueOf(intValue);
     }
 
+    public BigDecimal getBigDecimal() {
+        return new BigDecimal(value);
+    }
+
     public void fillIn(List<String> target) {
         target.add(value);
     }

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ predicate isRelevantType(Type t) {`
`259`	`259`	`not t instanceof EnumType and`
`260`	`260`	`not t instanceof PrimitiveType and`
`261`	`261`	`not t instanceof BoxedType and`
`262`		`- not t.(RefType).hasQualifiedName("java.math", "BigInteger") and`
	`262`	`+ not t.(RefType).getAnAncestor().hasQualifiedName("java.lang", "Number") and`
`263`	`263`	`(`
`264`	`264`	`not t.(Array).getElementType() instanceof PrimitiveType or`
`265`	`265`	`isPrimitiveTypeUsedForBulkData(t.(Array).getElementType())`