Java: Automodel: drive-by: remove unused message logic for candidate extraction

Author: Stephan Brandauer

java/ql/automodel/src/AutomodelApplicationModeExtractCandidates.ql

@@ -55,14 +55,15 @@ private Endpoint getSampleForSignature(
 }
 
 from
-  Endpoint endpoint, string message, ApplicationModeMetadataExtractor meta, DollarAtString package,
+  Endpoint endpoint, ApplicationModeMetadataExtractor meta, DollarAtString package,
   DollarAtString type, DollarAtString subtypes, DollarAtString name, DollarAtString signature,
   DollarAtString input, DollarAtString output, DollarAtString isVarargsArray,
   DollarAtString alreadyAiModeled, DollarAtString extensibleType
 where
   not exists(CharacteristicsImpl::UninterestingToModelCharacteristic u |
     u.appliesToEndpoint(endpoint)
   ) and
+  CharacteristicsImpl::isSinkCandidate(endpoint, _) and
   endpoint =
     getSampleForSignature(9, package, type, subtypes, name, signature, input, output,
       isVarargsArray, extensibleType) and
@@ -78,19 +79,9 @@ where
     CharacteristicsImpl::isModeled(endpoint, _, _, alreadyAiModeled)
   ) and
   meta.hasMetadata(endpoint, package, type, subtypes, name, signature, input, output, isVarargsArray) and
-  includeAutomodelCandidate(package, type, name, signature) and
-  // The message is the concatenation of all sink types for which this endpoint is known neither to be a sink nor to be
-  // a non-sink, and we surface only endpoints that have at least one such sink type.
-  message =
-    strictconcat(AutomodelEndpointTypes::SinkType sinkType |
-      not CharacteristicsImpl::isKnownAs(endpoint, sinkType, _) and
-      CharacteristicsImpl::isSinkCandidate(endpoint, sinkType)
-    |
-      sinkType, ", "
-    )
+  includeAutomodelCandidate(package, type, name, signature)
 select endpoint.asNode(),
-  message + "\nrelated locations: $@, $@, $@." +
-    "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@, $@.", //
+  "related locations: $@, $@, $@." + "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@, $@.", //
   CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, CallContext()), "CallContext", //
   CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, MethodDoc()), "MethodDoc", //
   CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, ClassDoc()), "ClassDoc", //

java/ql/automodel/src/AutomodelFrameworkModeExtractCandidates.ql

@@ -16,7 +16,7 @@ private import AutomodelFrameworkModeCharacteristics
 private import AutomodelJavaUtil
 
 from
-  Endpoint endpoint, string message, FrameworkModeMetadataExtractor meta, DollarAtString package,
+  Endpoint endpoint, FrameworkModeMetadataExtractor meta, DollarAtString package,
   DollarAtString type, DollarAtString subtypes, DollarAtString name, DollarAtString signature,
   DollarAtString input, DollarAtString output, DollarAtString parameterName,
   DollarAtString alreadyAiModeled, DollarAtString extensibleType
@@ -25,6 +25,7 @@ where
   not exists(CharacteristicsImpl::UninterestingToModelCharacteristic u |
     u.appliesToEndpoint(endpoint)
   ) and
+  CharacteristicsImpl::isSinkCandidate(endpoint, _) and
   // If a node is already a known sink for any of our existing ATM queries and is already modeled as a MaD sink, we
   // don't include it as a candidate. Otherwise, we might include it as a candidate for query A, but the model will
   // label it as a sink for one of the sink types of query B, for which it's already a known sink. This would result in
@@ -37,18 +38,9 @@ where
     CharacteristicsImpl::isSink(endpoint, _, alreadyAiModeled)
   ) and
   meta.hasMetadata(endpoint, package, type, subtypes, name, signature, input, output, parameterName) and
-  includeAutomodelCandidate(package, type, name, signature) and
-  // The message is the concatenation of all sink types for which this endpoint is known neither to be a sink nor to be
-  // a non-sink, and we surface only endpoints that have at least one such sink type.
-  message =
-    strictconcat(AutomodelEndpointTypes::SinkType sinkType |
-      not CharacteristicsImpl::isKnownAs(endpoint, sinkType, _) and
-      CharacteristicsImpl::isSinkCandidate(endpoint, sinkType)
-    |
-      sinkType, ", "
-    )
+  includeAutomodelCandidate(package, type, name, signature)
 select endpoint,
-  message + "\nrelated locations: $@, $@." + "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@.", //
+  "Related locations: $@, $@." + "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@, $@.", //
   CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, MethodDoc()), "MethodDoc", //
   CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, ClassDoc()), "ClassDoc", //
   package, "package", //