Refactored DefaultIdGeneratorFactory to its own class

Replaced use of CommonFactorys.defaultIdGeneratorFactory with direct instantiation of DefaultIdGeneratorFactory

kernel/src/main/java/org/neo4j/kernel/AbstractGraphDatabase.java

@@ -500,7 +500,7 @@ protected FileSystemAbstraction createFileSystemAbstraction()
 
     protected IdGeneratorFactory createIdGeneratorFactory()
     {
-        return new CommonFactories.DefaultIdGeneratorFactory();
+        return new DefaultIdGeneratorFactory();
     }
 
     protected LockManager createLockManager()

kernel/src/main/java/org/neo4j/kernel/CommonFactories.java

@@ -19,41 +19,16 @@
  */
 package org.neo4j.kernel;
 
-import java.util.HashMap;
-import java.util.Map;
 import org.neo4j.kernel.impl.core.LastCommittedTxIdSetter;
 import org.neo4j.kernel.impl.nioneo.store.FileSystemAbstraction;
-import org.neo4j.kernel.impl.nioneo.store.IdGenerator;
-import org.neo4j.kernel.impl.nioneo.store.IdGeneratorImpl;
 import org.neo4j.kernel.impl.transaction.TxHook;
 import org.neo4j.kernel.impl.transaction.xaframework.DefaultLogBufferFactory;
 import org.neo4j.kernel.impl.transaction.xaframework.LogBufferFactory;
 import org.neo4j.kernel.impl.transaction.xaframework.RecoveryVerifier;
 
