From 128918f990615f5097d8e113c7a7258a22f78754 Mon Sep 17 00:00:00 2001 From: Pontus Melke Date: Mon, 26 Feb 2018 13:11:16 +0100 Subject: [PATCH] Revert Token extends NamedToken Having Token extend the public NamedToken introduced a massive change for a tiny bit of performance that is most probably not needed there. --- .../neo4j/internal/kernel/api/NamedToken.java | 48 +++++++++++++++++-- .../org/neo4j/kernel/api/ReadOperations.java | 8 ++-- .../builtinprocs/BuiltInProcedures.java | 6 +-- .../kernel/impl/api/OperationsFacade.java | 8 ++-- .../api/StateHandlingStatementOperations.java | 8 ++-- .../api/operations/KeyReadOperations.java | 8 ++-- .../kernel/impl/api/store/StorageLayer.java | 8 ++-- .../kernel/impl/core/InMemoryTokenCache.java | 2 +- .../kernel/impl/core/LabelTokenHolder.java | 4 +- .../impl/core/PropertyKeyTokenHolder.java | 4 +- .../neo4j/kernel/impl/core/TokenHolder.java | 4 +- .../neo4j/kernel/impl/newapi/KernelToken.java | 10 ++-- .../storageengine/api/StoreReadLayer.java | 7 ++- .../org/neo4j/storageengine/api/Token.java | 3 +- .../builtinprocs/StubKernelTransaction.java | 7 +++ .../KernelTransactionImplementationTest.java | 10 ++-- .../api/KernelTransactionTerminationTest.java | 3 +- .../impl/api/KernelTransactionTestBase.java | 6 +-- .../ConstraintIndexCreatorTest.java | 7 +++ .../integrationtest/BuiltInProceduresIT.java | 4 +- .../TxStateTransactionDataViewTest.java | 3 +- .../impl/newapi/KernelTokenArgumentTest.java | 3 +- .../impl/newapi/OperationsLockTest.java | 2 +- .../security/auth/AuthProceduresTest.java | 6 +-- .../auth/SecurityContextDescriptionTest.java | 4 +- .../server/database/CypherExecutorTest.java | 3 +- .../security/EnterpriseSecurityContext.java | 4 +- .../builtinprocs/StubKernelTransaction.java | 7 +++ ...mbeddedBuiltInProceduresInteractionIT.java | 2 +- ...erpriseSecurityContextDescriptionTest.java | 6 +-- .../auth/InternalFlatFileRealmTest.java | 5 +- .../enterprise/auth/LdapCachingTest.java | 6 +-- .../auth/MultiRealmAuthManagerTest.java | 5 +- 33 files changed, 135 insertions(+), 86 deletions(-) diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/NamedToken.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/NamedToken.java index ab5ce7787c315..73a77ef4e8e94 100644 --- a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/NamedToken.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/NamedToken.java @@ -22,17 +22,59 @@ /** * A token with its associated name. */ -public interface NamedToken +public final class NamedToken { + private final int id; + private final String name; + + public NamedToken( int id, String name ) + { + this.id = id; + this.name = name; + } + /** * Id of token + * * @return the id of the token */ - int id(); + public int id() + { + return id; + } /** * The name associated with the token + * * @return The name corresponding to the token */ - String name(); + public String name() + { + return name; + } + + @Override + public boolean equals( Object o ) + { + if ( this == o ) + { + return true; + } + if ( o == null || getClass() != o.getClass() ) + { + return false; + } + + NamedToken that = (NamedToken) o; + + return id == that.id && name.equals( that.name ); + } + + @Override + public int hashCode() + { + int result = id; + result = 31 * result + name.hashCode(); + return result; + } } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java index 3a192d481f657..94c8fc00a0a79 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java @@ -32,7 +32,6 @@ import org.neo4j.graphdb.Direction; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.InternalIndexState; -import org.neo4j.internal.kernel.api.NamedToken; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; @@ -58,6 +57,7 @@ import org.neo4j.storageengine.api.NodeItem; import org.neo4j.storageengine.api.PropertyItem; import org.neo4j.storageengine.api.RelationshipItem; +import org.neo4j.storageengine.api.Token; import org.neo4j.storageengine.api.lock.ResourceType; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.values.storable.Value; @@ -82,7 +82,7 @@ public interface ReadOperations String labelGetName( int labelId ) throws LabelNotFoundKernelException; /** Returns the labels currently stored in the database * */ - Iterator labelsGetAllTokens(); + Iterator labelsGetAllTokens(); /** * Returns a property key id for the given property key. If the property key doesn't exist, * {@link StatementConstants#NO_SUCH_PROPERTY_KEY} will be returned. @@ -93,14 +93,14 @@ public interface ReadOperations String propertyKeyGetName( int propertyKeyId ) throws PropertyKeyIdNotFoundKernelException; /** Returns the property keys currently stored in the database */ - Iterator propertyKeyGetAllTokens(); + Iterator propertyKeyGetAllTokens(); int relationshipTypeGetForName( String relationshipTypeName ); String relationshipTypeGetName( int relationshipTypeId ) throws RelationshipTypeIdNotFoundKernelException; /** Returns the relationship types currently stored in the database */ - Iterator relationshipTypesGetAllTokens(); + Iterator relationshipTypesGetAllTokens(); int labelCount(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java index fee1e8489275b..5ed347dcedaaf 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/BuiltInProcedures.java @@ -87,7 +87,7 @@ public Stream listLabels() { // Ownership of the reference to the acquired statement is transfered to the returned iterator stream, // but we still want to eagerly consume the labels, so we can catch any exceptions, - List labelResults = asList( TokenAccess.LABELS.inUse( statement ).map( LabelResult::new ) ); + List labelResults = asList( TokenAccess.LABELS.inUse( tx ).map( LabelResult::new ) ); return labelResults.stream(); } catch ( Throwable t ) @@ -107,7 +107,7 @@ public Stream listPropertyKeys() // Ownership of the reference to the acquired statement is transfered to the returned iterator stream, // but we still want to eagerly consume the labels, so we can catch any exceptions, List propertyKeys = - asList( TokenAccess.PROPERTY_KEYS.inUse( statement ).map( PropertyKeyResult::new ) ); + asList( TokenAccess.PROPERTY_KEYS.inUse( tx ).map( PropertyKeyResult::new ) ); return propertyKeys.stream(); } catch ( Throwable t ) @@ -127,7 +127,7 @@ public Stream listRelationshipTypes() // Ownership of the reference to the acquired statement is transfered to the returned iterator stream, // but we still want to eagerly consume the labels, so we can catch any exceptions, List relationshipTypes = - asList( TokenAccess.RELATIONSHIP_TYPES.inUse( statement ).map( RelationshipTypeResult::new ) ); + asList( TokenAccess.RELATIONSHIP_TYPES.inUse( tx ).map( RelationshipTypeResult::new ) ); return relationshipTypes.stream(); } catch ( Throwable t ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java index 5e9b019bdeadc..871024866254c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java @@ -36,7 +36,6 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.InternalIndexState; -import org.neo4j.internal.kernel.api.NamedToken; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; import org.neo4j.internal.kernel.api.exceptions.KernelException; @@ -110,6 +109,7 @@ import org.neo4j.storageengine.api.NodeItem; import org.neo4j.storageengine.api.PropertyItem; import org.neo4j.storageengine.api.RelationshipItem; +import org.neo4j.storageengine.api.Token; import org.neo4j.storageengine.api.lock.ResourceType; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.storageengine.api.schema.SchemaRule; @@ -687,7 +687,7 @@ public String propertyKeyGetName( int propertyKeyId ) throws PropertyKeyIdNotFou } @Override - public Iterator propertyKeyGetAllTokens() + public Iterator propertyKeyGetAllTokens() { statement.assertOpen(); AccessMode mode = tx.securityContext().mode(); @@ -696,14 +696,14 @@ public Iterator propertyKeyGetAllTokens() } @Override - public Iterator labelsGetAllTokens() + public Iterator labelsGetAllTokens() { statement.assertOpen(); return tokenRead().labelsGetAllTokens( statement ); } @Override - public Iterator relationshipTypesGetAllTokens() + public Iterator relationshipTypesGetAllTokens() { statement.assertOpen(); return tokenRead().relationshipTypesGetAllTokens( statement ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java index 4f8a7992b836f..d9394eae5002f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java @@ -32,7 +32,6 @@ import org.neo4j.graphdb.NotFoundException; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.InternalIndexState; -import org.neo4j.internal.kernel.api.NamedToken; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException; @@ -93,6 +92,7 @@ import org.neo4j.storageengine.api.StorageProperty; import org.neo4j.storageengine.api.StorageStatement; import org.neo4j.storageengine.api.StoreReadLayer; +import org.neo4j.storageengine.api.Token; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.storageengine.api.txstate.NodeState; @@ -1373,19 +1373,19 @@ public String propertyKeyGetName( Statement state, int propertyKeyId ) throws Pr } @Override - public Iterator propertyKeyGetAllTokens( Statement state ) + public Iterator propertyKeyGetAllTokens( Statement state ) { return storeLayer.propertyKeyGetAllTokens(); } @Override - public Iterator labelsGetAllTokens( Statement state ) + public Iterator labelsGetAllTokens( Statement state ) { return storeLayer.labelsGetAllTokens(); } @Override - public Iterator relationshipTypesGetAllTokens( Statement state ) + public Iterator relationshipTypesGetAllTokens( Statement state ) { return storeLayer.relationshipTypeGetAllTokens(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyReadOperations.java index 242d062fbc847..21bc5e60c2ec0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyReadOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyReadOperations.java @@ -21,13 +21,13 @@ import java.util.Iterator; -import org.neo4j.internal.kernel.api.NamedToken; import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementConstants; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.impl.api.KernelStatement; +import org.neo4j.storageengine.api.Token; public interface KeyReadOperations { @@ -51,13 +51,13 @@ public interface KeyReadOperations String propertyKeyGetName( Statement state, int propertyKeyId ) throws PropertyKeyIdNotFoundKernelException; /** Returns the property keys currently stored in the database */ - Iterator propertyKeyGetAllTokens( Statement state ); + Iterator propertyKeyGetAllTokens( Statement state ); /** Returns the labels currently stored in the database **/ - Iterator labelsGetAllTokens( Statement state ); + Iterator labelsGetAllTokens( Statement state ); /** Returns the relationship types currently stored in the database */ - Iterator relationshipTypesGetAllTokens( Statement state ); + Iterator relationshipTypesGetAllTokens( Statement state ); int relationshipTypeGetForName( Statement state, String relationshipTypeName ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java index 1660370c815f8..87f41f6e1f782 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java @@ -33,7 +33,6 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.internal.kernel.api.InternalIndexState; -import org.neo4j.internal.kernel.api.NamedToken; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; @@ -81,6 +80,7 @@ import org.neo4j.storageengine.api.StorageProperty; import org.neo4j.storageengine.api.StorageStatement; import org.neo4j.storageengine.api.StoreReadLayer; +import org.neo4j.storageengine.api.Token; import org.neo4j.storageengine.api.schema.PopulationProgress; import org.neo4j.storageengine.api.schema.SchemaRule; @@ -348,20 +348,20 @@ public Iterator graphGetAllProperties() } @Override - public Iterator propertyKeyGetAllTokens() + public Iterator propertyKeyGetAllTokens() { return propertyKeyTokenHolder.getAllTokens().iterator(); } @Override - public Iterator labelsGetAllTokens() + public Iterator labelsGetAllTokens() { return labelTokenHolder.getAllTokens().iterator(); } @SuppressWarnings( "unchecked" ) @Override - public Iterator relationshipTypeGetAllTokens() + public Iterator relationshipTypeGetAllTokens() { return (Iterator) relationshipTokenHolder.getAllTokens().iterator(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/InMemoryTokenCache.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/InMemoryTokenCache.java index 96e02edc45f09..c20fbf227ff80 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/InMemoryTokenCache.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/InMemoryTokenCache.java @@ -54,7 +54,7 @@ public void clear() idToToken.clear(); } - private void putAndEnsureUnique( Map nameToId, Token token, String tokenType ) + private void putAndEnsureUnique( Map nameToId, TOKEN token, String tokenType ) { Integer previous = nameToId.putIfAbsent( token.name(), token.id() ); if ( previous != null && previous != token.id() ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/LabelTokenHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/LabelTokenHolder.java index a98330135b3e1..e1db306c34301 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/LabelTokenHolder.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/LabelTokenHolder.java @@ -19,8 +19,8 @@ */ package org.neo4j.kernel.impl.core; -import org.neo4j.internal.kernel.api.NamedToken; +import org.neo4j.storageengine.api.Token; -public interface LabelTokenHolder extends TokenHolder +public interface LabelTokenHolder extends TokenHolder { } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/PropertyKeyTokenHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/PropertyKeyTokenHolder.java index 94205f6595d6f..21b6672a4efbf 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/PropertyKeyTokenHolder.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/PropertyKeyTokenHolder.java @@ -19,8 +19,8 @@ */ package org.neo4j.kernel.impl.core; -import org.neo4j.internal.kernel.api.NamedToken; +import org.neo4j.storageengine.api.Token; -public interface PropertyKeyTokenHolder extends TokenHolder +public interface PropertyKeyTokenHolder extends TokenHolder { } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/TokenHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/TokenHolder.java index 7f5ebc5ef6f8d..43e9390b9e47a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/TokenHolder.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/TokenHolder.java @@ -21,9 +21,9 @@ import java.util.List; -import org.neo4j.internal.kernel.api.NamedToken; +import org.neo4j.storageengine.api.Token; -public interface TokenHolder +public interface TokenHolder { int NO_ID = -1; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/KernelToken.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/KernelToken.java index 5b1493d17d910..a1925cc2241a2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/KernelToken.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/KernelToken.java @@ -110,7 +110,7 @@ public String propertyKeyName( int propertyKeyId ) throws PropertyKeyIdNotFoundK public Iterator labelsGetAllTokens() { ktx.assertOpen(); - return store.labelsGetAllTokens(); + return Iterators.map( token -> new NamedToken( token.id(), token.name() ), store.labelsGetAllTokens()); } @Override @@ -118,15 +118,17 @@ public Iterator propertyKeyGetAllTokens() { ktx.assertOpen(); AccessMode mode = ktx.securityContext().mode(); - return Iterators.stream( store.propertyKeyGetAllTokens() ). - filter( propKey -> mode.allowsPropertyReads( propKey.id() ) ).iterator(); + return Iterators.stream( store.propertyKeyGetAllTokens() ) + .filter( propKey -> mode.allowsPropertyReads( propKey.id() ) ) + .map( token -> new NamedToken( token.id(), token.name() ) ) + .iterator(); } @Override public Iterator relationshipTypesGetAllTokens() { ktx.assertOpen(); - return store.relationshipTypeGetAllTokens(); + return Iterators.map( token -> new NamedToken( token.id(), token.name() ), store.relationshipTypeGetAllTokens()); } private String checkValidTokenName( String name ) throws IllegalTokenNameException diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java index 860bdf5cccf41..d68adfca185e7 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java @@ -30,7 +30,6 @@ import org.neo4j.cursor.Cursor; import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.internal.kernel.api.InternalIndexState; -import org.neo4j.internal.kernel.api.NamedToken; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; @@ -230,17 +229,17 @@ long indexGetCommittedId( IndexDescriptor index ) /** * @return all stored property key tokens. */ - Iterator propertyKeyGetAllTokens(); + Iterator propertyKeyGetAllTokens(); /** * @return all stored label tokens. */ - Iterator labelsGetAllTokens(); + Iterator labelsGetAllTokens(); /** * @return all stored relationship type tokens. */ - Iterator relationshipTypeGetAllTokens(); + Iterator relationshipTypeGetAllTokens(); /** * @param relationshipTypeName name of relationship type. diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/Token.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/Token.java index 7dcabc52d1bf9..2044a1ce8ea23 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/Token.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/Token.java @@ -19,9 +19,8 @@ */ package org.neo4j.storageengine.api; -import org.neo4j.internal.kernel.api.NamedToken; -public class Token implements NamedToken +public class Token { private final String name; private final int id; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/StubKernelTransaction.java b/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/StubKernelTransaction.java index 2d59e205bdefe..ec1f77923ddb3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/StubKernelTransaction.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/StubKernelTransaction.java @@ -31,6 +31,7 @@ import org.neo4j.internal.kernel.api.RelationshipScanCursor; import org.neo4j.internal.kernel.api.SchemaRead; import org.neo4j.internal.kernel.api.SchemaWrite; +import org.neo4j.internal.kernel.api.Token; import org.neo4j.internal.kernel.api.TokenRead; import org.neo4j.internal.kernel.api.TokenWrite; import org.neo4j.internal.kernel.api.Write; @@ -115,6 +116,12 @@ public TokenWrite tokenWrite() throw new UnsupportedOperationException( "not implemented" ); } + @Override + public Token token() + { + throw new UnsupportedOperationException( "not implemented" ); + } + @Override public SchemaRead schemaRead() { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java index 7238c8a4f775f..999268de8b6a8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java @@ -35,7 +35,6 @@ import java.util.function.Consumer; import org.neo4j.graphdb.TransactionTerminatedException; -import org.neo4j.internal.kernel.api.Token; import org.neo4j.internal.kernel.api.security.LoginContext; import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.io.pagecache.tracing.cursor.DefaultPageCursorTracer; @@ -450,7 +449,7 @@ public void shouldIncrementReuseCounterOnReuse() throws Exception transaction.close(); SimpleStatementLocks statementLocks = new SimpleStatementLocks( new NoOpClient() ); transaction.initialize( 1, BASE_TX_COMMIT_TIMESTAMP, statementLocks, KernelTransaction.Type.implicit, - loginContext().authorize( mock( Token.class ) ), 0L, 1L ); + loginContext().authorize( s -> -1 ), 0L, 1L ); // THEN assertEquals( reuseCount + 1, transaction.getReuseCount() ); @@ -671,7 +670,7 @@ public void markForTerminationWithCorrectReuseCount() throws Exception Locks.Client locksClient = mock( Locks.Client.class ); SimpleStatementLocks statementLocks = new SimpleStatementLocks( locksClient ); - tx.initialize( 42, 42, statementLocks, KernelTransaction.Type.implicit, loginContext().authorize( mock( Token.class ) ), 0L, 0L ); + tx.initialize( 42, 42, statementLocks, KernelTransaction.Type.implicit, loginContext().authorize( s -> -1 ), 0L, 0L ); assertTrue( tx.markForTermination( reuseCount, terminationReason ) ); @@ -691,7 +690,8 @@ public void markForTerminationWithIncorrectReuseCount() throws Exception Locks.Client locksClient = mock( Locks.Client.class ); SimpleStatementLocks statementLocks = new SimpleStatementLocks( locksClient ); - tx.initialize( 42, 42, statementLocks, KernelTransaction.Type.implicit, loginContext().authorize( mock( Token.class ) ), 0L, 0L ); + tx.initialize( 42, 42, statementLocks, KernelTransaction.Type.implicit, + loginContext().authorize( s -> -1 ), 0L, 0L ); assertFalse( tx.markForTermination( nextReuseCount, terminationReason ) ); @@ -758,7 +758,7 @@ private void initializeAndClose( KernelTransactionImplementation tx, int times ) for ( int i = 0; i < times; i++ ) { SimpleStatementLocks statementLocks = new SimpleStatementLocks( new NoOpClient() ); - tx.initialize( i + 10, i + 10, statementLocks, KernelTransaction.Type.implicit, loginContext().authorize( mock( Token.class ) ), 0L, 0L ); + tx.initialize( i + 10, i + 10, statementLocks, KernelTransaction.Type.implicit, loginContext().authorize( s -> -1 ), 0L, 0L ); tx.close(); } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java index e23177711d99d..2d6e36e1d315a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java @@ -45,7 +45,6 @@ import org.neo4j.kernel.impl.locking.NoOpClient; import org.neo4j.kernel.impl.locking.SimpleStatementLocks; import org.neo4j.kernel.impl.newapi.DefaultCursors; -import org.neo4j.kernel.impl.newapi.KernelToken; import org.neo4j.kernel.impl.proc.Procedures; import org.neo4j.kernel.impl.transaction.TransactionHeaderInformationFactory; import org.neo4j.kernel.impl.transaction.TransactionMonitor; @@ -346,7 +345,7 @@ private static class TestKernelTransaction extends KernelTransactionImplementati new AtomicReference<>( CpuClock.NOT_AVAILABLE ), new AtomicReference<>( HeapAllocation.NOT_AVAILABLE ), TransactionTracer.NULL, LockTracer.NONE, PageCursorTracerSupplier.NULL, - mock( StorageEngine.class, RETURNS_MOCKS ), new CanWrite(), mock( KernelToken.class ), + mock( StorageEngine.class, RETURNS_MOCKS ), new CanWrite(), mock( DefaultCursors.class ), AutoIndexing.UNSUPPORTED, mock( ExplicitIndexStore.class ), EmptyVersionContextSupplier.EMPTY ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java index f010c618c98a0..f8af6ab9d6964 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java @@ -27,7 +27,6 @@ import org.neo4j.collection.pool.Pool; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.internal.kernel.api.Token; import org.neo4j.internal.kernel.api.Transaction.Type; import org.neo4j.internal.kernel.api.security.LoginContext; import org.neo4j.internal.kernel.api.security.SecurityContext; @@ -44,7 +43,6 @@ import org.neo4j.kernel.impl.locking.SimpleStatementLocks; import org.neo4j.kernel.impl.locking.StatementLocks; import org.neo4j.kernel.impl.newapi.DefaultCursors; -import org.neo4j.kernel.impl.newapi.KernelToken; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.StoreStatement; import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.kernel.impl.store.NeoStores; @@ -144,7 +142,7 @@ public KernelTransactionImplementation newTransaction( long lastTransactionIdWhe { KernelTransactionImplementation tx = newNotInitializedTransaction(); StatementLocks statementLocks = new SimpleStatementLocks( locks ); - SecurityContext securityContext = loginContext.authorize( mock( Token.class ) ); + SecurityContext securityContext = loginContext.authorize( s -> -1 ); tx.initialize( lastTransactionIdWhenStarted, BASE_TX_COMMIT_TIMESTAMP,statementLocks, Type.implicit, securityContext, transactionTimeout, 1L ); return tx; @@ -155,7 +153,7 @@ public KernelTransactionImplementation newNotInitializedTransaction() return new KernelTransactionImplementation( statementOperations, schemaWriteGuard, hooks, null, null, headerInformationFactory, commitProcess, transactionMonitor, explicitIndexStateSupplier, txPool, clock, new AtomicReference<>( CpuClock.NOT_AVAILABLE ), new AtomicReference<>( HeapAllocation.NOT_AVAILABLE ), TransactionTracer.NULL, LockTracer.NONE, PageCursorTracerSupplier.NULL, storageEngine, - new CanWrite(), mock( KernelToken.class ), new DefaultCursors(), AutoIndexing.UNSUPPORTED, + new CanWrite(), new DefaultCursors(), AutoIndexing.UNSUPPORTED, mock( ExplicitIndexStore.class ), EmptyVersionContextSupplier.EMPTY ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java index f5be8ce4f3562..63126981f2ca2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java @@ -37,6 +37,7 @@ import org.neo4j.internal.kernel.api.SchemaRead; import org.neo4j.internal.kernel.api.SchemaWrite; import org.neo4j.internal.kernel.api.Session; +import org.neo4j.internal.kernel.api.Token; import org.neo4j.internal.kernel.api.TokenRead; import org.neo4j.internal.kernel.api.TokenWrite; import org.neo4j.internal.kernel.api.Write; @@ -449,6 +450,12 @@ public TokenWrite tokenWrite() throw new UnsupportedOperationException( "not implemented" ); } + @Override + public Token token() + { + throw new UnsupportedOperationException( "not implemented" ); + } + @Override public SchemaRead schemaRead() { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltInProceduresIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltInProceduresIT.java index 48d9fe21a763c..1e387c4a62c45 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltInProceduresIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltInProceduresIT.java @@ -31,7 +31,6 @@ import org.neo4j.collection.RawIterator; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.MapUtil; -import org.neo4j.internal.kernel.api.Token; import org.neo4j.kernel.api.ResourceTracker; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StubResourceManager; @@ -48,7 +47,6 @@ import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; import static org.neo4j.helpers.collection.Iterators.asList; import static org.neo4j.internal.kernel.api.security.LoginContext.AUTH_DISABLED; import static org.neo4j.kernel.api.proc.ProcedureSignature.procedureName; @@ -273,7 +271,7 @@ public void failWhenCallingNonExistingProcedures() { // When dbmsOperations().procedureCallDbms( procedureName( "dbms", "iDoNotExist" ), new Object[0], - AnonymousContext.none().authorize( mock( Token.class ) ), resourceTracker ); + AnonymousContext.none().authorize( s -> -1 ), resourceTracker ); fail( "This should never get here" ); } catch ( Exception e ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataViewTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataViewTest.java index cacecd7a5a2bb..8d135b82cd900 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataViewTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataViewTest.java @@ -30,7 +30,6 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.event.LabelEntry; import org.neo4j.graphdb.event.PropertyEntry; -import org.neo4j.internal.kernel.api.Token; import org.neo4j.internal.kernel.api.security.AccessMode; import org.neo4j.internal.kernel.api.security.AuthSubject; import org.neo4j.internal.kernel.api.security.SecurityContext; @@ -346,7 +345,7 @@ public void accessTransactionIdAndCommitTime() @Test public void shouldGetEmptyUsernameForAnonymousContext() { - when( transaction.securityContext() ).thenReturn( AnonymousContext.read().authorize( mock( Token.class ) ) ); + when( transaction.securityContext() ).thenReturn( AnonymousContext.read().authorize( s -> -1 ) ); TxStateTransactionDataSnapshot transactionDataSnapshot = snapshot(); assertEquals( "", transactionDataSnapshot.username() ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/KernelTokenArgumentTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/KernelTokenArgumentTest.java index c6da80208cb8b..0509fd95a785b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/KernelTokenArgumentTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/KernelTokenArgumentTest.java @@ -24,6 +24,7 @@ import org.neo4j.function.ThrowingAction; import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.kernel.impl.api.KernelTransactionImplementation; import org.neo4j.storageengine.api.StoreReadLayer; import org.neo4j.test.assertion.Assert; @@ -31,7 +32,7 @@ public class KernelTokenArgumentTest { - private KernelToken token = new KernelToken( mock( StoreReadLayer.class ), ktx ); + private KernelToken token = new KernelToken( mock( StoreReadLayer.class ), mock( KernelTransactionImplementation.class) ); @Test public void labelGetOrCreateForName() diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java index fad4b25328888..c0db3507980bd 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java @@ -117,7 +117,7 @@ public void setUp() throws InvalidTransactionTypeKernelException allStoreHolder = new AllStoreHolder( engine, store, transaction, cursors, mock( ExplicitIndexStore.class ) ); operations = new Operations( allStoreHolder, mock( IndexTxStateUpdater.class ), - store, transaction, new KernelToken( storeReadLayer, ktx ), cursors, autoindexing ); + store, transaction, new KernelToken( storeReadLayer, transaction ), cursors, autoindexing ); operations.initialize(); this.order = inOrder( locks, txState, storeReadLayer ); diff --git a/community/security/src/test/java/org/neo4j/server/security/auth/AuthProceduresTest.java b/community/security/src/test/java/org/neo4j/server/security/auth/AuthProceduresTest.java index 7398a43126de0..7b0b22c82a54e 100644 --- a/community/security/src/test/java/org/neo4j/server/security/auth/AuthProceduresTest.java +++ b/community/security/src/test/java/org/neo4j/server/security/auth/AuthProceduresTest.java @@ -25,14 +25,12 @@ import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.internal.kernel.api.Token; import org.neo4j.kernel.api.ResourceTracker; import org.neo4j.kernel.api.StubResourceManager; import org.neo4j.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.kernel.impl.api.integrationtest.KernelIntegrationTest; -import static org.mockito.Mockito.mock; import static org.neo4j.kernel.api.proc.ProcedureSignature.procedureName; public class AuthProceduresTest extends KernelIntegrationTest @@ -57,7 +55,7 @@ public void shouldFailWhenDeprecatedChangePasswordWithStaticAccessModeInDbmsMode dbmsOperations() .procedureCallDbms( procedureName( "dbms", "changePassword" ), inputArray, - AnonymousContext.none().authorize( mock( Token.class ) ), + AnonymousContext.none().authorize( s -> -1 ), resourceTracker ); } @@ -75,7 +73,7 @@ public void shouldFailWhenChangePasswordWithStaticAccessModeInDbmsMode() throws // When dbmsOperations().procedureCallDbms( procedureName( "dbms", "security", "changePassword" ), inputArray, - AnonymousContext.none().authorize( mock( Token.class ) ), + AnonymousContext.none().authorize( s -> -1 ), resourceTracker ); } diff --git a/community/security/src/test/java/org/neo4j/server/security/auth/SecurityContextDescriptionTest.java b/community/security/src/test/java/org/neo4j/server/security/auth/SecurityContextDescriptionTest.java index 8c069ee2f080f..5182702795a73 100644 --- a/community/security/src/test/java/org/neo4j/server/security/auth/SecurityContextDescriptionTest.java +++ b/community/security/src/test/java/org/neo4j/server/security/auth/SecurityContextDescriptionTest.java @@ -23,7 +23,6 @@ import org.junit.Before; import org.junit.Test; -import org.neo4j.internal.kernel.api.Token; import org.neo4j.internal.kernel.api.security.AccessMode; import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.configuration.Config; @@ -33,7 +32,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.mock; import static org.neo4j.server.security.auth.SecurityTestUtils.authToken; public class SecurityContextDescriptionTest @@ -54,7 +52,7 @@ public void setup() throws Throwable manager.init(); manager.start(); manager.newUser( "johan", "bar", false ); - context = manager.login( authToken( "johan", "bar" ) ).authorize( mock( Token.class ) ); + context = manager.login( authToken( "johan", "bar" ) ).authorize( s -> -1 ); } @After diff --git a/community/server/src/test/java/org/neo4j/server/database/CypherExecutorTest.java b/community/server/src/test/java/org/neo4j/server/database/CypherExecutorTest.java index 2acc147451fe3..84efbbc8cc27e 100644 --- a/community/server/src/test/java/org/neo4j/server/database/CypherExecutorTest.java +++ b/community/server/src/test/java/org/neo4j/server/database/CypherExecutorTest.java @@ -28,7 +28,6 @@ import org.neo4j.cypher.internal.javacompat.ExecutionEngine; import org.neo4j.graphdb.DependencyResolver; -import org.neo4j.internal.kernel.api.Token; import org.neo4j.internal.kernel.api.security.LoginContext; import org.neo4j.kernel.GraphDatabaseQueryService; import org.neo4j.kernel.api.KernelTransaction; @@ -153,7 +152,7 @@ private void setUpMocks() QueryRegistryOperations registryOperations = mock( QueryRegistryOperations.class ); when( statement.queryRegistration() ).thenReturn( registryOperations ); when( statementBridge.get() ).thenReturn( statement ); - when( kernelTransaction.securityContext() ).thenReturn( loginContext.authorize( mock( Token.class ) ) ); + when( kernelTransaction.securityContext() ).thenReturn( loginContext.authorize( s -> -1 ) ); when( kernelTransaction.transactionType() ).thenReturn( type ); when( database.getGraph() ).thenReturn( databaseFacade ); when( databaseFacade.getDependencyResolver() ).thenReturn( resolver ); diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/api/security/EnterpriseSecurityContext.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/api/security/EnterpriseSecurityContext.java index 7df01e4385116..f686be87522c5 100644 --- a/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/api/security/EnterpriseSecurityContext.java +++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/api/security/EnterpriseSecurityContext.java @@ -21,8 +21,8 @@ import java.util.Collections; import java.util.Set; +import java.util.function.Function; -import org.neo4j.internal.kernel.api.Token; import org.neo4j.internal.kernel.api.security.AccessMode; import org.neo4j.internal.kernel.api.security.AuthSubject; import org.neo4j.internal.kernel.api.security.SecurityContext; @@ -49,7 +49,7 @@ public boolean isAdmin() } @Override - public EnterpriseSecurityContext authorize( Token token ) + public EnterpriseSecurityContext authorize( Function tokenLookup ) { return this; } diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/StubKernelTransaction.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/StubKernelTransaction.java index 9c975b89a4e32..78405e854f79e 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/StubKernelTransaction.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/StubKernelTransaction.java @@ -33,6 +33,7 @@ import org.neo4j.internal.kernel.api.RelationshipScanCursor; import org.neo4j.internal.kernel.api.SchemaRead; import org.neo4j.internal.kernel.api.SchemaWrite; +import org.neo4j.internal.kernel.api.Token; import org.neo4j.internal.kernel.api.TokenRead; import org.neo4j.internal.kernel.api.TokenWrite; import org.neo4j.internal.kernel.api.Write; @@ -110,6 +111,12 @@ public TokenWrite tokenWrite() return null; } + @Override + public Token token() + { + return null; + } + @Override public SchemaRead schemaRead() { diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionIT.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionIT.java index 3e5702dc615fd..beed34911bb77 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionIT.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionIT.java @@ -125,7 +125,7 @@ public Set roles() return Collections.emptySet(); } - SecurityContext inner = AnonymousContext.none().authorize( (s) -> -1 ); + SecurityContext inner = AnonymousContext.none().authorize( s -> -1 ); @Override public AuthSubject subject() diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EnterpriseSecurityContextDescriptionTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EnterpriseSecurityContextDescriptionTest.java index e03d673b0467c..1a5e0b87e81b8 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EnterpriseSecurityContextDescriptionTest.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EnterpriseSecurityContextDescriptionTest.java @@ -24,8 +24,8 @@ import org.junit.Test; import java.time.Clock; +import java.util.function.Function; -import org.neo4j.internal.kernel.api.Token; import org.neo4j.internal.kernel.api.security.AccessMode; import org.neo4j.kernel.api.security.exception.InvalidAuthTokenException; import org.neo4j.kernel.enterprise.api.security.EnterpriseSecurityContext; @@ -36,7 +36,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.mock; import static org.neo4j.server.security.auth.SecurityTestUtils.authToken; import static org.neo4j.server.security.enterprise.auth.plugin.api.PredefinedRoles.PUBLISHER; @@ -47,7 +46,7 @@ public class EnterpriseSecurityContextDescriptionTest new RateLimitedAuthenticationStrategy( Clock.systemUTC(), 3 ) ); private EnterpriseUserManager manager; - private Token token; + private Function token = s -> -1; @Before public void setUp() throws Throwable @@ -55,7 +54,6 @@ public void setUp() throws Throwable authManagerRule.getManager().start(); manager = authManagerRule.getManager().getUserManager(); manager.newUser( "mats", "foo", false ); - token = mock( Token.class ); } @Test diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealmTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealmTest.java index c285110f9828f..76b9e8cc018ed 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealmTest.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealmTest.java @@ -35,9 +35,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.function.Function; import org.neo4j.commandline.admin.security.SetDefaultAdminCommand; -import org.neo4j.internal.kernel.api.Token; import org.neo4j.internal.kernel.api.security.AuthenticationResult; import org.neo4j.kernel.api.exceptions.InvalidArgumentsException; import org.neo4j.kernel.api.security.PasswordPolicy; @@ -77,12 +77,11 @@ public class InternalFlatFileRealmTest private MultiRealmAuthManager authManager; private TestRealm testRealm; - private Token token; + private Function token = s -> -1; @Before public void setup() throws Throwable { - token = mock( Token.class ); testRealm = new TestRealm( new InMemoryUserRepository(), new InMemoryRoleRepository(), diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/LdapCachingTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/LdapCachingTest.java index 6f363fcfbe684..7013629564850 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/LdapCachingTest.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/LdapCachingTest.java @@ -37,8 +37,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import java.util.function.Function; -import org.neo4j.internal.kernel.api.Token; import org.neo4j.kernel.api.security.exception.InvalidAuthTokenException; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.enterprise.api.security.EnterpriseLoginContext; @@ -62,12 +62,12 @@ public class LdapCachingTest private TestRealm testRealm; private FakeTicker fakeTicker; - private Token token; + private Function token; @Before public void setup() throws Throwable { - token = mock( Token.class ); + token = s -> -1; SecurityLog securityLog = mock( SecurityLog.class ); InternalFlatFileRealm internalFlatFileRealm = new InternalFlatFileRealm( diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/MultiRealmAuthManagerTest.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/MultiRealmAuthManagerTest.java index bc0610d34f892..9cd96ff21caaf 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/MultiRealmAuthManagerTest.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/MultiRealmAuthManagerTest.java @@ -27,9 +27,9 @@ import org.junit.rules.ExpectedException; import java.util.Collections; +import java.util.function.Function; import org.neo4j.commandline.admin.security.SetDefaultAdminCommand; -import org.neo4j.internal.kernel.api.Token; import org.neo4j.internal.kernel.api.security.AuthSubject; import org.neo4j.internal.kernel.api.security.AuthenticationResult; import org.neo4j.internal.kernel.api.security.LoginContext; @@ -80,12 +80,11 @@ public class MultiRealmAuthManagerTest extends InitialUserTest @Rule public ExpectedException expect = ExpectedException.none(); - private Token token; + private Function token = s -> -1; @Before public void setUp() throws Throwable { - token = mock( Token.class ); config = Config.defaults(); users = CommunitySecurityModule.getUserRepository( config, NullLogProvider.getInstance(), fsRule.get() ); authStrategy = mock( AuthenticationStrategy.class );