diff --git a/java/ql/src/semmle/code/java/security/JndiInjection.qll b/java/ql/src/semmle/code/java/security/JndiInjection.qll
index 89f4aa22dc3..dc5585dd648 100644
--- a/java/ql/src/semmle/code/java/security/JndiInjection.qll
+++ b/java/ql/src/semmle/code/java/security/JndiInjection.qll
@@ -108,14 +108,14 @@ private class DefaultJndiInjectionSinkModel extends SinkModelCsv {
         "org.springframework.ldap.core;LdapOperations;true;rename;;;Argument[0];jndi-injection",
         "org.springframework.ldap.core;LdapOperations;true;list;;;Argument[0];jndi-injection",
         "org.springframework.ldap.core;LdapOperations;true;listBindings;;;Argument[0];jndi-injection",
-        "org.springframework.ldap.core;LdapOperations;true;search;(Name,String,ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap.core;LdapOperations;true;search;(Name,String,int,ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap.core;LdapOperations;true;search;(Name,String,int,String[],ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap.core;LdapOperations;true;search;(String,String,ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap.core;LdapOperations;true;search;(String,String,int,ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap.core;LdapOperations;true;search;(String,String,int,String[],ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap.core;LdapOperations;true;searchForObject;(Name,String,ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap.core;LdapOperations;true;searchForObject;(String,String,ContextMapper<T>);;Argument[0];jndi-injection",
+        "org.springframework.ldap.core;LdapOperations;true;search;(Name,String,ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap.core;LdapOperations;true;search;(Name,String,int,ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap.core;LdapOperations;true;search;(Name,String,int,String[],ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap.core;LdapOperations;true;search;(String,String,ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap.core;LdapOperations;true;search;(String,String,int,ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap.core;LdapOperations;true;search;(String,String,int,String[],ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap.core;LdapOperations;true;searchForObject;(Name,String,ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap.core;LdapOperations;true;searchForObject;(String,String,ContextMapper);;Argument[0];jndi-injection",
         // spring-ldap 1.1.x
         "org.springframework.ldap;LdapOperations;true;lookup;;;Argument[0];jndi-injection",
         "org.springframework.ldap;LdapOperations;true;lookupContext;;;Argument[0];jndi-injection",
@@ -123,14 +123,14 @@ private class DefaultJndiInjectionSinkModel extends SinkModelCsv {
         "org.springframework.ldap;LdapOperations;true;rename;;;Argument[0];jndi-injection",
         "org.springframework.ldap;LdapOperations;true;list;;;Argument[0];jndi-injection",
         "org.springframework.ldap;LdapOperations;true;listBindings;;;Argument[0];jndi-injection",
-        "org.springframework.ldap;LdapOperations;true;search;(Name,String,ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap;LdapOperations;true;search;(Name,String,int,ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap;LdapOperations;true;search;(Name,String,int,String[],ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap;LdapOperations;true;search;(String,String,ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap;LdapOperations;true;search;(String,String,int,ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap;LdapOperations;true;search;(String,String,int,String[],ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap;LdapOperations;true;searchForObject;(Name,String,ContextMapper<T>);;Argument[0];jndi-injection",
-        "org.springframework.ldap;LdapOperations;true;searchForObject;(String,String,ContextMapper<T>);;Argument[0];jndi-injection",
+        "org.springframework.ldap;LdapOperations;true;search;(Name,String,ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap;LdapOperations;true;search;(Name,String,int,ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap;LdapOperations;true;search;(Name,String,int,String[],ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap;LdapOperations;true;search;(String,String,ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap;LdapOperations;true;search;(String,String,int,ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap;LdapOperations;true;search;(String,String,int,String[],ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap;LdapOperations;true;searchForObject;(Name,String,ContextMapper);;Argument[0];jndi-injection",
+        "org.springframework.ldap;LdapOperations;true;searchForObject;(String,String,ContextMapper);;Argument[0];jndi-injection",
         // Shiro
         "org.apache.shiro.jndi;JndiTemplate;false;lookup;;;Argument[0];jndi-injection"
       ]