add explicit this qualifier on all of java

Author: erik-krogh

java/ql/lib/external/ExternalArtifact.qll

@@ -3,24 +3,25 @@ import java
 class ExternalData extends @externalDataElement {
   string getDataPath() { externalData(this, result, _, _) }
 
-  string getQueryPath() { result = getDataPath().regexpReplaceAll("\\.[^.]*$", ".ql") }
+  string getQueryPath() { result = this.getDataPath().regexpReplaceAll("\\.[^.]*$", ".ql") }
 
   int getNumFields() { result = 1 + max(int i | externalData(this, _, i, _) | i) }
 
   string getField(int index) { externalData(this, _, index, result) }
 
-  int getFieldAsInt(int index) { result = getField(index).toInt() }
+  int getFieldAsInt(int index) { result = this.getField(index).toInt() }
 
-  float getFieldAsFloat(int index) { result = getField(index).toFloat() }
+  float getFieldAsFloat(int index) { result = this.getField(index).toFloat() }
 
-  date getFieldAsDate(int index) { result = getField(index).toDate() }
+  date getFieldAsDate(int index) { result = this.getField(index).toDate() }
 
-  string toString() { result = getQueryPath() + ": " + buildTupleString(0) }
+  string toString() { result = this.getQueryPath() + ": " + this.buildTupleString(0) }
 
   private string buildTupleString(int start) {
-    start = getNumFields() - 1 and result = getField(start)
+    start = this.getNumFields() - 1 and result = this.getField(start)
     or
-    start < getNumFields() - 1 and result = getField(start) + "," + buildTupleString(start + 1)
+    start < this.getNumFields() - 1 and
+    result = this.getField(start) + "," + this.buildTupleString(start + 1)
   }
 }
 
@@ -33,7 +34,7 @@ class DefectExternalData extends ExternalData {
     this.getNumFields() = 2
   }
 
-  string getURL() { result = getField(0) }
+  string getURL() { result = this.getField(0) }
 
-  string getMessage() { result = getField(1) }
+  string getMessage() { result = this.getField(1) }
 }

java/ql/lib/semmle/code/FileSystem.qll

