Rename the txstate.aux package to txstate.auxiliary because aux is a …

…reserved file name on Windows.
neo4j · Oct 5, 2018 · a5adfe4 · a5adfe4
1 parent ef89bf8
commit a5adfe4
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 34 deletions.
diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/api/txstate/ExplicitIndexTransactionState.java b/...nity/kernel/src/main/java/org/neo4j/kernel/api/txstate/ExplicitIndexTransactionState.java
@@ -23,9 +23,8 @@
 
 import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException;
 import org.neo4j.kernel.api.ExplicitIndex;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
 import org.neo4j.kernel.impl.index.IndexEntityType;
-import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordState;
 
 /**
  * Defines transactional state for explicit indexes. Since the implementation of this enlists another transaction

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TxStateHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TxStateHolder.java
@@ -19,7 +19,7 @@
  */
 package org.neo4j.kernel.api.txstate;
 
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
 
 public interface TxStateHolder
 {

diff --git a/...xstate/aux/AuxiliaryTransactionState.java → .../auxiliary/AuxiliaryTransactionState.java b/...xstate/aux/AuxiliaryTransactionState.java → .../auxiliary/AuxiliaryTransactionState.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.api.txstate.aux;
+package org.neo4j.kernel.api.txstate.auxiliary;
 
 import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
 import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordState;

diff --git a/...iliaryTransactionStateCloseException.java → ...iliaryTransactionStateCloseException.java b/...iliaryTransactionStateCloseException.java → ...iliaryTransactionStateCloseException.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.api.txstate.aux;
+package org.neo4j.kernel.api.txstate.auxiliary;
 
 public class AuxiliaryTransactionStateCloseException extends RuntimeException
 {

diff --git a/.../aux/AuxiliaryTransactionStateHolder.java → ...iary/AuxiliaryTransactionStateHolder.java b/.../aux/AuxiliaryTransactionStateHolder.java → ...iary/AuxiliaryTransactionStateHolder.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.api.txstate.aux;
+package org.neo4j.kernel.api.txstate.auxiliary;
 
 import java.util.Collection;
 

diff --git a/...aux/AuxiliaryTransactionStateManager.java → ...ary/AuxiliaryTransactionStateManager.java b/...aux/AuxiliaryTransactionStateManager.java → ...ary/AuxiliaryTransactionStateManager.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.api.txstate.aux;
+package org.neo4j.kernel.api.txstate.auxiliary;
 
 /**
  * The auxiliary transaction state manager keeps track of what auxiliary transaction state providers are available, and is responsible for creating

diff --git a/...ux/AuxiliaryTransactionStateProvider.java → ...ry/AuxiliaryTransactionStateProvider.java b/...ux/AuxiliaryTransactionStateProvider.java → ...ry/AuxiliaryTransactionStateProvider.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.api.txstate.aux;
+package org.neo4j.kernel.api.txstate.auxiliary;
 
 import org.neo4j.kernel.api.txstate.TxStateHolder;
 import org.neo4j.kernel.impl.api.KernelTransactionImplementation;

diff --git a/...kernel/src/main/java/org/neo4j/kernel/impl/api/ExplicitIndexTransactionStateProvider.java b/...kernel/src/main/java/org/neo4j/kernel/impl/api/ExplicitIndexTransactionStateProvider.java
@@ -19,8 +19,8 @@
  */
 package org.neo4j.kernel.impl.api;
 
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateProvider;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateProvider;
 import org.neo4j.kernel.impl.api.state.ExplicitIndexTransactionStateImpl;
 import org.neo4j.kernel.impl.index.IndexConfigStore;
 

diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelAuxTransactionStateManager.java b/...nity/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelAuxTransactionStateManager.java
@@ -26,11 +26,11 @@
 
 import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException;
 import org.neo4j.io.IOUtils;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateCloseException;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateHolder;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateProvider;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateCloseException;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateHolder;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateProvider;
 import org.neo4j.kernel.impl.util.CopyOnWriteHashMap;
 import org.neo4j.storageengine.api.StorageCommand;
 

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java
@@ -43,7 +43,7 @@
 import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
 import org.neo4j.kernel.api.txstate.TransactionState;
 import org.neo4j.kernel.api.txstate.TxStateHolder;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
 import org.neo4j.kernel.impl.locking.StatementLocks;
 import org.neo4j.storageengine.api.StorageReader;
 import org.neo4j.storageengine.api.lock.LockTracer;

diff --git a/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java b/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java
@@ -67,10 +67,10 @@
 import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
 import org.neo4j.kernel.api.txstate.TransactionState;
 import org.neo4j.kernel.api.txstate.TxStateHolder;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateCloseException;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateHolder;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateCloseException;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateHolder;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.api.index.IndexingProvidersService;
 import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java
@@ -38,7 +38,7 @@
 import org.neo4j.kernel.api.KernelTransactionHandle;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.api.explicitindex.AutoIndexing;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
 import org.neo4j.kernel.availability.AvailabilityGuard;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.api.index.IndexingProvidersService;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java
@@ -45,7 +45,7 @@
 import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
 import org.neo4j.kernel.api.txstate.TransactionState;
 import org.neo4j.kernel.api.txstate.TxStateHolder;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
 import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
 import org.neo4j.kernel.impl.locking.Locks;
 import org.neo4j.kernel.impl.locking.ResourceTypes;

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java b/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java
@@ -20,15 +20,14 @@
 package org.neo4j.kernel.api;
 
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
 
 import org.neo4j.collection.pool.Pool;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.internal.kernel.api.security.LoginContext;
 import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracerSupplier;
 import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier;
 import org.neo4j.kernel.api.explicitindex.AutoIndexing;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
 import org.neo4j.kernel.impl.api.SchemaState;

diff --git a/...y/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java b/...y/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java
@@ -45,8 +45,7 @@
 import org.neo4j.kernel.api.security.AnonymousContext;
 import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
 import org.neo4j.kernel.api.txstate.TransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateProvider;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
 import org.neo4j.kernel.impl.locking.Locks;
 import org.neo4j.kernel.impl.locking.NoOpClient;
 import org.neo4j.kernel.impl.locking.SimpleStatementLocks;

diff --git a/...nity/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java b/...nity/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java
@@ -37,7 +37,7 @@
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.api.explicitindex.AutoIndexing;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.api.index.IndexingService;
 import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator;

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java
@@ -27,7 +27,6 @@
 
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
 
 import org.neo4j.collection.pool.Pool;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
@@ -38,9 +37,7 @@
 import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier;
 import org.neo4j.kernel.api.explicitindex.AutoIndexing;
 import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
-import org.neo4j.kernel.availability.AvailabilityGuard;
-import org.neo4j.kernel.availability.DatabaseAvailabilityGuard;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.api.index.IndexingService;
 import org.neo4j.kernel.impl.constraints.StandardConstraintSemantics;

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java
@@ -44,7 +44,7 @@
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.api.explicitindex.AutoIndexing;
 import org.neo4j.kernel.api.security.AnonymousContext;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
 import org.neo4j.kernel.availability.AvailabilityGuard;
 import org.neo4j.kernel.availability.DatabaseAvailabilityGuard;
 import org.neo4j.kernel.configuration.Config;

diff --git a/...l/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/TransactionStatusResultTest.java b/...l/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/TransactionStatusResultTest.java
@@ -42,8 +42,7 @@
 import org.neo4j.kernel.api.explicitindex.AutoIndexing;
 import org.neo4j.kernel.api.query.ExecutingQuery;
 import org.neo4j.kernel.api.query.QuerySnapshot;
-import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
 import org.neo4j.kernel.impl.api.SchemaState;