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/GridNearGetResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java index 29695f2..3f831e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java @@ -224,63 +224,61 @@ public class GridNearGetResponse<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.writeByteArray("entriesBytes", entriesBytes)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeByteArray("errBytes", errBytes)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeIgniteUuid("futId", futId)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeCollection("invalidParts", invalidParts, Type.INT)) return false; - state.increment(); + writer.incrementState(); case 7: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 8: if (!writer.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); case 9: if (!writer.writeMessage("ver", ver)) 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/near/GridNearLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java index 3e30f4d..e3091fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java @@ -359,93 +359,91 @@ public class GridNearLockRequest<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.writeObjectArray("dhtVers", dhtVers, Type.MSG)) return false; - state.increment(); + writer.incrementState(); case 26: if (!writer.writeObjectArray("filterBytes", filterBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 27: if (!writer.writeBoolean("hasTransforms", hasTransforms)) return false; - state.increment(); + writer.incrementState(); case 28: if (!writer.writeBoolean("implicitSingleTx", implicitSingleTx)) return false; - state.increment(); + writer.incrementState(); case 29: if (!writer.writeBoolean("implicitTx", implicitTx)) return false; - state.increment(); + writer.incrementState(); case 30: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 31: if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit)) return false; - state.increment(); + writer.incrementState(); case 32: if (!writer.writeUuid("subjId", subjId)) return false; - state.increment(); + writer.incrementState(); case 33: if (!writer.writeBoolean("syncCommit", syncCommit)) return false; - state.increment(); + writer.incrementState(); case 34: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; - state.increment(); + writer.incrementState(); case 35: 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/near/GridNearLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java index e74f4eb..710054a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java @@ -201,51 +201,49 @@ public class GridNearLockResponse<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.writeObjectArray("dhtVers", dhtVers, Type.MSG)) return false; - state.increment(); + writer.incrementState(); case 12: if (!writer.writeBooleanArray("filterRes", filterRes)) return false; - state.increment(); + writer.incrementState(); case 13: if (!writer.writeObjectArray("mappedVers", mappedVers, Type.MSG)) return false; - state.increment(); + writer.incrementState(); case 14: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 15: if (!writer.writeCollection("pending", pending, 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/near/GridNearTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java index 9fb781b..eed072d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java @@ -179,57 +179,55 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques /** {@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.writeBoolean("explicitLock", explicitLock)) return false; - state.increment(); + writer.incrementState(); case 22: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 23: if (!writer.writeBoolean("storeEnabled", storeEnabled)) return false; - state.increment(); + writer.incrementState(); case 24: if (!writer.writeUuid("subjId", subjId)) return false; - state.increment(); + writer.incrementState(); case 25: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; - state.increment(); + writer.incrementState(); case 26: 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/near/GridNearTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java index eb2682e..cc52c16 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java @@ -133,39 +133,37 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo /** {@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("errBytes", errBytes)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 7: if (!writer.writeLong("nearThreadId", nearThreadId)) 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/near/GridNearTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java index b07aa35..b72e809 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java @@ -239,69 +239,67 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ /** {@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.writeBoolean("last", last)) return false; - state.increment(); + writer.incrementState(); case 24: if (!writer.writeCollection("lastBackups", lastBackups, Type.UUID)) return false; - state.increment(); + writer.incrementState(); case 25: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 26: if (!writer.writeBoolean("near", near)) return false; - state.increment(); + writer.incrementState(); case 27: if (!writer.writeUuid("subjId", subjId)) return false; - state.increment(); + writer.incrementState(); case 28: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; - state.increment(); + writer.incrementState(); case 29: 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/near/GridNearTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java index 94e179e..ff692a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java @@ -246,57 +246,55 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes /** {@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.writeMessage("dhtVer", dhtVer)) return false; - state.increment(); + writer.incrementState(); case 11: if (!writer.writeIgniteUuid("futId", futId)) return false; - state.increment(); + writer.incrementState(); case 12: if (!writer.writeCollection("invalidParts", invalidParts, Type.INT)) return false; - state.increment(); + writer.incrementState(); case 13: if (!writer.writeIgniteUuid("miniId", miniId)) return false; - state.increment(); + writer.incrementState(); case 14: if (!writer.writeCollection("ownedValsBytes", ownedValsBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 15: if (!writer.writeCollection("pending", pending, 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/near/GridNearUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java index 63af2df..7f6afaf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java @@ -60,19 +60,17 @@ public class GridNearUnlockRequest<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(); } 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/query/GridCacheQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java index 8ab6398..ea30154 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java @@ -480,135 +480,133 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen /** {@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("all", all)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeByteArray("argsBytes", argsBytes)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeString("cacheName", cacheName)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeBoolean("cancel", cancel)) return false; - state.increment(); + writer.incrementState(); case 7: if (!writer.writeString("clause", clause)) return false; - state.increment(); + writer.incrementState(); case 8: if (!writer.writeString("clsName", clsName)) return false; - state.increment(); + writer.incrementState(); case 9: if (!writer.writeBoolean("fields", fields)) return false; - state.increment(); + writer.incrementState(); case 10: if (!writer.writeLong("id", id)) return false; - state.increment(); + writer.incrementState(); case 11: if (!writer.writeBoolean("incBackups", incBackups)) return false; - state.increment(); + writer.incrementState(); case 12: if (!writer.writeBoolean("incMeta", incMeta)) return false; - state.increment(); + writer.incrementState(); case 13: if (!writer.writeBoolean("keepPortable", keepPortable)) return false; - state.increment(); + writer.incrementState(); case 14: if (!writer.writeByteArray("keyValFilterBytes", keyValFilterBytes)) return false; - state.increment(); + writer.incrementState(); case 15: if (!writer.writeInt("pageSize", pageSize)) return false; - state.increment(); + writer.incrementState(); case 16: if (!writer.writeByteArray("prjFilterBytes", prjFilterBytes)) return false; - state.increment(); + writer.incrementState(); case 17: if (!writer.writeByteArray("rdcBytes", rdcBytes)) return false; - state.increment(); + writer.incrementState(); case 18: if (!writer.writeUuid("subjId", subjId)) return false; - state.increment(); + writer.incrementState(); case 19: if (!writer.writeInt("taskHash", taskHash)) return false; - state.increment(); + writer.incrementState(); case 20: if (!writer.writeByteArray("transBytes", transBytes)) return false; - state.increment(); + writer.incrementState(); case 21: if (!writer.writeByte("type", type != null ? (byte)type.ordinal() : -1)) 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/query/GridCacheQueryResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java index 9b99a1f..1b157f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java @@ -226,57 +226,55 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme /** {@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("dataBytes", dataBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeByteArray("errBytes", errBytes)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeBoolean("fields", fields)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeBoolean("finished", finished)) return false; - state.increment(); + writer.incrementState(); case 7: if (!writer.writeCollection("metaDataBytes", metaDataBytes, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 8: if (!writer.writeLong("reqId", reqId)) 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/version/GridCacheVersion.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java index ab14b5e..b35677f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java @@ -253,42 +253,40 @@ public class GridCacheVersion extends MessageAdapter implements Comparable<GridC } /** {@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.writeLong("globalTime", globalTime)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeInt("nodeOrderDrId", nodeOrderDrId)) return false; - state.increment(); + writer.incrementState(); case 2: if (!writer.writeLong("order", order)) return false; - state.increment(); + writer.incrementState(); case 3: if (!writer.writeInt("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/clock/GridClockDeltaSnapshotMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java index 041ddc3..7e00107 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java @@ -87,30 +87,28 @@ public class GridClockDeltaSnapshotMessage extends MessageAdapter { /** {@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 (!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.writeMap("deltas", deltas, Type.UUID, Type.LONG)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeMessage("snapVer", snapVer)) 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/clock/GridClockDeltaVersion.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java index 4d006c9..309a7c4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java @@ -113,30 +113,28 @@ public class GridClockDeltaVersion extends MessageAdapter implements Comparable< } /** {@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.writeLong("topVer", topVer)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeLong("ver", ver)) 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/continuous/GridContinuousMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java index 1893117..07ebf4a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java @@ -149,42 +149,40 @@ public class GridContinuousMessage extends MessageAdapter { /** {@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 (!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.writeByteArray("dataBytes", dataBytes)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeIgniteUuid("futId", futId)) return false; - state.increment(); + writer.incrementState(); case 2: if (!writer.writeUuid("routineId", routineId)) return false; - state.increment(); + writer.incrementState(); case 3: if (!writer.writeByte("type", type != null ? (byte)type.ordinal() : -1)) 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/dataload/GridDataLoadRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java index 2b4609e..31a9732 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java @@ -223,96 +223,94 @@ public class GridDataLoadRequest extends MessageAdapter { } /** {@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.writeString("cacheName", cacheName)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeIgniteUuid("clsLdrId", clsLdrId)) return false; - state.increment(); + writer.incrementState(); case 2: if (!writer.writeByteArray("colBytes", colBytes)) return false; - state.increment(); + writer.incrementState(); case 3: if (!writer.writeByte("depMode", depMode != null ? (byte)depMode.ordinal() : -1)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeBoolean("forceLocDep", forceLocDep)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeBoolean("ignoreDepOwnership", ignoreDepOwnership)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeMap("ldrParticipants", ldrParticipants, Type.UUID, Type.IGNITE_UUID)) return false; - state.increment(); + writer.incrementState(); case 7: if (!writer.writeLong("reqId", reqId)) return false; - state.increment(); + writer.incrementState(); case 8: if (!writer.writeByteArray("resTopicBytes", resTopicBytes)) return false; - state.increment(); + writer.incrementState(); case 9: if (!writer.writeString("sampleClsName", sampleClsName)) return false; - state.increment(); + writer.incrementState(); case 10: if (!writer.writeBoolean("skipStore", skipStore)) return false; - state.increment(); + writer.incrementState(); case 11: if (!writer.writeByteArray("updaterBytes", updaterBytes)) return false; - state.increment(); + writer.incrementState(); case 12: if (!writer.writeString("userVer", userVer)) 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/dataload/GridDataLoadResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadResponse.java index e1c0bb8..1e70d59 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadResponse.java @@ -99,36 +99,34 @@ public class GridDataLoadResponse extends MessageAdapter { /** {@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 (!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.writeByteArray("errBytes", errBytes)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeBoolean("forceLocDep", forceLocDep)) return false; - state.increment(); + writer.incrementState(); case 2: if (!writer.writeLong("reqId", reqId)) 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/igfs/IgfsAckMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java index bfda505..bb4416c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java @@ -122,39 +122,37 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { /** {@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 0: if (!writer.writeByteArray("errBytes", errBytes)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeIgniteUuid("fileId", fileId)) return false; - state.increment(); + writer.incrementState(); case 2: if (!writer.writeLong("id", id)) 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/igfs/IgfsBlockKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java index 61262de..cc0bc07 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java @@ -175,42 +175,40 @@ public final class IgfsBlockKey extends MessageAdapter implements Externalizable /** {@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 (!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.writeIgniteUuid("affKey", affKey)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeLong("blockId", blockId)) return false; - state.increment(); + writer.incrementState(); case 2: if (!writer.writeBoolean("evictExclude", evictExclude)) return false; - state.increment(); + writer.incrementState(); case 3: if (!writer.writeIgniteUuid("fileId", fileId)) 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/igfs/IgfsBlocksMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java index 3f62995..0c4960a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java @@ -102,39 +102,37 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage { /** {@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 0: if (!writer.writeMap("blocks", blocks, Type.MSG, Type.BYTE_ARR)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeIgniteUuid("fileId", fileId)) return false; - state.increment(); + writer.incrementState(); case 2: if (!writer.writeLong("id", id)) 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/igfs/IgfsCommunicationMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java index e9bf72e..08b8713 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java @@ -53,16 +53,14 @@ public abstract class IgfsCommunicationMessage extends MessageAdapter { } /** {@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(); } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java index 7b58c56..7f87da3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java @@ -125,33 +125,31 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage { /** {@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 0: if (!writer.writeByteArray("errBytes", errBytes)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeIgniteUuid("id", id)) 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/igfs/IgfsFileAffinityRange.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java index 4c65ed3..5eef175 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java @@ -281,48 +281,46 @@ public class IgfsFileAffinityRange extends MessageAdapter implements Externaliza /** {@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 (!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.writeIgniteUuid("affKey", affKey)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeBoolean("done", done)) return false; - state.increment(); + writer.incrementState(); case 2: if (!writer.writeLong("endOff", endOff)) return false; - state.increment(); + writer.incrementState(); case 3: if (!writer.writeLong("startOff", startOff)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeInt("status", status)) 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/igfs/IgfsFragmentizerRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java index bd309b8..21a3cf1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java @@ -96,33 +96,31 @@ public class IgfsFragmentizerRequest extends IgfsCommunicationMessage { /** {@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 0: if (!writer.writeIgniteUuid("fileId", fileId)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeCollection("fragmentRanges", fragmentRanges, 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/igfs/IgfsFragmentizerResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java index dc4881c..01dfa70 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java @@ -71,27 +71,25 @@ public class IgfsFragmentizerResponse extends IgfsCommunicationMessage { /** {@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 0: if (!writer.writeIgniteUuid("fileId", fileId)) 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/igfs/IgfsSyncMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java index 391fa19..dc0ff29 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java @@ -89,33 +89,31 @@ public class IgfsSyncMessage extends IgfsCommunicationMessage { /** {@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 0: if (!writer.writeLong("order", order)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeBoolean("res", res)) 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/rest/handlers/task/GridTaskResultRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java index 6270a30..c4bbc09 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java @@ -115,30 +115,28 @@ public class GridTaskResultRequest extends MessageAdapter { /** {@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 (!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.writeIgniteUuid("taskId", taskId)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeByteArray("topicBytes", topicBytes)) 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/rest/handlers/task/GridTaskResultResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java index 37d6105..ce0bd41 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java @@ -135,42 +135,40 @@ public class GridTaskResultResponse extends MessageAdapter { /** {@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 (!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.writeString("err", err)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeBoolean("finished", finished)) return false; - state.increment(); + writer.incrementState(); case 2: if (!writer.writeBoolean("found", found)) return false; - state.increment(); + writer.incrementState(); case 3: if (!writer.writeByteArray("resBytes", resBytes)) 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/streamer/GridStreamerCancelRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerCancelRequest.java index 7a6b7fa..2c8b7db 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerCancelRequest.java @@ -69,24 +69,22 @@ public class GridStreamerCancelRequest extends MessageAdapter { /** {@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 (!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.writeIgniteUuid("cancelledFutId", cancelledFutId)) 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/streamer/GridStreamerExecutionRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java index c5cc326..c526858 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java @@ -170,60 +170,58 @@ public class GridStreamerExecutionRequest extends MessageAdapter { /** {@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 (!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.writeByteArray("batchBytes", batchBytes)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeIgniteUuid("clsLdrId", clsLdrId)) return false; - state.increment(); + writer.incrementState(); case 2: if (!writer.writeByte("depMode", depMode != null ? (byte)depMode.ordinal() : -1)) return false; - state.increment(); + writer.incrementState(); case 3: if (!writer.writeBoolean("forceLocDep", forceLocDep)) return false; - state.increment(); + writer.incrementState(); case 4: if (!writer.writeMap("ldrParticipants", ldrParticipants, Type.UUID, Type.IGNITE_UUID)) return false; - state.increment(); + writer.incrementState(); case 5: if (!writer.writeString("sampleClsName", sampleClsName)) return false; - state.increment(); + writer.incrementState(); case 6: if (!writer.writeString("userVer", userVer)) 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/streamer/GridStreamerResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerResponse.java index af8606d..78883aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerResponse.java @@ -90,30 +90,28 @@ public class GridStreamerResponse extends MessageAdapter { /** {@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 (!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.writeByteArray("errBytes", errBytes)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeIgniteUuid("futId", futId)) 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/util/GridByteArrayList.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java index 28b2e1e..3399082 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java @@ -407,30 +407,28 @@ public class GridByteArrayList extends MessageAdapter implements Externalizable } /** {@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.writeByteArray("data", data)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeInt("size", size)) 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/util/GridLongList.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java index dcaf563..2b89232 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java @@ -505,30 +505,28 @@ public class GridLongList extends MessageAdapter implements Externalizable { } /** {@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.writeLongArray("arr", arr)) return false; - state.increment(); + writer.incrementState(); case 1: if (!writer.writeInt("idx", idx)) 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/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 7901f24..ac9dc12 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -9142,13 +9142,13 @@ public abstract class IgniteUtils { * * @param msg Message. * @param out Stream to write to. - * @param buf Byte buffer that will be passed to {@link MessageAdapter#writeTo(ByteBuffer, MessageWriteState)} method. - * @param formatter Message formatter. + * @param buf Byte buffer that will be passed to {@link MessageAdapter#writeTo(ByteBuffer, MessageWriter)} method. + * @param writer Message writer. * @return Number of written bytes. * @throws IOException In case of error. */ public static int writeMessageFully(MessageAdapter msg, OutputStream out, ByteBuffer buf, - MessageFormatter formatter) throws IOException { + MessageWriter writer) throws IOException { assert msg != null; assert out != null; assert buf != null; @@ -9157,10 +9157,8 @@ public abstract class IgniteUtils { boolean finished = false; int cnt = 0; - MessageWriteState state = MessageWriteState.create(formatter); - while (!finished) { - finished = msg.writeTo(buf, state); + finished = msg.writeTo(buf, writer); out.write(buf.array(), 0, buf.position()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java index 2c24bca..512411e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcToNioAdapter.java @@ -152,7 +152,7 @@ public class IpcToNioAdapter<T> { assert writeBuf.hasArray(); try { - int cnt = U.writeMessageFully(msg, endp.outputStream(), writeBuf, formatter); + int cnt = U.writeMessageFully(msg, endp.outputStream(), writeBuf, formatter.writer()); metricsLsnr.onBytesSent(cnt); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index 68515c2..0d5649a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -834,10 +834,10 @@ public class GridNioServer<T> { GridSelectorNioSessionImpl ses = (GridSelectorNioSessionImpl)key.attachment(); - MessageWriteState state = ses.meta(WRITE_STATE.ordinal()); + MessageWriter writer = ses.meta(MSG_WRITER.ordinal()); - if (state == null) - ses.addMeta(WRITE_STATE.ordinal(), state = MessageWriteState.create(formatter)); + if (writer == null) + ses.addMeta(MSG_WRITER.ordinal(), writer = formatter.writer()); boolean handshakeFinished = sslFilter.lock(ses); @@ -888,10 +888,10 @@ public class GridNioServer<T> { assert msg != null; - finished = msg.writeTo(buf, state); + finished = msg.writeTo(buf, writer); if (finished) - state.reset(); + writer.reset(); } // Fill up as many messages as possible to write buffer. @@ -910,10 +910,10 @@ public class GridNioServer<T> { assert msg != null; - finished = msg.writeTo(buf, state); + finished = msg.writeTo(buf, writer); if (finished) - state.reset(); + writer.reset(); } buf.flip(); @@ -1010,10 +1010,10 @@ public class GridNioServer<T> { ByteBuffer buf = ses.writeBuffer(); NioOperationFuture<?> req = ses.removeMeta(NIO_OPERATION.ordinal()); - MessageWriteState state = ses.meta(WRITE_STATE.ordinal()); + MessageWriter writer = ses.meta(MSG_WRITER.ordinal()); - if (state == null) - ses.addMeta(WRITE_STATE.ordinal(), state = MessageWriteState.create(formatter)); + if (writer == null) + ses.addMeta(MSG_WRITER.ordinal(), writer = formatter.writer()); List<NioOperationFuture<?>> doneFuts = null; @@ -1036,10 +1036,10 @@ public class GridNioServer<T> { assert msg != null; - finished = msg.writeTo(buf, state); + finished = msg.writeTo(buf, writer); if (finished) - state.reset(); + writer.reset(); } // Fill up as many messages as possible to write buffer. @@ -1058,10 +1058,10 @@ public class GridNioServer<T> { assert msg != null; - finished = msg.writeTo(buf, state); + finished = msg.writeTo(buf, writer); if (finished) - state.reset(); + writer.reset(); } buf.flip(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java index ab44f5c..d7eb2f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java @@ -41,8 +41,8 @@ public enum GridNioSessionMetaKey { /** Client marshaller ID. */ MARSHALLER_ID, - /** Message write state. */ - WRITE_STATE; + /** Message writer. */ + MSG_WRITER; /** Maximum count of NIO session keys in system. */ public static final int MAX_KEYS_CNT = 64; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java index bd59ff7..d017dbd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridShmemCommunicationClient.java @@ -116,7 +116,7 @@ public class GridShmemCommunicationClient extends GridAbstractCommunicationClien assert writeBuf.hasArray(); try { - int cnt = U.writeMessageFully(msg, shmem.outputStream(), writeBuf, formatter); + int cnt = U.writeMessageFully(msg, shmem.outputStream(), writeBuf, formatter.writer()); metricsLsnr.onBytesSent(cnt); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java index 297d2a3..f8c1dd5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridTcpCommunicationClient.java @@ -197,7 +197,7 @@ public class GridTcpCommunicationClient extends GridAbstractCommunicationClient assert writeBuf.hasArray(); try { - int cnt = U.writeMessageFully(msg, out, writeBuf, formatter); + int cnt = U.writeMessageFully(msg, out, writeBuf, formatter.writer()); metricsLsnr.onBytesSent(cnt); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e63ce523/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java index 9cb8945..c31c2e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java @@ -44,10 +44,10 @@ public abstract class MessageAdapter implements Serializable, Cloneable { * Writes this message to provided byte buffer. * * @param buf Byte buffer. - * @param state Current state; + * @param writer Writer. * @return Whether message was fully written. */ - public abstract boolean writeTo(ByteBuffer buf, MessageWriteState state); + public abstract boolean writeTo(ByteBuffer buf, MessageWriter writer); /** * Reads this message from provided byte buffer.
