From 56f66762978babd8a9caa1748d6fbb8988321cc0 Mon Sep 17 00:00:00 2001 From: Praveena G Date: Thu, 2 Mar 2017 15:55:09 +0000 Subject: [PATCH] change requestScheme to protocol --- .../query/clientconnection/BoltConnectionInfo.java | 2 +- .../clientconnection/ClientConnectionInfo.java | 6 +++--- .../query/clientconnection/HttpConnectionInfo.java | 14 +++++++------- .../enterprise/builtinprocs/QueryStatusResult.java | 4 ++-- .../builtinprocs/ListQueriesProcedureTest.java | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/BoltConnectionInfo.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/BoltConnectionInfo.java index 970dfbc433abe..5c6df18a738a3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/BoltConnectionInfo.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/BoltConnectionInfo.java @@ -56,7 +56,7 @@ public String asConnectionDetails() } @Override - public String requestScheme() + public String protocol() { return "bolt"; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/ClientConnectionInfo.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/ClientConnectionInfo.java index 713fddfd453fb..45bbaf3001395 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/ClientConnectionInfo.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/ClientConnectionInfo.java @@ -52,7 +52,7 @@ public ClientConnectionInfo withUsername( String username ) * * @return the scheme used for connecting to the server, or {@code null} if no scheme is available. */ - public String requestScheme() + public String protocol() { return null; } @@ -108,9 +108,9 @@ public String asConnectionDetails() } @Override - public String requestScheme() + public String protocol() { - return source.requestScheme(); + return source.protocol(); } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/HttpConnectionInfo.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/HttpConnectionInfo.java index 6da4d59fc5b6d..9a950b33651ae 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/HttpConnectionInfo.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/HttpConnectionInfo.java @@ -26,19 +26,19 @@ */ public class HttpConnectionInfo extends ClientConnectionInfo { - private final String scheme; + private final String protocol; private final InetSocketAddress clientAddress; private final InetSocketAddress serverAddress; private final String requestPath; public HttpConnectionInfo( - String scheme, + String protocol, @SuppressWarnings( "unused" ) String userAgent, // useful for achieving parity with BoltConnectionInfo InetSocketAddress clientAddress, InetSocketAddress serverAddress, String requestPath ) { - this.scheme = scheme; + this.protocol = protocol; this.clientAddress = clientAddress; this.serverAddress = serverAddress; this.requestPath = requestPath; @@ -47,13 +47,13 @@ public HttpConnectionInfo( @Override public String asConnectionDetails() { - return String.join( "\t", "server-session", scheme, clientAddress.getHostString(), requestPath ); + return String.join( "\t", "server-session", protocol, clientAddress.getHostString(), requestPath ); } @Override - public String requestScheme() + public String protocol() { - return scheme; + return protocol; } @Override @@ -67,7 +67,7 @@ public String requestURI() { return serverAddress == null ? requestPath : String.format( "%s://%s:%d%s", - scheme, + protocol, serverAddress.getHostString(), serverAddress.getPort(), requestPath ); diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java index 62f03b060ce4d..2e4cf2ee8a894 100644 --- a/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java +++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java @@ -56,7 +56,7 @@ public class QueryStatusResult @Deprecated public final String connectionDetails; /** @since Neo4j 3.2 */ - public final String requestScheme; + public final String protocol; /** @since Neo4j 3.2 */ public final String clientAddress; /** @since Neo4j 3.2 */ @@ -92,7 +92,7 @@ private QueryStatusResult( QuerySnapshot query ) throws InvalidArgumentsExceptio this.elapsedTime = formatInterval( elapsedTimeMillis ); ClientConnectionInfo clientConnection = query.clientConnection(); this.connectionDetails = clientConnection.asConnectionDetails(); - this.requestScheme = clientConnection.requestScheme(); + this.protocol = clientConnection.protocol(); this.clientAddress = clientConnection.clientAddress(); this.requestUri = clientConnection.requestURI(); this.metaData = query.transactionAnnotationData(); diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/ListQueriesProcedureTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/ListQueriesProcedureTest.java index b8cea11a52a16..d5193cfd04bff 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/ListQueriesProcedureTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/ListQueriesProcedureTest.java @@ -212,7 +212,7 @@ public void shouldContainSpecificConnectionDetails() throws Exception Map data = getQueryListing( "CALL dbms.listQueries" ); // then - assertThat( data, hasKey( "requestScheme" ) ); + assertThat( data, hasKey( "protocol" ) ); assertThat( data, hasKey( "clientAddress" ) ); assertThat( data, hasKey( "requestUri" ) ); }