Add aliases for public, importable renamed classes and predicates.

Also rename and aliases a couple of uses of Access noted along the way.

Author: smowton

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

@@ -1933,13 +1933,19 @@ class MethodCall extends Expr, Call, @methodaccess {
    */
   predicate isOwnMethodCall() { Qualifier::ownMemberAccess(this) }
 
+  /** DEPRECATED: Alias for `isOwnMethodCall`. */
+  deprecated predicate isOwnMethodAccess() { this.isOwnMethodCall() }
+
   /**
    * Holds if this is a method access to an instance method of the enclosing
    * class `t`. That is, the qualifier is either an explicit or implicit
    * `t`-qualified `this` or `super`.
    */
   predicate isEnclosingMethodCall(RefType t) { Qualifier::enclosingMemberAccess(this, t) }
 
+  /** DEPRECATED: Alias for `isEnclosingMethodCall`. */
+  deprecated predicate isEnclosingMethodAccess() { this.isEnclosingMethodCall() }
+
   override string getAPrimaryQlClass() { result = "MethodCall" }
 }
 

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

@@ -276,6 +276,9 @@ class MethodCallSystemGetProperty extends MethodCall {
   }
 }
 
+/** DEPRECATED: Alias for `MethodCallSystemGetProperty`. */
+deprecated class MethodAccessSystemGetProperty = MethodCallSystemGetProperty;
+
 /**
  * Any method named `exit` on class `java.lang.Runtime` or `java.lang.System`.
  */

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

@@ -83,6 +83,9 @@ class ReflectiveClassIdentifierMethodCall extends ReflectiveClassIdentifier, Met
   }
 }
 
+/** DEPRECATED: Alias for `ReflectiveClassIdentifierMethodCall`. */
+deprecated class ReflectiveClassIdentifierMethodAccess = ReflectiveClassIdentifierMethodCall;
+
 /**
  * Gets a `ReflectiveClassIdentifier` that we believe may represent the value of `expr`.
  */
@@ -317,26 +320,35 @@ class ClassMethodCall extends MethodCall {
   }
 }
 
+/** DEPRECATED: Alias for `ClassMethodCall`. */
+deprecated class ClassMethodAccess = ClassMethodCall;
+
 /**
  * A call to `Class.getConstructors(..)` or `Class.getDeclaredConstructors(..)`.
  */
