Moved o.n.k.i.s.StoreId to o.n.storageengine.api

neo4j · Aug 10, 2018 · ad3f86a · ad3f86a
1 parent 49d3b9b
commit ad3f86a
Show file tree

Hide file tree

Showing 90 changed files with 108 additions and 111 deletions.
diff --git a/community/community-it/it-test-support/src/main/java/org/neo4j/test/rule/DatabaseRule.java b/community/community-it/it-test-support/src/main/java/org/neo4j/test/rule/DatabaseRule.java
@@ -57,9 +57,9 @@
 import org.neo4j.kernel.api.Statement;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.coreapi.InternalTransaction;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.monitoring.Monitors;
+import org.neo4j.storageengine.api.StoreId;
 
 import static org.neo4j.helpers.collection.MapUtil.stringMap;
 

diff --git a/community/jmx/src/main/java/org/neo4j/jmx/impl/KernelBean.java b/community/jmx/src/main/java/org/neo4j/jmx/impl/KernelBean.java
@@ -27,10 +27,10 @@
 
 import org.neo4j.jmx.Kernel;
 import org.neo4j.kernel.NeoStoreDataSource;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.transaction.log.LogVersionRepository;
 import org.neo4j.kernel.impl.transaction.state.DataSourceManager;
 import org.neo4j.kernel.internal.KernelData;
