Remove df-gen models we have deliberately modeled · github/codeql@919436e · GitHub
Skip to content

Commit 919436e

Browse files
owen-mcowen-mc
committed
Remove df-gen models we have deliberately modeled
Manual models always take precedence over generated models, so there is no point in keeping the generated models. These manual models were deliberately written to take precedence over the corresponding df-gen models.
1 parent 311512c commit 919436e

15 files changed

Lines changed: 0 additions & 356 deletions

‎java/ql/lib/ext/generated/java.beans.model.yml‎

Lines changed: 0 additions & 4 deletions

‎java/ql/lib/ext/generated/java.io.model.yml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,6 @@ extensions:
3838
- ["java.io", "EOFException", True, "EOFException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
3939
- ["java.io", "Externalizable", True, "readExternal", "(ObjectInput)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
4040
- ["java.io", "Externalizable", True, "writeExternal", "(ObjectOutput)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
41-
- ["java.io", "File", True, "createTempFile", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
42-
- ["java.io", "File", True, "createTempFile", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
43-
- ["java.io", "File", True, "createTempFile", "(String,String,File)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
44-
- ["java.io", "File", True, "createTempFile", "(String,String,File)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
45-
- ["java.io", "File", True, "createTempFile", "(String,String,File)", "", "Argument[2]", "ReturnValue", "taint", "df-generated"]
46-
- ["java.io", "File", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
47-
- ["java.io", "File", True, "listFiles", "(FileFilter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
48-
- ["java.io", "File", True, "listFiles", "(FilenameFilter)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
49-
- ["java.io", "File", True, "toURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
50-
- ["java.io", "FileInputStream", True, "FileInputStream", "(FileDescriptor)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
51-
- ["java.io", "FileInputStream", True, "FileInputStream", "(FileDescriptor)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
52-
- ["java.io", "FileInputStream", True, "FileInputStream", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
5341
- ["java.io", "FileInputStream", True, "getChannel", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
5442
- ["java.io", "FileInputStream", True, "getFD", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
5543
- ["java.io", "FileNotFoundException", True, "FileNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -90,7 +78,6 @@ extensions:
9078
- ["java.io", "LineNumberReader", True, "LineNumberReader", "(Reader,int)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
9179
- ["java.io", "NotActiveException", True, "NotActiveException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
9280
- ["java.io", "NotSerializableException", True, "NotSerializableException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
93-
- ["java.io", "ObjectInput", True, "readObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
9481
- ["java.io", "ObjectInputFilter$Config", False, "createFilter", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
9582
- ["java.io", "ObjectInputFilter", True, "allowFilter", "(Predicate,ObjectInputFilter$Status)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
9683
- ["java.io", "ObjectInputFilter", True, "merge", "(ObjectInputFilter,ObjectInputFilter)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]

‎java/ql/lib/ext/generated/java.lang.model.yml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,6 @@ extensions:
2222
- ["java.lang", "ClassCastException", True, "ClassCastException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
2323
- ["java.lang", "ClassCircularityError", True, "ClassCircularityError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
2424
- ["java.lang", "ClassFormatError", True, "ClassFormatError", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
25-
- ["java.lang", "ClassLoader", True, "findResource", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
26-
- ["java.lang", "ClassLoader", True, "getDefinedPackage", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
27-
- ["java.lang", "ClassLoader", True, "getDefinedPackage", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
28-
- ["java.lang", "ClassLoader", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
29-
- ["java.lang", "ClassLoader", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
30-
- ["java.lang", "ClassLoader", True, "getSystemResource", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
31-
- ["java.lang", "ClassLoader", True, "getUnnamedModule", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
32-
- ["java.lang", "ClassLoader", True, "loadClass", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
33-
- ["java.lang", "ClassLoader", True, "loadClass", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
34-
- ["java.lang", "ClassLoader", True, "setClassAssertionStatus", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
35-
- ["java.lang", "ClassLoader", True, "setPackageAssertionStatus", "(String,boolean)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
3625
- ["java.lang", "ClassNotFoundException", True, "ClassNotFoundException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
3726
- ["java.lang", "ClassNotFoundException", True, "ClassNotFoundException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
3827
- ["java.lang", "ClassNotFoundException", True, "ClassNotFoundException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
@@ -200,16 +189,12 @@ extensions:
200189
- ["java.lang", "StackWalker$StackFrame", True, "toStackTraceElement", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
201190
- ["java.lang", "StackWalker", False, "getInstance", "(Set)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
202191
- ["java.lang", "StackWalker", False, "getInstance", "(Set,int)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
203-
- ["java.lang", "String", False, "lines", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
204192
- ["java.lang", "StringIndexOutOfBoundsException", True, "StringIndexOutOfBoundsException", "(String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
205193
- ["java.lang", "System$LoggerFinder", True, "getLocalizedLogger", "(String,ResourceBundle,Module)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
206194
- ["java.lang", "System$LoggerFinder", True, "getLocalizedLogger", "(String,ResourceBundle,Module)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
207195
- ["java.lang", "System", False, "getLogger", "(String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
208196
- ["java.lang", "System", False, "getLogger", "(String,ResourceBundle)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
209197
- ["java.lang", "System", False, "getLogger", "(String,ResourceBundle)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
210-
- ["java.lang", "System", False, "getProperty", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
211-
- ["java.lang", "System", False, "setProperty", "(String,String)", "", "Argument[0]", "ReturnValue", "taint", "df-generated"]
212-
- ["java.lang", "System", False, "setProperty", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "df-generated"]
213198
- ["java.lang", "Thread", True, "Thread", "(Runnable,String)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
214199
- ["java.lang", "Thread", True, "Thread", "(Runnable,String)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
215200
- ["java.lang", "Thread", True, "Thread", "(ThreadGroup,Runnable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
@@ -240,8 +225,6 @@ extensions:
240225
- ["java.lang", "ThreadGroup", True, "enumerate", "(Thread[],boolean)", "", "Argument[this]", "Argument[0].ArrayElement", "taint", "df-generated"]
241226
- ["java.lang", "ThreadGroup", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
242227
- ["java.lang", "ThreadGroup", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
243-
- ["java.lang", "Throwable", True, "fillInStackTrace", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
244-
- ["java.lang", "Throwable", True, "printStackTrace", "(PrintWriter)", "", "Argument[this]", "Argument[0]", "taint", "df-generated"]
245228
- ["java.lang", "TypeNotPresentException", True, "TypeNotPresentException", "(String,Throwable)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
246229
- ["java.lang", "TypeNotPresentException", True, "TypeNotPresentException", "(String,Throwable)", "", "Argument[1]", "Argument[this]", "taint", "df-generated"]
247230
- ["java.lang", "TypeNotPresentException", True, "typeName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
@@ -711,7 +694,6 @@ extensions:
711694
- ["java.lang", "ProcessHandle", "pid", "()", "summary", "df-generated"]
712695
- ["java.lang", "ProcessHandle", "supportsNormalTermination", "()", "summary", "df-generated"]
713696
- ["java.lang", "Readable", "read", "(CharBuffer)", "summary", "df-generated"]
714-
- ["java.lang", "Runnable", "run", "()", "summary", "df-generated"]
715697
- ["java.lang", "Runtime$Version", "compareToIgnoreOptional", "(Runtime$Version)", "summary", "df-generated"]
716698
- ["java.lang", "Runtime$Version", "equalsIgnoreOptional", "(Object)", "summary", "df-generated"]
717699
- ["java.lang", "Runtime$Version", "feature", "()", "summary", "df-generated"]

‎java/ql/lib/ext/generated/java.net.model.yml‎

Lines changed: 0 additions & 9 deletions

0 commit comments

Comments
 (0)