Skip to content

Commit 2236db4

Browse files
Stephan Brandaueratorralba
Stephan Brandauer
authored and
atorralba
committed
sort the changed MaD declarations
1 parent 74e2617 commit 2236db4

File tree

5 files changed

+53
-36
lines changed

5 files changed

+53
-36
lines changed

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ extensions:
1919
- ["java.net", "URLClassLoader", False, "URLClassLoader", "(URL[],ClassLoader)", "", "Argument[0]", "open-url", "manual"]
2020
- ["java.net", "URLClassLoader", False, "URLClassLoader", "(URL[],ClassLoader,URLStreamHandlerFactory)", "", "Argument[0]", "open-url", "manual"]
2121
- ["java.net", "URLClassLoader", False, "newInstance", "", "", "Argument[0]", "open-url", "manual"]
22+
- ["java.net", "URLClassLoader", False, "URLClassLoader", "(String,URL[],ClassLoader,URLStreamHandlerFactory)", "", "Argument[1]", "open-url", "manual"]
23+
- ["java.net", "URLClassLoader", False, "URLClassLoader", "(String,URL[],ClassLoader)", "", "Argument[1]", "open-url", "manual"]
24+
- ["java.net", "URLClassLoader", False, "URLClassLoader", "(URL[],ClassLoader,URLStreamHandlerFactory)", "", "Argument[0]", "open-url", "manual"]
25+
- ["java.net", "URLClassLoader", False, "URLClassLoader", "(URL[],ClassLoader)", "", "Argument[0]", "open-url", "manual"]
26+
- ["java.net", "URLClassLoader", False, "URLClassLoader", "(URL[])", "", "Argument[0]", "open-url", "manual"]
27+
- ["java.net", "URLClassLoader", True, "URLClassLoader", "(URL[],ClassLoader)", "", "Argument[0]", "open-url", "ai-generated"]
2228
- addsTo:
2329
pack: codeql/java-all
2430
extensible: summaryModel
@@ -27,16 +33,16 @@ extensions:
2733
- ["java.net", "InetAddress", True, "getAllByName", "(String)", "", "Argument[0]", "ReturnValue.ArrayElement", "taint", "ai-generated"]
2834
- ["java.net", "InetSocketAddress", True, "createUnresolved", "(String,int)", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
2935
- ["java.net", "InetSocketAddress", True, "InetSocketAddress", "(String,int)", "", "Argument[0]", "Argument[this]", "taint", "ai-generated"]
30-
- ["java.net", "URI", False, "resolve", "(String)", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
31-
- ["java.net", "URI", False, "resolve", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
3236
- ["java.net", "URI", False, "URI", "(String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
3337
- ["java.net", "URI", False, "create", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
38+
- ["java.net", "URI", False, "resolve", "(String)", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
39+
- ["java.net", "URI", False, "resolve", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
3440
- ["java.net", "URI", False, "toASCIIString", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
3541
- ["java.net", "URI", False, "toString", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
3642
- ["java.net", "URI", False, "toURL", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
3743
- ["java.net", "URL", False, "URL", "(String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
38-
- ["java.net", "URL", False, "toURI", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
39-
- ["java.net", "URL", False, "toExternalForm", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
4044
- ["java.net", "URL", False, "URL", "(URL,String)", "", "Argument[0]", "Argument[this]", "taint", "ai-generated"]
4145
- ["java.net", "URL", False, "URL", "(URL,String)", "", "Argument[1]", "Argument[this]", "taint", "ai-generated"] # @atorralba: review for consistency
46+
- ["java.net", "URL", False, "toExternalForm", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
47+
- ["java.net", "URL", False, "toURI", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
4248
- ["java.net", "URLDecoder", False, "decode", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]

‎java/ql/lib/ext/java.nio.file.model.yml‎

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@ extensions:
33
pack: codeql/java-all
44
extensible: sinkModel
55
data:
6-
- ["java.nio.file", "Files", True, "createTempFile", "(Path,String,String,FileAttribute[])", "", "Argument[0]", "create-file", "ai-generated"]
7-
- ["java.nio.file", "Files", True, "createDirectory", "(Path,FileAttribute[])", "", "Argument[0]", "create-file", "ai-generated"]
8-
- ["java.nio.file", "Files", True, "createDirectories", "(Path,FileAttribute[])", "", "Argument[0]", "create-file", "ai-generated"]
9-
- ["java.nio.file", "Files", True, "move", "(Path,Path,CopyOption[])", "", "Argument[1]", "create-file", "ai-generated"]
10-
- ["java.nio.file", "Files", True, "createFile", "(Path,FileAttribute[])", "", "Argument[0]", "create-file", "ai-generated"]
11-
- ["java.nio.file", "Files", True, "getLastModifiedTime", "(Path,LinkOption[])", "", "Argument[0]", "read-file", "ai-generated"]
12-
- ["java.nio.file", "Files", True, "isWritable", "(Path)", "", "Argument[0]", "read-file", "ai-generated"]
13-
# suggested label is not supported: - ["java.nio.file", "Files", True, "delete", "(Path)", "", "Argument[0]", "delete-file", "ai-generated"]
14-
# suggested label is not supported: - ["java.nio.file", "Files", True, "move", "(Path,Path,CopyOption[])", "", "Argument[0]", "delete-file", "ai-generated"]
15-
- ["java.nio.file", "Files", True, "isDirectory", "(Path,LinkOption[])", "", "Argument[0]", "read-file", "ai-generated"]
166
- ["java.nio.file", "Files", False, "copy", "", "", "Argument[0]", "read-file", "manual"]
177
- ["java.nio.file", "Files", False, "copy", "", "", "Argument[1]", "create-file", "manual"]
188
- ["java.nio.file", "Files", False, "createDirectories", "", "", "Argument[0]", "create-file", "manual"]
@@ -33,30 +23,31 @@ extensions:
3323
- ["java.nio.file", "Files", False, "write", "", "", "Argument[1]", "write-file", "manual"]
3424
- ["java.nio.file", "Files", False, "writeString", "", "", "Argument[0]", "create-file", "manual"]
3525
- ["java.nio.file", "Files", False, "writeString", "", "", "Argument[1]", "write-file", "manual"]
26+
- ["java.nio.file", "Files", True, "createDirectories", "(Path,FileAttribute[])", "", "Argument[0]", "create-file", "ai-generated"]
27+
- ["java.nio.file", "Files", True, "createDirectory", "(Path,FileAttribute[])", "", "Argument[0]", "create-file", "ai-generated"]
28+
- ["java.nio.file", "Files", True, "createFile", "(Path,FileAttribute[])", "", "Argument[0]", "create-file", "ai-generated"]
29+
- ["java.nio.file", "Files", True, "createTempFile", "(Path,String,String,FileAttribute[])", "", "Argument[0]", "create-file", "ai-generated"]
30+
- ["java.nio.file", "Files", True, "getLastModifiedTime", "(Path,LinkOption[])", "", "Argument[0]", "read-file", "ai-generated"]
31+
- ["java.nio.file", "Files", True, "isDirectory", "(Path,LinkOption[])", "", "Argument[0]", "read-file", "ai-generated"]
32+
- ["java.nio.file", "Files", True, "isWritable", "(Path)", "", "Argument[0]", "read-file", "ai-generated"]
33+
- ["java.nio.file", "Files", True, "move", "(Path,Path,CopyOption[])", "", "Argument[1]", "create-file", "ai-generated"]
34+
# suggested label is not supported: - ["java.nio.file", "Files", True, "delete", "(Path)", "", "Argument[0]", "delete-file", "ai-generated"]
35+
# suggested label is not supported: - ["java.nio.file", "Files", True, "move", "(Path,Path,CopyOption[])", "", "Argument[0]", "delete-file", "ai-generated"]
3636
- addsTo:
3737
pack: codeql/java-all
3838
extensible: summaryModel
3939
data:
40-
- ["java.nio.file", "Files", True, "newByteChannel", "(Path,OpenOption[])", "", "Argument[0]" "ReturnValue", "taint", "ai-generated"]
41-
- ["java.nio.file", "Files", True, "newDirectoryStream", "(Path)", "", "Argument[0]" "ReturnValue", "taint", "ai-generated"]
42-
- ["java.nio.file", "Files", True, "newOutputStream", "(Path,OpenOption[])", "", "Argument[0]" "ReturnValue", "taint", "ai-generated"]
43-
- ["java.nio.file", "Files", True, "newBufferedReader", "(Path)", "", "Argument[0]" "ReturnValue", "taint", "ai-generated"]
44-
- ["java.nio.file", "Files", True, "newInputStream", "(Path,OpenOption[])", "", "Argument[0]" "ReturnValue", "taint", "ai-generated"]
45-
- ["java.nio.file", "FileSystem", True, "getPath", "(String,String[])", "", "Argument[1]" "ReturnValue", "taint", "ai-generated"]
46-
- ["java.nio.file", "FileSystem", True, "getPathMatcher", "(String)", "", "Argument[0]" "ReturnValue", "taint", "ai-generated"]
47-
- ["java.nio.file", "Files", True, "walk", "(Path,FileVisitOption[])", "", "Argument[0]" "ReturnValue", "taint", "ai-generated"]
48-
- ["java.nio.file", "Path", True, "of", "(String,String[])", "", "Argument[0]" "ReturnValue", "taint", "ai-generated"]
49-
# suggested label is not supported: - ["java.nio.file", "Files", True, "walkFileTree", "(Path,FileVisitor)", "", "Argument[0]" "Argument[1].Method[visitFileFailed(Path,IOException)].Parameter[0]", "taint", "ai-generated"]
50-
# suggested label is not supported: - ["java.nio.file", "Files", True, "walkFileTree", "(Path,FileVisitor)", "", "Argument[0]" "Argument[1].Method[postVisitDirectory(Path,IOException)].Parameter[0]", "taint", "ai-generated"]
51-
# suggested label is not supported: - ["java.nio.file", "Files", True, "walkFileTree", "(Path,FileVisitor)", "", "Argument[0]" "Argument[1].Method[preVisitDirectory(Path,BasicFileAttributes)].Parameter[0]", "taint", "ai-generated"]
52-
# suggested label is not supported: - ["java.nio.file", "Files", True, "walkFileTree", "(Path,FileVisitor)", "", "Argument[0]" "Argument[1].Method[visitFile(Path,BasicFileAttributes)].Parameter[0]", "taint", "ai-generated"]
53-
- ["java.nio.file", "Path", True, "of", "(URI)", "", "Argument[0]" "ReturnValue", "taint", "ai-generated"]
54-
- ["java.nio.file", "Files", True, "newBufferedReader", "(Path,Charset)", "", "Argument[0]" "ReturnValue", "taint", "ai-generated"]
55-
- ["java.nio.file", "Files", True, "newDirectoryStream", "(Path,Filter)", "", "Argument[0]" "ReturnValue", "taint", "ai-generated"]
56-
- ["java.nio.file", "Files", True, "newByteChannel", "(Path,Set,FileAttribute[])", "", "Argument[0]" "ReturnValue", "taint", "ai-generated"]
57-
- ["java.nio.file", "Path", True, "of", "(String,String[])", "", "Argument[1]" "ReturnValue", "taint", "ai-generated"]
58-
- ["java.nio.file", "Path", True, "of", "(String,String[])", "", "Argument[0]" "ReturnValue", "taint", "ai-generated"]
40+
- ["java.nio.file", "Files", True, "newBufferedReader", "(Path,Charset)", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
41+
- ["java.nio.file", "Files", True, "newBufferedReader", "(Path)", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
42+
- ["java.nio.file", "Files", True, "newByteChannel", "(Path,OpenOption[])", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
43+
- ["java.nio.file", "Files", True, "newByteChannel", "(Path,Set,FileAttribute[])", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
44+
- ["java.nio.file", "Files", True, "newDirectoryStream", "(Path,Filter)", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
45+
- ["java.nio.file", "Files", True, "newDirectoryStream", "(Path)", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
46+
- ["java.nio.file", "Files", True, "newInputStream", "(Path,OpenOption[])", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
47+
- ["java.nio.file", "Files", True, "newOutputStream", "(Path,OpenOption[])", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
48+
- ["java.nio.file", "Files", True, "walk", "(Path,FileVisitOption[])", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
5949
- ["java.nio.file", "FileSystem", True, "getPath", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
50+
<<<<<<< HEAD
6051
- ["java.nio.file", "Path", True, "getParent", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
6152
- ["java.nio.file", "Path", True, "normalize", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
6253
- ["java.nio.file", "Path", True, "resolve", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
@@ -65,5 +56,25 @@ extensions:
6556
- ["java.nio.file", "Path", False, "toFile", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
6657
- ["java.nio.file", "Path", True, "toString", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
6758
- ["java.nio.file", "Path", True, "toUri", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
59+
=======
60+
- ["java.nio.file", "FileSystem", True, "getPath", "(String,String[])", "", "Argument[1]", "ReturnValue", "taint", "ai-generated"]
61+
- ["java.nio.file", "FileSystem", True, "getPathMatcher", "(String)", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
62+
- ["java.nio.file", "FileSystem", True, "getRootDirectories", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
63+
- ["java.nio.file", "Path", False, "toFile", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
64+
- ["java.nio.file", "Path", True, "getParent", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
65+
- ["java.nio.file", "Path", True, "normalize", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
66+
- ["java.nio.file", "Path", True, "of", "(String,String[])", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
67+
- ["java.nio.file", "Path", True, "of", "(String,String[])", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
68+
- ["java.nio.file", "Path", True, "of", "(String,String[])", "", "Argument[1]", "ReturnValue", "taint", "ai-generated"]
69+
- ["java.nio.file", "Path", True, "of", "(URI)", "", "Argument[0]", "ReturnValue", "taint", "ai-generated"]
70+
- ["java.nio.file", "Path", True, "resolve", "", "", "Argument[-1..0]", "ReturnValue", "taint", "manual"]
71+
- ["java.nio.file", "Path", True, "toAbsolutePath", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
72+
- ["java.nio.file", "Path", True, "toString", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
73+
- ["java.nio.file", "Path", True, "toUri", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
74+
>>>>>>> cc4ba800cf (sort the changed MaD declarations)
6875
- ["java.nio.file", "Paths", True, "get", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
6976
- ["java.nio.file", "Paths", True, "get", "", "", "Argument[1].ArrayElement", "ReturnValue", "taint", "manual"]
77+
# suggested label is not supported: - ["java.nio.file", "Files", True, "walkFileTree", "(Path,FileVisitor)", "", "Argument[0]" "Argument[1].Method[postVisitDirectory(Path,IOException)].Parameter[0]", "taint", "ai-generated"]
78+
# suggested label is not supported: - ["java.nio.file", "Files", True, "walkFileTree", "(Path,FileVisitor)", "", "Argument[0]" "Argument[1].Method[preVisitDirectory(Path,BasicFileAttributes)].Parameter[0]", "taint", "ai-generated"]
79+
# suggested label is not supported: - ["java.nio.file", "Files", True, "walkFileTree", "(Path,FileVisitor)", "", "Argument[0]" "Argument[1].Method[visitFile(Path,BasicFileAttributes)].Parameter[0]", "taint", "ai-generated"]
80+
# suggested label is not supported: - ["java.nio.file", "Files", True, "walkFileTree", "(Path,FileVisitor)", "", "Argument[0]" "Argument[1].Method[visitFileFailed(Path,IOException)].Parameter[0]", "taint", "ai-generated"]

‎java/ql/lib/ext/javax.imageio.stream.model.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ extensions:
44
pack: codeql/java-all
55
extensible: summaryModel
66
data:
7-
- ["javax.imageio.stream", "FileCacheImageInputStream", True, "FileCacheImageInputStream", "(InputStream,File)", "", "Argument[0]" "Argument[-1].Element", "taint", "ai-generated"]
7+
- ["javax.imageio.stream", "FileCacheImageInputStream", True, "FileCacheImageInputStream", "(InputStream,File)", "", "Argument[0]", "Argument[-1].Element", "taint", "ai-generated"]

‎java/ql/lib/ext/javax.naming.model.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ extensions:
1414
pack: codeql/java-all
1515
extensible: summaryModel
1616
data:
17-
- ["javax.naming", "StringRefAddr", True, "StringRefAddr", "(String,String)", "", "Argument[1]" "ReturnValue", "taint", "ai-generated"]
17+
- ["javax.naming", "StringRefAddr", True, "StringRefAddr", "(String,String)", "", "Argument[1]", "ReturnValue", "taint", "ai-generated"]

‎java/ql/lib/ext/org.springframework.web.client.model.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ extensions:
1010
pack: codeql/java-all
1111
extensible: sinkModel
1212
data:
13-
- ["org.springframework.web.client", "RestTemplate", True, "exchange", "(String,HttpMethod,HttpEntity,Class,Object[])", "", "Argument[0]", "open-url", "ai-generated"]
1413
- ["org.springframework.web.client", "RestTemplate", False, "delete", "", "", "Argument[0]", "open-url", "manual"]
1514
- ["org.springframework.web.client", "RestTemplate", False, "doExecute", "", "", "Argument[0]", "open-url", "manual"]
1615
- ["org.springframework.web.client", "RestTemplate", False, "exchange", "", "", "Argument[0]", "open-url", "manual"]
@@ -24,3 +23,4 @@ extensions:
2423
- ["org.springframework.web.client", "RestTemplate", False, "postForLocation", "", "", "Argument[0]", "open-url", "manual"]
2524
- ["org.springframework.web.client", "RestTemplate", False, "postForObject", "", "", "Argument[0]", "open-url", "manual"]
2625
- ["org.springframework.web.client", "RestTemplate", False, "put", "", "", "Argument[0]", "open-url", "manual"]
26+
- ["org.springframework.web.client", "RestTemplate", True, "exchange", "(String,HttpMethod,HttpEntity,Class,Object[])", "", "Argument[0]", "open-url", "ai-generated"]

0 commit comments

Comments
 (0)