Remove deprecated code from KernelExtensionFactory

community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java

@@ -55,6 +55,7 @@
 import org.neo4j.kernel.configuration.ConfigValues;
 import org.neo4j.kernel.extension.KernelExtensionFactory;
 import org.neo4j.kernel.impl.logging.LogService;
+import org.neo4j.kernel.impl.spi.KernelContext;
 import org.neo4j.kernel.impl.util.JobScheduler;
 import org.neo4j.kernel.lifecycle.LifeSupport;
 import org.neo4j.kernel.lifecycle.Lifecycle;
@@ -173,7 +174,7 @@ public BoltKernelExtension()
     }
 
     @Override
-    public Lifecycle newKernelExtension( final Dependencies dependencies ) throws Throwable
+    public Lifecycle newInstance( KernelContext context, Dependencies dependencies ) throws Throwable
     {
         final Config config = dependencies.config();
         final GraphDatabaseService gdb = dependencies.db();
@@ -189,8 +190,6 @@ public Lifecycle newKernelExtension( final Dependencies dependencies ) throws Th
                 life.add( new StandardSessions( api, dependencies.usageData(), logging ) ),
                 scheduler, logging );
 
-
-
         List<NettyServer.ProtocolInitializer> connectors = new ArrayList<>();
 
         List<Configuration> view = config.view( Settings.connector_group );

community/jmx/src/main/java/org/neo4j/jmx/impl/JmxExtensionFactory.java

@@ -23,6 +23,7 @@
 import org.neo4j.kernel.KernelData;
 import org.neo4j.kernel.extension.KernelExtensionFactory;
 import org.neo4j.kernel.impl.logging.LogService;
+import org.neo4j.kernel.impl.spi.KernelContext;
 import org.neo4j.kernel.lifecycle.Lifecycle;
 
 @Service.Implementation(KernelExtensionFactory.class)
@@ -35,7 +36,6 @@ public interface Dependencies
         LogService getLogService();
     }
 
-
     public static final String KEY = "kernel jmx";
 
     public JmxExtensionFactory()
@@ -44,8 +44,9 @@ public JmxExtensionFactory()
     }
 
     @Override
-    public Lifecycle newKernelExtension( Dependencies dependencies ) throws Throwable
+    public Lifecycle newInstance( KernelContext context, Dependencies dependencies ) throws Throwable
     {
-        return new JmxKernelExtension( dependencies.getKernelData(), dependencies.getLogService().getInternalLogProvider() );
+        return new JmxKernelExtension(
+                dependencies.getKernelData(), dependencies.getLogService().getInternalLogProvider() );
     }
 }

community/kernel/src/main/java/org/neo4j/kernel/extension/KernelExtensionFactory.java

@@ -36,25 +36,10 @@ protected KernelExtensionFactory( String key )
      *
      * @return a class or null if no settings are needed
      */
-    public Class getSettingsClass()
+    public Class<?> getSettingsClass()
     {
         return null;
     }
-
-    /**
-     * Create a new instance of this kernel extension.
-     *
-     * @param dependencies Dependencies
-     * @return the lifecycle for the instance
-     * @deprecated use {@link #newInstance(KernelContext, Object)} instead
-     * @throws Throwable depends on the implementation
-     */
-    @Deprecated
-    public Lifecycle newKernelExtension( DEPENDENCIES dependencies )
-            throws Throwable
-    {
-        throw new UnsupportedOperationException( "deprecated" );
-    }
 
     /**
      * Create a new instance of this kernel extension.
@@ -64,10 +49,7 @@ public Lifecycle newKernelExtension( DEPENDENCIES dependencies )
      * @return the {@link Lifecycle} for the extension
      * @throws Throwable if there is an error
      */
-    public Lifecycle newInstance( @SuppressWarnings( "unused" ) KernelContext context, DEPENDENCIES dependencies ) throws Throwable
-    {
-        return newKernelExtension( dependencies );
-    }
+    public abstract Lifecycle newInstance( KernelContext context, DEPENDENCIES dependencies ) throws Throwable;
 
     @Override
     public String toString()

community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java

@@ -30,10 +30,10 @@
 import org.neo4j.graphdb.security.URLAccessRule;
 import org.neo4j.helpers.Clock;
 import org.neo4j.helpers.collection.Iterables;
+import org.neo4j.io.fs.DefaultFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.kernel.AvailabilityGuard;
-import org.neo4j.io.fs.DefaultFileSystemAbstraction;
 import org.neo4j.kernel.StoreLocker;
 import org.neo4j.kernel.StoreLockerLifecycleAdapter;
 import org.neo4j.kernel.Version;
