From ba524d40186711dc75e7b392b61152da23175f8b Mon Sep 17 00:00:00 2001 From: Davide Grohmann Date: Wed, 24 Feb 2016 12:18:01 +0100 Subject: [PATCH] Move StoreLocker to internal pkgs --- .../java/org/neo4j/kernel/impl/factory/PlatformModule.java | 4 ++-- .../java/org/neo4j/kernel/{ => internal}/StoreLocker.java | 7 ++----- .../kernel/{ => internal}/StoreLockerLifecycleAdapter.java | 6 +----- .../org/neo4j/unsafe/batchinsert/BatchInserterImpl.java | 2 +- .../{ => internal}/StoreLockerLifecycleAdapterTest.java | 4 ++-- .../org/neo4j/kernel/{ => internal}/StoreLockerTest.java | 5 +++-- .../neo4j/unsafe/batchinsert/BatchInserterImplTest.java | 2 +- .../java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java | 2 +- .../org/neo4j/kernel/ha/cluster/SwitchToSlaveTest.java | 2 +- 9 files changed, 14 insertions(+), 20 deletions(-) rename community/kernel/src/main/java/org/neo4j/kernel/{ => internal}/StoreLocker.java (96%) rename community/kernel/src/main/java/org/neo4j/kernel/{ => internal}/StoreLockerLifecycleAdapter.java (91%) rename community/kernel/src/test/java/org/neo4j/kernel/{ => internal}/StoreLockerLifecycleAdapterTest.java (97%) rename community/kernel/src/test/java/org/neo4j/kernel/{ => internal}/StoreLockerTest.java (98%) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java index 6605e1d5e86f7..35b30b2a3876c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java @@ -34,8 +34,8 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.AvailabilityGuard; -import org.neo4j.kernel.StoreLocker; -import org.neo4j.kernel.StoreLockerLifecycleAdapter; +import org.neo4j.kernel.internal.StoreLocker; +import org.neo4j.kernel.internal.StoreLockerLifecycleAdapter; import org.neo4j.kernel.internal.Version; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/StoreLocker.java b/community/kernel/src/main/java/org/neo4j/kernel/internal/StoreLocker.java similarity index 96% rename from community/kernel/src/main/java/org/neo4j/kernel/StoreLocker.java rename to community/kernel/src/main/java/org/neo4j/kernel/internal/StoreLocker.java index a8bb91dab8a51..add79d835aeb6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/StoreLocker.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/internal/StoreLocker.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel; +package org.neo4j.kernel.internal; import java.io.File; import java.io.IOException; @@ -26,11 +26,8 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; +import org.neo4j.kernel.StoreLockException; -/** - * @deprecated This will be moved to internal packages in the next major release. - */ -@Deprecated public class StoreLocker { public static final String STORE_LOCK_FILENAME = "store_lock"; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/StoreLockerLifecycleAdapter.java b/community/kernel/src/main/java/org/neo4j/kernel/internal/StoreLockerLifecycleAdapter.java similarity index 91% rename from community/kernel/src/main/java/org/neo4j/kernel/StoreLockerLifecycleAdapter.java rename to community/kernel/src/main/java/org/neo4j/kernel/internal/StoreLockerLifecycleAdapter.java index faa7dcefaf545..30e879012d8e3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/StoreLockerLifecycleAdapter.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/internal/StoreLockerLifecycleAdapter.java @@ -17,16 +17,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel; +package org.neo4j.kernel.internal; import java.io.File; import org.neo4j.kernel.lifecycle.LifecycleAdapter; -/** - * @deprecated This will be moved to internal packages in the next major release. - */ -@Deprecated public class StoreLockerLifecycleAdapter extends LifecycleAdapter { private final StoreLocker storeLocker; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/BatchInserterImpl.java b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/BatchInserterImpl.java index 75ad15b180e14..be920b9799c37 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/BatchInserterImpl.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/BatchInserterImpl.java @@ -53,7 +53,7 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.tracing.PageCacheTracer; import org.neo4j.kernel.internal.EmbeddedGraphDatabase; -import org.neo4j.kernel.StoreLocker; +import org.neo4j.kernel.internal.StoreLocker; import org.neo4j.kernel.api.constraints.NodePropertyExistenceConstraint; import org.neo4j.kernel.api.constraints.RelationshipPropertyExistenceConstraint; import org.neo4j.kernel.api.constraints.UniquenessConstraint; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/StoreLockerLifecycleAdapterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerLifecycleAdapterTest.java similarity index 97% rename from community/kernel/src/test/java/org/neo4j/kernel/StoreLockerLifecycleAdapterTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerLifecycleAdapterTest.java index 5e5b3ffceef20..76b98e57ec8c2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/StoreLockerLifecycleAdapterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerLifecycleAdapterTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel; +package org.neo4j.kernel.internal; import org.junit.Rule; import org.junit.Test; @@ -27,6 +27,7 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.factory.GraphDatabaseFactory; import org.neo4j.graphdb.factory.GraphDatabaseSettings; +import org.neo4j.kernel.StoreLockException; import org.neo4j.kernel.configuration.Settings; import org.neo4j.test.TargetDirectory; import org.neo4j.test.TargetDirectory.TestDirectory; @@ -35,7 +36,6 @@ import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; - import static org.neo4j.helpers.collection.MapUtil.stringMap; public class StoreLockerLifecycleAdapterTest diff --git a/community/kernel/src/test/java/org/neo4j/kernel/StoreLockerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerTest.java similarity index 98% rename from community/kernel/src/test/java/org/neo4j/kernel/StoreLockerTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerTest.java index 5e7f75fad0d21..815b8dffd262a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/StoreLockerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/internal/StoreLockerTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel; +package org.neo4j.kernel.internal; import org.junit.Rule; import org.junit.Test; @@ -33,6 +33,7 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; +import org.neo4j.kernel.StoreLockException; import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; @@ -41,7 +42,7 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static org.neo4j.kernel.StoreLocker.STORE_LOCK_FILENAME; +import static org.neo4j.kernel.internal.StoreLocker.STORE_LOCK_FILENAME; public class StoreLockerTest { diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BatchInserterImplTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BatchInserterImplTest.java index 968265d89cccd..1497b499275b6 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BatchInserterImplTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BatchInserterImplTest.java @@ -29,7 +29,7 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.kernel.StoreLockException; -import org.neo4j.kernel.StoreLocker; +import org.neo4j.kernel.internal.StoreLocker; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.test.ReflectionUtil; import org.neo4j.test.TargetDirectory; diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java index 9053e479ee548..1648133f9af9c 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java @@ -42,7 +42,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.NeoStoreDataSource; -import org.neo4j.kernel.StoreLockerLifecycleAdapter; +import org.neo4j.kernel.internal.StoreLockerLifecycleAdapter; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.ha.BranchedDataException; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveTest.java index 20d3d20e14f88..8be98d660008b 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/cluster/SwitchToSlaveTest.java @@ -44,7 +44,7 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.PagedFile; import org.neo4j.kernel.NeoStoreDataSource; -import org.neo4j.kernel.StoreLockerLifecycleAdapter; +import org.neo4j.kernel.internal.StoreLockerLifecycleAdapter; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.ha.BranchedDataException; import org.neo4j.kernel.ha.BranchedDataPolicy;