From 7d0ebefc7855311a862c0b52b838137661158753 Mon Sep 17 00:00:00 2001 From: MishaDemianenko Date: Mon, 26 Jun 2017 15:32:45 +0200 Subject: [PATCH] Make fields final and renaming. --- .../src/main/java/org/neo4j/bolt/BoltKernelExtension.java | 6 +++--- .../src/main/java/org/neo4j/bolt/transport/NettyServer.java | 6 +++--- .../java/org/neo4j/bolt/v1/transport/NettyServerTest.java | 4 ++-- .../bolt/v1/transport/integration/Neo4jWithSocket.java | 6 +++--- .../{BoltConnectorRegister.java => BoltPortRegister.java} | 4 ++-- .../java/org/neo4j/kernel/impl/factory/PlatformModule.java | 4 ++-- .../security/enterprise/auth/EmbeddedInteraction.java | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) rename community/kernel/src/main/java/org/neo4j/kernel/api/bolt/{BoltConnectorRegister.java => BoltPortRegister.java} (91%) diff --git a/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java b/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java index 637f19d0ab60d..3d7206c0eee6c 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java @@ -52,7 +52,7 @@ import org.neo4j.helpers.ListenSocketAddress; import org.neo4j.helpers.Service; import org.neo4j.kernel.api.bolt.BoltConnectionTracker; -import org.neo4j.kernel.api.bolt.BoltConnectorRegister; +import org.neo4j.kernel.api.bolt.BoltPortRegister; import org.neo4j.kernel.api.security.AuthManager; import org.neo4j.kernel.api.security.UserManagerSupplier; import org.neo4j.kernel.configuration.BoltConnector; @@ -106,7 +106,7 @@ public interface Dependencies BoltConnectionTracker sessionTracker(); - BoltConnectorRegister connectionRegister(); + BoltPortRegister connectionRegister(); Clock clock(); @@ -144,7 +144,7 @@ public Lifecycle newInstance( KernelContext context, Dependencies dependencies ) BoltFactory boltFactory = life.add( new BoltFactoryImpl( api, dependencies.usageData(), logService, dependencies.txBridge(), authentication, dependencies.sessionTracker(), config ) ); WorkerFactory workerFactory = createWorkerFactory( boltFactory, scheduler, dependencies, logService, clock ); - BoltConnectorRegister connectionRegister = dependencies.connectionRegister(); + BoltPortRegister connectionRegister = dependencies.connectionRegister(); Map connectors = config.enabledBoltConnectors().stream() .collect( Collectors.toMap( Function.identity(), connConfig -> diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/NettyServer.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/NettyServer.java index 48e221e86c5c6..85ab5a04bd9f8 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/transport/NettyServer.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/transport/NettyServer.java @@ -35,7 +35,7 @@ import org.neo4j.helpers.ListenSocketAddress; import org.neo4j.helpers.PortBindException; -import org.neo4j.kernel.api.bolt.BoltConnectorRegister; +import org.neo4j.kernel.api.bolt.BoltPortRegister; import org.neo4j.kernel.configuration.BoltConnector; import org.neo4j.kernel.lifecycle.LifecycleAdapter; @@ -52,7 +52,7 @@ public class NettyServer extends LifecycleAdapter private final Map bootstrappersMap; private final ThreadFactory tf; - private BoltConnectorRegister connectionRegister; + private final BoltPortRegister connectionRegister; private EventLoopGroup bossGroup; private EventLoopGroup selectorGroup; @@ -71,7 +71,7 @@ public interface ProtocolInitializer * @param connectorRegister register to keep local address information on all configured connectors */ public NettyServer( ThreadFactory tf, Map initializersMap, - BoltConnectorRegister connectorRegister ) + BoltPortRegister connectorRegister ) { this.bootstrappersMap = initializersMap; this.tf = tf; diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/NettyServerTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/NettyServerTest.java index f2d23e40d9429..81489745d738e 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/NettyServerTest.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/NettyServerTest.java @@ -33,7 +33,7 @@ import org.neo4j.helpers.ListenSocketAddress; import org.neo4j.helpers.NamedThreadFactory; import org.neo4j.helpers.PortBindException; -import org.neo4j.kernel.api.bolt.BoltConnectorRegister; +import org.neo4j.kernel.api.bolt.BoltPortRegister; import org.neo4j.kernel.configuration.BoltConnector; import static org.neo4j.helpers.collection.MapUtil.genericMap; @@ -60,7 +60,7 @@ public void shouldGivePortConflictErrorWithPortNumberInIt() throws Throwable Map initializersMap = genericMap( new BoltConnector( "test" ), protocolOnAddress( address ) ); new NettyServer( new NamedThreadFactory( "mythreads" ), initializersMap, - new BoltConnectorRegister() ).start(); + new BoltPortRegister() ).start(); } } diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/Neo4jWithSocket.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/Neo4jWithSocket.java index 29f444a43e628..aaa822e686780 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/Neo4jWithSocket.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/Neo4jWithSocket.java @@ -34,7 +34,7 @@ import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.helpers.HostnamePort; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.api.bolt.BoltConnectorRegister; +import org.neo4j.kernel.api.bolt.BoltPortRegister; import org.neo4j.kernel.configuration.BoltConnector; import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; @@ -52,7 +52,7 @@ public class Neo4jWithSocket extends ExternalResource private TestGraphDatabaseFactory graphDatabaseFactory; private GraphDatabaseService gdb; private File workingDirectory; - private BoltConnectorRegister connectorRegister; + private BoltPortRegister connectorRegister; public Neo4jWithSocket( Class testClass ) { @@ -150,7 +150,7 @@ public void ensureDatabase( Consumer> overrideSettingsFunctio gdb = graphDatabaseFactory.newImpermanentDatabaseBuilder( storeDir ). setConfig( settings ).newGraphDatabase(); connectorRegister = - ((GraphDatabaseAPI) gdb).getDependencyResolver().resolveDependency( BoltConnectorRegister.class ); + ((GraphDatabaseAPI) gdb).getDependencyResolver().resolveDependency( BoltPortRegister.class ); } private Map configure( Consumer> overrideSettingsFunction ) throws IOException diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/bolt/BoltConnectorRegister.java b/community/kernel/src/main/java/org/neo4j/kernel/api/bolt/BoltPortRegister.java similarity index 91% rename from community/kernel/src/main/java/org/neo4j/kernel/api/bolt/BoltConnectorRegister.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/bolt/BoltPortRegister.java index 16caed419aa7c..58bde5b245aa6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/bolt/BoltConnectorRegister.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/bolt/BoltPortRegister.java @@ -27,10 +27,10 @@ /** * Connector tracker that keeps information about local address that any configured connector get during bootstrapping. */ -public class BoltConnectorRegister +public class BoltPortRegister { - private ConcurrentHashMap connectorsInfo = new ConcurrentHashMap<>(); + private final ConcurrentHashMap connectorsInfo = new ConcurrentHashMap<>(); public void register( String connectorKey, InetSocketAddress localAddress ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java index f3432741e9442..6ad87aaba0dd5 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java @@ -32,7 +32,7 @@ import org.neo4j.io.fs.FileSystemLifecycleAdapter; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.AvailabilityGuard; -import org.neo4j.kernel.api.bolt.BoltConnectorRegister; +import org.neo4j.kernel.api.bolt.BoltPortRegister; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensions; import org.neo4j.kernel.extension.UnsatisfiedDependencyStrategies; @@ -209,7 +209,7 @@ public PlatformModule( File providedStoreDir, Config config, DatabaseInfo databa storeCopyCheckPointMutex = new StoreCopyCheckPointMutex(); dependencies.satisfyDependency( storeCopyCheckPointMutex ); - dependencies.satisfyDependency( new BoltConnectorRegister() ); + dependencies.satisfyDependency( new BoltPortRegister() ); publishPlatformInfo( dependencies.resolveDependency( UsageData.class ) ); } diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedInteraction.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedInteraction.java index 3241fb4fe2f2c..464046486f8e9 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedInteraction.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/EmbeddedInteraction.java @@ -31,7 +31,7 @@ import org.neo4j.helpers.HostnamePort; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.bolt.BoltConnectorRegister; +import org.neo4j.kernel.api.bolt.BoltPortRegister; import org.neo4j.kernel.api.security.AuthenticationResult; import org.neo4j.kernel.configuration.BoltConnector; import org.neo4j.kernel.configuration.ssl.LegacySslPolicyConfig; @@ -51,7 +51,7 @@ public class EmbeddedInteraction implements NeoInteractionLevel config ) throws Throwable { @@ -86,7 +86,7 @@ private void init( GraphDatabaseBuilder builder, Map config ) th db = (GraphDatabaseFacade) builder.newGraphDatabase(); authManager = db.getDependencyResolver().resolveDependency( EnterpriseAuthManager.class ); - connectorRegister = db.getDependencyResolver().resolveDependency( BoltConnectorRegister.class ); + connectorRegister = db.getDependencyResolver().resolveDependency( BoltPortRegister.class ); } @Override