From 8b294245a2a63b9ac7740919c053367f940aca38 Mon Sep 17 00:00:00 2001 From: Chris Vest Date: Tue, 24 Apr 2018 17:58:34 +0200 Subject: [PATCH] Better name for the TokenCreator method. --- .../neo4j/kernel/impl/core/DelegatingTokenHolder.java | 2 +- .../impl/core/IsolatedTransactionTokenCreator.java | 2 +- .../neo4j/kernel/impl/core/ReadOnlyTokenCreator.java | 2 +- .../java/org/neo4j/kernel/impl/core/TokenCreator.java | 10 +++++++++- .../java/org/neo4j/kernel/ha/AbstractTokenCreator.java | 2 +- .../org/neo4j/kernel/ha/AbstractTokenCreatorTest.java | 4 ++-- .../org/neo4j/kernel/ha/SlaveTokenCreatorTest.java | 4 ++-- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DelegatingTokenHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DelegatingTokenHolder.java index ce214b4a5f424..2fad12c709bd8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DelegatingTokenHolder.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DelegatingTokenHolder.java @@ -100,7 +100,7 @@ private synchronized int createToken( String name ) throws KernelException return id; } - id = tokenCreator.getOrCreate( name ); + id = tokenCreator.createToken( name ); try { tokenCache.put( tokenFactory.newToken( name, id ) ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java index aaabf3de3394a..ea05fedcf9b6b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java @@ -49,7 +49,7 @@ abstract class IsolatedTransactionTokenCreator implements TokenCreator } @Override - public synchronized int getOrCreate( String name ) throws KernelException + public synchronized int createToken( String name ) throws KernelException { Kernel kernel = kernelSupplier.get(); try ( Session session = kernel.beginSession( LoginContext.AUTH_DISABLED ) ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/ReadOnlyTokenCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/ReadOnlyTokenCreator.java index e2115beac2399..576cfa654b3db 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/ReadOnlyTokenCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/ReadOnlyTokenCreator.java @@ -28,7 +28,7 @@ public class ReadOnlyTokenCreator implements TokenCreator { @Override - public int getOrCreate( String name ) throws ReadOnlyDbException + public int createToken( String name ) throws ReadOnlyDbException { throw new ReadOnlyDbException(); } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/TokenCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/TokenCreator.java index bd48778af31c3..982f4aa216024 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/TokenCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/TokenCreator.java @@ -23,5 +23,13 @@ public interface TokenCreator { - int getOrCreate( String name ) throws KernelException; + /** + * Create a token by the given name and return the newly allocated id for this token. + * + * It is assumed that the token name is not already being used. + * @param name The token name to allocate. + * @return The id of the allocated token name. + * @throws KernelException If the inner transaction used to allocate the token encountered a problem. + */ + int createToken( String name ) throws KernelException; } diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/AbstractTokenCreator.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/AbstractTokenCreator.java index ac7b699f294f3..5719dcd24d442 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/AbstractTokenCreator.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/AbstractTokenCreator.java @@ -42,7 +42,7 @@ protected AbstractTokenCreator( Master master, RequestContextFactory requestCont } @Override - public final int getOrCreate( String name ) + public final int createToken( String name ) { try ( Response response = create( master, requestContextFactory.newRequestContext(), name ) ) { diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/AbstractTokenCreatorTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/AbstractTokenCreatorTest.java index cee19ada9354e..2eb1f0d853d8e 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/AbstractTokenCreatorTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/AbstractTokenCreatorTest.java @@ -76,7 +76,7 @@ public void shouldCreateALabelOnMasterAndApplyItLocally() int responseValue = response.response(); // WHEN - int result = creator.getOrCreate( label ); + int result = creator.createToken( label ); // THEN assertEquals( responseValue, result ); @@ -93,7 +93,7 @@ public void shouldThrowIfCreateThrowsAnException() try { // WHEN - throwingCreator.getOrCreate( "A" ); + throwingCreator.createToken( "A" ); fail( "Should have thrown" ); } catch ( Exception e ) diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveTokenCreatorTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveTokenCreatorTest.java index 9610bbff238bf..e154670d06cf9 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveTokenCreatorTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveTokenCreatorTest.java @@ -124,13 +124,13 @@ public SlaveTokenCreatorTest( String name, SlaveTokenCreatorFixture fixture ) public void mustTranslateComExceptionsToTransientTransactionFailures() { when( fixture.callMasterMethod( master, requestContext, name ) ).thenThrow( new ComException() ); - tokenCreator.getOrCreate( name ); + tokenCreator.createToken( name ); } @Test public void mustReturnIdentifierFromMaster() { when( fixture.callMasterMethod( master, requestContext, name ) ).thenReturn( new IntegerResponse( 13 ) ); - assertThat( tokenCreator.getOrCreate( name ), is( 13 ) ); + assertThat( tokenCreator.createToken( name ), is( 13 ) ); } }