-class ReflectiveConstructorsAccess extends ClassMethodCall {
-  ReflectiveConstructorsAccess() {
+class ReflectiveConstructorsCall extends ClassMethodCall {
+  ReflectiveConstructorsCall() {
     this.getCallee().hasName("getConstructors") or
     this.getCallee().hasName("getDeclaredConstructors")
   }
 }
 
+/** DEPRECATED: Alias for `ReflectiveConstructorsCall`. */
+deprecated class ReflectiveConstructorsAccess = ReflectiveConstructorsCall;
+
 /**
  * A call to `Class.getMethods(..)` or `Class.getDeclaredMethods(..)`.
  */
-class ReflectiveMethodsAccess extends ClassMethodCall {
-  ReflectiveMethodsAccess() {
+class ReflectiveMethodsCall extends ClassMethodCall {
+  ReflectiveMethodsCall() {
     this.getCallee().hasName("getMethods") or
     this.getCallee().hasName("getDeclaredMethods")
   }
 }
 
+/** DEPRECATED: Alias for `ReflectiveMethodsCall`. */
+deprecated class ReflectiveMethodsAccess = ReflectiveMethodsCall;
+
 /**
  * A call to `Class.getMethod(..)` or `Class.getDeclaredMethod(..)`.
  */
@@ -366,11 +378,14 @@ class ReflectiveMethodCall extends ClassMethodCall {
   }
 }
 
+/** DEPRECATED: Alias for `ReflectiveMethodCall`. */
+deprecated class ReflectiveMethodAccess = ReflectiveMethodCall;
+
 /**
  * A call to `Class.getAnnotation(..)`.
  */
-class ReflectiveAnnotationAccess extends ClassMethodCall {
-  ReflectiveAnnotationAccess() { this.getCallee().hasName("getAnnotation") }
+class ReflectiveAnnotationCall extends ClassMethodCall {
+  ReflectiveAnnotationCall() { this.getCallee().hasName("getAnnotation") }
 
   /**
    * Gets a possible annotation type for this reflective annotation access.
@@ -380,11 +395,14 @@ class ReflectiveAnnotationAccess extends ClassMethodCall {
   }
 }
 
+/** DEPRECATED: Alias for `ReflectiveAnnotationCall`. */
+deprecated class ReflectiveAnnotationAccess = ReflectiveAnnotationCall;
+
 /**
  * A call to `Class.getField(..)` that accesses a field.
  */
-class ReflectiveFieldAccess extends ClassMethodCall {
-  ReflectiveFieldAccess() {
+class ReflectiveFieldCall extends ClassMethodCall {
+  ReflectiveFieldCall() {
     this.getCallee().hasName("getField") or
     this.getCallee().hasName("getDeclaredField")
   }
@@ -405,3 +423,6 @@ class ReflectiveFieldAccess extends ClassMethodCall {
     result.hasName(this.getArgument(0).(StringLiteral).getValue())
   }
 }
+
+/** DEPRECATED: Alias for `ReflectiveFieldCall`. */
+deprecated class ReflectiveFieldAccess = ReflectiveFieldCall;

java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll

@@ -464,6 +464,11 @@ class ObjectOutputStreamVar extends LocalVariableDecl {
     result.getQualifier() = this.getAnAccess() and
     result.getMethod().hasName("writeObject")
   }
+
+  /** DEPRECATED: Alias for `getAWriteObjectMethodCall`. */
+  deprecated MethodCall getAWriteObjectMethodAccess() { 
+    result = this.getAWriteObjectMethodCall()
+  }
 }
 
 /** Flow through string formatting. */

java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll

@@ -267,7 +267,7 @@ private module Impl {
 
   /** Holds if `f` can have any sign. */
   predicate fieldWithUnknownSign(Field f) {
-    exists(ReflectiveFieldAccess rfa | rfa.inferAccessedField() = f)
+    exists(ReflectiveFieldCall rfa | rfa.inferAccessedField() = f)
   }
 
   /** Holds if `f` is accessed in an increment operation. */

java/ql/lib/semmle/code/java/deadcode/DeadCode.qll

@@ -173,9 +173,9 @@ class LiveClass extends SourceClassOrInterface {
     exists(NestedType r | r.getEnclosingType() = this | r instanceof LiveClass)
     or
     // An annotation on the class is reflectively accessed.
-    exists(ReflectiveAnnotationAccess reflectiveAnnotationAccess |
-      this = reflectiveAnnotationAccess.getInferredClassType() and
-      isLive(reflectiveAnnotationAccess.getEnclosingCallable())
+    exists(ReflectiveAnnotationCall reflectiveAnnotationCall |
+      this = reflectiveAnnotationCall.getInferredClassType() and
+      isLive(reflectiveAnnotationCall.getEnclosingCallable())
     )
     or
     this instanceof AnonymousClass

java/ql/lib/semmle/code/java/deadcode/DeadField.qll

@@ -130,7 +130,7 @@ class JUnitAnnotatedField extends ReflectivelyReadField {
  */
 class ClassReflectivelyReadField extends ReflectivelyReadField {
   ClassReflectivelyReadField() {
-    exists(ReflectiveFieldAccess fieldAccess | this = fieldAccess.inferAccessedField())
+    exists(ReflectiveFieldCall fieldAccess | this = fieldAccess.inferAccessedField())
   }
 }
 

java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll

@@ -172,6 +172,9 @@ class ReflectiveMethodCallEntryPoint extends EntryPoint, ReflectiveMethodCall {
   }
 }
 
+/** DEPRECATED: Alias for `ReflectiveMethodCallEntryPoint`. */
+deprecated class ReflectiveMethodAccessEntryPoint = ReflectiveMethodCallEntryPoint;
+
 /**
  * Classes that are entry points recognised by annotations.
  */

java/ql/lib/semmle/code/java/frameworks/Mockito.qll

@@ -25,6 +25,9 @@ class MockitoVerifiedMethodCall extends MethodCall {
   }
 }
 
+/** DEPRECATED: Alias for `MockitoVerifiedMethodCall`. */
+deprecated class MockitoVerifiedMethodAccess = MockitoVerifiedMethodCall;
+
 /**
  * A type that can be mocked by Mockito.
  */

java/ql/lib/semmle/code/java/security/CleartextStorageAndroidDatabaseQuery.qll

@@ -43,6 +43,9 @@ class LocalDatabaseOpenMethodCall extends Storable, Call {
   }
 }
 
+/** DEPRECATED: Alias for `LocalDatabaseOpenMethodCall`. */
+deprecated class LocalDatabaseOpenMethodAccess = LocalDatabaseOpenMethodCall;
+
 /** A method that is both a database input and a database store. */
 private class LocalDatabaseInputStoreMethod extends Method {
   LocalDatabaseInputStoreMethod() {