Move server info into result summary #272
Merged
Conversation
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
zhenlineo
force-pushed
the
1.1-server-info-in-result
branch
from
7de9ef9 to
be8b568
Compare
Replaced session.server with resultSummary.server.version Replaced session.address with resultSummary.server.address
zhenlineo
force-pushed
the
1.1-server-info-in-result
branch
from
be8b568 to
efdf8bd
Compare
lutovich
reviewed
Nov 16, 2016
| this.socket = socket; | ||
| this.logger = logger; | ||
|
|
||
| if( logger.isDebugEnabled() ) |
There was a problem hiding this comment.
Maybe extract this if-else in a method like createResponseHandler(Logger), otherwise it is duplicated in both constructors.
| queueMessage( new InitMessage( clientName, authToken ), initCollector ); | ||
| sync(); | ||
| this.serverInfo = new InternalServerInfo( socket.address(), initCollector.server() ); |
There was a problem hiding this comment.
InternalServerInfo constructor's second arg is called String version but here we pass initCollector.server() for it. This is a bit confusing. Maybe InitCollector#server() can be renamed to #serverVersion()?
|
|
||
| public class InternalServerInfo implements ServerInfo | ||
| { | ||
| private BoltServerAddress address; |
|
|
||
| /** | ||
| * Returns a string telling which version of the server the query was executed. | ||
| * @return The server version of <code>null</code> if not available. |
There was a problem hiding this comment.
Is it possible for the version to not be available while address is available?
There was a problem hiding this comment.
It is possible. The version is not supported before server 3.1. I will add a line in the doc
| System.out.println( session.server() ); | ||
| assumeTrue( ServerVersion.version( session.server() ).greaterThanOrEqual( v3_1_0 ) ); | ||
| String version = session.run( "RETURN 1" ).consume().server().version(); | ||
| System.out.println( version ); |
There was a problem hiding this comment.
This println can probably be removed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replaced session.server with resultSummary.server.version
Replaced session.address with resultSummary.server.address