Formatting and naming comments.

neo4j · Jan 23, 2018 · eab3a3b · eab3a3b
1 parent 47fd9a0
commit eab3a3b
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 20 deletions.
diff --git a/...nternal/javacompat/EagerResultITTest.java → ...er/internal/javacompat/EagerResultIT.java b/...nternal/javacompat/EagerResultITTest.java → ...er/internal/javacompat/EagerResultIT.java
@@ -71,7 +71,7 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-public class EagerResultITTest
+public class EagerResultIT
 {
     @Rule
     public final TestDirectory testDirectory = TestDirectory.testDirectory();

diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCache.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCache.java
@@ -196,8 +196,8 @@ public class MuninnPageCache implements PageCache
 
     // 'true' (the default) if we should print any exceptions we get when unmapping a file.
     private boolean printExceptionsOnClose;
-    private PageCursorTracerSupplier pageCursorTracerSupplier;
-    private VersionContextSupplier versionContextSupplier;
+    private final PageCursorTracerSupplier pageCursorTracerSupplier;
+    private final VersionContextSupplier versionContextSupplier;
 
     /**
      * Create page cache

diff --git a/...y/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/context/EmptyVersionContext.java b/...y/io/src/main/java/org/neo4j/io/pagecache/tracing/cursor/context/EmptyVersionContext.java
@@ -39,7 +39,6 @@ public void initRead()
     @Override
     public void initWrite( long committingTransactionId )
     {
-
     }
 
     @Override
@@ -57,7 +56,6 @@ public long lastClosedTransactionId()
     @Override
     public void markAsDirty()
     {
-
     }
 
     @Override

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java b/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java
@@ -287,20 +287,42 @@ boolean applicable( DiagnosticsPhase phase )
      * core API are now slowly accumulating in the Kernel implementation. Over time, these components should be
      * refactored into bigger components that wrap the very granular things we depend on here.
      */
-    public NeoStoreDataSource( File storeDir, Config config, IdGeneratorFactory idGeneratorFactory,
-            LogService logService, JobScheduler scheduler, TokenNameLookup tokenNameLookup,
-            DependencyResolver dependencyResolver, PropertyKeyTokenHolder propertyKeyTokens,
-            LabelTokenHolder labelTokens, RelationshipTypeTokenHolder relationshipTypeTokens,
-            StatementLocksFactory statementLocksFactory, SchemaWriteGuard schemaWriteGuard,
-            TransactionEventHandlers transactionEventHandlers, IndexingService.Monitor indexingServiceMonitor,
-            FileSystemAbstraction fs, TransactionMonitor transactionMonitor, DatabaseHealth databaseHealth,
+    public NeoStoreDataSource(
+            File storeDir,
+            Config config,
+            IdGeneratorFactory idGeneratorFactory,
+            LogService logService,
+            JobScheduler scheduler,
+            TokenNameLookup tokenNameLookup,
+            DependencyResolver dependencyResolver,
+            PropertyKeyTokenHolder propertyKeyTokens,
+            LabelTokenHolder labelTokens,
+            RelationshipTypeTokenHolder relationshipTypeTokens,
+            StatementLocksFactory statementLocksFactory,
+            SchemaWriteGuard schemaWriteGuard,
+            TransactionEventHandlers transactionEventHandlers,
+            IndexingService.Monitor indexingServiceMonitor,
+            FileSystemAbstraction fs,
+            TransactionMonitor transactionMonitor,
+            DatabaseHealth databaseHealth,
             PhysicalLogFile.Monitor physicalLogMonitor,
             TransactionHeaderInformationFactory transactionHeaderInformationFactory,
-            StartupStatisticsProvider startupStatistics, Guard guard, CommitProcessFactory commitProcessFactory,
-            AutoIndexing autoIndexing, PageCache pageCache, ConstraintSemantics constraintSemantics, Monitors monitors,
-            Tracers tracers, Procedures procedures, IOLimiter ioLimiter, AvailabilityGuard availabilityGuard,
-            SystemNanoClock clock, AccessCapability accessCapability, StoreCopyCheckPointMutex storeCopyCheckPointMutex,
-            IdController idController, VersionContextSupplier versionContextSupplier )
+            StartupStatisticsProvider startupStatistics,
+            Guard guard,
+            CommitProcessFactory commitProcessFactory,
+            AutoIndexing autoIndexing,
+            PageCache pageCache,
+            ConstraintSemantics constraintSemantics,
+            Monitors monitors,
+            Tracers tracers,
+            Procedures procedures,
+            IOLimiter ioLimiter,
+            AvailabilityGuard availabilityGuard,
+            SystemNanoClock clock,
+            AccessCapability accessCapability,
+            StoreCopyCheckPointMutex storeCopyCheckPointMutex,
+            IdController idController,
+            VersionContextSupplier versionContextSupplier )
     {
         this.storeDir = storeDir;
         this.config = config;

diff --git a/...ity/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactory.java b/...ity/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactory.java
@@ -56,7 +56,7 @@ public class ConfiguringPageCacheFactory
      * @param config page swapper configuration
      * @param pageCacheTracer global page cache tracer
      * @param pageCursorTracerSupplier supplier of thread local (transaction local) page cursor tracer that will provide
-* thread local page cache statistics
+     * thread local page cache statistics
      * @param log page cache factory log
      * @param versionContextSupplier cursor context factory
      */

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/CountsTracker.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/CountsTracker.java
@@ -93,8 +93,9 @@ public CountsTracker( final LogProvider logProvider, FileSystemAbstraction fs, P
     public CountsTracker( final LogProvider logProvider, FileSystemAbstraction fs, PageCache pages, Config config,
             File baseFile, Clock clock, VersionContextSupplier versionContextSupplier )
     {
-        super( fs, pages, baseFile, new CountsTrackerRotationMonitor( logProvider ), new RotationTimerFactory( clock,
-                config.get( counts_store_rotation_timeout ).toMillis() ), versionContextSupplier,16, 16, HEADER_FIELDS );
+        super( fs, pages, baseFile, new CountsTrackerRotationMonitor( logProvider ),
+                new RotationTimerFactory( clock, config.get( counts_store_rotation_timeout ).toMillis() ),
+                versionContextSupplier, 16, 16, HEADER_FIELDS );
     }
 
     public CountsTracker setInitializer( final DataInitializer<Updater> initializer )