C#/Java: Minor refactor and re-arranging of code to align the CaptureModel specific implementations.

Author: michaelnebel

csharp/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll

@@ -45,6 +45,11 @@ predicate asPartialModel = DataFlowPrivate::Csv::asPartialModel/1;
  */
 predicate isRelevantType(CS::Type t) { not t instanceof CS::Enum }
 
+/**
+ * Gets the CSV string representation of the qualifier.
+ */
+string qualifierString() { result = "Argument[Qualifier]" }
+
 private string parameterAccess(CS::Parameter p) {
   if Collections::isCollectionType(p.getType())
   then result = "Argument[" + p.getPosition() + "].Element"
@@ -57,7 +62,7 @@ private string parameterAccess(CS::Parameter p) {
 string parameterNodeAsInput(DataFlow::ParameterNode p) {
   result = parameterAccess(p.asParameter())
   or
-  result = "Argument[Qualifier]" and p instanceof DataFlowPrivate::InstanceParameterNode
+  result = qualifierString() and p instanceof DataFlowPrivate::InstanceParameterNode
 }
 
 pragma[nomagic]
@@ -78,7 +83,7 @@ string returnNodeAsOutput(DataFlowImplCommon::ReturnNodeExt node) {
       result = parameterAccess(getParameter(node, pos))
       or
       pos.isThisParameter() and
-      result = "Argument[Qualifier]"
+      result = qualifierString()
     )
 }
 
@@ -96,17 +101,6 @@ predicate isOwnInstanceAccessNode(DataFlowPrivate::ReturnNode node) {
   node.asExpr() instanceof CS::ThisAccess
 }
 
-/**
- * Gets the CSV string representation of the qualifier.
- */
-string qualifierString() { result = "Argument[Qualifier]" }
-
-/**
- * Holds if `kind` is a relevant sink kind for creating sink models.
- */
-bindingset[kind]
-predicate isRelevantSinkKind(string kind) { any() }
-
 private predicate isRelevantMemberAccess(DataFlow::Node node) {
   exists(CS::MemberAccess access | access = node.asExpr() |
     access.hasThisQualifier() and
@@ -143,3 +137,9 @@ string asInputArgument(DataFlow::Node source) {
   source.asExpr() instanceof DataFlowPrivate::FieldOrPropertyAccess and
   result = qualifierString()
 }
+
+/**
+ * Holds if `kind` is a relevant sink kind for creating sink models.
+ */
+bindingset[kind]
+predicate isRelevantSinkKind(string kind) { any() }

java/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll

@@ -137,6 +137,11 @@ predicate isRelevantType(J::Type t) {
   )
 }
 
+/**
+ * Gets the CSV string representation of the qualifier.
+ */
+string qualifierString() { result = "Argument[-1]" }
+
 private string parameterAccess(J::Parameter p) {
   if
     p.getType() instanceof J::Array and
@@ -154,7 +159,7 @@ private string parameterAccess(J::Parameter p) {
 string parameterNodeAsInput(DataFlow::ParameterNode p) {
   result = parameterAccess(p.asParameter())
   or
-  result = "Argument[-1]" and p instanceof DataFlow::InstanceParameterNode
+  result = qualifierString() and p instanceof DataFlow::InstanceParameterNode
 }
 
 /**
@@ -169,7 +174,7 @@ string returnNodeAsOutput(DataFlowImplCommon::ReturnNodeExt node) {
     |
       result = parameterAccess(node.getEnclosingCallable().getParameter(pos))
       or
-      result = "Argument[-1]" and pos = -1
+      result = qualifierString() and pos = -1
     )
 }
 
@@ -187,11 +192,6 @@ predicate isOwnInstanceAccessNode(ReturnNode node) {
   node.asExpr().(J::ThisAccess).isOwnInstanceAccess()
 }
 
-/**
- * Gets the CSV string representation of the qualifier.
- */
-string qualifierString() { result = "Argument[-1]" }
-
 /**
  * Language specific parts of the `PropagateToSinkConfiguration`.
  */