-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10724 from lutovich/3.4-bolt-refactoring
Refactor bolt server to easier allow multiple protocol versions
- Loading branch information
Showing
33 changed files
with
1,202 additions
and
913 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
community/bolt/src/main/java/org/neo4j/bolt/transport/BoltProtocolHandlerFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Copyright (c) 2002-2018 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.bolt.transport; | ||
|
|
||
| import org.neo4j.bolt.BoltChannel; | ||
|
|
||
| /** | ||
| * Represents a component that instantiates Bolt protocol handlers. | ||
| * | ||
| * @see BoltMessagingProtocolHandler | ||
| */ | ||
| @FunctionalInterface | ||
| public interface BoltProtocolHandlerFactory | ||
| { | ||
| /** | ||
| * Instantiate a handler for Bolt protocol with the specified version. Return {@code null} when handler for the | ||
| * given version can't be instantiated. | ||
| * | ||
| * @param protocolVersion the version as negishiated by the initial handshake. | ||
| * @param channel the channel representing network connection from the client. | ||
| * @return new protocol handler when given protocol version is known and valid, {@code null} otherwise. | ||
| */ | ||
| BoltMessagingProtocolHandler create( long protocolVersion, BoltChannel channel ); | ||
| } |
56 changes: 56 additions & 0 deletions
56
community/bolt/src/main/java/org/neo4j/bolt/transport/DefaultBoltProtocolHandlerFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Copyright (c) 2002-2018 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.bolt.transport; | ||
|
|
||
| import org.neo4j.bolt.BoltChannel; | ||
| import org.neo4j.bolt.v1.messaging.Neo4jPackV1; | ||
| import org.neo4j.bolt.v1.runtime.BoltWorker; | ||
| import org.neo4j.bolt.v1.runtime.WorkerFactory; | ||
| import org.neo4j.bolt.v1.transport.BoltMessagingProtocolV1Handler; | ||
| import org.neo4j.kernel.impl.logging.LogService; | ||
|
|
||
| public class DefaultBoltProtocolHandlerFactory implements BoltProtocolHandlerFactory | ||
| { | ||
| private final WorkerFactory workerFactory; | ||
| private final TransportThrottleGroup throttleGroup; | ||
| private final LogService logService; | ||
|
|
||
| public DefaultBoltProtocolHandlerFactory( WorkerFactory workerFactory, TransportThrottleGroup throttleGroup, | ||
| LogService logService ) | ||
| { | ||
| this.workerFactory = workerFactory; | ||
| this.throttleGroup = throttleGroup; | ||
| this.logService = logService; | ||
| } | ||
|
|
||
| @Override | ||
| public BoltMessagingProtocolHandler create( long protocolVersion, BoltChannel channel ) | ||
| { | ||
| if ( protocolVersion == BoltMessagingProtocolV1Handler.VERSION ) | ||
| { | ||
| BoltWorker worker = workerFactory.newWorker( channel ); | ||
| return new BoltMessagingProtocolV1Handler( channel, new Neo4jPackV1(), worker, throttleGroup, logService ); | ||
| } | ||
| else | ||
| { | ||
| return null; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/AuthTokenValuesWriter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright (c) 2002-2018 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.bolt.v1.messaging; | ||
|
|
||
| import org.neo4j.graphdb.Node; | ||
| import org.neo4j.graphdb.Relationship; | ||
| import org.neo4j.graphdb.spatial.Point; | ||
| import org.neo4j.kernel.impl.util.BaseToObjectValueWriter; | ||
| import org.neo4j.values.AnyValue; | ||
| import org.neo4j.values.AnyValueWriter; | ||
| import org.neo4j.values.storable.CoordinateReferenceSystem; | ||
|
|
||
| /** | ||
| * {@link AnyValueWriter Writer} that allows to convert {@link AnyValue} to any primitive Java type. It explicitly | ||
| * prohibits conversion of nodes, relationships and points. They are not expected in auth token map. | ||
| */ | ||
| class AuthTokenValuesWriter extends BaseToObjectValueWriter<RuntimeException> | ||
| { | ||
| Object valueAsObject( AnyValue value ) | ||
| { | ||
| value.writeTo( this ); | ||
| return value(); | ||
| } | ||
|
|
||
| @Override | ||
| protected Node newNodeProxyById( long id ) | ||
| { | ||
| throw new UnsupportedOperationException( "INIT message metadata should not contain nodes" ); | ||
| } | ||
|
|
||
| @Override | ||
| protected Relationship newRelationshipProxyById( long id ) | ||
| { | ||
| throw new UnsupportedOperationException( "INIT message metadata should not contain relationships" ); | ||
| } | ||
|
|
||
| @Override | ||
| protected Point newPoint( CoordinateReferenceSystem crs, double[] coordinate ) | ||
| { | ||
| throw new UnsupportedOperationException( "INIT message metadata should not contain points" ); | ||
| } | ||
| } |
Oops, something went wrong.