Java: Consistent naming of TContent cases

Author: paldepind

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

@@ -70,8 +70,10 @@ private module Cached {
     TMapValueContent() or
     TCapturedVariableContent(CapturedVariable v) or
     TSyntheticFieldContent(SyntheticField s) or
-    TLambdaReturn(Method m) or
-    TLambdaArgument(Method m, ArgumentPosition pos)
+    TLambdaReturnContent(Method m) or
+    TLambdaArgumentContent(Method m, ArgumentPosition pos) {
+      exists(m.getParameter(pos)) or pos = -1
+    }
 
   cached
   newtype TContentApprox =
@@ -82,8 +84,10 @@ private module Cached {
     TMapValueContentApprox() or
     TCapturedVariableContentApprox(CapturedVariable v) or
     TSyntheticFieldApproxContent() or
-    TLambdaReturnApprox(Method m) or
-    TLambdaArgumentApprox(Method m, ArgumentPosition pos)
+    TLambdaReturnContentApprox(Method m) or
+    TLambdaArgumentApprox(Method m, ArgumentPosition pos) {
+      exists(m.getParameter(pos)) or pos = -1
+    }
 }
 
 import Cached

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

@@ -533,7 +533,9 @@ class LambdaSynthCall extends DataFlowCall, TLambdaSynthCall {
 
   LambdaSynthCall() { this = TLambdaSynthCall(node) }
 
-  override DataFlowCallable getEnclosingCallable() { result.asCallable() = node.getEnclosingCallable() }
+  override DataFlowCallable getEnclosingCallable() {
+    result.asCallable() = node.getEnclosingCallable()
+  }
 
   override string toString() { result = "[synthetic] call to " + node }
 
@@ -611,7 +613,9 @@ predicate lambdaCreationHelper(Node creation, LambdaCallKind kind, DataFlowCalla
 }
 
 /** Holds if `creation` is an expression that creates a lambda of kind `kind` for `c`. */
-predicate lambdaCreation(Node creation, LambdaCallKind kind, DataFlowCallable c, DataFlowCall synthCall) {
+predicate lambdaCreation(
+  Node creation, LambdaCallKind kind, DataFlowCallable c, DataFlowCall synthCall
+) {
   synthCall = TLambdaSynthCall(creation) and
   lambdaCreationHelper(creation, kind, c)
 }
@@ -775,12 +779,11 @@ ContentApprox getContentApprox(Content c) {
   or
   c instanceof SyntheticFieldContent and result = TSyntheticFieldApproxContent()
   or
-  exists(Method m |
-    c = TLambdaReturn(m) and result = TLambdaReturnApprox(m))
+  exists(Method m | c = TLambdaReturnContent(m) and result = TLambdaReturnContentApprox(m))
   or
   exists(Method m, ArgumentPosition pos |
-    c = TLambdaArgument(m, pos) and result = TLambdaArgumentApprox(m, pos))
-
+    c = TLambdaArgumentContent(m, pos) and result = TLambdaArgumentApprox(m, pos)
+  )
 }
 
 /**
@@ -794,13 +797,13 @@ predicate containerContent(ContentSet c) {
 }
 
 Content getLambdaReturnContent(LambdaCallKind kind, ReturnKind k) {
-  result = TLambdaReturn(kind) and exists(k)
+  result = TLambdaReturnContent(kind) and exists(k)
 }
 
 Content getLambdaArgumentContent(LambdaCallKind kind, ArgumentPosition pos) {
-  result = TLambdaArgument(kind, pos)
+  result = TLambdaArgumentContent(kind, pos)
 }
 
 predicate isLambdaInstanceParameter(ParameterNode p) {
   exists(DataFlowCallable c | lambdaCreationHelper(_, _, c) and p.isParameterOf(c, -1))
-}
+}

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

@@ -360,31 +360,27 @@ class SyntheticFieldContent extends Content, TSyntheticFieldContent {
   override string toString() { result = s.toString() }
 }
 
-class LambdaReturnContent extends Content, TLambdaReturn {
+class LambdaReturnContent extends Content, TLambdaReturnContent {
   Method m;
 
-  LambdaReturnContent() { this = TLambdaReturn(m) }
+  LambdaReturnContent() { this = TLambdaReturnContent(m) }
 
-  override DataFlowType getType() {
-    result = getErasedRepr(m.getReturnType())
-  }
+  override DataFlowType getType() { result = getErasedRepr(m.getReturnType()) }
 
   override string toString() { result = "<lambda-return>" }
 }
 
-class LambdaArgumentContent extends Content, TLambdaArgument {
+class LambdaArgumentContent extends Content, TLambdaArgumentContent {
   Method m;
   ArgumentPosition pos;
 
-  LambdaArgumentContent() {
-    this = TLambdaArgument(m, pos)
-  }
+  LambdaArgumentContent() { this = TLambdaArgumentContent(m, pos) }
+
+  override DataFlowType getType() { result = getErasedRepr(m.getParameter(pos).getType()) }
 
-  override DataFlowType getType() {
-    result = getErasedRepr(m.getParameter(pos).getType())
-  }
   override string toString() { result = "<lambda-argument>" + pos.toString() }
 }
+
 /**
  * An entity that represents a set of `Content`s.
  *