Merge pull request #237 from pontusmelke/4.1-user-agent-string

Provide USER_AGENT when connecting

Author: pontusmelke

cypher-shell/src/main/java/org/neo4j/shell/state/BoltStateHandler.java

@@ -35,6 +35,7 @@
 import org.neo4j.shell.DatabaseManager;
 import org.neo4j.shell.TransactionHandler;
 import org.neo4j.shell.TriFunction;
+import org.neo4j.shell.build.Build;
 import org.neo4j.shell.exception.CommandException;
 import org.neo4j.shell.log.NullLogging;
 
@@ -46,6 +47,7 @@
  */
 public class BoltStateHandler implements TransactionHandler, Connector, DatabaseManager {
     private final TriFunction<String, AuthToken, Config, Driver> driverProvider;
+    private static final String USER_AGENT = "neo4j-cypher-shell/v" + Build.version();
     protected Driver driver;
     Session session;
     private String version;
@@ -486,7 +488,9 @@ public void disconnect() {
     }
 
     private Driver getDriver(@Nonnull ConnectionConfig connectionConfig, @Nullable AuthToken authToken) {
-        Config.ConfigBuilder configBuilder = Config.builder().withLogging(NullLogging.NULL_LOGGING);
+        Config.ConfigBuilder configBuilder = Config.builder()
+                                                   .withLogging(NullLogging.NULL_LOGGING)
+                                                   .withUserAgent( USER_AGENT );
         switch(connectionConfig.encryption())
         {
         case TRUE:

cypher-shell/src/test/java/org/neo4j/shell/state/BoltStateHandlerTest.java

@@ -587,6 +587,21 @@ public Driver apply(String uri, AuthToken authToken, Config config) {
         assertEquals("bolt+s", uriScheme[0]);
     }
 
+    @Test
+    public void provideUserAgentstring() throws CommandException {
+        RecordingDriverProvider provider = new RecordingDriverProvider() {
+            @Override
+            public Driver apply(String uri, AuthToken authToken, Config config) {
+                super.apply(uri, authToken, config);
+                return new FakeDriver();
+            }
+        };
+        BoltStateHandler handler = new BoltStateHandler(provider, false);
+        handler.connect(config);
+
+        assertTrue(provider.config.userAgent().startsWith( "neo4j-cypher-shell/v4.1" ));
+    }
+
     private Driver stubResultSummaryInAnOpenSession(Result resultMock, Session sessionMock, String version) {
         return stubResultSummaryInAnOpenSession(resultMock, sessionMock, version, DEFAULT_DEFAULT_DB_NAME);
     }