From 2577d1fc3f7f0c3abb9dc1cdc008de978adcd6f8 Mon Sep 17 00:00:00 2001
From: Mats Rydberg <mats@neotechnology.com>
Date: Thu, 25 Aug 2016 15:25:42 +0200
Subject: [PATCH] Rename `RestrictedAccessMode` to `OverriddenAccessMode`

---
 .../api/KernelTransactionImplementation.java  |  4 +--
 ...essMode.java => OverriddenAccessMode.java} | 28 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)
 rename community/kernel/src/main/java/org/neo4j/kernel/impl/api/security/{RestrictedAccessMode.java => OverriddenAccessMode.java} (65%)

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java
index f12b325c16cdf..4d0bae00d829e 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java
+++ b/community/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/community/kernel/src/main/java/org/neo4j/kernel/impl/api/security/RestrictedAccessMode.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/security/OverriddenAccessMode.java
similarity index 65%
rename from community/kernel/src/main/java/org/neo4j/kernel/impl/api/security/RestrictedAccessMode.java
rename to community/kernel/src/main/java/org/neo4j/kernel/impl/api/security/OverriddenAccessMode.java
index 78d23b53a8910..03f244c657be1 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/security/RestrictedAccessMode.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/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() &&
-               (restrictedMode.overrideOriginalMode() || originalMode.allowsReads());
+        return overriddenMode.allowsReads() &&
+               (overriddenMode.overrideOriginalMode() || originalMode.allowsReads());
     }
 
     @Override
     public boolean allowsWrites()
     {
-        return restrictedMode.allowsWrites() &&
-               (restrictedMode.overrideOriginalMode() || originalMode.allowsWrites());
+        return overriddenMode.allowsWrites() &&
+               (overriddenMode.overrideOriginalMode() || originalMode.allowsWrites());
     }
 
     @Override
     public boolean allowsSchemaWrites()
     {
-        return restrictedMode.allowsSchemaWrites() &&
-               (restrictedMode.overrideOriginalMode() || originalMode.allowsSchemaWrites());
+        return overriddenMode.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();
         }
     }
 }