Improved handling of unavailable usernames

neo4j · Sep 14, 2016 · 40247d6 · 40247d6
1 parent e0b4a3a
commit 40247d6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/ExecutingQuery.java b/community/kernel/src/main/java/org/neo4j/kernel/api/ExecutingQuery.java
@@ -29,6 +29,8 @@
  */
 public class ExecutingQuery
 {
+    public static String UNAVAILABLE_USERNAME = "<unavailable>";
+
     private final long queryId;
 
     private final Optional<String> username;
@@ -85,6 +87,11 @@ public Optional<String> username()
         return username;
     }
 
+    public String usernameAsString()
+    {
+        return username().orElse( UNAVAILABLE_USERNAME );
+
+    }
     public String queryText()
     {
         return queryText;
@@ -105,6 +112,6 @@ public String toString()
     {
         return format(
             "ExecutingQuery{queryId=%d, username='%s', queryText='%s', queryParameters=%s, startTime=%d}",
-            queryId, username == null ? "<unavailable>" : username, queryText, queryParameters, startTime );
+            queryId, usernameAsString(), queryText, queryParameters, startTime );
     }
 }
diff --git a/...rise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/BuiltInProcedures.java b/...rise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/BuiltInProcedures.java
@@ -227,7 +227,7 @@ private QueryTerminationResult killQueryTransaction( Pair<KernelTransactionHandl
         if ( isAdminEnterpriseAuthSubject() || query.username().map( authSubject::hasUsername ).orElse( false ) )
         {
             pair.first().markForTermination( Status.Transaction.Terminated );
-            return new QueryTerminationResult( ofInternalId( query.internalQueryId() ), query.username() );
+            return new QueryTerminationResult( ofInternalId( query.internalQueryId() ), query.usernameAsString() );
         }
         else
         {
@@ -334,16 +334,14 @@ private QueryStatusResult queryStatusResult( ExecutingQuery q ) throws InvalidAr
     {
         return new QueryStatusResult(
             ofInternalId( q.internalQueryId() ),
-            q.username(),
+            q.usernameAsString(),
             q.queryText(),
             q.queryParameters(),
             q.startTime(),
             clock.instant().minusMillis( q.startTime() ).toEpochMilli()
         );
     }
 
-    private static String UNAVAILABLE_USERNAME = "<unavailable>";
-
     public static class QueryStatusResult
     {
         public final String queryId;
@@ -354,11 +352,11 @@ public static class QueryStatusResult
         public final String startTime;
         public final String elapsedTime;
 
-        QueryStatusResult( QueryId queryId, Optional<String> username, String query, Map<String,Object> parameters,
+        QueryStatusResult( QueryId queryId, String username, String query, Map<String,Object> parameters,
                 long startTime, long elapsedTime )
         {
             this.queryId = queryId.toString();
-            this.username = username.orElse( UNAVAILABLE_USERNAME );
+            this.username = username;
             this.query = query;
             this.parameters = parameters;
             this.startTime = formatTime( startTime );
@@ -378,10 +376,10 @@ public static class QueryTerminationResult
         public final String queryId;
         public final String username;
 
-        public QueryTerminationResult( QueryId queryId, Optional<String> username )
+        public QueryTerminationResult( QueryId queryId, String username )
         {
             this.queryId = queryId.toString();
-            this.username = username.orElse( UNAVAILABLE_USERNAME );
+            this.username = username;
         }
     }