+import org.neo4j.storageengine.api.StoreId;
 
 public class KernelBean extends Neo4jMBean implements Kernel
 {

diff --git a/community/kernel-api/src/main/java/org/neo4j/storageengine/api/StorageEngine.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/StorageEngine.java
@@ -27,7 +27,6 @@
 import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException;
 import org.neo4j.io.pagecache.IOLimiter;
 import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.storageengine.api.lock.ResourceLocker;
 import org.neo4j.storageengine.api.txstate.ReadableTransactionState;
 import org.neo4j.storageengine.api.txstate.TxStateVisitor;

diff --git a/.../org/neo4j/kernel/impl/store/StoreId.java → .../org/neo4j/storageengine/api/StoreId.java b/.../org/neo4j/kernel/impl/store/StoreId.java → .../org/neo4j/storageengine/api/StoreId.java
@@ -17,7 +17,7 @@
  * 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.store;
+package org.neo4j.storageengine.api;
 
 import java.io.Externalizable;
 import java.io.IOException;
@@ -28,7 +28,6 @@
 
 public final class StoreId implements Externalizable
 {
-
     public static final StoreId DEFAULT = new StoreId( -1, -1, -1, -1, -1 );
 
     private static final Random r = new SecureRandom();

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java b/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java
@@ -84,7 +84,6 @@
 import org.neo4j.kernel.impl.spi.SimpleKernelContext;
 import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine;
 import org.neo4j.kernel.impl.storageengine.impl.recordstorage.id.IdController;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.store.format.RecordFormatPropertyConfigurator;
 import org.neo4j.kernel.impl.store.format.RecordFormatSelector;
 import org.neo4j.kernel.impl.store.format.RecordFormats;
@@ -152,6 +151,7 @@
 import org.neo4j.scheduler.JobScheduler;
 import org.neo4j.storageengine.api.StorageEngine;
 import org.neo4j.storageengine.api.StoreFileMetadata;
+import org.neo4j.storageengine.api.StoreId;
 import org.neo4j.time.SystemNanoClock;
 import org.neo4j.util.VisibleForTesting;
 

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java
@@ -106,12 +106,12 @@
 import org.neo4j.kernel.impl.query.TransactionalContext;
 import org.neo4j.kernel.impl.query.TransactionalContextFactory;
 import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.traversal.BidirectionalTraversalDescriptionImpl;
 import org.neo4j.kernel.impl.traversal.MonoDirectionalTraversalDescription;
 import org.neo4j.kernel.impl.util.ValueUtils;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.storageengine.api.EntityType;
+import org.neo4j.storageengine.api.StoreId;
 import org.neo4j.values.storable.Values;
 import org.neo4j.values.virtual.MapValue;
 

diff --git a/...main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java b/...main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java
@@ -77,7 +77,6 @@
 import org.neo4j.kernel.impl.store.RecordStore;
 import org.neo4j.kernel.impl.store.SchemaStorage;
 import org.neo4j.kernel.impl.store.StoreFactory;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.store.StoreType;
 import org.neo4j.kernel.impl.store.format.RecordFormat;
 import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
@@ -105,6 +104,7 @@
 import org.neo4j.storageengine.api.StorageEngine;
 import org.neo4j.storageengine.api.StorageReader;
 import org.neo4j.storageengine.api.StoreFileMetadata;
+import org.neo4j.storageengine.api.StoreId;
 import org.neo4j.storageengine.api.TransactionApplicationMode;
 import org.neo4j.storageengine.api.lock.ResourceLocker;
 import org.neo4j.storageengine.api.schema.SchemaRule;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/MetaDataStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/MetaDataStore.java
@@ -47,6 +47,7 @@
 import org.neo4j.kernel.impl.util.OutOfOrderSequence;
 import org.neo4j.logging.LogProvider;
 import org.neo4j.logging.Logger;
+import org.neo4j.storageengine.api.StoreId;
 import org.neo4j.time.Clocks;
 
 import static java.lang.String.format;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/MismatchingStoreIdException.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/MismatchingStoreIdException.java
@@ -19,6 +19,8 @@
  */
 package org.neo4j.kernel.impl.store;
 
+import org.neo4j.storageengine.api.StoreId;
+
 public class MismatchingStoreIdException extends StoreFailureException
 {
     private final StoreId expected;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/internal/GraphDatabaseAPI.java b/community/kernel/src/main/java/org/neo4j/kernel/internal/GraphDatabaseAPI.java
@@ -29,7 +29,7 @@
 import org.neo4j.internal.kernel.api.security.LoginContext;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.impl.coreapi.InternalTransaction;
-import org.neo4j.kernel.impl.store.StoreId;
+import org.neo4j.storageengine.api.StoreId;
 
 /**
  * This API can be used to get access to services.

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/internal/KernelDiagnostics.java b/community/kernel/src/main/java/org/neo4j/kernel/internal/KernelDiagnostics.java
@@ -31,9 +31,9 @@
 import org.neo4j.internal.diagnostics.DiagnosticsProvider;
 import org.neo4j.helpers.Format;
 import org.neo4j.kernel.impl.factory.DatabaseInfo;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.store.StoreType;
 import org.neo4j.logging.Logger;
+import org.neo4j.storageengine.api.StoreId;
 
 public abstract class KernelDiagnostics implements DiagnosticsProvider
 {

diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/facade/spi/ClassicCoreSPI.java b/community/neo4j/src/main/java/org/neo4j/graphdb/facade/spi/ClassicCoreSPI.java
@@ -39,9 +39,9 @@
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.kernel.impl.query.QueryExecutionKernelException;
 import org.neo4j.kernel.impl.query.TransactionalContext;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.lifecycle.LifecycleException;
 import org.neo4j.logging.Logger;
+import org.neo4j.storageengine.api.StoreId;
 import org.neo4j.values.virtual.MapValue;
 
 /**

diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/facade/spi/ProcedureGDBFacadeSPI.java b/community/neo4j/src/main/java/org/neo4j/graphdb/facade/spi/ProcedureGDBFacadeSPI.java
@@ -41,7 +41,7 @@
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.kernel.impl.query.QueryExecutionKernelException;
 import org.neo4j.kernel.impl.query.TransactionalContext;
-import org.neo4j.kernel.impl.store.StoreId;
+import org.neo4j.storageengine.api.StoreId;
 import org.neo4j.values.virtual.MapValue;
 
 public class ProcedureGDBFacadeSPI implements GraphDatabaseFacade.SPI

diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/DataSourceModule.java b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/DataSourceModule.java
@@ -28,7 +28,7 @@
 import org.neo4j.kernel.impl.core.TokenHolders;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.kernel.impl.proc.Procedures;
-import org.neo4j.kernel.impl.store.StoreId;
+import org.neo4j.storageengine.api.StoreId;
 
 public class DataSourceModule
 {

diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java b/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java
@@ -63,8 +63,8 @@
 import org.neo4j.internal.kernel.api.security.LoginContext;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.impl.coreapi.InternalTransaction;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
+import org.neo4j.storageengine.api.StoreId;
 
 public class ReadOnlyGraphDatabaseProxy implements GraphDatabaseService, GraphDatabaseAPI, IndexManager
 {

diff --git a/community/udc/src/test/java/org/neo4j/ext/udc/impl/DefaultUdcInformationCollectorTest.java b/community/udc/src/test/java/org/neo4j/ext/udc/impl/DefaultUdcInformationCollectorTest.java
@@ -39,7 +39,6 @@
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.factory.Edition;
 import org.neo4j.kernel.impl.factory.OperationalMode;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.store.format.RecordFormat;
 import org.neo4j.kernel.impl.store.id.IdGenerator;
 import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
@@ -49,6 +48,7 @@
 import org.neo4j.kernel.impl.util.Dependencies;
 import org.neo4j.scheduler.JobScheduler;
 import org.neo4j.storageengine.api.StoreFileMetadata;
+import org.neo4j.storageengine.api.StoreId;
 import org.neo4j.test.rule.TestDirectory;
 import org.neo4j.udc.UsageData;
 import org.neo4j.udc.UsageDataKeys;

diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupKernelExtension.java b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupKernelExtension.java
@@ -41,7 +41,6 @@
 import org.neo4j.kernel.NeoStoreDataSource;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.enterprise.configuration.OnlineBackupSettings;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.transaction.log.LogFileInformation;
 import org.neo4j.kernel.impl.transaction.log.LogicalTransactionStore;
 import org.neo4j.kernel.impl.transaction.log.TransactionIdStore;
@@ -52,6 +51,7 @@
 import org.neo4j.kernel.monitoring.ByteCounterMonitor;
 import org.neo4j.kernel.monitoring.Monitors;
 import org.neo4j.logging.LogProvider;
+import org.neo4j.storageengine.api.StoreId;
 
 import static org.neo4j.kernel.impl.enterprise.configuration.OnlineBackupSettings.online_backup_server;
 

diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupClient.java b/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupClient.java
@@ -37,12 +37,12 @@
 import org.neo4j.com.storecopy.ResponseUnpacker;
 import org.neo4j.com.storecopy.StoreWriter;
 import org.neo4j.com.storecopy.ToNetworkStoreWriter;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.transaction.log.ReadableClosablePositionAwareChannel;
 import org.neo4j.kernel.impl.transaction.log.entry.LogEntryReader;
 import org.neo4j.kernel.monitoring.ByteCounterMonitor;
 import org.neo4j.kernel.monitoring.Monitors;
 import org.neo4j.logging.LogProvider;
+import org.neo4j.storageengine.api.StoreId;
 
 import static org.neo4j.backup.impl.BackupServer.BACKUP_PROTOCOL_VERSION;
 import static org.neo4j.backup.impl.BackupServer.FRAME_LENGTH;

diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupImpl.java b/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupImpl.java
@@ -30,12 +30,12 @@
 import org.neo4j.com.storecopy.ResponsePacker;
 import org.neo4j.com.storecopy.StoreCopyServer;
 import org.neo4j.com.storecopy.StoreWriter;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.transaction.log.LogFileInformation;
 import org.neo4j.kernel.impl.transaction.log.LogicalTransactionStore;
 import org.neo4j.kernel.impl.transaction.log.TransactionIdStore;
 import org.neo4j.logging.LogProvider;
 import org.neo4j.logging.Logger;
+import org.neo4j.storageengine.api.StoreId;
 
 import static org.neo4j.com.RequestContext.anonymous;
 

diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupProtocolService.java b/enterprise/backup/src/main/java/org/neo4j/backup/impl/BackupProtocolService.java
@@ -65,7 +65,6 @@
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.store.MetaDataStore;
 import org.neo4j.kernel.impl.store.MismatchingStoreIdException;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.store.UnexpectedStoreVersionException;
 import org.neo4j.kernel.impl.store.id.IdGeneratorImpl;
 import org.neo4j.kernel.impl.storemigration.UpgradeNotAllowedByConfigurationException;
@@ -81,6 +80,7 @@
 import org.neo4j.logging.Log;
 import org.neo4j.logging.LogProvider;
 import org.neo4j.logging.NullLogProvider;
+import org.neo4j.storageengine.api.StoreId;
 
 import static org.neo4j.com.RequestContext.anonymous;
 import static org.neo4j.com.storecopy.TransactionCommittingResponseUnpacker.DEFAULT_BATCH_SIZE;

diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/impl/StoreCopyResponsePacker.java b/enterprise/backup/src/main/java/org/neo4j/backup/impl/StoreCopyResponsePacker.java
@@ -33,12 +33,12 @@
 import org.neo4j.com.storecopy.StoreCopyServer;
 import org.neo4j.com.storecopy.StoreCopyServer.Monitor;
 import org.neo4j.helpers.collection.Visitor;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.transaction.CommittedTransactionRepresentation;
 import org.neo4j.kernel.impl.transaction.log.LogFileInformation;
 import org.neo4j.kernel.impl.transaction.log.LogicalTransactionStore;
 import org.neo4j.kernel.impl.transaction.log.NoSuchTransactionException;
 import org.neo4j.kernel.impl.transaction.log.TransactionIdStore;
+import org.neo4j.storageengine.api.StoreId;
 
 import static org.neo4j.kernel.impl.transaction.log.TransactionIdStore.BASE_TX_ID;
 

diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/impl/BackupImplTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/impl/BackupImplTest.java
@@ -29,11 +29,11 @@
 import org.neo4j.com.RequestContext;
 import org.neo4j.com.storecopy.StoreCopyServer;
 import org.neo4j.com.storecopy.StoreWriter;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.transaction.log.LogFileInformation;
 import org.neo4j.kernel.impl.transaction.log.LogicalTransactionStore;
 import org.neo4j.kernel.impl.transaction.log.TransactionIdStore;
 import org.neo4j.logging.NullLogProvider;
+import org.neo4j.storageengine.api.StoreId;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;

diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/impl/BackupProtocolIT.java b/enterprise/backup/src/test/java/org/neo4j/backup/impl/BackupProtocolIT.java
@@ -33,14 +33,14 @@
 import org.neo4j.com.storecopy.ResponseUnpacker;
 import org.neo4j.com.storecopy.StoreWriter;
 import org.neo4j.helpers.HostnamePort;
-import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.transaction.log.ReadableClosablePositionAwareChannel;
 import org.neo4j.kernel.impl.transaction.log.entry.LogEntryReader;
 import org.neo4j.kernel.impl.transaction.log.entry.VersionAwareLogEntryReader;
 import org.neo4j.kernel.lifecycle.LifeSupport;
 import org.neo4j.kernel.monitoring.ByteCounterMonitor;
 import org.neo4j.logging.NullLogProvider;
 import org.neo4j.ports.allocation.PortAuthority;
+import org.neo4j.storageengine.api.StoreId;
 
 import static org.jboss.netty.buffer.ChannelBuffers.EMPTY_BUFFER;
 import static org.junit.Assert.assertEquals;

diff --git a/...sal-clustering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/StoreFiles.java b/...sal-clustering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/StoreFiles.java
@@ -153,7 +153,7 @@ public boolean isEmpty( File storeDir, List<File> filesToLookFor ) throws IOExce
     public StoreId readStoreId( File storeDir ) throws IOException
     {
         File neoStoreFile = new File( storeDir, MetaDataStore.DEFAULT_NAME );
-        org.neo4j.kernel.impl.store.StoreId kernelStoreId = MetaDataStore.getStoreId( pageCache, neoStoreFile );
+        org.neo4j.storageengine.api.StoreId kernelStoreId = MetaDataStore.getStoreId( pageCache, neoStoreFile );
         return new StoreId( kernelStoreId.getCreationTime(), kernelStoreId.getRandomId(),
                 kernelStoreId.getUpgradeTime(), kernelStoreId.getUpgradeId() );
     }

diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/identity/StoreId.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/identity/StoreId.java
@@ -22,17 +22,17 @@
  */
 package org.neo4j.causalclustering.identity;
 
-import static java.lang.String.format;
-
 import java.util.Objects;
 
+import static java.lang.String.format;
+
 public final class StoreId
 {
     public static final StoreId DEFAULT = new StoreId(
-            org.neo4j.kernel.impl.store.StoreId.DEFAULT.getCreationTime(),
+            org.neo4j.storageengine.api.StoreId.DEFAULT.getCreationTime(),
-            org.neo4j.kernel.impl.store.StoreId.DEFAULT.getRandomId(),
+            org.neo4j.storageengine.api.StoreId.DEFAULT.getRandomId(),
-            org.neo4j.kernel.impl.store.StoreId.DEFAULT.getUpgradeTime(),
+            org.neo4j.storageengine.api.StoreId.DEFAULT.getUpgradeTime(),
-            org.neo4j.kernel.impl.store.StoreId.DEFAULT.getUpgradeId() );
+            org.neo4j.storageengine.api.StoreId.DEFAULT.getUpgradeId() );
 
     public static boolean isDefault( StoreId storeId )
     {
@@ -75,7 +75,7 @@ public long getUpgradeId()
         return upgradeId;
     }
 
-    public boolean equalToKernelStoreId( org.neo4j.kernel.impl.store.StoreId kernelStoreId )
+    public boolean equalToKernelStoreId( org.neo4j.storageengine.api.StoreId kernelStoreId )
     {
         return creationTime == kernelStoreId.getCreationTime() &&
                randomId == kernelStoreId.getRandomId() &&

diff --git a/...java/org/neo4j/causalclustering/catchup/storecopy/PrepareStoreCopyRequestHandlerTest.java b/...java/org/neo4j/causalclustering/catchup/storecopy/PrepareStoreCopyRequestHandlerTest.java
@@ -148,7 +148,7 @@ private PrepareStoreCopyRequestHandler createHandler()
         catchupServerProtocol = new CatchupServerProtocol();
         catchupServerProtocol.expect( CatchupServerProtocol.State.PREPARE_STORE_COPY );
         Supplier<NeoStoreDataSource> dataSourceSupplier = () -> neoStoreDataSource;
-        when( neoStoreDataSource.getStoreId() ).thenReturn( new org.neo4j.kernel.impl.store.StoreId( 1, 2, 5, 3, 4 ) );
+        when( neoStoreDataSource.getStoreId() ).thenReturn( new org.neo4j.storageengine.api.StoreId( 1, 2, 5, 3, 4 ) );
 
         PrepareStoreCopyFilesProvider prepareStoreCopyFilesProvider = mock( PrepareStoreCopyFilesProvider.class );
         when( prepareStoreCopyFilesProvider.prepareStoreCopyFiles( any() ) ).thenReturn( prepareStoreCopyFiles );

diff --git a/...ering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/SimpleCatchupClient.java b/...ering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/SimpleCatchupClient.java
@@ -98,7 +98,7 @@ StoreCopyFinishedResponse requestIndividualFile( File file, StoreId expectedStor
 
     private StoreId getStoreIdFromKernelStoreId( GraphDatabaseAPI graphDb )
     {
-        org.neo4j.kernel.impl.store.StoreId storeId = graphDb.storeId();
+        org.neo4j.storageengine.api.StoreId storeId = graphDb.storeId();
         return new StoreId( storeId.getCreationTime(), storeId.getRandomId(), storeId.getUpgradeTime(), storeId.getUpgradeId() );
     }
 

diff --git a/...c/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyRequestHandlerTest.java b/...c/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyRequestHandlerTest.java
@@ -85,7 +85,7 @@ public void setup()
                 new NiceStoreCopyRequestHandler( catchupServerProtocol, () -> neoStoreDataSource, new StoreFileStreamingProtocol(),
                         fileSystemAbstraction, NullLogProvider.getInstance() );
         Dependencies dependencies = new Dependencies();
-        when( neoStoreDataSource.getStoreId() ).thenReturn( new org.neo4j.kernel.impl.store.StoreId( 1, 2, 5, 3, 4 ) );
+        when( neoStoreDataSource.getStoreId() ).thenReturn( new org.neo4j.storageengine.api.StoreId( 1, 2, 5, 3, 4 ) );
         when( neoStoreDataSource.getDependencyResolver() ).thenReturn( dependencies );
         embeddedChannel = new EmbeddedChannel( storeCopyRequestHandler );
     }

diff --git a/...stering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/TestCatchupServer.java b/...stering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/TestCatchupServer.java
@@ -84,7 +84,7 @@ private static ChildInitializer childInitializer( FileSystemAbstraction fileSyst
         Supplier<NeoStoreDataSource> dataSource = () -> graphDb.getDependencyResolver().resolveDependency( NeoStoreDataSource.class );
         LogProvider logProvider = NullLogProvider.getInstance();
 
-        org.neo4j.kernel.impl.store.StoreId kernelStoreId = dataSource.get().getStoreId();
+        org.neo4j.storageengine.api.StoreId kernelStoreId = dataSource.get().getStoreId();
         StoreId storeId = new StoreId( kernelStoreId.getCreationTime(), kernelStoreId.getRandomId(), kernelStoreId.getUpgradeTime(),
                 kernelStoreId.getUpgradeId() );