@@ -47,6 +47,7 @@
 import org.neo4j.kernel.impl.pagecache.PageCacheLifecycle;
 import org.neo4j.kernel.impl.security.URLAccessRules;
 import org.neo4j.kernel.impl.spi.KernelContext;
+import org.neo4j.kernel.impl.spi.SimpleKernelContext;
 import org.neo4j.kernel.impl.transaction.TransactionStats;
 import org.neo4j.kernel.impl.transaction.state.DataSourceManager;
 import org.neo4j.kernel.impl.util.JobScheduler;
@@ -169,20 +170,7 @@ public DependencyResolver get()
 
         transactionMonitor = dependencies.satisfyDependency( createTransactionStats() );
 
-        KernelContext kernelContext = dependencies.satisfyDependency( new KernelContext()
-        {
-            @Override
-            public FileSystemAbstraction fileSystem()
-            {
-                return PlatformModule.this.fileSystem;
-            }
-
-            @Override
-            public File storeDir()
-            {
-                return PlatformModule.this.storeDir;
-            }
-        } );
+        KernelContext kernelContext = dependencies.satisfyDependency( new SimpleKernelContext( fileSystem, storeDir ) );
 
         kernelExtensions = dependencies.satisfyDependency( new KernelExtensions(
                 kernelContext,
@@ -291,9 +279,10 @@ private Iterable<Class<?>> getSettingsClasses( Iterable<Class<?>> settingsClasse
         // Get the list of settings classes for extensions
         for ( KernelExtensionFactory<?> kernelExtension : kernelExtensions )
         {
-            if ( kernelExtension.getSettingsClass() != null )
+            Class<?> settingsClass = kernelExtension.getSettingsClass();
+            if ( settingsClass != null )
             {
-                totalSettingsClasses.add( kernelExtension.getSettingsClass() );
+                totalSettingsClasses.add( settingsClass );
             }
         }
 

community/kernel/src/main/java/org/neo4j/kernel/impl/spi/SimpleKernelContext.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2002-2015 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.kernel.impl.spi;
+
+import java.io.File;
+
+import org.neo4j.io.fs.FileSystemAbstraction;
+
+public class SimpleKernelContext implements KernelContext
+{
+    private final FileSystemAbstraction fileSystem;
+    private final File storeDir;
+
+    public SimpleKernelContext( FileSystemAbstraction fileSystem, File storeDir )
+    {
+        this.fileSystem = fileSystem;
+        this.storeDir = storeDir;
+    }
+
+    @Override
+    public FileSystemAbstraction fileSystem()
+    {
+        return fileSystem;
+    }
+
+    @Override
+    public File storeDir()
+    {
+        return storeDir;
+    }
+}

community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/BatchInserterImpl.java

@@ -46,15 +46,12 @@
 import org.neo4j.helpers.collection.IteratorUtil;
 import org.neo4j.helpers.collection.IteratorWrapper;
 import org.neo4j.helpers.collection.Visitor;
+import org.neo4j.io.fs.DefaultFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.fs.FileUtils;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
-import org.neo4j.io.fs.DefaultFileSystemAbstraction;
-import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory;
 import org.neo4j.kernel.EmbeddedGraphDatabase;
-import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
-import org.neo4j.kernel.impl.store.id.IdType;
 import org.neo4j.kernel.StoreLocker;
 import org.neo4j.kernel.api.constraints.NodePropertyExistenceConstraint;
 import org.neo4j.kernel.api.constraints.RelationshipPropertyExistenceConstraint;
@@ -100,7 +97,7 @@
 import org.neo4j.kernel.impl.logging.StoreLogService;
 import org.neo4j.kernel.impl.pagecache.ConfiguringPageCacheFactory;
 import org.neo4j.kernel.impl.pagecache.PageCacheLifecycle;
-import org.neo4j.kernel.impl.spi.KernelContext;
+import org.neo4j.kernel.impl.spi.SimpleKernelContext;
 import org.neo4j.kernel.impl.store.CountsComputer;
 import org.neo4j.kernel.impl.store.LabelTokenStore;
 import org.neo4j.kernel.impl.store.NeoStores;
@@ -115,7 +112,10 @@
 import org.neo4j.kernel.impl.store.StoreFactory;
 import org.neo4j.kernel.impl.store.UnderlyingStorageException;
 import org.neo4j.kernel.impl.store.counts.CountsTracker;
+import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory;
+import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
 import org.neo4j.kernel.impl.store.id.IdGeneratorImpl;
+import org.neo4j.kernel.impl.store.id.IdType;
 import org.neo4j.kernel.impl.store.record.DynamicRecord;
 import org.neo4j.kernel.impl.store.record.IndexRule;
 import org.neo4j.kernel.impl.store.record.LabelTokenRecord;
@@ -300,23 +300,8 @@ public Label apply( long from )
         Dependencies deps = new Dependencies();
         deps.satisfyDependencies( fileSystem, config, logService, (NeoStoresSupplier) () -> neoStores );
 
-        KernelContext kernelContext = new KernelContext()
-        {
-            @Override
-            public FileSystemAbstraction fileSystem()
-            {
-                return fileSystem;
-            }
-
-            @Override
-            public File storeDir()
-            {
-                return storeDir;
-            }
-        };
-        KernelExtensions extensions = life
-                .add( new KernelExtensions( kernelContext, kernelExtensions, deps,
-                                            UnsatisfiedDependencyStrategies.ignore() ) );
+        KernelExtensions extensions = life.add( new KernelExtensions( new SimpleKernelContext( fileSystem, storeDir ),
+                kernelExtensions, deps, UnsatisfiedDependencyStrategies.ignore() ) );
 
         SchemaIndexProvider provider = extensions.resolveDependency( SchemaIndexProvider.class,
                 HighestSelectionStrategy.getInstance() );

community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStores.java

@@ -38,6 +38,7 @@
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.pagecache.ConfiguringPageCacheFactory;
 import org.neo4j.kernel.impl.spi.KernelContext;
+import org.neo4j.kernel.impl.spi.SimpleKernelContext;
 import org.neo4j.kernel.impl.store.NeoStores;
 import org.neo4j.kernel.impl.store.NodeStore;
 import org.neo4j.kernel.impl.store.PropertyStore;
@@ -60,7 +61,6 @@
 import org.neo4j.unsafe.impl.batchimport.store.io.IoTracer;
 
 import static java.lang.String.valueOf;
-
 import static org.neo4j.graphdb.factory.GraphDatabaseSettings.dense_node_threshold;
 import static org.neo4j.graphdb.factory.GraphDatabaseSettings.pagecache_memory;
 import static org.neo4j.helpers.collection.MapUtil.stringMap;
@@ -134,20 +134,7 @@ public long countBytesWritten()
         dependencies.satisfyDependency( fileSystem );
         dependencies.satisfyDependency( this );
         dependencies.satisfyDependency( logService );
-        KernelContext kernelContext = new KernelContext()
-        {
-            @Override
-            public FileSystemAbstraction fileSystem()
-            {
-                return BatchingNeoStores.this.fileSystem;
-            }
-
-            @Override
-            public File storeDir()
-            {
-                return BatchingNeoStores.this.storeDir;
-            }
-        };
+        KernelContext kernelContext = new SimpleKernelContext( fileSystem, storeDir );
         @SuppressWarnings( { "unchecked", "rawtypes" } )
         KernelExtensions extensions = life.add( new KernelExtensions(
                 kernelContext, (Iterable) Service.load( KernelExtensionFactory.class ),

community/kernel/src/test/java/org/neo4j/kernel/DummyExtensionFactory.java

@@ -23,6 +23,7 @@
 
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.extension.KernelExtensionFactory;
+import org.neo4j.kernel.impl.spi.KernelContext;
 import org.neo4j.kernel.lifecycle.Lifecycle;
 
 public class DummyExtensionFactory extends KernelExtensionFactory<DummyExtensionFactory.Dependencies>
@@ -44,7 +45,7 @@ public DummyExtensionFactory()
     }
 
     @Override
-    public Lifecycle newKernelExtension( Dependencies dependencies ) throws Throwable
+    public Lifecycle newInstance( KernelContext context, Dependencies dependencies ) throws Throwable
     {
         return new DummyExtension( dependencies );
     }

community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java

@@ -49,6 +49,7 @@
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.locking.Lock;
 import org.neo4j.kernel.impl.locking.LockService;
+import org.neo4j.kernel.impl.spi.KernelContext;
 import org.neo4j.kernel.lifecycle.Lifecycle;
 import org.neo4j.test.TargetDirectory;
 import org.neo4j.test.TestGraphDatabaseFactory;
@@ -1017,12 +1018,12 @@ private static class PredefinedSchemaIndexProviderFactory extends KernelExtensio
         private final SchemaIndexProvider indexProvider;
 
         @Override
-        public Lifecycle newKernelExtension( NoDeps noDeps ) throws Throwable
+        public Lifecycle newInstance( KernelContext context, NoDeps noDeps ) throws Throwable
         {
             return indexProvider;
         }
 
-        public static interface NoDeps {
+        public interface NoDeps {
         }
 
         public PredefinedSchemaIndexProviderFactory( SchemaIndexProvider indexProvider )