Merge pull request github#14575 from github/smowton/feature/more-intuitive-java-class-names

Java: Replace MethodAccess, LValue, RValue with more intuitive names. Introduce NewClassExpr.

Author: smowton

docs/codeql/ql-training/query-examples/java/data-flow-java-1.ql

@@ -4,7 +4,7 @@ class StringConcat extends AddExpr {
   StringConcat() { getType() instanceof TypeString }
 }
 
-from MethodAccess ma
+from MethodCall ma
 where
   ma.getMethod().getName().matches("sparql%Query") and
   ma.getArgument(0) instanceof StringConcat

docs/codeql/ql-training/query-examples/java/data-flow-java-2.ql

@@ -1,7 +1,7 @@
 import java
 import semmle.code.java.dataflow.DataFlow::DataFlow
 
-from MethodAccess ma, StringConcat stringConcat
+from MethodCall ma, StringConcat stringConcat
 where
   ma.getMethod().getName().matches("sparql%Query") and
   localFlow(exprNode(stringConcat), exprNode(ma.getArgument(0)))

docs/codeql/ql-training/query-examples/java/query-injection-java-1.ql

@@ -1,6 +1,6 @@
 import java
 
-from Method m, MethodAccess ma
+from Method m, MethodCall ma
 where
   m.getName().matches("sparql%Query") and
   ma.getMethod() = m

docs/codeql/ql-training/query-examples/java/query-injection-java-2.ql

@@ -1,6 +1,6 @@
 import java
 
-from Method m, MethodAccess ma
+from Method m, MethodCall ma
 where
   m.getName().matches("sparql%Query") and
   ma.getMethod() = m and

docs/codeql/ql-training/query-examples/java/query-injection-java-3.ql

@@ -2,7 +2,7 @@ import java
 
 predicate isStringConcat(AddExpr ae) { ae.getType() instanceof TypeString }
 
-from Method m, MethodAccess ma
+from Method m, MethodCall ma
 where
   m.getName().matches("sparql%Query") and
   ma.getMethod() = m and

java/ql/consistency-queries/calls.ql

@@ -1,6 +1,6 @@
 import java
 
-from MethodAccess ma
+from MethodCall ma
 // Generally Kotlin calls will always use an explicit qualifier, except for calls
 // to the synthetic instance initializer <obinit>, which use an implicit `this`.
 where

java/ql/consistency-queries/cfgDeadEnds.ql

@@ -44,7 +44,7 @@ predicate shouldBeDeadEnd(ControlFlowNode n) {
   or
   n instanceof WildcardTypeAccess // TODO
   or
-  n instanceof MethodAccess // TODO
+  n instanceof MethodCall // TODO
   or
   n instanceof Method
   or

java/ql/consistency-queries/children.ql

@@ -37,11 +37,11 @@ predicate gapInChildren(Element e, int i) {
   // For statements may or may not declare a new variable (child 0), or
   // have a condition (child 1).
   not (e instanceof ForStmt and i = [0, 1]) and
-  // TODO: Clarify situation with Kotlin and MethodAccess.
+  // TODO: Clarify situation with Kotlin and MethodCall.
   // -1 can be skipped (type arguments from -2 down, no qualifier at -1,
   // then arguments from 0).
   // Can we also skip arguments, e.g. due to defaults for parameters?
-  not (e instanceof MethodAccess and e.getFile().isKotlinSourceFile()) and
+  not (e instanceof MethodCall and e.getFile().isKotlinSourceFile()) and
   // Kotlin-extracted annotations can have missing children where a default
   // value should be, because kotlinc doesn't load annotation defaults and we
   // want to leave a space for another extractor to fill in the default if it

java/ql/examples/snippets/method_call.ql

@@ -8,7 +8,7 @@
 
 import java
 
-from MethodAccess call, Method method
+from MethodCall call, Method method
 where
   call.getMethod() = method and
   method.hasName("methodName") and

java/ql/examples/snippets/mutualrecursion.ql

@@ -10,7 +10,7 @@ import java
 
 from Method m, Method n
 where
-  exists(MethodAccess ma | ma.getCaller() = m and ma.getCallee() = n) and
-  exists(MethodAccess ma | ma.getCaller() = n and ma.getCallee() = m) and
+  exists(MethodCall ma | ma.getCaller() = m and ma.getCallee() = n) and
+  exists(MethodCall ma | ma.getCaller() = n and ma.getCallee() = m) and
   m != n
 select m, n