http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 2e6e728..387c027 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 @@ -183,7 +183,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem writer.incrementState(); case 4: - if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -222,7 +222,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem readState++; case 4: - keyBytes = reader.readCollection("keyBytes", MessageFieldType.BYTE_ARR); + keyBytes = reader.readCollection("keyBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 3c863fc..a20ce51 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 @@ -198,7 +198,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple writer.incrementState(); case 6: - if (!writer.writeCollection("missedKeyBytes", missedKeyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("missedKeyBytes", missedKeyBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -241,7 +241,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple readState++; case 6: - missedKeyBytes = reader.readCollection("missedKeyBytes", MessageFieldType.BYTE_ARR); + missedKeyBytes = reader.readCollection("missedKeyBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 8867d47..25d5d19 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 @@ -205,7 +205,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> switch (writer.state()) { case 3: - if (!writer.writeCollection("parts", parts, MessageFieldType.INT)) + if (!writer.writeCollection("parts", parts, Type.INT)) return false; writer.incrementState(); @@ -254,7 +254,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> switch (readState) { case 3: - parts = reader.readCollection("parts", MessageFieldType.INT); + parts = reader.readCollection("parts", Type.INT); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 0af7cd5..d703186 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 @@ -300,13 +300,13 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> writer.incrementState(); case 5: - if (!writer.writeCollection("last", last, MessageFieldType.INT)) + if (!writer.writeCollection("last", last, Type.INT)) return false; writer.incrementState(); case 6: - if (!writer.writeCollection("missed", missed, MessageFieldType.INT)) + if (!writer.writeCollection("missed", missed, Type.INT)) return false; writer.incrementState(); @@ -353,7 +353,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> readState++; case 5: - last = reader.readCollection("last", MessageFieldType.INT); + last = reader.readCollection("last", Type.INT); if (!reader.isLastRead()) return false; @@ -361,7 +361,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> readState++; case 6: - missed = reader.readCollection("missed", MessageFieldType.INT); + missed = reader.readCollection("missed", Type.INT); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 15971ca..44ef152 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,7 +266,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements writer.incrementState(); case 5: - if (!writer.writeMap("keyBytes", keyBytes, MessageFieldType.BYTE_ARR, MessageFieldType.BOOLEAN)) + if (!writer.writeMap("keyBytes", keyBytes, Type.BYTE_ARR, Type.BOOLEAN)) return false; writer.incrementState(); @@ -349,7 +349,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements readState++; case 5: - keyBytes = reader.readMap("keyBytes", MessageFieldType.BYTE_ARR, MessageFieldType.BOOLEAN, true); + keyBytes = reader.readMap("keyBytes", Type.BYTE_ARR, Type.BOOLEAN, true); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 db94b95..3518915 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 @@ -233,7 +233,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements writer.incrementState(); case 6: - if (!writer.writeCollection("invalidParts", invalidParts, MessageFieldType.INT)) + if (!writer.writeCollection("invalidParts", invalidParts, Type.INT)) return false; writer.incrementState(); @@ -294,7 +294,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements readState++; case 6: - invalidParts = reader.readCollection("invalidParts", MessageFieldType.INT); + invalidParts = reader.readCollection("invalidParts", Type.INT); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 9c298d4..98ebb4f 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 @@ -352,13 +352,13 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> writer.incrementState(); case 25: - if (!writer.writeObjectArray("dhtVers", dhtVers, MessageFieldType.MSG)) + if (!writer.writeObjectArray("dhtVers", dhtVers, Type.MSG)) return false; writer.incrementState(); case 26: - if (!writer.writeObjectArray("filterBytes", filterBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeObjectArray("filterBytes", filterBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -439,7 +439,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> readState++; case 25: - dhtVers = reader.readObjectArray("dhtVers", MessageFieldType.MSG, GridCacheVersion.class); + dhtVers = reader.readObjectArray("dhtVers", Type.MSG, GridCacheVersion.class); if (!reader.isLastRead()) return false; @@ -447,7 +447,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> readState++; case 26: - filterBytes = reader.readObjectArray("filterBytes", MessageFieldType.BYTE_ARR, byte[].class); + filterBytes = reader.readObjectArray("filterBytes", Type.BYTE_ARR, byte[].class); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 0f77a35..8919465 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 @@ -196,7 +196,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V switch (writer.state()) { case 11: - if (!writer.writeObjectArray("dhtVers", dhtVers, MessageFieldType.MSG)) + if (!writer.writeObjectArray("dhtVers", dhtVers, Type.MSG)) return false; writer.incrementState(); @@ -208,7 +208,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V writer.incrementState(); case 13: - if (!writer.writeObjectArray("mappedVers", mappedVers, MessageFieldType.MSG)) + if (!writer.writeObjectArray("mappedVers", mappedVers, Type.MSG)) return false; writer.incrementState(); @@ -220,7 +220,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V writer.incrementState(); case 15: - if (!writer.writeCollection("pending", pending, MessageFieldType.MSG)) + if (!writer.writeCollection("pending", pending, Type.MSG)) return false; writer.incrementState(); @@ -239,7 +239,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V switch (readState) { case 11: - dhtVers = reader.readObjectArray("dhtVers", MessageFieldType.MSG, GridCacheVersion.class); + dhtVers = reader.readObjectArray("dhtVers", Type.MSG, GridCacheVersion.class); if (!reader.isLastRead()) return false; @@ -255,7 +255,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V readState++; case 13: - mappedVers = reader.readObjectArray("mappedVers", MessageFieldType.MSG, GridCacheVersion.class); + mappedVers = reader.readObjectArray("mappedVers", Type.MSG, GridCacheVersion.class); if (!reader.isLastRead()) return false; @@ -271,7 +271,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V readState++; case 15: - pending = reader.readCollection("pending", MessageFieldType.MSG); + pending = reader.readCollection("pending", Type.MSG); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 b4c8af3..3f5780e 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 @@ -243,7 +243,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ writer.incrementState(); case 24: - if (!writer.writeCollection("lastBackups", lastBackups, MessageFieldType.UUID)) + if (!writer.writeCollection("lastBackups", lastBackups, Type.UUID)) return false; writer.incrementState(); @@ -308,7 +308,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ readState++; case 24: - lastBackups = reader.readCollection("lastBackups", MessageFieldType.UUID); + lastBackups = reader.readCollection("lastBackups", Type.UUID); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 0d27b44..9c4ef78 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 @@ -251,7 +251,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes writer.incrementState(); case 12: - if (!writer.writeCollection("invalidParts", invalidParts, MessageFieldType.INT)) + if (!writer.writeCollection("invalidParts", invalidParts, Type.INT)) return false; writer.incrementState(); @@ -263,13 +263,13 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes writer.incrementState(); case 14: - if (!writer.writeCollection("ownedValsBytes", ownedValsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("ownedValsBytes", ownedValsBytes, Type.BYTE_ARR)) return false; writer.incrementState(); case 15: - if (!writer.writeCollection("pending", pending, MessageFieldType.MSG)) + if (!writer.writeCollection("pending", pending, Type.MSG)) return false; writer.incrementState(); @@ -304,7 +304,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; case 12: - invalidParts = reader.readCollection("invalidParts", MessageFieldType.INT); + invalidParts = reader.readCollection("invalidParts", Type.INT); if (!reader.isLastRead()) return false; @@ -320,7 +320,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; case 14: - ownedValsBytes = reader.readCollection("ownedValsBytes", MessageFieldType.BYTE_ARR); + ownedValsBytes = reader.readCollection("ownedValsBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -328,7 +328,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; case 15: - pending = reader.readCollection("pending", MessageFieldType.MSG); + pending = reader.readCollection("pending", Type.MSG); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 baf6c31..a82a0a1 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 @@ -217,7 +217,7 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme switch (writer.state()) { case 3: - if (!writer.writeCollection("dataBytes", dataBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("dataBytes", dataBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -241,7 +241,7 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme writer.incrementState(); case 7: - if (!writer.writeCollection("metaDataBytes", metaDataBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("metaDataBytes", metaDataBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -266,7 +266,7 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme switch (readState) { case 3: - dataBytes = reader.readCollection("dataBytes", MessageFieldType.BYTE_ARR); + dataBytes = reader.readCollection("dataBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -298,7 +298,7 @@ public class GridCacheQueryResponse<K, V> extends GridCacheMessage<K, V> impleme readState++; case 7: - metaDataBytes = reader.readCollection("metaDataBytes", MessageFieldType.BYTE_ARR); + metaDataBytes = reader.readCollection("metaDataBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 69716dd..73bb5ff 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 @@ -84,7 +84,7 @@ public class GridClockDeltaSnapshotMessage extends MessageAdapter { switch (writer.state()) { case 0: - if (!writer.writeMap("deltas", deltas, MessageFieldType.UUID, MessageFieldType.LONG)) + if (!writer.writeMap("deltas", deltas, Type.UUID, Type.LONG)) return false; writer.incrementState(); @@ -106,7 +106,7 @@ public class GridClockDeltaSnapshotMessage extends MessageAdapter { switch (readState) { case 0: - deltas = reader.readMap("deltas", MessageFieldType.UUID, MessageFieldType.LONG, false); + deltas = reader.readMap("deltas", Type.UUID, Type.LONG, false); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 2b19dc5..3ab6f2b 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 @@ -271,7 +271,7 @@ public class GridDataLoadRequest extends MessageAdapter { writer.incrementState(); case 6: - if (!writer.writeMap("ldrParticipants", ldrParticipants, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) + if (!writer.writeMap("ldrParticipants", ldrParticipants, Type.UUID, Type.IGNITE_UUID)) return false; writer.incrementState(); @@ -375,7 +375,7 @@ public class GridDataLoadRequest extends MessageAdapter { readState++; case 6: - ldrParticipants = reader.readMap("ldrParticipants", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); + ldrParticipants = reader.readMap("ldrParticipants", Type.UUID, Type.IGNITE_UUID, false); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 8565cfa..204ae7a 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 @@ -99,7 +99,7 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage { switch (writer.state()) { case 0: - if (!writer.writeMap("blocks", blocks, MessageFieldType.MSG, MessageFieldType.BYTE_ARR)) + if (!writer.writeMap("blocks", blocks, Type.MSG, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -130,7 +130,7 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage { switch (readState) { case 0: - blocks = reader.readMap("blocks", MessageFieldType.MSG, MessageFieldType.BYTE_ARR, false); + blocks = reader.readMap("blocks", Type.MSG, Type.BYTE_ARR, false); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 aa21a8c..dc12d21 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 @@ -100,7 +100,7 @@ public class IgfsFragmentizerRequest extends IgfsCommunicationMessage { writer.incrementState(); case 1: - if (!writer.writeCollection("fragmentRanges", fragmentRanges, MessageFieldType.MSG)) + if (!writer.writeCollection("fragmentRanges", fragmentRanges, Type.MSG)) return false; writer.incrementState(); @@ -127,7 +127,7 @@ public class IgfsFragmentizerRequest extends IgfsCommunicationMessage { readState++; case 1: - fragmentRanges = reader.readCollection("fragmentRanges", MessageFieldType.MSG); + fragmentRanges = reader.readCollection("fragmentRanges", Type.MSG); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 7d559e9..be731d3 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 @@ -186,7 +186,7 @@ public class GridStreamerExecutionRequest extends MessageAdapter { writer.incrementState(); case 4: - if (!writer.writeMap("ldrParticipants", ldrParticipants, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) + if (!writer.writeMap("ldrParticipants", ldrParticipants, Type.UUID, Type.IGNITE_UUID)) return false; writer.incrementState(); @@ -250,7 +250,7 @@ public class GridStreamerExecutionRequest extends MessageAdapter { readState++; case 4: - ldrParticipants = reader.readMap("ldrParticipants", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); + ldrParticipants = reader.readMap("ldrParticipants", Type.UUID, Type.IGNITE_UUID, false); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/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 1811c6e..2b3cfc4 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 @@ -73,4 +73,71 @@ public abstract class MessageAdapter implements Serializable { return false; } + /** + * Enum representing possible field types. + */ + public enum Type { + /** Byte. */ + BYTE, + + /** Short. */ + SHORT, + + /** Integer. */ + INT, + + /** Long. */ + LONG, + + /** Float. */ + FLOAT, + + /** Double. */ + DOUBLE, + + /** Character. */ + CHAR, + + /** Boolean. */ + BOOLEAN, + + /** Byte array. */ + BYTE_ARR, + + /** Short array. */ + SHORT_ARR, + + /** Integer array. */ + INT_ARR, + + /** Long array. */ + LONG_ARR, + + /** Float array. */ + FLOAT_ARR, + + /** Double array. */ + DOUBLE_ARR, + + /** Character array. */ + CHAR_ARR, + + /** Boolean array. */ + BOOLEAN_ARR, + + /** String. */ + STRING, + + /** Bit set. */ + BIT_SET, + + /** UUID. */ + UUID, + + /** Ignite UUID. */ + IGNITE_UUID, + + /** Message. */ + MSG + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFieldType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFieldType.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFieldType.java deleted file mode 100644 index 6779761..0000000 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFieldType.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.plugin.extensions.communication; - -/** - * Enum representing possible field types. - */ -public enum MessageFieldType { - /** Byte. */ - BYTE, - - /** Short. */ - SHORT, - - /** Integer. */ - INT, - - /** Long. */ - LONG, - - /** Float. */ - FLOAT, - - /** Double. */ - DOUBLE, - - /** Character. */ - CHAR, - - /** Boolean. */ - BOOLEAN, - - /** Byte array. */ - BYTE_ARR, - - /** Short array. */ - SHORT_ARR, - - /** Integer array. */ - INT_ARR, - - /** Long array. */ - LONG_ARR, - - /** Float array. */ - FLOAT_ARR, - - /** Double array. */ - DOUBLE_ARR, - - /** Character array. */ - CHAR_ARR, - - /** Boolean array. */ - BOOLEAN_ARR, - - /** String. */ - STRING, - - /** Bit set. */ - BIT_SET, - - /** UUID. */ - UUID, - - /** Ignite UUID. */ - IGNITE_UUID, - - /** Message. */ - MSG -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java index aa81627..9fa122d 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageReader.java @@ -211,7 +211,7 @@ public interface MessageReader { * @param itemCls Array component class. * @return Array of objects. */ - public <T> T[] readObjectArray(String name, MessageFieldType itemType, Class<T> itemCls); + public <T> T[] readObjectArray(String name, MessageAdapter.Type itemType, Class<T> itemCls); /** * Reads collection. @@ -220,7 +220,7 @@ public interface MessageReader { * @param itemType Collection item type. * @return Collection. */ - public <C extends Collection<?>> C readCollection(String name, MessageFieldType itemType); + public <C extends Collection<?>> C readCollection(String name, MessageAdapter.Type itemType); /** * Reads map. @@ -231,7 +231,7 @@ public interface MessageReader { * @param linked Whether {@link LinkedHashMap} should be created. * @return Map. */ - public <M extends Map<?, ?>> M readMap(String name, MessageFieldType keyType, MessageFieldType valType, + public <M extends Map<?, ?>> M readMap(String name, MessageAdapter.Type keyType, MessageAdapter.Type valType, boolean linked); /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java index a70be8f..ee729e8 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java @@ -232,7 +232,7 @@ public interface MessageWriter { * @param itemType Array component type. * @return Whether array was fully written. */ - public <T> boolean writeObjectArray(String name, T[] arr, MessageFieldType itemType); + public <T> boolean writeObjectArray(String name, T[] arr, MessageAdapter.Type itemType); /** * Writes collection. @@ -242,7 +242,7 @@ public interface MessageWriter { * @param itemType Collection item type. * @return Whether value was fully written. */ - public <T> boolean writeCollection(String name, Collection<T> col, MessageFieldType itemType); + public <T> boolean writeCollection(String name, Collection<T> col, MessageAdapter.Type itemType); /** * Writes map. @@ -253,8 +253,8 @@ public interface MessageWriter { * @param valType Map value type. * @return Whether value was fully written. */ - public <K, V> boolean writeMap(String name, Map<K, V> map, MessageFieldType keyType, - MessageFieldType valType); + public <K, V> boolean writeMap(String name, Map<K, V> map, MessageAdapter.Type keyType, + MessageAdapter.Type valType); public boolean isTypeWritten();