+@Deprecated
 public class CommonFactories
 {
-    public static class DefaultIdGeneratorFactory implements IdGeneratorFactory
-    {
-        private final Map<IdType, IdGenerator> generators = new HashMap<IdType, IdGenerator>();
-
-        public IdGenerator open( FileSystemAbstraction fs, String fileName, int grabSize, IdType idType,
-                long highestIdInUse, boolean startup )
-        {
-            IdGenerator generator = new IdGeneratorImpl( fs, fileName, grabSize, idType.getMaxValue(), idType.allowAggressiveReuse() );
-            generators.put( idType, generator );
-            return generator;
-        }
-
-        public IdGenerator get( IdType idType )
-        {
-            return generators.get( idType );
-        }
-
-        public void create( FileSystemAbstraction fs, String fileName )
-        {
-            IdGeneratorImpl.createGenerator( fs, fileName );
-        }
-    }
 
     public static IdGeneratorFactory defaultIdGeneratorFactory()
     {

kernel/src/main/java/org/neo4j/kernel/DefaultIdGeneratorFactory.java

@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2002-2012 "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;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.neo4j.kernel.impl.nioneo.store.FileSystemAbstraction;
+import org.neo4j.kernel.impl.nioneo.store.IdGenerator;
+import org.neo4j.kernel.impl.nioneo.store.IdGeneratorImpl;
+
+/**
+* TODO
+*/
+public class DefaultIdGeneratorFactory
+    implements IdGeneratorFactory
+{
+    private final Map<IdType, IdGenerator> generators = new HashMap<IdType, IdGenerator>();
+
+    public IdGenerator open( FileSystemAbstraction fs, String fileName, int grabSize, IdType idType,
+            long highestIdInUse, boolean startup )
+    {
+        IdGenerator generator = new IdGeneratorImpl( fs, fileName, grabSize, idType.getMaxValue(), idType.allowAggressiveReuse() );
+        generators.put( idType, generator );
+        return generator;
+    }
+
+    public IdGenerator get( IdType idType )
+    {
+        return generators.get( idType );
+    }
+
+    public void create( FileSystemAbstraction fs, String fileName )
+    {
+        IdGeneratorImpl.createGenerator( fs, fileName );
+    }
+}

kernel/src/main/java/org/neo4j/kernel/impl/batchinsert/BatchInserterImpl.java

@@ -32,9 +32,9 @@
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.factory.GraphDatabaseSetting;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
-import org.neo4j.kernel.CommonFactories;
 import org.neo4j.kernel.Config;
 import org.neo4j.kernel.DefaultFileSystemAbstraction;
+import org.neo4j.kernel.DefaultIdGeneratorFactory;
 import org.neo4j.kernel.EmbeddedGraphDatabase;
 import org.neo4j.kernel.IdGeneratorFactory;
 import org.neo4j.kernel.IdType;
@@ -101,7 +101,7 @@ public BatchInserterImpl( String storeDir,
         Config config = new Config( StringLogger.DEV_NULL, fileSystem, params );
         boolean dump = config.getBoolean( GraphDatabaseSettings.dump_configuration );
         this.storeDir = storeDir;
-        this.idGeneratorFactory = CommonFactories.defaultIdGeneratorFactory();
+        this.idGeneratorFactory = new DefaultIdGeneratorFactory();
 
         StoreFactory sf = new StoreFactory( config,idGeneratorFactory, fileSystem, null, StringLogger.DEV_NULL, null);
 

kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/StoreAccess.java

@@ -25,7 +25,7 @@
 import org.neo4j.graphdb.factory.GraphDatabaseSetting;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.kernel.AbstractGraphDatabase;
-import org.neo4j.kernel.CommonFactories;
+import org.neo4j.kernel.DefaultIdGeneratorFactory;
 import org.neo4j.kernel.IdGeneratorFactory;
 
 /**
@@ -166,7 +166,7 @@ private static Map<Object, Object> defaultParams()
         }
         params.put( GraphDatabaseSettings.rebuild_idgenerators_fast.name(), GraphDatabaseSetting.TRUE );
 
-        params.put( IdGeneratorFactory.class, new CommonFactories.DefaultIdGeneratorFactory() );
+        params.put( IdGeneratorFactory.class, new DefaultIdGeneratorFactory() );
         return params;
     }
 }

kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreMigrationTool.java

@@ -25,7 +25,6 @@
 import java.util.Map;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.factory.GraphDatabaseFactory;
-import org.neo4j.kernel.CommonFactories;
 import org.neo4j.kernel.Config;
 import org.neo4j.kernel.DefaultFileSystemAbstraction;
 import org.neo4j.kernel.impl.nioneo.store.FileSystemAbstraction;
@@ -65,7 +64,7 @@ private void run( String legacyStoreDirectory, String targetStoreDirectory ) thr
         File targetStoreFile = new File( targetStoreDirectory, NeoStore.DEFAULT_NAME );
         config.put( "neo_store", targetStoreFile.getPath() );
         FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction();
-        NeoStore neoStore = new StoreFactory(new Config( StringLogger.SYSTEM, fileSystem, config), CommonFactories.defaultIdGeneratorFactory(), fileSystem, null, StringLogger.SYSTEM, null).createNeoStore(targetStoreFile.getPath());
+        NeoStore neoStore = new StoreFactory(new Config( StringLogger.SYSTEM, fileSystem, config), new DefaultIdGeneratorFactory(), fileSystem, null, StringLogger.SYSTEM, null).createNeoStore(targetStoreFile.getPath());
 
         long startTime = System.currentTimeMillis();
 

kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/IdGeneratorRebuildFailureEmulationTest.java

@@ -40,6 +40,7 @@
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.kernel.AbstractGraphDatabase;
 import org.neo4j.kernel.Config;
+import org.neo4j.kernel.DefaultIdGeneratorFactory;
 import org.neo4j.kernel.IdGeneratorFactory;
 import org.neo4j.kernel.impl.util.StringLogger;
 import org.neo4j.test.ImpermanentGraphDatabase;
@@ -54,7 +55,6 @@
 import org.neo4j.tooling.GlobalGraphOperations;
 
 import static org.junit.Assert.*;
-import static org.neo4j.kernel.CommonFactories.*;
 
 @RunWith( Suite.class )
 @SuiteClasses( { IdGeneratorRebuildFailureEmulationTest.FailureBeforeRebuild.class,
@@ -150,7 +150,7 @@ public void initialize()
         graphdb.shutdown();
         Map<String, String> config = new HashMap<String, String>();
         config.put( GraphDatabaseSettings.rebuild_idgenerators_fast.name(), GraphDatabaseSetting.FALSE );
-        factory = new StoreFactory( new Config( StringLogger.SYSTEM, fs, config ), defaultIdGeneratorFactory(), fs, null, StringLogger.SYSTEM, null );
+        factory = new StoreFactory( new Config( StringLogger.SYSTEM, fs, config ), new DefaultIdGeneratorFactory(), fs, null, StringLogger.SYSTEM, null );
     }
 
     @After
@@ -258,7 +258,7 @@ protected FileSystemAbstraction createFileSystemAbstraction()
         @Override
         protected IdGeneratorFactory createIdGeneratorFactory()
         {
-            return defaultIdGeneratorFactory();
+            return new DefaultIdGeneratorFactory();
         }
     }
 

kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/StoreVersionTest.java

@@ -26,7 +26,6 @@
 import java.util.Map;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.neo4j.kernel.CommonFactories;
 import org.neo4j.kernel.Config;
 import org.neo4j.kernel.DefaultFileSystemAbstraction;
 import org.neo4j.kernel.impl.storemigration.StoreMigrator;
@@ -49,7 +48,7 @@ public void allStoresShouldHaveTheCurrentVersionIdentifier() throws IOException
         Map<String,String> config = new HashMap<String, String>();
         config.put( "neo_store", storeFileName );
         FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction();
-        StoreFactory sf = new StoreFactory(new Config( StringLogger.DEV_NULL, fileSystem, config ), CommonFactories.defaultIdGeneratorFactory(), fileSystem, null, StringLogger.SYSTEM, null);
+        StoreFactory sf = new StoreFactory(new Config( StringLogger.DEV_NULL, fileSystem, config ), new DefaultIdGeneratorFactory(), fileSystem, null, StringLogger.SYSTEM, null);
         NeoStore neoStore = sf.createNeoStore(storeFileName);
 
         CommonAbstractStore[] stores = {
@@ -83,7 +82,7 @@ public void shouldFailToCreateAStoreContainingOldVersionNumber() throws IOExcept
         Config config = new Config( StringLogger.SYSTEM, fileSystem, new HashMap<String, String>(  ) );
 
         try {
-            new NodeStore( workingFile.getPath(), config, CommonFactories.defaultIdGeneratorFactory(), fileSystem, StringLogger.SYSTEM );
+            new NodeStore( workingFile.getPath(), config, new DefaultIdGeneratorFactory(), fileSystem, StringLogger.SYSTEM );
             fail( "Should have thrown exception" );
         } catch ( NotCurrentStoreVersionException e ) {
             //expected
@@ -104,7 +103,7 @@ public void neoStoreHasCorrectStoreVersionField() throws IOException
         Map<String,String> config = new HashMap<String, String>();
         config.put( "neo_store", storeFileName );
         FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction();
-        StoreFactory sf = new StoreFactory(new Config(StringLogger.DEV_NULL, fileSystem, config), CommonFactories.defaultIdGeneratorFactory(), fileSystem, null, StringLogger.SYSTEM, null);
+        StoreFactory sf = new StoreFactory(new Config(StringLogger.DEV_NULL, fileSystem, config), new DefaultIdGeneratorFactory(), fileSystem, null, StringLogger.SYSTEM, null);
         NeoStore neoStore = sf.createNeoStore(storeFileName);
         // The first checks the instance method, the other the public one
         assertEquals( CommonAbstractStore.ALL_STORES_VERSION,

kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestDynamicStore.java

@@ -34,7 +34,6 @@
 import java.util.logging.Logger;
 import org.junit.Test;
 import org.neo4j.helpers.collection.MapUtil;
-import org.neo4j.kernel.CommonFactories;
 import org.neo4j.kernel.Config;
 import org.neo4j.kernel.DefaultFileSystemAbstraction;
 import org.neo4j.kernel.IdGeneratorFactory;
@@ -47,7 +46,7 @@
 public class TestDynamicStore
 {
     public static IdGeneratorFactory ID_GENERATOR_FACTORY =
-            CommonFactories.defaultIdGeneratorFactory();
+            new DefaultIdGeneratorFactory();
     public static FileSystemAbstraction FILE_SYSTEM =
             new DefaultFileSystemAbstraction();
 

kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestGraphProperties.java

@@ -38,6 +38,7 @@
 import org.neo4j.graphdb.factory.GraphDatabaseFactory;
 import org.neo4j.kernel.Config;
 import org.neo4j.kernel.DefaultFileSystemAbstraction;
+import org.neo4j.kernel.DefaultIdGeneratorFactory;
 import org.neo4j.kernel.GraphDatabaseSPI;
 import org.neo4j.kernel.impl.core.GraphProperties;
 import org.neo4j.kernel.impl.util.StringLogger;
@@ -49,7 +50,6 @@
 import static java.util.Arrays.*;
 import static org.junit.Assert.*;
 import static org.neo4j.helpers.collection.IteratorUtil.*;
-import static org.neo4j.kernel.CommonFactories.*;
 import static org.neo4j.kernel.impl.util.IoPrimitiveUtils.*;
 import static org.neo4j.test.TargetDirectory.*;
 
@@ -186,7 +186,7 @@ public void firstRecordOtherThanZeroIfNotFirst() throws Exception
         db.shutdown();
 
         FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction();
-        NeoStore neoStore = new StoreFactory(new Config( StringLogger.DEV_NULL, fileSystem, Collections.<String,String>emptyMap()), defaultIdGeneratorFactory(), fileSystem, null, StringLogger.DEV_NULL, null).newNeoStore(new File( storeDir, NeoStore.DEFAULT_NAME ).getAbsolutePath());
+        NeoStore neoStore = new StoreFactory(new Config( StringLogger.DEV_NULL, fileSystem, Collections.<String,String>emptyMap()), new DefaultIdGeneratorFactory(), fileSystem, null, StringLogger.DEV_NULL, null).newNeoStore(new File( storeDir, NeoStore.DEFAULT_NAME ).getAbsolutePath());
         long prop = neoStore.getGraphNextProp();
         assertTrue( prop != 0 );
         neoStore.close();

kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestNeoStore.java

@@ -43,7 +43,6 @@
 import org.neo4j.helpers.Pair;
 import org.neo4j.helpers.collection.CombiningIterable;
 import org.neo4j.helpers.collection.MapUtil;
-import org.neo4j.kernel.CommonFactories;
 import org.neo4j.kernel.Config;
 import org.neo4j.kernel.DefaultFileSystemAbstraction;
 import org.neo4j.kernel.impl.AbstractNeo4jTestCase;
@@ -99,7 +98,7 @@ public void setUpNeoStore() throws Exception
 
         FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction();
         Config config = new Config( StringLogger.SYSTEM, fileSystem, new HashMap<String,String>(  ) );
-        StoreFactory sf = new StoreFactory(config, CommonFactories.defaultIdGeneratorFactory(), fileSystem, null, StringLogger.SYSTEM, null);
+        StoreFactory sf = new StoreFactory(config, new DefaultIdGeneratorFactory(), fileSystem, null, StringLogger.SYSTEM, null);
         sf.createNeoStore(file( "neo" )).close();
     }
 
@@ -154,7 +153,7 @@ private void initializeStores() throws IOException
                         "store_dir", path(),
                         "neo_store", file("neo"),
                         "logical_log", file("nioneo_logical.log")) );
-        StoreFactory sf = new StoreFactory(config, CommonFactories.defaultIdGeneratorFactory(), fileSystem, null, StringLogger.DEV_NULL, null);
+        StoreFactory sf = new StoreFactory(config, new DefaultIdGeneratorFactory(), fileSystem, null, StringLogger.DEV_NULL, null);
 
         ds = new NeoStoreXaDataSource(config, sf, fileSystem, lockManager, lockReleaser, StringLogger.DEV_NULL,
                 new XaFactory(config, TxIdGenerator.DEFAULT, new PlaceboTm(),
@@ -1026,7 +1025,7 @@ public void testSetBlockSize() throws Exception
         FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction();
         Config config = new Config(StringLogger.SYSTEM, fileSystem, MapUtil.stringMap( "string_block_size", "62",
                                                                            "array_block_size", "302" ));
-        StoreFactory sf = new StoreFactory(config, CommonFactories.defaultIdGeneratorFactory(), fileSystem, null, StringLogger.DEV_NULL, null);
+        StoreFactory sf = new StoreFactory(config, new DefaultIdGeneratorFactory(), fileSystem, null, StringLogger.DEV_NULL, null);
         sf.createNeoStore(file( "neo" )).close();
 
 
@@ -1049,7 +1048,7 @@ public void setVersion() throws Exception
 
         FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction();
         StoreFactory sf = new StoreFactory(new Config( StringLogger.DEV_NULL, fileSystem, new HashMap<String, String>(  ) ),
-                CommonFactories.defaultIdGeneratorFactory(), fileSystem, null, StringLogger.DEV_NULL, null);
+                new DefaultIdGeneratorFactory(), fileSystem, null, StringLogger.DEV_NULL, null);
 
         NeoStore neoStore = sf.newNeoStore(new File( storeDir, NeoStore.DEFAULT_NAME ).getAbsolutePath());
         assertEquals( 12, neoStore.getVersion() );

kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestStore.java

@@ -25,7 +25,6 @@
 import java.util.List;
 import org.junit.Test;
 import org.neo4j.helpers.collection.MapUtil;
-import org.neo4j.kernel.CommonFactories;
 import org.neo4j.kernel.Config;
 import org.neo4j.kernel.DefaultFileSystemAbstraction;
 import org.neo4j.kernel.IdGeneratorFactory;
@@ -38,7 +37,7 @@
 public class TestStore
 {
     public static IdGeneratorFactory ID_GENERATOR_FACTORY =
-            CommonFactories.defaultIdGeneratorFactory();
+            new DefaultIdGeneratorFactory();
     public static FileSystemAbstraction FILE_SYSTEM =
             new DefaultFileSystemAbstraction();
 

kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestXa.java

@@ -42,7 +42,6 @@
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.helpers.Pair;
 import org.neo4j.helpers.collection.MapUtil;
-import org.neo4j.kernel.CommonFactories;
 import org.neo4j.kernel.Config;
 import org.neo4j.kernel.DefaultFileSystemAbstraction;
 import org.neo4j.kernel.impl.AbstractNeo4jTestCase;
@@ -122,7 +121,7 @@ public void setUpNeoStore() throws Exception
         propertyIndexes = new HashMap<String, PropertyIndex>();
 
         FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction();
-        StoreFactory sf = new StoreFactory(new Config( StringLogger.DEV_NULL, fileSystem, Collections.<String,String>emptyMap() ), CommonFactories.defaultIdGeneratorFactory(), fileSystem, null, StringLogger.DEV_NULL, null);
+        StoreFactory sf = new StoreFactory(new Config( StringLogger.DEV_NULL, fileSystem, Collections.<String,String>emptyMap() ), new DefaultIdGeneratorFactory(), fileSystem, null, StringLogger.DEV_NULL, null);
         sf.createNeoStore(file( "neo" )).close();
 
         lockManager = getEmbeddedGraphDb().getLockManager();
@@ -417,7 +416,7 @@ private NeoStoreXaDataSource newNeoStore() throws InstantiationException,
             "neo_store", file( "neo" ),
             "logical_log", file( "nioneo_logical.log" ) ));
 
-        StoreFactory sf = new StoreFactory(config, CommonFactories.defaultIdGeneratorFactory(), fileSystem, null, StringLogger.DEV_NULL, null);
+        StoreFactory sf = new StoreFactory(config, new DefaultIdGeneratorFactory(), fileSystem, null, StringLogger.DEV_NULL, null);
 
         PlaceboTm txManager = new PlaceboTm();
         LogBufferFactory logBufferFactory = new DefaultLogBufferFactory();

server/src/main/java/org/neo4j/server/storemigration/PreStartupStoreUpgrader.java

@@ -24,7 +24,6 @@
 import java.io.PrintStream;
 import java.util.HashMap;
 import java.util.Properties;
-import org.neo4j.kernel.CommonFactories;
 import org.neo4j.kernel.Config;
 import org.neo4j.kernel.DefaultFileSystemAbstraction;
 import org.neo4j.kernel.impl.nioneo.store.FileSystemAbstraction;
@@ -98,7 +97,7 @@ public int run()
             Config conf = new Config( StringLogger.SYSTEM, fileSystem, config );
             StoreUpgrader storeUpgrader = new StoreUpgrader( conf, StringLogger.SYSTEM,new ConfigMapUpgradeConfiguration( conf ),
                     new UpgradableDatabase(), new StoreMigrator( new VisibleMigrationProgressMonitor( out ) ),
-                    new DatabaseFiles(), CommonFactories.defaultIdGeneratorFactory(), fileSystem );
+                    new DatabaseFiles(), new DefaultIdGeneratorFactory(), fileSystem );
 
             try
             {