Java: Add manual models for FileReader (they would also have disappeared if models were re-generated without using mixed mode).

Author: michaelnebel

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

@@ -258,11 +258,6 @@ extensions:
       - ["java.io", "FileInputStream", "skip", "(long)", "summary", "df-generated"]
       - ["java.io", "FilePermission", "implies", "(Permission)", "summary", "df-generated"]
       - ["java.io", "FilePermission", "newPermissionCollection", "()", "summary", "df-generated"]
-      - ["java.io", "FileReader", "FileReader", "(File)", "summary", "df-generated"]
-      - ["java.io", "FileReader", "FileReader", "(File,Charset)", "summary", "df-generated"]
-      - ["java.io", "FileReader", "FileReader", "(FileDescriptor)", "summary", "df-generated"]
-      - ["java.io", "FileReader", "FileReader", "(String)", "summary", "df-generated"]
-      - ["java.io", "FileReader", "FileReader", "(String,Charset)", "summary", "df-generated"]
       - ["java.io", "FilterInputStream", "available", "()", "summary", "df-generated"]
       - ["java.io", "FilterInputStream", "mark", "(int)", "summary", "df-generated"]
       - ["java.io", "FilterInputStream", "markSupported", "()", "summary", "df-generated"]

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

@@ -100,6 +100,11 @@ extensions:
       - ["java.io", "File", True, "toString", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["java.io", "File", True, "toURI", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["java.io", "File", True, "toURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["java.io", "FileReader", True, "FileReader", "(File)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["java.io", "FileReader", True, "FileReader", "(File,Charset)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["java.io", "FileReader", True, "FileReader", "(FileDescriptor)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["java.io", "FileReader", True, "FileReader", "(String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["java.io", "FileReader", True, "FileReader", "(String,Charset)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["java.io", "FilterOutputStream", True, "FilterOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["java.io", "InputStream", True, "read", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["java.io", "InputStream", True, "read", "(byte[])", "", "Argument[this]", "Argument[0]", "taint", "manual"]