diff --git a/core/src/main/java/org/hibernate/ogm/cfg/OgmProperties.java b/core/src/main/java/org/hibernate/ogm/cfg/OgmProperties.java index abacf482ac..9ca35bf3ca 100644 --- a/core/src/main/java/org/hibernate/ogm/cfg/OgmProperties.java +++ b/core/src/main/java/org/hibernate/ogm/cfg/OgmProperties.java @@ -6,7 +6,7 @@ */ package org.hibernate.ogm.cfg; -import org.hibernate.ogm.failure.ErrorHandler; +import org.hibernate.ogm.compensation.ErrorHandler; /** * Common properties for configuring NoSql datastores via {@code persistence.xml} or diff --git a/core/src/main/java/org/hibernate/ogm/failure/BaseErrorHandler.java b/core/src/main/java/org/hibernate/ogm/compensation/BaseErrorHandler.java similarity index 94% rename from core/src/main/java/org/hibernate/ogm/failure/BaseErrorHandler.java rename to core/src/main/java/org/hibernate/ogm/compensation/BaseErrorHandler.java index c8dcaa0ee0..19eed73838 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/BaseErrorHandler.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/BaseErrorHandler.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure; +package org.hibernate.ogm.compensation; /** * Default (no-op) implementation of {@link ErrorHandler}. diff --git a/core/src/main/java/org/hibernate/ogm/failure/ErrorHandler.java b/core/src/main/java/org/hibernate/ogm/compensation/ErrorHandler.java similarity index 95% rename from core/src/main/java/org/hibernate/ogm/failure/ErrorHandler.java rename to core/src/main/java/org/hibernate/ogm/compensation/ErrorHandler.java index 8605ba9cfa..78f50ef463 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/ErrorHandler.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/ErrorHandler.java @@ -4,10 +4,10 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure; +package org.hibernate.ogm.compensation; import org.hibernate.ogm.cfg.OgmProperties; -import org.hibernate.ogm.failure.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; import org.hibernate.ogm.util.Experimental; /** diff --git a/core/src/main/java/org/hibernate/ogm/failure/ErrorHandlingStrategy.java b/core/src/main/java/org/hibernate/ogm/compensation/ErrorHandlingStrategy.java similarity index 96% rename from core/src/main/java/org/hibernate/ogm/failure/ErrorHandlingStrategy.java rename to core/src/main/java/org/hibernate/ogm/compensation/ErrorHandlingStrategy.java index 3f9c952edb..9b96785e70 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/ErrorHandlingStrategy.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/ErrorHandlingStrategy.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure; +package org.hibernate.ogm.compensation; /** * A strategy for dealing with errors occurring during execution of a grid dialect operation. diff --git a/core/src/main/java/org/hibernate/ogm/failure/impl/InvocationCollectingGridDialect.java b/core/src/main/java/org/hibernate/ogm/compensation/impl/InvocationCollectingGridDialect.java similarity index 85% rename from core/src/main/java/org/hibernate/ogm/failure/impl/InvocationCollectingGridDialect.java rename to core/src/main/java/org/hibernate/ogm/compensation/impl/InvocationCollectingGridDialect.java index 4dcd971e98..6b19454fb5 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/impl/InvocationCollectingGridDialect.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/impl/InvocationCollectingGridDialect.java @@ -4,12 +4,35 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.impl; +package org.hibernate.ogm.compensation.impl; import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import org.hibernate.ogm.compensation.ErrorHandler; +import org.hibernate.ogm.compensation.ErrorHandlingStrategy; +import org.hibernate.ogm.compensation.operation.CreateAssociationWithKey; +import org.hibernate.ogm.compensation.operation.CreateTuple; +import org.hibernate.ogm.compensation.operation.CreateTupleWithKey; +import org.hibernate.ogm.compensation.operation.ExecuteBatch; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.InsertOrUpdateAssociation; +import org.hibernate.ogm.compensation.operation.InsertTuple; +import org.hibernate.ogm.compensation.operation.RemoveAssociation; +import org.hibernate.ogm.compensation.operation.RemoveTuple; +import org.hibernate.ogm.compensation.operation.UpdateTupleWithOptimisticLock; +import org.hibernate.ogm.compensation.operation.impl.CreateAssociationWithKeyImpl; +import org.hibernate.ogm.compensation.operation.impl.CreateTupleImpl; +import org.hibernate.ogm.compensation.operation.impl.CreateTupleWithKeyImpl; +import org.hibernate.ogm.compensation.operation.impl.ExecuteBatchImpl; +import org.hibernate.ogm.compensation.operation.impl.InsertOrUpdateAssociationImpl; +import org.hibernate.ogm.compensation.operation.impl.InsertOrUpdateTupleImpl; +import org.hibernate.ogm.compensation.operation.impl.InsertTupleImpl; +import org.hibernate.ogm.compensation.operation.impl.RemoveAssociationImpl; +import org.hibernate.ogm.compensation.operation.impl.RemoveTupleImpl; +import org.hibernate.ogm.compensation.operation.impl.RemoveTupleWithOptimisticLockImpl; +import org.hibernate.ogm.compensation.operation.impl.UpdateTupleWithOptimisticLockImpl; import org.hibernate.ogm.dialect.batch.spi.InsertOrUpdateAssociationOperation; import org.hibernate.ogm.dialect.batch.spi.InsertOrUpdateTupleOperation; import org.hibernate.ogm.dialect.batch.spi.Operation; @@ -23,29 +46,6 @@ import org.hibernate.ogm.dialect.spi.TupleAlreadyExistsException; import org.hibernate.ogm.dialect.spi.TupleContext; import org.hibernate.ogm.exception.impl.Exceptions; -import org.hibernate.ogm.failure.ErrorHandler; -import org.hibernate.ogm.failure.ErrorHandlingStrategy; -import org.hibernate.ogm.failure.operation.CreateAssociationWithKey; -import org.hibernate.ogm.failure.operation.CreateTuple; -import org.hibernate.ogm.failure.operation.CreateTupleWithKey; -import org.hibernate.ogm.failure.operation.ExecuteBatch; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.InsertOrUpdateAssociation; -import org.hibernate.ogm.failure.operation.InsertTuple; -import org.hibernate.ogm.failure.operation.RemoveAssociation; -import org.hibernate.ogm.failure.operation.RemoveTuple; -import org.hibernate.ogm.failure.operation.UpdateTupleWithOptimisticLock; -import org.hibernate.ogm.failure.operation.impl.CreateAssociationWithKeyImpl; -import org.hibernate.ogm.failure.operation.impl.CreateTupleImpl; -import org.hibernate.ogm.failure.operation.impl.CreateTupleWithKeyImpl; -import org.hibernate.ogm.failure.operation.impl.ExecuteBatchImpl; -import org.hibernate.ogm.failure.operation.impl.InsertOrUpdateAssociationImpl; -import org.hibernate.ogm.failure.operation.impl.InsertOrUpdateTupleImpl; -import org.hibernate.ogm.failure.operation.impl.InsertTupleImpl; -import org.hibernate.ogm.failure.operation.impl.RemoveAssociationImpl; -import org.hibernate.ogm.failure.operation.impl.RemoveTupleImpl; -import org.hibernate.ogm.failure.operation.impl.RemoveTupleWithOptimisticLockImpl; -import org.hibernate.ogm.failure.operation.impl.UpdateTupleWithOptimisticLockImpl; import org.hibernate.ogm.model.key.spi.AssociationKey; import org.hibernate.ogm.model.key.spi.EntityKey; import org.hibernate.ogm.model.key.spi.EntityKeyMetadata; diff --git a/core/src/main/java/org/hibernate/ogm/failure/impl/OperationCollector.java b/core/src/main/java/org/hibernate/ogm/compensation/impl/OperationCollector.java similarity index 90% rename from core/src/main/java/org/hibernate/ogm/failure/impl/OperationCollector.java rename to core/src/main/java/org/hibernate/ogm/compensation/impl/OperationCollector.java index 1a035523aa..c58e5e0f19 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/impl/OperationCollector.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/impl/OperationCollector.java @@ -4,15 +4,15 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.impl; +package org.hibernate.ogm.compensation.impl; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.hibernate.ogm.failure.ErrorHandler; -import org.hibernate.ogm.failure.ErrorHandlingStrategy; -import org.hibernate.ogm.failure.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.ErrorHandler; +import org.hibernate.ogm.compensation.ErrorHandlingStrategy; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; /** * Collects the grid dialect operations applied in the course of one transaction. diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/CreateAssociationWithKey.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/CreateAssociationWithKey.java similarity index 93% rename from core/src/main/java/org/hibernate/ogm/failure/operation/CreateAssociationWithKey.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/CreateAssociationWithKey.java index a062e5ab73..3a48e127ec 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/CreateAssociationWithKey.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/CreateAssociationWithKey.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation; +package org.hibernate.ogm.compensation.operation; import org.hibernate.ogm.dialect.spi.GridDialect; import org.hibernate.ogm.model.key.spi.AssociationKey; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/CreateTuple.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/CreateTuple.java similarity index 93% rename from core/src/main/java/org/hibernate/ogm/failure/operation/CreateTuple.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/CreateTuple.java index dd14af68eb..d864f5cb80 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/CreateTuple.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/CreateTuple.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation; +package org.hibernate.ogm.compensation.operation; import org.hibernate.ogm.dialect.identity.spi.IdentityColumnAwareGridDialect; import org.hibernate.ogm.model.key.spi.EntityKeyMetadata; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/CreateTupleWithKey.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/CreateTupleWithKey.java similarity index 92% rename from core/src/main/java/org/hibernate/ogm/failure/operation/CreateTupleWithKey.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/CreateTupleWithKey.java index 8b1b294c8c..6989dfb854 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/CreateTupleWithKey.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/CreateTupleWithKey.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation; +package org.hibernate.ogm.compensation.operation; import org.hibernate.ogm.dialect.spi.GridDialect; import org.hibernate.ogm.model.key.spi.EntityKey; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/ExecuteBatch.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/ExecuteBatch.java similarity index 93% rename from core/src/main/java/org/hibernate/ogm/failure/operation/ExecuteBatch.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/ExecuteBatch.java index 6f5d539271..d057a94ab5 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/ExecuteBatch.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/ExecuteBatch.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation; +package org.hibernate.ogm.compensation.operation; import java.util.List; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/GridDialectOperation.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/GridDialectOperation.java similarity index 95% rename from core/src/main/java/org/hibernate/ogm/failure/operation/GridDialectOperation.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/GridDialectOperation.java index b8090bca79..3f1934748b 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/GridDialectOperation.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/GridDialectOperation.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation; +package org.hibernate.ogm.compensation.operation; import org.hibernate.ogm.dialect.optimisticlock.spi.OptimisticLockingAwareGridDialect; import org.hibernate.ogm.dialect.spi.GridDialect; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/InsertOrUpdateAssociation.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/InsertOrUpdateAssociation.java similarity index 93% rename from core/src/main/java/org/hibernate/ogm/failure/operation/InsertOrUpdateAssociation.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/InsertOrUpdateAssociation.java index bfa8cec071..512b77e6ce 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/InsertOrUpdateAssociation.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/InsertOrUpdateAssociation.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation; +package org.hibernate.ogm.compensation.operation; import org.hibernate.ogm.dialect.spi.GridDialect; import org.hibernate.ogm.model.key.spi.AssociationKey; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/InsertOrUpdateTuple.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/InsertOrUpdateTuple.java similarity index 93% rename from core/src/main/java/org/hibernate/ogm/failure/operation/InsertOrUpdateTuple.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/InsertOrUpdateTuple.java index 1db273ccfa..b3d3c28107 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/InsertOrUpdateTuple.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/InsertOrUpdateTuple.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation; +package org.hibernate.ogm.compensation.operation; import org.hibernate.ogm.dialect.spi.GridDialect; import org.hibernate.ogm.model.key.spi.EntityKey; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/InsertTuple.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/InsertTuple.java similarity index 93% rename from core/src/main/java/org/hibernate/ogm/failure/operation/InsertTuple.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/InsertTuple.java index c55ca23647..5bcab05334 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/InsertTuple.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/InsertTuple.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation; +package org.hibernate.ogm.compensation.operation; import org.hibernate.ogm.dialect.identity.spi.IdentityColumnAwareGridDialect; import org.hibernate.ogm.model.key.spi.EntityKeyMetadata; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/OperationType.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/OperationType.java similarity index 93% rename from core/src/main/java/org/hibernate/ogm/failure/operation/OperationType.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/OperationType.java index cdb978e751..4e0ce7e699 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/OperationType.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/OperationType.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation; +package org.hibernate.ogm.compensation.operation; /** * The type of a {@link GridDialectOperation}. diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/RemoveAssociation.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/RemoveAssociation.java similarity index 93% rename from core/src/main/java/org/hibernate/ogm/failure/operation/RemoveAssociation.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/RemoveAssociation.java index 676498909d..ba886721b0 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/RemoveAssociation.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/RemoveAssociation.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation; +package org.hibernate.ogm.compensation.operation; import org.hibernate.ogm.dialect.spi.GridDialect; import org.hibernate.ogm.model.key.spi.AssociationKey; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/RemoveTuple.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/RemoveTuple.java similarity index 92% rename from core/src/main/java/org/hibernate/ogm/failure/operation/RemoveTuple.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/RemoveTuple.java index 0b3d3a8293..4a63bc73f8 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/RemoveTuple.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/RemoveTuple.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation; +package org.hibernate.ogm.compensation.operation; import org.hibernate.ogm.dialect.spi.GridDialect; import org.hibernate.ogm.model.key.spi.EntityKey; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/RemoveTupleWithOptimisticLock.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/RemoveTupleWithOptimisticLock.java similarity index 93% rename from core/src/main/java/org/hibernate/ogm/failure/operation/RemoveTupleWithOptimisticLock.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/RemoveTupleWithOptimisticLock.java index c637e4c3f3..92beeef868 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/RemoveTupleWithOptimisticLock.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/RemoveTupleWithOptimisticLock.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation; +package org.hibernate.ogm.compensation.operation; import org.hibernate.ogm.dialect.optimisticlock.spi.OptimisticLockingAwareGridDialect; import org.hibernate.ogm.model.key.spi.EntityKey; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/UpdateTupleWithOptimisticLock.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/UpdateTupleWithOptimisticLock.java similarity index 94% rename from core/src/main/java/org/hibernate/ogm/failure/operation/UpdateTupleWithOptimisticLock.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/UpdateTupleWithOptimisticLock.java index 7e054ed7c4..20260e2b67 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/UpdateTupleWithOptimisticLock.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/UpdateTupleWithOptimisticLock.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation; +package org.hibernate.ogm.compensation.operation; import org.hibernate.ogm.dialect.optimisticlock.spi.OptimisticLockingAwareGridDialect; import org.hibernate.ogm.model.key.spi.EntityKey; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/CreateAssociationWithKeyImpl.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/CreateAssociationWithKeyImpl.java similarity index 81% rename from core/src/main/java/org/hibernate/ogm/failure/operation/impl/CreateAssociationWithKeyImpl.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/impl/CreateAssociationWithKeyImpl.java index 6ed1556920..3706ce828b 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/CreateAssociationWithKeyImpl.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/CreateAssociationWithKeyImpl.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation.impl; +package org.hibernate.ogm.compensation.operation.impl; -import org.hibernate.ogm.failure.operation.CreateAssociationWithKey; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.OperationType; +import org.hibernate.ogm.compensation.operation.CreateAssociationWithKey; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.OperationType; import org.hibernate.ogm.model.key.spi.AssociationKey; /** diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/CreateTupleImpl.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/CreateTupleImpl.java similarity index 81% rename from core/src/main/java/org/hibernate/ogm/failure/operation/impl/CreateTupleImpl.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/impl/CreateTupleImpl.java index f0d7a5b0b9..1e32068f34 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/CreateTupleImpl.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/CreateTupleImpl.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation.impl; +package org.hibernate.ogm.compensation.operation.impl; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.OperationType; -import org.hibernate.ogm.failure.operation.CreateTuple; +import org.hibernate.ogm.compensation.operation.CreateTuple; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.OperationType; import org.hibernate.ogm.model.key.spi.EntityKeyMetadata; /** diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/CreateTupleWithKeyImpl.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/CreateTupleWithKeyImpl.java similarity index 80% rename from core/src/main/java/org/hibernate/ogm/failure/operation/impl/CreateTupleWithKeyImpl.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/impl/CreateTupleWithKeyImpl.java index 9c3ed63ff8..9bc96e0cd3 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/CreateTupleWithKeyImpl.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/CreateTupleWithKeyImpl.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation.impl; +package org.hibernate.ogm.compensation.operation.impl; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.OperationType; -import org.hibernate.ogm.failure.operation.CreateTupleWithKey; +import org.hibernate.ogm.compensation.operation.CreateTupleWithKey; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.OperationType; import org.hibernate.ogm.model.key.spi.EntityKey; /** diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/ExecuteBatchImpl.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/ExecuteBatchImpl.java similarity index 78% rename from core/src/main/java/org/hibernate/ogm/failure/operation/impl/ExecuteBatchImpl.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/impl/ExecuteBatchImpl.java index cc23a0cc36..c6b85045ae 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/ExecuteBatchImpl.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/ExecuteBatchImpl.java @@ -4,13 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation.impl; +package org.hibernate.ogm.compensation.operation.impl; import java.util.List; -import org.hibernate.ogm.failure.operation.ExecuteBatch; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.OperationType; +import org.hibernate.ogm.compensation.operation.ExecuteBatch; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.OperationType; /** * @author Gunnar Morling diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/InsertOrUpdateAssociationImpl.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/InsertOrUpdateAssociationImpl.java similarity index 84% rename from core/src/main/java/org/hibernate/ogm/failure/operation/impl/InsertOrUpdateAssociationImpl.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/impl/InsertOrUpdateAssociationImpl.java index 4e5b88d345..84086def32 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/InsertOrUpdateAssociationImpl.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/InsertOrUpdateAssociationImpl.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation.impl; +package org.hibernate.ogm.compensation.operation.impl; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.OperationType; -import org.hibernate.ogm.failure.operation.InsertOrUpdateAssociation; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.InsertOrUpdateAssociation; +import org.hibernate.ogm.compensation.operation.OperationType; import org.hibernate.ogm.model.key.spi.AssociationKey; import org.hibernate.ogm.model.spi.Association; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/InsertOrUpdateTupleImpl.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/InsertOrUpdateTupleImpl.java similarity index 82% rename from core/src/main/java/org/hibernate/ogm/failure/operation/impl/InsertOrUpdateTupleImpl.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/impl/InsertOrUpdateTupleImpl.java index 674a9e4b58..6540e5addb 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/InsertOrUpdateTupleImpl.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/InsertOrUpdateTupleImpl.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation.impl; +package org.hibernate.ogm.compensation.operation.impl; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.OperationType; -import org.hibernate.ogm.failure.operation.InsertOrUpdateTuple; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.InsertOrUpdateTuple; +import org.hibernate.ogm.compensation.operation.OperationType; import org.hibernate.ogm.model.key.spi.EntityKey; import org.hibernate.ogm.model.spi.Tuple; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/InsertTupleImpl.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/InsertTupleImpl.java similarity index 83% rename from core/src/main/java/org/hibernate/ogm/failure/operation/impl/InsertTupleImpl.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/impl/InsertTupleImpl.java index 960eed6584..1c8db65366 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/InsertTupleImpl.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/InsertTupleImpl.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation.impl; +package org.hibernate.ogm.compensation.operation.impl; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.OperationType; -import org.hibernate.ogm.failure.operation.InsertTuple; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.InsertTuple; +import org.hibernate.ogm.compensation.operation.OperationType; import org.hibernate.ogm.model.key.spi.EntityKeyMetadata; import org.hibernate.ogm.model.spi.Tuple; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/RemoveAssociationImpl.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/RemoveAssociationImpl.java similarity index 81% rename from core/src/main/java/org/hibernate/ogm/failure/operation/impl/RemoveAssociationImpl.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/impl/RemoveAssociationImpl.java index 22cd856f4f..48b921eb9e 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/RemoveAssociationImpl.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/RemoveAssociationImpl.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation.impl; +package org.hibernate.ogm.compensation.operation.impl; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.OperationType; -import org.hibernate.ogm.failure.operation.RemoveAssociation; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.OperationType; +import org.hibernate.ogm.compensation.operation.RemoveAssociation; import org.hibernate.ogm.model.key.spi.AssociationKey; /** diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/RemoveTupleImpl.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/RemoveTupleImpl.java similarity index 80% rename from core/src/main/java/org/hibernate/ogm/failure/operation/impl/RemoveTupleImpl.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/impl/RemoveTupleImpl.java index 2a515bc2f4..d5cc4044bd 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/RemoveTupleImpl.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/RemoveTupleImpl.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation.impl; +package org.hibernate.ogm.compensation.operation.impl; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.OperationType; -import org.hibernate.ogm.failure.operation.RemoveTuple; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.OperationType; +import org.hibernate.ogm.compensation.operation.RemoveTuple; import org.hibernate.ogm.model.key.spi.EntityKey; /** diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/RemoveTupleWithOptimisticLockImpl.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/RemoveTupleWithOptimisticLockImpl.java similarity index 83% rename from core/src/main/java/org/hibernate/ogm/failure/operation/impl/RemoveTupleWithOptimisticLockImpl.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/impl/RemoveTupleWithOptimisticLockImpl.java index ba0336ccbe..ed67d1fe4a 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/RemoveTupleWithOptimisticLockImpl.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/RemoveTupleWithOptimisticLockImpl.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation.impl; +package org.hibernate.ogm.compensation.operation.impl; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.OperationType; -import org.hibernate.ogm.failure.operation.RemoveTupleWithOptimisticLock; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.OperationType; +import org.hibernate.ogm.compensation.operation.RemoveTupleWithOptimisticLock; import org.hibernate.ogm.model.key.spi.EntityKey; import org.hibernate.ogm.model.spi.Tuple; diff --git a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/UpdateTupleWithOptimisticLockImpl.java b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/UpdateTupleWithOptimisticLockImpl.java similarity index 84% rename from core/src/main/java/org/hibernate/ogm/failure/operation/impl/UpdateTupleWithOptimisticLockImpl.java rename to core/src/main/java/org/hibernate/ogm/compensation/operation/impl/UpdateTupleWithOptimisticLockImpl.java index 9d872de615..96b0e000e2 100644 --- a/core/src/main/java/org/hibernate/ogm/failure/operation/impl/UpdateTupleWithOptimisticLockImpl.java +++ b/core/src/main/java/org/hibernate/ogm/compensation/operation/impl/UpdateTupleWithOptimisticLockImpl.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.failure.operation.impl; +package org.hibernate.ogm.compensation.operation.impl; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.OperationType; -import org.hibernate.ogm.failure.operation.UpdateTupleWithOptimisticLock; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.OperationType; +import org.hibernate.ogm.compensation.operation.UpdateTupleWithOptimisticLock; import org.hibernate.ogm.model.key.spi.EntityKey; import org.hibernate.ogm.model.spi.Tuple; diff --git a/core/src/main/java/org/hibernate/ogm/dialect/eventstate/impl/EventStateProducers.java b/core/src/main/java/org/hibernate/ogm/dialect/eventstate/impl/EventStateProducers.java index 1680028bfe..7ea308a83d 100644 --- a/core/src/main/java/org/hibernate/ogm/dialect/eventstate/impl/EventStateProducers.java +++ b/core/src/main/java/org/hibernate/ogm/dialect/eventstate/impl/EventStateProducers.java @@ -11,7 +11,7 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.ogm.cfg.OgmProperties; -import org.hibernate.ogm.failure.impl.OperationCollector; +import org.hibernate.ogm.compensation.impl.OperationCollector; import org.hibernate.ogm.transaction.impl.ErrorHandlerEnabledTransactionDecorator; /** diff --git a/core/src/main/java/org/hibernate/ogm/dialect/impl/GridDialectInitiator.java b/core/src/main/java/org/hibernate/ogm/dialect/impl/GridDialectInitiator.java index f4168cf73e..41b4fa6099 100644 --- a/core/src/main/java/org/hibernate/ogm/dialect/impl/GridDialectInitiator.java +++ b/core/src/main/java/org/hibernate/ogm/dialect/impl/GridDialectInitiator.java @@ -12,11 +12,11 @@ import org.hibernate.boot.registry.StandardServiceInitiator; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.ogm.cfg.OgmProperties; +import org.hibernate.ogm.compensation.impl.InvocationCollectingGridDialect; import org.hibernate.ogm.datastore.spi.DatastoreProvider; import org.hibernate.ogm.dialect.batch.spi.BatchableGridDialect; import org.hibernate.ogm.dialect.eventstate.impl.EventContextManager; import org.hibernate.ogm.dialect.spi.GridDialect; -import org.hibernate.ogm.failure.impl.InvocationCollectingGridDialect; import org.hibernate.ogm.util.configurationreader.impl.DefaultClassPropertyReaderContext; import org.hibernate.ogm.util.configurationreader.impl.Instantiator; import org.hibernate.ogm.util.configurationreader.spi.ConfigurationPropertyReader; diff --git a/core/src/main/java/org/hibernate/ogm/persister/impl/OgmEntityPersister.java b/core/src/main/java/org/hibernate/ogm/persister/impl/OgmEntityPersister.java index eea68981af..d111d247bf 100644 --- a/core/src/main/java/org/hibernate/ogm/persister/impl/OgmEntityPersister.java +++ b/core/src/main/java/org/hibernate/ogm/persister/impl/OgmEntityPersister.java @@ -42,6 +42,7 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; +import org.hibernate.ogm.compensation.impl.InvocationCollectingGridDialect; import org.hibernate.ogm.dialect.identity.spi.IdentityColumnAwareGridDialect; import org.hibernate.ogm.dialect.impl.AssociationTypeContextImpl; import org.hibernate.ogm.dialect.impl.ExceptionThrowingLockingStrategy; @@ -55,7 +56,6 @@ import org.hibernate.ogm.dialect.spi.TupleContext; import org.hibernate.ogm.entityentry.impl.OgmEntityEntryState; import org.hibernate.ogm.exception.NotSupportedException; -import org.hibernate.ogm.failure.impl.InvocationCollectingGridDialect; import org.hibernate.ogm.id.impl.OgmIdentityGenerator; import org.hibernate.ogm.loader.impl.OgmLoader; import org.hibernate.ogm.model.impl.DefaultAssociatedEntityKeyMetadata; diff --git a/core/src/main/java/org/hibernate/ogm/transaction/impl/ErrorHandlerEnabledTransactionDecorator.java b/core/src/main/java/org/hibernate/ogm/transaction/impl/ErrorHandlerEnabledTransactionDecorator.java index 667bf577b6..6b5868b9b3 100644 --- a/core/src/main/java/org/hibernate/ogm/transaction/impl/ErrorHandlerEnabledTransactionDecorator.java +++ b/core/src/main/java/org/hibernate/ogm/transaction/impl/ErrorHandlerEnabledTransactionDecorator.java @@ -12,15 +12,15 @@ import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform; import org.hibernate.engine.transaction.spi.TransactionImplementor; -import org.hibernate.ogm.failure.ErrorHandler; -import org.hibernate.ogm.failure.impl.OperationCollector; +import org.hibernate.ogm.compensation.ErrorHandler; +import org.hibernate.ogm.compensation.impl.OperationCollector; /** * A {@link TransactionImplementor} wrapper which triggers invocation of the user-configured {@link ErrorHandler} upon * failed operations, rollbacks etc. *

* Depending on the type of the underlying transacton (JTA or not), - * {@link ErrorHandler#onRollback(org.hibernate.ogm.failure.ErrorHandler.RollbackContext)} will either be invoked + * {@link ErrorHandler#onRollback(org.hibernate.ogm.compensation.ErrorHandler.RollbackContext)} will either be invoked * via a {@link Synchronization} or through the {@link #rollback()} method. * * @author Gunnar Morling diff --git a/core/src/main/java/org/hibernate/ogm/transaction/impl/ErrorHandlerEnabledTransactionDecoratorFactory.java b/core/src/main/java/org/hibernate/ogm/transaction/impl/ErrorHandlerEnabledTransactionDecoratorFactory.java index 773ee7865e..cc2cdec8dd 100644 --- a/core/src/main/java/org/hibernate/ogm/transaction/impl/ErrorHandlerEnabledTransactionDecoratorFactory.java +++ b/core/src/main/java/org/hibernate/ogm/transaction/impl/ErrorHandlerEnabledTransactionDecoratorFactory.java @@ -11,7 +11,7 @@ import org.hibernate.engine.transaction.spi.TransactionCoordinator; import org.hibernate.engine.transaction.spi.TransactionFactory; import org.hibernate.engine.transaction.spi.TransactionImplementor; -import org.hibernate.ogm.failure.ErrorHandler; +import org.hibernate.ogm.compensation.ErrorHandler; /** * A {@link TransactionFactory} which takes transactions created by another factory and decorates them with the diff --git a/core/src/main/java/org/hibernate/ogm/transaction/impl/OgmTransactionFactoryInitiator.java b/core/src/main/java/org/hibernate/ogm/transaction/impl/OgmTransactionFactoryInitiator.java index f8c014e845..1426d22916 100644 --- a/core/src/main/java/org/hibernate/ogm/transaction/impl/OgmTransactionFactoryInitiator.java +++ b/core/src/main/java/org/hibernate/ogm/transaction/impl/OgmTransactionFactoryInitiator.java @@ -16,8 +16,8 @@ import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform; import org.hibernate.engine.transaction.spi.TransactionFactory; import org.hibernate.ogm.cfg.OgmProperties; +import org.hibernate.ogm.compensation.ErrorHandler; import org.hibernate.ogm.datastore.spi.DatastoreProvider; -import org.hibernate.ogm.failure.ErrorHandler; import org.hibernate.ogm.util.configurationreader.spi.ConfigurationPropertyReader; import org.hibernate.ogm.util.impl.Log; import org.hibernate.ogm.util.impl.LoggerFactory; diff --git a/core/src/test/java/org/hibernate/ogm/backendtck/failure/ErrorSpiJpaTest.java b/core/src/test/java/org/hibernate/ogm/backendtck/compensation/CompensationSpiJpaTest.java similarity index 94% rename from core/src/test/java/org/hibernate/ogm/backendtck/failure/ErrorSpiJpaTest.java rename to core/src/test/java/org/hibernate/ogm/backendtck/compensation/CompensationSpiJpaTest.java index 7abeb8fafa..25d1a2403b 100644 --- a/core/src/test/java/org/hibernate/ogm/backendtck/failure/ErrorSpiJpaTest.java +++ b/core/src/test/java/org/hibernate/ogm/backendtck/compensation/CompensationSpiJpaTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.backendtck.failure; +package org.hibernate.ogm.backendtck.compensation; import static org.fest.assertions.Assertions.assertThat; import static org.fest.assertions.Fail.fail; @@ -22,16 +22,16 @@ import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform; import org.hibernate.jpa.HibernateEntityManagerFactory; import org.hibernate.ogm.cfg.OgmProperties; +import org.hibernate.ogm.compensation.ErrorHandler.RollbackContext; +import org.hibernate.ogm.compensation.operation.CreateTupleWithKey; +import org.hibernate.ogm.compensation.operation.ExecuteBatch; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.InsertOrUpdateTuple; import org.hibernate.ogm.dialect.batch.spi.BatchableGridDialect; import org.hibernate.ogm.dialect.impl.GridDialects; import org.hibernate.ogm.dialect.optimisticlock.spi.OptimisticLockingAwareGridDialect; import org.hibernate.ogm.dialect.spi.DuplicateInsertPreventionStrategy; import org.hibernate.ogm.dialect.spi.GridDialect; -import org.hibernate.ogm.failure.ErrorHandler.RollbackContext; -import org.hibernate.ogm.failure.operation.CreateTupleWithKey; -import org.hibernate.ogm.failure.operation.ExecuteBatch; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.InsertOrUpdateTuple; import org.hibernate.ogm.model.impl.DefaultEntityKeyMetadata; import org.hibernate.ogm.utils.GridDialectType; import org.hibernate.ogm.utils.PackagingRule; @@ -44,7 +44,7 @@ import org.junit.Test; /** - * Test for using the error handler SPI with JPA. + * Test for using the compensation SPI with JPA. * * @author Gunnar Morling * @@ -53,7 +53,7 @@ value = { GridDialectType.CASSANDRA }, comment = "Cassandra always upserts, doesn't read-lock before write, doesn't support uniq constraint even on primary key except by explicit/slow CAS use" ) -public class ErrorSpiJpaTest extends JpaTestCase { +public class CompensationSpiJpaTest extends JpaTestCase { @Rule public PackagingRule packaging = new PackagingRule( "persistencexml/transaction-type-jta.xml", Shipment.class ); diff --git a/core/src/test/java/org/hibernate/ogm/backendtck/failure/ErrorSpiTest.java b/core/src/test/java/org/hibernate/ogm/backendtck/compensation/CompensationSpiTest.java similarity index 96% rename from core/src/test/java/org/hibernate/ogm/backendtck/failure/ErrorSpiTest.java rename to core/src/test/java/org/hibernate/ogm/backendtck/compensation/CompensationSpiTest.java index 471cd938cc..2c4166885f 100644 --- a/core/src/test/java/org/hibernate/ogm/backendtck/failure/ErrorSpiTest.java +++ b/core/src/test/java/org/hibernate/ogm/backendtck/compensation/CompensationSpiTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.backendtck.failure; +package org.hibernate.ogm.backendtck.compensation; import static org.fest.assertions.Assertions.assertThat; import static org.fest.assertions.Fail.fail; @@ -19,19 +19,19 @@ import org.hibernate.cfg.Configuration; import org.hibernate.ogm.OgmSession; import org.hibernate.ogm.cfg.OgmProperties; +import org.hibernate.ogm.compensation.ErrorHandler.FailedGridDialectOperationContext; +import org.hibernate.ogm.compensation.ErrorHandler.RollbackContext; +import org.hibernate.ogm.compensation.operation.CreateTupleWithKey; +import org.hibernate.ogm.compensation.operation.ExecuteBatch; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.InsertOrUpdateTuple; +import org.hibernate.ogm.compensation.operation.UpdateTupleWithOptimisticLock; import org.hibernate.ogm.dialect.batch.spi.BatchableGridDialect; import org.hibernate.ogm.dialect.impl.GridDialects; import org.hibernate.ogm.dialect.optimisticlock.spi.OptimisticLockingAwareGridDialect; import org.hibernate.ogm.dialect.spi.DuplicateInsertPreventionStrategy; import org.hibernate.ogm.dialect.spi.GridDialect; import org.hibernate.ogm.dialect.spi.TupleAlreadyExistsException; -import org.hibernate.ogm.failure.ErrorHandler.FailedGridDialectOperationContext; -import org.hibernate.ogm.failure.ErrorHandler.RollbackContext; -import org.hibernate.ogm.failure.operation.CreateTupleWithKey; -import org.hibernate.ogm.failure.operation.ExecuteBatch; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.InsertOrUpdateTuple; -import org.hibernate.ogm.failure.operation.UpdateTupleWithOptimisticLock; import org.hibernate.ogm.model.impl.DefaultEntityKeyMetadata; import org.hibernate.ogm.transaction.impl.ErrorHandlerEnabledTransactionDecorator; import org.hibernate.ogm.utils.GridDialectType; @@ -44,7 +44,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; /** - * Tests around the Error reporting SPI. + * Tests around the error compensation SPI. * * @author Gunnar Morling */ @@ -52,7 +52,7 @@ value = { GridDialectType.CASSANDRA }, comment = "Cassandra always upserts, doesn't read-lock before write, doesn't support uniq constraint even on primary key except by explicit/slow CAS use" ) -public class ErrorSpiTest extends OgmTestCase { +public class CompensationSpiTest extends OgmTestCase { private static ExecutorService executor; diff --git a/core/src/test/java/org/hibernate/ogm/backendtck/failure/ContinuingErrorHandler.java b/core/src/test/java/org/hibernate/ogm/backendtck/compensation/ContinuingErrorHandler.java similarity index 81% rename from core/src/test/java/org/hibernate/ogm/backendtck/failure/ContinuingErrorHandler.java rename to core/src/test/java/org/hibernate/ogm/backendtck/compensation/ContinuingErrorHandler.java index a4e07552a2..ddf4506ec0 100644 --- a/core/src/test/java/org/hibernate/ogm/backendtck/failure/ContinuingErrorHandler.java +++ b/core/src/test/java/org/hibernate/ogm/backendtck/compensation/ContinuingErrorHandler.java @@ -4,10 +4,10 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.backendtck.failure; +package org.hibernate.ogm.backendtck.compensation; -import org.hibernate.ogm.failure.ErrorHandler; -import org.hibernate.ogm.failure.ErrorHandlingStrategy; +import org.hibernate.ogm.compensation.ErrorHandler; +import org.hibernate.ogm.compensation.ErrorHandlingStrategy; /** * A test {@link ErrorHandler} which continues after failed operations. diff --git a/core/src/test/java/org/hibernate/ogm/backendtck/failure/InvocationTrackingHandler.java b/core/src/test/java/org/hibernate/ogm/backendtck/compensation/InvocationTrackingHandler.java similarity index 89% rename from core/src/test/java/org/hibernate/ogm/backendtck/failure/InvocationTrackingHandler.java rename to core/src/test/java/org/hibernate/ogm/backendtck/compensation/InvocationTrackingHandler.java index 3cbba73f10..502fd6b265 100644 --- a/core/src/test/java/org/hibernate/ogm/backendtck/failure/InvocationTrackingHandler.java +++ b/core/src/test/java/org/hibernate/ogm/backendtck/compensation/InvocationTrackingHandler.java @@ -4,13 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.backendtck.failure; +package org.hibernate.ogm.backendtck.compensation; import java.util.ArrayList; import java.util.List; -import org.hibernate.ogm.failure.ErrorHandler; -import org.hibernate.ogm.failure.ErrorHandlingStrategy; +import org.hibernate.ogm.compensation.ErrorHandler; +import org.hibernate.ogm.compensation.ErrorHandlingStrategy; /** * An {@link ErrorHandler} which makes all its invocations available for testing purposes. diff --git a/core/src/test/java/org/hibernate/ogm/backendtck/failure/Shipment.java b/core/src/test/java/org/hibernate/ogm/backendtck/compensation/Shipment.java similarity index 95% rename from core/src/test/java/org/hibernate/ogm/backendtck/failure/Shipment.java rename to core/src/test/java/org/hibernate/ogm/backendtck/compensation/Shipment.java index 4a5d73fe8f..326e1004bc 100644 --- a/core/src/test/java/org/hibernate/ogm/backendtck/failure/Shipment.java +++ b/core/src/test/java/org/hibernate/ogm/backendtck/compensation/Shipment.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.ogm.backendtck.failure; +package org.hibernate.ogm.backendtck.compensation; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/integrationtest/mongodb/src/test/java/org/hibernate/ogm/test/integration/jboss/MongoDBModuleMemberRegistrationIT.java b/integrationtest/mongodb/src/test/java/org/hibernate/ogm/test/integration/jboss/MongoDBModuleMemberRegistrationIT.java index 41cc1d41e9..d524cbafa4 100644 --- a/integrationtest/mongodb/src/test/java/org/hibernate/ogm/test/integration/jboss/MongoDBModuleMemberRegistrationIT.java +++ b/integrationtest/mongodb/src/test/java/org/hibernate/ogm/test/integration/jboss/MongoDBModuleMemberRegistrationIT.java @@ -18,11 +18,11 @@ import javax.inject.Inject; import org.hibernate.ogm.cfg.OgmProperties; +import org.hibernate.ogm.compensation.ErrorHandler.RollbackContext; +import org.hibernate.ogm.compensation.operation.CreateTuple; +import org.hibernate.ogm.compensation.operation.GridDialectOperation; +import org.hibernate.ogm.compensation.operation.OperationType; import org.hibernate.ogm.datastore.mongodb.MongoDB; -import org.hibernate.ogm.failure.ErrorHandler.RollbackContext; -import org.hibernate.ogm.failure.operation.CreateTuple; -import org.hibernate.ogm.failure.operation.GridDialectOperation; -import org.hibernate.ogm.failure.operation.OperationType; import org.hibernate.ogm.test.integration.jboss.errorhandler.TestErrorHandler; import org.hibernate.ogm.test.integration.jboss.model.EmailAddress; import org.hibernate.ogm.test.integration.jboss.model.Member; @@ -39,7 +39,6 @@ import org.jboss.shrinkwrap.descriptor.api.persistence20.Properties; import org.junit.Test; import org.junit.runner.RunWith; - /** * Test for the Hibernate OGM module in WildFly using MongoDB * diff --git a/integrationtest/mongodb/src/test/java/org/hibernate/ogm/test/integration/jboss/errorhandler/TestErrorHandler.java b/integrationtest/mongodb/src/test/java/org/hibernate/ogm/test/integration/jboss/errorhandler/TestErrorHandler.java index 9d00e98884..334314542f 100644 --- a/integrationtest/mongodb/src/test/java/org/hibernate/ogm/test/integration/jboss/errorhandler/TestErrorHandler.java +++ b/integrationtest/mongodb/src/test/java/org/hibernate/ogm/test/integration/jboss/errorhandler/TestErrorHandler.java @@ -10,8 +10,8 @@ import java.util.Collections; import java.util.List; -import org.hibernate.ogm.failure.ErrorHandler; -import org.hibernate.ogm.failure.ErrorHandlingStrategy; +import org.hibernate.ogm.compensation.ErrorHandler; +import org.hibernate.ogm.compensation.ErrorHandlingStrategy; /** * @author Gunnar Morling