tokenLookup -> propertyIdLookup

neo4j · Mar 2, 2018 · f73321a · f73321a
1 parent 349a4dc
commit f73321a
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/security/LoginContext.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/security/LoginContext.java
@@ -36,10 +36,10 @@ public interface LoginContext
     /**
      * Authorize the user and return a SecurityContext.
      *
-     * @param tokenLookup token lookup, used to compile property level security verification
+     * @param propertyIdLookup token lookup, used to compile property level security verification
      * @return the security context
      */
-    SecurityContext authorize( Function<String, Integer> tokenLookup );
+    SecurityContext authorize( Function<String, Integer> propertyIdLookup );
 
     LoginContext AUTH_DISABLED = new LoginContext()
     {
@@ -50,7 +50,7 @@ public AuthSubject subject()
         }
 
         @Override
-        public SecurityContext authorize( Function<String, Integer> tokenLookup )
+        public SecurityContext authorize( Function<String, Integer> propertyIdLookup )
         {
             return SecurityContext.AUTH_DISABLED;
         }

diff --git a/...nity/kernel-api/src/main/java/org/neo4j/internal/kernel/api/security/SecurityContext.java b/...nity/kernel-api/src/main/java/org/neo4j/internal/kernel/api/security/SecurityContext.java
@@ -62,7 +62,7 @@ public AuthSubject subject()
     }
 
     @Override
-    public SecurityContext authorize( Function<String, Integer> tokenLookup )
+    public SecurityContext authorize( Function<String, Integer> propertyIdLookup )
     {
         return this;
     }

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/security/AnonymousContext.java b/community/kernel/src/main/java/org/neo4j/kernel/api/security/AnonymousContext.java
@@ -68,7 +68,7 @@ public AuthSubject subject()
     }
 
     @Override
-    public SecurityContext authorize( Function<String, Integer> tokenLookup )
+    public SecurityContext authorize( Function<String, Integer> propertyIdLookup )
     {
         return new SecurityContext( subject(), accessMode );
     }

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TransactionEventsIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TransactionEventsIT.java
@@ -197,7 +197,7 @@ public AuthSubject subject()
             }
 
             @Override
-            public SecurityContext authorize( Function<String,Integer> tokenLookup )
+            public SecurityContext authorize( Function<String,Integer> propertyIdLookup )
             {
                 return new SecurityContext( subject, AccessMode.Static.WRITE );
             }

diff --git a/community/security/src/main/java/org/neo4j/server/security/auth/BasicLoginContext.java b/community/security/src/main/java/org/neo4j/server/security/auth/BasicLoginContext.java
@@ -108,7 +108,7 @@ public AuthSubject subject()
     }
 
     @Override
-    public SecurityContext authorize( Function<String, Integer> tokenLookup )
+    public SecurityContext authorize( Function<String, Integer> propertyIdLookup )
     {
         return new SecurityContext( authSubject, accessMode );
     }

diff --git a/...kernel/src/main/java/org/neo4j/kernel/enterprise/api/security/EnterpriseLoginContext.java b/...kernel/src/main/java/org/neo4j/kernel/enterprise/api/security/EnterpriseLoginContext.java
@@ -30,7 +30,7 @@ public interface EnterpriseLoginContext extends LoginContext
 {
     Set<String> roles();
 
-    EnterpriseSecurityContext authorize( Function<String, Integer> tokenLookup );
+    EnterpriseSecurityContext authorize( Function<String, Integer> propertyIdLookup );
 
     EnterpriseLoginContext AUTH_DISABLED = new EnterpriseLoginContext()
     {
@@ -47,7 +47,7 @@ public Set<String> roles()
         }
 
         @Override
-        public EnterpriseSecurityContext authorize( Function<String, Integer> tokenLookup )
+        public EnterpriseSecurityContext authorize( Function<String, Integer> propertyIdLookup )
         {
             return EnterpriseSecurityContext.AUTH_DISABLED;
         }

diff --git a/...nel/src/main/java/org/neo4j/kernel/enterprise/api/security/EnterpriseSecurityContext.java b/...nel/src/main/java/org/neo4j/kernel/enterprise/api/security/EnterpriseSecurityContext.java
@@ -49,7 +49,7 @@ public boolean isAdmin()
     }
 
     @Override
-    public EnterpriseSecurityContext authorize( Function<String, Integer> tokenLookup )
+    public EnterpriseSecurityContext authorize( Function<String, Integer> propertyIdLookup )
     {
         return this;
     }

diff --git a/...c/main/java/org/neo4j/server/security/enterprise/auth/StandardEnterpriseLoginContext.java b/...c/main/java/org/neo4j/server/security/enterprise/auth/StandardEnterpriseLoginContext.java
@@ -81,9 +81,9 @@ private StandardAccessMode mode( Function<String, Integer> tokenLookup )
     }
 
     @Override
-    public EnterpriseSecurityContext authorize( Function<String, Integer> tokenLookup )
+    public EnterpriseSecurityContext authorize( Function<String, Integer> propertyIdLookup )
     {
-        StandardAccessMode mode = mode( tokenLookup );
+        StandardAccessMode mode = mode( propertyIdLookup );
         return new EnterpriseSecurityContext( neoShiroSubject, mode, mode.roles, isAdmin() );
     }
 

diff --git a/...ava/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionIT.java b/...ava/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionIT.java
@@ -114,7 +114,7 @@ private EnterpriseLoginContext createFakeAnonymousEnterpriseLoginContext()
         return new EnterpriseLoginContext()
         {
             @Override
-            public EnterpriseSecurityContext authorize( Function<String, Integer> tokenLookup )
+            public EnterpriseSecurityContext authorize( Function<String, Integer> propertyIdLookup )
             {
                 return new EnterpriseSecurityContext( subject(), inner.mode(), Collections.emptySet(), false );
             }