Rename RestrictedAccessMode to OverriddenAccessMode

neo4j · Aug 31, 2016 · 2577d1f · 2577d1f
1 parent 284b2ea
commit 2577d1f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java b/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java
@@ -44,7 +44,7 @@
 import org.neo4j.kernel.api.txstate.LegacyIndexTransactionState;
 import org.neo4j.kernel.api.txstate.TransactionState;
 import org.neo4j.kernel.api.txstate.TxStateHolder;
-import org.neo4j.kernel.impl.api.security.RestrictedAccessMode;
+import org.neo4j.kernel.impl.api.security.OverriddenAccessMode;
 import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator;
 import org.neo4j.kernel.impl.api.state.TxState;
 import org.neo4j.kernel.impl.locking.Locks;
@@ -766,7 +766,7 @@ public long getCommitTime()
     public Revertable restrict( AccessMode mode )
     {
         AccessMode oldMode = this.accessMode;
-        this.accessMode = new RestrictedAccessMode( oldMode, mode );
+        this.accessMode = new OverriddenAccessMode( oldMode, mode );
         return () -> this.accessMode = oldMode;
     }
 

diff --git a/...pl/api/security/RestrictedAccessMode.java → ...pl/api/security/OverriddenAccessMode.java b/...pl/api/security/RestrictedAccessMode.java → ...pl/api/security/OverriddenAccessMode.java
@@ -22,36 +22,36 @@
 import org.neo4j.graphdb.security.AuthorizationViolationException;
 import org.neo4j.kernel.api.security.AccessMode;
 
-public class RestrictedAccessMode implements AccessMode
+public class OverriddenAccessMode implements AccessMode
 {
     private final AccessMode originalMode;
-    private final AccessMode restrictedMode;
+    private final AccessMode overriddenMode;
 
-    public RestrictedAccessMode( AccessMode originalMode, AccessMode restrictedMode )
+    public OverriddenAccessMode( AccessMode originalMode, AccessMode overriddenMode )
     {
         this.originalMode = originalMode;
-        this.restrictedMode = restrictedMode;
+        this.overriddenMode = overriddenMode;
     }
 
     @Override
     public boolean allowsReads()
     {
-        return restrictedMode.allowsReads() &&
+        return overriddenMode.allowsReads() &&
-               (restrictedMode.overrideOriginalMode() || originalMode.allowsReads());
+               (overriddenMode.overrideOriginalMode() || originalMode.allowsReads());
     }
 
     @Override
     public boolean allowsWrites()
     {
-        return restrictedMode.allowsWrites() &&
+        return overriddenMode.allowsWrites() &&
-               (restrictedMode.overrideOriginalMode() || originalMode.allowsWrites());
+               (overriddenMode.overrideOriginalMode() || originalMode.allowsWrites());
     }
 
     @Override
     public boolean allowsSchemaWrites()
     {
-        return restrictedMode.allowsSchemaWrites() &&
+        return overriddenMode.allowsSchemaWrites() &&
-               (restrictedMode.overrideOriginalMode() || originalMode.allowsSchemaWrites());
+               (overriddenMode.overrideOriginalMode() || originalMode.allowsSchemaWrites());
     }
 
     @Override
@@ -63,19 +63,19 @@ public boolean overrideOriginalMode()
     @Override
     public AuthorizationViolationException onViolation( String msg )
     {
-        return restrictedMode.onViolation( msg );
+        return overriddenMode.onViolation( msg );
     }
 
     @Override
     public String name()
     {
-        if ( restrictedMode.overrideOriginalMode() )
+        if ( overriddenMode.overrideOriginalMode() )
         {
-            return originalMode.name() + " overridden by " + restrictedMode.name();
+            return originalMode.name() + " overridden by " + overriddenMode.name();
         }
         else
         {
-            return originalMode.name() + " restricted to " + restrictedMode.name();
+            return originalMode.name() + " restricted to " + overriddenMode.name();
         }
     }
 }