When checking whether an endpoint has already been modelled, make sure to take the extensibleType into account.

Author: Max Schaefer

java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll

@@ -377,9 +377,9 @@ class ApplicationModeMetadataExtractor extends string {
       extensibleType = e.getExtensibleType()
     ) and
     (
-      not CharacteristicsImpl::isModeled(e, _, _, _) and alreadyAiModeled = ""
+      not CharacteristicsImpl::isModeled(e, _, extensibleType, _) and alreadyAiModeled = ""
       or
-      CharacteristicsImpl::isModeled(e, _, _, alreadyAiModeled)
+      CharacteristicsImpl::isModeled(e, _, extensibleType, alreadyAiModeled)
     )
   }
 }

java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll

@@ -322,9 +322,9 @@ class FrameworkModeMetadataExtractor extends string {
       e.getExtensibleType() = extensibleType
     ) and
     (
-      not CharacteristicsImpl::isModeled(e, _, _, _) and alreadyAiModeled = ""
+      not CharacteristicsImpl::isModeled(e, _, extensibleType, _) and alreadyAiModeled = ""
       or
-      CharacteristicsImpl::isModeled(e, _, _, alreadyAiModeled)
+      CharacteristicsImpl::isModeled(e, _, extensibleType, alreadyAiModeled)
     )
   }
 }