Added PR feedback, including lazy remote host lookup

community/kernel/src/main/java/org/neo4j/kernel/api/ExecutingQuery.java

@@ -123,6 +123,6 @@ public String toString()
         return format(
             "ExecutingQuery{queryId=%d, querySource='%s', username='%s', queryText='%s', queryParameters=%s, " +
             "startTime=%d}",
-            queryId, querySource.toString( ':' ), usernameAsString(), queryText, queryParameters, startTime );
+            queryId, querySource.toString( ":" ), usernameAsString(), queryText, queryParameters, startTime );
     }
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java

@@ -267,9 +267,4 @@ public AccessMode accessMode()
     {
         return mode;
     }
-
-    public static Function<TransactionalContext, String> describe()
-    {
-        return transactionalContext -> "We didn't really care to describe this for you in this test";
-    }
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/query/QuerySource.java

@@ -41,27 +41,11 @@ public QuerySource append( String newPart )
     @Override
     public String toString()
     {
-        return toString( '\t' );
+        return toString( "\t" );
     }
 
-    public String toString( Character sep )
+    public String toString( String sep )
     {
-        StringBuilder builder = new StringBuilder(  );
-
-        boolean isFirst = true;
-        for ( String part : parts )
-        {
-            if ( isFirst )
-            {
-                isFirst = false;
-            }
-            else
-            {
-                builder.append( sep );
-            }
-            builder.append( part );
-        }
-
-        return builder.toString();
+        return String.join( sep, parts );
     }
 }

community/kernel/src/test/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContextTest.java

@@ -69,18 +69,12 @@ public void checkKernelStatementOnCheck() throws Exception
         KernelTransaction.Type transactionType = null;
         AccessMode transactionMode = null;
         ExecutingQuery executingQuery = null;
-        PropertyContainerLocker locker = null;
         DbmsOperations.Factory dbmsOperationsFactory = null;
         ThreadToStatementContextBridge txBridge = null;
         Neo4jTransactionalContext transactionalContext =
-//<<<<<<< HEAD
-//            new Neo4jTransactionalContext(
-//                databaseQueryService, transaction, statement, "", Collections.emptyMap(), propertyContainerLocker );
-//=======
                 new Neo4jTransactionalContext(
                         databaseQueryService, transaction, transactionType, transactionMode, statement, executingQuery,
                         propertyContainerLocker, txBridge, dbmsOperationsFactory, guard );
-//>>>>>>> b556d13... Moved functionality from QuerySession to TransactionContext
 
         transactionalContext.check();
 

community/server/src/main/java/org/neo4j/server/rest/web/InternalJettyServletRequest.java

@@ -35,6 +35,7 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Supplier;
 import javax.servlet.DispatcherType;
 import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
@@ -43,6 +44,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.core.MediaType;
 
+import org.neo4j.function.Suppliers;
 import org.neo4j.string.UTF8;
 
 public class InternalJettyServletRequest extends Request
@@ -216,7 +218,7 @@ public String getRemoteAddr()
     @Override
     public String getRemoteHost()
     {
-        return requestData.remoteHost;
+        return requestData.remoteHost.get();
     }
 
     @Override
@@ -362,7 +364,7 @@ public HttpChannelState getHttpChannelState()
     public static class RequestData
     {
         public final String remoteAddress;
-        public final String remoteHost;
+        public final Supplier<String> remoteHost;
         public final boolean isSecure;
         public final int remotePort;
         public final String localName;
@@ -372,7 +374,7 @@ public static class RequestData
 
         public RequestData(
                 String remoteAddress,
-                String remoteHost,
+                Supplier<String> remoteHost,
                 boolean isSecure,
                 int remotePort,
                 String localName,
@@ -394,7 +396,7 @@ public static RequestData from( HttpServletRequest req )
         {
             return new RequestData(
                     req.getRemoteAddr(),
-                    req.getRemoteHost(),
+                    Suppliers.lazySingleton( req::getRemoteHost ),
                     req.isSecure(),
                     req.getRemotePort(),
                     req.getLocalName(),

community/server/src/main/java/org/neo4j/server/rest/web/ServerQuerySession.java

@@ -29,6 +29,6 @@ public static QuerySource describe( HttpServletRequest request )
     {
         return request == null ?
             new QuerySource( "server-session" ) :
-            new QuerySource( "server-session", "http", request.getRemoteAddr(), request.getRequestURI() );
+            new QuerySource( "server-session", request.getScheme(), request.getRemoteAddr(), request.getRequestURI() );
     }
 }

community/server/src/test/java/org/neo4j/server/rest/batch/BatchOperationsTest.java

@@ -34,6 +34,7 @@
 import org.neo4j.server.rest.web.InternalJettyServletResponse;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
 public class BatchOperationsTest {
@@ -83,7 +84,7 @@ public void shouldForwardMetadataFromRequestData() throws Exception
     {
         // Given
         RequestData mock = new RequestData(
-                "127.0.0.1", "localhost", true, 1,
+                "127.0.0.1", () -> "localhost", true, 1,
                 "TheLocalName", "129.0.0.1", 2, "authorization/auth" );
 
         InternalJettyServletRequest req = new InternalJettyServletRequest( "POST",
@@ -93,7 +94,7 @@ public void shouldForwardMetadataFromRequestData() throws Exception
         // When & then
         assertEquals( "127.0.0.1", req.getRemoteAddr());
         assertEquals( "localhost", req.getRemoteHost());
-        assertEquals( true, req.isSecure() );
+        assertTrue( req.isSecure() );
         assertEquals( 1, req.getRemotePort());
         assertEquals( "TheLocalName", req.getLocalName());
         assertEquals( "129.0.0.1", req.getLocalAddr());

enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/QueryLoggerKernelExtension.java

@@ -225,11 +225,5 @@ private static String mapAsString( Map<String,Object> params )
 
             return builder.toString();
         }
-
-        @SuppressWarnings( "unchecked" )
-        private static Class<Map<String,Object>> paramsClass()
-        {
-            return (Class<Map<String,Object>>) (Object) Map.class;
-        }
     }
 }