From c5a7772e9099db80a10ca78ee4a55fef0378beb4 Mon Sep 17 00:00:00 2001
From: Craig Taverner <craig@amanzi.com>
Date: Mon, 18 Jun 2018 16:01:09 +0200
Subject: [PATCH] Checkstyle

---
 .../kernel/impl/index/schema/SpatialIndexAccessor.java | 10 +++++-----
 .../kernel/impl/index/schema/SpatialIndexFiles.java    |  5 +++++
 .../impl/index/schema/SpatialIndexPopulator.java       |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexAccessor.java
index 387718523247..c2d7ec66219a 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexAccessor.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexAccessor.java
@@ -189,7 +189,7 @@ static class PartAccessor extends NativeIndexAccessor<SpatialIndexKey,NativeInde
                 RecoveryCleanupWorkCollector recoveryCleanupWorkCollector, IndexProvider.Monitor monitor, StoreIndexDescriptor descriptor,
                 IndexSamplingConfig samplingConfig, SpaceFillingCurveConfiguration searchConfiguration ) throws IOException
         {
-            super( pageCache, fs, fileLayout.spatialFile.indexFile, fileLayout.layout, recoveryCleanupWorkCollector, monitor, descriptor, samplingConfig );
+            super( pageCache, fs, fileLayout.getIndexFile(), fileLayout.layout, recoveryCleanupWorkCollector, monitor, descriptor, samplingConfig );
             this.layout = fileLayout.layout;
             this.descriptor = descriptor;
             this.samplingConfig = samplingConfig;
@@ -237,16 +237,16 @@ static class PartFactory implements Factory<PartAccessor>
         @Override
         public PartAccessor newSpatial( CoordinateReferenceSystem crs ) throws IOException
         {
-            SpatialIndexFiles.SpatialFile indexFile = spatialIndexFiles.forCrs( crs );
-            if ( !fs.fileExists( indexFile.indexFile ) )
+            SpatialIndexFiles.SpatialFile spatialFile = spatialIndexFiles.forCrs( crs );
+            if ( !fs.fileExists( spatialFile.indexFile ) )
             {
-                SpatialIndexFiles.SpatialFileLayout fileLayout = indexFile.getLayoutForNewIndex();
+                SpatialIndexFiles.SpatialFileLayout fileLayout = spatialFile.getLayoutForNewIndex();
                 createEmptyIndex( fileLayout );
                 return createPartAccessor( fileLayout );
             }
             else
             {
-                return createPartAccessor( indexFile.getLayoutForExistingIndex( pageCache ) );
+                return createPartAccessor( spatialFile.getLayoutForExistingIndex( pageCache ) );
             }
         }
 
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexFiles.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexFiles.java
index c809087a7f2b..39c70a9139c2 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexFiles.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexFiles.java
@@ -133,5 +133,10 @@ static class SpatialFileLayout
             this.settings = settings;
             this.layout = new SpatialLayout( spatialFile.crs, settings.curve() );
         }
+
+        public File getIndexFile()
+        {
+            return spatialFile.indexFile;
+        }
     }
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPopulator.java
index 369231406f4f..c6022c68ee33 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPopulator.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/SpatialIndexPopulator.java
@@ -151,7 +151,7 @@ static class PartPopulator extends NativeIndexPopulator<SpatialIndexKey,NativeIn
         PartPopulator( PageCache pageCache, FileSystemAbstraction fs, SpatialIndexFiles.SpatialFileLayout fileLayout, IndexProvider.Monitor monitor,
                        StoreIndexDescriptor descriptor, IndexSamplingConfig samplingConfig, SpaceFillingCurveConfiguration configuration )
         {
-            super( pageCache, fs, fileLayout.spatialFile.indexFile, fileLayout.layout, monitor, descriptor, samplingConfig );
+            super( pageCache, fs, fileLayout.getIndexFile(), fileLayout.layout, monitor, descriptor, samplingConfig );
             this.configuration = configuration;
             this.settings = fileLayout.settings;
         }