Move StoreLocker to internal pkgs

neo4j · Feb 25, 2016 · ba524d4 · ba524d4
1 parent b4bafa3
commit ba524d4
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 20 deletions.
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
@@ -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/...in/java/org/neo4j/kernel/StoreLocker.java → ...rg/neo4j/kernel/internal/StoreLocker.java b/...in/java/org/neo4j/kernel/StoreLocker.java → ...rg/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 <http://www.gnu.org/licenses/>.
  */
-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/...j/kernel/StoreLockerLifecycleAdapter.java → ...internal/StoreLockerLifecycleAdapter.java b/...j/kernel/StoreLockerLifecycleAdapter.java → ...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 <http://www.gnu.org/licenses/>.
  */
-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
@@ -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/...rnel/StoreLockerLifecycleAdapterTest.java → ...rnal/StoreLockerLifecycleAdapterTest.java b/...rnel/StoreLockerLifecycleAdapterTest.java → ...rnal/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 <http://www.gnu.org/licenses/>.
  */
-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/...ava/org/neo4j/kernel/StoreLockerTest.java → ...eo4j/kernel/internal/StoreLockerTest.java b/...ava/org/neo4j/kernel/StoreLockerTest.java → ...eo4j/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 <http://www.gnu.org/licenses/>.
  */
-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
@@ -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
@@ -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
@@ -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;