http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java index 60108c8..7ac8041 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java @@ -298,39 +298,37 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 8: if (!writer.writeByteArray("errBytes", errBytes)) return false; - state.increment(); + writer.incrementState(); case 9: if (!writer.writeIgniteUuid("futId", futId)) return false; - state.increment(); + writer.incrementState(); case 10: if (!writer.writeCollection("valBytes", valBytes, Type.MSG)) return false; - state.increment(); + writer.incrementState(); }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java index 46aa9d8..5688cfc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java @@ -376,99 +376,97 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 8: if (!writer.writeMessage("baseVer", baseVer)) return false; - state.increment(); + writer.incrementState(); case 9: if (!writer.writeBoolean("commit", commit)) return false; - state.increment(); + writer.incrementState(); case 10: if (!writer.writeMessage("commitVer", commitVer)) return false; - state.increment(); + writer.incrementState(); case 11: if (!writer.writeIgniteUuid("futId", futId)) return false; - state.increment(); + writer.incrementState(); case 12: if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes)) return false; - state.increment(); + writer.incrementState(); case 13: if (!writer.writeBoolean("invalidate", invalidate)) return false; - state.increment(); + writer.incrementState(); case 14: if (!writer.writeCollection("recoveryWritesBytes", recoveryWritesBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 15: if (!writer.writeBoolean("syncCommit", syncCommit)) return false; - state.increment(); + writer.incrementState(); case 16: if (!writer.writeBoolean("syncRollback", syncRollback)) return false; - state.increment(); + writer.incrementState(); case 17: if (!writer.writeBoolean("sys", sys)) return false; - state.increment(); + writer.incrementState(); case 18: if (!writer.writeLong("threadId", threadId)) return false; - state.increment(); + writer.incrementState(); case 19: if (!writer.writeInt("txSize", txSize)) return false; - state.increment(); + writer.incrementState(); case 20: if (!writer.writeCollection("writeEntriesBytes", writeEntriesBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java index 1811457..2d63664 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java @@ -92,33 +92,31 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeIgniteUuid("futId", futId)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeMessage("txId", txId)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java ---------------------------------------------------------------------- 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 4a9b972..97b36e6 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 @@ -437,105 +437,103 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 8: if (!writer.writeMessage("commitVer", commitVer)) return false; - state.increment(); + writer.incrementState(); case 9: if (!writer.writeByte("concurrency", concurrency != null ? (byte)concurrency.ordinal() : -1)) return false; - state.increment(); + writer.incrementState(); case 10: if (!writer.writeByteArray("dhtVersBytes", dhtVersBytes)) return false; - state.increment(); + writer.incrementState(); case 11: if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes)) return false; - state.increment(); + writer.incrementState(); case 12: if (!writer.writeBoolean("invalidate", invalidate)) return false; - state.increment(); + writer.incrementState(); case 13: if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) return false; - state.increment(); + writer.incrementState(); case 14: if (!writer.writeBoolean("partLock", partLock)) return false; - state.increment(); + writer.incrementState(); case 15: if (!writer.writeCollection("readsBytes", readsBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 16: if (!writer.writeBoolean("sys", sys)) return false; - state.increment(); + writer.incrementState(); case 17: if (!writer.writeLong("threadId", threadId)) return false; - state.increment(); + writer.incrementState(); case 18: if (!writer.writeLong("timeout", timeout)) return false; - state.increment(); + writer.incrementState(); case 19: if (!writer.writeByteArray("txNodesBytes", txNodesBytes)) return false; - state.increment(); + writer.incrementState(); case 20: if (!writer.writeInt("txSize", txSize)) return false; - state.increment(); + writer.incrementState(); case 21: if (!writer.writeCollection("writesBytes", writesBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java index e024724..72bd333 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java @@ -169,33 +169,31 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 8: if (!writer.writeByteArray("candsBytes", candsBytes)) return false; - state.increment(); + writer.incrementState(); case 9: if (!writer.writeByteArray("errBytes", errBytes)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java index 5dfbdc5..6d18edb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java @@ -133,27 +133,25 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 8: if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java index 32986fb..fde5bdd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java @@ -82,27 +82,25 @@ public class GridDhtAffinityAssignmentRequest<K, V> extends GridCacheMessage<K, } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java index e3e7d69..dfff328 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java @@ -123,33 +123,31 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K, } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeByteArray("affAssignmentBytes", affAssignmentBytes)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index 3fc595c..ad1538f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@ -367,75 +367,73 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 24: if (!writer.writeLong("accessTtl", accessTtl)) return false; - state.increment(); + writer.incrementState(); case 25: if (!writer.writeBitSet("invalidateEntries", invalidateEntries)) return false; - state.increment(); + writer.incrementState(); case 26: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 27: if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 28: if (!writer.writeByteArray("ownedBytes", ownedBytes)) return false; - state.increment(); + writer.incrementState(); case 29: if (!writer.writeBitSet("preloadKeys", preloadKeys)) return false; - state.increment(); + writer.incrementState(); case 30: if (!writer.writeUuid("subjId", subjId)) return false; - state.increment(); + writer.incrementState(); case 31: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; - state.increment(); + writer.incrementState(); case 32: if (!writer.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java index e4c9f89..d9c7465 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java @@ -220,45 +220,43 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 11: if (!writer.writeCollection("invalidParts", invalidParts, Type.INT)) return false; - state.increment(); + writer.incrementState(); case 12: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 13: if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 14: if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index 7e4602d..5d7fc33 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -377,99 +377,97 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 21: if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) return false; - state.increment(); + writer.incrementState(); case 22: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 23: if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; - state.increment(); + writer.incrementState(); case 24: if (!writer.writeMessage("nearTtls", nearTtls)) return false; - state.increment(); + writer.incrementState(); case 25: if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 26: if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit)) return false; - state.increment(); + writer.incrementState(); case 27: if (!writer.writeCollection("pendingVers", pendingVers, Type.MSG)) return false; - state.increment(); + writer.incrementState(); case 28: if (!writer.writeUuid("subjId", subjId)) return false; - state.increment(); + writer.incrementState(); case 29: if (!writer.writeBoolean("sysInvalidate", sysInvalidate)) return false; - state.increment(); + writer.incrementState(); case 30: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; - state.increment(); + writer.incrementState(); case 31: if (!writer.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); case 32: if (!writer.writeMessage("ttls", ttls)) return false; - state.increment(); + writer.incrementState(); case 33: if (!writer.writeMessage("writeVer", writeVer)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java index 0b2c294..045295e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java @@ -85,27 +85,25 @@ public class GridDhtTxFinishResponse<K, V> extends GridDistributedTxFinishRespon /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 5: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java index 97a911d..6fdbcb2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java @@ -341,93 +341,91 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 22: if (!writer.writeIgniteUuid("futId", futId)) return false; - state.increment(); + writer.incrementState(); case 23: if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries)) return false; - state.increment(); + writer.incrementState(); case 24: if (!writer.writeBoolean("last", last)) return false; - state.increment(); + writer.incrementState(); case 25: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 26: if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; - state.increment(); + writer.incrementState(); case 27: if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 28: if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; - state.increment(); + writer.incrementState(); case 29: if (!writer.writeByteArray("ownedBytes", ownedBytes)) return false; - state.increment(); + writer.incrementState(); case 30: if (!writer.writeBitSet("preloadKeys", preloadKeys)) return false; - state.increment(); + writer.incrementState(); case 31: if (!writer.writeUuid("subjId", subjId)) return false; - state.increment(); + writer.incrementState(); case 32: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; - state.increment(); + writer.incrementState(); case 33: if (!writer.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java index b015fb6..266a536 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java @@ -227,51 +227,49 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 10: if (!writer.writeIgniteUuid("futId", futId)) return false; - state.increment(); + writer.incrementState(); case 11: if (!writer.writeCollection("invalidParts", invalidParts, Type.INT)) return false; - state.increment(); + writer.incrementState(); case 12: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 13: if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 14: if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java index 2e6762f..1a0f1af 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java @@ -121,27 +121,25 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 9: if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java index a0896f8..c765ed6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java @@ -89,27 +89,25 @@ public class GridDhtAtomicDeferredUpdateResponse<K, V> extends GridCacheMessage< /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeCollection("futVers", futVers, Type.MSG)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index a6caa5a..f65de25 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -723,141 +723,139 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeMessage("drExpireTimes", drExpireTimes)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeCollection("drVers", drVers, Type.MSG)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeBoolean("forceTransformBackups", forceTransformBackups)) return false; - state.increment(); + writer.incrementState(); case 7: if (!writer.writeMessage("futVer", futVer)) return false; - state.increment(); + writer.incrementState(); case 8: if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 9: if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 10: if (!writer.writeCollection("nearEntryProcessorsBytes", nearEntryProcessorsBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 11: if (!writer.writeMessage("nearExpireTimes", nearExpireTimes)) return false; - state.increment(); + writer.incrementState(); case 12: if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 13: if (!writer.writeMessage("nearTtls", nearTtls)) return false; - state.increment(); + writer.incrementState(); case 14: if (!writer.writeCollection("nearValBytes", nearValBytes, Type.MSG)) return false; - state.increment(); + writer.incrementState(); case 15: if (!writer.writeUuid("nodeId", nodeId)) return false; - state.increment(); + writer.incrementState(); case 16: if (!writer.writeUuid("subjId", subjId)) return false; - state.increment(); + writer.incrementState(); case 17: if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1)) return false; - state.increment(); + writer.incrementState(); case 18: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; - state.increment(); + writer.incrementState(); case 19: if (!writer.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); case 20: if (!writer.writeMessage("ttls", ttls)) return false; - state.increment(); + writer.incrementState(); case 21: if (!writer.writeCollection("valBytes", valBytes, Type.MSG)) return false; - state.increment(); + writer.incrementState(); case 22: if (!writer.writeMessage("writeVer", writeVer)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java index 1dbbaff..de6e6e8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java @@ -200,45 +200,43 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeByteArray("errBytes", errBytes)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeByteArray("failedKeysBytes", failedKeysBytes)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeMessage("futVer", futVer)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java index 5103919..41c8d42 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java @@ -583,135 +583,133 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeMessage("drExpireTimes", drExpireTimes)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeMessage("drTtls", drTtls)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeCollection("drVers", drVers, Type.MSG)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeByteArray("expiryPlcBytes", expiryPlcBytes)) return false; - state.increment(); + writer.incrementState(); case 7: if (!writer.writeBoolean("fastMap", fastMap)) return false; - state.increment(); + writer.incrementState(); case 8: if (!writer.writeObjectArray("filterBytes", filterBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 9: if (!writer.writeBoolean("forceTransformBackups", forceTransformBackups)) return false; - state.increment(); + writer.incrementState(); case 10: if (!writer.writeMessage("futVer", futVer)) return false; - state.increment(); + writer.incrementState(); case 11: if (!writer.writeBoolean("hasPrimary", hasPrimary)) return false; - state.increment(); + writer.incrementState(); case 12: if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 13: if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 14: if (!writer.writeByte("op", op != null ? (byte)op.ordinal() : -1)) return false; - state.increment(); + writer.incrementState(); case 15: if (!writer.writeBoolean("retval", retval)) return false; - state.increment(); + writer.incrementState(); case 16: if (!writer.writeUuid("subjId", subjId)) return false; - state.increment(); + writer.incrementState(); case 17: if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1)) return false; - state.increment(); + writer.incrementState(); case 18: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; - state.increment(); + writer.incrementState(); case 19: if (!writer.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); case 20: if (!writer.writeMessage("updateVer", updateVer)) return false; - state.increment(); + writer.incrementState(); case 21: if (!writer.writeCollection("valBytes", valBytes, Type.MSG)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java index f339465..b5f1ebe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java @@ -450,87 +450,85 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i /** {@inheritDoc} */ @SuppressWarnings("fallthrough") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeByteArray("errBytes", errBytes)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeByteArray("failedKeysBytes", failedKeysBytes)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeMessage("futVer", futVer)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeMessage("nearExpireTimes", nearExpireTimes)) return false; - state.increment(); + writer.incrementState(); case 7: if (!writer.writeCollection("nearSkipIdxs", nearSkipIdxs, Type.INT)) return false; - state.increment(); + writer.incrementState(); case 8: if (!writer.writeMessage("nearTtls", nearTtls)) return false; - state.increment(); + writer.incrementState(); case 9: if (!writer.writeCollection("nearValBytes", nearValBytes, Type.MSG)) return false; - state.increment(); + writer.incrementState(); case 10: if (!writer.writeCollection("nearValsIdxs", nearValsIdxs, Type.INT)) return false; - state.increment(); + writer.incrementState(); case 11: if (!writer.writeMessage("nearVer", nearVer)) return false; - state.increment(); + writer.incrementState(); case 12: if (!writer.writeByteArray("remapKeysBytes", remapKeysBytes)) return false; - state.increment(); + writer.incrementState(); case 13: if (!writer.writeByteArray("retValBytes", retValBytes)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java index da3d9df..06e44fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java @@ -182,45 +182,43 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeIgniteUuid("futId", futId)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java index 70b62c3..11ff1cf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java @@ -186,45 +186,43 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeIgniteUuid("futId", futId)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeByteArray("infosBytes", infosBytes)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeCollection("missedKeyBytes", missedKeyBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java index f188d22..a737d3d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java @@ -212,57 +212,55 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeCollection("parts", parts, Type.INT)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeLong("timeout", timeout)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeByteArray("topicBytes", topicBytes)) return false; - state.increment(); + writer.incrementState(); case 7: if (!writer.writeLong("updateSeq", updateSeq)) return false; - state.increment(); + writer.incrementState(); case 8: if (!writer.writeInt("workerId", workerId)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java index 43847a6..5cf1748 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java @@ -146,36 +146,34 @@ public class GridDhtPartitionExchangeId extends MessageAdapter implements Compar } /** {@inheritDoc} */ - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 0: if (!writer.writeInt("evt", evt)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeUuid("nodeId", nodeId)) return false; - state.increment(); + writer.incrementState(); case 2: if (!writer.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java index 142150b..29b19ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java @@ -297,57 +297,55 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeBoolean("ack", ack)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeByteArray("infoBytes", infoBytes)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeCollection("last", last, Type.INT)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeCollection("missed", missed, Type.INT)) return false; - state.increment(); + writer.incrementState(); case 7: if (!writer.writeLong("updateSeq", updateSeq)) return false; - state.increment(); + writer.incrementState(); case 8: if (!writer.writeInt("workerId", workerId)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java index 5c798d8..147488e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java @@ -86,33 +86,31 @@ abstract class GridDhtPartitionsAbstractMessage<K, V> extends GridCacheMessage<K /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeMessage("exchId", exchId)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeMessage("lastVer", lastVer)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index a773e61..83957d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -134,33 +134,31 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 5: if (!writer.writeByteArray("partsBytes", partsBytes)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java index 1399519..05160f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java @@ -112,27 +112,25 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 5: if (!writer.writeByteArray("partsBytes", partsBytes)) return false; - state.increment(); + writer.incrementState(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java index 0278a6e..ee94c8a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java @@ -58,19 +58,17 @@ public class GridDhtPartitionsSingleRequest<K, V> extends GridDhtPartitionsAbstr /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java index 5673242..a77fcf6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java @@ -266,87 +266,85 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements /** {@inheritDoc} */ @SuppressWarnings("all") - @Override public boolean writeTo(ByteBuffer buf, MessageWriteState state) { - MessageWriter writer = state.writer(); - + @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); - if (!super.writeTo(buf, state)) + if (!super.writeTo(buf, writer)) return false; - if (!state.isTypeWritten()) { + if (!writer.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - state.setTypeWritten(); + writer.onTypeWritten(); } - switch (state.index()) { + switch (writer.state()) { case 3: if (!writer.writeLong("accessTtl", accessTtl)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeIgniteUuid("futId", futId)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeMap("keyBytes", keyBytes, Type.BYTE_ARR, Type.BOOLEAN)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 7: if (!writer.writeBoolean("readThrough", readThrough)) return false; - state.increment(); + writer.incrementState(); case 8: if (!writer.writeBoolean("reload", reload)) return false; - state.increment(); + writer.incrementState(); case 9: if (!writer.writeBoolean("skipVals", skipVals)) return false; - state.increment(); + writer.incrementState(); case 10: if (!writer.writeUuid("subjId", subjId)) return false; - state.increment(); + writer.incrementState(); case 11: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; - state.increment(); + writer.incrementState(); case 12: if (!writer.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); case 13: if (!writer.writeMessage("ver", ver)) return false; - state.increment(); + writer.incrementState(); }
