Make username non-optional

neo4j · Oct 12, 2016 · f7b7c52 · f7b7c52
1 parent 2a08c9b
commit f7b7c52
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 25 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
@@ -20,7 +20,6 @@
 package org.neo4j.kernel.api;
 
 import java.util.Map;
-import java.util.Optional;
 
 import org.neo4j.kernel.impl.query.QuerySource;
 
@@ -31,11 +30,9 @@
  */
 public class ExecutingQuery
 {
-    public static String UNAVAILABLE_USERNAME = "<unavailable>";
-
     private final long queryId;
 
-    private final Optional<String> username;
+    private final String username;
     private final QuerySource querySource;
     private final String queryText;
     private final Map<String, Object> queryParameters;
@@ -45,7 +42,7 @@ public class ExecutingQuery
     public ExecutingQuery(
             long queryId,
             QuerySource querySource,
-            Optional<String> username,
+            String username,
             String queryText,
             Map<String,Object> queryParameters,
             long startTime,
@@ -89,7 +86,7 @@ public long internalQueryId()
         return queryId;
     }
 
-    public Optional<String> username()
+    public String username()
     {
         return username;
     }
@@ -99,11 +96,6 @@ public QuerySource querySource()
         return querySource;
     }
 
-    public String usernameAsString()
-    {
-        return username().orElse( UNAVAILABLE_USERNAME );
-
-    }
     public String queryText()
     {
         return queryText;
@@ -125,7 +117,7 @@ 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( ":" ), username, queryText, queryParameters, startTime );
     }
 
     public Map<String,Object> metaData()

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java
@@ -19,14 +19,13 @@
  */
 package org.neo4j.kernel.impl.api;
 
-import java.util.Optional;
 import java.util.function.Supplier;
 
 import org.neo4j.graphdb.NotInTransactionException;
 import org.neo4j.graphdb.TransactionTerminatedException;
-import org.neo4j.kernel.api.ProcedureCallOperations;
 import org.neo4j.kernel.api.DataWriteOperations;
 import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.ProcedureCallOperations;
 import org.neo4j.kernel.api.QueryRegistryOperations;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.SchemaWriteOperations;
@@ -212,10 +211,9 @@ final void forceClose()
         }
     }
 
-    final Optional<String> username()
+    final String username()
     {
-        String username = transaction.mode().username();
+        return transaction.mode().username();
-        return Optional.of( username );
     }
 
     final ExecutingQueryList executingQueryList()

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/ExecutingQueryListTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/ExecutingQueryListTest.java
@@ -23,7 +23,6 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.neo4j.kernel.api.ExecutingQuery;
@@ -99,7 +98,7 @@ public void removingQueryInTheMiddleKeepsOrder()
 
     private ExecutingQuery createExecutingQuery( int queryId, String query )
     {
-        return new ExecutingQuery( queryId, QuerySource.UNKNOWN, Optional.of( "me" ), query,
+        return new ExecutingQuery( queryId, QuerySource.UNKNOWN, "me", query,
                 Collections.emptyMap(), 10, Collections.emptyMap() );
     }
 }
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
@@ -172,7 +172,7 @@ public Stream<QueryStatusResult> listQueries() throws InvalidArgumentsException,
             return getKernelTransactions().activeTransactions().stream()
                 .flatMap( KernelTransactionHandle::executingQueries )
                 .filter( query -> isAdminEnterpriseAuthSubject() ||
-                        query.username().map( authSubject::hasUsername ).orElse( false ) )
+                                  authSubject.hasUsername( query.username() ) )
                 .map( catchThrown( InvalidArgumentsException.class, this::queryStatusResult ) );
         }
         catch ( UncaughtCheckedException uncaught )
@@ -256,10 +256,10 @@ private QueryTerminationResult killQueryTransaction( Pair<KernelTransactionHandl
             throws InvalidArgumentsException
     {
         ExecutingQuery query = pair.other();
-        if ( isAdminEnterpriseAuthSubject() || query.username().map( authSubject::hasUsername ).orElse( false ) )
+        if ( isAdminEnterpriseAuthSubject() || authSubject.hasUsername( query.username() ) )
         {
             pair.first().markForTermination( Status.Transaction.Terminated );
-            return new QueryTerminationResult( ofInternalId( query.internalQueryId() ), query.usernameAsString() );
+            return new QueryTerminationResult( ofInternalId( query.internalQueryId() ), query.username() );
         }
         else
         {
@@ -370,7 +370,7 @@ private QueryStatusResult queryStatusResult( ExecutingQuery q )
     {
         return new QueryStatusResult(
                 ofInternalId( q.internalQueryId() ),
-                q.usernameAsString(),
+                q.username(),
                 q.queryText(),
                 q.queryParameters(),
                 q.startTime(),

diff --git a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerTest.java b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerTest.java
@@ -25,7 +25,6 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 import org.neo4j.kernel.api.ExecutingQuery;
@@ -286,7 +285,7 @@ private static ExecutingQuery query(
         when( query.queryText() ).thenReturn( queryText );
         when( query.queryParameters() ).thenReturn( params );
         when( query.startTime() ).thenReturn( startTime );
-        when( query.username() ).thenReturn( Optional.of(username) );
+        when( query.username() ).thenReturn( username );
         when( query.metaData() ).thenReturn( metaData );
         return query;
     }