Fix more compilation problems

neo4j · Sep 14, 2016 · 36e7647 · 36e7647
1 parent c549cd2
commit 36e7647
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/community/security/src/test/java/org/neo4j/server/security/auth/FileUserRepositoryTest.java b/community/security/src/test/java/org/neo4j/server/security/auth/FileUserRepositoryTest.java
@@ -37,7 +37,7 @@
 import org.neo4j.graphdb.mockfs.DelegatingFileSystemAbstraction;
 import org.neo4j.io.fs.DelegateFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
-import org.neo4j.kernel.api.security.exception.InvalidArgumentsException;
+import org.neo4j.kernel.api.exceptions.InvalidArgumentsException;
 import org.neo4j.logging.AssertableLogProvider;
 import org.neo4j.logging.LogProvider;
 import org.neo4j.logging.NullLogProvider;

diff --git a/...rise/security/src/main/java/org/neo4j/server/security/enterprise/auth/AuthProcedures.java b/...rise/security/src/main/java/org/neo4j/server/security/enterprise/auth/AuthProcedures.java
@@ -403,7 +403,7 @@ public void deleteRole( @Name( "roleName" ) String roleName )
 
     // ----------------- helpers ---------------------
 
-    private void terminateTransactionsForValidUser( String username )
+    protected void terminateTransactionsForValidUser( String username )
     {
         getActiveTransactions()
                 .stream()
@@ -413,7 +413,7 @@ private void terminateTransactionsForValidUser( String username )
                 ).forEach( tx -> tx.markForTermination( Status.Transaction.Terminated ) );
     }
 
-    private void terminateConnectionsForValidUser( String username )
+    protected void terminateConnectionsForValidUser( String username )
     {
         getBoltConnectionTracker().getActiveConnections( username ).forEach( ManagedBoltStateMachine::terminate );
     }

diff --git a/...ty/src/test/java/org/neo4j/server/security/enterprise/auth/AuthProceduresLoggingTest.java b/...ty/src/test/java/org/neo4j/server/security/enterprise/auth/AuthProceduresLoggingTest.java
@@ -24,12 +24,11 @@
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.stream.Stream;
 
 import org.neo4j.function.ThrowingAction;
 import org.neo4j.graphdb.security.AuthorizationViolationException;
+import org.neo4j.kernel.api.exceptions.InvalidArgumentsException;
 import org.neo4j.kernel.api.security.AuthSubject;
-import org.neo4j.kernel.api.security.exception.InvalidArgumentsException;
 import org.neo4j.kernel.impl.enterprise.SecurityLog;
 import org.neo4j.kernel.impl.util.JobScheduler;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
@@ -39,8 +38,8 @@
 import org.neo4j.server.security.auth.InMemoryUserRepository;
 
 import static org.mockito.Mockito.mock;
+import static org.neo4j.graphdb.security.AuthorizationViolationException.PERMISSION_DENIED;
 import static org.neo4j.logging.AssertableLogProvider.inLog;
-import static org.neo4j.server.security.enterprise.auth.AuthProcedures.PERMISSION_DENIED;
 import static org.neo4j.server.security.enterprise.auth.PredefinedRolesBuilder.ADMIN;
 import static org.neo4j.server.security.enterprise.auth.PredefinedRolesBuilder.ARCHITECT;
 import static org.neo4j.server.security.enterprise.auth.PredefinedRolesBuilder.READER;
@@ -656,7 +655,7 @@ public EnterpriseUserManager getUserManager()
         }
 
         @Override
-        public boolean doesUsernameMatch( String username )
+        public boolean hasUsername( String username )
         {
             return name.equals( username );
         }
@@ -689,19 +688,17 @@ void failTerminateTransaction()
         }
 
         @Override
-        Stream<TransactionTerminationResult> terminateTransactionsForValidUser( String username )
+        protected void terminateTransactionsForValidUser( String username )
         {
             if ( failTerminateTransactions )
             {
                 throw new RuntimeException( "Unexpected error" );
             }
-            return Stream.empty();
         }
 
         @Override
-        Stream<ConnectionResult> terminateConnectionsForValidUser( String username )
+        protected void terminateConnectionsForValidUser( String username )
         {
-            return Stream.empty();
         }
     }
 

diff --git a/...urity/src/test/java/org/neo4j/server/security/enterprise/auth/FileRoleRepositoryTest.java b/...urity/src/test/java/org/neo4j/server/security/enterprise/auth/FileRoleRepositoryTest.java
@@ -37,7 +37,7 @@
 import org.neo4j.graphdb.mockfs.DelegatingFileSystemAbstraction;
 import org.neo4j.io.fs.DelegateFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
-import org.neo4j.kernel.api.security.exception.InvalidArgumentsException;
+import org.neo4j.kernel.api.exceptions.InvalidArgumentsException;
 import org.neo4j.logging.AssertableLogProvider;
 import org.neo4j.logging.LogProvider;
 import org.neo4j.logging.NullLogProvider;