diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index 017d19d82b1fc..59896638c750f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -80,21 +80,15 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage private long threadId; /** Transaction concurrency. */ + @Order(8) @GridToStringInclude private TransactionConcurrency concurrency; - /** Transaction concurrency ordinal. */ - @Order(value = 8, method = "concurrencyOrdinal") - private byte concurrencyOrd; - /** Transaction isolation. */ + @Order(9) @GridToStringInclude private TransactionIsolation isolation; - /** Transaction isolation ordinal. */ - @Order(value = 9, method = "isolationOrdinal") - private byte isolationOrd; - /** Commit version for EC transactions. */ @Order(value = 10, method = "writeVersion") @GridToStringInclude @@ -188,9 +182,7 @@ public GridDistributedTxPrepareRequest( writeVer = tx.writeVersion(); threadId = tx.threadId(); concurrency = tx.concurrency(); - concurrencyOrd = concurrency != null ? (byte)concurrency.ordinal() : -1; isolation = tx.isolation(); - isolationOrd = isolation != null ? (byte)isolation.ordinal() : -1; txSize = tx.size(); plc = tx.ioPolicy(); @@ -342,19 +334,10 @@ public TransactionConcurrency concurrency() { } /** - * @return Concurrency ordinal. - */ - public byte concurrencyOrdinal() { - return concurrencyOrd; - } - - /** - * @param concurrencyOrd Concurrency ordinal. + * @param concurrency Concurrency. */ - public void concurrencyOrdinal(byte concurrencyOrd) { - this.concurrencyOrd = concurrencyOrd; - - concurrency = TransactionConcurrency.fromOrdinal(concurrencyOrd); + public void concurrency(TransactionConcurrency concurrency) { + this.concurrency = concurrency; } /** @@ -365,19 +348,10 @@ public TransactionIsolation isolation() { } /** - * @return Isolation level ordinal. - */ - public byte isolationOrdinal() { - return isolationOrd; - } - - /** - * @param isolationOrd Isolation level ordinal. + * @param isolation Isolation level. */ - public void isolationOrdinal(byte isolationOrd) { - this.isolationOrd = isolationOrd; - - isolation = TransactionIsolation.fromOrdinal(isolationOrd); + public void isolation(TransactionIsolation isolation) { + this.isolation = isolation; } /**