Sort models and tests alphabetically

Author: owen-mc

java/ql/lib/ext/org.apache.commons.fileupload.model.yml

@@ -3,13 +3,13 @@ extensions:
       pack: codeql/java-all
       extensible: sourceModel
     data:
-      - ["org.apache.commons.fileupload", "FileItem", True, "getInputStream", "()", "", "ReturnValue", "remote", "manual"]
-      - ["org.apache.commons.fileupload", "FileItem", True, "getFieldName", "()", "", "ReturnValue", "remote", "manual"]
+      - ["org.apache.commons.fileupload", "FileItem", True, "get", "()", "", "ReturnValue", "remote", "manual"]
       - ["org.apache.commons.fileupload", "FileItem", True, "getContentType", "()", "", "ReturnValue", "remote", "manual"]
-      - ["org.apache.commons.fileupload", "FileItem", True, "getString", "()", "", "ReturnValue", "remote", "manual"]
+      - ["org.apache.commons.fileupload", "FileItem", True, "getFieldName", "()", "", "ReturnValue", "remote", "manual"]
+      - ["org.apache.commons.fileupload", "FileItem", True, "getInputStream", "()", "", "ReturnValue", "remote", "manual"]
       - ["org.apache.commons.fileupload", "FileItem", True, "getName", "()", "", "ReturnValue", "remote", "manual"]
-      - ["org.apache.commons.fileupload", "FileItem", True, "getString "(String)", "", "ReturnValue", "remote", "manual"]
-      - ["org.apache.commons.fileupload", "FileItem", True, "get", "()", "", "ReturnValue", "remote", "manual"]
+      - ["org.apache.commons.fileupload", "FileItem", True, "getString", "()", "", "ReturnValue", "remote", "manual"]
+      - ["org.apache.commons.fileupload", "FileItem", True, "getString", "(String)", "", "ReturnValue", "remote", "manual"]
       - ["org.apache.commons.fileupload", "FileItemStream", True, "getContentType", "()", "", "ReturnValue", "remote", "manual"]
       - ["org.apache.commons.fileupload", "FileItemStream", True, "getFieldName", "()", "", "ReturnValue", "remote", "manual"]
       - ["org.apache.commons.fileupload", "FileItemStream", True, "getName", "()", "", "ReturnValue", "remote", "manual"]

java/ql/lib/ext/org.apache.commons.fileupload.util.model.yml

@@ -3,7 +3,7 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["org.apache.commons.fileupload.util", "Streams", True, "copy", "(InputStream,OutputStream,boolean)", "", "Argument[0]", "Argument[1]", "taint", "manual"]
-      - ["org.apache.commons.fileupload.util", "Streams", True, "copy", "(InputStream,OutputStream,boolean,byte[])", "", "Argument[0]", "Argument[1]", "taint", "manual"]
       - ["org.apache.commons.fileupload.util", "Streams", True, "asString", "(InputStream)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["org.apache.commons.fileupload.util", "Streams", True, "asString", "(InputStream,String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["org.apache.commons.fileupload.util", "Streams", True, "asString", "(InputStream,String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["org.apache.commons.fileupload.util", "Streams", True, "copy", "(InputStream,OutputStream,boolean)", "", "Argument[0]", "Argument[1]", "taint", "manual"]
+      - ["org.apache.commons.fileupload.util", "Streams", True, "copy", "(InputStream,OutputStream,boolean,byte[])", "", "Argument[0]", "Argument[1]", "taint", "manual"]

java/ql/test/library-tests/dataflow/taintsources/FileUpload.java

@@ -18,32 +18,32 @@ private static void sink(Object o) {}
     public void test() throws Exception {
         sink(filePart.getContentType());  // $ hasRemoteValueFlow
         sink(filePart.getHeader("test")); // $ hasRemoteValueFlow
-        sink(filePart.getInputStream()); // $ hasRemoteValueFlow
-        sink(filePart.getHeaders("test")); // $ hasRemoteValueFlow
         sink(filePart.getHeaderNames()); // $ hasRemoteValueFlow
-        sink(filePart.getSubmittedFileName()); // $ hasRemoteValueFlow
+        sink(filePart.getHeaders("test")); // $ hasRemoteValueFlow
+        sink(filePart.getInputStream()); // $ hasRemoteValueFlow
         sink(filePart.getName()); // $ hasRemoteValueFlow
+        sink(filePart.getSubmittedFileName()); // $ hasRemoteValueFlow
 
-        sink(fileItem.getName());        // $ hasRemoteValueFlow
         sink(fileItem.get());            // $ hasRemoteValueFlow
-        sink(fileItem.getString());      // $ hasRemoteValueFlow
         sink(fileItem.getContentType()); // $ hasRemoteValueFlow
         sink(fileItem.getFieldName());        // $ hasRemoteValueFlow
         sink(fileItem.getInputStream());        // $ hasRemoteValueFlow
         sink(fileItem.getName());        // $ hasRemoteValueFlow
+        sink(fileItem.getName());        // $ hasRemoteValueFlow
+        sink(fileItem.getString());      // $ hasRemoteValueFlow
 
+        sink(fileItemStream.getContentType()); // $ hasRemoteValueFlow
         sink(fileItemStream.getFieldName()); // $ hasRemoteValueFlow
         sink(fileItemStream.getName()); // $ hasRemoteValueFlow
-        sink(fileItemStream.getContentType()); // $ hasRemoteValueFlow
         sink(fileItemStream.openStream()); // $ hasRemoteValueFlow
 
         sink(jakartaPart.getContentType());  // $ hasRemoteValueFlow
         sink(jakartaPart.getHeader("test")); // $ hasRemoteValueFlow
-        sink(jakartaPart.getInputStream()); // $ hasRemoteValueFlow
-        sink(jakartaPart.getHeaders("test")); // $ hasRemoteValueFlow
         sink(jakartaPart.getHeaderNames()); // $ hasRemoteValueFlow
-        sink(jakartaPart.getSubmittedFileName()); // $ hasRemoteValueFlow
+        sink(jakartaPart.getHeaders("test")); // $ hasRemoteValueFlow
+        sink(jakartaPart.getInputStream()); // $ hasRemoteValueFlow
         sink(jakartaPart.getName()); // $ hasRemoteValueFlow
+        sink(jakartaPart.getSubmittedFileName()); // $ hasRemoteValueFlow
 
     }
 }