@@ -47,7 +47,7 @@ class Container extends @container, Top {
    */
   string getRelativePath() {
     exists(string absPath, string pref |
-      absPath = getAbsolutePath() and sourceLocationPrefix(pref)
+      absPath = this.getAbsolutePath() and sourceLocationPrefix(pref)
     |
       absPath = pref and result = ""
       or
@@ -74,7 +74,7 @@ class Container extends @container, Top {
    * </table>
    */
   string getBaseName() {
-    result = getAbsolutePath().regexpCapture(".*/(([^/]*?)(?:\\.([^.]*))?)", 1)
+    result = this.getAbsolutePath().regexpCapture(".*/(([^/]*?)(?:\\.([^.]*))?)", 1)
   }
 
   /**
@@ -100,7 +100,9 @@ class Container extends @container, Top {
    * <tr><td>"/tmp/x.tar.gz"</td><td>"gz"</td></tr>
    * </table>
    */
-  string getExtension() { result = getAbsolutePath().regexpCapture(".*/([^/]*?)(\\.([^.]*))?", 3) }
+  string getExtension() {
+    result = this.getAbsolutePath().regexpCapture(".*/([^/]*?)(\\.([^.]*))?", 3)
+  }
 
   /**
    * Gets the stem of this container, that is, the prefix of its base name up to
@@ -119,7 +121,9 @@ class Container extends @container, Top {
    * <tr><td>"/tmp/x.tar.gz"</td><td>"x.tar"</td></tr>
    * </table>
    */
-  string getStem() { result = getAbsolutePath().regexpCapture(".*/([^/]*?)(?:\\.([^.]*))?", 1) }
+  string getStem() {
+    result = this.getAbsolutePath().regexpCapture(".*/([^/]*?)(?:\\.([^.]*))?", 1)
+  }
 
   /** Gets the parent container of this file or folder, if any. */
   Container getParentContainer() { containerparent(result, this) }
@@ -128,20 +132,20 @@ class Container extends @container, Top {
   Container getAChildContainer() { this = result.getParentContainer() }
 
   /** Gets a file in this container. */
-  File getAFile() { result = getAChildContainer() }
+  File getAFile() { result = this.getAChildContainer() }
 
   /** Gets the file in this container that has the given `baseName`, if any. */
   File getFile(string baseName) {
-    result = getAFile() and
+    result = this.getAFile() and
     result.getBaseName() = baseName
   }
 
   /** Gets a sub-folder in this container. */
-  Folder getAFolder() { result = getAChildContainer() }
+  Folder getAFolder() { result = this.getAChildContainer() }
 
   /** Gets the sub-folder in this container that has the given `baseName`, if any. */
   Folder getFolder(string baseName) {
-    result = getAFolder() and
+    result = this.getAFolder() and
     result.getBaseName() = baseName
   }
 
@@ -152,15 +156,15 @@ class Container extends @container, Top {
    * to provide a different result. To get the absolute path of any `Container`, call
    * `Container.getAbsolutePath()` directly.
    */
-  override string toString() { result = getAbsolutePath() }
+  override string toString() { result = this.getAbsolutePath() }
 }
 
 /** A folder. */
 class Folder extends Container, @folder {
   override string getAbsolutePath() { folders(this, result) }
 
   /** Gets the URL of this folder. */
-  override string getURL() { result = "folder://" + getAbsolutePath() }
+  override string getURL() { result = "folder://" + this.getAbsolutePath() }
 
   override string getAPrimaryQlClass() { result = "Folder" }
 }
@@ -183,7 +187,7 @@ class File extends Container, @file {
  * A Java archive file with a ".jar" extension.
  */
 class JarFile extends File {
-  JarFile() { getExtension() = "jar" }
+  JarFile() { this.getExtension() = "jar" }
 
   /**
    * Gets the main attribute with the specified `key`
@@ -195,13 +199,17 @@ class JarFile extends File {
    * Gets the "Specification-Version" main attribute
    * from this JAR file's manifest.
    */
-  string getSpecificationVersion() { result = getManifestMainAttribute("Specification-Version") }
+  string getSpecificationVersion() {
+    result = this.getManifestMainAttribute("Specification-Version")
+  }
 
   /**
    * Gets the "Implementation-Version" main attribute
    * from this JAR file's manifest.
    */
-  string getImplementationVersion() { result = getManifestMainAttribute("Implementation-Version") }
+  string getImplementationVersion() {
+    result = this.getManifestMainAttribute("Implementation-Version")
+  }
 
   /**
    * Gets the per-entry attribute for the specified `entry` and `key`

java/ql/lib/semmle/code/Location.qll

@@ -63,10 +63,10 @@ class Top extends @top {
   predicate hasLocationInfo(
     string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
-    hasLocationInfoAux(filepath, startline, startcolumn, endline, endcolumn)
+    this.hasLocationInfoAux(filepath, startline, startcolumn, endline, endcolumn)
     or
     exists(string outFilepath, int outStartline, int outEndline |
-      hasLocationInfoAux(outFilepath, outStartline, _, outEndline, _) and
+      this.hasLocationInfoAux(outFilepath, outStartline, _, outEndline, _) and
       hasSmapLocationInfo(filepath, startline, startcolumn, endline, endcolumn, outFilepath,
         outStartline, outEndline)
     )
@@ -103,7 +103,7 @@ class Top extends @top {
   /**
    * Gets a comma-separated list of the names of the primary CodeQL classes to which this element belongs.
    */
-  final string getPrimaryQlClasses() { result = concat(getAPrimaryQlClass(), ",") }
+  final string getPrimaryQlClasses() { result = concat(this.getAPrimaryQlClass(), ",") }
 
   /**
    * Gets the name of a primary CodeQL class to which this element belongs.

java/ql/lib/semmle/code/java/Annotation.qll

@@ -51,7 +51,7 @@ class Annotation extends @annotation, Expr {
   Expr getValue(string name) { filteredAnnotValue(this, this.getAnnotationElement(name), result) }
 
   /** Gets the element being annotated. */
-  Element getTarget() { result = getAnnotatedElement() }
+  Element getTarget() { result = this.getAnnotatedElement() }
 
   override string toString() { result = this.getType().getName() }
 
@@ -67,8 +67,8 @@ class Annotation extends @annotation, Expr {
    * expression defined for the value.
    */
   Expr getAValue(string name) {
-    getType().getAnnotationElement(name).getType() instanceof Array and
-    exists(Expr value | value = getValue(name) |
+    this.getType().getAnnotationElement(name).getType() instanceof Array and
+    exists(Expr value | value = this.getValue(name) |
       if value instanceof ArrayInit then result = value.(ArrayInit).getAnInit() else result = value
     )
   }
@@ -104,7 +104,7 @@ class Annotatable extends Element {
 
   /** Holds if this element has the specified annotation. */
   predicate hasAnnotation(string package, string name) {
-    exists(AnnotationType at | at = getAnAnnotation().getType() |
+    exists(AnnotationType at | at = this.getAnAnnotation().getType() |
       at.nestedName() = name and at.getPackage().getName() = package
     )
   }
@@ -118,7 +118,7 @@ class Annotatable extends Element {
    * annotation attached to it for the specified `category`.
    */
   predicate suppressesWarningsAbout(string category) {
-    category = getAnAnnotation().(SuppressWarningsAnnotation).getASuppressedWarning()
+    category = this.getAnAnnotation().(SuppressWarningsAnnotation).getASuppressedWarning()
     or
     this.(Member).getDeclaringType().suppressesWarningsAbout(category)
     or

java/ql/lib/semmle/code/java/ControlFlowGraph.qll

@@ -528,13 +528,13 @@ private module ControlFlowGraphImpl {
 
     /** Gets the first child node, if any. */
     ControlFlowNode firstChild() {
-      result = getChildNode(-1)
+      result = this.getChildNode(-1)
       or
-      result = getChildNode(0) and not exists(getChildNode(-1))
+      result = this.getChildNode(0) and not exists(this.getChildNode(-1))
     }
 
     /** Holds if this CFG node has any child nodes. */
-    predicate isLeafNode() { not exists(getChildNode(_)) }
+    predicate isLeafNode() { not exists(this.getChildNode(_)) }
 
     /** Holds if this node can finish with a `normalCompletion`. */
     predicate mayCompleteNormally() {
@@ -1222,10 +1222,10 @@ class ConditionNode extends ControlFlowNode {
   ControlFlowNode getABranchSuccessor(boolean branch) { result = branchSuccessor(this, branch) }
 
   /** Gets a true-successor of the `ConditionNode`. */
-  ControlFlowNode getATrueSuccessor() { result = getABranchSuccessor(true) }
+  ControlFlowNode getATrueSuccessor() { result = this.getABranchSuccessor(true) }
 
   /** Gets a false-successor of the `ConditionNode`. */
-  ControlFlowNode getAFalseSuccessor() { result = getABranchSuccessor(false) }
+  ControlFlowNode getAFalseSuccessor() { result = this.getABranchSuccessor(false) }
 
   /** Gets the condition of this `ConditionNode`. This is equal to the node itself. */
   Expr getCondition() { result = this }

java/ql/lib/semmle/code/java/Conversions.qll

@@ -27,7 +27,7 @@ abstract class ConversionSite extends Expr {
   /**
    * Whether this conversion site actually induces a conversion.
    */
-  predicate isTrivial() { getConversionTarget() = getConversionSource() }
+  predicate isTrivial() { this.getConversionTarget() = this.getConversionSource() }
 
   /**
    * Whether this conversion is implicit.

java/ql/lib/semmle/code/java/Element.qll

@@ -34,10 +34,10 @@ class Element extends @element, Top {
    * Elements pertaining to source files may include generated elements
    * not visible in source code, such as implicit default constructors.
    */
-  predicate fromSource() { getCompilationUnit().getExtension() = "java" }
+  predicate fromSource() { this.getCompilationUnit().getExtension() = "java" }
 
   /** Gets the compilation unit that this element belongs to. */
-  CompilationUnit getCompilationUnit() { result = getFile() }
+  CompilationUnit getCompilationUnit() { result = this.getFile() }
 
   /** Cast this element to a `Documentable`. */
   Documentable getDoc() { result = this }