Various small code cleanups.

neo4j · Jul 26, 2018 · 9bfce59 · 9bfce59
1 parent 75f6f42
commit 9bfce59
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipCursor.java
@@ -28,7 +28,6 @@ abstract class DefaultRelationshipCursor<STORECURSOR extends StorageRelationship
 {
     private boolean hasChanges;
     private boolean checkHasChanges;
-    private PropertyCursor propertyCursor;
     final DefaultCursors pool;
     Read read;
 

diff --git a/community/udc/src/main/java/org/neo4j/ext/udc/impl/Pinger.java b/community/udc/src/main/java/org/neo4j/ext/udc/impl/Pinger.java
@@ -50,11 +50,11 @@ void ping() throws IOException
 
         StringBuilder uri = new StringBuilder( "http://" + address + "/" + "?" );
 
-        for ( String key : usageDataMap.keySet() )
+        for ( Map.Entry<String,String> entry : usageDataMap.entrySet() )
         {
-            uri.append( key );
+            uri.append( entry.getKey() );
             uri.append( "=" );
-            uri.append( URLEncoder.encode( usageDataMap.get( key ), StandardCharsets.UTF_8.name() ) );
+            uri.append( URLEncoder.encode( entry.getValue(), StandardCharsets.UTF_8.name() ) );
             uri.append( "+" );
         }
 

diff --git a/...src/main/java/org/neo4j/cypher/internal/runtime/compiled/expressions/CompiledHelpers.java b/...src/main/java/org/neo4j/cypher/internal/runtime/compiled/expressions/CompiledHelpers.java
@@ -57,7 +57,7 @@ public static AnyValue loadVariable( ExecutionContext ctx, String name )
     {
         if ( !ctx.contains( name ) )
         {
-            throw new NotFoundException( String.format( "Unknown variable `%s`." ) );
+            throw new NotFoundException( String.format( "Unknown variable `%s`.", name ) );
         }
         return ctx.apply( name );
     }

diff --git a/enterprise/deferred-locks/src/main/java/org/neo4j/kernel/impl/locking/LockUnit.java b/enterprise/deferred-locks/src/main/java/org/neo4j/kernel/impl/locking/LockUnit.java
@@ -109,10 +109,10 @@ else if ( resourceType.typeId() != other.resourceType.typeId() )
     public int compareTo( LockUnit o )
     {
         // Exclusive locks go first to minimize amount of potential deadlocks
-        int exclusiveCompare = Boolean.compare( exclusive, o.exclusive );
+        int exclusiveCompare = Boolean.compare( o.exclusive, exclusive );
         if ( exclusiveCompare != 0 )
         {
-            return -exclusiveCompare;
+            return exclusiveCompare;
         }
 
         // Then shared/exclusive locks are compared by resourceTypeId and then by resourceId