Fix return value for requireNonNullElse

bmuskalla · smowton · web-flow · commit 9ca3b4661a2f · 2021-08-26T14:03:55.000+02:00
Co-authored-by: Chris Smowton &lt;smowton@github.com&gt;
diff --git a/java/ql/lib/semmle/code/java/frameworks/Objects.qll b/java/ql/lib/semmle/code/java/frameworks/Objects.qll
@@ -9,10 +9,8 @@ private class ObjectsSummaryCsv extends SummaryModelCsv {
       [
         //`namespace; type; subtypes; name; signature; ext; input; output; kind`
         "java.util;Objects;false;requireNonNull;;;Argument[0];ReturnValue;value",
-        "java.util;Objects;false;requireNonNullElse;;;Argument[0];ReturnValue;value",
-        "java.util;Objects;false;requireNonNullElse;;;Argument[1];ReturnValue;value",
+        "java.util;Objects;false;requireNonNullElse;;;Argument[0..1];ReturnValue;value",
         "java.util;Objects;false;requireNonNullElseGet;;;Argument[0];ReturnValue;value",
-        "java.util;Objects;false;requireNonNullElseGet;;;Argument[1];ReturnValue;value",
         "java.util;Objects;false;toString;;;Argument[1];ReturnValue;value"
       ]
   }

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,8 @@ private class ObjectsSummaryCsv extends SummaryModelCsv {`
`9`	`9`	`[`
`10`	`10`	//`namespace; type; subtypes; name; signature; ext; input; output; kind`
`11`	`11`	`"java.util;Objects;false;requireNonNull;;;Argument[0];ReturnValue;value",`
`12`		`- "java.util;Objects;false;requireNonNullElse;;;Argument[0];ReturnValue;value",`
`13`		`- "java.util;Objects;false;requireNonNullElse;;;Argument[1];ReturnValue;value",`
	`12`	`+ "java.util;Objects;false;requireNonNullElse;;;Argument[0..1];ReturnValue;value",`
`14`	`13`	`"java.util;Objects;false;requireNonNullElseGet;;;Argument[0];ReturnValue;value",`
`15`		`- "java.util;Objects;false;requireNonNullElseGet;;;Argument[1];ReturnValue;value",`
`16`	`14`	`"java.util;Objects;false;toString;;;Argument[1];ReturnValue;value"`
`17`	`15`	`]`
`18`	`16`	`}`