From 11c34addf33a12da615623f73f7fcfd204b2f932 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Tue, 17 Feb 2026 20:05:19 +0300 Subject: [PATCH 01/42] WIP --- .../calcite/message/CalciteErrorMessage.java | 6 +- .../calcite/message/GenericValueMessage.java | 2 +- .../calcite/message/InboxCloseMessage.java | 8 +- .../query/calcite/message/MessageType.java | 15 +- .../message/QueryBatchAcknowledgeMessage.java | 10 +- .../calcite/message/QueryBatchMessage.java | 16 +- .../calcite/message/QueryCloseMessage.java | 4 +- .../calcite/message/QueryStartRequest.java | 42 +-- .../calcite/message/QueryStartResponse.java | 10 +- .../query/calcite/message/QueryTxEntry.java | 12 +- .../calcite/metadata/ColocationGroup.java | 8 +- .../calcite/metadata/FragmentDescription.java | 8 +- .../calcite/metadata/FragmentMapping.java | 4 +- .../internal/jdbc2/JdbcResultSetSelfTest.java | 6 +- .../internal/MessageSerializerGenerator.java | 183 +++++---- .../apache/ignite/internal/ExchangeInfo.java | 4 +- .../ignite/internal/GridJobCancelRequest.java | 6 +- .../internal/GridJobExecuteRequest.java | 82 ++--- .../internal/GridJobExecuteResponse.java | 28 +- .../internal/GridJobSiblingsRequest.java | 6 +- .../internal/GridJobSiblingsResponse.java | 2 +- .../internal/GridTaskCancelRequest.java | 4 +- .../internal/GridTaskSessionRequest.java | 10 +- .../internal/IgniteDiagnosticRequest.java | 8 +- .../internal/IgniteDiagnosticResponse.java | 8 +- .../apache/ignite/internal/TxEntriesInfo.java | 4 +- .../org/apache/ignite/internal/TxInfo.java | 8 +- .../query/index/IndexKeyTypeMessage.java | 2 +- .../query/index/IndexQueryResultMeta.java | 10 +- .../index/sorted/IndexKeyDefinition.java | 10 +- .../index/sorted/IndexKeyTypeSettings.java | 14 +- .../checkpoint/GridCheckpointRequest.java | 10 +- .../managers/communication/ErrorMessage.java | 2 +- .../managers/communication/GridIoMessage.java | 24 +- .../communication/GridIoMessageFactory.java | 288 +++++++-------- .../GridIoSecurityAwareMessage.java | 4 +- .../communication/SessionChannelMessage.java | 2 +- .../deployment/GridDeploymentResponse.java | 10 +- .../discovery/DiscoveryMessageFactory.java | 56 +-- .../GenerateEncryptionKeyRequest.java | 6 +- .../eventstorage/GridEventStorageMessage.java | 36 +- .../UserAuthenticateRequestMessage.java | 8 +- .../UserAuthenticateResponseMessage.java | 6 +- ...serManagementOperationFinishedMessage.java | 8 +- .../cache/CacheEntryInfoCollection.java | 2 +- .../cache/CacheEntryPredicateAdapter.java | 4 +- .../processors/cache/CacheEvictionEntry.java | 8 +- .../cache/CacheInvokeDirectResult.java | 10 +- .../processors/cache/GridCacheEntryInfo.java | 16 +- .../cache/GridCacheGroupIdMessage.java | 4 +- .../processors/cache/GridCacheIdMessage.java | 2 +- .../processors/cache/GridCacheMessage.java | 12 +- .../processors/cache/GridCacheReturn.java | 16 +- .../GridChangeGlobalStateMessageResponse.java | 8 +- .../processors/cache/WalStateAckMessage.java | 12 +- .../binary/BinaryMetadataVersionInfo.java | 10 +- .../cache/binary/MetadataRequestMessage.java | 2 +- .../cache/binary/MetadataResponseMessage.java | 6 +- .../GridCacheTtlUpdateRequest.java | 18 +- .../GridCacheTxRecoveryRequest.java | 20 +- .../GridCacheTxRecoveryResponse.java | 8 +- .../GridDistributedBaseMessage.java | 12 +- .../GridDistributedLockRequest.java | 36 +- .../GridDistributedLockResponse.java | 12 +- .../GridDistributedTxFinishRequest.java | 36 +- .../GridDistributedTxFinishResponse.java | 12 +- .../GridDistributedTxPrepareRequest.java | 36 +- .../GridDistributedTxPrepareResponse.java | 8 +- .../distributed/GridNearUnlockRequest.java | 2 +- .../dht/GridDhtAffinityAssignmentRequest.java | 10 +- .../GridDhtAffinityAssignmentResponse.java | 24 +- .../distributed/dht/GridDhtLockRequest.java | 22 +- .../distributed/dht/GridDhtLockResponse.java | 8 +- .../dht/GridDhtTxFinishRequest.java | 8 +- .../dht/GridDhtTxFinishResponse.java | 12 +- .../GridDhtTxOnePhaseCommitAckRequest.java | 2 +- .../dht/GridDhtTxPrepareRequest.java | 42 +-- .../dht/GridDhtTxPrepareResponse.java | 14 +- .../distributed/dht/GridDhtUnlockRequest.java | 2 +- .../dht/PartitionUpdateCountersMessage.java | 4 +- .../TransactionAttributesAwareRequest.java | 6 +- ...omicApplicationAttributesAwareRequest.java | 6 +- .../GridDhtAtomicAbstractUpdateRequest.java | 12 +- .../GridDhtAtomicDeferredUpdateResponse.java | 4 +- .../dht/atomic/GridDhtAtomicNearResponse.java | 16 +- .../GridDhtAtomicSingleUpdateRequest.java | 6 +- .../atomic/GridDhtAtomicUpdateRequest.java | 44 +-- .../atomic/GridDhtAtomicUpdateResponse.java | 14 +- .../GridNearAtomicAbstractUpdateRequest.java | 8 +- .../GridNearAtomicCheckUpdateRequest.java | 8 +- .../GridNearAtomicFullUpdateRequest.java | 26 +- ...idNearAtomicSingleUpdateFilterRequest.java | 2 +- ...idNearAtomicSingleUpdateInvokeRequest.java | 8 +- .../GridNearAtomicSingleUpdateRequest.java | 2 +- .../atomic/GridNearAtomicUpdateResponse.java | 24 +- .../dht/atomic/NearCacheUpdates.java | 20 +- .../distributed/dht/atomic/UpdateErrors.java | 6 +- .../preloader/CacheGroupAffinityMessage.java | 12 +- .../CachePartitionFullCountersMap.java | 8 +- .../CachePartitionPartialCountersMap.java | 16 +- .../preloader/CachePartitionsToReloadMap.java | 4 +- .../preloader/GridDhtForceKeysRequest.java | 12 +- .../preloader/GridDhtForceKeysResponse.java | 16 +- .../GridDhtPartitionDemandMessage.java | 14 +- .../preloader/GridDhtPartitionExchangeId.java | 10 +- .../GridDhtPartitionSupplyMessage.java | 20 +- .../GridDhtPartitionsAbstractMessage.java | 8 +- .../GridDhtPartitionsFullMessage.java | 52 +-- .../GridDhtPartitionsSingleMessage.java | 36 +- .../GridDhtPartitionsSingleRequest.java | 4 +- .../dht/preloader/GroupPartitionIdPair.java | 8 +- .../IgniteDhtDemandedPartitionsMap.java | 8 +- .../IgniteDhtPartitionCountersMap.java | 4 +- ...IgniteDhtPartitionHistorySuppliersMap.java | 4 +- .../IgniteDhtPartitionsToReloadMap.java | 4 +- .../distributed/dht/preloader/IntLongMap.java | 2 +- .../preloader/PartitionReservationsMap.java | 4 +- .../dht/preloader/PartitionsToReload.java | 4 +- .../dht/preloader/latch/LatchAckMessage.java | 6 +- .../distributed/near/CacheVersionedValue.java | 8 +- .../distributed/near/GridNearGetRequest.java | 30 +- .../distributed/near/GridNearGetResponse.java | 24 +- .../distributed/near/GridNearLockRequest.java | 24 +- .../near/GridNearLockResponse.java | 24 +- .../near/GridNearSingleGetRequest.java | 22 +- .../near/GridNearSingleGetResponse.java | 18 +- .../near/GridNearTxFinishRequest.java | 2 +- .../near/GridNearTxFinishResponse.java | 10 +- .../near/GridNearTxPrepareRequest.java | 20 +- .../near/GridNearTxPrepareResponse.java | 36 +- .../snapshot/AbstractSnapshotMessage.java | 2 +- .../IncrementalSnapshotAwareMessage.java | 12 +- .../snapshot/SnapshotFilesFailureMessage.java | 4 +- .../snapshot/SnapshotFilesRequestMessage.java | 16 +- .../cache/query/GridCacheQueryRequest.java | 66 ++-- .../cache/query/GridCacheQueryResponse.java | 22 +- .../cache/query/GridCacheSqlQuery.java | 10 +- .../CacheContinuousQueryBatchAck.java | 4 +- .../cache/transactions/IgniteTxKey.java | 4 +- .../transactions/TxEntryValueHolder.java | 12 +- .../processors/cache/transactions/TxLock.java | 8 +- .../cache/transactions/TxLockList.java | 4 +- .../cache/transactions/TxLocksRequest.java | 8 +- .../cache/transactions/TxLocksResponse.java | 16 +- .../cache/version/GridCacheVersion.java | 10 +- .../cache/version/GridCacheVersionEx.java | 4 +- .../cluster/CacheMetricsMessage.java | 348 +++++++++--------- .../cluster/ClusterMetricsUpdateMessage.java | 4 +- .../cluster/NodeFullMetricsMessage.java | 8 +- .../cluster/NodeMetricsMessage.java | 220 +++++------ .../ContinuousRoutineStartResultMessage.java | 10 +- .../MissingMappingRequestMessage.java | 4 +- .../MissingMappingResponseMessage.java | 8 +- .../messages/GridQueryCancelRequest.java | 4 +- .../messages/GridQueryFailResponse.java | 10 +- .../messages/GridQueryNextPageRequest.java | 14 +- .../messages/GridQueryNextPageResponse.java | 28 +- .../query/messages/GridQueryKillRequest.java | 10 +- .../query/messages/GridQueryKillResponse.java | 8 +- .../message/SchemaOperationStatusMessage.java | 14 +- .../handlers/task/GridTaskResultRequest.java | 4 +- .../handlers/task/GridTaskResultResponse.java | 12 +- .../service/ServiceDeploymentProcessId.java | 8 +- ...erviceSingleNodeDeploymentResultBatch.java | 6 +- .../internal/util/UUIDCollectionMessage.java | 2 +- .../jobstealing/JobStealingRequest.java | 2 +- .../tcp/internal/GridNioServerWrapper.java | 2 +- .../tcp/internal/TcpHandshakeExecutor.java | 2 +- .../TcpInverseConnectionResponseMessage.java | 4 +- .../tcp/messages/HandshakeMessage.java | 14 +- .../tcp/messages/NodeIdMessage.java | 2 +- .../messages/RecoveryLastReceivedMessage.java | 4 +- .../tcp/internal/DiscoveryDataPacket.java | 8 +- .../tcp/messages/InetAddressMessage.java | 6 +- .../messages/InetSocketAddressMessage.java | 2 +- .../tcp/messages/NodeSpecificData.java | 2 +- .../messages/TcpDiscoveryAbstractMessage.java | 12 +- .../TcpDiscoveryAbstractTraceableMessage.java | 4 +- .../TcpDiscoveryAuthFailedMessage.java | 6 +- .../TcpDiscoveryCheckFailedMessage.java | 4 +- .../TcpDiscoveryClientAckResponse.java | 4 +- ...cpDiscoveryClientMetricsUpdateMessage.java | 4 +- ...TcpDiscoveryClientNodesMetricsMessage.java | 4 +- .../TcpDiscoveryClientPingRequest.java | 2 +- .../TcpDiscoveryClientPingResponse.java | 6 +- .../messages/TcpDiscoveryDiscardMessage.java | 8 +- .../TcpDiscoveryDuplicateIdMessage.java | 2 +- .../TcpDiscoveryHandshakeRequest.java | 6 +- .../TcpDiscoveryHandshakeResponse.java | 10 +- .../TcpDiscoveryLoopbackProblemMessage.java | 6 +- .../TcpDiscoveryMetricsUpdateMessage.java | 12 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 9 +- .../TcpDiscoveryNodeFailedMessage.java | 8 +- .../tcp/messages/TcpDiscoveryPingRequest.java | 2 +- .../messages/TcpDiscoveryPingResponse.java | 2 +- .../TcpDiscoveryRingLatencyCheckMessage.java | 8 +- .../TcpDiscoveryStatusCheckMessage.java | 8 +- .../test/resources/codegen/TestMessage.java | 8 +- 198 files changed, 1640 insertions(+), 1613 deletions(-) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java index 00b8f2e513b0b..f6dcbc252e9cd 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java @@ -26,12 +26,12 @@ */ public class CalciteErrorMessage extends ErrorMessage implements CalciteMessage { /** */ - @Order(value = 1, method = "queryId") - private UUID qryId; + @Order(1) + UUID qryId; /** */ @Order(2) - private long fragmentId; + long fragmentId; /** */ public CalciteErrorMessage() { diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java index e2521de67434a..90fbf297c52e2 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java @@ -31,7 +31,7 @@ public final class GenericValueMessage implements ValueMessage { /** */ @Order(0) - private byte[] serialized; + byte[] serialized; /** */ public GenericValueMessage() { diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java index cc23b734350d0..52b2a4c3441ec 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java @@ -25,16 +25,16 @@ */ public class InboxCloseMessage implements CalciteMessage { /** */ - @Order(value = 0, method = "queryId") - private UUID qryId; + @Order(0) + UUID qryId; /** */ @Order(1) - private long fragmentId; + long fragmentId; /** */ @Order(2) - private long exchangeId; + long exchangeId; /** */ public InboxCloseMessage() { diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java index 4d74ac8b54a6b..44438a8d4892b 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageType.java @@ -18,21 +18,12 @@ package org.apache.ignite.internal.processors.query.calcite.message; import java.util.function.Supplier; -import org.apache.ignite.internal.codegen.CalciteErrorMessageSerializer; -import org.apache.ignite.internal.codegen.ColocationGroupSerializer; -import org.apache.ignite.internal.codegen.FragmentDescriptionSerializer; -import org.apache.ignite.internal.codegen.FragmentMappingSerializer; -import org.apache.ignite.internal.codegen.GenericValueMessageSerializer; -import org.apache.ignite.internal.codegen.InboxCloseMessageSerializer; -import org.apache.ignite.internal.codegen.QueryBatchAcknowledgeMessageSerializer; -import org.apache.ignite.internal.codegen.QueryBatchMessageSerializer; -import org.apache.ignite.internal.codegen.QueryCloseMessageSerializer; -import org.apache.ignite.internal.codegen.QueryStartRequestSerializer; -import org.apache.ignite.internal.codegen.QueryStartResponseSerializer; -import org.apache.ignite.internal.codegen.QueryTxEntrySerializer; import org.apache.ignite.internal.processors.query.calcite.metadata.ColocationGroup; +import org.apache.ignite.internal.processors.query.calcite.metadata.ColocationGroupSerializer; import org.apache.ignite.internal.processors.query.calcite.metadata.FragmentDescription; +import org.apache.ignite.internal.processors.query.calcite.metadata.FragmentDescriptionSerializer; import org.apache.ignite.internal.processors.query.calcite.metadata.FragmentMapping; +import org.apache.ignite.internal.processors.query.calcite.metadata.FragmentMappingSerializer; import org.apache.ignite.plugin.extensions.communication.MessageSerializer; /** diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java index 4ddf299150b9e..0d6b604646a67 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java @@ -25,20 +25,20 @@ */ public class QueryBatchAcknowledgeMessage implements ExecutionContextAware { /** */ - @Order(value = 0, method = "queryId") - private UUID qryId; + @Order(0) + UUID qryId; /** */ @Order(1) - private long fragmentId; + long fragmentId; /** */ @Order(2) - private long exchangeId; + long exchangeId; /** */ @Order(3) - private int batchId; + int batchId; /** */ public QueryBatchAcknowledgeMessage() { diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java index b325b11085ceb..e863aebc47433 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java @@ -29,31 +29,31 @@ */ public class QueryBatchMessage implements MarshalableMessage, ExecutionContextAware { /** */ - @Order(value = 0, method = "queryId") - private UUID qryId; + @Order(0) + UUID qryId; /** */ @Order(1) - private long fragmentId; + long fragmentId; /** */ @Order(2) - private long exchangeId; + long exchangeId; /** */ @Order(3) - private int batchId; + int batchId; /** */ @Order(4) - private boolean last; + boolean last; /** */ private List rows; /** */ - @Order(value = 5, method = "messageRows") - private List mRows; + @Order(5) + List mRows; /** */ public QueryBatchMessage() { diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java index b0544ddd264fe..6c7e66113d1f8 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java @@ -25,8 +25,8 @@ */ public class QueryCloseMessage implements CalciteMessage { /** */ - @Order(value = 0, method = "queryId") - private UUID qryId; + @Order(0) + UUID qryId; /** */ public QueryCloseMessage() { diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java index e4c4c338a4cbe..526e2d02a8f90 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java @@ -34,50 +34,50 @@ public class QueryStartRequest implements MarshalableMessage, ExecutionContextAware { /** */ @Order(0) - private String schema; + String schema; /** */ - @Order(value = 1, method = "queryId") - private UUID qryId; + @Order(1) + UUID qryId; /** */ - @Order(value = 2, method = "originatingQueryId") - private long originatingQryId; + @Order(2) + long originatingQryId; /** */ - @Order(value = 3, method = "topologyVersion") - private AffinityTopologyVersion ver; + @Order(3) + AffinityTopologyVersion ver; /** */ - @Order(value = 4, method = "fragmentDescription") - private FragmentDescription fragmentDesc; + @Order(4) + FragmentDescription fragmentDesc; /** */ - @Order(value = 5) - private String root; + @Order(5) + String root; /** Total count of fragments in query for this node. */ - @Order(value = 6, method = "totalFragmentsCount") - private int totalFragmentsCnt; + @Order(6) + int totalFragmentsCnt; /** */ private @Nullable Object[] params; /** */ - @Order(value = 7, method = "parametersBytes") - private @Nullable byte[] paramsBytes; + @Order(7) + @Nullable byte[] paramsBytes; /** */ - @Order(value = 8) - private long timeout; + @Order(8) + long timeout; /** */ - @Order(value = 9, method = "queryTransactionEntries") - private @Nullable Collection qryTxEntries; + @Order(9) + @Nullable Collection qryTxEntries; /** */ - @Order(value = 10, method = "applicationAttributes") - private @Nullable Map appAttrs; + @Order(10) + @Nullable Map appAttrs; /** */ @SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType") diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java index 5df60d2d780fb..f90484152784d 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java @@ -27,16 +27,16 @@ */ public class QueryStartResponse implements CalciteMessage { /** */ - @Order(value = 0, method = "queryId") - private UUID qryId; + @Order(0) + UUID qryId; /** */ @Order(1) - private long fragmentId; + long fragmentId; /** */ - @Order(value = 2, method = "errorMessage") - private @Nullable ErrorMessage errMsg; + @Order(2) + @Nullable ErrorMessage errMsg; /** */ public QueryStartResponse() {} diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryTxEntry.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryTxEntry.java index a2b8feac693fe..061c84a4b6df5 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryTxEntry.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryTxEntry.java @@ -41,19 +41,19 @@ public class QueryTxEntry implements CalciteMessage { /** Cache id. */ @Order(0) - private int cacheId; + int cacheId; /** Entry key. */ @Order(1) - private KeyCacheObject key; + KeyCacheObject key; /** Entry value. */ - @Order(value = 2, method = "value") - private CacheObject val; + @Order(2) + CacheObject val; /** Entry version. */ - @Order(value = 3, method = "version") - private GridCacheVersion ver; + @Order(3) + GridCacheVersion ver; /** * Empty constructor. diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java index 47c15e619b152..81a5f363a3f06 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java @@ -43,12 +43,12 @@ /** */ public class ColocationGroup implements CalciteMessage { /** */ - @Order(value = 0, method = "sourceIds") - private long[] srcIds; + @Order(0) + long[] srcIds; /** */ @Order(1) - private List nodeIds; + List nodeIds; /** */ private List> assignments; @@ -61,7 +61,7 @@ public class ColocationGroup implements CalciteMessage { /** Marshalled assignments serialization call holder. */ @Order(2) - private int[] marshalledAssignments; + int[] marshalledAssignments; /** */ public static ColocationGroup forNodes(List nodeIds) { diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentDescription.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentDescription.java index 881019b5ed66c..012591fa1e398 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentDescription.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentDescription.java @@ -32,19 +32,19 @@ public class FragmentDescription implements MarshalableMessage { /** */ @Order(0) - private long fragmentId; + long fragmentId; /** */ @Order(1) - private FragmentMapping mapping; + FragmentMapping mapping; /** */ @Order(2) - private Map remoteSources0; + Map remoteSources0; /** */ @Order(3) - private ColocationGroup target; + ColocationGroup target; /** */ private Map> remoteSources; diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentMapping.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentMapping.java index 5450d9fcaecc1..a8bed128b3d7c 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentMapping.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentMapping.java @@ -36,8 +36,8 @@ */ public class FragmentMapping implements CalciteMessage { /** */ - @Order(value = 0, method = "colocationGroups") - private List colocationGrps; + @Order(0) + List colocationGrps; /** */ public FragmentMapping() { diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java index 536744a519526..1318d763d4424 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java @@ -1140,10 +1140,12 @@ private TestObject(int id) { @SuppressWarnings("PackageVisibleField") private static class TestObjectField implements Serializable { /** */ - @GridToStringInclude final int a; + @GridToStringInclude + final int a; /** */ - @GridToStringInclude final String b; + @GridToStringInclude + final String b; /** * @param a A. diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java index a253c05897098..87a32e85120cd 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java @@ -30,6 +30,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.TreeSet; import java.util.UUID; @@ -46,6 +47,7 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Elements; +import javax.lang.model.util.Types; import javax.tools.Diagnostic; import javax.tools.FileObject; import javax.tools.JavaFileObject; @@ -70,9 +72,6 @@ public class MessageSerializerGenerator { /** */ public static final String NL = System.lineSeparator(); - /** */ - private static final String PKG_NAME = "org.apache.ignite.internal.codegen"; - /** */ private static final String CLS_JAVADOC = "/** " + NL + " * This class is generated automatically." + NL + @@ -116,11 +115,12 @@ public class MessageSerializerGenerator { void generate(TypeElement type, List fields) throws Exception { generateMethods(type, fields); - imports.add(type.getQualifiedName().toString()); + for (TypeMirror typeMirror : getAllSuperclasses(env.getTypeUtils(), type.asType())) + imports.add(typeMirror.toString()); String serClsName = type.getSimpleName() + "Serializer"; - String serFqnClsName = PKG_NAME + "." + serClsName; - String serCode = generateSerializerCode(serClsName); + String serFqnClsName = env.getElementUtils().getPackageOf(type) + "." + serClsName; + String serCode = generateSerializerCode(type); try { JavaFileObject file = env.getFiler().createSourceFile(serFqnClsName); @@ -147,10 +147,32 @@ void generate(TypeElement type, List fields) throws Exception { } } + /** */ + private static List getAllSuperclasses(Types typeUtils, TypeMirror typeMirror) { + List superclasses = new ArrayList<>(); + TypeMirror currentMirror = typeMirror; + + while (currentMirror != null && currentMirror.getKind() == TypeKind.DECLARED) { + TypeElement typeElement = (TypeElement)typeUtils.asElement(currentMirror); + TypeMirror directSuperclass = typeElement.getSuperclass(); + + if (directSuperclass == null || + directSuperclass.getKind() == TypeKind.NONE || + directSuperclass.toString().equals(Object.class.getCanonicalName())) { + break; + } + + superclasses.add(directSuperclass); + currentMirror = directSuperclass; + } + + return superclasses; + } + /** Generates full code for a serializer class. */ - private String generateSerializerCode(String serClsName) throws IOException { + private String generateSerializerCode(TypeElement type) throws IOException { try (Writer writer = new StringWriter()) { - writeClassHeader(writer, PKG_NAME, serClsName); + writeClassHeader(writer, env.getElementUtils().getPackageOf(type).toString(), type.getSimpleName() + "Serializer"); writeClassFields(writer); @@ -317,14 +339,14 @@ private void readField(VariableElement field, int opt) throws Exception { private void returnFalseIfWriteFailed(VariableElement field) throws Exception { String methodName = field.getAnnotation(Order.class).method(); - String getExpr = (F.isEmpty(methodName) ? field.getSimpleName().toString() : methodName) + "()"; + String getExpr = (F.isEmpty(methodName) ? field.getSimpleName().toString() : methodName + "()"); TypeMirror type = field.asType(); if (type.getKind().isPrimitive()) { String typeName = capitalizeOnlyFirst(type.getKind().name()); - returnFalseIfWriteFailed(write, "writer.write" + typeName, getExpr); + returnFalseIfWriteFailed(write, field, "writer.write" + typeName, getExpr); return; } @@ -336,14 +358,14 @@ private void returnFalseIfWriteFailed(VariableElement field) throws Exception { if (componentType.getKind().isPrimitive()) { String typeName = capitalizeOnlyFirst(componentType.getKind().name()); - returnFalseIfWriteFailed(write, "writer.write" + typeName + "Array", getExpr); + returnFalseIfWriteFailed(write, field, "writer.write" + typeName + "Array", getExpr); return; } imports.add("org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType"); - returnFalseIfWriteFailed(write, "writer.writeObjectArray", getExpr, + returnFalseIfWriteFailed(write, field, "writer.writeObjectArray", getExpr, "MessageCollectionItemType." + messageCollectionItemType(componentType)); return; @@ -351,19 +373,19 @@ private void returnFalseIfWriteFailed(VariableElement field) throws Exception { if (type.getKind() == TypeKind.DECLARED) { if (sameType(type, String.class)) - returnFalseIfWriteFailed(write, "writer.writeString", getExpr); + returnFalseIfWriteFailed(write, field, "writer.writeString", getExpr); else if (sameType(type, BitSet.class)) - returnFalseIfWriteFailed(write, "writer.writeBitSet", getExpr); + returnFalseIfWriteFailed(write, field, "writer.writeBitSet", getExpr); else if (sameType(type, UUID.class)) - returnFalseIfWriteFailed(write, "writer.writeUuid", getExpr); + returnFalseIfWriteFailed(write, field, "writer.writeUuid", getExpr); else if (sameType(type, "org.apache.ignite.lang.IgniteUuid")) - returnFalseIfWriteFailed(write, "writer.writeIgniteUuid", getExpr); + returnFalseIfWriteFailed(write, field, "writer.writeIgniteUuid", getExpr); else if (sameType(type, "org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion")) - returnFalseIfWriteFailed(write, "writer.writeAffinityTopologyVersion", getExpr); + returnFalseIfWriteFailed(write, field, "writer.writeAffinityTopologyVersion", getExpr); else if (assignableFrom(erasedType(type), type(Map.class.getName()))) { List typeArgs = ((DeclaredType)type).getTypeArguments(); @@ -372,22 +394,22 @@ else if (assignableFrom(erasedType(type), type(Map.class.getName()))) { imports.add("org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType"); - returnFalseIfWriteFailed(write, "writer.writeMap", getExpr, + returnFalseIfWriteFailed(write, field, "writer.writeMap", getExpr, "MessageCollectionItemType." + messageCollectionItemType(typeArgs.get(0)), "MessageCollectionItemType." + messageCollectionItemType(typeArgs.get(1))); } else if (assignableFrom(type, type("org.apache.ignite.internal.processors.cache.KeyCacheObject"))) - returnFalseIfWriteFailed(write, "writer.writeKeyCacheObject", getExpr); + returnFalseIfWriteFailed(write, field, "writer.writeKeyCacheObject", getExpr); else if (assignableFrom(type, type("org.apache.ignite.internal.processors.cache.CacheObject"))) - returnFalseIfWriteFailed(write, "writer.writeCacheObject", getExpr); + returnFalseIfWriteFailed(write, field, "writer.writeCacheObject", getExpr); else if (assignableFrom(type, type("org.apache.ignite.internal.util.GridLongList"))) - returnFalseIfWriteFailed(write, "writer.writeGridLongList", getExpr); + returnFalseIfWriteFailed(write, field, "writer.writeGridLongList", getExpr); else if (assignableFrom(type, type(MESSAGE_INTERFACE))) - returnFalseIfWriteFailed(write, "writer.writeMessage", getExpr); + returnFalseIfWriteFailed(write, field, "writer.writeMessage", getExpr); else if (assignableFrom(erasedType(type), type(Collection.class.getName()))) { List typeArgs = ((DeclaredType)type).getTypeArguments(); @@ -400,7 +422,7 @@ else if (assignableFrom(erasedType(type), type(Collection.class.getName()))) { ? "writer.writeSet" : "writer.writeCollection"; - returnFalseIfWriteFailed(write, collectionWriter, getExpr, + returnFalseIfWriteFailed(write, field, collectionWriter, getExpr, "MessageCollectionItemType." + messageCollectionItemType(typeArgs.get(0))); } @@ -440,9 +462,8 @@ else if (enumType(env, type)) { mapperCallStmnt = "DefaultEnumMapper.INSTANCE.encode"; } - returnFalseIfEnumWriteFailed(write, "writer.writeByte", mapperCallStmnt, getExpr); + returnFalseIfEnumWriteFailed(write, field, "writer.writeByte", mapperCallStmnt, getExpr); } - else throw new IllegalArgumentException("Unsupported declared type: " + type); @@ -462,9 +483,9 @@ private String typeNameToFieldName(String typeName) { } /** - * Generate code of writing single field: + * Generate code of writing header: * 
-     * if (!writer.writeInt(msg.id()))
+     * if (!writer.writeHeader(msg.directType()))
      *     return false;
      *
*/ @@ -480,15 +501,36 @@ private void returnFalseIfWriteFailed(Collection code, String accessor, indent--; } + /** + * Generate code of writing single field: + */ + private void returnFalseIfWriteFailed(Collection code, VariableElement field, String accessor, @Nullable String... args) { + String argsStr = String.join(", ", args); + + String methodName = field.getAnnotation(Order.class).method(); + + if (Objects.equals(methodName, "")) + code.add(line("if (!%s(((%s)msg).%s))", accessor, field.getEnclosingElement().getSimpleName(), argsStr)); + else + code.add(line("if (!%s(msg.%s))", accessor, argsStr)); + + indent++; + + code.add(line(RETURN_FALSE_STMT)); + + indent--; + } + /** * Generate code of writing single enum field mapped with EnumMapper: - * 
-     * if (!writer.writeByte(myEnumMapper.encode(msg.myEnum()))
-     *     return false;
-     *
*/ - private void returnFalseIfEnumWriteFailed(Collection code, String writerCall, String mapperCall, String fieldGetterCall) { - code.add(line("if (!%s(%s(msg.%s)))", writerCall, mapperCall, fieldGetterCall)); + private void returnFalseIfEnumWriteFailed(Collection code, VariableElement field, String writerCall, String mapperCall, String fieldGetterCall) { + String methodName = field.getAnnotation(Order.class).method(); + + if (Objects.equals(methodName, "")) + code.add(line("if (!%s(%s(((%s)msg).%s)))", writerCall, mapperCall, field.getEnclosingElement().getSimpleName(), fieldGetterCall)); + else + code.add(line("if (!%s(%s(msg.%s)))", writerCall, mapperCall, fieldGetterCall)); indent++; @@ -505,14 +547,10 @@ private void returnFalseIfEnumWriteFailed(Collection code, String writer private void returnFalseIfReadFailed(VariableElement field) throws Exception { TypeMirror type = field.asType(); - String methodName = field.getAnnotation(Order.class).method(); - - String name = F.isEmpty(methodName) ? field.getSimpleName().toString() : methodName; - if (type.getKind().isPrimitive()) { String typeName = capitalizeOnlyFirst(type.getKind().name()); - returnFalseIfReadFailed(name, "reader.read" + typeName); + returnFalseIfReadFailed(field, "reader.read" + typeName); return; } @@ -524,7 +562,7 @@ private void returnFalseIfReadFailed(VariableElement field) throws Exception { if (componentType.getKind().isPrimitive()) { String typeName = capitalizeOnlyFirst(componentType.getKind().name()); - returnFalseIfReadFailed(name, "reader.read" + typeName + "Array"); + returnFalseIfReadFailed(field, "reader.read" + typeName + "Array"); return; } @@ -534,7 +572,7 @@ private void returnFalseIfReadFailed(VariableElement field) throws Exception { assert ctype.getKind().isPrimitive(); - returnFalseIfReadFailed(name, "reader.readObjectArray", + returnFalseIfReadFailed(field, "reader.readObjectArray", "MessageCollectionItemType." + messageCollectionItemType(ctype), ctype.getKind().name().toLowerCase() + "[].class"); @@ -546,7 +584,7 @@ private void returnFalseIfReadFailed(VariableElement field) throws Exception { String cls = componentElement.getSimpleName().toString(); - returnFalseIfReadFailed(name, "reader.readObjectArray", + returnFalseIfReadFailed(field, "reader.readObjectArray", "MessageCollectionItemType." + messageCollectionItemType(componentType), cls + ".class"); @@ -562,41 +600,41 @@ private void returnFalseIfReadFailed(VariableElement field) throws Exception { if (type.getKind() == TypeKind.DECLARED) { if (sameType(type, String.class)) - returnFalseIfReadFailed(name, "reader.readString"); + returnFalseIfReadFailed(field, "reader.readString"); else if (sameType(type, BitSet.class)) - returnFalseIfReadFailed(name, "reader.readBitSet"); + returnFalseIfReadFailed(field, "reader.readBitSet"); else if (sameType(type, UUID.class)) - returnFalseIfReadFailed(name, "reader.readUuid"); + returnFalseIfReadFailed(field , "reader.readUuid"); else if (sameType(type, "org.apache.ignite.lang.IgniteUuid")) - returnFalseIfReadFailed(name, "reader.readIgniteUuid"); + returnFalseIfReadFailed(field, "reader.readIgniteUuid"); else if (sameType(type, "org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion")) - returnFalseIfReadFailed(name, "reader.readAffinityTopologyVersion"); + returnFalseIfReadFailed(field, "reader.readAffinityTopologyVersion"); else if (assignableFrom(erasedType(type), type(Map.class.getName()))) { List typeArgs = ((DeclaredType)type).getTypeArguments(); assert typeArgs.size() == 2; - returnFalseIfReadFailed(name, "reader.readMap", + returnFalseIfReadFailed(field, "reader.readMap", "MessageCollectionItemType." + messageCollectionItemType(typeArgs.get(0)), "MessageCollectionItemType." + messageCollectionItemType(typeArgs.get(1)), "false"); } else if (assignableFrom(type, type("org.apache.ignite.internal.processors.cache.KeyCacheObject"))) - returnFalseIfReadFailed(name, "reader.readKeyCacheObject"); + returnFalseIfReadFailed(field, "reader.readKeyCacheObject"); else if (assignableFrom(type, type("org.apache.ignite.internal.processors.cache.CacheObject"))) - returnFalseIfReadFailed(name, "reader.readCacheObject"); + returnFalseIfReadFailed(field, "reader.readCacheObject"); else if (assignableFrom(type, type("org.apache.ignite.internal.util.GridLongList"))) - returnFalseIfReadFailed(name, "reader.readGridLongList"); + returnFalseIfReadFailed(field, "reader.readGridLongList"); else if (assignableFrom(type, type(MESSAGE_INTERFACE))) - returnFalseIfReadFailed(name, "reader.readMessage"); + returnFalseIfReadFailed(field, "reader.readMessage"); else if (assignableFrom(erasedType(type), type(Collection.class.getName()))) { List typeArgs = ((DeclaredType)type).getTypeArguments(); @@ -607,7 +645,7 @@ else if (assignableFrom(erasedType(type), type(Collection.class.getName()))) { ? "reader.readSet" : "reader.readCollection"; - returnFalseIfReadFailed(name, collectionReader, + returnFalseIfReadFailed(field, collectionReader, "MessageCollectionItemType." + messageCollectionItemType(typeArgs.get(0))); } else if (enumType(env, type)) { @@ -618,7 +656,7 @@ else if (enumType(env, type)) { String mapperCallStmnt = hasCustMapperAnn ? fieldPrefix + "Mapper.decode" : "DefaultEnumMapper.INSTANCE.decode"; String enumValsFieldName = hasCustMapperAnn ? null : fieldPrefix + "Vals"; - returnFalseIfEnumReadFailed(name, mapperCallStmnt, enumValsFieldName); + returnFalseIfEnumReadFailed(field, mapperCallStmnt, enumValsFieldName); } else @@ -708,20 +746,19 @@ private PrimitiveType unboxedType(TypeMirror type) { /** * Generate code of reading single field: - * 
-     * msg.id(reader.readInt());
-     *
-     * if (!reader.isLastRead())
-     *     return false;
-     *
* - * @param var Variable name. + * @param field Field. * @param mtd Method name. */ - private void returnFalseIfReadFailed(String var, String mtd, String... args) { + private void returnFalseIfReadFailed(VariableElement field, String mtd, String... args) { String argsStr = String.join(", ", args); - read.add(line("msg.%s(%s(%s));", var, mtd, argsStr)); + String methodName = field.getAnnotation(Order.class).method(); + + if (Objects.equals(methodName, "")) + read.add(line("((%s)msg).%s = %s(%s);", field.getEnclosingElement().getSimpleName(), field.getSimpleName().toString(), mtd, argsStr)); + else + read.add(line("msg.%s(%s(%s));", methodName, mtd, argsStr)); read.add(EMPTY); @@ -736,21 +773,23 @@ private void returnFalseIfReadFailed(String var, String mtd, String... args) { /** * Generate code of reading single field: - * 
-     * msg.id(reader.readInt());
      *
-     * if (!reader.isLastRead())
-     *     return false;
-     *
- * - * @param msgSetterName Variable name. * @param mapperDecodeCallStmnt Method name. */ - private void returnFalseIfEnumReadFailed(String msgSetterName, String mapperDecodeCallStmnt, String enumValuesFieldName) { + private void returnFalseIfEnumReadFailed(VariableElement field, String mapperDecodeCallStmnt, String enumValuesFieldName) { + String readOp; + if (enumValuesFieldName == null) - read.add(line("msg.%s(%s(reader.readByte()));", msgSetterName, mapperDecodeCallStmnt)); + readOp = line("%s(reader.readByte())", mapperDecodeCallStmnt); + else + readOp = line("%s(%s, reader.readByte())", mapperDecodeCallStmnt, enumValuesFieldName); + + String methodName = field.getAnnotation(Order.class).method(); + + if (Objects.equals(methodName, "")) + read.add(line("((%s)msg).%s = %s;", field.getEnclosingElement().getSimpleName(), field.getSimpleName().toString(), readOp)); else - read.add(line("msg.%s(%s(%s, reader.readByte()));", msgSetterName, mapperDecodeCallStmnt, enumValuesFieldName)); + read.add(line("msg.%s(%s);", methodName, readOp)); read.add(EMPTY); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ExchangeInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/ExchangeInfo.java index 3e4770303c521..b2e2af5125a26 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/ExchangeInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/ExchangeInfo.java @@ -27,8 +27,8 @@ /** */ public final class ExchangeInfo extends IgniteDiagnosticRequest.DiagnosticBaseInfo { /** */ - @Order(value = 0, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(0) + AffinityTopologyVersion topVer; /** * Empty constructor required by {@link GridIoMessageFactory}. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java index cf31e9694eec7..25ee72e150faa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java @@ -28,15 +28,15 @@ public class GridJobCancelRequest implements Message { /** */ @Order(0) - private IgniteUuid sessionId; + IgniteUuid sessionId; /** */ @Order(1) - private IgniteUuid jobId; + IgniteUuid jobId; /** */ @Order(2) - private boolean system; + boolean system; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java index 22bfb3f3a39f7..e46408abcd6dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java @@ -42,17 +42,17 @@ @SuppressWarnings({"AssignmentOrReturnOfFieldWithMutableType", "NullableProblems"}) public class GridJobExecuteRequest implements ExecutorAwareMessage { /** */ - @Order(value = 0, method = "sessionId") - private IgniteUuid sesId; + @Order(0) + IgniteUuid sesId; /** */ @Order(1) - private IgniteUuid jobId; + IgniteUuid jobId; /** */ @GridToStringExclude @Order(2) - private byte[] jobBytes; + byte[] jobBytes; /** */ @GridToStringExclude @@ -60,33 +60,33 @@ public class GridJobExecuteRequest implements ExecutorAwareMessage { /** */ @Order(3) - private long startTaskTime; + long startTaskTime; /** */ @Order(4) - private long timeout; + long timeout; /** */ @Order(5) - private String taskName; + String taskName; /** */ - @Order(value = 6, method = "userVersion") - private String userVer; + @Order(6) + String userVer; /** */ - @Order(value = 7, method = "taskClassName") - private String taskClsName; + @Order(7) + String taskClsName; /** Node class loader participants. */ @GridToStringInclude - @Order(value = 8, method = "loaderParticipants") - private Map ldrParticipants; + @Order(8) + Map ldrParticipants; /** */ @GridToStringExclude - @Order(value = 9, method = "sessionAttributesBytes") - private byte[] sesAttrsBytes; + @Order(9) + byte[] sesAttrsBytes; /** */ @GridToStringExclude @@ -94,77 +94,77 @@ public class GridJobExecuteRequest implements ExecutorAwareMessage { /** */ @GridToStringExclude - @Order(value = 10, method = "jobAttributesBytes") - private byte[] jobAttrsBytes; + @Order(10) + byte[] jobAttrsBytes; /** */ @GridToStringExclude private Map jobAttrs; /** Checkpoint SPI name. */ - @Order(value = 11, method = "checkpointSpi") - private String cpSpi; + @Order(11) + String cpSpi; /** */ private Collection siblings; /** */ @Order(12) - private byte[] siblingsBytes; + byte[] siblingsBytes; /** Transient since needs to hold local creation time. */ private final long createTime = U.currentTimeMillis(); /** */ - @Order(value = 13, method = "classLoaderId") - private IgniteUuid clsLdrId; + @Order(13) + IgniteUuid clsLdrId; /** */ - @Order(value = 14, method = "deploymentMode") - private DeploymentMode depMode; + @Order(14) + DeploymentMode depMode; /** */ @Order(15) - private boolean dynamicSiblings; + boolean dynamicSiblings; /** */ - @Order(value = 16, method = "forceLocalDeployment") - private boolean forceLocDep; + @Order(16) + boolean forceLocDep; /** */ - @Order(value = 17, method = "sessionFullSupport") - private boolean sesFullSup; + @Order(17) + boolean sesFullSup; /** */ @Order(18) - private boolean internal; + boolean internal; /** */ - @Order(value = 19, method = "topology") - private Collection top; + @Order(19) + Collection top; /** */ private IgnitePredicate topPred; /** */ - @Order(value = 20, method = "topologyPredicateBytes") - private byte[] topPredBytes; + @Order(20) + byte[] topPredBytes; /** */ @Order(21) - private int[] cacheIds; + int[] cacheIds; /** */ - @Order(value = 22, method = "partition") - private int part; + @Order(22) + int part; /** */ - @Order(value = 23, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(23) + AffinityTopologyVersion topVer; /** */ - @Order(value = 24, method = "executorName") - private String execName; + @Order(24) + String execName; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java index 0ede431ce19d0..15ea1ef3fce7e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java @@ -40,15 +40,15 @@ public class GridJobExecuteResponse implements Message { /** */ @Order(0) - private UUID nodeId; + UUID nodeId; /** */ - @Order(value = 1, method = "sessionId") - private IgniteUuid sesId; + @Order(1) + IgniteUuid sesId; /** */ @Order(2) - private IgniteUuid jobId; + IgniteUuid jobId; /** */ private IgniteException gridEx; @@ -57,35 +57,35 @@ public class GridJobExecuteResponse implements Message { * Serialization call holder for {@code gridEx}. Works with {@link #marshallUserData(Marshaller)}. * Wraps also possible serialization error. */ - @Order(value = 3, method = "exceptionMessage") - private @Nullable ErrorMessage gridExMsg; + @Order(3) + @Nullable ErrorMessage gridExMsg; /** Job result serialization call holder. */ - @Order(value = 4, method = "jobResultBytes") - private @Nullable byte[] resBytes; + @Order(4) + @Nullable byte[] resBytes; /** */ private @Nullable Object res; /** */ /** Job attributes serialization call holder. */ - @Order(value = 5, method = "jobAttrubutesBytes") - private byte[] jobAttrsBytes; + @Order(5) + byte[] jobAttrsBytes; /** */ private Map jobAttrs; /** */ - @Order(value = 6, method = "cancelled") - private boolean isCancelled; + @Order(6) + boolean isCancelled; /** */ @GridToStringExclude private IgniteException fakeEx; /** Retry topology version. */ - @Order(value = 7, method = "retryTopologyVersion") - private AffinityTopologyVersion retry; + @Order(7) + AffinityTopologyVersion retry; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java index 483b2f19ce044..672450cabd8a8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java @@ -26,12 +26,12 @@ */ public class GridJobSiblingsRequest implements Message { /** */ - @Order(value = 0, method = "sessionId") - private IgniteUuid sesId; + @Order(0) + IgniteUuid sesId; /** */ @Order(1) - private long topicId; + long topicId; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java index 9aeb780795fd0..a625d4edcc4ec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java @@ -35,7 +35,7 @@ public class GridJobSiblingsResponse implements Message { /** */ @Order(0) - private byte[] siblingsBytes; + byte[] siblingsBytes; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java index dad45acbef748..ae329423720f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java @@ -26,8 +26,8 @@ */ public class GridTaskCancelRequest implements Message { /** */ - @Order(value = 0, method = "sessionId") - private IgniteUuid sesId; + @Order(0) + IgniteUuid sesId; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java index e2cc2ca4bf09a..c1ea1fe7bb00b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java @@ -30,16 +30,16 @@ */ public class GridTaskSessionRequest implements Message { /** Task session ID. */ - @Order(value = 0, method = "sessionId") - private IgniteUuid sesId; + @Order(0) + IgniteUuid sesId; /** ID of job within a task. */ @Order(1) - private IgniteUuid jobId; + IgniteUuid jobId; /** Changed attributes bytes. */ - @Order(value = 2, method = "attributesBytes") - private byte[] attrsBytes; + @Order(2) + byte[] attrsBytes; /** Changed attributes. */ private Map attrs; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java index 5f34d24c2a04d..ddb7d134652fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java @@ -34,16 +34,16 @@ */ public class IgniteDiagnosticRequest implements Message { /** */ - @Order(value = 0, method = "futureId") - private long futId; + @Order(0) + long futId; /** Originator node id. */ @Order(1) - private UUID nodeId; + UUID nodeId; /** Infos to send to a remote node. */ @Order(2) - private @Nullable Set infos; + @Nullable Set infos; /** Local message related to remote info. */ private final Map> msgs = new LinkedHashMap<>(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticResponse.java index 0e951015162a1..b59a0b2121f2e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticResponse.java @@ -25,12 +25,12 @@ /** */ public class IgniteDiagnosticResponse implements Message { /** */ - @Order(value = 0, method = "futureId") - private long futId; + @Order(0) + long futId; /** */ - @Order(value = 1, method = "responseInfo") - private @Nullable String respInfo; + @Order(1) + @Nullable String respInfo; /** * Default constructor required by {@link GridIoMessageFactory}. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/TxEntriesInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/TxEntriesInfo.java index f81fbbedfc4dc..dfd267f086d07 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/TxEntriesInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/TxEntriesInfo.java @@ -31,11 +31,11 @@ public final class TxEntriesInfo extends IgniteDiagnosticRequest.DiagnosticBaseInfo { /** */ @Order(0) - private int cacheId; + int cacheId; /** */ @Order(1) - private Collection keys; + Collection keys; /** * Empty constructor required by {@link GridIoMessageFactory}. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/TxInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/TxInfo.java index 0646daa9692fe..36016d59ec092 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/TxInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/TxInfo.java @@ -26,12 +26,12 @@ /** */ public final class TxInfo extends IgniteDiagnosticRequest.DiagnosticBaseInfo { /** */ - @Order(value = 0, method = "dhtVersion") - private GridCacheVersion dhtVer; + @Order(0) + GridCacheVersion dhtVer; /** */ - @Order(value = 1, method = "nearVersion") - private GridCacheVersion nearVer; + @Order(1) + GridCacheVersion nearVer; /** * Empty constructor required by {@link GridIoMessageFactory}. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java index 0a15822b45360..91451a5ec8c5b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java @@ -36,7 +36,7 @@ public class IndexKeyTypeMessage implements Message { /** Code. */ @Order(0) - private byte code = NULL_VALUE_CODE; + byte code = NULL_VALUE_CODE; /** Empty constructor for {@link GridIoMessageFactory}. */ public IndexKeyTypeMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryResultMeta.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryResultMeta.java index 453f73bdd0a32..4c89990e8c11d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryResultMeta.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryResultMeta.java @@ -38,15 +38,15 @@ public class IndexQueryResultMeta implements Message { /** Index key settings. */ @Order(0) - private IndexKeyTypeSettings keyTypeSettings; + IndexKeyTypeSettings keyTypeSettings; /** Index names order holder. Should be serialized together with the definitions. */ - @Order(value = 1, method = "orderedIndexNames") - private @Nullable String[] idxNames; + @Order(1) + @Nullable String[] idxNames; /** Index definitions serialization holder. Should be serialized together with the names. */ - @Order(value = 2, method = "orderedIndexDefinitions") - private @Nullable IndexKeyDefinition[] idxDefs; + @Order(2) + @Nullable IndexKeyDefinition[] idxDefs; /** */ public IndexQueryResultMeta() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyDefinition.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyDefinition.java index c58d677db82e0..70e4e02559683 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyDefinition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyDefinition.java @@ -26,16 +26,16 @@ */ public class IndexKeyDefinition implements Message { /** A message for {@link IndexKeyType}. */ - @Order(value = 0, method = "indexKeyTypeMessage") - private IndexKeyTypeMessage idxTypeMsg; + @Order(0) + IndexKeyTypeMessage idxTypeMsg; /** Order. */ - @Order(value = 1, method = "ascending") - private boolean asc; + @Order(1) + boolean asc; /** Precision for variable length key types. */ @Order(2) - private int precision; + int precision; /** */ public IndexKeyDefinition() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyTypeSettings.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyTypeSettings.java index 4c186e5631914..5e7c367287cf4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyTypeSettings.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyTypeSettings.java @@ -25,20 +25,20 @@ */ public class IndexKeyTypeSettings implements Message { /** Whether inlining POJO keys as hash is supported. */ - @Order(value = 0, method = "inlineObjectHash") - private boolean inlineObjHash = true; + @Order(0) + boolean inlineObjHash = true; /** Whether inlining of POJO keys is supported. */ - @Order(value = 1, method = "inlineObjectSupported") - private boolean inlineObjSupported = true; + @Order(1) + boolean inlineObjSupported = true; /** Whether optimized algorithm of String comparison is used. */ - @Order(value = 2, method = "stringOptimizedCompare") - private boolean strOptimizedCompare = true; + @Order(2) + boolean strOptimizedCompare = true; /** Whether use unsigned bytes for storing byte arrays. */ @Order(3) - private boolean binaryUnsigned = true; + boolean binaryUnsigned = true; /** {@inheritDoc} */ @Override public short directType() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java index 73d679b5eeeaf..856d609676da0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java @@ -28,17 +28,17 @@ */ public class GridCheckpointRequest implements Message { /** */ - @Order(value = 0, method = "sessionId") - private IgniteUuid sesId; + @Order(0) + IgniteUuid sesId; /** */ @Order(1) @GridToStringInclude(sensitive = true) - private String key; + String key; /** */ - @Order(value = 2, method = "checkpointSpi") - private String cpSpi; + @Order(2) + String cpSpi; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/ErrorMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/ErrorMessage.java index 8bed97aa47f24..49889896252ef 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/ErrorMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/ErrorMessage.java @@ -44,7 +44,7 @@ public class ErrorMessage implements Message { /** Serialization and deserealization call holder. */ @Order(value = 0, method = "errorBytes") @GridToStringExclude - private @Nullable byte[] errBytes; + @Nullable public byte[] errBytes; /** Original error. It is transient and necessary only to avoid duplicated serialization and deserializtion. */ private @Nullable Throwable err; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java index f0e2f66bebbdd..8e1c3ea6d9da8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java @@ -38,8 +38,8 @@ public class GridIoMessage implements Message, SpanTransport { public static final Integer STRIPE_DISABLED_PART = Integer.MIN_VALUE; /** Policy. */ - @Order(value = 0, method = "policy") - private byte plc; + @Order(0) + byte plc; /** Message topic. */ @GridToStringInclude @@ -47,31 +47,31 @@ public class GridIoMessage implements Message, SpanTransport { /** Topic bytes. */ @Order(1) - private byte[] topicBytes; + byte[] topicBytes; /** Topic ordinal. */ - @Order(value = 2, method = "topicOrdinal") - private int topicOrd = -1; + @Order(2) + int topicOrd = -1; /** Message ordered flag. */ - @Order(value = 3, method = "isOrdered") - private boolean ordered; + @Order(3) + boolean ordered; /** Message timeout. */ @Order(4) - private long timeout; + long timeout; /** Whether message can be skipped on timeout. */ @Order(5) - private boolean skipOnTimeout; + boolean skipOnTimeout; /** Message. */ - @Order(value = 6, method = "message") - private Message msg; + @Order(6) + Message msg; /** Serialized span */ @Order(7) - private byte[] span; + byte[] span; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index 03db54860b703..613a9cbca487d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -18,292 +18,277 @@ package org.apache.ignite.internal.managers.communication; import org.apache.ignite.internal.ExchangeInfo; +import org.apache.ignite.internal.ExchangeInfoSerializer; import org.apache.ignite.internal.GridJobCancelRequest; +import org.apache.ignite.internal.GridJobCancelRequestSerializer; import org.apache.ignite.internal.GridJobExecuteRequest; +import org.apache.ignite.internal.GridJobExecuteRequestSerializer; import org.apache.ignite.internal.GridJobExecuteResponse; +import org.apache.ignite.internal.GridJobExecuteResponseSerializer; import org.apache.ignite.internal.GridJobSiblingsRequest; +import org.apache.ignite.internal.GridJobSiblingsRequestSerializer; import org.apache.ignite.internal.GridJobSiblingsResponse; +import org.apache.ignite.internal.GridJobSiblingsResponseSerializer; import org.apache.ignite.internal.GridTaskCancelRequest; +import org.apache.ignite.internal.GridTaskCancelRequestSerializer; import org.apache.ignite.internal.GridTaskSessionRequest; +import org.apache.ignite.internal.GridTaskSessionRequestSerializer; import org.apache.ignite.internal.IgniteDiagnosticRequest; +import org.apache.ignite.internal.IgniteDiagnosticRequestSerializer; import org.apache.ignite.internal.IgniteDiagnosticResponse; +import org.apache.ignite.internal.IgniteDiagnosticResponseSerializer; import org.apache.ignite.internal.TxEntriesInfo; +import org.apache.ignite.internal.TxEntriesInfoSerializer; import org.apache.ignite.internal.TxInfo; +import org.apache.ignite.internal.TxInfoSerializer; import org.apache.ignite.internal.cache.query.index.IndexKeyTypeMessage; +import org.apache.ignite.internal.cache.query.index.IndexKeyTypeMessageSerializer; import org.apache.ignite.internal.cache.query.index.IndexQueryResultMeta; +import org.apache.ignite.internal.cache.query.index.IndexQueryResultMetaSerializer; import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyDefinition; +import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyDefinitionSerializer; import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyTypeSettings; -import org.apache.ignite.internal.codegen.AtomicApplicationAttributesAwareRequestSerializer; -import org.apache.ignite.internal.codegen.BinaryMetadataVersionInfoSerializer; -import org.apache.ignite.internal.codegen.CacheContinuousQueryBatchAckSerializer; -import org.apache.ignite.internal.codegen.CacheEntryInfoCollectionSerializer; -import org.apache.ignite.internal.codegen.CacheEntryPredicateAdapterSerializer; -import org.apache.ignite.internal.codegen.CacheEvictionEntrySerializer; -import org.apache.ignite.internal.codegen.CacheGroupAffinityMessageSerializer; -import org.apache.ignite.internal.codegen.CacheInvokeDirectResultSerializer; -import org.apache.ignite.internal.codegen.CacheMetricsMessageSerializer; -import org.apache.ignite.internal.codegen.CachePartitionFullCountersMapSerializer; -import org.apache.ignite.internal.codegen.CachePartitionPartialCountersMapSerializer; -import org.apache.ignite.internal.codegen.CachePartitionsToReloadMapSerializer; -import org.apache.ignite.internal.codegen.CacheVersionedValueSerializer; -import org.apache.ignite.internal.codegen.ClusterMetricsUpdateMessageSerializer; -import org.apache.ignite.internal.codegen.ContinuousRoutineStartResultMessageSerializer; -import org.apache.ignite.internal.codegen.ErrorMessageSerializer; -import org.apache.ignite.internal.codegen.ExchangeInfoSerializer; -import org.apache.ignite.internal.codegen.GenerateEncryptionKeyRequestSerializer; -import org.apache.ignite.internal.codegen.GridCacheEntryInfoSerializer; -import org.apache.ignite.internal.codegen.GridCacheQueryRequestSerializer; -import org.apache.ignite.internal.codegen.GridCacheQueryResponseSerializer; -import org.apache.ignite.internal.codegen.GridCacheReturnSerializer; -import org.apache.ignite.internal.codegen.GridCacheSqlQuerySerializer; -import org.apache.ignite.internal.codegen.GridCacheTtlUpdateRequestSerializer; -import org.apache.ignite.internal.codegen.GridCacheTxRecoveryRequestSerializer; -import org.apache.ignite.internal.codegen.GridCacheTxRecoveryResponseSerializer; -import org.apache.ignite.internal.codegen.GridCacheVersionExSerializer; -import org.apache.ignite.internal.codegen.GridCacheVersionSerializer; -import org.apache.ignite.internal.codegen.GridChangeGlobalStateMessageResponseSerializer; -import org.apache.ignite.internal.codegen.GridCheckpointRequestSerializer; -import org.apache.ignite.internal.codegen.GridDeploymentResponseSerializer; -import org.apache.ignite.internal.codegen.GridDhtAffinityAssignmentRequestSerializer; -import org.apache.ignite.internal.codegen.GridDhtAffinityAssignmentResponseSerializer; -import org.apache.ignite.internal.codegen.GridDhtAtomicDeferredUpdateResponseSerializer; -import org.apache.ignite.internal.codegen.GridDhtAtomicNearResponseSerializer; -import org.apache.ignite.internal.codegen.GridDhtAtomicSingleUpdateRequestSerializer; -import org.apache.ignite.internal.codegen.GridDhtAtomicUpdateRequestSerializer; -import org.apache.ignite.internal.codegen.GridDhtAtomicUpdateResponseSerializer; -import org.apache.ignite.internal.codegen.GridDhtForceKeysRequestSerializer; -import org.apache.ignite.internal.codegen.GridDhtForceKeysResponseSerializer; -import org.apache.ignite.internal.codegen.GridDhtLockRequestSerializer; -import org.apache.ignite.internal.codegen.GridDhtLockResponseSerializer; -import org.apache.ignite.internal.codegen.GridDhtPartitionDemandMessageSerializer; -import org.apache.ignite.internal.codegen.GridDhtPartitionExchangeIdSerializer; -import org.apache.ignite.internal.codegen.GridDhtPartitionSupplyMessageSerializer; -import org.apache.ignite.internal.codegen.GridDhtPartitionsFullMessageSerializer; -import org.apache.ignite.internal.codegen.GridDhtPartitionsSingleMessageSerializer; -import org.apache.ignite.internal.codegen.GridDhtPartitionsSingleRequestSerializer; -import org.apache.ignite.internal.codegen.GridDhtTxFinishRequestSerializer; -import org.apache.ignite.internal.codegen.GridDhtTxFinishResponseSerializer; -import org.apache.ignite.internal.codegen.GridDhtTxOnePhaseCommitAckRequestSerializer; -import org.apache.ignite.internal.codegen.GridDhtTxPrepareRequestSerializer; -import org.apache.ignite.internal.codegen.GridDhtTxPrepareResponseSerializer; -import org.apache.ignite.internal.codegen.GridDhtUnlockRequestSerializer; -import org.apache.ignite.internal.codegen.GridDistributedLockRequestSerializer; -import org.apache.ignite.internal.codegen.GridDistributedLockResponseSerializer; -import org.apache.ignite.internal.codegen.GridDistributedTxFinishRequestSerializer; -import org.apache.ignite.internal.codegen.GridDistributedTxFinishResponseSerializer; -import org.apache.ignite.internal.codegen.GridDistributedTxPrepareRequestSerializer; -import org.apache.ignite.internal.codegen.GridDistributedTxPrepareResponseSerializer; -import org.apache.ignite.internal.codegen.GridEventStorageMessageSerializer; -import org.apache.ignite.internal.codegen.GridIoMessageSerializer; -import org.apache.ignite.internal.codegen.GridIoSecurityAwareMessageSerializer; -import org.apache.ignite.internal.codegen.GridJobCancelRequestSerializer; -import org.apache.ignite.internal.codegen.GridJobExecuteRequestSerializer; -import org.apache.ignite.internal.codegen.GridJobExecuteResponseSerializer; -import org.apache.ignite.internal.codegen.GridJobSiblingsRequestSerializer; -import org.apache.ignite.internal.codegen.GridJobSiblingsResponseSerializer; -import org.apache.ignite.internal.codegen.GridNearAtomicCheckUpdateRequestSerializer; -import org.apache.ignite.internal.codegen.GridNearAtomicFullUpdateRequestSerializer; -import org.apache.ignite.internal.codegen.GridNearAtomicSingleUpdateFilterRequestSerializer; -import org.apache.ignite.internal.codegen.GridNearAtomicSingleUpdateInvokeRequestSerializer; -import org.apache.ignite.internal.codegen.GridNearAtomicSingleUpdateRequestSerializer; -import org.apache.ignite.internal.codegen.GridNearAtomicUpdateResponseSerializer; -import org.apache.ignite.internal.codegen.GridNearGetRequestSerializer; -import org.apache.ignite.internal.codegen.GridNearGetResponseSerializer; -import org.apache.ignite.internal.codegen.GridNearLockRequestSerializer; -import org.apache.ignite.internal.codegen.GridNearLockResponseSerializer; -import org.apache.ignite.internal.codegen.GridNearSingleGetRequestSerializer; -import org.apache.ignite.internal.codegen.GridNearSingleGetResponseSerializer; -import org.apache.ignite.internal.codegen.GridNearTxFinishRequestSerializer; -import org.apache.ignite.internal.codegen.GridNearTxFinishResponseSerializer; -import org.apache.ignite.internal.codegen.GridNearTxPrepareRequestSerializer; -import org.apache.ignite.internal.codegen.GridNearTxPrepareResponseSerializer; -import org.apache.ignite.internal.codegen.GridNearUnlockRequestSerializer; -import org.apache.ignite.internal.codegen.GridQueryCancelRequestSerializer; -import org.apache.ignite.internal.codegen.GridQueryFailResponseSerializer; -import org.apache.ignite.internal.codegen.GridQueryKillRequestSerializer; -import org.apache.ignite.internal.codegen.GridQueryKillResponseSerializer; -import org.apache.ignite.internal.codegen.GridQueryNextPageRequestSerializer; -import org.apache.ignite.internal.codegen.GridQueryNextPageResponseSerializer; -import org.apache.ignite.internal.codegen.GridTaskCancelRequestSerializer; -import org.apache.ignite.internal.codegen.GridTaskResultRequestSerializer; -import org.apache.ignite.internal.codegen.GridTaskResultResponseSerializer; -import org.apache.ignite.internal.codegen.GridTaskSessionRequestSerializer; -import org.apache.ignite.internal.codegen.GroupPartitionIdPairSerializer; -import org.apache.ignite.internal.codegen.HandshakeMessageSerializer; -import org.apache.ignite.internal.codegen.HandshakeWaitMessageSerializer; -import org.apache.ignite.internal.codegen.IgniteDhtDemandedPartitionsMapSerializer; -import org.apache.ignite.internal.codegen.IgniteDhtPartitionCountersMapSerializer; -import org.apache.ignite.internal.codegen.IgniteDhtPartitionHistorySuppliersMapSerializer; -import org.apache.ignite.internal.codegen.IgniteDhtPartitionsToReloadMapSerializer; -import org.apache.ignite.internal.codegen.IgniteDiagnosticRequestSerializer; -import org.apache.ignite.internal.codegen.IgniteDiagnosticResponseSerializer; -import org.apache.ignite.internal.codegen.IgniteTxKeySerializer; -import org.apache.ignite.internal.codegen.IncrementalSnapshotAwareMessageSerializer; -import org.apache.ignite.internal.codegen.IndexKeyDefinitionSerializer; -import org.apache.ignite.internal.codegen.IndexKeyTypeMessageSerializer; -import org.apache.ignite.internal.codegen.IndexKeyTypeSettingsSerializer; -import org.apache.ignite.internal.codegen.IndexQueryResultMetaSerializer; -import org.apache.ignite.internal.codegen.IntLongMapSerializer; -import org.apache.ignite.internal.codegen.JobStealingRequestSerializer; -import org.apache.ignite.internal.codegen.LatchAckMessageSerializer; -import org.apache.ignite.internal.codegen.MetadataRequestMessageSerializer; -import org.apache.ignite.internal.codegen.MetadataResponseMessageSerializer; -import org.apache.ignite.internal.codegen.MissingMappingRequestMessageSerializer; -import org.apache.ignite.internal.codegen.MissingMappingResponseMessageSerializer; -import org.apache.ignite.internal.codegen.NearCacheUpdatesSerializer; -import org.apache.ignite.internal.codegen.NodeFullMetricsMessageSerializer; -import org.apache.ignite.internal.codegen.NodeIdMessageSerializer; -import org.apache.ignite.internal.codegen.NodeMetricsMessageSerializer; -import org.apache.ignite.internal.codegen.PartitionReservationsMapSerializer; -import org.apache.ignite.internal.codegen.PartitionUpdateCountersMessageSerializer; -import org.apache.ignite.internal.codegen.PartitionsToReloadSerializer; -import org.apache.ignite.internal.codegen.RecoveryLastReceivedMessageSerializer; -import org.apache.ignite.internal.codegen.SchemaOperationStatusMessageSerializer; -import org.apache.ignite.internal.codegen.ServiceDeploymentProcessIdSerializer; -import org.apache.ignite.internal.codegen.ServiceSingleNodeDeploymentResultBatchSerializer; -import org.apache.ignite.internal.codegen.SessionChannelMessageSerializer; -import org.apache.ignite.internal.codegen.SnapshotFilesFailureMessageSerializer; -import org.apache.ignite.internal.codegen.SnapshotFilesRequestMessageSerializer; -import org.apache.ignite.internal.codegen.TcpInverseConnectionResponseMessageSerializer; -import org.apache.ignite.internal.codegen.TransactionAttributesAwareRequestSerializer; -import org.apache.ignite.internal.codegen.TxEntriesInfoSerializer; -import org.apache.ignite.internal.codegen.TxEntryValueHolderSerializer; -import org.apache.ignite.internal.codegen.TxInfoSerializer; -import org.apache.ignite.internal.codegen.TxLockListSerializer; -import org.apache.ignite.internal.codegen.TxLockSerializer; -import org.apache.ignite.internal.codegen.TxLocksRequestSerializer; -import org.apache.ignite.internal.codegen.TxLocksResponseSerializer; -import org.apache.ignite.internal.codegen.UUIDCollectionMessageSerializer; -import org.apache.ignite.internal.codegen.UpdateErrorsSerializer; -import org.apache.ignite.internal.codegen.UserAuthenticateRequestMessageSerializer; -import org.apache.ignite.internal.codegen.UserAuthenticateResponseMessageSerializer; -import org.apache.ignite.internal.codegen.UserManagementOperationFinishedMessageSerializer; -import org.apache.ignite.internal.codegen.WalStateAckMessageSerializer; +import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyTypeSettingsSerializer; import org.apache.ignite.internal.managers.checkpoint.GridCheckpointRequest; +import org.apache.ignite.internal.managers.checkpoint.GridCheckpointRequestSerializer; import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean; import org.apache.ignite.internal.managers.deployment.GridDeploymentRequest; import org.apache.ignite.internal.managers.deployment.GridDeploymentResponse; +import org.apache.ignite.internal.managers.deployment.GridDeploymentResponseSerializer; import org.apache.ignite.internal.managers.encryption.GenerateEncryptionKeyRequest; +import org.apache.ignite.internal.managers.encryption.GenerateEncryptionKeyRequestSerializer; import org.apache.ignite.internal.managers.encryption.GenerateEncryptionKeyResponse; import org.apache.ignite.internal.managers.eventstorage.GridEventStorageMessage; +import org.apache.ignite.internal.managers.eventstorage.GridEventStorageMessageSerializer; import org.apache.ignite.internal.processors.authentication.UserAuthenticateRequestMessage; +import org.apache.ignite.internal.processors.authentication.UserAuthenticateRequestMessageSerializer; import org.apache.ignite.internal.processors.authentication.UserAuthenticateResponseMessage; +import org.apache.ignite.internal.processors.authentication.UserAuthenticateResponseMessageSerializer; import org.apache.ignite.internal.processors.authentication.UserManagementOperationFinishedMessage; +import org.apache.ignite.internal.processors.authentication.UserManagementOperationFinishedMessageSerializer; import org.apache.ignite.internal.processors.cache.CacheEntryInfoCollection; +import org.apache.ignite.internal.processors.cache.CacheEntryInfoCollectionSerializer; import org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapter; +import org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapterSerializer; import org.apache.ignite.internal.processors.cache.CacheEvictionEntry; +import org.apache.ignite.internal.processors.cache.CacheEvictionEntrySerializer; import org.apache.ignite.internal.processors.cache.CacheInvokeDirectResult; +import org.apache.ignite.internal.processors.cache.CacheInvokeDirectResultSerializer; import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo; +import org.apache.ignite.internal.processors.cache.GridCacheEntryInfoSerializer; import org.apache.ignite.internal.processors.cache.GridCacheReturn; +import org.apache.ignite.internal.processors.cache.GridCacheReturnSerializer; import org.apache.ignite.internal.processors.cache.GridChangeGlobalStateMessageResponse; +import org.apache.ignite.internal.processors.cache.GridChangeGlobalStateMessageResponseSerializer; import org.apache.ignite.internal.processors.cache.WalStateAckMessage; +import org.apache.ignite.internal.processors.cache.WalStateAckMessageSerializer; import org.apache.ignite.internal.processors.cache.binary.BinaryMetadataVersionInfo; +import org.apache.ignite.internal.processors.cache.binary.BinaryMetadataVersionInfoSerializer; import org.apache.ignite.internal.processors.cache.binary.MetadataRequestMessage; +import org.apache.ignite.internal.processors.cache.binary.MetadataRequestMessageSerializer; import org.apache.ignite.internal.processors.cache.binary.MetadataResponseMessage; +import org.apache.ignite.internal.processors.cache.binary.MetadataResponseMessageSerializer; import org.apache.ignite.internal.processors.cache.distributed.GridCacheTtlUpdateRequest; +import org.apache.ignite.internal.processors.cache.distributed.GridCacheTtlUpdateRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxRecoveryRequest; +import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxRecoveryRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxRecoveryResponse; +import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxRecoveryResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockRequest; +import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockResponse; +import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishRequest; +import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishResponse; +import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest; +import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareResponse; +import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.GridNearUnlockRequest; +import org.apache.ignite.internal.processors.cache.distributed.GridNearUnlockRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentResponse; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockResponse; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishResponse; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxOnePhaseCommitAckRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxOnePhaseCommitAckRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnlockRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnlockRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.PartitionUpdateCountersMessage; +import org.apache.ignite.internal.processors.cache.distributed.dht.PartitionUpdateCountersMessageSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.TransactionAttributesAwareRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.TransactionAttributesAwareRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.AtomicApplicationAttributesAwareRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.AtomicApplicationAttributesAwareRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicDeferredUpdateResponse; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicDeferredUpdateResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicNearResponse; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicNearResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicSingleUpdateRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicSingleUpdateRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateResponse; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicCheckUpdateRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicCheckUpdateRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicFullUpdateRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicFullUpdateRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicSingleUpdateFilterRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicSingleUpdateFilterRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicSingleUpdateInvokeRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicSingleUpdateInvokeRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicSingleUpdateRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicSingleUpdateRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateResponse; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.NearCacheUpdates; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.NearCacheUpdatesSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.UpdateErrors; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.UpdateErrorsSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.CacheGroupAffinityMessage; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.CacheGroupAffinityMessageSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.CachePartitionFullCountersMap; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.CachePartitionFullCountersMapSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.CachePartitionPartialCountersMap; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.CachePartitionPartialCountersMapSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.CachePartitionsToReloadMap; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.CachePartitionsToReloadMapSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysResponse; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandMessage; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandMessageSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeIdSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessage; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessageSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessageSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessageSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GroupPartitionIdPair; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GroupPartitionIdPairSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtDemandedPartitionsMap; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtDemandedPartitionsMapSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionCountersMap; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionCountersMapSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionHistorySuppliersMap; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionHistorySuppliersMapSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionsToReloadMap; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionsToReloadMapSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IntLongMap; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IntLongMapSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.PartitionReservationsMap; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.PartitionReservationsMapSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.PartitionsToReload; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.PartitionsToReloadSerializer; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.latch.LatchAckMessage; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.latch.LatchAckMessageSerializer; import org.apache.ignite.internal.processors.cache.distributed.near.CacheVersionedValue; +import org.apache.ignite.internal.processors.cache.distributed.near.CacheVersionedValueSerializer; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetResponse; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockRequest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponse; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearSingleGetRequest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearSingleGetRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearSingleGetResponse; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearSingleGetResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishRequest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishResponse; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishResponseSerializer; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequestSerializer; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponseSerializer; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotAwareMessage; +import org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotAwareMessageSerializer; import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotFilesFailureMessage; +import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotFilesFailureMessageSerializer; import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotFilesRequestMessage; +import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotFilesRequestMessageSerializer; import org.apache.ignite.internal.processors.cache.query.GridCacheQueryRequest; +import org.apache.ignite.internal.processors.cache.query.GridCacheQueryRequestSerializer; import org.apache.ignite.internal.processors.cache.query.GridCacheQueryResponse; +import org.apache.ignite.internal.processors.cache.query.GridCacheQueryResponseSerializer; import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery; +import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuerySerializer; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryBatchAck; +import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryBatchAckSerializer; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEntry; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey; +import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKeySerializer; import org.apache.ignite.internal.processors.cache.transactions.TxEntryValueHolder; +import org.apache.ignite.internal.processors.cache.transactions.TxEntryValueHolderSerializer; import org.apache.ignite.internal.processors.cache.transactions.TxLock; import org.apache.ignite.internal.processors.cache.transactions.TxLockList; +import org.apache.ignite.internal.processors.cache.transactions.TxLockListSerializer; +import org.apache.ignite.internal.processors.cache.transactions.TxLockSerializer; import org.apache.ignite.internal.processors.cache.transactions.TxLocksRequest; +import org.apache.ignite.internal.processors.cache.transactions.TxLocksRequestSerializer; import org.apache.ignite.internal.processors.cache.transactions.TxLocksResponse; +import org.apache.ignite.internal.processors.cache.transactions.TxLocksResponseSerializer; import org.apache.ignite.internal.processors.cache.version.GridCacheRawVersionedEntry; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx; +import org.apache.ignite.internal.processors.cache.version.GridCacheVersionExSerializer; +import org.apache.ignite.internal.processors.cache.version.GridCacheVersionSerializer; import org.apache.ignite.internal.processors.cluster.CacheMetricsMessage; +import org.apache.ignite.internal.processors.cluster.CacheMetricsMessageSerializer; import org.apache.ignite.internal.processors.cluster.ClusterMetricsUpdateMessage; +import org.apache.ignite.internal.processors.cluster.ClusterMetricsUpdateMessageSerializer; import org.apache.ignite.internal.processors.cluster.NodeFullMetricsMessage; +import org.apache.ignite.internal.processors.cluster.NodeFullMetricsMessageSerializer; import org.apache.ignite.internal.processors.cluster.NodeMetricsMessage; +import org.apache.ignite.internal.processors.cluster.NodeMetricsMessageSerializer; import org.apache.ignite.internal.processors.continuous.ContinuousRoutineStartResultMessage; +import org.apache.ignite.internal.processors.continuous.ContinuousRoutineStartResultMessageSerializer; import org.apache.ignite.internal.processors.continuous.GridContinuousMessage; import org.apache.ignite.internal.processors.datastreamer.DataStreamerEntry; import org.apache.ignite.internal.processors.datastreamer.DataStreamerRequest; import org.apache.ignite.internal.processors.datastreamer.DataStreamerResponse; import org.apache.ignite.internal.processors.marshaller.MissingMappingRequestMessage; +import org.apache.ignite.internal.processors.marshaller.MissingMappingRequestMessageSerializer; import org.apache.ignite.internal.processors.marshaller.MissingMappingResponseMessage; +import org.apache.ignite.internal.processors.marshaller.MissingMappingResponseMessageSerializer; import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryCancelRequest; +import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryCancelRequestSerializer; import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryFailResponse; +import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryFailResponseSerializer; import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageRequest; +import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageRequestSerializer; import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageResponse; +import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryNextPageResponseSerializer; import org.apache.ignite.internal.processors.query.messages.GridQueryKillRequest; +import org.apache.ignite.internal.processors.query.messages.GridQueryKillRequestSerializer; import org.apache.ignite.internal.processors.query.messages.GridQueryKillResponse; +import org.apache.ignite.internal.processors.query.messages.GridQueryKillResponseSerializer; import org.apache.ignite.internal.processors.query.schema.message.SchemaOperationStatusMessage; +import org.apache.ignite.internal.processors.query.schema.message.SchemaOperationStatusMessageSerializer; import org.apache.ignite.internal.processors.query.stat.messages.StatisticsColumnData; import org.apache.ignite.internal.processors.query.stat.messages.StatisticsDecimalMessage; import org.apache.ignite.internal.processors.query.stat.messages.StatisticsKeyMessage; @@ -311,22 +296,33 @@ import org.apache.ignite.internal.processors.query.stat.messages.StatisticsRequest; import org.apache.ignite.internal.processors.query.stat.messages.StatisticsResponse; import org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultRequest; +import org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultRequestSerializer; import org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultResponse; +import org.apache.ignite.internal.processors.rest.handlers.task.GridTaskResultResponseSerializer; import org.apache.ignite.internal.processors.service.ServiceDeploymentProcessId; +import org.apache.ignite.internal.processors.service.ServiceDeploymentProcessIdSerializer; import org.apache.ignite.internal.processors.service.ServiceSingleNodeDeploymentResult; import org.apache.ignite.internal.processors.service.ServiceSingleNodeDeploymentResultBatch; +import org.apache.ignite.internal.processors.service.ServiceSingleNodeDeploymentResultBatchSerializer; import org.apache.ignite.internal.util.GridByteArrayList; import org.apache.ignite.internal.util.UUIDCollectionMessage; +import org.apache.ignite.internal.util.UUIDCollectionMessageSerializer; import org.apache.ignite.internal.util.distributed.SingleNodeMessage; import org.apache.ignite.plugin.extensions.communication.MessageFactory; import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider; import org.apache.ignite.spi.collision.jobstealing.JobStealingRequest; +import org.apache.ignite.spi.collision.jobstealing.JobStealingRequestSerializer; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.communication.tcp.internal.TcpInverseConnectionResponseMessage; +import org.apache.ignite.spi.communication.tcp.internal.TcpInverseConnectionResponseMessageSerializer; import org.apache.ignite.spi.communication.tcp.messages.HandshakeMessage; +import org.apache.ignite.spi.communication.tcp.messages.HandshakeMessageSerializer; import org.apache.ignite.spi.communication.tcp.messages.HandshakeWaitMessage; +import org.apache.ignite.spi.communication.tcp.messages.HandshakeWaitMessageSerializer; import org.apache.ignite.spi.communication.tcp.messages.NodeIdMessage; +import org.apache.ignite.spi.communication.tcp.messages.NodeIdMessageSerializer; import org.apache.ignite.spi.communication.tcp.messages.RecoveryLastReceivedMessage; +import org.apache.ignite.spi.communication.tcp.messages.RecoveryLastReceivedMessageSerializer; /** * Message factory implementation. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java index 9a256cd116975..65afd74f4d1b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java @@ -29,8 +29,8 @@ public class GridIoSecurityAwareMessage extends GridIoMessage { public static final short TYPE_CODE = 174; /** Security subject ID that will be used during message processing on a remote node. */ - @Order(value = 8, method = "securitySubjectId") - private UUID secSubjId; + @Order(8) + UUID secSubjId; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java index 6e680ee87b7c9..45f46a12be32e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java @@ -33,7 +33,7 @@ public class SessionChannelMessage implements Message { /** Channel session unique identifier. */ @Order(0) - private IgniteUuid sesId; + IgniteUuid sesId; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java index a788ffb70c78e..00e2978130e09 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java @@ -28,15 +28,15 @@ public class GridDeploymentResponse implements Message { /** Result state. */ @Order(0) - private boolean success; + boolean success; /** */ - @Order(value = 1, method = "errorMessage") - private String errMsg; + @Order(1) + String errMsg; /** Raw class/resource/task. */ - @Order(value = 2, method = "byteSource") - private GridByteArrayList byteSrc; + @Order(2) + GridByteArrayList byteSrc; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java index 753f00569c5cf..d188ac507048a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java @@ -17,64 +17,64 @@ package org.apache.ignite.internal.managers.discovery; -import org.apache.ignite.internal.codegen.DiscoveryDataPacketSerializer; -import org.apache.ignite.internal.codegen.InetAddressMessageSerializer; -import org.apache.ignite.internal.codegen.InetSocketAddressMessageSerializer; -import org.apache.ignite.internal.codegen.NodeSpecificDataSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryAuthFailedMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryCacheMetricsMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryCheckFailedMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryClientAckResponseSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryClientMetricsUpdateMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryClientNodesMetricsMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryClientPingRequestSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryClientPingResponseSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryConnectionCheckMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryDiscardMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryDuplicateIdMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryHandshakeRequestSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryHandshakeResponseSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryLoopbackProblemMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryMetricsUpdateMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryNodeAddFinishedMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryNodeFailedMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryNodeFullMetricsMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryNodeLeftMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryNodeMetricsMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryPingRequestSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryPingResponseSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryRingLatencyCheckMessageSerializer; -import org.apache.ignite.internal.codegen.TcpDiscoveryStatusCheckMessageSerializer; import org.apache.ignite.plugin.extensions.communication.MessageFactory; import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider; import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket; +import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacketSerializer; import org.apache.ignite.spi.discovery.tcp.messages.InetAddressMessage; +import org.apache.ignite.spi.discovery.tcp.messages.InetAddressMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.InetSocketAddressMessage; +import org.apache.ignite.spi.discovery.tcp.messages.InetSocketAddressMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.NodeSpecificData; +import org.apache.ignite.spi.discovery.tcp.messages.NodeSpecificDataSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAuthFailedMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAuthFailedMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCacheMetricsMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCacheMetricsMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientAckResponse; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientAckResponseSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientMetricsUpdateMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientMetricsUpdateMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientNodesMetricsMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientNodesMetricsMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingRequest; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingRequestSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingResponse; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryClientPingResponseSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryConnectionCheckMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryConnectionCheckMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDiscardMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDiscardMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDuplicateIdMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDuplicateIdMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeRequest; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeRequestSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeResponse; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryHandshakeResponseSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryLoopbackProblemMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryLoopbackProblemMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryMetricsUpdateMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryMetricsUpdateMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeFailedMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeFailedMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeFullMetricsMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeFullMetricsMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeLeftMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeLeftMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeMetricsMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeMetricsMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingRequest; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingRequestSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingResponse; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingResponseSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryRingLatencyCheckMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryRingLatencyCheckMessageSerializer; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusCheckMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusCheckMessageSerializer; /** Message factory for discovery messages. */ public class DiscoveryMessageFactory implements MessageFactoryProvider { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java index c76967c4d086f..fff70b5d84166 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java @@ -28,11 +28,11 @@ public class GenerateEncryptionKeyRequest implements Message { /** Request ID. */ @Order(0) - private IgniteUuid id; + IgniteUuid id; /** */ - @Order(value = 1, method = "keyCount") - private int keyCnt; + @Order(1) + int keyCnt; /** */ public GenerateEncryptionKeyRequest() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java index 6bcf91275e769..70a6898cc848e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java @@ -43,47 +43,47 @@ public class GridEventStorageMessage implements Message { private Object resTopic; /** */ - @Order(value = 0, method = "responseTopicBytes") - private byte[] resTopicBytes; + @Order(0) + byte[] resTopicBytes; /** */ private IgnitePredicate filter; /** */ - @Order(value = 1, method = "filterBytes") - private byte[] filterBytes; + @Order(1) + byte[] filterBytes; /** */ private Collection evts; /** */ - @Order(value = 2, method = "eventsBytes") - private byte[] evtsBytes; + @Order(2) + byte[] evtsBytes; /** */ - @Order(value = 3, method = "errorMessage") - private ErrorMessage errMsg; + @Order(3) + ErrorMessage errMsg; /** */ - @Order(value = 4, method = "classLoaderId") - private IgniteUuid clsLdrId; + @Order(4) + IgniteUuid clsLdrId; /** */ - @Order(value = 5, method = "deploymentMode") - private DeploymentMode depMode; + @Order(5) + DeploymentMode depMode; /** */ - @Order(value = 6, method = "filterClassName") - private String filterClsName; + @Order(6) + String filterClsName; /** */ - @Order(value = 7, method = "userVersion") - private String userVer; + @Order(7) + String userVer; /** Node class loader participants. */ @GridToStringInclude - @Order(value = 8, method = "loaderParticipants") - private Map ldrParties; + @Order(8) + Map ldrParties; /** */ public GridEventStorageMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java index 55e44dfa66f4e..45c1a9561fa83 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java @@ -28,15 +28,15 @@ public class UserAuthenticateRequestMessage implements Message { /** User name. */ @Order(0) - private String name; + String name; /** User password. */ - @Order(value = 1, method = "password") - private String passwd; + @Order(1) + String passwd; /** Request ID. */ @Order(2) - private IgniteUuid id; + IgniteUuid id; /** * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java index e145224257701..ea8fa323ae8ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java @@ -28,11 +28,11 @@ public class UserAuthenticateResponseMessage implements Message { /** Request ID. */ @Order(0) - private IgniteUuid id; + IgniteUuid id; /** Error message. */ - @Order(value = 1, method = "errorMessage") - private String errMsg; + @Order(1) + String errMsg; /** * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java index 079a78322414b..1132b1eca310c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java @@ -28,12 +28,12 @@ */ public class UserManagementOperationFinishedMessage implements Message { /** Operation Id. */ - @Order(value = 0, method = "operationId") - private IgniteUuid opId; + @Order(0) + IgniteUuid opId; /** Error message. */ - @Order(value = 1, method = "errorMessage") - private String errorMsg; + @Order(1) + String errorMsg; /** * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java index 2997b9c57e36d..6618e19e7db5d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java @@ -26,7 +26,7 @@ public class CacheEntryInfoCollection implements Message { /** */ @Order(0) - private List infos = new ArrayList<>(); + List infos = new ArrayList<>(); /** * Sets entries. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java index c58bdba94008f..28dbacd802684 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java @@ -46,8 +46,8 @@ public class CacheEntryPredicateAdapter implements CacheEntryPredicate { /** */ @GridToStringInclude - @Order(value = 1, method = "value") - @Nullable private CacheObject val; + @Order(1) + @Nullable CacheObject val; /** */ public CacheEntryPredicateAdapter() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java index 1057111392228..594acdb3d334b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java @@ -30,16 +30,16 @@ public class CacheEvictionEntry implements Message { /** */ @Order(0) @GridToStringInclude - private KeyCacheObject key; + KeyCacheObject key; /** */ - @Order(value = 1, method = "version") + @Order(1) @GridToStringInclude - private GridCacheVersion ver; + GridCacheVersion ver; /** */ @Order(2) - private boolean near; + boolean near; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java index 1a13b532a96a9..723a3f6169e8b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java @@ -33,7 +33,7 @@ public class CacheInvokeDirectResult implements Message { /** Cache key. */ @Order(0) - private KeyCacheObject key; + KeyCacheObject key; /** */ @GridToStringInclude @@ -41,13 +41,13 @@ public class CacheInvokeDirectResult implements Message { /** Result. */ @GridToStringInclude - @Order(value = 1, method = "result") - private CacheObject res; + @Order(1) + CacheObject res; /** Error message. */ @GridToStringInclude(sensitive = true) - @Order(value = 2, method = "errorMessage") - private ErrorMessage errMsg; + @Order(2) + ErrorMessage errMsg; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java index e827304dda3de..18ddc901c9bce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java @@ -35,27 +35,27 @@ public class GridCacheEntryInfo implements Message { /** Cache key. */ @Order(0) @GridToStringInclude - private KeyCacheObject key; + KeyCacheObject key; /** Cache ID. */ @Order(1) - private int cacheId; + int cacheId; /** Cache value. */ - @Order(value = 2, method = "value") - private CacheObject val; + @Order(2) + CacheObject val; /** Time to live. */ @Order(3) - private long ttl; + long ttl; /** Expiration time. */ @Order(4) - private long expireTime; + long expireTime; /** Entry version. */ - @Order(value = 5, method = "version") - private GridCacheVersion ver; + @Order(5) + GridCacheVersion ver; /** New flag. */ private boolean isNew; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java index c8b20778c439a..b456d623f9ab9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java @@ -30,8 +30,8 @@ public abstract class GridCacheGroupIdMessage extends GridCacheMessage { /** Cache group ID. */ @GridToStringInclude - @Order(value = 3, method = "groupId") - protected int grpId; + @Order(3) + public int grpId; /** * @return Cache group ID. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java index deed796f84f7e..e7aac72ec7646 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java @@ -31,7 +31,7 @@ public abstract class GridCacheIdMessage extends GridCacheMessage { /** Cache ID. */ @GridToStringInclude @Order(3) - protected int cacheId; + public int cacheId; /** * @return Cache ID. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java index c17fa7ac9fba1..7bb9549558772 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java @@ -59,18 +59,18 @@ public abstract class GridCacheMessage implements Message { private static final long NULL_MSG_ID = -1; /** ID of this message. */ - @Order(value = 0, method = "messageId") - private long msgId = NULL_MSG_ID; + @Order(0) + public long msgId = NULL_MSG_ID; /** */ @GridToStringInclude - @Order(value = 1, method = "deployInfo") - private GridDeploymentInfoBean depInfo; + @Order(1) + public GridDeploymentInfoBean depInfo; /** */ @GridToStringInclude - @Order(value = 2, method = "lastAffinityChangedTopologyVersion") - private @Nullable AffinityTopologyVersion lastAffChangedTopVer; + @Order(2) + @Nullable public AffinityTopologyVersion lastAffChangedTopVer; /** */ protected boolean addDepInfo; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java index 1c392d3362e19..c6c6c70ae5ab9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java @@ -43,27 +43,27 @@ public class GridCacheReturn implements Message { private volatile Object v; /** Cache object. */ - @Order(value = 0, method = "cacheObject") - private @Nullable CacheObject cacheObj; + @Order(0) + @Nullable CacheObject cacheObj; /** Invoke direct results. */ - @Order(value = 1, method = "invokeDirectResults") - private @Nullable Collection invokeResCol; + @Order(1) + @Nullable Collection invokeResCol; /** Success flag. */ @Order(2) - private volatile boolean success; + volatile boolean success; /** Invoke result flag. */ - @Order(value = 3, method = "invokeResult") - private volatile boolean invokeRes; + @Order(3) + volatile boolean invokeRes; /** Local result flag, if non local then do not need unwrap cache objects. */ private boolean loc; /** Cache Id. */ @Order(4) - private int cacheId; + int cacheId; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java index bb184eb883382..dd7d4749344ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java @@ -28,12 +28,12 @@ */ public class GridChangeGlobalStateMessageResponse extends GridCacheMessage { /** Request id. */ - @Order(value = 3, method = "requestId") - private UUID reqId; + @Order(3) + UUID reqId; /** Activation error message. */ - @Order(value = 4, method = "errorMessage") - private ErrorMessage errMsg; + @Order(4) + ErrorMessage errMsg; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java index 86c96ce9a4f98..ae3fb550c6640 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java @@ -28,20 +28,20 @@ */ public class WalStateAckMessage implements Message { /** Operation ID. */ - @Order(value = 0, method = "operationId") - private UUID opId; + @Order(0) + UUID opId; /** Affinity node flag. */ @Order(1) - private boolean affNode; + boolean affNode; /** Operation result. */ @Order(2) - private boolean changed; + boolean changed; /** Error message. */ - @Order(value = 3, method = "errorMessage") - private String errMsg; + @Order(3) + String errMsg; /** Sender node ID. */ private UUID sndNodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java index 88aff49bdd498..864cd416e4c93 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataVersionInfo.java @@ -43,21 +43,21 @@ public final class BinaryMetadataVersionInfo implements Serializable, Message { /** Serialized binary metadata. */ @Order(0) - private transient byte[] metadataBytes; + transient byte[] metadataBytes; /** * The version of metadata that has been proposed for update. This represents how many unique updates have been issued * for this type. When a metadata update is proposed, this version is incremented. */ - @Order(value = 1, method = "pendingVersion") - private int pendingVer; + @Order(1) + int pendingVer; /** * The version of metadata that has been accepted by the entire cluster. * This represents the number of updates that have been confirmed across all nodes. */ - @Order(value = 2, method = "acceptedVersion") - private int acceptedVer; + @Order(2) + int acceptedVer; /** A flag indicating whether the metadata is currently being removed. */ private final transient boolean removing; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java index 8d21d50d29ecc..99ad492481b82 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java @@ -33,7 +33,7 @@ public class MetadataRequestMessage implements Message { /** */ @Order(0) - private int typeId; + int typeId; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java index 160162e58f583..5d75c7a280df9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java @@ -26,11 +26,11 @@ public class MetadataResponseMessage implements Message { /** Type ID. */ @Order(0) - private int typeId; + int typeId; /** Binary metadata version info. */ - @Order(value = 1, method = "metadataVersionInfo") - private BinaryMetadataVersionInfo metaVerInfo; + @Order(1) + BinaryMetadataVersionInfo metaVerInfo; /** */ public MetadataResponseMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java index d81d51ea8a7c7..9ee1dc93dcaaa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java @@ -38,28 +38,28 @@ public class GridCacheTtlUpdateRequest extends GridCacheIdMessage { /** Entries keys. */ @GridToStringInclude @Order(4) - private List keys; + List keys; /** Entries versions. */ - @Order(value = 5, method = "versions") - private List vers; + @Order(5) + List vers; /** Near entries keys. */ @GridToStringInclude @Order(6) - private List nearKeys; + List nearKeys; /** Near entries versions. */ - @Order(value = 7, method = "nearVersions") - private List nearVers; + @Order(7) + List nearVers; /** New TTL. */ @Order(8) - private long ttl; + long ttl; /** Topology version. */ - @Order(value = 9, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(9) + AffinityTopologyVersion topVer; /** * Required empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java index 53801551afef3..250a36305c8b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java @@ -30,28 +30,28 @@ */ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage { /** Future ID. */ - @Order(value = 7, method = "futureId") - private IgniteUuid futId; + @Order(7) + IgniteUuid futId; /** Mini future ID. */ @Order(8) - private IgniteUuid miniId; + IgniteUuid miniId; /** Near transaction ID. */ - @Order(value = 9, method = "nearXidVersion") - private GridCacheVersion nearXidVer; + @Order(9) + GridCacheVersion nearXidVer; /** Expected number of transactions on node. */ - @Order(value = 10, method = "transactions") - private int txNum; + @Order(10) + int txNum; /** System transaction flag. */ - @Order(value = 11, method = "system") - private boolean sys; + @Order(11) + boolean sys; /** {@code True} if should check only tx on near node. */ @Order(12) - private boolean nearTxCheck; + boolean nearTxCheck; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java index 4409185b823b9..01696ac60bf09 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java @@ -31,16 +31,16 @@ */ public class GridCacheTxRecoveryResponse extends GridDistributedBaseMessage implements IgniteTxStateAware { /** Future ID. */ - @Order(value = 7, method = "futureId") - private IgniteUuid futId; + @Order(7) + IgniteUuid futId; /** Mini future ID. */ @Order(8) - private IgniteUuid miniId; + IgniteUuid miniId; /** Flag indicating if all remote transactions were prepared. */ @Order(9) - private boolean success; + boolean success; /** Transient TX state. */ private IgniteTxState txState; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java index a4bb44cfa72dc..83d6dba9c0b5a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java @@ -33,19 +33,19 @@ public abstract class GridDistributedBaseMessage extends GridCacheIdMessage implements GridCacheDeployable, GridCacheVersionable { /** Lock or transaction version. */ - @Order(value = 4, method = "version") + @Order(4) @GridToStringInclude - protected GridCacheVersion ver; + public GridCacheVersion ver; /** Committed versions with order higher than one for this message (needed for commit ordering). */ - @Order(value = 5, method = "committedVersions") + @Order(5) @GridToStringInclude - private @Nullable Collection committedVers; + @Nullable public Collection committedVers; /** Rolled back versions with order higher than one for this message (needed for commit ordering). */ - @Order(value = 6, method = "rolledbackVersions") + @Order(6) @GridToStringInclude - private @Nullable Collection rolledbackVers; + @Nullable public Collection rolledbackVers; /** Count of keys referenced in candidates array (needed only locally for optimization). */ @GridToStringInclude diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java index caca8c405ce7f..a1b0a85ba9f6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java @@ -51,59 +51,59 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { /** Sender node ID. */ @Order(7) - private UUID nodeId; + public UUID nodeId; /** Near transaction version. */ - @Order(value = 8, method = "nearXidVersion") - private GridCacheVersion nearXidVer; + @Order(8) + public GridCacheVersion nearXidVer; /** Thread ID. */ @Order(9) - private long threadId; + public long threadId; /** Future ID. */ - @Order(value = 10, method = "futureId") - private IgniteUuid futId; + @Order(10) + public IgniteUuid futId; /** Max wait timeout. */ @Order(11) - private long timeout; + public long timeout; /** Indicates whether lock is obtained within a scope of transaction. */ - @Order(value = 12, method = "inTx") - private boolean isInTx; + @Order(12) + public boolean isInTx; /** Invalidate flag for transactions. */ @Order(13) - private boolean isInvalidate; + public boolean isInvalidate; /** Indicates whether implicit lock so for read or write operation. */ - @Order(value = 14, method = "txRead") - private boolean isRead; + @Order(14) + public boolean isRead; /** Transaction isolation level. */ @Order(15) - private TransactionIsolation isolation; + public TransactionIsolation isolation; /** Key bytes for keys to lock. */ @Order(16) - private List keys; + public List keys; /** Array indicating whether value should be returned for a key. */ - @Order(value = 17, method = "returnValues") + @Order(17) @GridToStringInclude - private boolean[] retVals; + public boolean[] retVals; /** Key-bytes index. */ protected int idx; /** Key count. */ @Order(18) - private int txSize; + public int txSize; /** Additional flags. */ @Order(19) - private byte flags; + public byte flags; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java index 5d91aa91d49f7..10fa4714dbcac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java @@ -38,17 +38,17 @@ @SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType") public class GridDistributedLockResponse extends GridDistributedBaseMessage { /** Future ID. */ - @Order(value = 7, method = "futureId") - private IgniteUuid futId; + @Order(7) + public IgniteUuid futId; /** Error. */ - @Order(value = 8, method = "errorMessage") - private ErrorMessage errMsg; + @Order(8) + public ErrorMessage errMsg; /** Values. */ @GridToStringInclude - @Order(value = 9, method = "values") - private List vals; + @Order(9) + public List vals; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java index 20fb93ad205de..ad3fd2704a88b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java @@ -56,48 +56,48 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i protected static final int STORE_ENABLED_FLAG_MASK = 0x20; /** Topology version. */ - @Order(value = 7, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(7) + public AffinityTopologyVersion topVer; /** Future ID. */ - @Order(value = 8, method = "futureId") - private IgniteUuid futId; + @Order(8) + public IgniteUuid futId; /** Thread ID. */ @Order(9) - private long threadId; + public long threadId; /** Commit version. */ - @Order(value = 10, method = "commitVersion") - private GridCacheVersion commitVer; + @Order(10) + public GridCacheVersion commitVer; /** Invalidate flag. */ - @Order(value = 11, method = "isInvalidate") - private boolean invalidate; + @Order(11) + public boolean invalidate; /** Commit flag. */ @Order(12) - private boolean commit; + public boolean commit; /** Min version used as base for completed versions. */ - @Order(value = 13, method = "baseVersion") - private GridCacheVersion baseVer; + @Order(13) + public GridCacheVersion baseVer; /** IO policy. */ - @Order(value = 14, method = "policy") - private byte plc; + @Order(14) + public byte plc; /** Task name hash. */ @Order(15) - private int taskNameHash; + public int taskNameHash; /** */ @Order(16) - private byte flags; + public byte flags; /** Write synchronization mode. */ - @Order(value = 17) - private CacheWriteSynchronizationMode syncMode; + @Order(17) + public CacheWriteSynchronizationMode syncMode; /** Transient TX state. */ private IgniteTxState txState; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java index 390cc43ea3e8b..abc0833fb5dd5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java @@ -31,16 +31,16 @@ */ public class GridDistributedTxFinishResponse extends GridCacheMessage { /** */ - @Order(value = 3, method = "xid") - private GridCacheVersion txId; + @Order(3) + public GridCacheVersion txId; /** Future ID. */ - @Order(value = 4, method = "futureId") - private IgniteUuid futId; + @Order(4) + public IgniteUuid futId; /** Partition ID this message is targeted to. */ - @Order(value = 5, method = "partition") - private int part; + @Order(5) + public int part; /** * Empty constructor required by {@link GridIoMessageFactory}. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index 59896638c750f..6de8034d6903d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -77,64 +77,64 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage /** Thread ID. */ @Order(7) @GridToStringInclude - private long threadId; + public long threadId; /** Transaction concurrency. */ @Order(8) @GridToStringInclude - private TransactionConcurrency concurrency; + public TransactionConcurrency concurrency; /** Transaction isolation. */ @Order(9) @GridToStringInclude - private TransactionIsolation isolation; + public TransactionIsolation isolation; /** Commit version for EC transactions. */ - @Order(value = 10, method = "writeVersion") + @Order(10) @GridToStringInclude - private GridCacheVersion writeVer; + public GridCacheVersion writeVer; /** Transaction timeout. */ @Order(11) @GridToStringInclude - private long timeout; + public long timeout; /** Transaction read set. */ @Order(12) @GridToStringInclude - private Collection reads; + public Collection reads; /** Transaction write entries. */ @Order(13) @GridToStringInclude - private Collection writes; + public Collection writes; /** DHT versions to verify. */ @GridToStringInclude private Map dhtVers; /** */ - @Order(value = 14, method = "dhtVersionKeys") - private Collection dhtVerKeys; + @Order(14) + public Collection dhtVerKeys; /** */ - @Order(value = 15, method = "dhtVersionValues") - private Collection dhtVerVals; + @Order(15) + public Collection dhtVerVals; /** Expected transaction size. */ @Order(16) - private int txSize; + public int txSize; /** Transaction nodes mapping (primary node -> related backup nodes). */ private Map> txNodes; /** Tx nodes direct marshallable message. */ - @Order(value = 17, method = "txNodesMessages") - private Map txNodesMsg; + @Order(17) + public Map txNodesMsg; /** IO policy. */ - @Order(value = 18, method = "policy") - private byte plc; + @Order(18) + public byte plc; /** Transient TX state. */ private IgniteTxState txState; @@ -142,7 +142,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage /** */ @Order(19) @GridToStringExclude - private byte flags; + public byte flags; /** Application attributes. */ @GridToStringExclude diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java index 446227578a820..0584e7521f72c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java @@ -34,15 +34,15 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage implements IgniteTxStateAware { /** Error message. */ @GridToStringExclude - @Order(value = 7, method = "errorMessage") - private @Nullable ErrorMessage errMsg; + @Order(7) + @Nullable public ErrorMessage errMsg; /** TX state. */ private IgniteTxState txState; /** Partition ID this message is targeted to. */ - @Order(value = 8, method = "partition") - private int part; + @Order(8) + public int part; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java index e5e2e8beb75a2..9e4a2de3b0348 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java @@ -34,7 +34,7 @@ public class GridNearUnlockRequest extends GridDistributedBaseMessage { /** Keys. */ @GridToStringInclude @Order(7) - private List keys; + public List keys; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java index ae3f39fce4bcd..3bcb6532ec220 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java @@ -31,15 +31,15 @@ public class GridDhtAffinityAssignmentRequest extends GridCacheGroupIdMessage { /** */ @Order(4) - private byte flags; + byte flags; /** */ - @Order(value = 5, method = "futureId") - private long futId; + @Order(5) + long futId; /** Topology version being queried. */ - @Order(value = 6, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(6) + AffinityTopologyVersion topVer; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java index fa46caa871c25..5703b59795340 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java @@ -38,40 +38,40 @@ */ public class GridDhtAffinityAssignmentResponse extends GridCacheGroupIdMessage { /** */ - @Order(value = 4, method = "futureId") - private long futId; + @Order(4) + long futId; /** Topology version. */ - @Order(value = 5, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(5) + AffinityTopologyVersion topVer; /** */ private List> affAssignmentIds; /** */ - @Order(value = 6, method = "affinityAssignmentIdsBytes") - private byte[] affAssignmentIdsBytes; + @Order(6) + byte[] affAssignmentIdsBytes; /** */ private List> idealAffAssignment; /** Affinity assignment bytes. */ - @Order(value = 7, method = "idealAffinityAssignmentsBytes") - private byte[] idealAffAssignmentBytes; + @Order(7) + byte[] idealAffAssignmentBytes; /** */ private GridDhtPartitionFullMap partMap; /** */ - @Order(value = 8, method = "partitionBytes") - private byte[] partBytes; + @Order(8) + byte[] partBytes; /** Indicates that getting required affinity assignments has been failed. */ private IgniteCheckedException affAssignmentErr; /** Serialized error. */ - @Order(value = 9, method = "affinityAssignmentsErrorBytes") - private byte[] affAssignmentErrBytes; + @Order(9) + byte[] affAssignmentErrBytes; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index 321417ed44e60..067dc4d0d1f8c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@ -42,11 +42,11 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { /** Invalidate reader flags. */ @Order(20) - private BitSet invalidateEntries; + BitSet invalidateEntries; /** Mini future ID. */ @Order(21) - private IgniteUuid miniId; + IgniteUuid miniId; /** Owner mapped version, if any. */ @GridToStringInclude @@ -55,32 +55,32 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { /** Array of keys from {@link #owned}. Used during marshalling and unmarshalling. */ @Order(22) @GridToStringExclude - private KeyCacheObject[] ownedKeys; + KeyCacheObject[] ownedKeys; /** Array of values from {@link #owned}. Used during marshalling and unmarshalling. */ @Order(23) @GridToStringExclude - private GridCacheVersion[] ownedValues; + GridCacheVersion[] ownedValues; /** Topology version. */ - @Order(value = 24, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(24) + AffinityTopologyVersion topVer; /** Task name hash. */ @Order(25) - private int taskNameHash; + int taskNameHash; /** Indexes of keys needed to be preloaded. */ @Order(26) - private BitSet preloadKeys; + BitSet preloadKeys; /** TTL for read operation. */ @Order(27) - private long accessTtl; + long accessTtl; /** Transaction label. */ - @Order(value = 28, method = "txLabel") - private String txLbl; + @Order(28) + String txLbl; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java index 30e7ad5754175..c1d48bcc03099 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java @@ -39,16 +39,16 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { /** Mini future ID. */ @Order(10) - private IgniteUuid miniId; + IgniteUuid miniId; /** Invalid partitions. */ @GridToStringInclude - @Order(value = 11, method = "invalidPartitions") - private Collection invalidParts; + @Order(11) + Collection invalidParts; /** Preload entries returned from backup. */ @Order(12) - private List preloadEntries; + List preloadEntries; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index 3b8c711bf6538..409ee4f24eb41 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -35,15 +35,15 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { /** Near node ID. */ @Order(18) - private UUID nearNodeId; + UUID nearNodeId; /** Mini future ID. */ @Order(19) - private int miniId; + int miniId; /** */ - @Order(value = 20, method = "updateCounters") - private Collection updCntrs; + @Order(20) + Collection updCntrs; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java index adbdb85d01b92..ae2e0f60452d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java @@ -35,19 +35,19 @@ public final class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { /** Mini future ID. */ @Order(6) - private int miniId; + int miniId; /** Error message. */ - @Order(value = 7, method = "checkCommittedErrorMessage") - private @Nullable ErrorMessage checkCommittedErrMsg; + @Order(7) + @Nullable ErrorMessage checkCommittedErrMsg; /** Cache return value. */ - @Order(value = 8, method = "returnValue") - private GridCacheReturn retVal; + @Order(8) + GridCacheReturn retVal; /** Flag indicating if this is a check-committed response. */ @Order(9) - private boolean checkCommitted; + boolean checkCommitted; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java index c0e6801376f84..189b4f22b93b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java @@ -30,7 +30,7 @@ public class GridDhtTxOnePhaseCommitAckRequest extends GridCacheMessage { /** Lock or transaction versions. */ @GridToStringInclude - @Order(value = 3, method = "versions") + @Order(3) protected Collection vers; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java index 250be9692be1e..211a662a84825 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java @@ -47,28 +47,28 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { /** Max order. */ @Order(20) - private UUID nearNodeId; + UUID nearNodeId; /** Future ID. */ - @Order(value = 21, method = "futureId") - private IgniteUuid futId; + @Order(21) + IgniteUuid futId; /** Mini future ID. */ @Order(22) - private int miniId; + int miniId; /** Topology version. */ - @Order(value = 23, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(23) + AffinityTopologyVersion topVer; /** Invalidate near entries flags. */ @Order(24) - private BitSet invalidateNearEntries; + BitSet invalidateNearEntries; /** Near writes. */ @Order(25) @GridToStringInclude - private Collection nearWrites; + Collection nearWrites; /** Owned versions by key. */ @GridToStringInclude @@ -76,39 +76,39 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { /** Owned keys. */ @Order(26) - private Collection ownedKeys; + Collection ownedKeys; /** Owned values. */ - @Order(value = 27, method = "ownedValues") - private Collection ownedVals; + @Order(27) + Collection ownedVals; /** */ - @Order(value = 28, method = "updateCounters") - private Collection updCntrs; + @Order(28) + Collection updCntrs; /** Near transaction ID. */ - @Order(value = 29, method = "nearXidVersion") - private GridCacheVersion nearXidVer; + @Order(29) + GridCacheVersion nearXidVer; /** Task name hash. */ @Order(30) - private int taskNameHash; + int taskNameHash; /** Preload keys. */ @Order(31) - private BitSet preloadKeys; + BitSet preloadKeys; /** */ private List nearWritesCacheMissed; /** {@code True} if remote tx should skip adding itself to completed versions map on finish. */ - @Order(value = 32, method = "skipCompletedVersion") - private boolean skipCompletedVers; + @Order(32) + boolean skipCompletedVers; /** Transaction label. */ - @Order(value = 33, method = "txLabel") + @Order(33) @GridToStringInclude - @Nullable private String txLbl; + @Nullable String txLbl; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java index 7d13e13a41d55..d8867bfd81610 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java @@ -41,23 +41,23 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { /** Evicted readers. */ @GridToStringInclude @Order(9) - private @Nullable Collection nearEvicted; + @Nullable Collection nearEvicted; /** Future ID. */ - @Order(value = 10, method = "futureId") - private IgniteUuid futId; + @Order(10) + IgniteUuid futId; /** Mini future ID. */ @Order(11) - private int miniId; + int miniId; /** Invalid partitions by cache ID. */ - @Order(value = 12, method = "invalidPartitions") - private @Nullable Map invalidParts; + @Order(12) + @Nullable Map invalidParts; /** Preload entries found on backup node. */ @Order(13) - private @Nullable List preloadEntries; + @Nullable List preloadEntries; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java index 14e2854c7a422..6f6a65082d0d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java @@ -32,7 +32,7 @@ public class GridDhtUnlockRequest extends GridNearUnlockRequest { /** Near keys. */ @Order(8) - private List nearKeys; + List nearKeys; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java index bf36020f1ee8b..3e58817ce2be8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java @@ -33,11 +33,11 @@ public class PartitionUpdateCountersMessage implements Message { /** Byte representation of partition counters. */ @Order(0) - private byte[] data; + byte[] data; /** */ @Order(1) - private int cacheId; + int cacheId; /** */ private int size; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java index f7ac69f85eafc..189aafe36c95a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java @@ -31,11 +31,11 @@ public class TransactionAttributesAwareRequest extends GridCacheMessage { /** Original transaction prepare message. */ @Order(3) - private GridDistributedTxPrepareRequest payload; + GridDistributedTxPrepareRequest payload; /** Application attributes. */ - @Order(value = 4, method = "applicationAttributes") - private Map appAttrs; + @Order(4) + Map appAttrs; /** */ public TransactionAttributesAwareRequest() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java index 3e95da8101182..dac5d7ccde67a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java @@ -30,11 +30,11 @@ public class AtomicApplicationAttributesAwareRequest extends GridCacheIdMessage /** Original update message. */ @Order(4) - private GridNearAtomicAbstractUpdateRequest payload; + GridNearAtomicAbstractUpdateRequest payload; /** Application attributes. */ - @Order(value = 5, method = "applicationAttributes") - private Map appAttrs; + @Order(5) + Map appAttrs; /** */ public AtomicApplicationAttributesAwareRequest() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java index e9e09cea3c6a4..380c43e3854e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java @@ -62,15 +62,15 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheIdMess public static final int CACHE_MSG_IDX = nextIndexId(); /** Future ID on primary. */ - @Order(value = 4, method = "futureId") + @Order(4) protected long futId; /** Write version. */ - @Order(value = 5, method = "writeVersion") + @Order(5) protected GridCacheVersion writeVer; /** Topology version. */ - @Order(value = 6, method = "topologyVersion") + @Order(6) protected AffinityTopologyVersion topVer; /** Task name hash. */ @@ -85,11 +85,11 @@ public abstract class GridDhtAtomicAbstractUpdateRequest extends GridCacheIdMess /** */ @Order(8) - private UUID nearNodeId; + UUID nearNodeId; /** */ - @Order(value = 9, method = "nearFutureId") - private long nearFutId; + @Order(9) + long nearFutId; /** Additional flags. */ @Order(10) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java index a2322cb4e4a0d..1a949a32bbb32 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java @@ -36,8 +36,8 @@ public class GridDhtAtomicDeferredUpdateResponse extends GridCacheIdMessage impl public static final int CACHE_MSG_IDX = nextIndexId(); /** ACK future versions. */ - @Order(value = 4, method = "futureIds") - private GridLongList futIds; + @Order(4) + GridLongList futIds; /** */ @GridToStringExclude diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java index 2c58e3c02f603..579ce307dcc5c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java @@ -39,26 +39,26 @@ public class GridDhtAtomicNearResponse extends GridCacheIdMessage { public static final int CACHE_MSG_IDX = nextIndexId(); /** */ - @Order(value = 4, method = "partition") - private int partId; + @Order(4) + int partId; /** */ - @Order(value = 5, method = "futureId") - private long futId; + @Order(5) + long futId; /** */ @Order(6) - private UUID primaryId; + UUID primaryId; /** */ @Order(7) @GridToStringExclude - private byte flags; + byte flags; /** */ - @Order(value = 8, method = "errors") + @Order(8) @GridToStringInclude - private UpdateErrors errs; + UpdateErrors errs; /** * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java index 4571d02ce056a..47fb12d26ef8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java @@ -47,16 +47,16 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat /** Value to update. */ @GridToStringInclude - @Order(value = 12, method = "value") + @Order(12) protected CacheObject val; /** Previous value. */ @GridToStringInclude - @Order(value = 13, method = "previousValue") + @Order(13) protected CacheObject prevVal; /** Partition. */ - @Order(value = 14, method = "updateCounter") + @Order(14) protected long updateCntr; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index 3c7fc5937af76..b7439c3a2c214 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -46,81 +46,81 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque /** Keys to update. */ @GridToStringInclude @Order(11) - private List keys; + List keys; /** Values to update. */ @GridToStringInclude - @Order(value = 12, method = "values") - private List vals; + @Order(12) + List vals; /** Previous values. */ @GridToStringInclude - @Order(value = 13, method = "previousValues") - private List prevVals; + @Order(13) + List prevVals; /** Conflict versions. */ - @Order(value = 14, method = "conflictVersions") - private List conflictVers; + @Order(14) + List conflictVers; /** TTLs. */ @Order(15) - private GridLongList ttls; + GridLongList ttls; /** Conflict expire time. */ @Order(16) - private GridLongList conflictExpireTimes; + GridLongList conflictExpireTimes; /** Near TTLs. */ @Order(17) - private GridLongList nearTtls; + GridLongList nearTtls; /** Near expire times. */ @Order(18) - private GridLongList nearExpireTimes; + GridLongList nearExpireTimes; /** Near cache keys to update. */ @GridToStringInclude @Order(19) - private List nearKeys; + List nearKeys; /** Values to update. */ @GridToStringInclude - @Order(value = 20, method = "nearValues") - private List nearVals; + @Order(20) + List nearVals; /** Obsolete near values. */ @GridToStringInclude @Order(21) - private List obsoleteIndexes; + List obsoleteIndexes; /** Force transform backups flag. */ @Order(22) - private boolean forceTransformBackups; + boolean forceTransformBackups; /** Entry processors. */ private List> entryProcessors; /** Entry processors bytes. */ @Order(23) - private List entryProcessorsBytes; + List entryProcessorsBytes; /** Near entry processors. */ private List> nearEntryProcessors; /** Near entry processors bytes. */ @Order(24) - private List nearEntryProcessorsBytes; + List nearEntryProcessorsBytes; /** Optional arguments for entry processor. */ private Object[] invokeArgs; /** Entry processor arguments bytes. */ - @Order(value = 25, method = "invokeArgumentsBytes") - private List invokeArgsBytes; + @Order(25) + List invokeArgsBytes; /** Partition. */ - @Order(value = 26, method = "updateCounters") - private GridLongList updateCntrs; + @Order(26) + GridLongList updateCntrs; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java index 4ba3453e8da49..687e5e0db172d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java @@ -38,21 +38,21 @@ public class GridDhtAtomicUpdateResponse extends GridCacheIdMessage implements G public static final int CACHE_MSG_IDX = nextIndexId(); /** Future version. */ - @Order(value = 4, method = "futureId") - private long futId; + @Order(4) + long futId; /** */ - @Order(value = 5, method = "errors") - private UpdateErrors errs; + @Order(5) + UpdateErrors errs; /** Evicted readers. */ @GridToStringInclude @Order(6) - private List nearEvicted; + List nearEvicted; /** */ - @Order(value = 7, method = "partition") - private int partId; + @Order(7) + int partId; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java index 2f4159640ab68..99e61a6c74b04 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java @@ -76,19 +76,19 @@ public abstract class GridNearAtomicAbstractUpdateRequest extends GridCacheIdMes protected UUID nodeId; /** Future version. */ - @Order(value = 4, method = "futureId") + @Order(4) protected long futId; /** Topology version. */ - @Order(value = 5, method = "topologyVersion") + @Order(5) protected AffinityTopologyVersion topVer; /** Cache update operation. */ - @Order(value = 6, method = "operation") + @Order(6) protected GridCacheOperation op; /** Write synchronization mode. */ - @Order(value = 7, method = "writeSynchronizationMode") + @Order(7) protected CacheWriteSynchronizationMode syncMode; /** Task name hash. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java index 78a11bf56d254..e288b13eb6f73 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java @@ -32,12 +32,12 @@ public class GridNearAtomicCheckUpdateRequest extends GridCacheIdMessage { private GridNearAtomicAbstractUpdateRequest updateReq; /** */ - @Order(value = 4, method = "partition") - private int partId; + @Order(4) + int partId; /** */ - @Order(value = 5, method = "futureId") - private long futId; + @Order(5) + long futId; /** * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java index a80d8d9961b33..55857aaa4c077 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java @@ -55,48 +55,48 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat /** Keys to update. */ @Order(10) @GridToStringInclude - private List keys; + List keys; /** Values to update. */ - @Order(value = 11, method = "valuesToUpdate") - private List vals; + @Order(11) + List vals; /** Entry processors. */ private List> entryProcessors; /** Entry processors bytes. */ @Order(12) - private @Nullable List entryProcessorsBytes; + @Nullable List entryProcessorsBytes; /** Conflict versions. */ - @Order(value = 13, method = "conflictVersions") - private @Nullable List conflictVers; + @Order(13) + @Nullable List conflictVers; /** Conflict TTLs. */ @Order(14) - private GridLongList conflictTtls; + GridLongList conflictTtls; /** Conflict expire times. */ @Order(15) - private GridLongList conflictExpireTimes; + GridLongList conflictExpireTimes; /** Optional arguments for entry processor. */ private @Nullable Object[] invokeArgs; /** Entry processor arguments bytes. */ - @Order(value = 16, method = "invokeArgumentsBytes") - private @Nullable List invokeArgsBytes; + @Order(16) + @Nullable List invokeArgsBytes; /** Expiry policy. */ private @Nullable ExpiryPolicy expiryPlc; /** Expiry policy bytes. */ - @Order(value = 17, method = "expiryPolicyBytes") - private @Nullable byte[] expiryPlcBytes; + @Order(17) + @Nullable byte[] expiryPlcBytes; /** Filter. */ @Order(18) - private @Nullable CacheEntryPredicate[] filter; + @Nullable CacheEntryPredicate[] filter; /** Maximum possible size of inner collections. */ private int initSize; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java index df39c01b127ae..8a215625f077c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java @@ -37,7 +37,7 @@ public class GridNearAtomicSingleUpdateFilterRequest extends GridNearAtomicSingleUpdateRequest { /** Filter. */ @Order(12) - private CacheEntryPredicate[] filter; + CacheEntryPredicate[] filter; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java index 68f3a9827f614..f1b329ea99e49 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java @@ -49,15 +49,15 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl private @Nullable Object[] invokeArgs; /** Entry processor arguments bytes. */ - @Order(value = 12, method = "invokeArgumentsBytes") - private @Nullable List invokeArgsBytes; + @Order(12) + @Nullable List invokeArgsBytes; /** Entry processors. */ private @Nullable EntryProcessor entryProc; /** Entry processors bytes. */ - @Order(value = 13, method = "entryProcessorBytes") - private @Nullable byte[] entryProcBytes; + @Order(13) + @Nullable byte[] entryProcBytes; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java index 0495ab8668cc6..7da56fdb284fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java @@ -53,7 +53,7 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractUpd protected KeyCacheObject key; /** Value to update. */ - @Order(value = 11, method = "value") + @Order(11) protected CacheObject val; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java index 11793c3437642..6767c19f76e39 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java @@ -47,34 +47,34 @@ public class GridNearAtomicUpdateResponse extends GridCacheIdMessage implements private UUID nodeId; /** Future ID. */ - @Order(value = 4, method = "futureId") - private long futId; + @Order(4) + long futId; /** */ - @Order(value = 5, method = "errors") - private UpdateErrors errs; + @Order(5) + UpdateErrors errs; /** Return value. */ @GridToStringInclude - @Order(value = 6, method = "returnValue") - private GridCacheReturn ret; + @Order(6) + GridCacheReturn ret; /** */ - @Order(value = 7, method = "remapTopologyVersion") - private AffinityTopologyVersion remapTopVer; + @Order(7) + AffinityTopologyVersion remapTopVer; /** Data for near cache update. */ @Order(8) - private NearCacheUpdates nearUpdates; + NearCacheUpdates nearUpdates; /** Partition ID. */ - @Order(value = 9, method = "partition") - private int partId; + @Order(9) + int partId; /** */ @GridToStringInclude @Order(10) - private List mapping; + List mapping; /** */ private boolean nodeLeft; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java index 650cd6c153db1..428dffb89baae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java @@ -33,29 +33,29 @@ */ public class NearCacheUpdates implements Message { /** Indexes of keys for which values were generated on primary node (used if originating node has near cache). */ - @Order(value = 0, method = "nearValuesIndexes") - private List nearValsIdxs; + @Order(0) + List nearValsIdxs; /** Indexes of keys for which update was skipped (used if originating node has near cache). */ - @Order(value = 1, method = "skippedIndexes") - private List nearSkipIdxs; + @Order(1) + List nearSkipIdxs; /** Values generated on primary node which should be put to originating node's near cache. */ @GridToStringInclude - @Order(value = 2, method = "nearValues") - private List nearVals; + @Order(2) + List nearVals; /** Version generated on primary node to be used for originating node's near cache update. */ - @Order(value = 3, method = "nearVersion") - private GridCacheVersion nearVer; + @Order(3) + GridCacheVersion nearVer; /** Near TTLs. */ @Order(4) - private GridLongList nearTtls; + GridLongList nearTtls; /** Near expire times. */ @Order(5) - private GridLongList nearExpireTimes; + GridLongList nearExpireTimes; /** * @return Values. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java index 7d1250a915f16..11a8b0e6dcba9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java @@ -38,11 +38,11 @@ public class UpdateErrors implements Message { /** Failed keys. */ @GridToStringInclude @Order(0) - private List failedKeys; + List failedKeys; /** Error message. */ - @Order(value = 1, method = "errorMessage") - private ErrorMessage errMsg; + @Order(1) + ErrorMessage errMsg; /** * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java index 0b5750b8cae2d..00b88604a51fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java @@ -40,16 +40,16 @@ */ public class CacheGroupAffinityMessage implements Message { /** */ - @Order(value = 0, method = "assignments") - private List assigns; + @Order(0) + List assigns; /** */ - @Order(value = 1, method = "idealAssignments") - private List idealAssigns; + @Order(1) + List idealAssigns; /** */ - @Order(value = 2, method = "assignmentsDiff") - private Map assignsDiff; + @Order(2) + Map assignsDiff; /** * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java index d5fb7ed1413c3..6e93abfe25b54 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java @@ -32,12 +32,12 @@ public class CachePartitionFullCountersMap implements Message { public static final short TYPE_CODE = 506; /** */ - @Order(value = 0, method = "initialUpdateCounters") - private long[] initUpdCntrs; + @Order(0) + long[] initUpdCntrs; /** */ - @Order(value = 1, method = "updateCounters") - private long[] updCntrs; + @Order(1) + long[] updCntrs; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java index eaf0593154e89..8691e3ef5b4a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionPartialCountersMap.java @@ -40,20 +40,20 @@ public class CachePartitionPartialCountersMap implements Serializable, Message { public static final CachePartitionPartialCountersMap EMPTY = new CachePartitionPartialCountersMap(); /** */ - @Order(value = 0, method = "partitionIds") - private int[] partIds; + @Order(0) + int[] partIds; /** */ - @Order(value = 1, method = "initialUpdateCounters") - private long[] initialUpdCntrs; + @Order(1) + long[] initialUpdCntrs; /** */ - @Order(value = 2, method = "updateCounters") - private long[] updCntrs; + @Order(2) + long[] updCntrs; /** */ - @Order(value = 3, method = "currentIndex") - private int curIdx; + @Order(3) + int curIdx; /** */ public CachePartitionPartialCountersMap() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionsToReloadMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionsToReloadMap.java index bcf6ab80c3a43..637238755c284 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionsToReloadMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionsToReloadMap.java @@ -29,8 +29,8 @@ public class CachePartitionsToReloadMap implements Message { public static final short TYPE_CODE = 512; /** Partition reload map for cache. */ - @Order(value = 0, method = "cachePartitions") - private Map map; + @Order(0) + Map map; /** * @return Partition reload map for cache. 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 9884832310696..7c323a019b77a 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 @@ -37,21 +37,21 @@ */ public class GridDhtForceKeysRequest extends GridCacheIdMessage implements GridCacheDeployable { /** Future ID. */ - @Order(value = 4, method = "futureId") - private IgniteUuid futId; + @Order(4) + IgniteUuid futId; /** Mini-future ID. */ @Order(5) - private IgniteUuid miniId; + IgniteUuid miniId; /** Keys to request. */ @Order(6) @GridToStringInclude - private Collection keys; + Collection keys; /** Topology version for which keys are requested. */ - @Order(value = 7, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(7) + AffinityTopologyVersion topVer; /** * Empty constructor. 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 e6f24aea5f8e0..deb45e8362121 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 @@ -40,26 +40,26 @@ */ public class GridDhtForceKeysResponse extends GridCacheIdMessage implements GridCacheDeployable { /** Future ID. */ - @Order(value = 4, method = "futureId") - private IgniteUuid futId; + @Order(4) + IgniteUuid futId; /** Mini-future ID. */ @Order(5) - private IgniteUuid miniId; + IgniteUuid miniId; /** Error message. */ - @Order(value = 6, method = "errorMessage") - @Nullable private volatile ErrorMessage errMsg; + @Order(6) + @Nullable volatile ErrorMessage errMsg; /** Missed (not found) keys. */ @GridToStringInclude @Order(7) - private List missedKeys; + List missedKeys; /** Cache entries. */ @GridToStringInclude - @Order(value = 8, method = "forcedInfos") - private List infos; + @Order(8) + List infos; /** * Empty constructor. 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 b06ce1df103a1..3b074137445ee 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 @@ -29,23 +29,23 @@ public class GridDhtPartitionDemandMessage extends GridCacheGroupIdMessage { /** Rebalance id. */ @Order(4) - private long rebalanceId; + long rebalanceId; /** Partitions map. */ - @Order(value = 5, method = "partitions") - private IgniteDhtDemandedPartitionsMap parts; + @Order(5) + IgniteDhtDemandedPartitionsMap parts; /** Timeout. */ @Order(6) - private long timeout; + long timeout; /** Worker ID. */ @Order(7) - private int workerId = -1; + int workerId = -1; /** Topology version. */ - @Order(value = 8, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(8) + AffinityTopologyVersion topVer; /** * @param rebalanceId Rebalance id for this node. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java index d23f5ae40d84a..58bf247fba56c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java @@ -46,16 +46,16 @@ public class GridDhtPartitionExchangeId implements Message, Comparable last; + Map last; /** Partitions which were not found. */ @GridToStringInclude @Order(7) - private Collection missed; + Collection missed; /** Entries. */ @Order(8) - private Map infos; + Map infos; /** Message size. */ - @Order(value = 9, method = "messageSize") - private int msgSize; + @Order(9) + int msgSize; /** Supplying process error message. */ - @Order(value = 10, method = "errorMessage") - private @Nullable ErrorMessage errMsg; + @Order(10) + @Nullable ErrorMessage errMsg; /** * @param rebalanceId Rebalance id. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java index df9672c02e580..023683fc1cb3c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java @@ -35,12 +35,12 @@ public abstract class GridDhtPartitionsAbstractMessage extends GridCacheMessage private static final byte RESTORE_STATE_FLAG_MASK = 0x02; /** Exchange ID. */ - @Order(value = 3, method = "exchangeId") - private GridDhtPartitionExchangeId exchId; + @Order(3) + GridDhtPartitionExchangeId exchId; /** Last used cache version. */ - @Order(value = 4, method = "lastVersion") - private GridCacheVersion lastVer; + @Order(4) + GridCacheVersion lastVer; /** */ @Order(5) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index ead64e48bcff9..137fe0eded024 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -65,35 +65,35 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa *

* TODO Remove this field after completing task IGNITE-26976. */ - @Order(value = 6, method = "partitionBytes") - private byte[] partsBytes; + @Order(6) + byte[] partsBytes; /** */ - @Order(value = 7, method = "duplicatedPartitionsData") - private Map dupPartsData; + @Order(7) + Map dupPartsData; /** Partitions update counters. */ - @Order(value = 8, method = "partitionCounters") + @Order(8) @GridToStringInclude - private IgniteDhtPartitionCountersMap partCntrs; + IgniteDhtPartitionCountersMap partCntrs; /** Partitions history suppliers. */ - @Order(value = 9, method = "partitionHistorySuppliers") + @Order(9) @GridToStringInclude - private IgniteDhtPartitionHistorySuppliersMap partHistSuppliers; + IgniteDhtPartitionHistorySuppliersMap partHistSuppliers; /** Partitions that must be cleared and re-loaded. */ - @Order(value = 10, method = "partitionsToReload") + @Order(10) @GridToStringInclude - private IgniteDhtPartitionsToReloadMap partsToReload; + IgniteDhtPartitionsToReloadMap partsToReload; /** Partition sizes. */ - @Order(value = 11, method = "partitionSizes") - private Map partsSizes; + @Order(11) + Map partsSizes; /** Topology version. */ - @Order(value = 12, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(12) + AffinityTopologyVersion topVer; /** Exceptions. */ @GridToStringInclude @@ -103,30 +103,30 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa * Used as a stub for serialization of {@link #errs}. * All logic resides within getter and setter. */ - @Order(value = 13, method = "errorMessages") + @Order(13) @SuppressWarnings("unused") - private Map errMsgs; + Map errMsgs; /** */ - @Order(value = 14, method = "resultTopologyVersion") - private AffinityTopologyVersion resTopVer; + @Order(14) + AffinityTopologyVersion resTopVer; /** */ - @Order(value = 15, method = "joinedNodeAffinity") - private Map joinedNodeAff; + @Order(15) + Map joinedNodeAff; /** */ - @Order(value = 16, method = "idealAffinityDiff") - private Map idealAffDiff; + @Order(16) + Map idealAffDiff; /** */ - @Order(value = 17, method = "rebalancedFlags") - private byte flags; + @Order(17) + byte flags; /** */ - @Order(value = 18, method = "lostPartitions") + @Order(18) @GridToStringExclude - private Map lostParts; + Map lostParts; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java index 9266a486c7c74..17ef40ee2b333 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java @@ -48,51 +48,51 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes *

* TODO Remove this field after completing task IGNITE-26976. */ - @Order(value = 6, method = "partitionBytes") - private byte[] partsBytes; + @Order(6) + byte[] partsBytes; /** */ - @Order(value = 7, method = "duplicatedPartitionsData") - private Map dupPartsData; + @Order(7) + Map dupPartsData; /** Partitions update counters. */ - @Order(value = 8, method = "partitionUpdateCounters") + @Order(8) @GridToStringInclude - private Map partCntrs; + Map partCntrs; /** Partitions sizes. */ - @Order(value = 9, method = "partitionSizesMap") + @Order(9) @GridToStringInclude - private Map partsSizes; + Map partsSizes; /** Partitions history reservation counters. */ - @Order(value = 10, method = "partitionHistoryCountersMap") + @Order(10) @GridToStringInclude - private Map partHistCntrs; + Map partHistCntrs; /** Error message. */ - @Order(value = 11, method = "errorMessage") + @Order(11) @GridToStringInclude - private ErrorMessage errMsg; + ErrorMessage errMsg; /** */ @Order(12) - private boolean client; + boolean client; /** */ - @Order(value = 13, method = "cacheGroupsAffinityRequest") - private Collection grpsAffReq; + @Order(13) + Collection grpsAffReq; /** Start time of exchange on node which sent this message in nanoseconds. */ @Order(14) - private long exchangeStartTime; + long exchangeStartTime; /** * Exchange finish message, sent to new coordinator when it tries to restore state after previous coordinator failed * during exchange. */ - @Order(value = 15, method = "finishMessage") - private GridDhtPartitionsFullMessage finishMsg; + @Order(15) + GridDhtPartitionsFullMessage finishMsg; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java index 2e3159ad80f2f..8f6a3ab87643c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java @@ -25,8 +25,8 @@ */ public class GridDhtPartitionsSingleRequest extends GridDhtPartitionsAbstractMessage { /** */ - @Order(value = 6, method = "restoreExchangeId") - private GridDhtPartitionExchangeId restoreExchId; + @Order(6) + GridDhtPartitionExchangeId restoreExchId; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java index 738dc90fc2940..244b97410e359 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GroupPartitionIdPair.java @@ -27,12 +27,12 @@ public class GroupPartitionIdPair implements Message { public static final short TYPE_CODE = 508; /** Group ID. */ - @Order(value = 0, method = "groupId") - private int grpId; + @Order(0) + int grpId; /** Partition ID. */ - @Order(value = 1, method = "partitionId") - private int partId; + @Order(1) + int partId; /** Default constructor. */ public GroupPartitionIdPair() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java index fe88fce8389b2..8474bf09e669a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java @@ -41,13 +41,13 @@ public class IgniteDhtDemandedPartitionsMap implements Serializable, Message { private static final long serialVersionUID = 0L; /** Map of partitions that will be preloaded from history. (partId -> (fromCntr, toCntr)). */ - @Order(value = 0, method = "historicalMap") - private CachePartitionPartialCountersMap historical; + @Order(0) + CachePartitionPartialCountersMap historical; /** Set of partitions that require full rebalancing. */ - @Order(value = 1, method = "fullSet") + @Order(1) @GridToStringInclude - private Set full; + Set full; /** * @param historical Historical partition set. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java index 9f08178dae7df..685c30cf56101 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionCountersMap.java @@ -31,8 +31,8 @@ public class IgniteDhtPartitionCountersMap implements Message { public static final short TYPE_CODE = 507; /** */ - @Order(value = 0, method = "partitionCounters") - private Map map; + @Order(0) + Map map; /** * @return {@code True} if map is empty. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java index dda003ffd3391..fdc982952a156 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionHistorySuppliersMap.java @@ -40,8 +40,8 @@ public class IgniteDhtPartitionHistorySuppliersMap implements Message { private static final IgniteDhtPartitionHistorySuppliersMap EMPTY = new IgniteDhtPartitionHistorySuppliersMap(); /** */ - @Order(value = 0, method = "historySuppliers") - private Map map; + @Order(0) + Map map; /** * @return Empty map. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java index 7ebc88c6b4786..649981be684f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtPartitionsToReloadMap.java @@ -36,8 +36,8 @@ public class IgniteDhtPartitionsToReloadMap implements Message { public static final short TYPE_CODE = 513; /** */ - @Order(value = 0, method = "partitionsToReload") - private Map map; + @Order(0) + Map map; /** * @param nodeId Node ID. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java index fba057b5c4d13..1b4a6987170b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IntLongMap.java @@ -32,7 +32,7 @@ public class IntLongMap implements Message { /** Map. */ @Order(0) - private @Nullable Map map; + @Nullable Map map; /** Default constructor. */ public IntLongMap() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java index 3a37229db9edb..20b2d40ec3b3e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionReservationsMap.java @@ -29,8 +29,8 @@ public class PartitionReservationsMap implements Message { public static final short TYPE_CODE = 509; /** Mapping between GroupPartitionIdPair objects and their respective history counter values. */ - @Order(value = 0, method = "reservations") - private Map map; + @Order(0) + Map map; /** * @return Partition reservations map. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionsToReload.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionsToReload.java index c5a61f730b365..073b9735d82a1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionsToReload.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/PartitionsToReload.java @@ -28,8 +28,8 @@ public class PartitionsToReload implements Message { public static final short TYPE_CODE = 511; /** Set of partitions to reload. */ - @Order(value = 0, method = "partitions") - private Set parts; + @Order(0) + Set parts; /** * @return Set of partitions to reload. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java index 26e35e12ba335..31f402a598f73 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java @@ -26,15 +26,15 @@ public class LatchAckMessage implements Message { /** Latch id. */ @Order(0) - private String latchId; + String latchId; /** Latch topology version. */ @Order(1) - private AffinityTopologyVersion topVer; + AffinityTopologyVersion topVer; /** Flag indicates that ack is final. */ @Order(2) - private boolean isFinal; + boolean isFinal; /** * Constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java index 4318c0cc69801..338bbbee1c3aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java @@ -32,14 +32,14 @@ */ public class CacheVersionedValue implements Message { /** Value. */ - @Order(value = 0, method = "value") + @Order(0) @GridToStringInclude - private CacheObject val; + CacheObject val; /** Cache version. */ - @Order(value = 1, method = "version") + @Order(1) @GridToStringInclude - private GridCacheVersion ver; + GridCacheVersion ver; /** */ public CacheVersionedValue() { 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 afbe6bc63ffa4..3c17e4192a487 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 @@ -58,16 +58,16 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD public static final int RECOVERY_FLAG_MASK = 0x08; /** Future ID. */ - @Order(value = 4, method = "futureId") - private IgniteUuid futId; + @Order(4) + IgniteUuid futId; /** Sub ID. */ @Order(5) - private IgniteUuid miniId; + IgniteUuid miniId; /** Version. */ - @Order(value = 6, method = "version") - private GridCacheVersion ver; + @Order(6) + GridCacheVersion ver; /** */ @GridToStringInclude @@ -75,35 +75,35 @@ public class GridNearGetRequest extends GridCacheIdMessage implements GridCacheD /** */ @Order(7) - private List keys; + List keys; /** */ @Order(8) - private List readersFlags; + List readersFlags; /** */ @Order(9) - private byte flags; + byte flags; /** Topology version. */ - @Order(value = 10, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(10) + AffinityTopologyVersion topVer; /** Task name hash. */ @Order(11) - private int taskNameHash; + int taskNameHash; /** TTL for read operation. */ @Order(12) - private long createTtl; + long createTtl; /** TTL for read operation. */ @Order(13) - private long accessTtl; + long accessTtl; /** Transaction label. */ - @Order(value = 14, method = "txLabel") - private @Nullable String txLbl; + @Order(14) + @Nullable String txLbl; /** * Empty constructor. 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 b549369ffadd2..ebe9eae260556 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 @@ -42,34 +42,34 @@ */ public class GridNearGetResponse extends GridCacheIdMessage implements GridCacheDeployable, GridCacheVersionable { /** Future ID. */ - @Order(value = 4, method = "futureId") - private IgniteUuid futId; + @Order(4) + IgniteUuid futId; /** Sub ID. */ @Order(5) - private IgniteUuid miniId; + IgniteUuid miniId; /** Version. */ - @Order(value = 6, method = "version") - private GridCacheVersion ver; + @Order(6) + GridCacheVersion ver; /** Result. */ @GridToStringInclude @Order(7) - private Collection entries; + Collection entries; /** Keys to retry due to ownership shift. */ @GridToStringInclude - @Order(value = 8, method = "invalidPartitions") - private Collection invalidParts = new GridLeanSet<>(); + @Order(8) + Collection invalidParts = new GridLeanSet<>(); /** Topology version if invalid partitions is not empty. */ - @Order(value = 9, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(9) + AffinityTopologyVersion topVer; /** Error message. */ - @Order(value = 10, method = "errorMessage") - private @Nullable ErrorMessage errMsg; + @Order(10) + @Nullable ErrorMessage errMsg; /** * Empty constructor. 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 4cb217dd9cfaf..8052e926d7bca 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 @@ -47,37 +47,37 @@ public class GridNearLockRequest extends GridDistributedLockRequest { private static final int NEAR_CACHE_FLAG_MASK = 0x08; /** Topology version. */ - @Order(value = 20, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(20) + AffinityTopologyVersion topVer; /** Mini future ID. */ @Order(21) - private int miniId; + int miniId; /** Array of mapped DHT versions for this entry. */ - @Order(value = 22, method = "dhtVersions") + @Order(22) @GridToStringInclude - private GridCacheVersion[] dhtVers; + GridCacheVersion[] dhtVers; /** Task name hash. */ @Order(23) - private int taskNameHash; + int taskNameHash; /** TTL for create operation. */ @Order(24) - private long createTtl; + long createTtl; /** TTL for read operation. */ @Order(25) - private long accessTtl; + long accessTtl; /** */ - @Order(value = 26, method = "nearFlags") - private byte flags; + @Order(26) + byte flags; /** Transaction label. */ - @Order(value = 27, method = "txLabel") - private String txLbl; + @Order(27) + String txLbl; /** * Empty constructor. 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 a8e6173a6aafd..f36b700621471 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 @@ -37,36 +37,36 @@ public class GridNearLockResponse extends GridDistributedLockResponse { /** Pending versions that are less than {@link #version()}. */ @GridToStringInclude @Order(10) - private Collection pending; + Collection pending; /** Mini future ID. */ @Order(11) - private int miniId; + int miniId; /** DHT versions. */ @GridToStringInclude - @Order(value = 12, method = "dhtVersions") - private GridCacheVersion[] dhtVers; + @Order(12) + GridCacheVersion[] dhtVers; /** DHT candidate versions. */ @GridToStringInclude - @Order(value = 13, method = "mappedVersions") - private GridCacheVersion[] mappedVers; + @Order(13) + GridCacheVersion[] mappedVers; /** Filter evaluation results for fast-commit transactions. */ - @Order(value = 14, method = "filterResults") - private boolean[] filterRes; + @Order(14) + boolean[] filterRes; /** Topology version, which is set when client node should remap lock request. */ - @Order(value = 15, method = "clientRemapVersion") - private AffinityTopologyVersion clientRemapVer; + @Order(15) + AffinityTopologyVersion clientRemapVer; /** * Flag, indicating whether remap version is compatible with current version. * Used together with clientRemapVer. */ - @Order(value = 16, method = "compatibleRemapVersion") - private boolean compatibleRemapVer; + @Order(16) + boolean compatibleRemapVer; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java index 2d47d8de19944..15979629207ad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java @@ -52,36 +52,36 @@ public class GridNearSingleGetRequest extends GridCacheIdMessage implements Grid public static final int RECOVERY_FLAG_MASK = 0x20; /** Future ID. */ - @Order(value = 4, method = "futureId") - private long futId; + @Order(4) + long futId; /** */ @Order(5) - private KeyCacheObject key; + KeyCacheObject key; /** Flags. */ @Order(6) - private byte flags; + byte flags; /** Topology version. */ - @Order(value = 7, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(7) + AffinityTopologyVersion topVer; /** Task name hash. */ @Order(8) - private int taskNameHash; + int taskNameHash; /** TTL for read operation. */ @Order(9) - private long createTtl; + long createTtl; /** TTL for read operation. */ @Order(10) - private long accessTtl; + long accessTtl; /** Transaction label. */ - @Order(value = 11, method = "txLabel") - private @Nullable String txLbl; + @Order(11) + @Nullable String txLbl; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java index d51a7b85c843a..eb2e7d7865efe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java @@ -42,24 +42,24 @@ public class GridNearSingleGetResponse extends GridCacheIdMessage implements Gri public static final int CONTAINS_VAL_FLAG_MASK = 0x2; /** Future ID. */ - @Order(value = 4, method = "futureId") - private long futId; + @Order(4) + long futId; /** Result. */ - @Order(value = 5, method = "result") - private Message res; + @Order(5) + Message res; /** Topology version. */ - @Order(value = 6, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(6) + AffinityTopologyVersion topVer; /** Error message. */ - @Order(value = 7, method = "errorMessage") - private ErrorMessage errMsg; + @Order(7) + ErrorMessage errMsg; /** Flags. */ @Order(8) - private byte flags; + byte flags; /** * Empty constructor. 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 0e7ca32829e3e..1d82458b17207 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 @@ -34,7 +34,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { /** Mini future ID. */ @Order(18) - private int miniId; + int miniId; /** * Empty constructor. 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 193427296fa3d..cfac5b264a561 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 @@ -30,16 +30,16 @@ */ public final class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { /** Error message. */ - @Order(value = 6, method = "errorMessage") - private @Nullable ErrorMessage errMsg; + @Order(6) + @Nullable ErrorMessage errMsg; /** Mini future ID. */ @Order(7) - private int miniId; + int miniId; /** Near tx thread ID. */ - @Order(value = 8, method = "threadId") - private long nearThreadId; + @Order(8) + long nearThreadId; /** * Empty constructor. 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 22f53066376da..940ee0f1f2aa3 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 @@ -58,30 +58,30 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { private static final int RECOVERY_FLAG_MASK = 0x40; /** Future ID. */ - @Order(value = 20, method = "futureId") - private IgniteUuid futId; + @Order(20) + IgniteUuid futId; /** Mini future ID. */ @Order(21) - private int miniId; + int miniId; /** Topology version. */ - @Order(value = 22, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(22) + AffinityTopologyVersion topVer; /** Task name hash. */ @Order(23) - private int taskNameHash; + int taskNameHash; /** */ - @Order(value = 24, method = "nearFlags") + @Order(24) @GridToStringExclude - private byte flags; + byte flags; /** Transaction label. */ - @Order(value = 25, method = "txLabel") + @Order(25) @GridToStringInclude - @Nullable private String txLbl; + @Nullable String txLbl; /** * Empty constructor. 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 8d1ec23b760d4..45382d139a385 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 @@ -46,51 +46,51 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse /** Versions that are less than lock version ({@link #version()}). */ @GridToStringInclude @Order(9) - private @Nullable Collection pending; + @Nullable Collection pending; /** Future ID. */ - @Order(value = 10, method = "futureId") - private IgniteUuid futId; + @Order(10) + IgniteUuid futId; /** Mini future ID. */ @Order(11) - private int miniId; + int miniId; /** DHT version. */ - @Order(value = 12, method = "dhtVersion") - private GridCacheVersion dhtVer; + @Order(12) + GridCacheVersion dhtVer; /** Write version. */ - @Order(value = 13, method = "writeVersion") - private GridCacheVersion writeVer; + @Order(13) + GridCacheVersion writeVer; /** Map of owned values to set on near node. */ @GridToStringInclude private Map ownedVals; /** OwnedVals' keys for marshalling. */ - @Order(value = 14, method = "ownedValuesKeys") - private @Nullable Collection ownedValKeys; + @Order(14) + @Nullable Collection ownedValKeys; /** OwnedVals' values for marshalling. */ - @Order(value = 15, method = "ownedValuesValues") - private @Nullable Collection ownedValVals; + @Order(15) + @Nullable Collection ownedValVals; /** Cache return value. */ - @Order(value = 16, method = "returnValue") - private GridCacheReturn retVal; + @Order(16) + GridCacheReturn retVal; /** Keys that did not pass the filter. */ @Order(17) - private @Nullable Collection filterFailedKeys; + @Nullable Collection filterFailedKeys; /** Topology version, which is set when client node should remap lock request. */ - @Order(value = 18, method = "clientRemapVersion") - private @Nullable AffinityTopologyVersion clientRemapVer; + @Order(18) + @Nullable AffinityTopologyVersion clientRemapVer; /** One-phase commit on primary flag. */ @Order(19) - private boolean onePhaseCommit; + boolean onePhaseCommit; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java index bb2e66e1c1d72..5fe0213a7a5e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java @@ -29,7 +29,7 @@ abstract class AbstractSnapshotMessage implements Message { /** Unique message ID. */ @Order(0) - private String id; + String id; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java index fdf55154b41fd..07e15193a5a66 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java @@ -33,19 +33,19 @@ public class IncrementalSnapshotAwareMessage extends GridCacheMessage { /** Original transaction message. */ @Order(3) - private GridCacheMessage payload; + GridCacheMessage payload; /** Incremental snapshot ID. */ @Order(4) - private UUID id; + UUID id; /** ID of the latest incremental snapshot after which this transaction committed. */ - @Order(value = 5, method = "txIncrementalSnapshotId") - private @Nullable UUID txSnpId; + @Order(5) + @Nullable UUID txSnpId; /** Incremental snapshot topology version. */ - @Order(value = 6, method = "snapshotTopologyVersion") - private long topVer; + @Order(6) + long topVer; /** */ public IncrementalSnapshotAwareMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java index 80b00b1e22865..a362743884c07 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java @@ -29,8 +29,8 @@ public class SnapshotFilesFailureMessage extends AbstractSnapshotMessage { public static final short TYPE_CODE = 179; /** Exception message which is occurred during snapshot request processing. */ - @Order(value = 1, method = "errorMessage") - private String errMsg; + @Order(1) + String errMsg; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java index 89622fae57362..8df0715bcf51e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java @@ -38,20 +38,20 @@ public class SnapshotFilesRequestMessage extends AbstractSnapshotMessage { public static final short TYPE_CODE = 178; /** Snapshot operation request ID. */ - @Order(value = 1, method = "requestId") - private UUID reqId; + @Order(1) + UUID reqId; /** Snapshot name to request. */ - @Order(value = 2, method = "snapshotName") - private String snpName; + @Order(2) + String snpName; /** Snapshot directory path. */ - @Order(value = 3, method = "snapshotPath") - private String snpPath; + @Order(3) + String snpPath; /** Map of cache group ids and corresponding set of its partition ids. */ - @Order(value = 4, method = "partitions") - private Map parts; + @Order(4) + Map parts; /** * Empty constructor. 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 84a0a6ec0cb8b..7df0348db85ad 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 @@ -60,107 +60,107 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac /** */ @Order(4) - private long id; + long id; /** */ @Order(5) - private String cacheName; + String cacheName; /** */ @Order(6) - private GridCacheQueryType type; + GridCacheQueryType type; /** */ @Order(7) @GridToStringInclude(sensitive = true) - private String clause; + String clause; /** */ private IndexQueryDesc idxQryDesc; /** */ - @Order(value = 8, method = "indexQueryDescriptionBytes") - private byte[] idxQryDescBytes; + @Order(8) + byte[] idxQryDescBytes; /** */ @Order(9) - private int limit; + int limit; /** */ - @Order(value = 10, method = "className") - private String clsName; + @Order(10) + String clsName; /** */ private IgniteBiPredicate keyValFilter; /** */ - @Order(value = 11, method = "keyValueFilterBytes") - private byte[] keyValFilterBytes; + @Order(11) + byte[] keyValFilterBytes; /** */ private IgniteReducer rdc; /** */ - @Order(value = 12, method = "reducerBytes") - private byte[] rdcBytes; + @Order(12) + byte[] rdcBytes; /** */ private IgniteClosure trans; /** */ - @Order(value = 13, method = "transformerBytes") - private byte[] transBytes; + @Order(13) + byte[] transBytes; /** */ private Object[] args; /** */ - @Order(value = 14, method = "argumentsBytes") - private byte[] argsBytes; + @Order(14) + byte[] argsBytes; /** */ @Order(15) - private int pageSize; + int pageSize; /** */ - @Order(value = 16, method = "includeBackups") - private boolean incBackups; + @Order(16) + boolean incBackups; /** */ @Order(17) - private boolean cancel; + boolean cancel; /** */ - @Order(value = 18, method = "includeMetaData") - private boolean incMeta; + @Order(18) + boolean incMeta; /** */ - @Order(value = 19, method = "allPages") - private boolean all; + @Order(19) + boolean all; /** */ @Order(20) - private boolean keepBinary; + boolean keepBinary; /** */ @Order(21) - private int taskHash; + int taskHash; /** Partition. */ - @Order(value = 22, method = "partition") - private int part = -1; + @Order(22) + int part = -1; /** */ - @Order(value = 23, method = "topologyVersion") - private AffinityTopologyVersion topVer; + @Order(23) + AffinityTopologyVersion topVer; /** Set of keys that must be skiped during iteration. */ @Order(24) - private Collection skipKeys; + Collection skipKeys; /** */ @Order(25) - private byte flags; + byte flags; /** * Empty constructor. 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 886eb540faa31..fb1b7ea2203ba 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 @@ -43,27 +43,27 @@ public class GridCacheQueryResponse extends GridCacheIdMessage implements GridCacheDeployable { /** */ @Order(4) - private boolean finished; + boolean finished; /** */ - @Order(value = 5, method = "requestId") - private long reqId; + @Order(5) + long reqId; /** */ - @Order(value = 6, method = "errorMessage") - private @Nullable ErrorMessage errMsg; + @Order(6) + @Nullable ErrorMessage errMsg; /** */ - @Order(value = 7) - private boolean fields; + @Order(7) + boolean fields; /** */ - @Order(value = 8, method = "indexQueryMetadata") - private IndexQueryResultMeta idxQryMetadata; + @Order(8) + IndexQueryResultMeta idxQryMetadata; /** */ - @Order(value = 9) - private Collection dataBytes; + @Order(9) + Collection dataBytes; /** */ private Collection data; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java index bb42eafabc071..ae1c2b285320d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java @@ -35,14 +35,14 @@ public class GridCacheSqlQuery implements Message { public static final Object[] EMPTY_PARAMS = {}; /** */ - @Order(value = 0, method = "query") + @Order(0) @GridToStringInclude(sensitive = true) - private String qry; + String qry; /** */ - @Order(value = 1, method = "parameterIndexes") + @Order(1) @GridToStringInclude - private int[] paramIdxs; + int[] paramIdxs; /** */ @GridToStringInclude @@ -58,7 +58,7 @@ public class GridCacheSqlQuery implements Message { /** Single node to execute the query on. */ @Order(2) - private UUID node; + UUID node; /** Derived partition info. */ @GridToStringInclude diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java index fb80aa2e598d5..204e16ce71e68 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java @@ -30,12 +30,12 @@ public class CacheContinuousQueryBatchAck extends GridCacheIdMessage { /** Routine ID. */ @Order(4) - private UUID routineId; + UUID routineId; /** Update counters. */ @Order(5) @GridToStringInclude - private Map updateCntrs; + Map updateCntrs; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java index 2a7e8d31debec..ed0728fcd303f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java @@ -33,11 +33,11 @@ public class IgniteTxKey implements Message { /** Key. */ @Order(0) @GridToStringInclude(sensitive = true) - private KeyCacheObject key; + KeyCacheObject key; /** Cache ID. */ @Order(1) - private int cacheId; + int cacheId; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java index 1774936e2ae81..f5ba59e9ae559 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java @@ -40,19 +40,19 @@ */ public class TxEntryValueHolder implements Message { /** Stored value. */ - @Order(value = 0, method = "storedValue") + @Order(0) @GridToStringInclude(sensitive = true) - private @Nullable CacheObject val; + @Nullable CacheObject val; /** Cache operation. */ - @Order(value = 1, method = "operation") + @Order(1) @GridToStringInclude - private GridCacheOperation op = NOOP; + GridCacheOperation op = NOOP; /** Flag indicating that value has been set for write. */ - @Order(value = 2, method = "hasWriteValue") + @Order(2) @GridToStringExclude - private boolean hasWriteVal; + boolean hasWriteVal; /** Flag indicating that value has been set for read. */ @GridToStringExclude diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java index 090033883655d..5ae0a167df0f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java @@ -41,19 +41,19 @@ public class TxLock implements Message { /** Near node ID. */ @Order(0) - private UUID nearNodeId; + UUID nearNodeId; /** Tx ID. */ @Order(1) - private GridCacheVersion txId; + GridCacheVersion txId; /** Thread ID. */ @Order(2) - private long threadId; + long threadId; /** Ownership. */ @Order(3) - private byte ownership; + byte ownership; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java index 4bd02c6491e3c..c526284e91710 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java @@ -30,8 +30,8 @@ public class TxLockList implements Message { /** Tx locks. */ @GridToStringInclude - @Order(value = 0, method = "transactionLocks") - private List txLocks = new ArrayList<>(); + @Order(0) + List txLocks = new ArrayList<>(); /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java index afaedd8adefd6..c6dd3ecb52b99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java @@ -34,8 +34,8 @@ */ public class TxLocksRequest extends GridCacheMessage { /** Future ID. */ - @Order(value = 3, method = "futureId") - private long futId; + @Order(3) + long futId; /** Tx keys. */ @GridToStringInclude @@ -43,8 +43,8 @@ public class TxLocksRequest extends GridCacheMessage { /** Array of txKeys from {@link #txKeys}. Used during marshalling and unmarshalling. */ @GridToStringExclude - @Order(value = 4, method = "txKeysArray") - private IgniteTxKey[] txKeysArr; + @Order(4) + IgniteTxKey[] txKeysArr; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java index 7d7adc66ce20d..6e1fcd7bff89a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java @@ -35,8 +35,8 @@ */ public class TxLocksResponse extends GridCacheMessage { /** Future ID. */ - @Order(value = 3, method = "futureId") - private long futId; + @Order(3) + long futId; /** Locks for near txKeys of near transactions. */ @GridToStringInclude @@ -48,18 +48,18 @@ public class TxLocksResponse extends GridCacheMessage { /** Array of txKeys from {@link #nearTxKeyLocks}. Used during marshalling and unmarshalling. */ @GridToStringExclude - @Order(value = 4, method = "nearTxKeysArray") - private IgniteTxKey[] nearTxKeysArr; + @Order(4) + IgniteTxKey[] nearTxKeysArr; /** Array of txKeys from {@link #txKeys}. Used during marshalling and unmarshalling. */ @GridToStringExclude - @Order(value = 5, method = "txKeysArray") - private IgniteTxKey[] txKeysArr; + @Order(5) + IgniteTxKey[] txKeysArr; /** Array of locksArr from {@link #nearTxKeyLocks}. Used during marshalling and unmarshalling. */ @GridToStringExclude - @Order(value = 6, method = "locksArray") - private TxLockList[] locksArr; + @Order(6) + TxLockList[] locksArr; /** * Default constructor. 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 1b6394e6ca13c..e785024c40c82 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 @@ -44,16 +44,16 @@ public class GridCacheVersion implements Message, Externalizable, CacheEntryVers private static final int DR_ID_MASK = 0x1F; /** Topology version. */ - @Order(value = 0, method = "topologyVersion") - private int topVer; + @Order(0) + int topVer; /** Node order (used as global order) and DR ID. */ - @Order(value = 1, method = "nodeOrderAndDrIdRaw") - private int nodeOrderDrId; + @Order(1) + int nodeOrderDrId; /** Order. */ @Order(2) - private long order; + long order; /** * Empty constructor required by {@link Externalizable}. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java index 3a96004808331..63e19971dcf0f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java @@ -32,8 +32,8 @@ public class GridCacheVersionEx extends GridCacheVersion { private static final long serialVersionUID = 0L; /** DR version. */ - @Order(value = 3, method = "conflictVersion") - private GridCacheVersion drVer; + @Order(3) + GridCacheVersion drVer; /** * {@link Externalizable} support. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java index 3d5d7e80342d9..bbd8617c43053 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java @@ -30,370 +30,370 @@ public class CacheMetricsMessage implements Message { public static final short TYPE_CODE = 136; /** Number of reads. */ - @Order(value = 0) - protected long cacheGets; + @Order(0) + public long cacheGets; /** Number of puts. */ - @Order(value = 1) - protected long cachePuts; + @Order(1) + public long cachePuts; /** Number of invokes caused updates. */ - @Order(value = 2) - protected long entryProcessorPuts; + @Order(2) + public long entryProcessorPuts; /** Number of invokes caused no updates. */ - @Order(value = 3) - protected long entryProcessorReadOnlyInvocations; + @Order(3) + public long entryProcessorReadOnlyInvocations; /** * The mean time to execute cache invokes */ - @Order(value = 4) - protected float entryProcessorAverageInvocationTime; + @Order(4) + public float entryProcessorAverageInvocationTime; /** * The total number of cache invocations. */ - @Order(value = 5) - protected long entryProcessorInvocations; + @Order(5) + public long entryProcessorInvocations; /** * The total number of cache invocations, caused removal. */ - @Order(value = 6) - protected long entryProcessorRemovals; + @Order(6) + public long entryProcessorRemovals; /** * The total number of invocations on keys, which don't exist in cache. */ - @Order(value = 7) - protected long entryProcessorMisses; + @Order(7) + public long entryProcessorMisses; /** * The total number of invocations on keys, which exist in cache. */ - @Order(value = 8) - protected long entryProcessorHits; + @Order(8) + public long entryProcessorHits; /** * The percentage of invocations on keys, which don't exist in cache. */ - @Order(value = 9) - protected float entryProcessorMissPercentage; + @Order(9) + public float entryProcessorMissPercentage; /** * The percentage of invocations on keys, which exist in cache. */ - @Order(value = 10) - protected float entryProcessorHitPercentage; + @Order(10) + public float entryProcessorHitPercentage; /** * So far, the maximum time to execute cache invokes. */ - @Order(value = 11) - protected float entryProcessorMaxInvocationTime; + @Order(11) + public float entryProcessorMaxInvocationTime; /** * So far, the minimum time to execute cache invokes. */ - @Order(value = 12) - protected float entryProcessorMinInvocationTime; + @Order(12) + public float entryProcessorMinInvocationTime; /** Number of hits. */ - @Order(value = 13) - protected long cacheHits; + @Order(13) + public long cacheHits; /** Number of misses. */ - @Order(value = 14) - protected long cacheMisses; + @Order(14) + public long cacheMisses; /** Number of transaction commits. */ - @Order(value = 15) - protected long cacheTxCommits; + @Order(15) + public long cacheTxCommits; /** Number of transaction rollbacks. */ - @Order(value = 16) - protected long cacheTxRollbacks; + @Order(16) + public long cacheTxRollbacks; /** Number of evictions. */ - @Order(value = 17) - protected long cacheEvictions; + @Order(17) + public long cacheEvictions; /** Number of removed entries. */ - @Order(value = 18) - protected long cacheRemovals; + @Order(18) + public long cacheRemovals; /** Put time taken nanos. */ - @Order(value = 19) - protected float averagePutTime; + @Order(19) + public float averagePutTime; /** Get time taken nanos. */ - @Order(value = 20) - protected float averageGetTime; + @Order(20) + public float averageGetTime; /** Remove time taken nanos. */ - @Order(value = 21) - protected float averageRemoveTime; + @Order(21) + public float averageRemoveTime; /** Commit transaction time taken nanos. */ - @Order(value = 22) - protected float averageTxCommitTime; + @Order(22) + public float averageTxCommitTime; /** Commit transaction time taken nanos. */ - @Order(value = 23) - protected float averageTxRollbackTime; + @Order(23) + public float averageTxRollbackTime; /** Cache name */ - @Order(value = 24) - protected String cacheName; + @Order(24) + public String cacheName; /** Number of reads from off-heap. */ - @Order(value = 25) - protected long offHeapGets; + @Order(25) + public long offHeapGets; /** Number of writes to off-heap. */ - @Order(value = 26) - protected long offHeapPuts; + @Order(26) + public long offHeapPuts; /** Number of removed entries from off-heap. */ - @Order(value = 27, method = "offHeapRemovals") - protected long offHeapRemoves; + @Order(27) + public long offHeapRemoves; /** Number of evictions from off-heap. */ - @Order(value = 28, method = "offHeapEvictions") - protected long offHeapEvicts; + @Order(28) + public long offHeapEvicts; /** Off-heap hits number. */ - @Order(value = 29, method = "offHeapHits") - protected long offHeapHits; + @Order(29) + public long offHeapHits; /** Off-heap misses number. */ - @Order(value = 30) - protected long offHeapMisses; + @Order(30) + public long offHeapMisses; /** Number of entries stored in off-heap memory. */ - @Order(value = 31, method = "offHeapEntriesCount") - protected long offHeapEntriesCnt; + @Order(31) + public long offHeapEntriesCnt; /** Number of entries stored in heap. */ - @Order(value = 32, method = "heapEntriesCount") - protected long heapEntriesCnt; + @Order(32) + public long heapEntriesCnt; /** Number of primary entries stored in off-heap memory. */ - @Order(value = 33, method = "offHeapPrimaryEntriesCount") - protected long offHeapPrimaryEntriesCnt; + @Order(33) + public long offHeapPrimaryEntriesCnt; /** Number of backup entries stored in off-heap memory. */ - @Order(value = 34, method = "offHeapBackupEntriesCount") - protected long offHeapBackupEntriesCnt; + @Order(34) + public long offHeapBackupEntriesCnt; /** Memory size allocated in off-heap. */ - @Order(value = 35) - protected long offHeapAllocatedSize; + @Order(35) + public long offHeapAllocatedSize; /** Number of non-{@code null} values in the cache. */ - @Order(value = 36) - protected int size; + @Order(36) + public int size; /** Cache size. */ - @Order(value = 37) - protected long cacheSize; + @Order(37) + public long cacheSize; /** Number of keys in the cache, possibly with {@code null} values. */ - @Order(value = 38) - protected int keySize; + @Order(38) + public int keySize; /** Cache is empty. */ - @Order(value = 39) - protected boolean empty; + @Order(39) + public boolean empty; /** Gets current size of evict queue used to batch up evictions. */ - @Order(value = 40, method = "dhtEvictQueueCurrentSize") - protected int dhtEvictQueueCurrSize; + @Order(40) + public int dhtEvictQueueCurrSize; /** Transaction per-thread map size. */ - @Order(value = 41) - protected int txThreadMapSize; + @Order(41) + public int txThreadMapSize; /** Transaction per-Xid map size. */ - @Order(value = 42) - protected int txXidMapSize; + @Order(42) + public int txXidMapSize; /** Committed transaction queue size. */ - @Order(value = 43) - protected int txCommitQueueSize; + @Order(43) + public int txCommitQueueSize; /** Prepared transaction queue size. */ - @Order(value = 44) - protected int txPrepareQueueSize; + @Order(44) + public int txPrepareQueueSize; /** Start version counts map size. */ - @Order(value = 45, method = "txStartVersionCountsSize") - protected int txStartVerCountsSize; + @Order(45) + public int txStartVerCountsSize; /** Number of cached committed transaction IDs. */ - @Order(value = 46) - protected int txCommittedVersionsSize; + @Order(46) + public int txCommittedVersionsSize; /** Number of cached rolled back transaction IDs. */ - @Order(value = 47) - protected int txRolledbackVersionsSize; + @Order(47) + public int txRolledbackVersionsSize; /** DHT thread map size. */ - @Order(value = 48, method = "txDhtThreadMapSize") - protected int txDhtThreadMapSize; + @Order(48) + public int txDhtThreadMapSize; /** Transaction DHT per-Xid map size. */ - @Order(value = 49, method = "txDhtXidMapSize") - protected int txDhtXidMapSize; + @Order(49) + public int txDhtXidMapSize; /** Committed DHT transaction queue size. */ - @Order(value = 50) - protected int txDhtCommitQueueSize; + @Order(50) + public int txDhtCommitQueueSize; /** Prepared DHT transaction queue size. */ - @Order(value = 51) - protected int txDhtPrepareQueueSize; + @Order(51) + public int txDhtPrepareQueueSize; /** DHT start version counts map size. */ - @Order(value = 52, method = "txDhtStartVersionCountsSize") - protected int txDhtStartVerCountsSize; + @Order(52) + public int txDhtStartVerCountsSize; /** Number of cached committed DHT transaction IDs. */ - @Order(value = 53) - protected int txDhtCommittedVersionsSize; + @Order(53) + public int txDhtCommittedVersionsSize; /** Number of cached rolled back DHT transaction IDs. */ - @Order(value = 54) - protected int txDhtRolledbackVersionsSize; + @Order(54) + public int txDhtRolledbackVersionsSize; /** Write-behind is enabled. */ - @Order(value = 55) - protected boolean writeBehindEnabled; + @Order(55) + public boolean writeBehindEnabled; /** Buffer size that triggers flush procedure. */ - @Order(value = 56) - protected int writeBehindFlushSize; + @Order(56) + public int writeBehindFlushSize; /** Count of worker threads. */ - @Order(value = 57, method = "writeBehindFlushThreadCount") - protected int writeBehindFlushThreadCnt; + @Order(57) + public int writeBehindFlushThreadCnt; /** Flush frequency in milliseconds. */ - @Order(value = 58, method = "writeBehindFlushFrequency") - protected long writeBehindFlushFreq; + @Order(58) + public long writeBehindFlushFreq; /** Maximum size of batch. */ - @Order(value = 59) - protected int writeBehindStoreBatchSize; + @Order(59) + public int writeBehindStoreBatchSize; /** Count of cache overflow events since start. */ - @Order(value = 60, method = "writeBehindTotalCriticalOverflowCount") - protected int writeBehindTotalCriticalOverflowCnt; + @Order(60) + public int writeBehindTotalCriticalOverflowCnt; /** Count of cache overflow events since start. */ - @Order(value = 61, method = "writeBehindCriticalOverflowCount") - protected int writeBehindCriticalOverflowCnt; + @Order(61) + public int writeBehindCriticalOverflowCnt; /** Count of entries in store-retry state. */ - @Order(value = 62, method = "writeBehindErrorRetryCount") - protected int writeBehindErrorRetryCnt; + @Order(62) + public int writeBehindErrorRetryCnt; /** Total count of entries in cache store internal buffer. */ - @Order(value = 63, method = "writeBehindBufferSize") - protected int writeBehindBufSize; + @Order(63) + public int writeBehindBufSize; /** Total partitions count. */ - @Order(value = 64, method = "totalPartitionsCount") - protected int totalPartitionsCnt; + @Order(64) + public int totalPartitionsCnt; /** Rebalancing partitions count. */ - @Order(value = 65, method = "rebalancingPartitionsCount") - protected int rebalancingPartitionsCnt; + @Order(65) + public int rebalancingPartitionsCnt; /** Number of already rebalanced keys. */ - @Order(value = 66) - protected long rebalancedKeys; + @Order(66) + public long rebalancedKeys; /** Number estimated to rebalance keys. */ - @Order(value = 67) - protected long estimatedRebalancingKeys; + @Order(67) + public long estimatedRebalancingKeys; /** Keys to rebalance left. */ - @Order(value = 68) - protected long keysToRebalanceLeft; + @Order(68) + public long keysToRebalanceLeft; /** Rebalancing keys rate. */ - @Order(value = 69) - protected long rebalancingKeysRate; + @Order(69) + public long rebalancingKeysRate; /** Get rebalancing bytes rate. */ - @Order(value = 70) - protected long rebalancingBytesRate; + @Order(70) + public long rebalancingBytesRate; /** Start rebalance time. */ - @Order(value = 71, method = "rebalancingStartTime") - protected long rebalanceStartTime; + @Order(71) + public long rebalanceStartTime; /** Estimate rebalance finish time. */ - @Order(value = 72) - protected long rebalanceFinishTime; + @Order(72) + public long rebalanceFinishTime; /** The number of clearing partitions need to await before rebalance. */ - @Order(value = 73) - protected long rebalanceClearingPartitionsLeft; + @Order(73) + public long rebalanceClearingPartitionsLeft; /** */ - @Order(value = 74) - protected String keyType; + @Order(74) + public String keyType; /** */ - @Order(value = 75, method = "valueType") - protected String valType; + @Order(75) + public String valType; /** */ - @Order(value = 76, method = "storeByValue") - protected boolean storeByVal; + @Order(76) + public boolean storeByVal; /** */ - @Order(value = 77) - protected boolean statisticsEnabled; + @Order(77) + public boolean statisticsEnabled; /** */ - @Order(value = 78) - protected boolean managementEnabled; + @Order(78) + public boolean managementEnabled; /** */ - @Order(value = 79) - protected boolean readThrough; + @Order(79) + public boolean readThrough; /** */ - @Order(value = 80) - protected boolean writeThrough; + @Order(80) + public boolean writeThrough; /** */ - @Order(value = 81) - protected boolean validForReading; + @Order(81) + public boolean validForReading; /** */ - @Order(value = 82) - protected boolean validForWriting; + @Order(82) + public boolean validForWriting; /** Tx key collisions with appropriate queue size string representation. */ - @Order(value = 83) - protected String txKeyCollisions; + @Order(83) + public String txKeyCollisions; /** Index rebuilding in progress. */ - @Order(value = 84, method = "indexRebuildInProgress") - protected boolean idxRebuildInProgress; + @Order(84) + public boolean idxRebuildInProgress; /** Number of keys processed idxRebuildInProgressduring index rebuilding. */ - @Order(value = 85, method = "indexRebuildKeysProcessed") - protected long idxRebuildKeyProcessed; + @Order(85) + public long idxRebuildKeyProcessed; /** The number of local node partitions that remain to be processed to complete indexing. */ - @Order(value = 86, method = "indexBuildPartitionsLeftCount") - protected int idxBuildPartitionsLeftCount; + @Order(86) + public int idxBuildPartitionsLeftCount; /** * Default constructor for {@link GridIoMessageFactory}. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java index 1d176a72996c6..25aff5029324d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java @@ -35,11 +35,11 @@ public final class ClusterMetricsUpdateMessage implements Message { /** Single node metrics message. */ @Order(0) - @Nullable private NodeFullMetricsMessage singleNodeMetricsMsg; + @Nullable NodeFullMetricsMessage singleNodeMetricsMsg; /** All-nodes cache metrics messages. */ @Order(1) - @Nullable private Map allNodesMetrics; + @Nullable Map allNodesMetrics; /** Default constructor. Required for {@link GridIoMessageFactory}. */ public ClusterMetricsUpdateMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java index 0ca3ee6800f6d..fe5f1671404dd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java @@ -32,12 +32,12 @@ public class NodeFullMetricsMessage implements Message { public static final short TYPE_CODE = 138; /** Node metrics wrapper message. */ - @Order(value = 0, method = "nodeMetricsMessage") - private NodeMetricsMessage nodeMetricsMsg; + @Order(0) + public NodeMetricsMessage nodeMetricsMsg; /** Cache metrics wrapper message. */ - @Order(value = 1, method = "cachesMetricsMessages") - private Map cachesMetricsMsgs; + @Order(1) + public Map cachesMetricsMsgs; /** Empty constructor for {@link GridIoMessageFactory}. */ public NodeFullMetricsMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java index 55b51cb041dba..6cef552e80617 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/NodeMetricsMessage.java @@ -37,224 +37,224 @@ public class NodeMetricsMessage implements Message { public static final short TYPE_CODE = 137; /** */ - @Order(value = 0) - private long lastUpdateTime = -1; + @Order(0) + public long lastUpdateTime = -1; /** */ - @Order(value = 1, method = "maximumActiveJobs") - private int maxActiveJobs = -1; + @Order(1) + public int maxActiveJobs = -1; /** */ - @Order(value = 2, method = "currentActiveJobs") - private int curActiveJobs = -1; + @Order(2) + public int curActiveJobs = -1; /** */ - @Order(value = 3, method = "averageActiveJobs") - private float avgActiveJobs = -1; + @Order(3) + public float avgActiveJobs = -1; /** */ - @Order(value = 4, method = "maximumWaitingJobs") - private int maxWaitingJobs = -1; + @Order(4) + public int maxWaitingJobs = -1; /** */ - @Order(value = 5, method = "currentWaitingJobs") - private int curWaitingJobs = -1; + @Order(5) + public int curWaitingJobs = -1; /** */ - @Order(value = 6, method = "averageWaitingJobs") - private float avgWaitingJobs = -1; + @Order(6) + public float avgWaitingJobs = -1; /** */ - @Order(value = 7, method = "maximumRejectedJobs") - private int maxRejectedJobs = -1; + @Order(7) + public int maxRejectedJobs = -1; /** */ - @Order(value = 8, method = "currentRejectedJobs") - private int curRejectedJobs = -1; + @Order(8) + public int curRejectedJobs = -1; /** */ - @Order(value = 9, method = "averageRejectedJobs") - private float avgRejectedJobs = -1; + @Order(9) + public float avgRejectedJobs = -1; /** */ - @Order(value = 10, method = "maximumCancelledJobs") - private int maxCancelledJobs = -1; + @Order(10) + public int maxCancelledJobs = -1; /** */ - @Order(value = 11, method = "currentCancelledJobs") - private int curCancelledJobs = -1; + @Order(11) + public int curCancelledJobs = -1; /** */ - @Order(value = 12, method = "averageCancelledJobs") - private float avgCancelledJobs = -1; + @Order(12) + public float avgCancelledJobs = -1; /** */ - @Order(value = 13) - private int totalRejectedJobs = -1; + @Order(13) + public int totalRejectedJobs = -1; /** */ - @Order(value = 14) - private int totalCancelledJobs = -1; + @Order(14) + public int totalCancelledJobs = -1; /** */ - @Order(value = 15) - private int totalExecutedJobs = -1; + @Order(15) + public int totalExecutedJobs = -1; /** */ - @Order(value = 16, method = "maximumJobWaitTime") - private long maxJobWaitTime = -1; + @Order(16) + public long maxJobWaitTime = -1; /** */ - @Order(value = 17, method = "currentJobWaitTime") - private long curJobWaitTime = Long.MAX_VALUE; + @Order(17) + public long curJobWaitTime = Long.MAX_VALUE; /** */ - @Order(value = 18, method = "averageJobWaitTime") - private double avgJobWaitTime = -1; + @Order(18) + public double avgJobWaitTime = -1; /** */ - @Order(value = 19, method = "maximumJobExecuteTime") - private long maxJobExecTime = -1; + @Order(19) + public long maxJobExecTime = -1; /** */ - @Order(value = 20, method = "currentJobExecuteTime") - private long curJobExecTime = -1; + @Order(20) + public long curJobExecTime = -1; /** */ - @Order(value = 21, method = "averageJobExecuteTime") - private double avgJobExecTime = -1; + @Order(21) + public double avgJobExecTime = -1; /** */ - @Order(value = 22, method = "totalExecutedTasks") - private int totalExecTasks = -1; + @Order(22) + public int totalExecTasks = -1; /** */ - @Order(value = 23) - private long totalIdleTime = -1; + @Order(23) + public long totalIdleTime = -1; /** */ - @Order(value = 24, method = "currentIdleTime") - private long curIdleTime = -1; + @Order(24) + public long curIdleTime = -1; /** */ - @Order(value = 25) - private int totalCpus = -1; + @Order(25) + public int totalCpus = -1; /** */ - @Order(value = 26, method = "currentCpuLoad") - private double curCpuLoad = -1; + @Order(26) + public double curCpuLoad = -1; /** */ - @Order(value = 27, method = "averageCpuLoad") - private double avgCpuLoad = -1; + @Order(27) + public double avgCpuLoad = -1; /** */ - @Order(value = 28, method = "currentGcCpuLoad") - private double curGcCpuLoad = -1; + @Order(28) + public double curGcCpuLoad = -1; /** */ - @Order(value = 29, method = "heapMemoryInitialized") - private long heapInit = -1; + @Order(29) + public long heapInit = -1; /** */ - @Order(value = 30, method = "heapMemoryUsed") - private long heapUsed = -1; + @Order(30) + public long heapUsed = -1; /** */ - @Order(value = 31, method = "heapMemoryCommitted") - private long heapCommitted = -1; + @Order(31) + public long heapCommitted = -1; /** */ - @Order(value = 32, method = "heapMemoryMaximum") - private long heapMax = -1; + @Order(32) + public long heapMax = -1; /** */ - @Order(value = 33, method = "heapMemoryTotal") - private long heapTotal = -1; + @Order(33) + public long heapTotal = -1; /** */ - @Order(value = 34, method = "nonHeapMemoryInitialized") - private long nonHeapInit = -1; + @Order(34) + public long nonHeapInit = -1; /** */ - @Order(value = 35, method = "nonHeapMemoryUsed") - private long nonHeapUsed = -1; + @Order(35) + public long nonHeapUsed = -1; /** */ - @Order(value = 36, method = "nonHeapMemoryCommitted") - private long nonHeapCommitted = -1; + @Order(36) + public long nonHeapCommitted = -1; /** */ - @Order(value = 37, method = "nonHeapMemoryMaximum") - private long nonHeapMax = -1; + @Order(37) + public long nonHeapMax = -1; /** */ - @Order(value = 38, method = "nonHeapMemoryTotal") - private long nonHeapTotal = -1; + @Order(38) + public long nonHeapTotal = -1; /** */ - @Order(value = 39) - private long upTime = -1; + @Order(39) + public long upTime = -1; /** */ - @Order(value = 40) - private long startTime = -1; + @Order(40) + public long startTime = -1; /** */ - @Order(value = 41) - private long nodeStartTime = -1; + @Order(41) + public long nodeStartTime = -1; /** */ - @Order(value = 42, method = "currentThreadCount") - private int threadCnt = -1; + @Order(42) + public int threadCnt = -1; /** */ - @Order(value = 43, method = "maximumThreadCount") - private int peakThreadCnt = -1; + @Order(43) + public int peakThreadCnt = -1; /** */ - @Order(value = 44, method = "totalStartedThreadCount") - private long startedThreadCnt = -1; + @Order(44) + public long startedThreadCnt = -1; /** */ - @Order(value = 45, method = "currentDaemonThreadCount") - private int daemonThreadCnt = -1; + @Order(45) + public int daemonThreadCnt = -1; /** */ - @Order(value = 46, method = "lastDataVersion") - private long lastDataVer = -1; + @Order(46) + public long lastDataVer = -1; /** */ - @Order(value = 47, method = "sentMessagesCount") - private int sentMsgsCnt = -1; + @Order(47) + public int sentMsgsCnt = -1; /** */ - @Order(value = 48, method = "sentBytesCount") - private long sentBytesCnt = -1; + @Order(48) + public long sentBytesCnt = -1; /** */ - @Order(value = 49, method = "receivedMessagesCount") - private int rcvdMsgsCnt = -1; + @Order(49) + public int rcvdMsgsCnt = -1; /** */ - @Order(value = 50, method = "receivedBytesCount") - private long rcvdBytesCnt = -1; + @Order(50) + public long rcvdBytesCnt = -1; /** */ - @Order(value = 51, method = "outboundMessagesQueueSize") - private int outMesQueueSize = -1; + @Order(51) + public int outMesQueueSize = -1; /** */ - @Order(value = 52) - private int totalNodes = -1; + @Order(52) + public int totalNodes = -1; /** */ - @Order(value = 53, method = "totalJobsExecutionTime") - private long totalJobsExecTime = -1; + @Order(53) + public long totalJobsExecTime = -1; /** */ - @Order(value = 54, method = "currentPmeDuration") - private long curPmeDuration = -1; + @Order(54) + public long curPmeDuration = -1; /** */ public NodeMetricsMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java index bf12b906a3032..90e91aa2a5ef9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java @@ -31,15 +31,15 @@ public class ContinuousRoutineStartResultMessage implements Message { /** */ @Order(0) - private UUID routineId; + UUID routineId; /** */ - @Order(value = 1, method = "errorMessage") - private @Nullable ErrorMessage errMsg; + @Order(1) + @Nullable ErrorMessage errMsg; /** */ - @Order(value = 2, method = "countersMap") - private CachePartitionPartialCountersMap cntrsMap; + @Order(2) + CachePartitionPartialCountersMap cntrsMap; /** * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java index bd6f677fd70aa..f6669e3c4aa3c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java @@ -35,11 +35,11 @@ public class MissingMappingRequestMessage implements Message { /** */ @Order(0) - private byte platformId; + byte platformId; /** */ @Order(1) - private int typeId; + int typeId; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java index e617ca6f40abd..9423b141a0fbb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java @@ -28,15 +28,15 @@ public class MissingMappingResponseMessage implements Message { /** */ @Order(0) - private byte platformId; + byte platformId; /** */ @Order(1) - private int typeId; + int typeId; /** */ - @Order(value = 2, method = "className") - private String clsName; + @Order(2) + String clsName; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java index 52ea52119de82..06a267f4f876f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java @@ -26,8 +26,8 @@ */ public class GridQueryCancelRequest implements Message { /** */ - @Order(value = 0, method = "queryRequestId") - private long qryReqId; + @Order(0) + long qryReqId; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java index 0e0635588a269..946fcc54fc3ed 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java @@ -37,16 +37,16 @@ public class GridQueryFailResponse implements Message { public static final byte RETRY_QUERY = 2; /** */ - @Order(value = 0, method = "queryRequestId") - private long qryReqId; + @Order(0) + long qryReqId; /** */ - @Order(value = 1, method = "error") - private String errMsg; + @Order(1) + String errMsg; /** */ @Order(2) - private byte failCode; + byte failCode; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java index 5882f366da464..b2d59d569221a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java @@ -26,24 +26,24 @@ */ public class GridQueryNextPageRequest implements Message { /** */ - @Order(value = 0, method = "queryRequestId") - private long qryReqId; + @Order(0) + long qryReqId; /** */ @Order(1) - private int segmentId; + int segmentId; /** */ - @Order(value = 2, method = "query") - private int qry; + @Order(2) + int qry; /** */ @Order(3) - private int pageSize; + int pageSize; /** */ @Order(4) - private byte flags; + byte flags; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java index 5658f1af2ebeb..17cbc252db006 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java @@ -28,32 +28,32 @@ */ public class GridQueryNextPageResponse implements Message { /** */ - @Order(value = 0, method = "queryRequestId") - private long qryReqId; + @Order(0) + long qryReqId; /** */ @Order(1) - private int segmentId; + int segmentId; /** */ - @Order(value = 2, method = "query") - private int qry; + @Order(2) + int qry; /** */ @Order(3) - private int page; + int page; /** */ @Order(4) - private int allRows; + int allRows; /** */ - @Order(value = 5, method = "columns") - private int cols; + @Order(5) + int cols; /** */ - @Order(value = 6, method = "values") - private Collection vals; + @Order(6) + Collection vals; /** * Note, columns count in plain row can differ from {@link #cols}. @@ -64,15 +64,15 @@ public class GridQueryNextPageResponse implements Message { /** */ @Order(7) - private AffinityTopologyVersion retry; + AffinityTopologyVersion retry; /** Retry cause description. */ @Order(8) - private String retryCause; + String retryCause; /** Last page flag. */ @Order(9) - private boolean last; + boolean last; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java index 162629c777387..1adc8f4b258b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java @@ -30,16 +30,16 @@ public class GridQueryKillRequest implements Message { public static final short TYPE_CODE = 172; /** Request id. */ - @Order(value = 0, method = "requestId") - private long reqId; + @Order(0) + long reqId; /** Query id on a node. */ @Order(1) - private long nodeQryId; + long nodeQryId; /** Async response flag. */ - @Order(value = 2, method = "asyncResponse") - private boolean asyncRes; + @Order(2) + boolean asyncRes; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java index b0588dd290aac..114064afd2061 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillResponse.java @@ -30,12 +30,12 @@ public class GridQueryKillResponse implements Message { public static final short TYPE_CODE = 173; /** Error text. */ - @Order(value = 0, method = "error") - private String errMsg; + @Order(0) + String errMsg; /** Request id.*/ - @Order(value = 1, method = "requestId") - private long reqId; + @Order(1) + long reqId; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java index f49553c503ef9..f29669057ea97 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java @@ -28,23 +28,23 @@ */ public class SchemaOperationStatusMessage implements Message { /** Operation ID. */ - @Order(value = 0, method = "operationId") - private UUID opId; + @Order(0) + UUID opId; /** Error code. */ - @Order(value = 1, method = "errorCode") - private int errCode; + @Order(1) + int errCode; /** Error message. */ - @Order(value = 2, method = "errorMessage") - private String errMsg; + @Order(2) + String errMsg; /** Sender node ID. */ private UUID sndNodeId; /** No-op flag. */ @Order(3) - private boolean nop; + boolean nop; /** * Default constructor. 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 fa4a70889fd9d..5fc1e166944b6 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 @@ -27,11 +27,11 @@ public class GridTaskResultRequest implements Message { /** Task ID. */ @Order(0) - private IgniteUuid taskId; + IgniteUuid taskId; /** Topic ID. */ @Order(1) - private long topicId; + long topicId; /** * Empty constructor. 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 afd97872069e0..c974fcd31e7ab 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 @@ -32,20 +32,20 @@ public class GridTaskResultResponse implements Message { private @Nullable Object res; /** Serialized result. */ - @Order(value = 0, method = "resultBytes") - private byte[] resBytes; + @Order(0) + byte[] resBytes; /** Finished flag. */ @Order(1) - private boolean finished; + boolean finished; /** Flag indicating that task has ever been launched on node. */ @Order(2) - private boolean found; + boolean found; /** Error. */ - @Order(value = 3, method = "error") - private String err; + @Order(3) + String err; /** * @return Task result. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessId.java index 602a4b253ca95..6862408eb3181 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessId.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentProcessId.java @@ -35,12 +35,12 @@ public class ServiceDeploymentProcessId implements Message, Serializable { private static final long serialVersionUID = 0L; /** Topology version. */ - @Order(value = 0, method = "topologyVersion") - @Nullable private AffinityTopologyVersion topVer; + @Order(0) + @Nullable AffinityTopologyVersion topVer; /** Request's id. */ - @Order(value = 1, method = "requestId") - @Nullable private IgniteUuid reqId; + @Order(1) + @Nullable IgniteUuid reqId; /** * Empty constructor for marshalling purposes. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java index e0d689d330e01..6243a13db1af9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResultBatch.java @@ -32,14 +32,14 @@ */ public class ServiceSingleNodeDeploymentResultBatch implements Message { /** Deployment process id. */ - @Order(value = 0, method = "deploymentId") + @Order(0) @GridToStringInclude - private ServiceDeploymentProcessId depId; + ServiceDeploymentProcessId depId; /** Services deployments results. */ @Order(1) @GridToStringInclude - private Map results; + Map results; /** * Empty constructor for marshalling purposes. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java index 403519c5d6ded..bd77f4db9406d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java @@ -29,7 +29,7 @@ public class UUIDCollectionMessage implements Message { /** The collection of UUIDs that was wrapped. */ @Order(0) - private Collection uuids; + Collection uuids; /** * Empty constructor required for direct marshalling. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java index daa491113c22f..500ef4881c9b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java @@ -27,7 +27,7 @@ public class JobStealingRequest implements Message { /** Delta. */ @Order(0) - private int delta; + int delta; /** * Empty constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java index fa202b3157abf..82549317158cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java @@ -51,7 +51,6 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteTooManyOpenFilesException; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; -import org.apache.ignite.internal.codegen.HandshakeWaitMessageSerializer; import org.apache.ignite.internal.direct.DirectMessageWriter; import org.apache.ignite.internal.managers.GridManager; import org.apache.ignite.internal.managers.tracing.GridTracingManager; @@ -98,6 +97,7 @@ import org.apache.ignite.spi.communication.CommunicationListener; import org.apache.ignite.spi.communication.tcp.AttributeNames; import org.apache.ignite.spi.communication.tcp.messages.HandshakeMessage; +import org.apache.ignite.spi.communication.tcp.messages.HandshakeWaitMessageSerializer; import org.apache.ignite.spi.communication.tcp.messages.NodeIdMessage; import org.apache.ignite.spi.communication.tcp.messages.RecoveryLastReceivedMessage; import org.apache.ignite.spi.discovery.IgniteDiscoveryThread; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpHandshakeExecutor.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpHandshakeExecutor.java index fd86c7f455fb1..dd99c16202141 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpHandshakeExecutor.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpHandshakeExecutor.java @@ -25,7 +25,6 @@ import javax.net.ssl.SSLException; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; -import org.apache.ignite.internal.codegen.RecoveryLastReceivedMessageSerializer; import org.apache.ignite.internal.util.nio.ssl.BlockingSslHandler; import org.apache.ignite.internal.util.nio.ssl.GridSslMeta; import org.apache.ignite.internal.util.typedef.internal.U; @@ -37,6 +36,7 @@ import org.apache.ignite.spi.communication.tcp.messages.HandshakeMessage; import org.apache.ignite.spi.communication.tcp.messages.NodeIdMessage; import org.apache.ignite.spi.communication.tcp.messages.RecoveryLastReceivedMessage; +import org.apache.ignite.spi.communication.tcp.messages.RecoveryLastReceivedMessageSerializer; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.plugin.extensions.communication.Message.DIRECT_TYPE_SIZE; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java index 40c8e7216b304..795877a1940d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java @@ -29,8 +29,8 @@ */ public class TcpInverseConnectionResponseMessage implements TcpConnectionIndexAwareMessage { /** */ - @Order(value = 0, method = "connectionIndex") - private int connIdx; + @Order(0) + int connIdx; /** */ public TcpInverseConnectionResponseMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java index 7951170e02879..a39a0d38d506e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java @@ -35,19 +35,19 @@ public class HandshakeMessage implements Message { /** */ @Order(0) - private UUID nodeId; + UUID nodeId; /** */ - @Order(value = 1, method = "received") - private long rcvCnt; + @Order(1) + long rcvCnt; /** */ - @Order(value = 2, method = "connectCount") - private long connectCnt; + @Order(2) + long connectCnt; /** */ - @Order(value = 3, method = "connectionIndex") - private int connIdx; + @Order(3) + int connIdx; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java index 8b28a129d68e3..6adb5d5fb8fb9 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java @@ -35,7 +35,7 @@ public class NodeIdMessage implements Message { /** */ @Order(0) - private UUID nodeId; + UUID nodeId; /** */ public NodeIdMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java index df260bf10d5cd..3d48933edf484 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java @@ -50,8 +50,8 @@ public class RecoveryLastReceivedMessage implements Message { public static final int MESSAGE_FULL_SIZE = MESSAGE_SIZE + DIRECT_TYPE_SIZE; /** */ - @Order(value = 0, method = "received") - private long rcvCnt; + @Order(0) + long rcvCnt; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java index 9c33cbb73a9a4..e535807cf981b 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/DiscoveryDataPacket.java @@ -50,22 +50,22 @@ public class DiscoveryDataPacket implements Serializable, Message { /** */ @Order(0) - private UUID joiningNodeId; + UUID joiningNodeId; /** */ @Order(1) - private Map joiningNodeData = new HashMap<>(); + Map joiningNodeData = new HashMap<>(); /** */ private transient Map unmarshalledJoiningNodeData; /** */ @Order(2) - private Map commonData = new HashMap<>(); + Map commonData = new HashMap<>(); /** */ @Order(3) - private Map nodeSpecificData = new HashMap<>(); + Map nodeSpecificData = new HashMap<>(); /** */ private transient boolean joiningNodeClient; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java index 2903e94fcf9ab..d24b4bba61d99 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java @@ -29,11 +29,11 @@ public class InetAddressMessage implements Message { /** */ @Order(0) - private String hostName; + String hostName; /** */ - @Order(value = 1, method = "addressBytes") - private byte[] addrBytes; + @Order(1) + byte[] addrBytes; /** Default constructor for {@link DiscoveryMessageFactory}. */ public InetAddressMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java index 1ecb819b0bdfc..bcc535e9df1f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java @@ -26,7 +26,7 @@ public class InetSocketAddressMessage extends InetAddressMessage { /** */ @Order(2) - private int port; + int port; /** * Default constructor for {@link DiscoveryMessageFactory}. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/NodeSpecificData.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/NodeSpecificData.java index ea3d4ea66478e..cda65035091cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/NodeSpecificData.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/NodeSpecificData.java @@ -33,7 +33,7 @@ public class NodeSpecificData implements Message, Serializable { /** Node specific data. */ @Order(0) - private Map nodeSpecificData; + Map nodeSpecificData; /** Constructor. */ public NodeSpecificData() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java index 17083499ec434..6408fc2b06c90 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java @@ -53,7 +53,7 @@ public abstract class TcpDiscoveryAbstractMessage implements Serializable { /** Message ID. */ @Order(0) - private IgniteUuid id; + IgniteUuid id; /** * Verifier node ID. @@ -63,21 +63,21 @@ public abstract class TcpDiscoveryAbstractMessage implements Serializable { * verification. */ @Order(1) - private UUID verifierNodeId; + UUID verifierNodeId; /** Topology version. */ - @Order(value = 2, method = "topologyVersion") - private long topVer; + @Order(2) + long topVer; /** Flags. */ @GridToStringExclude @Order(3) - private int flags; + int flags; /** */ @GridToStringInclude @Order(4) - private Set failedNodes; + Set failedNodes; /** * Default no-arg constructor for {@link Externalizable} interface. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java index 6b4e9c8872c74..0c229d54defba 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java @@ -33,8 +33,8 @@ public abstract class TcpDiscoveryAbstractTraceableMessage extends TcpDiscoveryA /** Serialization holder of {@link #spanContainer}'s bytes. */ @SuppressWarnings("unused") - @Order(value = 5, method = "spanBytes") - private @Nullable byte[] spanBytesHolder; + @Order(5) + @Nullable byte[] spanBytesHolder; /** * Default constructor for {@link DiscoveryMessageFactory}. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java index a11045294f4e0..694eaf6c97697 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java @@ -32,12 +32,12 @@ public class TcpDiscoveryAuthFailedMessage extends TcpDiscoveryAbstractMessage i private static final long serialVersionUID = 0L; /** Creator address. */ - @Order(value = 5, method = "creatorAddressMessage") - private InetAddressMessage creatorAddrMsg; + @Order(5) + InetAddressMessage creatorAddrMsg; /** Node id for which authentication was failed. */ @Order(6) - private UUID targetNodeId; + UUID targetNodeId; /** Default constructor for {@link DiscoveryMessageFactory}. */ public TcpDiscoveryAuthFailedMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java index 48eded601193e..b72f0dd57d72d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java @@ -30,8 +30,8 @@ public class TcpDiscoveryCheckFailedMessage extends TcpDiscoveryAbstractMessage private static final long serialVersionUID = 0L; /** Coordinator version. */ - @Order(value = 5, method = "error") - private String err; + @Order(5) + String err; /** */ public TcpDiscoveryCheckFailedMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java index 1711343d779de..8f0f7fcc4a7b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientAckResponse.java @@ -31,8 +31,8 @@ public class TcpDiscoveryClientAckResponse extends TcpDiscoveryAbstractMessage i private static final long serialVersionUID = 0L; /** */ - @Order(value = 5, method = "messageId") - private IgniteUuid msgId; + @Order(5) + IgniteUuid msgId; /** */ public TcpDiscoveryClientAckResponse() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java index f110c40e8cb92..49db31403bf33 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java @@ -34,8 +34,8 @@ public class TcpDiscoveryClientMetricsUpdateMessage extends TcpDiscoveryAbstract private static final long serialVersionUID = 0L; /** */ - @Order(value = 5, method = "metricsMessage") - private TcpDiscoveryNodeMetricsMessage metricsMsg; + @Order(5) + TcpDiscoveryNodeMetricsMessage metricsMsg; /** Constructor for {@link DiscoveryMessageFactory}. */ public TcpDiscoveryClientMetricsUpdateMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientNodesMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientNodesMetricsMessage.java index c09a7698b802e..f544151b73f14 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientNodesMetricsMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientNodesMetricsMessage.java @@ -27,8 +27,8 @@ /** Holds map of thick client or server metrics messages per node id. */ public class TcpDiscoveryClientNodesMetricsMessage implements Message { /** Map of nodes metrics messages per node id. */ - @Order(value = 0, method = "nodesMetricsMessages") - private Map nodesMetricsMsgs; + @Order(0) + Map nodesMetricsMsgs; /** Constructor for {@link DiscoveryMessageFactory}. */ public TcpDiscoveryClientNodesMetricsMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java index 59ccb01367848..cb588a765122f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java @@ -32,7 +32,7 @@ public class TcpDiscoveryClientPingRequest extends TcpDiscoveryAbstractMessage i /** Pinged client node ID. */ @Order(5) - private @Nullable UUID nodeToPing; + @Nullable UUID nodeToPing; /** */ public TcpDiscoveryClientPingRequest() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java index 039a40fde47db..9ab4b9c178232 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingResponse.java @@ -32,11 +32,11 @@ public class TcpDiscoveryClientPingResponse extends TcpDiscoveryAbstractMessage /** Pinged client node ID. */ @Order(5) - private @Nullable UUID nodeToPing; + @Nullable UUID nodeToPing; /** */ - @Order(value = 6, method = "result") - private boolean res; + @Order(6) + boolean res; /** */ public TcpDiscoveryClientPingResponse() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java index e4d601723fcf9..1e212a2e9b554 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java @@ -32,12 +32,12 @@ public class TcpDiscoveryDiscardMessage extends TcpDiscoveryAbstractMessage impl private static final long serialVersionUID = 0L; /** ID of the message to discard (this and all preceding). */ - @Order(value = 5, method = "messageId") - private IgniteUuid msgId; + @Order(5) + IgniteUuid msgId; /** True if this is discard ID for custom event message. */ - @Order(value = 6, method = "customMessageDiscard") - private boolean customMsgDiscard; + @Order(6) + boolean customMsgDiscard; /** */ public TcpDiscoveryDiscardMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java index c78d1b5284f75..93966689201df 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java @@ -32,7 +32,7 @@ public class TcpDiscoveryDuplicateIdMessage extends TcpDiscoveryAbstractMessage /** ID of the node with duplicate ID. */ @Order(5) - private UUID nodeId; + UUID nodeId; /** */ public TcpDiscoveryDuplicateIdMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java index 76c5d68a9f42c..6e23b5a39cdce 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeRequest.java @@ -32,12 +32,12 @@ public class TcpDiscoveryHandshakeRequest extends TcpDiscoveryAbstractMessage im private static final long serialVersionUID = 0L; /** */ - @Order(value = 5, method = "previousNodeId") - private @Nullable UUID prevNodeId; + @Order(5) + @Nullable UUID prevNodeId; /** */ @Order(6) - private @Nullable String dcId; + @Nullable String dcId; /** * Default constructor for {@link DiscoveryMessageFactory}. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java index 5a291cf712707..3d3d5559f9f3c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHandshakeResponse.java @@ -36,15 +36,15 @@ public class TcpDiscoveryHandshakeResponse extends TcpDiscoveryAbstractMessage i /** */ @Order(5) - private long order; + long order; /** */ - @Order(value = 6, method = "previousNodeAliveFlag") - private boolean prevNodeAliveFlag; + @Order(6) + boolean prevNodeAliveFlag; /** Redirect addresses messages serialization holder. */ - @Order(value = 7, method = "redirectAddressesMessages") - private @Nullable Collection redirectAddrsMsgs; + @Order(7) + @Nullable Collection redirectAddrsMsgs; /** * Default constructor for {@link DiscoveryMessageFactory}. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java index d9bca70b28861..50e4e1efcf187 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java @@ -32,12 +32,12 @@ public class TcpDiscoveryLoopbackProblemMessage extends TcpDiscoveryAbstractMess private static final long serialVersionUID = 0L; /** Remote node addresses. */ - @Order(value = 5, method = "addresses") - private Collection addrs; + @Order(5) + Collection addrs; /** Remote node host names. */ @Order(6) - private Collection hostNames; + Collection hostNames; /** */ public TcpDiscoveryLoopbackProblemMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java index 8b2ccfaf31fa9..b11b9e77a4835 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java @@ -54,17 +54,17 @@ public class TcpDiscoveryMetricsUpdateMessage extends TcpDiscoveryAbstractMessag /** Connected clients metrics: server id -> client id -> clients metrics. */ @GridToStringExclude - @Order(value = 5, method = "connectedClientsMetricsMessages") - private Map connectedClientsMetricsMsgs; + @Order(5) + Map connectedClientsMetricsMsgs; /** Servers full metrics: server id -> server metrics + metrics of server's caches. */ @GridToStringExclude - @Order(value = 6, method = "serversFullMetricsMessages") - private @Nullable Map serversFullMetricsMsgs; + @Order(6) + @Nullable Map serversFullMetricsMsgs; /** Client node IDs. */ - @Order(value = 7) - private @Nullable Set clientNodeIds; + @Order(7) + @Nullable Set clientNodeIds; /** Constructor for {@link DiscoveryMessageFactory}. */ public TcpDiscoveryMetricsUpdateMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java index 7e75a16853d33..96a9b1582af60 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java @@ -42,23 +42,22 @@ public class TcpDiscoveryNodeAddFinishedMessage extends TcpDiscoveryAbstractTrac /** Added node ID. */ @Order(6) - private UUID nodeId; + UUID nodeId; /** * Client node can not get discovery data from TcpDiscoveryNodeAddedMessage, we have to pass discovery data in * TcpDiscoveryNodeAddFinishedMessage. */ @Order(7) - @GridToStringExclude - private DiscoveryDataPacket clientDiscoData; + @GridToStringExclude DiscoveryDataPacket clientDiscoData; /** */ @GridToStringExclude private Map clientNodeAttrs; /** Serialized client node attributes. */ - @Order(value = 8, method = "clientNodeAttributesBytes") - private @Nullable byte[] clientNodeAttrsBytes; + @Order(8) + @Nullable byte[] clientNodeAttrsBytes; /** Constructor. */ public TcpDiscoveryNodeAddFinishedMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java index e1dbb975b646a..db9789966ce52 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java @@ -35,15 +35,15 @@ public class TcpDiscoveryNodeFailedMessage extends TcpDiscoveryAbstractTraceable /** ID of the failed node. */ @Order(6) - private UUID failedNodeId; + UUID failedNodeId; /** Internal order of the failed node. */ - @Order(value = 7, method = "internalOrder") - private long order; + @Order(7) + long order; /** */ @Order(8) - private String warning; + String warning; /** Constructor. */ public TcpDiscoveryNodeFailedMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java index 7a05965eaa2b6..3e9db33564ffc 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java @@ -32,7 +32,7 @@ public class TcpDiscoveryPingRequest extends TcpDiscoveryAbstractMessage impleme /** Pinged client node ID. */ @Order(5) - private @Nullable UUID clientNodeId; + @Nullable UUID clientNodeId; /** */ public TcpDiscoveryPingRequest() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java index 7a027a25c4ce8..ec93f1f2e9b81 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java @@ -31,7 +31,7 @@ public class TcpDiscoveryPingResponse extends TcpDiscoveryAbstractMessage implem /** Whether pinged client exists. */ @Order(5) - private boolean clientExists; + boolean clientExists; /** */ public TcpDiscoveryPingResponse() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java index 5a30d6367f035..b9db8228b9c4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java @@ -31,12 +31,12 @@ public class TcpDiscoveryRingLatencyCheckMessage extends TcpDiscoveryAbstractMes private static final long serialVersionUID = 0L; /** Maximal hops number. */ - @Order(value = 5, method = "maximalHops") - private int maxHops; + @Order(5) + int maxHops; /** Current hops reached. */ - @Order(value = 6, method = "currentHops") - private int curHops; + @Order(6) + int curHops; /** Empty constructor for {@link DiscoveryMessageFactory}. */ public TcpDiscoveryRingLatencyCheckMessage() { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java index 8d04b4f6d90d1..914065189ed45 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java @@ -47,16 +47,16 @@ public class TcpDiscoveryStatusCheckMessage extends TcpDiscoveryAbstractMessage public static final int STATUS_RECON = 2; /** Creator node addresses. */ - @Order(value = 5, method = "creatorNodeAddressesMessages") - @Nullable private Collection creatorNodeAddrsMsgs; + @Order(5) + @Nullable Collection creatorNodeAddrsMsgs; /** Failed node id. */ @Order(6) - @Nullable private UUID failedNodeId; + @Nullable UUID failedNodeId; /** Creator node status (initialized by coordinator). */ @Order(7) - private int status; + int status; /** Empty constructor for {@link DiscoveryMessageFactory}. */ public TcpDiscoveryStatusCheckMessage() { diff --git a/modules/core/src/test/resources/codegen/TestMessage.java b/modules/core/src/test/resources/codegen/TestMessage.java index edc66e73e9b7e..1765f6498e27c 100644 --- a/modules/core/src/test/resources/codegen/TestMessage.java +++ b/modules/core/src/test/resources/codegen/TestMessage.java @@ -62,16 +62,16 @@ public class TestMessage implements Message { @Order(10) private BitSet bitSet; - @Order(value = 11, method = "overridenFieldMethod") + @Order(11) private String field; - @Order(value = 12) + @Order(12) private KeyCacheObject keyCacheObject; - @Order(value = 13) + @Order(13) private CacheObject cacheObject; - @Order(value = 14) + @Order(14) private GridLongList gridLongList; public int id() { From 4c84a35fa5c3be246b69b86d4951690536a7bd29 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Tue, 17 Feb 2026 20:11:07 +0300 Subject: [PATCH 02/42] WIP --- .../internal/MessageSerializerGenerator.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java index 87a32e85120cd..8a3a21a56ecec 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java @@ -150,10 +150,10 @@ void generate(TypeElement type, List fields) throws Exception { /** */ private static List getAllSuperclasses(Types typeUtils, TypeMirror typeMirror) { List superclasses = new ArrayList<>(); - TypeMirror currentMirror = typeMirror; + TypeMirror curMirror = typeMirror; - while (currentMirror != null && currentMirror.getKind() == TypeKind.DECLARED) { - TypeElement typeElement = (TypeElement)typeUtils.asElement(currentMirror); + while (curMirror != null && curMirror.getKind() == TypeKind.DECLARED) { + TypeElement typeElement = (TypeElement)typeUtils.asElement(curMirror); TypeMirror directSuperclass = typeElement.getSuperclass(); if (directSuperclass == null || @@ -163,7 +163,7 @@ private static List getAllSuperclasses(Types typeUtils, TypeMirror t } superclasses.add(directSuperclass); - currentMirror = directSuperclass; + curMirror = directSuperclass; } return superclasses; @@ -524,11 +524,18 @@ private void returnFalseIfWriteFailed(Collection code, VariableElement f /** * Generate code of writing single enum field mapped with EnumMapper: */ - private void returnFalseIfEnumWriteFailed(Collection code, VariableElement field, String writerCall, String mapperCall, String fieldGetterCall) { + private void returnFalseIfEnumWriteFailed( + Collection code, + VariableElement field, + String writerCall, + String mapperCall, + String fieldGetterCall) + { String methodName = field.getAnnotation(Order.class).method(); if (Objects.equals(methodName, "")) - code.add(line("if (!%s(%s(((%s)msg).%s)))", writerCall, mapperCall, field.getEnclosingElement().getSimpleName(), fieldGetterCall)); + code.add(line("if (!%s(%s(((%s)msg).%s)))", + writerCall, mapperCall, field.getEnclosingElement().getSimpleName(), fieldGetterCall)); else code.add(line("if (!%s(%s(msg.%s)))", writerCall, mapperCall, fieldGetterCall)); @@ -606,7 +613,7 @@ else if (sameType(type, BitSet.class)) returnFalseIfReadFailed(field, "reader.readBitSet"); else if (sameType(type, UUID.class)) - returnFalseIfReadFailed(field , "reader.readUuid"); + returnFalseIfReadFailed(field, "reader.readUuid"); else if (sameType(type, "org.apache.ignite.lang.IgniteUuid")) returnFalseIfReadFailed(field, "reader.readIgniteUuid"); @@ -756,7 +763,8 @@ private void returnFalseIfReadFailed(VariableElement field, String mtd, String.. String methodName = field.getAnnotation(Order.class).method(); if (Objects.equals(methodName, "")) - read.add(line("((%s)msg).%s = %s(%s);", field.getEnclosingElement().getSimpleName(), field.getSimpleName().toString(), mtd, argsStr)); + read.add(line("((%s)msg).%s = %s(%s);", + field.getEnclosingElement().getSimpleName(), field.getSimpleName().toString(), mtd, argsStr)); else read.add(line("msg.%s(%s(%s));", methodName, mtd, argsStr)); From b8bc6eef7b057a36cf6d8982d0f65adfcb6f94a8 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Tue, 17 Feb 2026 20:16:56 +0300 Subject: [PATCH 03/42] WIP --- .../org/apache/ignite/internal/MessageSerializerGenerator.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java index 8a3a21a56ecec..dc196bc0ed07f 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java @@ -529,8 +529,7 @@ private void returnFalseIfEnumWriteFailed( VariableElement field, String writerCall, String mapperCall, - String fieldGetterCall) - { + String fieldGetterCall) { String methodName = field.getAnnotation(Order.class).method(); if (Objects.equals(methodName, "")) From 6ef7dc2712f3429b8f182eb64fcc4e3c193f05d6 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Tue, 17 Feb 2026 21:18:04 +0300 Subject: [PATCH 04/42] WIP --- .../internal/MessageSerializerGenerator.java | 77 +++--- .../codegen/MessageProcessorTest.java | 16 +- .../resources/codegen/AbstractMessage.java | 10 +- .../test/resources/codegen/ChildMessage.java | 10 +- .../codegen/ChildMessageSerializer.java | 16 +- .../CustomMapperEnumFieldsMessage.java | 10 +- ...stomMapperEnumFieldsMessageSerializer.java | 7 +- .../CustomMapperEnumFieldsSecondMessage.java | 10 +- .../DefaultMapperEnumFieldsMessage.java | 20 +- ...aultMapperEnumFieldsMessageSerializer.java | 16 +- .../DefaultMapperEnumFieldsSecondMessage.java | 10 +- .../codegen/TestCollectionsMessage.java | 250 ++---------------- .../TestCollectionsMessageSerializer.java | 103 ++++---- .../resources/codegen/TestMapMessage.java | 240 ++--------------- .../codegen/TestMapMessageSerializer.java | 99 ++++--- .../test/resources/codegen/TestMessage.java | 151 ++--------- .../codegen/TestMessageSerializer.java | 67 +++-- 17 files changed, 275 insertions(+), 837 deletions(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java index dc196bc0ed07f..09a7cfe934541 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java @@ -234,34 +234,34 @@ private void generateMethods(TypeElement type, List fields) thr private void start(TypeElement type, Collection code, boolean write) { indent = 1; - code.add(line(METHOD_JAVADOC)); + code.add(identedLine(METHOD_JAVADOC)); - code.add(line("@Override public boolean %s(Message m, %s) {", + code.add(identedLine("@Override public boolean %s(Message m, %s) {", write ? "writeTo" : "readFrom", write ? "MessageWriter writer" : "MessageReader reader")); indent++; - code.add(line("%s msg = (%s)m;", type.getSimpleName().toString(), type.getSimpleName().toString())); + code.add(identedLine("%s msg = (%s)m;", type.getSimpleName().toString(), type.getSimpleName().toString())); code.add(EMPTY); if (write) { - code.add(line("if (!writer.isHeaderWritten()) {")); + code.add(identedLine("if (!writer.isHeaderWritten()) {")); indent++; returnFalseIfWriteFailed(code, "writer.writeHeader", "directType()"); code.add(EMPTY); - code.add(line("writer.onHeaderWritten();")); + code.add(identedLine("writer.onHeaderWritten();")); indent--; - code.add(line("}")); + code.add(identedLine("}")); code.add(EMPTY); } - code.add(line("switch (%s.state()) {", write ? "writer" : "reader")); + code.add(identedLine("switch (%s.state()) {", write ? "writer" : "reader")); } /** @@ -290,14 +290,14 @@ private void processField(VariableElement field, int opt) throws Exception { * @param opt Case option. */ private void writeField(VariableElement field, int opt) throws Exception { - write.add(line("case %d:", opt)); + write.add(identedLine("case %d:", opt)); indent++; returnFalseIfWriteFailed(field); write.add(EMPTY); - write.add(line("writer.incrementState();")); + write.add(identedLine("writer.incrementState();")); write.add(EMPTY); indent--; @@ -318,14 +318,14 @@ private void writeField(VariableElement field, int opt) throws Exception { * @param opt Case option. */ private void readField(VariableElement field, int opt) throws Exception { - read.add(line("case %d:", opt)); + read.add(identedLine("case %d:", opt)); indent++; returnFalseIfReadFailed(field); read.add(EMPTY); - read.add(line("reader.incrementState();")); + read.add(identedLine("reader.incrementState();")); read.add(EMPTY); indent--; @@ -492,11 +492,11 @@ private String typeNameToFieldName(String typeName) { private void returnFalseIfWriteFailed(Collection code, String accessor, @Nullable String... args) { String argsStr = String.join(", ", args); - code.add(line("if (!%s(msg.%s))", accessor, argsStr)); + code.add(identedLine("if (!%s(msg.%s))", accessor, argsStr)); indent++; - code.add(line(RETURN_FALSE_STMT)); + code.add(identedLine(RETURN_FALSE_STMT)); indent--; } @@ -510,13 +510,13 @@ private void returnFalseIfWriteFailed(Collection code, VariableElement f String methodName = field.getAnnotation(Order.class).method(); if (Objects.equals(methodName, "")) - code.add(line("if (!%s(((%s)msg).%s))", accessor, field.getEnclosingElement().getSimpleName(), argsStr)); + code.add(identedLine("if (!%s(((%s)msg).%s))", accessor, field.getEnclosingElement().getSimpleName(), argsStr)); else - code.add(line("if (!%s(msg.%s))", accessor, argsStr)); + code.add(identedLine("if (!%s(msg.%s))", accessor, argsStr)); indent++; - code.add(line(RETURN_FALSE_STMT)); + code.add(identedLine(RETURN_FALSE_STMT)); indent--; } @@ -533,14 +533,14 @@ private void returnFalseIfEnumWriteFailed( String methodName = field.getAnnotation(Order.class).method(); if (Objects.equals(methodName, "")) - code.add(line("if (!%s(%s(((%s)msg).%s)))", + code.add(identedLine("if (!%s(%s(((%s)msg).%s)))", writerCall, mapperCall, field.getEnclosingElement().getSimpleName(), fieldGetterCall)); else - code.add(line("if (!%s(%s(msg.%s)))", writerCall, mapperCall, fieldGetterCall)); + code.add(identedLine("if (!%s(%s(msg.%s)))", writerCall, mapperCall, fieldGetterCall)); indent++; - code.add(line(RETURN_FALSE_STMT)); + code.add(identedLine(RETURN_FALSE_STMT)); indent--; } @@ -762,18 +762,18 @@ private void returnFalseIfReadFailed(VariableElement field, String mtd, String.. String methodName = field.getAnnotation(Order.class).method(); if (Objects.equals(methodName, "")) - read.add(line("((%s)msg).%s = %s(%s);", + read.add(identedLine("((%s)msg).%s = %s(%s);", field.getEnclosingElement().getSimpleName(), field.getSimpleName().toString(), mtd, argsStr)); else - read.add(line("msg.%s(%s(%s));", methodName, mtd, argsStr)); + read.add(identedLine("msg.%s(%s(%s));", methodName, mtd, argsStr)); read.add(EMPTY); - read.add(line("if (!reader.isLastRead())")); + read.add(identedLine("if (!reader.isLastRead())")); indent++; - read.add(line(RETURN_FALSE_STMT)); + read.add(identedLine(RETURN_FALSE_STMT)); indent--; } @@ -794,17 +794,17 @@ private void returnFalseIfEnumReadFailed(VariableElement field, String mapperDec String methodName = field.getAnnotation(Order.class).method(); if (Objects.equals(methodName, "")) - read.add(line("((%s)msg).%s = %s;", field.getEnclosingElement().getSimpleName(), field.getSimpleName().toString(), readOp)); + read.add(identedLine("((%s)msg).%s = %s;", field.getEnclosingElement().getSimpleName(), field.getSimpleName().toString(), readOp)); else - read.add(line("msg.%s(%s);", methodName, readOp)); + read.add(identedLine("msg.%s(%s);", methodName, readOp)); read.add(EMPTY); - read.add(line("if (!reader.isLastRead())")); + read.add(identedLine("if (!reader.isLastRead())")); indent++; - read.add(line(RETURN_FALSE_STMT)); + read.add(identedLine(RETURN_FALSE_STMT)); indent--; } @@ -816,10 +816,10 @@ private void finish(List code) { if (EMPTY.equals(lastLine)) code.remove(code.size() - 1); - code.add(line("}")); + code.add(identedLine("}")); code.add(EMPTY); - code.add(line("return true;")); + code.add(identedLine("return true;")); } /** @@ -827,7 +827,7 @@ private void finish(List code) { * * @return Line with current indent. */ - private String line(String format, Object... args) { + private String identedLine(String format, Object... args) { SB sb = new SB(); for (int i = 0; i < indent; i++) @@ -838,6 +838,19 @@ private String line(String format, Object... args) { return sb.toString(); } + /** + * Creates line from given arguments. + * + * @return Line. + */ + private String line(String format, Object... args) { + SB sb = new SB(); + + sb.a(String.format(format, args)); + + return sb.toString(); + } + /** Write serializer class fields: enum values, custom enum mappers. */ private void writeClassFields(Writer writer) throws IOException { if (fields.isEmpty()) @@ -846,9 +859,9 @@ private void writeClassFields(Writer writer) throws IOException { indent = 1; for (String field: fields) { - writer.write(line(METHOD_JAVADOC)); + writer.write(identedLine(METHOD_JAVADOC)); writer.write(NL); - writer.write(line(field)); + writer.write(identedLine(field)); writer.write(NL); } writer.write(NL); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/codegen/MessageProcessorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/codegen/MessageProcessorTest.java index 75eb529616c42..7ddf1fa7e2448 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/codegen/MessageProcessorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/codegen/MessageProcessorTest.java @@ -52,7 +52,7 @@ public void testProcessorGeneratesSerializer() { assertEquals(1, compilation.generatedSourceFiles().size()); assertThat(compilation) - .generatedSourceFile("org.apache.ignite.internal.codegen.TestMessageSerializer") + .generatedSourceFile("org.apache.ignite.internal.TestMessageSerializer") .hasSourceEquivalentTo(javaFile("TestMessageSerializer.java")); } @@ -66,7 +66,7 @@ public void testCollectionsMessage() { assertEquals(1, compilation.generatedSourceFiles().size()); assertThat(compilation) - .generatedSourceFile("org.apache.ignite.internal.codegen.TestCollectionsMessageSerializer") + .generatedSourceFile("org.apache.ignite.internal.TestCollectionsMessageSerializer") .hasSourceEquivalentTo(javaFile("TestCollectionsMessageSerializer.java")); } @@ -80,7 +80,7 @@ public void testMapMessage() { assertEquals(1, compilation.generatedSourceFiles().size()); assertThat(compilation) - .generatedSourceFile("org.apache.ignite.internal.codegen.TestMapMessageSerializer") + .generatedSourceFile("org.apache.ignite.internal.TestMapMessageSerializer") .hasSourceEquivalentTo(javaFile("TestMapMessageSerializer.java")); } @@ -127,7 +127,7 @@ public void testInheritedMessages() { assertEquals(1, compilation.generatedSourceFiles().size()); assertThat(compilation) - .generatedSourceFile("org.apache.ignite.internal.codegen.ChildMessageSerializer") + .generatedSourceFile("org.apache.ignite.internal.ChildMessageSerializer") .hasSourceEquivalentTo(javaFile("ChildMessageSerializer.java")); } @@ -141,11 +141,11 @@ public void testMultipleMessages() { assertEquals(2, compilation.generatedSourceFiles().size()); assertThat(compilation) - .generatedSourceFile("org.apache.ignite.internal.codegen.ChildMessageSerializer") + .generatedSourceFile("org.apache.ignite.internal.ChildMessageSerializer") .hasSourceEquivalentTo(javaFile("ChildMessageSerializer.java")); assertThat(compilation) - .generatedSourceFile("org.apache.ignite.internal.codegen.TestMessageSerializer") + .generatedSourceFile("org.apache.ignite.internal.TestMessageSerializer") .hasSourceEquivalentTo(javaFile("TestMessageSerializer.java")); } @@ -184,7 +184,7 @@ public void testDefaultMapperEnumFields() { assertThat(compilation).succeeded(); assertThat(compilation) - .generatedSourceFile("org.apache.ignite.internal.codegen.DefaultMapperEnumFieldsMessageSerializer") + .generatedSourceFile("org.apache.ignite.internal.DefaultMapperEnumFieldsMessageSerializer") .hasSourceEquivalentTo(javaFile("DefaultMapperEnumFieldsMessageSerializer.java")); } @@ -224,7 +224,7 @@ public void testCustomMapperEnumFieldsMessage() { assertThat(compilation).succeeded(); assertThat(compilation) - .generatedSourceFile("org.apache.ignite.internal.codegen.CustomMapperEnumFieldsMessageSerializer") + .generatedSourceFile("org.apache.ignite.internal.CustomMapperEnumFieldsMessageSerializer") .hasSourceEquivalentTo(javaFile("CustomMapperEnumFieldsMessageSerializer.java")); } diff --git a/modules/core/src/test/resources/codegen/AbstractMessage.java b/modules/core/src/test/resources/codegen/AbstractMessage.java index 93b630d2f481b..a309841ba5c4a 100644 --- a/modules/core/src/test/resources/codegen/AbstractMessage.java +++ b/modules/core/src/test/resources/codegen/AbstractMessage.java @@ -24,15 +24,7 @@ public abstract class AbstractMessage implements Message { @Order(0) - private int id; - - public int id() { - return id; - } - - public void id(int id) { - this.id = id; - } + int id; public short directType() { return 0; diff --git a/modules/core/src/test/resources/codegen/ChildMessage.java b/modules/core/src/test/resources/codegen/ChildMessage.java index 7c23e43b3f5a9..151fcc0926964 100644 --- a/modules/core/src/test/resources/codegen/ChildMessage.java +++ b/modules/core/src/test/resources/codegen/ChildMessage.java @@ -22,13 +22,5 @@ public class ChildMessage extends AbstractMessage { @Order(1) - private String str; - - public String str() { - return str; - } - - public void str(String str) { - this.str = str; - } + String str; } diff --git a/modules/core/src/test/resources/codegen/ChildMessageSerializer.java b/modules/core/src/test/resources/codegen/ChildMessageSerializer.java index c4d3599e97b71..b16282528490c 100644 --- a/modules/core/src/test/resources/codegen/ChildMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/ChildMessageSerializer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.ignite.internal.codegen; +package org.apache.ignite.internal; -import org.apache.ignite.internal.ChildMessage; +import org.apache.ignite.internal.AbstractMessage; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageReader; import org.apache.ignite.plugin.extensions.communication.MessageSerializer; @@ -26,7 +26,7 @@ /** * This class is generated automatically. * - * @see org.apache.ignite.codegen.MessageSerializerGenerator + * @see org.apache.ignite.internal.MessageProcessor */ public class ChildMessageSerializer implements MessageSerializer { /** */ @@ -42,13 +42,13 @@ public class ChildMessageSerializer implements MessageSerializer { switch (writer.state()) { case 0: - if (!writer.writeInt(msg.id())) + if (!writer.writeInt(((AbstractMessage)msg).id)) return false; writer.incrementState(); case 1: - if (!writer.writeString(msg.str())) + if (!writer.writeString(((ChildMessage)msg).str)) return false; writer.incrementState(); @@ -63,7 +63,7 @@ public class ChildMessageSerializer implements MessageSerializer { switch (reader.state()) { case 0: - msg.id(reader.readInt()); + ((AbstractMessage)msg).id = reader.readInt(); if (!reader.isLastRead()) return false; @@ -71,7 +71,7 @@ public class ChildMessageSerializer implements MessageSerializer { reader.incrementState(); case 1: - msg.str(reader.readString()); + ((ChildMessage)msg).str = reader.readString(); if (!reader.isLastRead()) return false; @@ -81,4 +81,4 @@ public class ChildMessageSerializer implements MessageSerializer { return true; } -} +} \ No newline at end of file diff --git a/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessage.java b/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessage.java index a681362e794ef..1cdf20fc579bc 100644 --- a/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessage.java +++ b/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessage.java @@ -23,15 +23,7 @@ public class CustomMapperEnumFieldsMessage implements Message { @Order(0) @CustomMapper("org.apache.ignite.internal.TransactionIsolationEnumMapper") - private TransactionIsolation txMode; - - public TransactionIsolation txMode() { - return txMode; - } - - public void txMode(TransactionIsolation txMode) { - this.txMode = txMode; - } + TransactionIsolation txMode; public short directType() { return 0; diff --git a/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessageSerializer.java b/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessageSerializer.java index 011e5424e8a78..17e0d4b1d39f7 100644 --- a/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessageSerializer.java @@ -15,9 +15,8 @@ * limitations under the License. */ -package org.apache.ignite.internal.codegen; +package org.apache.ignite.internal; -import org.apache.ignite.internal.CustomMapperEnumFieldsMessage; import org.apache.ignite.internal.TransactionIsolationEnumMapper; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageReader; @@ -48,7 +47,7 @@ public class CustomMapperEnumFieldsMessageSerializer implements MessageSerialize switch (writer.state()) { case 0: - if (!writer.writeByte(transactionIsolationMapper.encode(msg.txMode()))) + if (!writer.writeByte(transactionIsolationMapper.encode(((CustomMapperEnumFieldsMessage)msg).txMode))) return false; writer.incrementState(); @@ -63,7 +62,7 @@ public class CustomMapperEnumFieldsMessageSerializer implements MessageSerialize switch (reader.state()) { case 0: - msg.txMode(transactionIsolationMapper.decode(reader.readByte())); + ((CustomMapperEnumFieldsMessage)msg).txMode = transactionIsolationMapper.decode(reader.readByte()); if (!reader.isLastRead()) return false; diff --git a/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsSecondMessage.java b/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsSecondMessage.java index 9b5bc91d0326a..3965d264a1d46 100644 --- a/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsSecondMessage.java +++ b/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsSecondMessage.java @@ -23,15 +23,7 @@ public class CustomMapperEnumFieldsSecondMessage implements Message { @Order(0) @CustomMapper("org.apache.ignite.internal.TransactionIsolationEnumMapper") - private TransactionIsolation txMode; - - public TransactionIsolation txMode() { - return txMode; - } - - public void txMode(TransactionIsolation txMode) { - this.txMode = txMode; - } + TransactionIsolation txMode; public short directType() { return 0; diff --git a/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessage.java b/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessage.java index ceaf1bfc23678..9af3651e327c1 100644 --- a/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessage.java +++ b/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessage.java @@ -23,26 +23,10 @@ public class DefaultMapperEnumFieldsMessage implements Message { @Order(0) - private TransactionIsolation publicEnum; + TransactionIsolation publicEnum; @Order(1) - private GridCacheOperation internalEnum; - - public TransactionIsolation publicEnum() { - return publicEnum; - } - - public void publicEnum(TransactionIsolation publicEnum) { - this.publicEnum = publicEnum; - } - - public GridCacheOperation internalEnum() { - return internalEnum; - } - - public void internalEnum(GridCacheOperation internalEnum) { - this.internalEnum = internalEnum; - } + GridCacheOperation internalEnum; public short directType() { return 0; diff --git a/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessageSerializer.java b/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessageSerializer.java index aaa598639974a..5af4c6814e5f2 100644 --- a/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessageSerializer.java @@ -15,9 +15,8 @@ * limitations under the License. */ -package org.apache.ignite.internal.codegen; +package org.apache.ignite.internal; -import org.apache.ignite.internal.DefaultMapperEnumFieldsMessage; import org.apache.ignite.internal.processors.cache.GridCacheOperation; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageReader; @@ -34,11 +33,10 @@ public class DefaultMapperEnumFieldsMessageSerializer implements MessageSerializer { /** */ private final GridCacheOperation[] gridCacheOperationVals = GridCacheOperation.values(); - /** */ private final TransactionIsolation[] transactionIsolationVals = TransactionIsolation.values(); - /** {@inheritDoc} */ + /** */ @Override public boolean writeTo(Message m, MessageWriter writer) { DefaultMapperEnumFieldsMessage msg = (DefaultMapperEnumFieldsMessage)m; @@ -51,13 +49,13 @@ public class DefaultMapperEnumFieldsMessageSerializer implements MessageSerializ switch (writer.state()) { case 0: - if (!writer.writeByte(DefaultEnumMapper.INSTANCE.encode(msg.publicEnum()))) + if (!writer.writeByte(DefaultEnumMapper.INSTANCE.encode(((DefaultMapperEnumFieldsMessage)msg).publicEnum))) return false; writer.incrementState(); case 1: - if (!writer.writeByte(DefaultEnumMapper.INSTANCE.encode(msg.internalEnum()))) + if (!writer.writeByte(DefaultEnumMapper.INSTANCE.encode(((DefaultMapperEnumFieldsMessage)msg).internalEnum))) return false; writer.incrementState(); @@ -66,13 +64,13 @@ public class DefaultMapperEnumFieldsMessageSerializer implements MessageSerializ return true; } - /** {@inheritDoc} */ + /** */ @Override public boolean readFrom(Message m, MessageReader reader) { DefaultMapperEnumFieldsMessage msg = (DefaultMapperEnumFieldsMessage)m; switch (reader.state()) { case 0: - msg.publicEnum(DefaultEnumMapper.INSTANCE.decode(transactionIsolationVals, reader.readByte())); + ((DefaultMapperEnumFieldsMessage)msg).publicEnum = DefaultEnumMapper.INSTANCE.decode(transactionIsolationVals, reader.readByte()); if (!reader.isLastRead()) return false; @@ -80,7 +78,7 @@ public class DefaultMapperEnumFieldsMessageSerializer implements MessageSerializ reader.incrementState(); case 1: - msg.internalEnum(DefaultEnumMapper.INSTANCE.decode(gridCacheOperationVals, reader.readByte())); + ((DefaultMapperEnumFieldsMessage)msg).internalEnum = DefaultEnumMapper.INSTANCE.decode(gridCacheOperationVals, reader.readByte()); if (!reader.isLastRead()) return false; diff --git a/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsSecondMessage.java b/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsSecondMessage.java index a9ad7816d09ff..3637bcd86d07d 100644 --- a/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsSecondMessage.java +++ b/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsSecondMessage.java @@ -22,15 +22,7 @@ public class DefaultMapperEnumFieldsSecondMessage implements Message { @Order(0) - private TransactionIsolation txMode; - - public TransactionIsolation txMode() { - return txMode; - } - - public void txMode(TransactionIsolation txMode) { - this.txMode = txMode; - } + TransactionIsolation txMode; public short directType() { return 1; diff --git a/modules/core/src/test/resources/codegen/TestCollectionsMessage.java b/modules/core/src/test/resources/codegen/TestCollectionsMessage.java index 358123c837415..312d5e91f8122 100644 --- a/modules/core/src/test/resources/codegen/TestCollectionsMessage.java +++ b/modules/core/src/test/resources/codegen/TestCollectionsMessage.java @@ -29,279 +29,79 @@ public class TestCollectionsMessage implements Message { @Order(0) - private List booleanArrayList; + List booleanArrayList; @Order(1) - private List byteArrayList; + List byteArrayList; @Order(2) - private List shortArrayList; + List shortArrayList; @Order(3) - private List intArrayList; + List intArrayList; @Order(4) - private List longArrayList; + List longArrayList; @Order(5) - private List charArrayList; + List charArrayList; @Order(6) - private List floatArrayList; + List floatArrayList; @Order(7) - private List doubleArrayList; + List doubleArrayList; @Order(8) - private List stringList; + List stringList; @Order(9) - private List uuidList; + List uuidList; @Order(10) - private List bitSetList; + List bitSetList; @Order(11) - private List igniteUuidList; + List igniteUuidList; @Order(12) - private List affTopVersionList; + List affTopVersionList; @Order(13) - private List boxedBooleanList; + List boxedBooleanList; @Order(14) - private List boxedByteList; + List boxedByteList; @Order(15) - private List boxedShortList; + List boxedShortList; @Order(16) - private List boxedIntList; + List boxedIntList; @Order(17) - private List boxedLongList; + List boxedLongList; @Order(18) - private List boxedCharList; + List boxedCharList; @Order(19) - private List boxedFloatList; + List boxedFloatList; @Order(20) - private List boxedDoubleList; + List boxedDoubleList; @Order(21) - private List messageList; + List messageList; @Order(22) - private List gridLongListList; + List gridLongListList; @Order(23) - private Set boxedIntegerSet; + Set boxedIntegerSet; @Order(24) - private Set bitSetSet; - - public List booleanArrayList() { - return booleanArrayList; - } - - public void booleanArrayList(List booleanArrayList) { - this.booleanArrayList = booleanArrayList; - } - - public List byteArrayList() { - return byteArrayList; - } - - public void byteArrayList(List byteArrayList) { - this.byteArrayList = byteArrayList; - } - - public List shortArrayList() { - return shortArrayList; - } - - public void shortArrayList(List shortArrayList) { - this.shortArrayList = shortArrayList; - } - - public List intArrayList() { - return intArrayList; - } - - public void intArrayList(List intArrayList) { - this.intArrayList = intArrayList; - } - - public List longArrayList() { - return longArrayList; - } - - public void longArrayList(List longArrayList) { - this.longArrayList = longArrayList; - } - - public List charArrayList() { - return charArrayList; - } - - public void charArrayList(List charArrayList) { - this.charArrayList = charArrayList; - } - - public List floatArrayList() { - return floatArrayList; - } - - public void floatArrayList(List floatArrayList) { - this.floatArrayList = floatArrayList; - } - - public List doubleArrayList() { - return doubleArrayList; - } - - public void doubleArrayList(List doubleArrayList) { - this.doubleArrayList = doubleArrayList; - } - - public List stringList() { - return stringList; - } - - public void stringList(List stringList) { - this.stringList = stringList; - } - - public List uuidList() { - return uuidList; - } - - public void uuidList(List uuidList) { - this.uuidList = uuidList; - } - - public List bitSetList() { - return bitSetList; - } - - public void bitSetList(List bitSetList) { - this.bitSetList = bitSetList; - } - - public List igniteUuidList() { - return igniteUuidList; - } - - public void igniteUuidList(List igniteUuidList) { - this.igniteUuidList = igniteUuidList; - } - - public List affTopVersionList() { - return affTopVersionList; - } - - public void affTopVersionList(List affTopVerList) { - affTopVersionList = affTopVerList; - } - - public List boxedBooleanList() { - return boxedBooleanList; - } - - public void boxedBooleanList(List boxedBooleanList) { - this.boxedBooleanList = boxedBooleanList; - } - - public List boxedByteList() { - return boxedByteList; - } - - public void boxedByteList(List boxedByteList) { - this.boxedByteList = boxedByteList; - } - - public List boxedShortList() { - return boxedShortList; - } - - public void boxedShortList(List boxedShortList) { - this.boxedShortList = boxedShortList; - } - - public List boxedIntList() { - return boxedIntList; - } - - public void boxedIntList(List boxedIntList) { - this.boxedIntList = boxedIntList; - } - - public List boxedLongList() { - return boxedLongList; - } - - public void boxedLongList(List boxedLongList) { - this.boxedLongList = boxedLongList; - } - - public List boxedCharList() { - return boxedCharList; - } - - public void boxedCharList(List boxedCharList) { - this.boxedCharList = boxedCharList; - } - - public List boxedFloatList() { - return boxedFloatList; - } - - public void boxedFloatList(List boxedFloatList) { - this.boxedFloatList = boxedFloatList; - } - - public List boxedDoubleList() { - return boxedDoubleList; - } - - public void boxedDoubleList(List boxedDoubleList) { - this.boxedDoubleList = boxedDoubleList; - } - - public List messageList() { - return messageList; - } - - public void messageList(List messageList) { - this.messageList = messageList; - } - - public List gridLongListList() { - return gridLongListList; - } - - public void gridLongListList(List gridLongListList) { - this.gridLongListList = gridLongListList; - } - - public Set boxedIntegerSet() { - return boxedIntegerSet; - } - - public void boxedIntegerSet(Set boxedIntegerSet) { - this.boxedIntegerSet = boxedIntegerSet; - } - - public Set bitSetSet() { - return bitSetSet; - } - - public void bitSetSet(Set bitSetSet) { - this.bitSetSet = bitSetSet; - } + Set bitSetSet; public short directType() { return 0; diff --git a/modules/core/src/test/resources/codegen/TestCollectionsMessageSerializer.java b/modules/core/src/test/resources/codegen/TestCollectionsMessageSerializer.java index 44d3382c2182b..9e35c9c27a249 100644 --- a/modules/core/src/test/resources/codegen/TestCollectionsMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/TestCollectionsMessageSerializer.java @@ -15,9 +15,8 @@ * limitations under the License. */ -package org.apache.ignite.internal.codegen; +package org.apache.ignite.internal; -import org.apache.ignite.internal.TestCollectionsMessage; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; import org.apache.ignite.plugin.extensions.communication.MessageReader; @@ -43,151 +42,151 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { switch (writer.state()) { case 0: - if (!writer.writeCollection(msg.booleanArrayList(), MessageCollectionItemType.BOOLEAN_ARR)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).booleanArrayList, MessageCollectionItemType.BOOLEAN_ARR)) return false; writer.incrementState(); case 1: - if (!writer.writeCollection(msg.byteArrayList(), MessageCollectionItemType.BYTE_ARR)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).byteArrayList, MessageCollectionItemType.BYTE_ARR)) return false; writer.incrementState(); case 2: - if (!writer.writeCollection(msg.shortArrayList(), MessageCollectionItemType.SHORT_ARR)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).shortArrayList, MessageCollectionItemType.SHORT_ARR)) return false; writer.incrementState(); case 3: - if (!writer.writeCollection(msg.intArrayList(), MessageCollectionItemType.INT_ARR)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).intArrayList, MessageCollectionItemType.INT_ARR)) return false; writer.incrementState(); case 4: - if (!writer.writeCollection(msg.longArrayList(), MessageCollectionItemType.LONG_ARR)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).longArrayList, MessageCollectionItemType.LONG_ARR)) return false; writer.incrementState(); case 5: - if (!writer.writeCollection(msg.charArrayList(), MessageCollectionItemType.CHAR_ARR)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).charArrayList, MessageCollectionItemType.CHAR_ARR)) return false; writer.incrementState(); case 6: - if (!writer.writeCollection(msg.floatArrayList(), MessageCollectionItemType.FLOAT_ARR)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).floatArrayList, MessageCollectionItemType.FLOAT_ARR)) return false; writer.incrementState(); case 7: - if (!writer.writeCollection(msg.doubleArrayList(), MessageCollectionItemType.DOUBLE_ARR)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).doubleArrayList, MessageCollectionItemType.DOUBLE_ARR)) return false; writer.incrementState(); case 8: - if (!writer.writeCollection(msg.stringList(), MessageCollectionItemType.STRING)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).stringList, MessageCollectionItemType.STRING)) return false; writer.incrementState(); case 9: - if (!writer.writeCollection(msg.uuidList(), MessageCollectionItemType.UUID)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).uuidList, MessageCollectionItemType.UUID)) return false; writer.incrementState(); case 10: - if (!writer.writeCollection(msg.bitSetList(), MessageCollectionItemType.BIT_SET)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).bitSetList, MessageCollectionItemType.BIT_SET)) return false; writer.incrementState(); case 11: - if (!writer.writeCollection(msg.igniteUuidList(), MessageCollectionItemType.IGNITE_UUID)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).igniteUuidList, MessageCollectionItemType.IGNITE_UUID)) return false; writer.incrementState(); case 12: - if (!writer.writeCollection(msg.affTopVersionList(), MessageCollectionItemType.AFFINITY_TOPOLOGY_VERSION)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).affTopVersionList, MessageCollectionItemType.AFFINITY_TOPOLOGY_VERSION)) return false; writer.incrementState(); case 13: - if (!writer.writeCollection(msg.boxedBooleanList(), MessageCollectionItemType.BOOLEAN)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).boxedBooleanList, MessageCollectionItemType.BOOLEAN)) return false; writer.incrementState(); case 14: - if (!writer.writeCollection(msg.boxedByteList(), MessageCollectionItemType.BYTE)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).boxedByteList, MessageCollectionItemType.BYTE)) return false; writer.incrementState(); case 15: - if (!writer.writeCollection(msg.boxedShortList(), MessageCollectionItemType.SHORT)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).boxedShortList, MessageCollectionItemType.SHORT)) return false; writer.incrementState(); case 16: - if (!writer.writeCollection(msg.boxedIntList(), MessageCollectionItemType.INT)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).boxedIntList, MessageCollectionItemType.INT)) return false; writer.incrementState(); case 17: - if (!writer.writeCollection(msg.boxedLongList(), MessageCollectionItemType.LONG)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).boxedLongList, MessageCollectionItemType.LONG)) return false; writer.incrementState(); case 18: - if (!writer.writeCollection(msg.boxedCharList(), MessageCollectionItemType.CHAR)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).boxedCharList, MessageCollectionItemType.CHAR)) return false; writer.incrementState(); case 19: - if (!writer.writeCollection(msg.boxedFloatList(), MessageCollectionItemType.FLOAT)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).boxedFloatList, MessageCollectionItemType.FLOAT)) return false; writer.incrementState(); case 20: - if (!writer.writeCollection(msg.boxedDoubleList(), MessageCollectionItemType.DOUBLE)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).boxedDoubleList, MessageCollectionItemType.DOUBLE)) return false; writer.incrementState(); case 21: - if (!writer.writeCollection(msg.messageList(), MessageCollectionItemType.MSG)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).messageList, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 22: - if (!writer.writeCollection(msg.gridLongListList(), MessageCollectionItemType.GRID_LONG_LIST)) + if (!writer.writeCollection(((TestCollectionsMessage)msg).gridLongListList, MessageCollectionItemType.GRID_LONG_LIST)) return false; writer.incrementState(); case 23: - if (!writer.writeSet(msg.boxedIntegerSet(), MessageCollectionItemType.INT)) + if (!writer.writeSet(((TestCollectionsMessage)msg).boxedIntegerSet, MessageCollectionItemType.INT)) return false; writer.incrementState(); case 24: - if (!writer.writeSet(msg.bitSetSet(), MessageCollectionItemType.BIT_SET)) + if (!writer.writeSet(((TestCollectionsMessage)msg).bitSetSet, MessageCollectionItemType.BIT_SET)) return false; writer.incrementState(); @@ -202,7 +201,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { switch (reader.state()) { case 0: - msg.booleanArrayList(reader.readCollection(MessageCollectionItemType.BOOLEAN_ARR)); + ((TestCollectionsMessage)msg).booleanArrayList = reader.readCollection(MessageCollectionItemType.BOOLEAN_ARR); if (!reader.isLastRead()) return false; @@ -210,7 +209,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 1: - msg.byteArrayList(reader.readCollection(MessageCollectionItemType.BYTE_ARR)); + ((TestCollectionsMessage)msg).byteArrayList = reader.readCollection(MessageCollectionItemType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -218,7 +217,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 2: - msg.shortArrayList(reader.readCollection(MessageCollectionItemType.SHORT_ARR)); + ((TestCollectionsMessage)msg).shortArrayList = reader.readCollection(MessageCollectionItemType.SHORT_ARR); if (!reader.isLastRead()) return false; @@ -226,7 +225,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 3: - msg.intArrayList(reader.readCollection(MessageCollectionItemType.INT_ARR)); + ((TestCollectionsMessage)msg).intArrayList = reader.readCollection(MessageCollectionItemType.INT_ARR); if (!reader.isLastRead()) return false; @@ -234,7 +233,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 4: - msg.longArrayList(reader.readCollection(MessageCollectionItemType.LONG_ARR)); + ((TestCollectionsMessage)msg).longArrayList = reader.readCollection(MessageCollectionItemType.LONG_ARR); if (!reader.isLastRead()) return false; @@ -242,7 +241,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 5: - msg.charArrayList(reader.readCollection(MessageCollectionItemType.CHAR_ARR)); + ((TestCollectionsMessage)msg).charArrayList = reader.readCollection(MessageCollectionItemType.CHAR_ARR); if (!reader.isLastRead()) return false; @@ -250,7 +249,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 6: - msg.floatArrayList(reader.readCollection(MessageCollectionItemType.FLOAT_ARR)); + ((TestCollectionsMessage)msg).floatArrayList = reader.readCollection(MessageCollectionItemType.FLOAT_ARR); if (!reader.isLastRead()) return false; @@ -258,7 +257,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 7: - msg.doubleArrayList(reader.readCollection(MessageCollectionItemType.DOUBLE_ARR)); + ((TestCollectionsMessage)msg).doubleArrayList = reader.readCollection(MessageCollectionItemType.DOUBLE_ARR); if (!reader.isLastRead()) return false; @@ -266,7 +265,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 8: - msg.stringList(reader.readCollection(MessageCollectionItemType.STRING)); + ((TestCollectionsMessage)msg).stringList = reader.readCollection(MessageCollectionItemType.STRING); if (!reader.isLastRead()) return false; @@ -274,7 +273,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 9: - msg.uuidList(reader.readCollection(MessageCollectionItemType.UUID)); + ((TestCollectionsMessage)msg).uuidList = reader.readCollection(MessageCollectionItemType.UUID); if (!reader.isLastRead()) return false; @@ -282,7 +281,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 10: - msg.bitSetList(reader.readCollection(MessageCollectionItemType.BIT_SET)); + ((TestCollectionsMessage)msg).bitSetList = reader.readCollection(MessageCollectionItemType.BIT_SET); if (!reader.isLastRead()) return false; @@ -290,7 +289,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 11: - msg.igniteUuidList(reader.readCollection(MessageCollectionItemType.IGNITE_UUID)); + ((TestCollectionsMessage)msg).igniteUuidList = reader.readCollection(MessageCollectionItemType.IGNITE_UUID); if (!reader.isLastRead()) return false; @@ -298,7 +297,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 12: - msg.affTopVersionList(reader.readCollection(MessageCollectionItemType.AFFINITY_TOPOLOGY_VERSION)); + ((TestCollectionsMessage)msg).affTopVersionList = reader.readCollection(MessageCollectionItemType.AFFINITY_TOPOLOGY_VERSION); if (!reader.isLastRead()) return false; @@ -306,7 +305,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 13: - msg.boxedBooleanList(reader.readCollection(MessageCollectionItemType.BOOLEAN)); + ((TestCollectionsMessage)msg).boxedBooleanList = reader.readCollection(MessageCollectionItemType.BOOLEAN); if (!reader.isLastRead()) return false; @@ -314,7 +313,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 14: - msg.boxedByteList(reader.readCollection(MessageCollectionItemType.BYTE)); + ((TestCollectionsMessage)msg).boxedByteList = reader.readCollection(MessageCollectionItemType.BYTE); if (!reader.isLastRead()) return false; @@ -322,7 +321,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 15: - msg.boxedShortList(reader.readCollection(MessageCollectionItemType.SHORT)); + ((TestCollectionsMessage)msg).boxedShortList = reader.readCollection(MessageCollectionItemType.SHORT); if (!reader.isLastRead()) return false; @@ -330,7 +329,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 16: - msg.boxedIntList(reader.readCollection(MessageCollectionItemType.INT)); + ((TestCollectionsMessage)msg).boxedIntList = reader.readCollection(MessageCollectionItemType.INT); if (!reader.isLastRead()) return false; @@ -338,7 +337,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 17: - msg.boxedLongList(reader.readCollection(MessageCollectionItemType.LONG)); + ((TestCollectionsMessage)msg).boxedLongList = reader.readCollection(MessageCollectionItemType.LONG); if (!reader.isLastRead()) return false; @@ -346,7 +345,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 18: - msg.boxedCharList(reader.readCollection(MessageCollectionItemType.CHAR)); + ((TestCollectionsMessage)msg).boxedCharList = reader.readCollection(MessageCollectionItemType.CHAR); if (!reader.isLastRead()) return false; @@ -354,7 +353,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 19: - msg.boxedFloatList(reader.readCollection(MessageCollectionItemType.FLOAT)); + ((TestCollectionsMessage)msg).boxedFloatList = reader.readCollection(MessageCollectionItemType.FLOAT); if (!reader.isLastRead()) return false; @@ -362,7 +361,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 20: - msg.boxedDoubleList(reader.readCollection(MessageCollectionItemType.DOUBLE)); + ((TestCollectionsMessage)msg).boxedDoubleList = reader.readCollection(MessageCollectionItemType.DOUBLE); if (!reader.isLastRead()) return false; @@ -370,7 +369,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 21: - msg.messageList(reader.readCollection(MessageCollectionItemType.MSG)); + ((TestCollectionsMessage)msg).messageList = reader.readCollection(MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -378,7 +377,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 22: - msg.gridLongListList(reader.readCollection(MessageCollectionItemType.GRID_LONG_LIST)); + ((TestCollectionsMessage)msg).gridLongListList = reader.readCollection(MessageCollectionItemType.GRID_LONG_LIST); if (!reader.isLastRead()) return false; @@ -386,7 +385,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 23: - msg.boxedIntegerSet(reader.readSet(MessageCollectionItemType.INT)); + ((TestCollectionsMessage)msg).boxedIntegerSet = reader.readSet(MessageCollectionItemType.INT); if (!reader.isLastRead()) return false; @@ -394,7 +393,7 @@ public class TestCollectionsMessageSerializer implements MessageSerializer { reader.incrementState(); case 24: - msg.bitSetSet(reader.readSet(MessageCollectionItemType.BIT_SET)); + ((TestCollectionsMessage)msg).bitSetSet = reader.readSet(MessageCollectionItemType.BIT_SET); if (!reader.isLastRead()) return false; diff --git a/modules/core/src/test/resources/codegen/TestMapMessage.java b/modules/core/src/test/resources/codegen/TestMapMessage.java index dfd99916a4b54..8fc709ba0c9d7 100644 --- a/modules/core/src/test/resources/codegen/TestMapMessage.java +++ b/modules/core/src/test/resources/codegen/TestMapMessage.java @@ -28,268 +28,76 @@ public class TestMapMessage implements Message { @Order(0) - private Map booleanArrayBoxedLongMap; + Map booleanArrayBoxedLongMap; @Order(1) - private Map byteArrayBooleanArrayMap; + Map byteArrayBooleanArrayMap; @Order(2) - private Map shortArrayByteArrayMap; + Map shortArrayByteArrayMap; @Order(3) - private Map intArrayShortArrayMap; + Map intArrayShortArrayMap; @Order(4) - private Map longArrayIntArrayMap; + Map longArrayIntArrayMap; @Order(5) - private Map charArrayLongArrayMap; + Map charArrayLongArrayMap; @Order(6) - private Map floatArrayCharArrayMap; + Map floatArrayCharArrayMap; @Order(7) - private Map doubleArrayFloatArrayMap; + Map doubleArrayFloatArrayMap; @Order(8) - private Map stringDoubleArrayMap; + Map stringDoubleArrayMap; @Order(9) - private Map uuidStringMap; + Map uuidStringMap; @Order(10) - private Map bitSetUuidMap; + Map bitSetUuidMap; @Order(11) - private Map igniteUuidBitSetMap; + Map igniteUuidBitSetMap; @Order(12) - private Map affTopVersionIgniteUuidMap; + Map affTopVersionIgniteUuidMap; @Order(13) - private Map boxedBooleanAffTopVersionMap; + Map boxedBooleanAffTopVersionMap; @Order(14) - private Map boxedByteBoxedBooleanMap; + Map boxedByteBoxedBooleanMap; @Order(15) - private Map boxedShortBoxedByteMap; + Map boxedShortBoxedByteMap; @Order(16) - private Map boxedIntBoxedShortMap; + Map boxedIntBoxedShortMap; @Order(17) - private Map boxedLongBoxedIntMap; + Map boxedLongBoxedIntMap; @Order(18) - private Map boxedCharBoxedLongMap; + Map boxedCharBoxedLongMap; @Order(19) - private Map boxedFloatBoxedCharMap; + Map boxedFloatBoxedCharMap; @Order(20) - private Map boxedDoubleBoxedFloatMap; + Map boxedDoubleBoxedFloatMap; @Order(21) - private Map messageBoxedDoubleMap; + Map messageBoxedDoubleMap; @Order(22) - private Map integerGridLongListMap; + Map integerGridLongListMap; @Order(23) - private Map gridLongListIntegerMap; - - public Map booleanArrayBoxedLongMap() { - return booleanArrayBoxedLongMap; - } - - public void booleanArrayBoxedLongMap(Map booleanArrayBoxedLongMap) { - this.booleanArrayBoxedLongMap = booleanArrayBoxedLongMap; - } - - public Map byteArrayBooleanArrayMap() { - return byteArrayBooleanArrayMap; - } - - public void byteArrayBooleanArrayMap(Map byteArrayBooleanArrayMap) { - this.byteArrayBooleanArrayMap = byteArrayBooleanArrayMap; - } - - public Map shortArrayByteArrayMap() { - return shortArrayByteArrayMap; - } - - public void shortArrayByteArrayMap(Map shortArrayByteArrayMap) { - this.shortArrayByteArrayMap = shortArrayByteArrayMap; - } - - public Map intArrayShortArrayMap() { - return intArrayShortArrayMap; - } - - public void intArrayShortArrayMap(Map intArrayShortArrayMap) { - this.intArrayShortArrayMap = intArrayShortArrayMap; - } - - public Map longArrayIntArrayMap() { - return longArrayIntArrayMap; - } - - public void longArrayIntArrayMap(Map longArrayIntArrayMap) { - this.longArrayIntArrayMap = longArrayIntArrayMap; - } - - public Map charArrayLongArrayMap() { - return charArrayLongArrayMap; - } - - public void charArrayLongArrayMap(Map charArrayLongArrayMap) { - this.charArrayLongArrayMap = charArrayLongArrayMap; - } - - public Map floatArrayCharArrayMap() { - return floatArrayCharArrayMap; - } - - public void floatArrayCharArrayMap(Map floatArrayCharArrayMap) { - this.floatArrayCharArrayMap = floatArrayCharArrayMap; - } - - public Map doubleArrayFloatArrayMap() { - return doubleArrayFloatArrayMap; - } - - public void doubleArrayFloatArrayMap(Map doubleArrayFloatArrayMap) { - this.doubleArrayFloatArrayMap = doubleArrayFloatArrayMap; - } - - public Map stringDoubleArrayMap() { - return stringDoubleArrayMap; - } - - public void stringDoubleArrayMap(Map stringDoubleArrayMap) { - this.stringDoubleArrayMap = stringDoubleArrayMap; - } - - public Map uuidStringMap() { - return uuidStringMap; - } - - public void uuidStringMap(Map uuidStringMap) { - this.uuidStringMap = uuidStringMap; - } - - public Map bitSetUuidMap() { - return bitSetUuidMap; - } - - public void bitSetUuidMap(Map bitSetUuidMap) { - this.bitSetUuidMap = bitSetUuidMap; - } - - public Map igniteUuidBitSetMap() { - return igniteUuidBitSetMap; - } - - public void igniteUuidBitSetMap(Map igniteUuidBitSetMap) { - this.igniteUuidBitSetMap = igniteUuidBitSetMap; - } - - public Map affTopVersionIgniteUuidMap() { - return affTopVersionIgniteUuidMap; - } - - public void affTopVersionIgniteUuidMap(Map affTopVersionIgniteUuidMap) { - affTopVersionIgniteUuidMap = affTopVersionIgniteUuidMap; - } - - public Map boxedBooleanAffTopVersionMap() { - return boxedBooleanAffTopVersionMap; - } - - public void boxedBooleanAffTopVersionMap(Map boxedBooleanAffTopVersionMap) { - this.boxedBooleanAffTopVersionMap = boxedBooleanAffTopVersionMap; - } - - public Map boxedByteBoxedBooleanMap() { - return boxedByteBoxedBooleanMap; - } - - public void boxedByteBoxedBooleanMap(Map boxedByteBoxedBooleanMap) { - this.boxedByteBoxedBooleanMap = boxedByteBoxedBooleanMap; - } - - public Map boxedShortBoxedByteMap() { - return boxedShortBoxedByteMap; - } - - public void boxedShortBoxedByteMap(Map boxedShortBoxedByteMap) { - this.boxedShortBoxedByteMap = boxedShortBoxedByteMap; - } - - public Map boxedIntBoxedShortMap() { - return boxedIntBoxedShortMap; - } - - public void boxedIntBoxedShortMap(Map boxedIntBoxedShortMap) { - this.boxedIntBoxedShortMap = boxedIntBoxedShortMap; - } - - public Map boxedLongBoxedIntMap() { - return boxedLongBoxedIntMap; - } - - public void boxedLongBoxedIntMap(Map boxedLongBoxedIntMap) { - this.boxedLongBoxedIntMap = boxedLongBoxedIntMap; - } - - public Map boxedCharBoxedLongMap() { - return boxedCharBoxedLongMap; - } - - public void boxedCharBoxedLongMap(Map boxedCharBoxedLongMap) { - this.boxedCharBoxedLongMap = boxedCharBoxedLongMap; - } - - public Map boxedFloatBoxedCharMap() { - return boxedFloatBoxedCharMap; - } - - public void boxedFloatBoxedCharMap(Map boxedFloatBoxedCharMap) { - this.boxedFloatBoxedCharMap = boxedFloatBoxedCharMap; - } - - public Map boxedDoubleBoxedFloatMap() { - return boxedDoubleBoxedFloatMap; - } - - public void boxedDoubleBoxedFloatMap(Map boxedDoubleBoxedFloatMap) { - this.boxedDoubleBoxedFloatMap = boxedDoubleBoxedFloatMap; - } - - public Map messageBoxedDoubleMap() { - return messageBoxedDoubleMap; - } - - public void messageBoxedDoubleMap(Map messageBoxedDoubleMap) { - this.messageBoxedDoubleMap = messageBoxedDoubleMap; - } - - public Map integerGridLongListMap() { - return integerGridLongListMap; - } - - public void integerGridLongListMap(Map integerGridLongListMap) { - this.integerGridLongListMap = integerGridLongListMap; - } - - public Map gridLongListIntegerMap() { - return gridLongListIntegerMap; - } - - public void gridLongListIntegerMap(Map gridLongListIntegerMap) { - this.gridLongListIntegerMap = gridLongListIntegerMap; - } + Map gridLongListIntegerMap; public short directType() { return 0; diff --git a/modules/core/src/test/resources/codegen/TestMapMessageSerializer.java b/modules/core/src/test/resources/codegen/TestMapMessageSerializer.java index c128921af7abb..71166432f61be 100644 --- a/modules/core/src/test/resources/codegen/TestMapMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/TestMapMessageSerializer.java @@ -15,9 +15,8 @@ * limitations under the License. */ -package org.apache.ignite.internal.codegen; +package org.apache.ignite.internal; -import org.apache.ignite.internal.TestMapMessage; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; import org.apache.ignite.plugin.extensions.communication.MessageReader; @@ -43,145 +42,145 @@ public class TestMapMessageSerializer implements MessageSerializer { switch (writer.state()) { case 0: - if (!writer.writeMap(msg.booleanArrayBoxedLongMap(), MessageCollectionItemType.BOOLEAN_ARR, MessageCollectionItemType.LONG)) + if (!writer.writeMap(((TestMapMessage)msg).booleanArrayBoxedLongMap, MessageCollectionItemType.BOOLEAN_ARR, MessageCollectionItemType.LONG)) return false; writer.incrementState(); case 1: - if (!writer.writeMap(msg.byteArrayBooleanArrayMap(), MessageCollectionItemType.BYTE_ARR, MessageCollectionItemType.BOOLEAN_ARR)) + if (!writer.writeMap(((TestMapMessage)msg).byteArrayBooleanArrayMap, MessageCollectionItemType.BYTE_ARR, MessageCollectionItemType.BOOLEAN_ARR)) return false; writer.incrementState(); case 2: - if (!writer.writeMap(msg.shortArrayByteArrayMap(), MessageCollectionItemType.SHORT_ARR, MessageCollectionItemType.BYTE_ARR)) + if (!writer.writeMap(((TestMapMessage)msg).shortArrayByteArrayMap, MessageCollectionItemType.SHORT_ARR, MessageCollectionItemType.BYTE_ARR)) return false; writer.incrementState(); case 3: - if (!writer.writeMap(msg.intArrayShortArrayMap(), MessageCollectionItemType.INT_ARR, MessageCollectionItemType.SHORT_ARR)) + if (!writer.writeMap(((TestMapMessage)msg).intArrayShortArrayMap, MessageCollectionItemType.INT_ARR, MessageCollectionItemType.SHORT_ARR)) return false; writer.incrementState(); case 4: - if (!writer.writeMap(msg.longArrayIntArrayMap(), MessageCollectionItemType.LONG_ARR, MessageCollectionItemType.INT_ARR)) + if (!writer.writeMap(((TestMapMessage)msg).longArrayIntArrayMap, MessageCollectionItemType.LONG_ARR, MessageCollectionItemType.INT_ARR)) return false; writer.incrementState(); case 5: - if (!writer.writeMap(msg.charArrayLongArrayMap(), MessageCollectionItemType.CHAR_ARR, MessageCollectionItemType.LONG_ARR)) + if (!writer.writeMap(((TestMapMessage)msg).charArrayLongArrayMap, MessageCollectionItemType.CHAR_ARR, MessageCollectionItemType.LONG_ARR)) return false; writer.incrementState(); case 6: - if (!writer.writeMap(msg.floatArrayCharArrayMap(), MessageCollectionItemType.FLOAT_ARR, MessageCollectionItemType.CHAR_ARR)) + if (!writer.writeMap(((TestMapMessage)msg).floatArrayCharArrayMap, MessageCollectionItemType.FLOAT_ARR, MessageCollectionItemType.CHAR_ARR)) return false; writer.incrementState(); case 7: - if (!writer.writeMap(msg.doubleArrayFloatArrayMap(), MessageCollectionItemType.DOUBLE_ARR, MessageCollectionItemType.FLOAT_ARR)) + if (!writer.writeMap(((TestMapMessage)msg).doubleArrayFloatArrayMap, MessageCollectionItemType.DOUBLE_ARR, MessageCollectionItemType.FLOAT_ARR)) return false; writer.incrementState(); case 8: - if (!writer.writeMap(msg.stringDoubleArrayMap(), MessageCollectionItemType.STRING, MessageCollectionItemType.DOUBLE_ARR)) + if (!writer.writeMap(((TestMapMessage)msg).stringDoubleArrayMap, MessageCollectionItemType.STRING, MessageCollectionItemType.DOUBLE_ARR)) return false; writer.incrementState(); case 9: - if (!writer.writeMap(msg.uuidStringMap(), MessageCollectionItemType.UUID, MessageCollectionItemType.STRING)) + if (!writer.writeMap(((TestMapMessage)msg).uuidStringMap, MessageCollectionItemType.UUID, MessageCollectionItemType.STRING)) return false; writer.incrementState(); case 10: - if (!writer.writeMap(msg.bitSetUuidMap(), MessageCollectionItemType.BIT_SET, MessageCollectionItemType.UUID)) + if (!writer.writeMap(((TestMapMessage)msg).bitSetUuidMap, MessageCollectionItemType.BIT_SET, MessageCollectionItemType.UUID)) return false; writer.incrementState(); case 11: - if (!writer.writeMap(msg.igniteUuidBitSetMap(), MessageCollectionItemType.IGNITE_UUID, MessageCollectionItemType.BIT_SET)) + if (!writer.writeMap(((TestMapMessage)msg).igniteUuidBitSetMap, MessageCollectionItemType.IGNITE_UUID, MessageCollectionItemType.BIT_SET)) return false; writer.incrementState(); case 12: - if (!writer.writeMap(msg.affTopVersionIgniteUuidMap(), MessageCollectionItemType.AFFINITY_TOPOLOGY_VERSION, MessageCollectionItemType.IGNITE_UUID)) + if (!writer.writeMap(((TestMapMessage)msg).affTopVersionIgniteUuidMap, MessageCollectionItemType.AFFINITY_TOPOLOGY_VERSION, MessageCollectionItemType.IGNITE_UUID)) return false; writer.incrementState(); case 13: - if (!writer.writeMap(msg.boxedBooleanAffTopVersionMap(), MessageCollectionItemType.BOOLEAN, MessageCollectionItemType.AFFINITY_TOPOLOGY_VERSION)) + if (!writer.writeMap(((TestMapMessage)msg).boxedBooleanAffTopVersionMap, MessageCollectionItemType.BOOLEAN, MessageCollectionItemType.AFFINITY_TOPOLOGY_VERSION)) return false; writer.incrementState(); case 14: - if (!writer.writeMap(msg.boxedByteBoxedBooleanMap(), MessageCollectionItemType.BYTE, MessageCollectionItemType.BOOLEAN)) + if (!writer.writeMap(((TestMapMessage)msg).boxedByteBoxedBooleanMap, MessageCollectionItemType.BYTE, MessageCollectionItemType.BOOLEAN)) return false; writer.incrementState(); case 15: - if (!writer.writeMap(msg.boxedShortBoxedByteMap(), MessageCollectionItemType.SHORT, MessageCollectionItemType.BYTE)) + if (!writer.writeMap(((TestMapMessage)msg).boxedShortBoxedByteMap, MessageCollectionItemType.SHORT, MessageCollectionItemType.BYTE)) return false; writer.incrementState(); case 16: - if (!writer.writeMap(msg.boxedIntBoxedShortMap(), MessageCollectionItemType.INT, MessageCollectionItemType.SHORT)) + if (!writer.writeMap(((TestMapMessage)msg).boxedIntBoxedShortMap, MessageCollectionItemType.INT, MessageCollectionItemType.SHORT)) return false; writer.incrementState(); case 17: - if (!writer.writeMap(msg.boxedLongBoxedIntMap(), MessageCollectionItemType.LONG, MessageCollectionItemType.INT)) + if (!writer.writeMap(((TestMapMessage)msg).boxedLongBoxedIntMap, MessageCollectionItemType.LONG, MessageCollectionItemType.INT)) return false; writer.incrementState(); case 18: - if (!writer.writeMap(msg.boxedCharBoxedLongMap(), MessageCollectionItemType.CHAR, MessageCollectionItemType.LONG)) + if (!writer.writeMap(((TestMapMessage)msg).boxedCharBoxedLongMap, MessageCollectionItemType.CHAR, MessageCollectionItemType.LONG)) return false; writer.incrementState(); case 19: - if (!writer.writeMap(msg.boxedFloatBoxedCharMap(), MessageCollectionItemType.FLOAT, MessageCollectionItemType.CHAR)) + if (!writer.writeMap(((TestMapMessage)msg).boxedFloatBoxedCharMap, MessageCollectionItemType.FLOAT, MessageCollectionItemType.CHAR)) return false; writer.incrementState(); case 20: - if (!writer.writeMap(msg.boxedDoubleBoxedFloatMap(), MessageCollectionItemType.DOUBLE, MessageCollectionItemType.FLOAT)) + if (!writer.writeMap(((TestMapMessage)msg).boxedDoubleBoxedFloatMap, MessageCollectionItemType.DOUBLE, MessageCollectionItemType.FLOAT)) return false; writer.incrementState(); case 21: - if (!writer.writeMap(msg.messageBoxedDoubleMap(), MessageCollectionItemType.MSG, MessageCollectionItemType.DOUBLE)) + if (!writer.writeMap(((TestMapMessage)msg).messageBoxedDoubleMap, MessageCollectionItemType.MSG, MessageCollectionItemType.DOUBLE)) return false; writer.incrementState(); case 22: - if (!writer.writeMap(msg.integerGridLongListMap(), MessageCollectionItemType.INT, MessageCollectionItemType.GRID_LONG_LIST)) + if (!writer.writeMap(((TestMapMessage)msg).integerGridLongListMap, MessageCollectionItemType.INT, MessageCollectionItemType.GRID_LONG_LIST)) return false; writer.incrementState(); case 23: - if (!writer.writeMap(msg.gridLongListIntegerMap(), MessageCollectionItemType.GRID_LONG_LIST, MessageCollectionItemType.INT)) + if (!writer.writeMap(((TestMapMessage)msg).gridLongListIntegerMap, MessageCollectionItemType.GRID_LONG_LIST, MessageCollectionItemType.INT)) return false; writer.incrementState(); @@ -196,7 +195,7 @@ public class TestMapMessageSerializer implements MessageSerializer { switch (reader.state()) { case 0: - msg.booleanArrayBoxedLongMap(reader.readMap(MessageCollectionItemType.BOOLEAN_ARR, MessageCollectionItemType.LONG, false)); + ((TestMapMessage)msg).booleanArrayBoxedLongMap = reader.readMap(MessageCollectionItemType.BOOLEAN_ARR, MessageCollectionItemType.LONG, false); if (!reader.isLastRead()) return false; @@ -204,7 +203,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 1: - msg.byteArrayBooleanArrayMap(reader.readMap(MessageCollectionItemType.BYTE_ARR, MessageCollectionItemType.BOOLEAN_ARR, false)); + ((TestMapMessage)msg).byteArrayBooleanArrayMap = reader.readMap(MessageCollectionItemType.BYTE_ARR, MessageCollectionItemType.BOOLEAN_ARR, false); if (!reader.isLastRead()) return false; @@ -212,7 +211,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 2: - msg.shortArrayByteArrayMap(reader.readMap(MessageCollectionItemType.SHORT_ARR, MessageCollectionItemType.BYTE_ARR, false)); + ((TestMapMessage)msg).shortArrayByteArrayMap = reader.readMap(MessageCollectionItemType.SHORT_ARR, MessageCollectionItemType.BYTE_ARR, false); if (!reader.isLastRead()) return false; @@ -220,7 +219,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 3: - msg.intArrayShortArrayMap(reader.readMap(MessageCollectionItemType.INT_ARR, MessageCollectionItemType.SHORT_ARR, false)); + ((TestMapMessage)msg).intArrayShortArrayMap = reader.readMap(MessageCollectionItemType.INT_ARR, MessageCollectionItemType.SHORT_ARR, false); if (!reader.isLastRead()) return false; @@ -228,7 +227,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 4: - msg.longArrayIntArrayMap(reader.readMap(MessageCollectionItemType.LONG_ARR, MessageCollectionItemType.INT_ARR, false)); + ((TestMapMessage)msg).longArrayIntArrayMap = reader.readMap(MessageCollectionItemType.LONG_ARR, MessageCollectionItemType.INT_ARR, false); if (!reader.isLastRead()) return false; @@ -236,7 +235,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 5: - msg.charArrayLongArrayMap(reader.readMap(MessageCollectionItemType.CHAR_ARR, MessageCollectionItemType.LONG_ARR, false)); + ((TestMapMessage)msg).charArrayLongArrayMap = reader.readMap(MessageCollectionItemType.CHAR_ARR, MessageCollectionItemType.LONG_ARR, false); if (!reader.isLastRead()) return false; @@ -244,7 +243,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 6: - msg.floatArrayCharArrayMap(reader.readMap(MessageCollectionItemType.FLOAT_ARR, MessageCollectionItemType.CHAR_ARR, false)); + ((TestMapMessage)msg).floatArrayCharArrayMap = reader.readMap(MessageCollectionItemType.FLOAT_ARR, MessageCollectionItemType.CHAR_ARR, false); if (!reader.isLastRead()) return false; @@ -252,7 +251,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 7: - msg.doubleArrayFloatArrayMap(reader.readMap(MessageCollectionItemType.DOUBLE_ARR, MessageCollectionItemType.FLOAT_ARR, false)); + ((TestMapMessage)msg).doubleArrayFloatArrayMap = reader.readMap(MessageCollectionItemType.DOUBLE_ARR, MessageCollectionItemType.FLOAT_ARR, false); if (!reader.isLastRead()) return false; @@ -260,7 +259,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 8: - msg.stringDoubleArrayMap(reader.readMap(MessageCollectionItemType.STRING, MessageCollectionItemType.DOUBLE_ARR, false)); + ((TestMapMessage)msg).stringDoubleArrayMap = reader.readMap(MessageCollectionItemType.STRING, MessageCollectionItemType.DOUBLE_ARR, false); if (!reader.isLastRead()) return false; @@ -268,7 +267,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 9: - msg.uuidStringMap(reader.readMap(MessageCollectionItemType.UUID, MessageCollectionItemType.STRING, false)); + ((TestMapMessage)msg).uuidStringMap = reader.readMap(MessageCollectionItemType.UUID, MessageCollectionItemType.STRING, false); if (!reader.isLastRead()) return false; @@ -276,7 +275,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 10: - msg.bitSetUuidMap(reader.readMap(MessageCollectionItemType.BIT_SET, MessageCollectionItemType.UUID, false)); + ((TestMapMessage)msg).bitSetUuidMap = reader.readMap(MessageCollectionItemType.BIT_SET, MessageCollectionItemType.UUID, false); if (!reader.isLastRead()) return false; @@ -284,7 +283,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 11: - msg.igniteUuidBitSetMap(reader.readMap(MessageCollectionItemType.IGNITE_UUID, MessageCollectionItemType.BIT_SET, false)); + ((TestMapMessage)msg).igniteUuidBitSetMap = reader.readMap(MessageCollectionItemType.IGNITE_UUID, MessageCollectionItemType.BIT_SET, false); if (!reader.isLastRead()) return false; @@ -292,7 +291,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 12: - msg.affTopVersionIgniteUuidMap(reader.readMap(MessageCollectionItemType.AFFINITY_TOPOLOGY_VERSION, MessageCollectionItemType.IGNITE_UUID, false)); + ((TestMapMessage)msg).affTopVersionIgniteUuidMap = reader.readMap(MessageCollectionItemType.AFFINITY_TOPOLOGY_VERSION, MessageCollectionItemType.IGNITE_UUID, false); if (!reader.isLastRead()) return false; @@ -300,7 +299,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 13: - msg.boxedBooleanAffTopVersionMap(reader.readMap(MessageCollectionItemType.BOOLEAN, MessageCollectionItemType.AFFINITY_TOPOLOGY_VERSION, false)); + ((TestMapMessage)msg).boxedBooleanAffTopVersionMap = reader.readMap(MessageCollectionItemType.BOOLEAN, MessageCollectionItemType.AFFINITY_TOPOLOGY_VERSION, false); if (!reader.isLastRead()) return false; @@ -308,7 +307,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 14: - msg.boxedByteBoxedBooleanMap(reader.readMap(MessageCollectionItemType.BYTE, MessageCollectionItemType.BOOLEAN, false)); + ((TestMapMessage)msg).boxedByteBoxedBooleanMap = reader.readMap(MessageCollectionItemType.BYTE, MessageCollectionItemType.BOOLEAN, false); if (!reader.isLastRead()) return false; @@ -316,7 +315,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 15: - msg.boxedShortBoxedByteMap(reader.readMap(MessageCollectionItemType.SHORT, MessageCollectionItemType.BYTE, false)); + ((TestMapMessage)msg).boxedShortBoxedByteMap = reader.readMap(MessageCollectionItemType.SHORT, MessageCollectionItemType.BYTE, false); if (!reader.isLastRead()) return false; @@ -324,7 +323,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 16: - msg.boxedIntBoxedShortMap(reader.readMap(MessageCollectionItemType.INT, MessageCollectionItemType.SHORT, false)); + ((TestMapMessage)msg).boxedIntBoxedShortMap = reader.readMap(MessageCollectionItemType.INT, MessageCollectionItemType.SHORT, false); if (!reader.isLastRead()) return false; @@ -332,7 +331,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 17: - msg.boxedLongBoxedIntMap(reader.readMap(MessageCollectionItemType.LONG, MessageCollectionItemType.INT, false)); + ((TestMapMessage)msg).boxedLongBoxedIntMap = reader.readMap(MessageCollectionItemType.LONG, MessageCollectionItemType.INT, false); if (!reader.isLastRead()) return false; @@ -340,7 +339,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 18: - msg.boxedCharBoxedLongMap(reader.readMap(MessageCollectionItemType.CHAR, MessageCollectionItemType.LONG, false)); + ((TestMapMessage)msg).boxedCharBoxedLongMap = reader.readMap(MessageCollectionItemType.CHAR, MessageCollectionItemType.LONG, false); if (!reader.isLastRead()) return false; @@ -348,7 +347,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 19: - msg.boxedFloatBoxedCharMap(reader.readMap(MessageCollectionItemType.FLOAT, MessageCollectionItemType.CHAR, false)); + ((TestMapMessage)msg).boxedFloatBoxedCharMap = reader.readMap(MessageCollectionItemType.FLOAT, MessageCollectionItemType.CHAR, false); if (!reader.isLastRead()) return false; @@ -356,7 +355,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 20: - msg.boxedDoubleBoxedFloatMap(reader.readMap(MessageCollectionItemType.DOUBLE, MessageCollectionItemType.FLOAT, false)); + ((TestMapMessage)msg).boxedDoubleBoxedFloatMap = reader.readMap(MessageCollectionItemType.DOUBLE, MessageCollectionItemType.FLOAT, false); if (!reader.isLastRead()) return false; @@ -364,7 +363,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 21: - msg.messageBoxedDoubleMap(reader.readMap(MessageCollectionItemType.MSG, MessageCollectionItemType.DOUBLE, false)); + ((TestMapMessage)msg).messageBoxedDoubleMap = reader.readMap(MessageCollectionItemType.MSG, MessageCollectionItemType.DOUBLE, false); if (!reader.isLastRead()) return false; @@ -372,7 +371,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 22: - msg.integerGridLongListMap(reader.readMap(MessageCollectionItemType.INT, MessageCollectionItemType.GRID_LONG_LIST, false)); + ((TestMapMessage)msg).integerGridLongListMap = reader.readMap(MessageCollectionItemType.INT, MessageCollectionItemType.GRID_LONG_LIST, false); if (!reader.isLastRead()) return false; @@ -380,7 +379,7 @@ public class TestMapMessageSerializer implements MessageSerializer { reader.incrementState(); case 23: - msg.gridLongListIntegerMap(reader.readMap(MessageCollectionItemType.GRID_LONG_LIST, MessageCollectionItemType.INT, false)); + ((TestMapMessage)msg).gridLongListIntegerMap = reader.readMap(MessageCollectionItemType.GRID_LONG_LIST, MessageCollectionItemType.INT, false); if (!reader.isLastRead()) return false; diff --git a/modules/core/src/test/resources/codegen/TestMessage.java b/modules/core/src/test/resources/codegen/TestMessage.java index 1765f6498e27c..104f64c324d4c 100644 --- a/modules/core/src/test/resources/codegen/TestMessage.java +++ b/modules/core/src/test/resources/codegen/TestMessage.java @@ -30,170 +30,49 @@ public class TestMessage implements Message { @Order(0) - private int id; + int id; @Order(1) - private byte[] byteArr; + byte[] byteArr; @Order(2) - private String str; + String str; @Order(3) - private String[] strArr; + String[] strArr; @Order(4) - private int[][] intMatrix; + int[][] intMatrix; @Order(5) - private GridCacheVersion ver; + GridCacheVersion ver; @Order(6) - private GridCacheVersion[] verArr; + GridCacheVersion[] verArr; @Order(7) - private UUID uuid; + UUID uuid; @Order(8) - private IgniteUuid ignUuid; + IgniteUuid ignUuid; @Order(9) - private AffinityTopologyVersion topVer; + AffinityTopologyVersion topVer; @Order(10) - private BitSet bitSet; + BitSet bitSet; @Order(11) - private String field; + String field; @Order(12) - private KeyCacheObject keyCacheObject; + KeyCacheObject keyCacheObject; @Order(13) - private CacheObject cacheObject; + CacheObject cacheObject; @Order(14) - private GridLongList gridLongList; - - public int id() { - return id; - } - - public void id(int id) { - this.id = id; - } - - public byte[] byteArr() { - return byteArr; - } - - public void byteArr(byte[] byteArr) { - this.byteArr = byteArr; - } - - public String str() { - return str; - } - - public void str(String str) { - this.str = str; - } - - public String[] strArr() { - return strArr; - } - - public void strArr(String[] strArr) { - this.strArr = strArr; - } - - public int[][] intMatrix() { - return intMatrix; - } - - public void intMatrix(int[][] intMatrix) { - this.intMatrix = intMatrix; - } - - public GridCacheVersion ver() { - return ver; - } - - public void ver(GridCacheVersion ver) { - this.ver = ver; - } - - public GridCacheVersion[] verArr() { - return verArr; - } - - public void verArr(GridCacheVersion[] verArr) { - this.verArr = verArr; - } - - public UUID uuid() { - return uuid; - } - - public void uuid(UUID uuid) { - this.uuid = uuid; - } - - public IgniteUuid ignUuid() { - return ignUuid; - } - - public void ignUuid(IgniteUuid ignUuid) { - this.ignUuid = ignUuid; - } - - public AffinityTopologyVersion topVer() { - return topVer; - } - - public void topVer(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - - public BitSet bitSet() { - return bitSet; - } - - public void bitSet(BitSet bitSet) { - this.bitSet = bitSet; - } - - public String overridenFieldMethod() { - return field; - } - - public void overridenFieldMethod(String field) { - this.field = field; - } - - public KeyCacheObject keyCacheObject() { - return keyCacheObject; - } - - public void keyCacheObject(KeyCacheObject keyCacheObject) { - this.keyCacheObject = keyCacheObject; - } - - public CacheObject cacheObject() { - return cacheObject; - } - - public void cacheObject(CacheObject cacheObject) { - this.cacheObject = cacheObject; - } - - public GridLongList gridLongList() { - return gridLongList; - } - - public void gridLongList(GridLongList gridLongList) { - this.gridLongList = gridLongList; - } - + GridLongList gridLongList; public short directType() { return 0; diff --git a/modules/core/src/test/resources/codegen/TestMessageSerializer.java b/modules/core/src/test/resources/codegen/TestMessageSerializer.java index 1767ce03e1d1f..87e4e1fea5976 100644 --- a/modules/core/src/test/resources/codegen/TestMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/TestMessageSerializer.java @@ -15,9 +15,8 @@ * limitations under the License. */ -package org.apache.ignite.internal.codegen; +package org.apache.ignite.internal; -import org.apache.ignite.internal.TestMessage; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; @@ -28,7 +27,7 @@ /** * This class is generated automatically. * - * @see org.apache.ignite.codegen.MessageSerializer + * @see org.apache.ignite.internal.MessageProcessor */ public class TestMessageSerializer implements MessageSerializer { /** */ @@ -44,91 +43,91 @@ public class TestMessageSerializer implements MessageSerializer { switch (writer.state()) { case 0: - if (!writer.writeInt(msg.id())) + if (!writer.writeInt(((TestMessage)msg).id)) return false; writer.incrementState(); case 1: - if (!writer.writeByteArray(msg.byteArr())) + if (!writer.writeByteArray(((TestMessage)msg).byteArr)) return false; writer.incrementState(); case 2: - if (!writer.writeString(msg.str())) + if (!writer.writeString(((TestMessage)msg).str)) return false; writer.incrementState(); case 3: - if (!writer.writeObjectArray(msg.strArr(), MessageCollectionItemType.STRING)) + if (!writer.writeObjectArray(((TestMessage)msg).strArr, MessageCollectionItemType.STRING)) return false; writer.incrementState(); case 4: - if (!writer.writeObjectArray(msg.intMatrix(), MessageCollectionItemType.INT_ARR)) + if (!writer.writeObjectArray(((TestMessage)msg).intMatrix, MessageCollectionItemType.INT_ARR)) return false; writer.incrementState(); case 5: - if (!writer.writeMessage(msg.ver())) + if (!writer.writeMessage(((TestMessage)msg).ver)) return false; writer.incrementState(); case 6: - if (!writer.writeObjectArray(msg.verArr(), MessageCollectionItemType.MSG)) + if (!writer.writeObjectArray(((TestMessage)msg).verArr, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 7: - if (!writer.writeUuid(msg.uuid())) + if (!writer.writeUuid(((TestMessage)msg).uuid)) return false; writer.incrementState(); case 8: - if (!writer.writeIgniteUuid(msg.ignUuid())) + if (!writer.writeIgniteUuid(((TestMessage)msg).ignUuid)) return false; writer.incrementState(); case 9: - if (!writer.writeAffinityTopologyVersion(msg.topVer())) + if (!writer.writeAffinityTopologyVersion(((TestMessage)msg).topVer)) return false; writer.incrementState(); case 10: - if (!writer.writeBitSet(msg.bitSet())) + if (!writer.writeBitSet(((TestMessage)msg).bitSet)) return false; writer.incrementState(); case 11: - if (!writer.writeString(msg.overridenFieldMethod())) + if (!writer.writeString(((TestMessage)msg).field)) return false; writer.incrementState(); case 12: - if (!writer.writeKeyCacheObject(msg.keyCacheObject())) + if (!writer.writeKeyCacheObject(((TestMessage)msg).keyCacheObject)) return false; writer.incrementState(); case 13: - if (!writer.writeCacheObject(msg.cacheObject())) + if (!writer.writeCacheObject(((TestMessage)msg).cacheObject)) return false; writer.incrementState(); case 14: - if (!writer.writeGridLongList(msg.gridLongList())) + if (!writer.writeGridLongList(((TestMessage)msg).gridLongList)) return false; writer.incrementState(); @@ -143,7 +142,7 @@ public class TestMessageSerializer implements MessageSerializer { switch (reader.state()) { case 0: - msg.id(reader.readInt()); + ((TestMessage)msg).id = reader.readInt(); if (!reader.isLastRead()) return false; @@ -151,7 +150,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 1: - msg.byteArr(reader.readByteArray()); + ((TestMessage)msg).byteArr = reader.readByteArray(); if (!reader.isLastRead()) return false; @@ -159,7 +158,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 2: - msg.str(reader.readString()); + ((TestMessage)msg).str = reader.readString(); if (!reader.isLastRead()) return false; @@ -167,7 +166,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 3: - msg.strArr(reader.readObjectArray(MessageCollectionItemType.STRING, String.class)); + ((TestMessage)msg).strArr = reader.readObjectArray(MessageCollectionItemType.STRING, String.class); if (!reader.isLastRead()) return false; @@ -175,7 +174,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 4: - msg.intMatrix(reader.readObjectArray(MessageCollectionItemType.INT, int[].class)); + ((TestMessage)msg).intMatrix = reader.readObjectArray(MessageCollectionItemType.INT, int[].class); if (!reader.isLastRead()) return false; @@ -183,7 +182,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 5: - msg.ver(reader.readMessage()); + ((TestMessage)msg).ver = reader.readMessage(); if (!reader.isLastRead()) return false; @@ -191,7 +190,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 6: - msg.verArr(reader.readObjectArray(MessageCollectionItemType.MSG, GridCacheVersion.class)); + ((TestMessage)msg).verArr = reader.readObjectArray(MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) return false; @@ -199,7 +198,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 7: - msg.uuid(reader.readUuid()); + ((TestMessage)msg).uuid = reader.readUuid(); if (!reader.isLastRead()) return false; @@ -207,7 +206,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 8: - msg.ignUuid(reader.readIgniteUuid()); + ((TestMessage)msg).ignUuid = reader.readIgniteUuid(); if (!reader.isLastRead()) return false; @@ -215,7 +214,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 9: - msg.topVer(reader.readAffinityTopologyVersion()); + ((TestMessage)msg).topVer = reader.readAffinityTopologyVersion(); if (!reader.isLastRead()) return false; @@ -223,7 +222,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 10: - msg.bitSet(reader.readBitSet()); + ((TestMessage)msg).bitSet = reader.readBitSet(); if (!reader.isLastRead()) return false; @@ -231,7 +230,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 11: - msg.overridenFieldMethod(reader.readString()); + ((TestMessage)msg).field = reader.readString(); if (!reader.isLastRead()) return false; @@ -239,7 +238,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 12: - msg.keyCacheObject(reader.readKeyCacheObject()); + ((TestMessage)msg).keyCacheObject = reader.readKeyCacheObject(); if (!reader.isLastRead()) return false; @@ -247,7 +246,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 13: - msg.cacheObject(reader.readCacheObject()); + ((TestMessage)msg).cacheObject = reader.readCacheObject(); if (!reader.isLastRead()) return false; @@ -255,7 +254,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 14: - msg.gridLongList(reader.readGridLongList()); + ((TestMessage)msg).gridLongList = reader.readGridLongList(); if (!reader.isLastRead()) return false; @@ -265,4 +264,4 @@ public class TestMessageSerializer implements MessageSerializer { return true; } -} +} \ No newline at end of file From bca89afd9328f4d52a3edc64897e943eb6bb5f3a Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Tue, 17 Feb 2026 21:23:13 +0300 Subject: [PATCH 05/42] WIP --- .../org/apache/ignite/internal/MessageSerializerGenerator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java index 09a7cfe934541..c2f70ed913391 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java @@ -794,7 +794,8 @@ private void returnFalseIfEnumReadFailed(VariableElement field, String mapperDec String methodName = field.getAnnotation(Order.class).method(); if (Objects.equals(methodName, "")) - read.add(identedLine("((%s)msg).%s = %s;", field.getEnclosingElement().getSimpleName(), field.getSimpleName().toString(), readOp)); + read.add(identedLine("((%s)msg).%s = %s;", + field.getEnclosingElement().getSimpleName(), field.getSimpleName().toString(), readOp)); else read.add(identedLine("msg.%s(%s);", methodName, readOp)); From ec7877d69281bb65e35efa77ee7e021fa7eb9b9c Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 15:43:45 +0300 Subject: [PATCH 06/42] WIP --- .../processors/cache/transactions/TxEntryValueHolder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java index f5ba59e9ae559..ec2d4f02f453e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java @@ -40,7 +40,7 @@ */ public class TxEntryValueHolder implements Message { /** Stored value. */ - @Order(0) + @Order(value = 0, method = "storedValue") @GridToStringInclude(sensitive = true) @Nullable CacheObject val; From b7ac8a6055eccd6a5ad0427c84cf62fda8adc908 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 15:47:29 +0300 Subject: [PATCH 07/42] WIP --- .../processors/query/calcite/metadata/ColocationGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java index 81a5f363a3f06..de1f069a4ab10 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java @@ -60,7 +60,7 @@ public class ColocationGroup implements CalciteMessage { private boolean primaryAssignment; /** Marshalled assignments serialization call holder. */ - @Order(2) + @Order(value = 2, method = "marshalledAssignments") int[] marshalledAssignments; /** */ From ef2dc51a1cdc1a373ab901966ca9a86b36f5002a Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 15:53:13 +0300 Subject: [PATCH 08/42] WIP --- .../cache/distributed/near/GridNearSingleGetResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java index eb2e7d7865efe..961ef40e7a3ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java @@ -50,7 +50,7 @@ public class GridNearSingleGetResponse extends GridCacheIdMessage implements Gri Message res; /** Topology version. */ - @Order(6) + @Order(value = 6, method = "topologyVersion") AffinityTopologyVersion topVer; /** Error message. */ From 041ad54744c7448d7a2e183863d0c15665cff2e3 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 16:01:34 +0300 Subject: [PATCH 09/42] WIP --- .../java/org/apache/ignite/internal/GridJobExecuteResponse.java | 2 +- .../processors/cache/distributed/near/GridNearGetResponse.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java index 15ea1ef3fce7e..e141d537f4b73 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java @@ -57,7 +57,7 @@ public class GridJobExecuteResponse implements Message { * Serialization call holder for {@code gridEx}. Works with {@link #marshallUserData(Marshaller)}. * Wraps also possible serialization error. */ - @Order(3) + @Order(value = 3, method = "exceptionMessage") @Nullable ErrorMessage gridExMsg; /** Job result serialization call holder. */ 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 ebe9eae260556..f8c921127309f 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 @@ -55,7 +55,7 @@ public class GridNearGetResponse extends GridCacheIdMessage implements GridCache /** Result. */ @GridToStringInclude - @Order(7) + @Order(value = 7, method = "entries") Collection entries; /** Keys to retry due to ownership shift. */ From 4fad5081c3e2fe816b83cfb72fd94d3c70e228ac Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 16:23:32 +0300 Subject: [PATCH 10/42] WIP --- .../internal/managers/eventstorage/GridEventStorageMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java index 70a6898cc848e..77ee2c0e201c1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java @@ -82,7 +82,7 @@ public class GridEventStorageMessage implements Message { /** Node class loader participants. */ @GridToStringInclude - @Order(8) + @Order(value = 8, method = "loaderParticipants") Map ldrParties; /** */ From 920122ffe8289dfcfcd1f126f9ede9bde922856c Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 16:26:57 +0300 Subject: [PATCH 11/42] WIP --- .../authentication/UserAuthenticateResponseMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java index ea8fa323ae8ca..476eb35146246 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java @@ -31,7 +31,7 @@ public class UserAuthenticateResponseMessage implements Message { IgniteUuid id; /** Error message. */ - @Order(1) + @Order(value = 1, method = "errorMessage") String errMsg; /** From a763d846f9905520701b214d8d308c9167a10790 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 16:43:22 +0300 Subject: [PATCH 12/42] WIP --- .../processors/query/calcite/message/QueryStartResponse.java | 2 +- .../internal/managers/eventstorage/GridEventStorageMessage.java | 2 +- .../internal/processors/cache/CacheInvokeDirectResult.java | 2 +- .../ignite/internal/processors/cache/GridCacheMessage.java | 2 +- .../processors/cache/GridChangeGlobalStateMessageResponse.java | 2 +- .../cache/distributed/GridDistributedLockResponse.java | 2 +- .../cache/distributed/GridDistributedTxPrepareResponse.java | 2 +- .../cache/distributed/dht/GridDhtTxFinishResponse.java | 2 +- .../processors/cache/distributed/dht/atomic/UpdateErrors.java | 2 +- .../distributed/dht/preloader/GridDhtForceKeysResponse.java | 2 +- .../dht/preloader/GridDhtPartitionSupplyMessage.java | 2 +- .../dht/preloader/GridDhtPartitionsSingleMessage.java | 2 +- .../processors/cache/distributed/near/GridNearGetResponse.java | 2 +- .../cache/distributed/near/GridNearSingleGetResponse.java | 2 +- .../cache/distributed/near/GridNearTxFinishResponse.java | 2 +- .../internal/processors/cache/query/GridCacheQueryResponse.java | 2 +- .../continuous/ContinuousRoutineStartResultMessage.java | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java index f90484152784d..4d5a1e8060586 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java @@ -35,7 +35,7 @@ public class QueryStartResponse implements CalciteMessage { long fragmentId; /** */ - @Order(2) + @Order(value = 2, method = "errorMessage") @Nullable ErrorMessage errMsg; /** */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java index 77ee2c0e201c1..c66a95bea2d6e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java @@ -61,7 +61,7 @@ public class GridEventStorageMessage implements Message { byte[] evtsBytes; /** */ - @Order(3) + @Order(value = 3, method = "errorMessage") ErrorMessage errMsg; /** */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java index 723a3f6169e8b..f28734515a45d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java @@ -46,7 +46,7 @@ public class CacheInvokeDirectResult implements Message { /** Error message. */ @GridToStringInclude(sensitive = true) - @Order(2) + @Order(value = 2, method = "errorMessage") ErrorMessage errMsg; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java index 7bb9549558772..068c0abceeab0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java @@ -69,7 +69,7 @@ public abstract class GridCacheMessage implements Message { /** */ @GridToStringInclude - @Order(2) + @Order(value = 2, method = "lastAffinityChangedTopologyVersion") @Nullable public AffinityTopologyVersion lastAffChangedTopVer; /** */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java index dd7d4749344ea..ecb4cafdf6bd4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java @@ -32,7 +32,7 @@ public class GridChangeGlobalStateMessageResponse extends GridCacheMessage { UUID reqId; /** Activation error message. */ - @Order(4) + @Order(value = 4, method = "errorMessage") ErrorMessage errMsg; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java index 10fa4714dbcac..6c96331b42a1f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java @@ -42,7 +42,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { public IgniteUuid futId; /** Error. */ - @Order(8) + @Order(value = 8, method = "errorMessage") public ErrorMessage errMsg; /** Values. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java index 0584e7521f72c..2ca1f10dbebeb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java @@ -34,7 +34,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage implements IgniteTxStateAware { /** Error message. */ @GridToStringExclude - @Order(7) + @Order(value = 7, method = "errorMessage") @Nullable public ErrorMessage errMsg; /** TX state. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java index ae2e0f60452d3..6d313c217522b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java @@ -38,7 +38,7 @@ public final class GridDhtTxFinishResponse extends GridDistributedTxFinishRespon int miniId; /** Error message. */ - @Order(7) + @Order(value = 7, method = "checkCommittedErrorMessage") @Nullable ErrorMessage checkCommittedErrMsg; /** Cache return value. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java index 11a8b0e6dcba9..3ff3a77791083 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java @@ -41,7 +41,7 @@ public class UpdateErrors implements Message { List failedKeys; /** Error message. */ - @Order(1) + @Order(value = 1, method = "errorMessage") ErrorMessage errMsg; /** 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 deb45e8362121..a57884bf7d060 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 @@ -48,7 +48,7 @@ public class GridDhtForceKeysResponse extends GridCacheIdMessage implements Grid IgniteUuid miniId; /** Error message. */ - @Order(6) + @Order(value = 6, method = "errorMessage") @Nullable volatile ErrorMessage errMsg; /** Missed (not found) keys. */ 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 fe44d824938ca..db30b483badaa 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 @@ -68,7 +68,7 @@ public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage imple int msgSize; /** Supplying process error message. */ - @Order(10) + @Order(value = 10, method = "errorMessage") @Nullable ErrorMessage errMsg; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java index 17ef40ee2b333..c72b951385532 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java @@ -71,7 +71,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes Map partHistCntrs; /** Error message. */ - @Order(11) + @Order(value = 11, method = "errorMessage") @GridToStringInclude ErrorMessage errMsg; 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 f8c921127309f..7c079fd5f308c 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 @@ -68,7 +68,7 @@ public class GridNearGetResponse extends GridCacheIdMessage implements GridCache AffinityTopologyVersion topVer; /** Error message. */ - @Order(10) + @Order(value = 10, method = "errorMessage") @Nullable ErrorMessage errMsg; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java index 961ef40e7a3ce..864d52c5ea3b3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java @@ -54,7 +54,7 @@ public class GridNearSingleGetResponse extends GridCacheIdMessage implements Gri AffinityTopologyVersion topVer; /** Error message. */ - @Order(7) + @Order(value = 7, method = "errorMessage") ErrorMessage errMsg; /** Flags. */ 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 cfac5b264a561..23c897294c272 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 @@ -30,7 +30,7 @@ */ public final class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { /** Error message. */ - @Order(6) + @Order(value = 6, method = "errorMessage") @Nullable ErrorMessage errMsg; /** Mini future ID. */ 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 fb1b7ea2203ba..1d33f521059dd 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 @@ -50,7 +50,7 @@ public class GridCacheQueryResponse extends GridCacheIdMessage implements GridCa long reqId; /** */ - @Order(6) + @Order(value = 6, method = "errorMessage") @Nullable ErrorMessage errMsg; /** */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java index 90e91aa2a5ef9..f14676eeb43e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java @@ -34,7 +34,7 @@ public class ContinuousRoutineStartResultMessage implements Message { UUID routineId; /** */ - @Order(1) + @Order(value = 1, method = "errorMessage") @Nullable ErrorMessage errMsg; /** */ From 43aa60c5df3c3f257ec4f0c536890adf087c8204 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 16:55:50 +0300 Subject: [PATCH 13/42] WIP --- .../cache/distributed/dht/PartitionUpdateCountersMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java index 3e58817ce2be8..c599082caa60f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java @@ -32,7 +32,7 @@ public class PartitionUpdateCountersMessage implements Message { private static final int ITEM_SIZE = 4 /* partition */ + 8 /* initial counter */ + 8 /* updates count */; /** Byte representation of partition counters. */ - @Order(0) + @Order(value = 0, method = "data") byte[] data; /** */ From 81f6f8b1fa0e94134f2f99f8411e488e3bc6faf7 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 17:15:26 +0300 Subject: [PATCH 14/42] WIP --- .../distributed/dht/preloader/GridDhtPartitionsFullMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index 137fe0eded024..47a581b4a5689 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -103,7 +103,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa * Used as a stub for serialization of {@link #errs}. * All logic resides within getter and setter. */ - @Order(13) + @Order(value = 13, method = "errorMessages") @SuppressWarnings("unused") Map errMsgs; From 0ec18a7843e5041f8f92332c60392f70c6d5325d Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 17:38:29 +0300 Subject: [PATCH 15/42] WIP --- .../dht/preloader/IgniteDhtDemandedPartitionsMap.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java index 8474bf09e669a..1b1bda799a85b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/IgniteDhtDemandedPartitionsMap.java @@ -41,11 +41,11 @@ public class IgniteDhtDemandedPartitionsMap implements Serializable, Message { private static final long serialVersionUID = 0L; /** Map of partitions that will be preloaded from history. (partId -> (fromCntr, toCntr)). */ - @Order(0) + @Order(value = 0, method = "historicalMap") CachePartitionPartialCountersMap historical; /** Set of partitions that require full rebalancing. */ - @Order(1) + @Order(value = 1, method = "fullSet") @GridToStringInclude Set full; From 4f3246046a3325c00541c0616ea7af3b8406b951 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 17:57:28 +0300 Subject: [PATCH 16/42] WIP --- .../tcp/messages/TcpDiscoveryAbstractTraceableMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java index 0c229d54defba..66b74c532ab4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractTraceableMessage.java @@ -33,7 +33,7 @@ public abstract class TcpDiscoveryAbstractTraceableMessage extends TcpDiscoveryA /** Serialization holder of {@link #spanContainer}'s bytes. */ @SuppressWarnings("unused") - @Order(5) + @Order(value = 5, method = "spanBytes") @Nullable byte[] spanBytesHolder; /** From dd461fc35ebc2b5460262d3dd3dbd20777abe17d Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 18:04:35 +0300 Subject: [PATCH 17/42] WIP --- .../internal/processors/cache/query/GridCacheQueryRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7df0348db85ad..129bb1e4c3240 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 @@ -151,7 +151,7 @@ public class GridCacheQueryRequest extends GridCacheIdMessage implements GridCac int part = -1; /** */ - @Order(23) + @Order(value = 23, method = "topologyVersion") AffinityTopologyVersion topVer; /** Set of keys that must be skiped during iteration. */ From d776488174c699f54788af61d568269108d06292 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 18:39:05 +0300 Subject: [PATCH 18/42] WIP --- .../internal/managers/eventstorage/GridEventStorageMessage.java | 2 +- .../authentication/UserAuthenticateResponseMessage.java | 2 +- .../internal/processors/cache/CacheInvokeDirectResult.java | 2 +- .../processors/cache/GridChangeGlobalStateMessageResponse.java | 2 +- .../cache/distributed/GridDistributedLockResponse.java | 2 +- .../cache/distributed/GridDistributedTxPrepareResponse.java | 2 +- .../cache/distributed/dht/GridDhtTxFinishResponse.java | 2 +- .../processors/cache/distributed/dht/atomic/UpdateErrors.java | 2 +- .../distributed/dht/preloader/GridDhtForceKeysResponse.java | 2 +- .../dht/preloader/GridDhtPartitionSupplyMessage.java | 2 +- .../dht/preloader/GridDhtPartitionsSingleMessage.java | 2 +- .../processors/cache/distributed/near/GridNearGetResponse.java | 2 +- .../cache/distributed/near/GridNearSingleGetResponse.java | 2 +- .../cache/distributed/near/GridNearTxFinishResponse.java | 2 +- .../internal/processors/cache/query/GridCacheQueryResponse.java | 2 +- .../continuous/ContinuousRoutineStartResultMessage.java | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java index c66a95bea2d6e..77ee2c0e201c1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java @@ -61,7 +61,7 @@ public class GridEventStorageMessage implements Message { byte[] evtsBytes; /** */ - @Order(value = 3, method = "errorMessage") + @Order(3) ErrorMessage errMsg; /** */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java index 476eb35146246..ea8fa323ae8ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java @@ -31,7 +31,7 @@ public class UserAuthenticateResponseMessage implements Message { IgniteUuid id; /** Error message. */ - @Order(value = 1, method = "errorMessage") + @Order(1) String errMsg; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java index f28734515a45d..723a3f6169e8b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java @@ -46,7 +46,7 @@ public class CacheInvokeDirectResult implements Message { /** Error message. */ @GridToStringInclude(sensitive = true) - @Order(value = 2, method = "errorMessage") + @Order(2) ErrorMessage errMsg; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java index ecb4cafdf6bd4..dd7d4749344ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java @@ -32,7 +32,7 @@ public class GridChangeGlobalStateMessageResponse extends GridCacheMessage { UUID reqId; /** Activation error message. */ - @Order(value = 4, method = "errorMessage") + @Order(4) ErrorMessage errMsg; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java index 6c96331b42a1f..10fa4714dbcac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java @@ -42,7 +42,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { public IgniteUuid futId; /** Error. */ - @Order(value = 8, method = "errorMessage") + @Order(8) public ErrorMessage errMsg; /** Values. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java index 2ca1f10dbebeb..0584e7521f72c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java @@ -34,7 +34,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage implements IgniteTxStateAware { /** Error message. */ @GridToStringExclude - @Order(value = 7, method = "errorMessage") + @Order(7) @Nullable public ErrorMessage errMsg; /** TX state. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java index 6d313c217522b..ae2e0f60452d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java @@ -38,7 +38,7 @@ public final class GridDhtTxFinishResponse extends GridDistributedTxFinishRespon int miniId; /** Error message. */ - @Order(value = 7, method = "checkCommittedErrorMessage") + @Order(7) @Nullable ErrorMessage checkCommittedErrMsg; /** Cache return value. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java index 3ff3a77791083..11a8b0e6dcba9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java @@ -41,7 +41,7 @@ public class UpdateErrors implements Message { List failedKeys; /** Error message. */ - @Order(value = 1, method = "errorMessage") + @Order(1) ErrorMessage errMsg; /** 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 a57884bf7d060..deb45e8362121 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 @@ -48,7 +48,7 @@ public class GridDhtForceKeysResponse extends GridCacheIdMessage implements Grid IgniteUuid miniId; /** Error message. */ - @Order(value = 6, method = "errorMessage") + @Order(6) @Nullable volatile ErrorMessage errMsg; /** Missed (not found) keys. */ 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 db30b483badaa..fe44d824938ca 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 @@ -68,7 +68,7 @@ public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage imple int msgSize; /** Supplying process error message. */ - @Order(value = 10, method = "errorMessage") + @Order(10) @Nullable ErrorMessage errMsg; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java index c72b951385532..17ef40ee2b333 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java @@ -71,7 +71,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes Map partHistCntrs; /** Error message. */ - @Order(value = 11, method = "errorMessage") + @Order(11) @GridToStringInclude ErrorMessage errMsg; 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 7c079fd5f308c..f8c921127309f 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 @@ -68,7 +68,7 @@ public class GridNearGetResponse extends GridCacheIdMessage implements GridCache AffinityTopologyVersion topVer; /** Error message. */ - @Order(value = 10, method = "errorMessage") + @Order(10) @Nullable ErrorMessage errMsg; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java index 864d52c5ea3b3..961ef40e7a3ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java @@ -54,7 +54,7 @@ public class GridNearSingleGetResponse extends GridCacheIdMessage implements Gri AffinityTopologyVersion topVer; /** Error message. */ - @Order(value = 7, method = "errorMessage") + @Order(7) ErrorMessage errMsg; /** Flags. */ 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 23c897294c272..cfac5b264a561 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 @@ -30,7 +30,7 @@ */ public final class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { /** Error message. */ - @Order(value = 6, method = "errorMessage") + @Order(6) @Nullable ErrorMessage errMsg; /** Mini future ID. */ 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 1d33f521059dd..fb1b7ea2203ba 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 @@ -50,7 +50,7 @@ public class GridCacheQueryResponse extends GridCacheIdMessage implements GridCa long reqId; /** */ - @Order(value = 6, method = "errorMessage") + @Order(6) @Nullable ErrorMessage errMsg; /** */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java index f14676eeb43e2..90e91aa2a5ef9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java @@ -34,7 +34,7 @@ public class ContinuousRoutineStartResultMessage implements Message { UUID routineId; /** */ - @Order(value = 1, method = "errorMessage") + @Order(1) @Nullable ErrorMessage errMsg; /** */ From 75b0ad48411aa6791afcb5480e5082243d4fd1c9 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 18:40:12 +0300 Subject: [PATCH 19/42] WIP --- .../processors/query/calcite/message/QueryStartResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java index 4d5a1e8060586..f90484152784d 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java @@ -35,7 +35,7 @@ public class QueryStartResponse implements CalciteMessage { long fragmentId; /** */ - @Order(value = 2, method = "errorMessage") + @Order(2) @Nullable ErrorMessage errMsg; /** */ From c657d62387cc513c52af095018b1325f9f9c9e91 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Wed, 18 Feb 2026 18:57:38 +0300 Subject: [PATCH 20/42] WIP --- .../internal/processors/cache/CacheEntryPredicateAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java index 28dbacd802684..b9f618a27701e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java @@ -41,7 +41,7 @@ public class CacheEntryPredicateAdapter implements CacheEntryPredicate { private PredicateType type; /** Type value serialization holder. */ - @Order(0) + @Order(value = 0, method = "code") protected transient byte code; /** */ From 6ad76ecc78ba53f516e30db3e594a8eecdafeb70 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 19 Feb 2026 14:24:09 +0300 Subject: [PATCH 21/42] WIP --- .../ignite/internal/cache/query/index/IndexKeyTypeMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java index 91451a5ec8c5b..c5394ad3d413d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexKeyTypeMessage.java @@ -35,7 +35,7 @@ public class IndexKeyTypeMessage implements Message { private @Nullable IndexKeyType val; /** Code. */ - @Order(0) + @Order(value = 0, method = "code") byte code = NULL_VALUE_CODE; /** Empty constructor for {@link GridIoMessageFactory}. */ From 5b2f796b7d06b00764aa39d94f9ba6d06a71b898 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 19 Feb 2026 18:52:29 +0300 Subject: [PATCH 22/42] WIP --- .../internal/MessageSerializerGenerator.java | 27 ++----------------- ...SystemViewRowAttributeWalkerProcessor.java | 2 +- .../codegen/ChildMessageSerializer.java | 1 + ...stomMapperEnumFieldsMessageSerializer.java | 1 + ...aultMapperEnumFieldsMessageSerializer.java | 1 + .../TestCollectionsMessageSerializer.java | 1 + .../codegen/TestMapMessageSerializer.java | 1 + .../codegen/TestMessageSerializer.java | 1 + 8 files changed, 9 insertions(+), 26 deletions(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java index c2f70ed913391..a003c0d004559 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java @@ -47,11 +47,11 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Elements; -import javax.lang.model.util.Types; import javax.tools.Diagnostic; import javax.tools.FileObject; import javax.tools.JavaFileObject; import javax.tools.StandardLocation; +import org.apache.ignite.internal.systemview.SystemViewRowAttributeWalkerProcessor; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.SB; import org.jetbrains.annotations.Nullable; @@ -115,8 +115,7 @@ public class MessageSerializerGenerator { void generate(TypeElement type, List fields) throws Exception { generateMethods(type, fields); - for (TypeMirror typeMirror : getAllSuperclasses(env.getTypeUtils(), type.asType())) - imports.add(typeMirror.toString()); + SystemViewRowAttributeWalkerProcessor.superclasses(env, type).forEach(el -> imports.add(el.toString())); String serClsName = type.getSimpleName() + "Serializer"; String serFqnClsName = env.getElementUtils().getPackageOf(type) + "." + serClsName; @@ -147,28 +146,6 @@ void generate(TypeElement type, List fields) throws Exception { } } - /** */ - private static List getAllSuperclasses(Types typeUtils, TypeMirror typeMirror) { - List superclasses = new ArrayList<>(); - TypeMirror curMirror = typeMirror; - - while (curMirror != null && curMirror.getKind() == TypeKind.DECLARED) { - TypeElement typeElement = (TypeElement)typeUtils.asElement(curMirror); - TypeMirror directSuperclass = typeElement.getSuperclass(); - - if (directSuperclass == null || - directSuperclass.getKind() == TypeKind.NONE || - directSuperclass.toString().equals(Object.class.getCanonicalName())) { - break; - } - - superclasses.add(directSuperclass); - curMirror = directSuperclass; - } - - return superclasses; - } - /** Generates full code for a serializer class. */ private String generateSerializerCode(TypeElement type) throws IOException { try (Writer writer = new StringWriter()) { diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java index b2c6e03d87c47..5aae958401754 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java @@ -83,7 +83,7 @@ public class SystemViewRowAttributeWalkerProcessor extends AbstractProcessor { * @return Stream of all superclasses including the starting element. Goes up the inheritance chain * until {@link Object} (excluded). */ - static Stream superclasses(ProcessingEnvironment env, TypeElement e) { + public static Stream superclasses(ProcessingEnvironment env, TypeElement e) { return Stream.iterate(e, Objects::nonNull, c -> (TypeElement)env.getTypeUtils().asElement(c.getSuperclass()) diff --git a/modules/core/src/test/resources/codegen/ChildMessageSerializer.java b/modules/core/src/test/resources/codegen/ChildMessageSerializer.java index b16282528490c..f7989a079c7ef 100644 --- a/modules/core/src/test/resources/codegen/ChildMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/ChildMessageSerializer.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal; import org.apache.ignite.internal.AbstractMessage; +import org.apache.ignite.internal.ChildMessage; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageReader; import org.apache.ignite.plugin.extensions.communication.MessageSerializer; diff --git a/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessageSerializer.java b/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessageSerializer.java index 17e0d4b1d39f7..180f067c2f185 100644 --- a/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessageSerializer.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal; +import org.apache.ignite.internal.CustomMapperEnumFieldsMessage; import org.apache.ignite.internal.TransactionIsolationEnumMapper; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageReader; diff --git a/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessageSerializer.java b/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessageSerializer.java index 5af4c6814e5f2..ce0dfcfab17ad 100644 --- a/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessageSerializer.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal; +import org.apache.ignite.internal.DefaultMapperEnumFieldsMessage; import org.apache.ignite.internal.processors.cache.GridCacheOperation; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageReader; diff --git a/modules/core/src/test/resources/codegen/TestCollectionsMessageSerializer.java b/modules/core/src/test/resources/codegen/TestCollectionsMessageSerializer.java index 9e35c9c27a249..00335f38db649 100644 --- a/modules/core/src/test/resources/codegen/TestCollectionsMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/TestCollectionsMessageSerializer.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal; +import org.apache.ignite.internal.TestCollectionsMessage; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; import org.apache.ignite.plugin.extensions.communication.MessageReader; diff --git a/modules/core/src/test/resources/codegen/TestMapMessageSerializer.java b/modules/core/src/test/resources/codegen/TestMapMessageSerializer.java index 71166432f61be..9753dd90e53e0 100644 --- a/modules/core/src/test/resources/codegen/TestMapMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/TestMapMessageSerializer.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal; +import org.apache.ignite.internal.TestMapMessage; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; import org.apache.ignite.plugin.extensions.communication.MessageReader; diff --git a/modules/core/src/test/resources/codegen/TestMessageSerializer.java b/modules/core/src/test/resources/codegen/TestMessageSerializer.java index 87e4e1fea5976..0d567043c5625 100644 --- a/modules/core/src/test/resources/codegen/TestMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/TestMessageSerializer.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal; +import org.apache.ignite.internal.TestMessage; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; From d88b094c0138bfae9dbbf41726eaed4d842ada2d Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 19 Feb 2026 20:28:57 +0300 Subject: [PATCH 23/42] WIP --- .../internal/managers/communication/GridIoMessageFactory.java | 4 ++++ .../internal/managers/deployment/GridDeploymentRequest.java | 4 ++-- .../managers/encryption/GenerateEncryptionKeyResponse.java | 2 +- .../processors/service/ServiceSingleNodeDeploymentResult.java | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index 236a8c38c0be3..9f44bfa330552 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -53,11 +53,13 @@ import org.apache.ignite.internal.managers.checkpoint.GridCheckpointRequestSerializer; import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean; import org.apache.ignite.internal.managers.deployment.GridDeploymentRequest; +import org.apache.ignite.internal.managers.deployment.GridDeploymentRequestSerializer; import org.apache.ignite.internal.managers.deployment.GridDeploymentResponse; import org.apache.ignite.internal.managers.deployment.GridDeploymentResponseSerializer; import org.apache.ignite.internal.managers.encryption.GenerateEncryptionKeyRequest; import org.apache.ignite.internal.managers.encryption.GenerateEncryptionKeyRequestSerializer; import org.apache.ignite.internal.managers.encryption.GenerateEncryptionKeyResponse; +import org.apache.ignite.internal.managers.encryption.GenerateEncryptionKeyResponseSerializer; import org.apache.ignite.internal.managers.eventstorage.GridEventStorageMessage; import org.apache.ignite.internal.managers.eventstorage.GridEventStorageMessageSerializer; import org.apache.ignite.internal.processors.authentication.UserAuthenticateRequestMessage; @@ -271,6 +273,7 @@ import org.apache.ignite.internal.processors.datastreamer.DataStreamerEntry; import org.apache.ignite.internal.processors.datastreamer.DataStreamerRequest; import org.apache.ignite.internal.processors.datastreamer.DataStreamerResponse; +import org.apache.ignite.internal.processors.datastreamer.DataStreamerResponseSerializer; import org.apache.ignite.internal.processors.marshaller.MissingMappingRequestMessage; import org.apache.ignite.internal.processors.marshaller.MissingMappingRequestMessageSerializer; import org.apache.ignite.internal.processors.marshaller.MissingMappingResponseMessage; @@ -304,6 +307,7 @@ import org.apache.ignite.internal.processors.service.ServiceSingleNodeDeploymentResult; import org.apache.ignite.internal.processors.service.ServiceSingleNodeDeploymentResultBatch; import org.apache.ignite.internal.processors.service.ServiceSingleNodeDeploymentResultBatchSerializer; +import org.apache.ignite.internal.processors.service.ServiceSingleNodeDeploymentResultSerializer; import org.apache.ignite.internal.util.GridByteArrayList; import org.apache.ignite.internal.util.UUIDCollectionMessage; import org.apache.ignite.internal.util.UUIDCollectionMessageSerializer; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java index 1014b8c990c47..fa48610f524df 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java @@ -49,12 +49,12 @@ public class GridDeploymentRequest implements Message { /** Undeploy flag. */ @Order(3) - private boolean isUndeploy; + boolean isUndeploy; /** Nodes participating in request (chain). */ @Order(4) @GridToStringInclude - private Collection nodeIds; + Collection nodeIds; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java index ab012dee3e1c5..d8bc8fdc5a0da 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java @@ -37,7 +37,7 @@ public class GenerateEncryptionKeyResponse implements Message { /** Master key digest that encrypted group encryption keys. */ @Order(2) - private byte[] masterKeyDigest; + byte[] masterKeyDigest; /** */ public GenerateEncryptionKeyResponse() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java index 024567fa214f1..4814e05dc0cdd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java @@ -40,7 +40,7 @@ public class ServiceSingleNodeDeploymentResult implements Message, Serializable /** Serialized exceptions. */ @Order(1) - private Collection errors; + Collection errors; /** * Empty constructor for marshalling purposes. From d529c0a9d00ba690dd5bbde08dc60d22f678013f Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 19 Feb 2026 20:35:31 +0300 Subject: [PATCH 24/42] WIP --- .../internal/managers/communication/GridIoMessageFactory.java | 1 + .../java/org/apache/ignite/internal/util/GridByteArrayList.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index 79fdfbf529f06..35602626a154b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -309,6 +309,7 @@ import org.apache.ignite.internal.processors.service.ServiceSingleNodeDeploymentResultBatchSerializer; import org.apache.ignite.internal.processors.service.ServiceSingleNodeDeploymentResultSerializer; import org.apache.ignite.internal.util.GridByteArrayList; +import org.apache.ignite.internal.util.GridByteArrayListSerializer; import org.apache.ignite.internal.util.UUIDCollectionMessage; import org.apache.ignite.internal.util.UUIDCollectionMessageSerializer; import org.apache.ignite.internal.util.distributed.SingleNodeMessage; 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 3e31658599b4e..b9011582bf5ef 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 @@ -43,7 +43,7 @@ public class GridByteArrayList implements Message, Externalizable { /** List's size. */ @Order(1) - private int size; + int size; /** * No-op constructor that creates uninitialized list. This method is meant From 2c150eb9a3d79797c71993f010429153ed77c611 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 19 Feb 2026 20:44:31 +0300 Subject: [PATCH 25/42] WIP --- .../managers/deployment/GridDeploymentRequest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java index fa48610f524df..fd3abb429baee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java @@ -36,16 +36,16 @@ public class GridDeploymentRequest implements Message { private Object resTopic; /** Serialized topic. */ - @Order(value = 0, method = "responseTopicBytes") - private byte[] resTopicBytes; + @Order(0) + byte[] resTopicBytes; /** Requested class name. */ - @Order(value = 1, method = "resourceName") - private String rsrcName; + @Order(1) + String rsrcName; /** Class loader ID. */ - @Order(value = 2, method = "classLoaderId") - private IgniteUuid ldrId; + @Order(2) + IgniteUuid ldrId; /** Undeploy flag. */ @Order(3) From 66210c1fbbd3465c2f14151132963307a6524e58 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 19 Feb 2026 20:54:43 +0300 Subject: [PATCH 26/42] WIP --- .../encryption/GenerateEncryptionKeyResponse.java | 8 ++++---- .../processors/datastreamer/DataStreamerResponse.java | 8 ++++---- .../service/ServiceSingleNodeDeploymentResult.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java index d8bc8fdc5a0da..2c8c81afa790e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java @@ -28,12 +28,12 @@ */ public class GenerateEncryptionKeyResponse implements Message { /** Request message ID. */ - @Order(value = 0, method = "requestId") - private IgniteUuid id; + @Order(0) + IgniteUuid id; /** */ - @Order(value = 1, method = "encryptionKeys") - private Collection encKeys; + @Order(1) + Collection encKeys; /** Master key digest that encrypted group encryption keys. */ @Order(2) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java index 83b51fb08001f..1beefa98476b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java @@ -31,15 +31,15 @@ */ public class DataStreamerResponse implements Message { /** */ - @Order(value = 0, method = "requestId") - private long reqId; + @Order(0) + long reqId; /** */ private @Nullable Throwable err; /** */ - @Order(value = 1, method = "errorBytes") - private @Nullable byte[] errBytes; + @Order(1) + @Nullable byte[] errBytes; /** * @param reqId Request ID. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java index 4814e05dc0cdd..7d09987207b30 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java @@ -35,8 +35,8 @@ public class ServiceSingleNodeDeploymentResult implements Message, Serializable private static final long serialVersionUID = 0L; /** Count of service's instances. */ - @Order(value = 0, method = "count") - private int cnt; + @Order(0) + int cnt; /** Serialized exceptions. */ @Order(1) From c5dfb8ed11b5aa176151bb06a9f4fc1afc7df59a Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 19 Feb 2026 20:56:35 +0300 Subject: [PATCH 27/42] WIP --- .../org/apache/ignite/internal/util/GridByteArrayList.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b9011582bf5ef..ce1fb536c6331 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 @@ -37,9 +37,9 @@ public class GridByteArrayList implements Message, Externalizable { private static final long serialVersionUID = 0L; /** List byte data. */ - @Order(value = 0, method = "internalArray") + @Order(0) @GridToStringExclude - private byte[] data; + byte[] data; /** List's size. */ @Order(1) From 6b6e98b3f10fdd15b7795ff651905dd4c15582ea Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 19 Feb 2026 21:07:02 +0300 Subject: [PATCH 28/42] WIP --- .../calcite/message/CalciteErrorMessage.java | 10 -- .../calcite/message/GenericValueMessage.java | 14 --- .../calcite/message/InboxCloseMessage.java | 21 ---- .../message/QueryBatchAcknowledgeMessage.java | 28 ----- .../calcite/message/QueryBatchMessage.java | 49 -------- .../calcite/message/QueryCloseMessage.java | 7 -- .../managers/communication/GridIoMessage.java | 56 ---------- .../GridIoSecurityAwareMessage.java | 7 -- .../communication/IgniteIoTestMessage.java | 14 --- .../communication/SessionChannelMessage.java | 7 -- .../eventstorage/GridEventStorageMessage.java | 84 -------------- .../UserAuthenticateRequestMessage.java | 21 ---- .../UserAuthenticateResponseMessage.java | 14 --- ...serManagementOperationFinishedMessage.java | 14 --- .../cache/GridCacheGroupIdMessage.java | 7 -- .../processors/cache/GridCacheIdMessage.java | 7 -- .../processors/cache/GridCacheMessage.java | 8 -- .../processors/cache/WalStateAckMessage.java | 28 ----- .../cache/WalStateProposeMessage.java | 7 -- .../cache/binary/MetadataRequestMessage.java | 7 -- .../cache/binary/MetadataResponseMessage.java | 7 -- .../GridDistributedBaseMessage.java | 14 --- .../dht/PartitionUpdateCountersMessage.java | 7 -- .../preloader/CacheGroupAffinityMessage.java | 35 ------ .../GridDhtPartitionDemandMessage.java | 28 ----- .../GridDhtPartitionSupplyMessage.java | 63 ----------- .../GridDhtPartitionsAbstractMessage.java | 21 ---- .../GridDhtPartitionsFullMessage.java | 91 --------------- .../GridDhtPartitionsSingleMessage.java | 84 -------------- .../dht/preloader/latch/LatchAckMessage.java | 21 ---- .../snapshot/AbstractSnapshotMessage.java | 7 -- .../IncrementalSnapshotAwareMessage.java | 28 ----- .../snapshot/SnapshotFilesFailureMessage.java | 7 -- .../snapshot/SnapshotFilesRequestMessage.java | 35 ------ .../cluster/CacheMetricsMessage.java | 105 ------------------ .../cluster/ChangeGlobalStateMessage.java | 7 -- .../cluster/ClusterMetricsUpdateMessage.java | 14 --- .../ContinuousRoutineStartResultMessage.java | 21 ---- .../StopRoutineAckDiscoveryMessage.java | 7 -- .../StopRoutineDiscoveryMessage.java | 7 -- .../MissingMappingRequestMessage.java | 10 -- .../MissingMappingResponseMessage.java | 15 --- .../DistributedMetaStorageUpdateMessage.java | 5 - .../message/SchemaFinishDiscoveryMessage.java | 7 -- .../message/SchemaOperationStatusMessage.java | 28 ----- .../internal/util/UUIDCollectionMessage.java | 7 -- .../TcpInverseConnectionResponseMessage.java | 26 ----- .../tcp/messages/HandshakeMessage.java | 28 ----- .../tcp/messages/HandshakeWaitMessage.java | 14 --- .../tcp/messages/NodeIdMessage.java | 7 -- .../messages/RecoveryLastReceivedMessage.java | 7 -- .../tcp/messages/InetAddressMessage.java | 20 ---- .../messages/InetSocketAddressMessage.java | 5 - .../messages/TcpDiscoveryAbstractMessage.java | 23 ---- .../TcpDiscoveryAuthFailedMessage.java | 15 --- .../TcpDiscoveryCheckFailedMessage.java | 7 -- ...cpDiscoveryClientMetricsUpdateMessage.java | 9 -- .../TcpDiscoveryConnectionCheckMessage.java | 10 -- .../messages/TcpDiscoveryDiscardMessage.java | 14 --- .../TcpDiscoveryDuplicateIdMessage.java | 7 -- .../TcpDiscoveryLoopbackProblemMessage.java | 14 --- .../TcpDiscoveryMetricsUpdateMessage.java | 19 ---- .../TcpDiscoveryNodeAddFinishedMessage.java | 21 ---- .../TcpDiscoveryNodeFailedMessage.java | 14 --- .../messages/TcpDiscoveryNodeLeftMessage.java | 5 - .../TcpDiscoveryRingLatencyCheckMessage.java | 15 --- .../TcpDiscoveryStatusCheckMessage.java | 27 ----- .../communication/GridTestMessage.java | 7 -- .../spi/communication/GridTestMessage.java | 7 -- ...ommunicationErrorResolveFinishMessage.java | 11 -- ...CommunicationErrorResolveStartMessage.java | 11 -- .../zk/internal/ZkForceNodeFailMessage.java | 11 -- .../internal/ZkInternalJoinErrorMessage.java | 4 - 73 files changed, 1449 deletions(-) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java index f6dcbc252e9cd..a766adae9206f 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java @@ -55,11 +55,6 @@ public UUID queryId() { return qryId; } - /** */ - public void queryId(UUID qryId) { - this.qryId = qryId; - } - /** * @return Fragment ID. */ @@ -67,11 +62,6 @@ public long fragmentId() { return fragmentId; } - /** */ - public void fragmentId(long fragmentId) { - this.fragmentId = fragmentId; - } - /** {@inheritDoc} */ @Override public MessageType type() { return MessageType.QUERY_ERROR_MESSAGE; diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java index 90fbf297c52e2..b03659defa95f 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java @@ -48,20 +48,6 @@ public GenericValueMessage(Object val) { return val; } - /** - * @return Serialized value. - */ - public byte[] serialized() { - return serialized; - } - - /** - * @param serialized Serialized value. - */ - public void serialized(byte[] serialized) { - this.serialized = serialized; - } - /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { if (val != null && serialized == null) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java index 52b2a4c3441ec..19638738da0a4 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java @@ -55,13 +55,6 @@ public UUID queryId() { return qryId; } - /** - * @param queryId New query ID. - */ - public void queryId(UUID qryId) { - this.qryId = qryId; - } - /** * @return Fragment ID. */ @@ -69,13 +62,6 @@ public long fragmentId() { return fragmentId; } - /** - * @param fragmentId New fragment ID. - */ - public void fragmentId(long fragmentId) { - this.fragmentId = fragmentId; - } - /** * @return Exchange ID. */ @@ -83,13 +69,6 @@ public long exchangeId() { return exchangeId; } - /** - * @param exchangeId New exchange ID. - */ - public void exchangeId(long exchangeId) { - this.exchangeId = exchangeId; - } - /** {@inheritDoc} */ @Override public MessageType type() { return MessageType.QUERY_INBOX_CANCEL_MESSAGE; diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java index 0d6b604646a67..ec7b04e05adfb 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java @@ -58,25 +58,11 @@ public QueryBatchAcknowledgeMessage(UUID qryId, long fragmentId, long exchangeId return qryId; } - /** - * @param qryId New query ID. - */ - public void queryId(UUID qryId) { - this.qryId = qryId; - } - /** {@inheritDoc} */ @Override public long fragmentId() { return fragmentId; } - /** - * @param fragmentId New fragment ID. - */ - public void fragmentId(long fragmentId) { - this.fragmentId = fragmentId; - } - /** * @return Exchange ID. */ @@ -84,13 +70,6 @@ public long exchangeId() { return exchangeId; } - /** - * @param exchangeId New exchange ID. - */ - public void exchangeId(long exchangeId) { - this.exchangeId = exchangeId; - } - /** * @return Batch ID. */ @@ -98,13 +77,6 @@ public int batchId() { return batchId; } - /** - * @param batchId New batch ID. - */ - public void batchId(int batchId) { - this.batchId = batchId; - } - /** {@inheritDoc} */ @Override public MessageType type() { return MessageType.QUERY_ACKNOWLEDGE_MESSAGE; diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java index e863aebc47433..b722b6ccf3758 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java @@ -74,25 +74,11 @@ public QueryBatchMessage(UUID qryId, long fragmentId, long exchangeId, int batch return qryId; } - /** - * @param qryId Query ID. - */ - public void queryId(UUID qryId) { - this.qryId = qryId; - } - /** {@inheritDoc} */ @Override public long fragmentId() { return fragmentId; } - /** - * @param fragmentId Fragment ID. - */ - public void fragmentId(long fragmentId) { - this.fragmentId = fragmentId; - } - /** * @return Exchange ID. */ @@ -100,13 +86,6 @@ public long exchangeId() { return exchangeId; } - /** - * @param exchangeId Exchange ID. - */ - public void exchangeId(long exchangeId) { - this.exchangeId = exchangeId; - } - /** * @return Batch ID. */ @@ -114,13 +93,6 @@ public int batchId() { return batchId; } - /** - * @param batchId Batch ID. - */ - public void batchId(int batchId) { - this.batchId = batchId; - } - /** * @return Last batch flag. */ @@ -128,13 +100,6 @@ public boolean last() { return last; } - /** - * @param last Last batch flag. - */ - public void last(boolean last) { - this.last = last; - } - /** * @return Rows. */ @@ -142,20 +107,6 @@ public List rows() { return rows; } - /** - * @return Message rows. - */ - public List messageRows() { - return mRows; - } - - /** - * @param mRows Message rows. - */ - public void messageRows(List mRows) { - this.mRows = mRows; - } - /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { if (mRows != null || rows == null) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java index 6c7e66113d1f8..6db451d285cc8 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java @@ -45,13 +45,6 @@ public UUID queryId() { return qryId; } - /** - * @param qryId New query ID. - */ - public void queryId(UUID qryId) { - this.qryId = qryId; - } - /** {@inheritDoc} */ @Override public MessageType type() { return MessageType.QUERY_CLOSE_MESSAGE; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java index 8e1c3ea6d9da8..b42b8df962a7e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java @@ -118,13 +118,6 @@ public byte policy() { return plc; } - /** - * @param plc Policy. - */ - public void policy(byte plc) { - this.plc = plc; - } - /** * @return Topic. */ @@ -139,20 +132,6 @@ void topic(Object topic) { this.topic = topic; } - /** - * @return Topic bytes. - */ - public byte[] topicBytes() { - return topicBytes; - } - - /** - * @param topicBytes Topic bytes. - */ - public void topicBytes(byte[] topicBytes) { - this.topicBytes = topicBytes; - } - /** * @return Topic ordinal. */ @@ -160,13 +139,6 @@ public int topicOrdinal() { return topicOrd; } - /** - * @param topicOrd Topic ordinal. - */ - public void topicOrdinal(int topicOrd) { - this.topicOrd = topicOrd; - } - /** * @return Message. */ @@ -174,13 +146,6 @@ public Message message() { return msg; } - /** - * @param msg Message. - */ - public void message(Message msg) { - this.msg = msg; - } - /** * @return Message timeout. */ @@ -188,13 +153,6 @@ public long timeout() { return timeout; } - /** - * @param timeout Message timeout. - */ - public void timeout(long timeout) { - this.timeout = timeout; - } - /** * @return Whether message can be skipped on timeout. */ @@ -202,13 +160,6 @@ public boolean skipOnTimeout() { return skipOnTimeout; } - /** - * @param skipOnTimeout Whether message can be skipped on timeout. - */ - public void skipOnTimeout(boolean skipOnTimeout) { - this.skipOnTimeout = skipOnTimeout; - } - /** * @return {@code True} if message is ordered, {@code false} otherwise. */ @@ -216,13 +167,6 @@ public boolean isOrdered() { return ordered; } - /** - * @param ordered {@code True} if message is ordered, {@code false} otherwise. - */ - public void isOrdered(boolean ordered) { - this.ordered = ordered; - } - /** {@inheritDoc} */ @Override public boolean equals(Object obj) { throw new AssertionError(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java index 65afd74f4d1b5..ae4c7abebab7a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java @@ -71,13 +71,6 @@ public UUID securitySubjectId() { return secSubjId; } - /** - * @param secSubjId Security subject ID. - */ - public void securitySubjectId(UUID secSubjId) { - this.secSubjId = secSubjId; - } - /** {@inheritDoc} */ @Override public short directType() { return TYPE_CODE; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java index 9fd6a00ddca72..7773fb3bcbb15 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java @@ -208,13 +208,6 @@ public long responseReceiveTs() { return resRcvTs; } - /** - * @return Response process timestamp. - */ - public long responseProcessTs() { - return resProcTs; - } - /** * @return Request send timestamp (millis). */ @@ -229,13 +222,6 @@ public long requestReceivedTsMillis() { return reqRcvTsMillis; } - /** - * @return Response send timestamp (millis). - */ - public long responseSendTsMillis() { - return resSndTsMillis; - } - /** * @return Response received timestamp (millis). */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java index 45f46a12be32e..1afab64ee6d8f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java @@ -56,13 +56,6 @@ public IgniteUuid sesId() { return sesId; } - /** - * @param sesId The unique session id for the channel. - */ - public void sesId(IgniteUuid sesId) { - this.sesId = sesId; - } - /** {@inheritDoc} */ @Override public short directType() { return TYPE_CODE; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java index 77ee2c0e201c1..dade283bc0d1f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java @@ -142,34 +142,6 @@ Object responseTopic() { return resTopic; } - /** - * @return Serialized response topic. - */ - public byte[] responseTopicBytes() { - return resTopicBytes; - } - - /** - * @param resTopicBytes Serialized response topic. - */ - public void responseTopicBytes(byte[] resTopicBytes) { - this.resTopicBytes = resTopicBytes; - } - - /** - * @return Filter. - */ - public byte[] filterBytes() { - return filterBytes; - } - - /** - * @param filterBytes Filter bytes. - */ - public void filterBytes(byte[] filterBytes) { - this.filterBytes = filterBytes; - } - /** * @return Filter. */ @@ -184,20 +156,6 @@ public IgnitePredicate filter() { return evts != null ? Collections.unmodifiableCollection(evts) : null; } - /** - * @return Serialized events. - */ - public byte[] eventsBytes() { - return evtsBytes; - } - - /** - * @param evtsBytes Serialized events. - */ - public void eventsBytes(byte[] evtsBytes) { - this.evtsBytes = evtsBytes; - } - /** * @return the Class loader ID. */ @@ -205,13 +163,6 @@ public IgniteUuid classLoaderId() { return clsLdrId; } - /** - * @param clsLdrId the Class loader ID. - */ - public void classLoaderId(IgniteUuid clsLdrId) { - this.clsLdrId = clsLdrId; - } - /** * @return Deployment mode. */ @@ -219,13 +170,6 @@ public DeploymentMode deploymentMode() { return depMode; } - /** - * @param depMode Deployment mode. - */ - public void deploymentMode(DeploymentMode depMode) { - this.depMode = depMode; - } - /** * @return Filter class name. */ @@ -233,13 +177,6 @@ public String filterClassName() { return filterClsName; } - /** - * @param filterClsName Filter class name. - */ - public void filterClassName(String filterClsName) { - this.filterClsName = filterClsName; - } - /** * @return User version. */ @@ -247,13 +184,6 @@ public String userVersion() { return userVer; } - /** - * @param userVer User version. - */ - public void userVersion(String userVer) { - this.userVer = userVer; - } - /** * @return Node class loader participant map. */ @@ -275,20 +205,6 @@ public void loaderParticipants(@Nullable Map ldrParties) { return ErrorMessage.error(errMsg); } - /** - * @return Error message. - */ - public @Nullable ErrorMessage errorMessage() { - return errMsg; - } - - /** - * @param errMsg Error message. - */ - public void errorMessage(@Nullable ErrorMessage errMsg) { - this.errMsg = errMsg; - } - /** * @param marsh Marshaller. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java index 45c1a9561fa83..0a33a95f63764 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java @@ -62,13 +62,6 @@ public String name() { return name; } - /** - * @param name New username. - */ - public void name(String name) { - this.name = name; - } - /** * @return User password. */ @@ -76,13 +69,6 @@ public String password() { return passwd; } - /** - * @param passwd New user password. - */ - public void password(String passwd) { - this.passwd = passwd; - } - /** * @return Request ID. */ @@ -90,13 +76,6 @@ public IgniteUuid id() { return id; } - /** - * @param id New request ID. - */ - public void id(IgniteUuid id) { - this.id = id; - } - /** {@inheritDoc} */ @Override public short directType() { return 131; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java index ea8fa323ae8ca..5c9e8251ef46d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java @@ -64,13 +64,6 @@ public String errorMessage() { return errMsg; } - /** - * @param errMsg New error message. - */ - public void errorMessage(String errMsg) { - this.errMsg = errMsg; - } - /** * @return Request ID. */ @@ -78,13 +71,6 @@ public IgniteUuid id() { return id; } - /** - * @param id New request ID. - */ - public void id(IgniteUuid id) { - this.id = id; - } - /** {@inheritDoc} */ @Override public short directType() { return 132; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java index 1132b1eca310c..d0c32b91b14f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java @@ -58,13 +58,6 @@ public IgniteUuid operationId() { return opId; } - /** - * @param opId New operation ID. - */ - public void operationId(IgniteUuid opId) { - this.opId = opId; - } - /** * @return Success flag. */ @@ -79,13 +72,6 @@ public String errorMessage() { return errorMsg; } - /** - * @param errorMsg New error message. - */ - public void errorMessage(String errorMsg) { - this.errorMsg = errorMsg; - } - /** {@inheritDoc} */ @Override public short directType() { return 130; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java index b456d623f9ab9..49f9980c4c998 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java @@ -40,13 +40,6 @@ public int groupId() { return grpId; } - /** - * @param grpId Cache group ID. - */ - public void groupId(int grpId) { - this.grpId = grpId; - } - /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { // TODO: Safe to remove only after all inheritors have migrated to the new ser/der scheme (IGNITE-25490). diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java index e7aac72ec7646..8365c22a2509e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java @@ -40,13 +40,6 @@ public int cacheId() { return cacheId; } - /** - * @param cacheId Cache ID. - */ - public void cacheId(int cacheId) { - this.cacheId = cacheId; - } - /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { // TODO: Remove #writeTo() after all inheritors have migrated to the new ser/der scheme (IGNITE-25490). diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java index 068c0abceeab0..be7c6b6f5670a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java @@ -265,14 +265,6 @@ public GridDeploymentInfoBean deployInfo() { return depInfo; } - /** - * @param depInfo Preset deployment info. - * @see GridCacheDeployable#deployInfo() - */ - public void deployInfo(GridDeploymentInfoBean depInfo) { - this.depInfo = depInfo; - } - /** * This method is called before the whole message is serialized * and is responsible for pre-marshalling state. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java index ae3fb550c6640..bd2031b6287f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java @@ -75,13 +75,6 @@ public UUID operationId() { return opId; } - /** - * @param opId New operation ID. - */ - public void operationId(UUID opId) { - this.opId = opId; - } - /** * @return Affinity node flag. */ @@ -89,13 +82,6 @@ public boolean affNode() { return affNode; } - /** - * @param affNode New affinity node flag. - */ - public void affNode(boolean affNode) { - this.affNode = affNode; - } - /** * @return Result. */ @@ -103,13 +89,6 @@ public boolean changed() { return changed; } - /** - * @param changed New operation result. - */ - public void changed(boolean changed) { - this.changed = changed; - } - /** * @return Error message. */ @@ -117,13 +96,6 @@ public void changed(boolean changed) { return errMsg; } - /** - * @param errMsg New error message. - */ - public void errorMessage(String errMsg) { - this.errMsg = errMsg; - } - /** * @return Sender node ID. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java index b7c4e34092e62..442b67968e58c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java @@ -61,13 +61,6 @@ public WalStateProposeMessage(UUID opId, int grpId, IgniteUuid grpDepId, UUID no this.enable = enable; } - /** - * @return Node ID. - */ - public UUID nodeId() { - return nodeId; - } - /** * @return Caches. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java index 99ad492481b82..143f731de6dab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java @@ -61,13 +61,6 @@ public int typeId() { return typeId; } - /** - * @param typeId Type ID. - */ - public void typeId(int typeId) { - this.typeId = typeId; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(MetadataRequestMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java index 5d75c7a280df9..13c49a1d53eba 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java @@ -70,13 +70,6 @@ public int typeId() { return typeId; } - /** - * @param typeId Type ID. - */ - public void typeId(int typeId) { - this.typeId = typeId; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(MetadataResponseMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java index 83d6dba9c0b5a..8d8d045ffdace 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java @@ -118,13 +118,6 @@ public void completedVersions(@Nullable Collection committedVe return committedVers; } - /** - * @param committedVers Committed versions. - */ - public void committedVersions(@Nullable Collection committedVers) { - this.committedVers = committedVers; - } - /** * @return Rolled back versions. */ @@ -132,13 +125,6 @@ public void committedVersions(@Nullable Collection committedVe return rolledbackVers; } - /** - * @param rolledbackVers Rolled back versions. - */ - public void rolledbackVersions(@Nullable Collection rolledbackVers) { - this.rolledbackVers = rolledbackVers; - } - /** * @return Count of keys referenced in candidates array (needed only locally for optimization). */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java index c599082caa60f..363abf815ec30 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java @@ -83,13 +83,6 @@ public int cacheId() { return cacheId; } - /** - * @param cacheId New cache id. - */ - public void cacheId(int cacheId) { - this.cacheId = cacheId; - } - /** * @return Size. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java index 00b88604a51fd..540e56e5156f6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java @@ -234,34 +234,6 @@ private List> createAssignments(List assigns, return assignments0; } - /** - * @return Assignment. - */ - public List assignments() { - return assigns; - } - - /** - * @param assigns Assignment. - */ - public void assignments(List assigns) { - this.assigns = assigns; - } - - /** - * @return Ideal assignment. - */ - public List idealAssignments() { - return idealAssigns; - } - - /** - * @param idealAssigns Ideal assignment. - */ - public void idealAssignments(List idealAssigns) { - this.idealAssigns = idealAssigns; - } - /** * @return Difference with ideal affinity assignment. */ @@ -269,13 +241,6 @@ public Map assignmentsDiff() { return assignsDiff; } - /** - * @param assignsDiff Difference with ideal affinity assignment. - */ - public void assignmentsDiff(Map assignsDiff) { - this.assignsDiff = assignsDiff; - } - /** {@inheritDoc} */ @Override public short directType() { return 128; 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 3b074137445ee..b299f431afd37 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 @@ -101,13 +101,6 @@ public IgniteDhtDemandedPartitionsMap partitions() { return parts; } - /** - * @param parts Partitions. - */ - public void partitions(IgniteDhtDemandedPartitionsMap parts) { - this.parts = parts; - } - /** * @param updateSeq Update sequence. */ @@ -136,20 +129,6 @@ public void timeout(long timeout) { this.timeout = timeout; } - /** - * @return Worker ID. - */ - public int workerId() { - return workerId; - } - - /** - * @param workerId Worker ID. - */ - public void workerId(int workerId) { - this.workerId = workerId; - } - /** * @return Topology version for which demand message is sent. */ @@ -157,13 +136,6 @@ public void workerId(int workerId) { return topVer; } - /** - * @param topVer Topology version for which demand message is sent. - */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - /** {@inheritDoc} */ @Override public boolean addDeploymentInfo() { return false; 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 fe44d824938ca..d697eb90b6c9e 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 @@ -130,13 +130,6 @@ public long rebalanceId() { return rebalanceId; } - /** - * @param rebalanceId New unique (per demander) rebalance id. - */ - public void rebalanceId(long rebalanceId) { - this.rebalanceId = rebalanceId; - } - /** * @return Topology version for which demand message is sent. */ @@ -144,13 +137,6 @@ public void rebalanceId(long rebalanceId) { return topVer; } - /** - * @param topVer New topology version for which demand message is sent. - */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - /** * @return Partitions that have been fully sent. */ @@ -158,13 +144,6 @@ public Map last() { return last; } - /** - * @param last New map of partitions that have been fully sent. - */ - public void last(Map last) { - this.last = last; - } - /** * @param p Partition which was fully sent. */ @@ -199,13 +178,6 @@ public Collection missed() { return missed; } - /** - * @param missed New partitions which were not found. - */ - public void missed(Collection missed) { - this.missed = missed; - } - /** * @return Entries. */ @@ -216,39 +188,11 @@ public Map getInfosSafe() { return infos; } - /** - * @return Entries. - */ - public Map infos() { - return infos; - } - - /** - * @param infos New entries. - */ - public void infos(Map infos) { - this.infos = infos; - } - /** Supplying process error. */ @Nullable @Override public Throwable error() { return ErrorMessage.error(errMsg); } - /** - * @return Supplying process error message. - */ - @Nullable public ErrorMessage errorMessage() { - return errMsg; - } - - /** - * @param errMsg New supplying process error message. - */ - public void errorMessage(@Nullable ErrorMessage errMsg) { - this.errMsg = errMsg; - } - /** * @return Message size. */ @@ -256,13 +200,6 @@ public int messageSize() { return msgSize; } - /** - * @param msgSize New message size. - */ - public void messageSize(int msgSize) { - this.msgSize = msgSize; - } - /** * @param p Partition. * @param historical {@code True} if partition rebalancing using WAL history. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java index 023683fc1cb3c..c03ef06bac717 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java @@ -107,27 +107,6 @@ public void exchangeId(GridDhtPartitionExchangeId exchId) { return lastVer; } - /** - * @param lastVer Last used version among all nodes. - */ - public void lastVersion(GridCacheVersion lastVer) { - this.lastVer = lastVer; - } - - /** - * @return Flags. - */ - public byte flags() { - return flags; - } - - /** - * @param flags Flags. - */ - public void flags(byte flags) { - this.flags = flags; - } - /** * @return {@code True} if message data is compressed. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index 47a581b4a5689..0a6da4ecc8838 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -257,20 +257,6 @@ public Map partitions() { return parts; } - /** - * @return Serialized local partitions. - */ - public byte[] partitionBytes() { - return partsBytes; - } - - /** - * @param partsBytes Serialized local partitions. - */ - public void partitionBytes(byte[] partsBytes) { - this.partsBytes = partsBytes; - } - /** * @param grpId Cache group ID. * @return {@code True} if message contains full map for given cache. @@ -361,13 +347,6 @@ public IgniteDhtPartitionHistorySuppliersMap partitionHistorySuppliers() { return partHistSuppliers; } - /** - * @param partHistSuppliers Partitions history suppliers. - */ - public void partitionHistorySuppliers(IgniteDhtPartitionHistorySuppliersMap partHistSuppliers) { - this.partHistSuppliers = partHistSuppliers; - } - /** * */ @@ -436,76 +415,6 @@ public void rebalanced(boolean rebalanced) { flags = rebalanced ? (byte)(flags | REBALANCED_FLAG_MASK) : (byte)(flags & ~REBALANCED_FLAG_MASK); } - /** - * @return Duplicated partitions data. - */ - public Map duplicatedPartitionsData() { - return dupPartsData; - } - - /** - * @param dupPartsData Duplicated partitions data. - */ - public void duplicatedPartitionsData(Map dupPartsData) { - this.dupPartsData = dupPartsData; - } - - /** - * @return Partitions update counters. - */ - public IgniteDhtPartitionCountersMap partitionCounters() { - return partCntrs; - } - - /** - * @param partCntrs Partitions update counters. - */ - public void partitionCounters(IgniteDhtPartitionCountersMap partCntrs) { - this.partCntrs = partCntrs; - } - - /** - * @return Partitions that must be cleared and re-loaded. - */ - public IgniteDhtPartitionsToReloadMap partitionsToReload() { - return partsToReload; - } - - /** - * @param partsToReload Partitions that must be cleared and re-loaded. - */ - public void partitionsToReload(IgniteDhtPartitionsToReloadMap partsToReload) { - this.partsToReload = partsToReload; - } - - /** - * @return Rebalanced flags. - */ - public byte rebalancedFlags() { - return flags; - } - - /** - * @param flags Rebalanced flags. - */ - public void rebalancedFlags(byte flags) { - this.flags = flags; - } - - /** - * @return Lost partitions. - */ - public Map lostPartitions() { - return lostParts; - } - - /** - * @param lostParts Lost partitions. - */ - public void lostPartitions(Map lostParts) { - this.lostParts = lostParts; - } - /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java index 17ef40ee2b333..53d9918569ad2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java @@ -147,13 +147,6 @@ public void cacheGroupsAffinityRequest(Collection grpsAffReq) { return grpsAffReq; } - /** - * @param client {@code True} if sent from client node. - */ - public void client(boolean client) { - this.client = client; - } - /** * @return {@code True} if sent from client node. */ @@ -161,20 +154,6 @@ public boolean client() { return client; } - /** - * @return Duplicated partitions data. - */ - public Map duplicatedPartitionsData() { - return dupPartsData; - } - - /** - * @param dupPartsData Duplicated partitions data. - */ - public void duplicatedPartitionsData(Map dupPartsData) { - this.dupPartsData = dupPartsData; - } - /** * @param cacheId Cache ID to add local partition for. * @param locMap Local partition map. @@ -209,13 +188,6 @@ public void addPartitionUpdateCounters(int grpId, CachePartitionPartialCountersM partCntrs.put(grpId, cntrMap); } - /** - * @param partCntrs Partition update counters per cache group. - */ - public void partitionUpdateCounters(Map partCntrs) { - this.partCntrs = partCntrs; - } - /** @return Partition update counters per cache group. */ public Map partitionUpdateCounters() { return partCntrs; @@ -262,34 +234,6 @@ public Map partitionSizes(int grpId) { return sizesMap != null ? F.emptyIfNull(sizesMap.map()) : Collections.emptyMap(); } - /** - * @return Partitions sizes. - */ - public Map partitionSizesMap() { - return partsSizes; - } - - /** - * @param partsSizes Partitions sizes. - */ - public void partitionSizesMap(Map partsSizes) { - this.partsSizes = partsSizes; - } - - /** - * @return Partitions history reservation counters. - */ - public Map partitionHistoryCountersMap() { - return partHistCntrs; - } - - /** - * @param partHistCntrs Partitions history reservation counters. - */ - public void partitionHistoryCountersMap(Map partHistCntrs) { - this.partHistCntrs = partHistCntrs; - } - /** * @param cntrMap Partition history counters. */ @@ -331,34 +275,6 @@ public Map partitions() { return parts; } - /** - * @return Serialized local partitions. - */ - public byte[] partitionBytes() { - return partsBytes; - } - - /** - * @param partsBytes Serialized local partitions. - */ - public void partitionBytes(byte[] partsBytes) { - this.partsBytes = partsBytes; - } - - /** - * @return Error message. - */ - public ErrorMessage errorMessage() { - return errMsg; - } - - /** - * @param errMsg Error message. - */ - public void errorMessage(ErrorMessage errMsg) { - this.errMsg = errMsg; - } - /** * @param ex Exception. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java index 31f402a598f73..32e3618603b2a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java @@ -62,13 +62,6 @@ public String latchId() { return latchId; } - /** - * @param latchId New latch id. - */ - public void latchId(String latchId) { - this.latchId = latchId; - } - /** * @return Latch topology version. */ @@ -76,13 +69,6 @@ public AffinityTopologyVersion topVer() { return topVer; } - /** - * @param topVer New latch topology version. - */ - public void topVer(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - /** * @return {@code} if ack is final. */ @@ -90,13 +76,6 @@ public boolean isFinal() { return isFinal; } - /** - * @param isFinal New flag indicates that ack is final. - */ - public void isFinal(boolean isFinal) { - this.isFinal = isFinal; - } - /** {@inheritDoc} */ @Override public short directType() { return 135; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java index 5fe0213a7a5e2..002d179deca2c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java @@ -54,13 +54,6 @@ public String id() { return id; } - /** - * @param id Unique message ID. - */ - public void id(String id) { - this.id = id; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(AbstractSnapshotMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java index 07e15193a5a66..0c257a6dc6c72 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java @@ -69,49 +69,21 @@ public UUID id() { return id; } - /** - * @param id Incremental snapshot ID. - */ - public void id(UUID id) { - this.id = id; - } - /** ID of the latest incremental snapshot after which this transaction committed. */ public UUID txIncrementalSnapshotId() { return txSnpId; } - /** - * @param txSnpId ID of the latest incremental snapshot after which this transaction committed. - */ - public void txIncrementalSnapshotId(UUID txSnpId) { - this.txSnpId = txSnpId; - } - /** */ public GridCacheMessage payload() { return payload; } - /** - * @param payload Original transaction message. - */ - public void payload(GridCacheMessage payload) { - this.payload = payload; - } - /** @return Incremental snapshot topology version. */ public long snapshotTopologyVersion() { return topVer; } - /** - * @param topVer Incremental snapshot topology version. - */ - public void snapshotTopologyVersion(long topVer) { - this.topVer = topVer; - } - /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { payload.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java index a362743884c07..4e0416e959f01 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java @@ -56,13 +56,6 @@ public String errorMessage() { return errMsg; } - /** - * @param errMsg Response error message. - */ - public void errorMessage(String errMsg) { - this.errMsg = errMsg; - } - /** {@inheritDoc} */ @Override public short directType() { return TYPE_CODE; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java index 8df0715bcf51e..b084b6cb9a599 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java @@ -99,20 +99,6 @@ public Map> parts() { return res; } - /** - * @return The demanded cache group partitions per each cache group. - */ - public Map partitions() { - return parts; - } - - /** - * @param parts The demanded cache group partitions per each cache group. - */ - public void partitions(Map parts) { - this.parts = parts; - } - /** * @return Requested snapshot name. */ @@ -120,13 +106,6 @@ public String snapshotName() { return snpName; } - /** - * @param snpName Requested snapshot name. - */ - public void snapshotName(String snpName) { - this.snpName = snpName; - } - /** * @return Snapshot directory path. */ @@ -134,13 +113,6 @@ public String snapshotPath() { return snpPath; } - /** - * @param snpPath Snapshot directory path. - */ - public void snapshotPath(String snpPath) { - this.snpPath = snpPath; - } - /** * @return Snapshot operation request ID. */ @@ -148,13 +120,6 @@ public UUID requestId() { return reqId; } - /** - * @param reqId Snapshot operation request ID. - */ - public void requestId(UUID reqId) { - this.reqId = reqId; - } - /** {@inheritDoc} */ @Override public short directType() { return TYPE_CODE; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java index bbd8617c43053..e8e98ae20b245 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java @@ -1009,11 +1009,6 @@ public long rebalancingBytesRate() { return rebalancingBytesRate; } - /** */ - public long estimateRebalancingFinishTime() { - return rebalanceFinishTime; - } - /** */ public long rebalancingStartTime() { return rebalanceStartTime; @@ -1154,11 +1149,6 @@ public void cacheGets(long reads) { cacheGets = reads; } - /** */ - public void cacheName(String cacheName) { - this.cacheName = cacheName; - } - /** */ public void cacheSize(long cacheSize) { this.cacheSize = cacheSize; @@ -1254,61 +1244,11 @@ public void indexBuildPartitionsLeftCount(int idxBuildPartitionsLeftCnt) { idxBuildPartitionsLeftCount = idxBuildPartitionsLeftCnt; } - /** */ - public void indexRebuildInProgress(boolean idxRebuildInProgress) { - this.idxRebuildInProgress = idxRebuildInProgress; - } - - /** */ - public void indexRebuildKeysProcessed(long idxRebuildKeyProcessed) { - this.idxRebuildKeyProcessed = idxRebuildKeyProcessed; - } - /** */ public void empty(boolean empty) { this.empty = empty; } - /** */ - public void managementEnabled(boolean managementEnabled) { - this.managementEnabled = managementEnabled; - } - - /** */ - public void readThrough(boolean readThrough) { - this.readThrough = readThrough; - } - - /** */ - public void statisticsEnabled(boolean statisticsEnabled) { - this.statisticsEnabled = statisticsEnabled; - } - - /** */ - public void storeByValue(boolean storeByVal) { - this.storeByVal = storeByVal; - } - - /** */ - public void validForReading(boolean validForReading) { - this.validForReading = validForReading; - } - - /** */ - public void validForWriting(boolean validForWriting) { - this.validForWriting = validForWriting; - } - - /** */ - public void writeBehindEnabled(boolean writeBehindEnabled) { - this.writeBehindEnabled = writeBehindEnabled; - } - - /** */ - public void writeThrough(boolean writeThrough) { - this.writeThrough = writeThrough; - } - /** */ public void keySize(int keySize) { this.keySize = keySize; @@ -1319,11 +1259,6 @@ public void keysToRebalanceLeft(long keysToRebalanceLeft) { this.keysToRebalanceLeft = keysToRebalanceLeft; } - /** */ - public void keyType(String keyType) { - this.keyType = keyType; - } - /** */ public void cacheMisses(long misses) { cacheMisses = misses; @@ -1384,16 +1319,6 @@ public void averagePutTime(float putAvgTimeNanos) { averagePutTime = putAvgTimeNanos; } - /** */ - public void puts(long puts) { - cachePuts = puts; - } - - /** */ - public void reads(long reads) { - cacheGets = reads; - } - /** */ public void rebalanceClearingPartitionsLeft(long rebalanceClearingPartitionsLeft) { this.rebalanceClearingPartitionsLeft = rebalanceClearingPartitionsLeft; @@ -1539,16 +1464,6 @@ public void txXidMapSize(int txXidMapSize) { this.txXidMapSize = txXidMapSize; } - /** */ - public void valueType(String valType) { - this.valType = valType; - } - - /** */ - public void writeBehindBufferSize(int writeBehindBufSize) { - this.writeBehindBufSize = writeBehindBufSize; - } - /** */ public void writeBehindCriticalOverflowCount(int writeBehindCriticalOverflowCnt) { this.writeBehindCriticalOverflowCnt = writeBehindCriticalOverflowCnt; @@ -1559,26 +1474,6 @@ public void writeBehindErrorRetryCount(int writeBehindErrorRetryCnt) { this.writeBehindErrorRetryCnt = writeBehindErrorRetryCnt; } - /** */ - public void writeBehindFlushFrequency(long writeBehindFlushFreq) { - this.writeBehindFlushFreq = writeBehindFlushFreq; - } - - /** */ - public void writeBehindFlushSize(int writeBehindFlushSize) { - this.writeBehindFlushSize = writeBehindFlushSize; - } - - /** */ - public void writeBehindFlushThreadCount(int writeBehindFlushThreadCnt) { - this.writeBehindFlushThreadCnt = writeBehindFlushThreadCnt; - } - - /** */ - public void writeBehindStoreBatchSize(int writeBehindStoreBatchSize) { - this.writeBehindStoreBatchSize = writeBehindStoreBatchSize; - } - /** */ public void writeBehindTotalCriticalOverflowCount(int writeBehindTotalCriticalOverflowCnt) { this.writeBehindTotalCriticalOverflowCnt = writeBehindTotalCriticalOverflowCnt; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java index 19049695dcf1a..1810a9f9982fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java @@ -213,13 +213,6 @@ public boolean forceDeactivation() { return forceDeactivation; } - /** - * @return Timestamp. - */ - public long timestamp() { - return timestamp; - } - /** * @return State change request ID. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java index 25aff5029324d..051f5f28fc717 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java @@ -63,25 +63,11 @@ public ClusterMetricsUpdateMessage(Map allNodesMetrics return allNodesMetrics; } - /** */ - public void allNodesMetrics(@Nullable Map allNodesMetrics) { - assert allNodesMetrics == null || singleNodeMetricsMsg == null; - - this.allNodesMetrics = allNodesMetrics; - } - /** */ public @Nullable NodeFullMetricsMessage singleNodeMetricsMsg() { return singleNodeMetricsMsg; } - /** */ - public void singleNodeMetricsMsg(@Nullable NodeFullMetricsMessage singleNodeMetricsMsg) { - assert singleNodeMetricsMsg == null || allNodesMetrics == null; - - this.singleNodeMetricsMsg = singleNodeMetricsMsg; - } - /** */ public boolean singleNodeMetrics() { assert (singleNodeMetricsMsg == null && allNodesMetrics != null) || (singleNodeMetricsMsg != null && allNodesMetrics == null); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java index 90e91aa2a5ef9..9a77b3870193e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java @@ -72,13 +72,6 @@ public ContinuousRoutineStartResultMessage() { return cntrsMap; } - /** - * @param cntrsMap Counters map. - */ - public void countersMap(@Nullable CachePartitionPartialCountersMap cntrsMap) { - this.cntrsMap = cntrsMap; - } - /** * @return Routine ID. */ @@ -86,13 +79,6 @@ public UUID routineId() { return routineId; } - /** - * @param routineId Routine ID. - */ - public void routineId(UUID routineId) { - this.routineId = routineId; - } - /** * @return Error message. */ @@ -100,13 +86,6 @@ public void routineId(UUID routineId) { return errMsg; } - /** - * @param errMsg Error message. - */ - public void errorMessage(@Nullable ErrorMessage errMsg) { - this.errMsg = errMsg; - } - /** {@inheritDoc} */ @Override public short directType() { return 134; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java index 79d8b29a24081..4363cf5279a3d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java @@ -18,9 +18,7 @@ package org.apache.ignite.internal.processors.continuous; import java.util.UUID; -import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; -import org.jetbrains.annotations.Nullable; /** * @@ -36,11 +34,6 @@ public StopRoutineAckDiscoveryMessage(UUID routineId) { super(routineId); } - /** {@inheritDoc} */ - @Nullable @Override public DiscoveryCustomMessage ackMessage() { - return null; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(StopRoutineAckDiscoveryMessage.class, this, "routineId", routineId()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java index f6b18fd1aaa76..07d867d5da15f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java @@ -18,9 +18,7 @@ package org.apache.ignite.internal.processors.continuous; import java.util.UUID; -import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; -import org.jetbrains.annotations.Nullable; /** * @@ -36,11 +34,6 @@ public StopRoutineDiscoveryMessage(UUID routineId) { super(routineId); } - /** {@inheritDoc} */ - @Nullable @Override public DiscoveryCustomMessage ackMessage() { - return new StopRoutineAckDiscoveryMessage(routineId); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(StopRoutineDiscoveryMessage.class, this, "routineId", routineId()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java index f6669e3c4aa3c..7703f7e45e4a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java @@ -67,21 +67,11 @@ public byte platformId() { return platformId; } - /** */ - public void platformId(byte platformId) { - this.platformId = platformId; - } - /** */ public int typeId() { return typeId; } - /** */ - public void typeId(int typeId) { - this.typeId = typeId; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(MissingMappingRequestMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java index 9423b141a0fbb..9ce70f900a461 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java @@ -67,11 +67,6 @@ public byte platformId() { return platformId; } - /** */ - public void platformId(byte platformId) { - this.platformId = platformId; - } - /** * */ @@ -79,11 +74,6 @@ public int typeId() { return typeId; } - /** */ - public void typeId(int typeId) { - this.typeId = typeId; - } - /** * */ @@ -91,11 +81,6 @@ public String className() { return clsName; } - /** */ - public void className(String clsName) { - this.clsName = clsName; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(MissingMappingResponseMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java index 74dc88f6ade34..ad9dfa4270e4a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java @@ -81,11 +81,6 @@ public boolean isAckMessage() { return false; } - /** */ - public void errorMessage(String errorMsg) { - this.errorMsg = errorMsg; - } - /** */ protected String errorMessage() { return errorMsg; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java index 3ae253cb1d715..78237036f0891 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java @@ -82,13 +82,6 @@ public boolean hasError() { return err; } - /** - * @return Propose message. - */ - public SchemaProposeDiscoveryMessage proposeMessage() { - return proposeMsg; - } - /** * @param proposeMsg Propose message. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java index f29669057ea97..7758f1b686cc4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java @@ -75,13 +75,6 @@ public UUID operationId() { return opId; } - /** - * @param opId Operation ID. - */ - public void operationId(UUID opId) { - this.opId = opId; - } - /** * @return Error code. */ @@ -89,13 +82,6 @@ public int errorCode() { return errCode; } - /** - * @param errCode Error code. - */ - public void errorCode(int errCode) { - this.errCode = errCode; - } - /** * @return Error message. */ @@ -103,13 +89,6 @@ public void errorCode(int errCode) { return errMsg; } - /** - * @param errMsg Error message. - */ - public void errorMessage(String errMsg) { - this.errMsg = errMsg; - } - /** * @return Sender node ID. */ @@ -131,13 +110,6 @@ public boolean nop() { return nop; } - /** - * @param nop True if message is no-op. - */ - public void nop(boolean nop) { - this.nop = nop; - } - /** {@inheritDoc} */ @Override public short directType() { return -53; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java index bd77f4db9406d..0b4841db8c744 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java @@ -52,13 +52,6 @@ public Collection uuids() { return uuids; } - /** - * @param uuids The collection of UUIDs that was wrapped. - */ - public void uuids(Collection uuids) { - this.uuids = uuids; - } - /** {@inheritDoc} */ @Override public short directType() { return 115; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java index 795877a1940d0..1e0fe9ff83e61 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java @@ -32,32 +32,6 @@ public class TcpInverseConnectionResponseMessage implements TcpConnectionIndexAw @Order(0) int connIdx; - /** */ - public TcpInverseConnectionResponseMessage() { - } - - /** */ - public TcpInverseConnectionResponseMessage(int connIdx) { - this.connIdx = connIdx; - } - - /** {@inheritDoc} */ - @Override public int connectionIndex() { - return connIdx; - } - - /** - * @param connIdx New connection index. - */ - public void connectionIndex(int connIdx) { - this.connIdx = connIdx; - } - - /** {@inheritDoc} */ - @Override public short directType() { - return 177; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpInverseConnectionResponseMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java index a39a0d38d506e..fd82f326fe0e6 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java @@ -100,34 +100,6 @@ public UUID nodeId() { return nodeId; } - /** - * @param connIdx Connection index. - */ - public void connectionIndex(int connIdx) { - this.connIdx = connIdx; - } - - /** - * @param connectCnt Connect count. - */ - public void connectCount(long connectCnt) { - this.connectCnt = connectCnt; - } - - /** - * @param rcvCnt Number of received messages. - */ - public void received(long rcvCnt) { - this.rcvCnt = rcvCnt; - } - - /** - * @param nodeId Node ID. - */ - public void nodeId(UUID nodeId) { - this.nodeId = nodeId; - } - /** * @return Message size in bytes. */ diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java index b1f95a8fb92a3..84cc53e433560 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java @@ -20,8 +20,6 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.plugin.extensions.communication.Message; -import static org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi.HANDSHAKE_WAIT_MSG_TYPE; - /** * Message requesting to wait until node's SPI context initialize. */ @@ -29,18 +27,6 @@ public class HandshakeWaitMessage implements Message { /** Full message size (with message type) in bytes. */ public static final int MESSAGE_FULL_SIZE = DIRECT_TYPE_SIZE; - /** - * Default constructor. - */ - public HandshakeWaitMessage() { - // No-op. - } - - /** {@inheritDoc} */ - @Override public short directType() { - return HANDSHAKE_WAIT_MSG_TYPE; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(HandshakeWaitMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java index 6adb5d5fb8fb9..224f8d5397416 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java @@ -58,13 +58,6 @@ public UUID nodeId() { return nodeId; } - /** - * @param nodeId Node ID bytes. - */ - public void nodeId(UUID nodeId) { - this.nodeId = nodeId; - } - /** {@inheritDoc} */ @Override public short directType() { return TcpCommunicationSpi.NODE_ID_MSG_TYPE; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java index 3d48933edf484..05a13078110c9 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java @@ -74,13 +74,6 @@ public long received() { return rcvCnt; } - /** - * @param rcvCnt Number of received messages. - */ - public void received(long rcvCnt) { - this.rcvCnt = rcvCnt; - } - /** {@inheritDoc} */ @Override public short directType() { return TcpCommunicationSpi.RECOVERY_LAST_ID_MSG_TYPE; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java index d24b4bba61d99..74981891c3803 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java @@ -46,16 +46,6 @@ public InetAddressMessage(InetAddress addr) { addrBytes = addr.getAddress(); } - /** @return {@link InetAddress#getAddress()} */ - public byte[] addressBytes() { - return addrBytes; - } - - /** @param addrBytes {@link InetAddress#getAddress()} */ - public void addressBytes(byte[] addrBytes) { - this.addrBytes = addrBytes; - } - /** @return {@link InetAddress#getByAddress(String, byte[])} */ public InetAddress address() { try { @@ -66,16 +56,6 @@ public InetAddress address() { } } - /** @return Host name. */ - public String hostName() { - return hostName; - } - - /** @param hostName Host name. */ - public void hostName(String hostName) { - this.hostName = hostName; - } - /** {@inheritDoc} */ @Override public short directType() { return -100; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java index bcc535e9df1f4..f23d7d7cf80f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java @@ -52,11 +52,6 @@ public int port() { return port; } - /** @param port Port. */ - public void port(int port) { - this.port = port; - } - /** {@inheritDoc} */ @Override public short directType() { return -101; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java index 6408fc2b06c90..d5653d3d78b25 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java @@ -130,15 +130,6 @@ public IgniteUuid id() { return id; } - /** - * Sets message ID. - * - * @param id Message ID. - */ - public void id(IgniteUuid id) { - this.id = id; - } - /** * Gets sender node ID. * @@ -300,20 +291,6 @@ public void failedNodes(@Nullable Set failedNodes) { return failedNodes; } - /** - * @return Flags. - */ - public int flags() { - return flags; - } - - /** - * @param flags New flags. - */ - public void flags(int flags) { - this.flags = flags; - } - /** {@inheritDoc} */ @Override public boolean equals(Object obj) { if (this == obj) diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java index 694eaf6c97697..c05cda06e4888 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java @@ -63,21 +63,6 @@ public UUID targetNodeId() { return targetNodeId; } - /** @param targetNodeId Node for which authentication was failed. */ - public void targetNodeId(UUID targetNodeId) { - this.targetNodeId = targetNodeId; - } - - /** @return Creator address message. */ - public InetAddressMessage creatorAddressMessage() { - return creatorAddrMsg; - } - - /** @param addr Creator address message. */ - public void creatorAddressMessage(InetAddressMessage addr) { - this.creatorAddrMsg = addr; - } - /** @return Creator address. */ public InetAddress creatorAddress() { return creatorAddrMsg.address(); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java index b72f0dd57d72d..46d5531d1785b 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java @@ -56,13 +56,6 @@ public String error() { return err; } - /** - * @param err message from coordinator. - */ - public void error(String err) { - this.err = err; - } - /** {@inheritDoc} */ @Override public short directType() { return 0; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java index 49db31403bf33..61cb68449e7fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java @@ -63,15 +63,6 @@ public TcpDiscoveryNodeMetricsMessage metricsMessage() { return metricsMsg; } - /** - * Sets the metrics message. - * - * @param metricsMsg Metrics holder message. - */ - public void metricsMessage(TcpDiscoveryNodeMetricsMessage metricsMsg) { - this.metricsMsg = metricsMsg; - } - /** {@inheritDoc} */ @Override public short directType() { return 13; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java index 3cf1784da5600..e38aacd7b2a4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java @@ -47,16 +47,6 @@ public TcpDiscoveryConnectionCheckMessage(TcpDiscoveryNode creatorNode) { super(creatorNode.id()); } - /** {@inheritDoc} */ - @Override public boolean traceLogLevel() { - return true; - } - - /** {@inheritDoc} */ - @Override public short directType() { - return 6; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryConnectionCheckMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java index 1e212a2e9b554..a82beeaa4d4ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java @@ -67,13 +67,6 @@ public IgniteUuid messageId() { return msgId; } - /** - * @param msgId Message ID. - */ - public void messageId(IgniteUuid msgId) { - this.msgId = msgId; - } - /** * Flag indicating whether the ID to discard is for a custom message or not. * @@ -83,13 +76,6 @@ public boolean customMessageDiscard() { return customMsgDiscard; } - /** - * @param customMsgDiscard Custom message flag. - */ - public void customMessageDiscard(boolean customMsgDiscard) { - this.customMsgDiscard = customMsgDiscard; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryDiscardMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java index 93966689201df..9e0e249ea5fae 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java @@ -60,13 +60,6 @@ public UUID nodeId() { return nodeId; } - /** - * @param nodeId Node with duplicate ID. - */ - public void nodeId(UUID nodeId) { - this.nodeId = nodeId; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryDuplicateIdMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java index 50e4e1efcf187..6193b7726910a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java @@ -66,13 +66,6 @@ public Collection addresses() { return addrs; } - /** - * @param addrs Remote node addresses. - */ - public void addresses(Collection addrs) { - this.addrs = addrs; - } - /** * @return Remote node host names. */ @@ -80,13 +73,6 @@ public Collection hostNames() { return hostNames; } - /** - * @param hostNames Remote node host names. - */ - public void hostNames(Collection hostNames) { - this.hostNames = hostNames; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryLoopbackProblemMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java index b11b9e77a4835..33e7a0e4fa87f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java @@ -182,21 +182,11 @@ public Map serversFullMetricsMessages( return serversFullMetricsMsgs; } - /** @param serversFullMetricsMsgs Map of server full metrics messages. */ - public void serversFullMetricsMessages(Map serversFullMetricsMsgs) { - this.serversFullMetricsMsgs = serversFullMetricsMsgs; - } - /** @return Map of nodes metrics messages. */ public @Nullable Map connectedClientsMetricsMessages() { return connectedClientsMetricsMsgs; } - /** @param connectedClientsMetricsMsgs Map of nodes metrics messages. */ - public void connectedClientsMetricsMessages(Map connectedClientsMetricsMsgs) { - this.connectedClientsMetricsMsgs = connectedClientsMetricsMsgs; - } - /** * Gets client node IDs. * @@ -206,15 +196,6 @@ public void connectedClientsMetricsMessages(Map clientNodeIds) { - this.clientNodeIds = clientNodeIds; - } - /** * Adds client node ID. * diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java index 96a9b1582af60..e8bd7c7ad2a73 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java @@ -96,13 +96,6 @@ public UUID nodeId() { return nodeId; } - /** - * @param nodeId ID of the node added. - */ - public void nodeId(UUID nodeId) { - this.nodeId = nodeId; - } - /** * @return Discovery data for joined client. */ @@ -133,20 +126,6 @@ public void clientNodeAttributes(Map clientNodeAttrs) { this.clientNodeAttrs = clientNodeAttrs; } - /** - * @return Serialized client node attributes. - */ - public @Nullable byte[] clientNodeAttributesBytes() { - return clientNodeAttrsBytes; - } - - /** - * @param clientNodeAttrsBytes Serialized client node attributes. - */ - public void clientNodeAttributesBytes(@Nullable byte[] clientNodeAttrsBytes) { - this.clientNodeAttrsBytes = clientNodeAttrsBytes; - } - /** * @param marsh Marshaller. */ diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java index db9789966ce52..14cd0fcafc24f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java @@ -90,13 +90,6 @@ public UUID failedNodeId() { return failedNodeId; } - /** - * @param failedNodeId ID of the failed node. - */ - public void failedNodeId(UUID failedNodeId) { - this.failedNodeId = failedNodeId; - } - /** * @return Internal order of the failed node. */ @@ -104,13 +97,6 @@ public long internalOrder() { return order; } - /** - * @param order Internal order of the failed node. - */ - public void internalOrder(long order) { - this.order = order; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryNodeFailedMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java index 8e70196ab051b..949c73348c7b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java @@ -46,11 +46,6 @@ public TcpDiscoveryNodeLeftMessage(UUID creatorNodeId) { super(creatorNodeId); } - /** {@inheritDoc} */ - @Override public short directType() { - return 16; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryNodeLeftMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java index b9db8228b9c4f..4dc212ff0c677 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java @@ -62,16 +62,6 @@ public void onRead() { curHops++; } - /** @return Current hops reached. */ - public int currentHops() { - return curHops; - } - - /** @param curHop Current hops reached. */ - public void currentHops(int curHop) { - curHops = curHop; - } - /** * @return Maximal hops number. */ @@ -79,11 +69,6 @@ public int maximalHops() { return maxHops; } - /** @param maxHops Maximal hops. */ - public void maximalHops(int maxHops) { - this.maxHops = maxHops; - } - /** * @return {@code True} if max hops reached. */ diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java index 914065189ed45..2cd673ebaf587 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java @@ -98,24 +98,6 @@ public TcpDiscoveryStatusCheckMessage( .collect(Collectors.toList()); } - /** - * Gets creator node addresses. - * - * @return Creator node addresses. - */ - public @Nullable Collection creatorNodeAddressesMessages() { - return creatorNodeAddrsMsgs; - } - - /** - * Sets creator node addresses. - * - * @param creatorNodeAddrsMsgs Creator node addresses. - */ - public void creatorNodeAddressesMessages(@Nullable Collection creatorNodeAddrsMsgs) { - this.creatorNodeAddrsMsgs = creatorNodeAddrsMsgs; - } - /** * Gets failed node id. * @@ -125,15 +107,6 @@ public void creatorNodeAddressesMessages(@Nullable Collection Date: Thu, 19 Feb 2026 21:15:39 +0300 Subject: [PATCH 29/42] WIP --- .../StopRoutineAckDiscoveryMessage.java | 7 +++++ .../StopRoutineDiscoveryMessage.java | 7 +++++ .../TcpInverseConnectionResponseMessage.java | 26 +++++++++++++++++++ .../tcp/messages/HandshakeWaitMessage.java | 14 ++++++++++ .../TcpDiscoveryConnectionCheckMessage.java | 10 +++++++ .../messages/TcpDiscoveryNodeLeftMessage.java | 5 ++++ ...ommunicationErrorResolveFinishMessage.java | 11 ++++++++ ...CommunicationErrorResolveStartMessage.java | 11 ++++++++ .../zk/internal/ZkForceNodeFailMessage.java | 11 ++++++++ 9 files changed, 102 insertions(+) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java index 4363cf5279a3d..79d8b29a24081 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java @@ -18,7 +18,9 @@ package org.apache.ignite.internal.processors.continuous; import java.util.UUID; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; /** * @@ -34,6 +36,11 @@ public StopRoutineAckDiscoveryMessage(UUID routineId) { super(routineId); } + /** {@inheritDoc} */ + @Nullable @Override public DiscoveryCustomMessage ackMessage() { + return null; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(StopRoutineAckDiscoveryMessage.class, this, "routineId", routineId()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java index 07d867d5da15f..f6b18fd1aaa76 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java @@ -18,7 +18,9 @@ package org.apache.ignite.internal.processors.continuous; import java.util.UUID; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; /** * @@ -34,6 +36,11 @@ public StopRoutineDiscoveryMessage(UUID routineId) { super(routineId); } + /** {@inheritDoc} */ + @Nullable @Override public DiscoveryCustomMessage ackMessage() { + return new StopRoutineAckDiscoveryMessage(routineId); + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(StopRoutineDiscoveryMessage.class, this, "routineId", routineId()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java index 1e0fe9ff83e61..795877a1940d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java @@ -32,6 +32,32 @@ public class TcpInverseConnectionResponseMessage implements TcpConnectionIndexAw @Order(0) int connIdx; + /** */ + public TcpInverseConnectionResponseMessage() { + } + + /** */ + public TcpInverseConnectionResponseMessage(int connIdx) { + this.connIdx = connIdx; + } + + /** {@inheritDoc} */ + @Override public int connectionIndex() { + return connIdx; + } + + /** + * @param connIdx New connection index. + */ + public void connectionIndex(int connIdx) { + this.connIdx = connIdx; + } + + /** {@inheritDoc} */ + @Override public short directType() { + return 177; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpInverseConnectionResponseMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java index 84cc53e433560..b1f95a8fb92a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java @@ -20,6 +20,8 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.plugin.extensions.communication.Message; +import static org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi.HANDSHAKE_WAIT_MSG_TYPE; + /** * Message requesting to wait until node's SPI context initialize. */ @@ -27,6 +29,18 @@ public class HandshakeWaitMessage implements Message { /** Full message size (with message type) in bytes. */ public static final int MESSAGE_FULL_SIZE = DIRECT_TYPE_SIZE; + /** + * Default constructor. + */ + public HandshakeWaitMessage() { + // No-op. + } + + /** {@inheritDoc} */ + @Override public short directType() { + return HANDSHAKE_WAIT_MSG_TYPE; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(HandshakeWaitMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java index e38aacd7b2a4f..3cf1784da5600 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java @@ -47,6 +47,16 @@ public TcpDiscoveryConnectionCheckMessage(TcpDiscoveryNode creatorNode) { super(creatorNode.id()); } + /** {@inheritDoc} */ + @Override public boolean traceLogLevel() { + return true; + } + + /** {@inheritDoc} */ + @Override public short directType() { + return 6; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryConnectionCheckMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java index 949c73348c7b0..8e70196ab051b 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java @@ -46,6 +46,11 @@ public TcpDiscoveryNodeLeftMessage(UUID creatorNodeId) { super(creatorNodeId); } + /** {@inheritDoc} */ + @Override public short directType() { + return 16; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryNodeLeftMessage.class, this, "super", super.toString()); diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java index fb17594dd765d..9b7476c5355f5 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java @@ -20,6 +20,7 @@ import java.util.UUID; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; +import org.jetbrains.annotations.Nullable; /** * @@ -46,11 +47,21 @@ class ZkCommunicationErrorResolveFinishMessage implements DiscoverySpiCustomMess this.topVer = topVer; } + /** {@inheritDoc} */ + @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { + return null; + } + /** {@inheritDoc} */ @Override public boolean isMutable() { return false; } + /** {@inheritDoc} */ + @Override public boolean stopProcess() { + return false; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(ZkCommunicationErrorResolveFinishMessage.class, this); diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java index 31864fe087e02..0c79c36aee0a9 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java @@ -20,6 +20,7 @@ import java.util.UUID; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; +import org.jetbrains.annotations.Nullable; /** * Zk Communication Error Resolve Start Message. @@ -38,11 +39,21 @@ public class ZkCommunicationErrorResolveStartMessage implements DiscoverySpiCust this.id = id; } + /** {@inheritDoc} */ + @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { + return null; + } + /** {@inheritDoc} */ @Override public boolean isMutable() { return false; } + /** {@inheritDoc} */ + @Override public boolean stopProcess() { + return false; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(ZkCommunicationErrorResolveStartMessage.class, this); diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java index e7139d39c75ca..de7291c0d453c 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java @@ -19,6 +19,7 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; +import org.jetbrains.annotations.Nullable; /** * Zk Force Node Fail Message. @@ -42,11 +43,21 @@ public class ZkForceNodeFailMessage implements DiscoverySpiCustomMessage, ZkInte this.warning = warning; } + /** {@inheritDoc} */ + @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { + return null; + } + /** {@inheritDoc} */ @Override public boolean isMutable() { return false; } + /** {@inheritDoc} */ + @Override public boolean stopProcess() { + return false; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(ZkForceNodeFailMessage.class, this); From 96b20908f91b614649cccf2209ac87b7104d6860 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 19 Feb 2026 21:34:50 +0300 Subject: [PATCH 30/42] WIP --- .../calcite/message/QueryStartRequest.java | 65 ------ .../ignite/internal/GridJobCancelRequest.java | 21 -- .../internal/GridJobExecuteRequest.java | 219 ------------------ .../internal/GridJobSiblingsRequest.java | 14 -- .../internal/GridTaskCancelRequest.java | 7 - .../internal/GridTaskSessionRequest.java | 28 --- .../internal/IgniteDiagnosticRequest.java | 15 -- .../checkpoint/GridCheckpointRequest.java | 21 -- .../deployment/GridDeploymentRequest.java | 35 --- .../GenerateEncryptionKeyRequest.java | 14 -- .../cache/DynamicCacheChangeRequest.java | 21 -- .../processors/cache/StateChangeRequest.java | 8 - .../GridCacheTtlUpdateRequest.java | 52 ----- .../GridCacheTxRecoveryRequest.java | 42 ---- .../GridDistributedLockRequest.java | 105 --------- .../GridDistributedTxFinishRequest.java | 91 -------- .../GridDistributedTxPrepareRequest.java | 105 --------- .../distributed/GridNearUnlockRequest.java | 7 - .../dht/GridDhtAffinityAssignmentRequest.java | 28 --- .../distributed/dht/GridDhtLockRequest.java | 91 -------- .../dht/GridDhtTxFinishRequest.java | 21 -- .../GridDhtTxOnePhaseCommitAckRequest.java | 7 - .../dht/GridDhtTxPrepareRequest.java | 126 ---------- .../distributed/dht/GridDhtUnlockRequest.java | 7 - .../TransactionAttributesAwareRequest.java | 10 - ...omicApplicationAttributesAwareRequest.java | 10 - .../GridDhtAtomicAbstractUpdateRequest.java | 49 ---- .../GridNearAtomicAbstractUpdateRequest.java | 47 ---- .../GridNearAtomicCheckUpdateRequest.java | 15 -- ...idNearAtomicSingleUpdateFilterRequest.java | 10 - ...idNearAtomicSingleUpdateInvokeRequest.java | 20 -- .../GridNearAtomicSingleUpdateRequest.java | 28 --- .../preloader/GridDhtForceKeysRequest.java | 28 --- .../GridDhtPartitionsSingleRequest.java | 7 - .../distributed/near/GridNearGetRequest.java | 98 -------- .../distributed/near/GridNearLockRequest.java | 56 ----- .../near/GridNearSingleGetRequest.java | 59 ----- .../near/GridNearTxFinishRequest.java | 9 - .../near/GridNearTxPrepareRequest.java | 56 ----- .../cache/query/GridCacheQueryRequest.java | 189 --------------- .../cache/transactions/TxLocksRequest.java | 21 -- .../odbc/OdbcQueryExecuteBatchRequest.java | 7 - .../odbc/OdbcQueryGetTablesMetaRequest.java | 7 - .../ClientIgniteSetRequest.java | 9 - .../messages/GridQueryCancelRequest.java | 7 - .../messages/GridQueryNextPageRequest.java | 35 --- .../query/messages/GridQueryKillRequest.java | 21 -- .../GridClientAuthenticationRequest.java | 14 -- .../message/GridClientCacheRequest.java | 9 - .../GridClientClusterStateRequest.java | 23 -- .../message/GridClientStateRequest.java | 14 -- .../client/message/GridClientTaskRequest.java | 14 -- .../message/GridClientWarmUpRequest.java | 12 - .../handlers/task/GridTaskResultRequest.java | 16 -- .../jobstealing/JobStealingRequest.java | 7 - .../TcpDiscoveryClientPingRequest.java | 7 - .../tcp/messages/TcpDiscoveryPingRequest.java | 7 - .../ignite/loadtests/dsi/GridDsiRequest.java | 14 -- .../h2/twostep/msg/GridH2DmlRequest.java | 9 - .../h2/twostep/msg/GridH2QueryRequest.java | 11 - 60 files changed, 2105 deletions(-) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java index 526e2d02a8f90..81d843bf3eee0 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java @@ -119,21 +119,11 @@ public String schema() { return schema; } - /** */ - public void schema(String schema) { - this.schema = schema; - } - /** {@inheritDoc} */ @Override public UUID queryId() { return qryId; } - /** */ - public void queryId(UUID qryId) { - this.qryId = qryId; - } - /** * @return Registered local query ID on originating node. */ @@ -141,21 +131,6 @@ public long originatingQueryId() { return originatingQryId; } - /** */ - public void originatingQueryId(long originatingQryId) { - this.originatingQryId = originatingQryId; - } - - /** */ - public @Nullable byte[] parametersBytes() { - return paramsBytes; - } - - /** */ - public void parametersBytes(@Nullable byte[] paramsBytes) { - this.paramsBytes = paramsBytes; - } - /** {@inheritDoc} */ @Override public long fragmentId() { return fragmentDesc.fragmentId(); @@ -168,11 +143,6 @@ public FragmentDescription fragmentDescription() { return fragmentDesc; } - /** */ - public void fragmentDescription(FragmentDescription fragmentDesc) { - this.fragmentDesc = fragmentDesc; - } - /** * @return Topology version. */ @@ -180,11 +150,6 @@ public AffinityTopologyVersion topologyVersion() { return ver; } - /** */ - public void topologyVersion(AffinityTopologyVersion ver) { - this.ver = ver; - } - /** * @return Fragment plan. */ @@ -192,11 +157,6 @@ public String root() { return root; } - /** */ - public void root(String root) { - this.root = root; - } - /** * @return Total count of fragments in query for this node. */ @@ -204,11 +164,6 @@ public int totalFragmentsCount() { return totalFragmentsCnt; } - /** */ - public void totalFragmentsCount(int totalFragmentsCnt) { - this.totalFragmentsCnt = totalFragmentsCnt; - } - /** * @return Query parameters. */ @@ -232,16 +187,6 @@ public long timeout() { return timeout; } - /** */ - public void timeout(long timeout) { - this.timeout = timeout; - } - - /** */ - public void parametersBytes(long timeout) { - this.timeout = timeout; - } - /** * @return Transaction entries to mixin on query processing. */ @@ -249,21 +194,11 @@ public void parametersBytes(long timeout) { return qryTxEntries; } - /** */ - public void queryTransactionEntries(@Nullable Collection qryTxEntries) { - this.qryTxEntries = qryTxEntries; - } - /** */ public @Nullable Map applicationAttributes() { return appAttrs; } - /** */ - public void applicationAttributes(@Nullable Map appAttrs) { - this.appAttrs = appAttrs; - } - /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { if (paramsBytes == null && params != null) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java index 25ee72e150faa..f6f77938ae7d4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java @@ -105,27 +105,6 @@ public boolean system() { return system; } - /** - * Gets execution ID of task to be cancelled. - */ - public void sessionId(IgniteUuid sesId) { - this.sessionId = sesId; - } - - /** - * Gets session ID of job to be cancelled. If {@code null}, then - * all jobs for the specified task execution ID will be cancelled. - */ - public void jobId(IgniteUuid jobId) { - this.jobId = jobId; - } - - /** - */ - public void system(boolean system) { - this.system = system; - } - /** {@inheritDoc} */ @Override public short directType() { return 0; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java index e46408abcd6dc..089b1ad209432 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java @@ -274,13 +274,6 @@ public IgniteUuid sessionId() { return sesId; } - /** - * @param sesId New task session ID. - */ - public void sessionId(IgniteUuid sesId) { - this.sesId = sesId; - } - /** * @return Job session ID. */ @@ -288,13 +281,6 @@ public IgniteUuid jobId() { return jobId; } - /** - * @param jobId New job session ID. - */ - public void jobId(IgniteUuid jobId) { - this.jobId = jobId; - } - /** * @return Task class name. */ @@ -302,13 +288,6 @@ public String taskClassName() { return taskClsName; } - /** - * @param taskClsName New task class name. - */ - public void taskClassName(String taskClsName) { - this.taskClsName = taskClsName; - } - /** * @return Task name. */ @@ -316,13 +295,6 @@ public String taskName() { return taskName; } - /** - * @param taskName New task name. - */ - public void taskName(String taskName) { - this.taskName = taskName; - } - /** * @return Task version. */ @@ -330,27 +302,6 @@ public String userVersion() { return userVer; } - /** - * @param userVer New task version. - */ - public void userVersion(String userVer) { - this.userVer = userVer; - } - - /** - * @return Serialized job bytes. - */ - public byte[] jobBytes() { - return jobBytes; - } - - /** - * @param jobBytes New serialized job bytes. - */ - public void jobBytes(byte[] jobBytes) { - this.jobBytes = jobBytes; - } - /** * @return Grid job. */ @@ -365,13 +316,6 @@ public long startTaskTime() { return startTaskTime; } - /** - * @param startTaskTime New task start time. - */ - public void startTaskTime(long startTaskTime) { - this.startTaskTime = startTaskTime; - } - /** * @return Timeout. */ @@ -379,13 +323,6 @@ public long timeout() { return timeout; } - /** - * @param timeout New timeout. - */ - public void timeout(long timeout) { - this.timeout = timeout; - } - /** * Gets this instance creation time. * @@ -395,20 +332,6 @@ public long getCreateTime() { return createTime; } - /** - * @return Serialized collection of split siblings. - */ - public byte[] siblingsBytes() { - return siblingsBytes; - } - - /** - * @param siblingsBytes New serialized collection of split siblings. - */ - public void siblingsBytes(byte[] siblingsBytes) { - this.siblingsBytes = siblingsBytes; - } - /** * @return Job siblings. */ @@ -416,20 +339,6 @@ public Collection getSiblings() { return siblings; } - /** - * @return Serialized form of session attributes. - */ - public byte[] sessionAttributesBytes() { - return sesAttrsBytes; - } - - /** - * @param sesAttrsBytes New serialized form of session attributes. - */ - public void sessionAttributesBytes(byte[] sesAttrsBytes) { - this.sesAttrsBytes = sesAttrsBytes; - } - /** * @return Session attributes. */ @@ -437,20 +346,6 @@ public Map getSessionAttributes() { return sesAttrs; } - /** - * @return Serialized form of job attributes. - */ - public byte[] jobAttributesBytes() { - return jobAttrsBytes; - } - - /** - * @param jobAttrsBytes New serialized form of job attributes. - */ - public void jobAttributesBytes(byte[] jobAttrsBytes) { - this.jobAttrsBytes = jobAttrsBytes; - } - /** * @return Job attributes. */ @@ -465,13 +360,6 @@ public String checkpointSpi() { return cpSpi; } - /** - * @param cpSpi New checkpoint SPI name. - */ - public void checkpointSpi(String cpSpi) { - this.cpSpi = cpSpi; - } - /** * @return Task local class loader id. */ @@ -479,13 +367,6 @@ public IgniteUuid classLoaderId() { return clsLdrId; } - /** - * @param clsLdrId New task local class loader id. - */ - public void classLoaderId(IgniteUuid clsLdrId) { - this.clsLdrId = clsLdrId; - } - /** * @return Deployment mode. */ @@ -493,29 +374,6 @@ public DeploymentMode deploymentMode() { return depMode; } - /** - * @param depMode New deployment mode value. - */ - public void deploymentMode(DeploymentMode depMode) { - this.depMode = depMode; - } - - /** - * Returns true if siblings list is dynamic, i.e. task is continuous. - * - * @return True if siblings list is dynamic. - */ - public boolean dynamicSiblings() { - return dynamicSiblings; - } - - /** - * @param dynamicSiblings New dynamic siblings flag. - */ - public void dynamicSiblings(boolean dynamicSiblings) { - this.dynamicSiblings = dynamicSiblings; - } - /** * @return Node class loader participant map. */ @@ -523,13 +381,6 @@ public Map loaderParticipants() { return ldrParticipants; } - /** - * @param ldrParticipants New node class loader participant map. - */ - public void loaderParticipants(Map ldrParticipants) { - this.ldrParticipants = ldrParticipants; - } - /** * @return Returns {@code true} if deployment should always be used. */ @@ -537,13 +388,6 @@ public boolean forceLocalDeployment() { return forceLocDep; } - /** - * @param forceLocDep New local deployment forcing flag. - */ - public void forceLocalDeployment(boolean forceLocDep) { - this.forceLocDep = forceLocDep; - } - /** * @return Topology. */ @@ -551,13 +395,6 @@ public void forceLocalDeployment(boolean forceLocDep) { return top; } - /** - * @param top New topology. - */ - public void topology(@Nullable Collection top) { - this.top = top; - } - /** * @return Topology predicate. */ @@ -565,20 +402,6 @@ public IgnitePredicate getTopologyPredicate() { return topPred; } - /** - * @return Marshalled topology predicate. - */ - public byte[] topologyPredicateBytes() { - return topPredBytes; - } - - /** - * @param topPredBytes New marshalled topology predicate. - */ - public void topologyPredicateBytes(byte[] topPredBytes) { - this.topPredBytes = topPredBytes; - } - /** * @return {@code True} if session attributes are enabled. */ @@ -586,13 +409,6 @@ public boolean sessionFullSupport() { return sesFullSup; } - /** - * @param sesFullSup New flag, indicating that session attributes are enabled. - */ - public void sessionFullSupport(boolean sesFullSup) { - this.sesFullSup = sesFullSup; - } - /** * @return {@code True} if internal job. */ @@ -600,13 +416,6 @@ public boolean internal() { return internal; } - /** - * @param internal New internal job flag. - */ - public void internal(boolean internal) { - this.internal = internal; - } - /** * @return Caches' identifiers to reserve specified partition for job execution. */ @@ -614,13 +423,6 @@ public int[] cacheIds() { return cacheIds; } - /** - * @param cacheIds New cache identifiers. - */ - public void cacheIds(int[] cacheIds) { - this.cacheIds = cacheIds; - } - /** * @return Partition to lock for job execution. */ @@ -628,25 +430,11 @@ public int partition() { return part; } - /** - * @param part New partition. - */ - public void partition(int part) { - this.part = part; - } - /** {@inheritDoc} */ @Override public String executorName() { return execName; } - /** - * @param execName New executor name. - */ - public void executorName(String execName) { - this.execName = execName; - } - /** * @return Affinity version which was used to map job */ @@ -654,13 +442,6 @@ public AffinityTopologyVersion topologyVersion() { return topVer; } - /** - * @param topVer New topology version. - */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - /** {@inheritDoc} */ @Override public short directType() { return 1; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java index 672450cabd8a8..d14a449bb5998 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java @@ -58,13 +58,6 @@ public IgniteUuid sessionId() { return sesId; } - /** - * @param sesId New session ID. - */ - public void sessionId(IgniteUuid sesId) { - this.sesId = sesId; - } - /** * @return Topic ID. */ @@ -72,13 +65,6 @@ public long topicId() { return topicId; } - /** - * @param topicId New topic ID. - */ - public void topicId(long topicId) { - this.topicId = topicId; - } - /** {@inheritDoc} */ @Override public short directType() { return 3; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java index ae329423720f7..dba1b6af737cf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java @@ -54,13 +54,6 @@ public IgniteUuid sessionId() { return sesId; } - /** - * @param sesId New session ID. - */ - public void sessionId(IgniteUuid sesId) { - this.sesId = sesId; - } - /** {@inheritDoc} */ @Override public short directType() { return 5; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java index c1ea1fe7bb00b..447c4b1112d62 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java @@ -65,20 +65,6 @@ public GridTaskSessionRequest(IgniteUuid sesId, IgniteUuid jobId, Map attr this.attrs = attrs; } - /** - * @return Changed attributes (serialized). - */ - public byte[] attributesBytes() { - return attrsBytes; - } - - /** - * @param attrsBytes Changed attributes (serialized). - */ - public void attributesBytes(byte[] attrsBytes) { - this.attrsBytes = attrsBytes; - } - /** * @return Changed attributes. */ @@ -93,13 +79,6 @@ public IgniteUuid sessionId() { return sesId; } - /** - * @param sesId Task session ID. - */ - public void sessionId(IgniteUuid sesId) { - this.sesId = sesId; - } - /** * @return Job ID. */ @@ -107,13 +86,6 @@ public IgniteUuid jobId() { return jobId; } - /** - * @param jobId Job ID. - */ - public void jobId(IgniteUuid jobId) { - this.jobId = jobId; - } - /** {@inheritDoc} */ @Override public short directType() { return 6; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java index ddb7d134652fc..bc733db54c0d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java @@ -124,11 +124,6 @@ public UUID nodeId() { return nodeId; } - /** */ - public void nodeId(UUID nodeId) { - this.nodeId = nodeId; - } - /** * @return Future ID. */ @@ -136,21 +131,11 @@ public long futureId() { return futId; } - /** */ - public void futureId(long futId) { - this.futId = futId; - } - /** @return Compound diagnostic infos. */ public @Nullable Set infos() { return infos; } - /** Sets compound diagnostic infos. */ - public void infos(@Nullable Set infos) { - this.infos = infos; - } - /** {@inheritDoc} */ @Override public short directType() { return -61; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java index 856d609676da0..4af14a3727da4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java @@ -69,13 +69,6 @@ public IgniteUuid sessionId() { return sesId; } - /** - * @param sesId Session ID. - */ - public void sessionId(IgniteUuid sesId) { - this.sesId = sesId; - } - /** * @return Checkpoint key. */ @@ -83,13 +76,6 @@ public String key() { return key; } - /** - * @param key Checkpoint key. - */ - public void key(String key) { - this.key = key; - } - /** * @return Checkpoint SPI. */ @@ -97,13 +83,6 @@ public String checkpointSpi() { return cpSpi; } - /** - * @param cpSpi Checkpoint SPI. - */ - public void checkpointSpi(String cpSpi) { - this.cpSpi = cpSpi; - } - /** {@inheritDoc} */ @Override public short directType() { return 7; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java index fd3abb429baee..00890882e0590 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java @@ -91,20 +91,6 @@ Object responseTopic() { return resTopic; } - /** - * @return Serialized topic. - */ - public byte[] responseTopicBytes() { - return resTopicBytes; - } - - /** - * @param resTopicBytes Serialized topic. - */ - public void responseTopicBytes(byte[] resTopicBytes) { - this.resTopicBytes = resTopicBytes; - } - /** * Class name/resource name that is being requested. * @@ -114,13 +100,6 @@ public String resourceName() { return rsrcName; } - /** - * @param rsrcName Resource or class name. - */ - public void resourceName(String rsrcName) { - this.rsrcName = rsrcName; - } - /** * Gets property ldrId. * @@ -130,13 +109,6 @@ public IgniteUuid classLoaderId() { return ldrId; } - /** - * @param ldrId Property class loader ID. - */ - public void classLoaderId(IgniteUuid ldrId) { - this.ldrId = ldrId; - } - /** * Gets property undeploy. * @@ -146,13 +118,6 @@ public boolean isUndeploy() { return isUndeploy; } - /** - * @param isUndeploy Property undeploy. - */ - public void isUndeploy(boolean isUndeploy) { - this.isUndeploy = isUndeploy; - } - /** * @return Node IDs chain which is updated as request jumps * from node to node. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java index fff70b5d84166..b6359952bb051 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java @@ -53,13 +53,6 @@ public IgniteUuid id() { return id; } - /** - * @param id New request ID. - */ - public void id(IgniteUuid id) { - this.id = id; - } - /** * @return Count of encryption key to generate. */ @@ -67,13 +60,6 @@ public int keyCount() { return keyCnt; } - /** - * @param keyCnt New key count. - */ - public void keyCount(int keyCnt) { - this.keyCnt = keyCnt; - } - /** {@inheritDoc} */ @Override public short directType() { return 162; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java index e0e6037a8568a..6f3bf5f11b62e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java @@ -331,13 +331,6 @@ public String cacheName() { return cacheName; } - /** - * @param cacheName Cache name. - */ - public void cacheName(String cacheName) { - this.cacheName = cacheName; - } - /** * @return Near node ID. */ @@ -434,20 +427,6 @@ public void sql(boolean sql) { this.sql = sql; } - /** - * @param nodeId ID of node provided cache configuration in discovery data. - */ - public void receivedFrom(UUID nodeId) { - rcvdFrom = nodeId; - } - - /** - * @return ID of node provided cache configuration in discovery data. - */ - @Nullable public UUID receivedFrom() { - return rcvdFrom; - } - /** * @return Dynamic schema. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/StateChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/StateChangeRequest.java index a0ce972da8559..75da7b8adff7d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/StateChangeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/StateChangeRequest.java @@ -24,7 +24,6 @@ import org.apache.ignite.internal.processors.cluster.BaselineTopologyHistoryItem; import org.apache.ignite.internal.processors.cluster.ChangeGlobalStateMessage; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; /** @@ -74,13 +73,6 @@ public AffinityTopologyVersion topologyVersion() { return topVer; } - /** - * @return State change message ID. - */ - public IgniteUuid id() { - return msg.id(); - } - /** * @return State change request ID. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java index 9ee1dc93dcaaa..b7d7e6322fcc5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java @@ -88,13 +88,6 @@ public GridCacheTtlUpdateRequest(int cacheId, AffinityTopologyVersion topVer, lo return topVer; } - /** - * @param topVer New topology version. - */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - /** * @return TTL. */ @@ -102,13 +95,6 @@ public long ttl() { return ttl; } - /** - * @param ttl New TTL. - */ - public void ttl(long ttl) { - this.ttl = ttl; - } - /** * @param key Key. * @param ver Version. @@ -148,13 +134,6 @@ public List keys() { return keys; } - /** - * @param keys New entries keys. - */ - public void keys(List keys) { - this.keys = keys; - } - /** * @return Versions. */ @@ -162,23 +141,6 @@ public List versions() { return vers; } - /** - * @param vers New entries versions. - */ - public void versions(List vers) { - this.vers = vers; - } - - /** - * @param idx Entry index. - * @return Version. - */ - public GridCacheVersion version(int idx) { - assert idx >= 0 && idx < vers.size() : idx; - - return vers.get(idx); - } - /** * @return Keys for near cache. */ @@ -186,13 +148,6 @@ public List nearKeys() { return nearKeys; } - /** - * @param nearKeys New near entries keys. - */ - public void nearKeys(List nearKeys) { - this.nearKeys = nearKeys; - } - /** * @return Versions for near cache entries. */ @@ -200,13 +155,6 @@ public List nearVersions() { return nearVers; } - /** - * @param nearVers New near entries versions. - */ - public void nearVersions(List nearVers) { - this.nearVers = nearVers; - } - /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java index 250a36305c8b8..8b48490c6bd77 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java @@ -93,13 +93,6 @@ public boolean nearTxCheck() { return nearTxCheck; } - /** - * @param nearTxCheck {@code True} if should check only tx on near node. - */ - public void nearTxCheck(boolean nearTxCheck) { - this.nearTxCheck = nearTxCheck; - } - /** * @return Near version. */ @@ -107,13 +100,6 @@ public GridCacheVersion nearXidVersion() { return nearXidVer; } - /** - * @param nearXidVer Near version. - */ - public void nearXidVersion(GridCacheVersion nearXidVer) { - this.nearXidVer = nearXidVer; - } - /** * @return Future ID. */ @@ -121,13 +107,6 @@ public IgniteUuid futureId() { return futId; } - /** - * @param futId Future ID. - */ - public void futureId(IgniteUuid futId) { - this.futId = futId; - } - /** * @return Mini future ID. */ @@ -135,13 +114,6 @@ public IgniteUuid miniId() { return miniId; } - /** - * @param miniId Mini future ID. - */ - public void miniId(IgniteUuid miniId) { - this.miniId = miniId; - } - /** * @return Expected number of transactions on node. */ @@ -149,13 +121,6 @@ public int transactions() { return txNum; } - /** - * @param txNum Expected number of transactions on node. - */ - public void transactions(int txNum) { - this.txNum = txNum; - } - /** * @return System transaction flag. */ @@ -163,13 +128,6 @@ public boolean system() { return sys; } - /** - * @param sys System transaction flag. - */ - public void system(boolean sys) { - this.sys = sys; - } - /** {@inheritDoc} */ @Override public IgniteLogger messageLogger(GridCacheSharedContext ctx) { return ctx.txRecoveryMessageLogger(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java index a1b0a85ba9f6a..aa7eb1c8ec747 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java @@ -180,13 +180,6 @@ public UUID nodeId() { return nodeId; } - /** - * @param nodeId Node ID. - */ - public void nodeId(UUID nodeId) { - this.nodeId = nodeId; - } - /** * @return Near transaction ID. */ @@ -194,13 +187,6 @@ public GridCacheVersion nearXidVersion() { return nearXidVer; } - /** - * @param nearXidVer Near transaction ID. - */ - public void nearXidVersion(GridCacheVersion nearXidVer) { - this.nearXidVer = nearXidVer; - } - /** * @return Owner node thread ID. */ @@ -208,13 +194,6 @@ public long threadId() { return threadId; } - /** - * @param threadId Owner node thread ID. - */ - public void threadId(long threadId) { - this.threadId = threadId; - } - /** * @return Future ID. */ @@ -222,13 +201,6 @@ public IgniteUuid futureId() { return futId; } - /** - * @param futId Future ID. - */ - public void futureId(IgniteUuid futId) { - this.futId = futId; - } - /** * @return {@code True} if implicit transaction lock. */ @@ -236,13 +208,6 @@ public boolean inTx() { return isInTx; } - /** - * @param isInTx {@code True} if implicit transaction lock. - */ - public void inTx(boolean isInTx) { - this.isInTx = isInTx; - } - /** * @return Invalidate flag. */ @@ -250,13 +215,6 @@ public boolean isInvalidate() { return isInvalidate; } - /** - * @param isInvalidate Invalidate flag. - */ - public void isInvalidate(boolean isInvalidate) { - this.isInvalidate = isInvalidate; - } - /** * @return {@code True} if lock is implicit and for a read operation. */ @@ -264,13 +222,6 @@ public boolean txRead() { return isRead; } - /** - * @param isRead {@code True} if lock is implicit and for a read operation. - */ - public void txRead(boolean isRead) { - this.isRead = isRead; - } - /** * @param idx Key index. * @return Flag indicating whether a value should be returned. @@ -279,20 +230,6 @@ public boolean returnValue(int idx) { return retVals[idx]; } - /** - * @return Array indicating whether value should be returned for a key. - */ - public boolean[] returnValues() { - return retVals; - } - - /** - * @param retVals Array indicating whether value should be returned for a key. - */ - public void returnValues(boolean[] retVals) { - this.retVals = retVals; - } - /** * Sets skip store flag value. * @@ -363,13 +300,6 @@ public TransactionIsolation isolation() { return isolation; } - /** - * @param isolation Transaction isolation level. - */ - public void isolation(TransactionIsolation isolation) { - this.isolation = isolation; - } - /** * @return Tx size. */ @@ -377,13 +307,6 @@ public int txSize() { return txSize; } - /** - * @param txSize Tx size. - */ - public void txSize(int txSize) { - this.txSize = txSize; - } - /** * Adds a key. * @@ -408,13 +331,6 @@ public List keys() { return keys; } - /** - * @param keys Unmarshalled keys. - */ - public void keys(List keys) { - this.keys = keys; - } - /** {@inheritDoc} */ @Override public int partition() { return keys != null && !keys.isEmpty() ? keys.get(0).partition() : -1; @@ -427,27 +343,6 @@ public long timeout() { return timeout; } - /** - * @param timeout Max lock wait time. - */ - public void timeout(long timeout) { - this.timeout = timeout; - } - - /** - * @return Flags. - */ - public byte flags() { - return flags; - } - - /** - * @param flags Flags. - */ - public void flags(byte flags) { - this.flags = flags; - } - /** {@inheritDoc} */ @Override public IgniteLogger messageLogger(GridCacheSharedContext ctx) { return ctx.txLockMessageLogger(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java index ad3fd2704a88b..3528473dd3f08 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java @@ -165,13 +165,6 @@ public GridDistributedTxFinishRequest( return syncMode; } - /** - * @param syncMode Transaction write synchronization mode. - */ - public void syncMode(CacheWriteSynchronizationMode syncMode) { - this.syncMode = syncMode; - } - /** * Sets flag mask. * @@ -192,20 +185,6 @@ protected final boolean isFlag(int mask) { return (flags & mask) != 0; } - /** - * @return Task name hash. - */ - public final int taskNameHash() { - return taskNameHash; - } - - /** - * @param taskNameHash Task name hash. - */ - public void taskNameHash(int taskNameHash) { - this.taskNameHash = taskNameHash; - } - /** * @return Topology version. */ @@ -213,13 +192,6 @@ public void taskNameHash(int taskNameHash) { return topVer; } - /** - * @param topVer Topology version. - */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - /** * @return IO policy. */ @@ -227,13 +199,6 @@ public byte policy() { return plc; } - /** - * @param plc IO policy. - */ - public void policy(byte plc) { - this.plc = plc; - } - /** * @return Future ID. */ @@ -241,13 +206,6 @@ public IgniteUuid futureId() { return futId; } - /** - * @param futId Future ID. - */ - public void futureId(IgniteUuid futId) { - this.futId = futId; - } - /** * @return Thread ID. */ @@ -255,13 +213,6 @@ public long threadId() { return threadId; } - /** - * @param threadId Thread ID. - */ - public void threadId(long threadId) { - this.threadId = threadId; - } - /** * @return Commit version. */ @@ -269,13 +220,6 @@ public GridCacheVersion commitVersion() { return commitVer; } - /** - * @param commitVer Commit version. - */ - public void commitVersion(GridCacheVersion commitVer) { - this.commitVer = commitVer; - } - /** * @return Commit flag. */ @@ -283,13 +227,6 @@ public boolean commit() { return commit; } - /** - * @param commit Commit flag. - */ - public void commit(boolean commit) { - this.commit = commit; - } - /** * * @return Invalidate flag. @@ -298,13 +235,6 @@ public boolean isInvalidate() { return invalidate; } - /** - * @param invalidate Invalidate flag. - */ - public void isInvalidate(boolean invalidate) { - this.invalidate = invalidate; - } - /** * @return Base version. */ @@ -312,27 +242,6 @@ public GridCacheVersion baseVersion() { return baseVer; } - /** - * @param baseVer Base version. - */ - public void baseVersion(GridCacheVersion baseVer) { - this.baseVer = baseVer; - } - - /** - * @return Flags. - */ - public byte flags() { - return flags; - } - - /** - * @param flags Flags. - */ - public void flags(byte flags) { - this.flags = flags; - } - /** * * @return {@code True} if reply is required. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index 6de8034d6903d..379fc9bcd1708 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -250,13 +250,6 @@ public byte policy() { return plc; } - /** - * @param plc IO policy. - */ - public void policy(byte plc) { - this.plc = plc; - } - /** * Adds version to be verified on remote node. * @@ -284,13 +277,6 @@ public long threadId() { return threadId; } - /** - * @param threadId Thread ID. - */ - public void threadId(long threadId) { - this.threadId = threadId; - } - /** * @return Commit version. */ @@ -298,13 +284,6 @@ public GridCacheVersion writeVersion() { return writeVer; } - /** - * @param writeVer Commit version. - */ - public void writeVersion(GridCacheVersion writeVer) { - this.writeVer = writeVer; - } - /** * @return Invalidate flag. */ @@ -319,13 +298,6 @@ public long timeout() { return timeout; } - /** - * @param timeout Transaction timeout. - */ - public void timeout(long timeout) { - this.timeout = timeout; - } - /** * @return Concurrency. */ @@ -333,13 +305,6 @@ public TransactionConcurrency concurrency() { return concurrency; } - /** - * @param concurrency Concurrency. - */ - public void concurrency(TransactionConcurrency concurrency) { - this.concurrency = concurrency; - } - /** * @return Isolation level. */ @@ -347,13 +312,6 @@ public TransactionIsolation isolation() { return isolation; } - /** - * @param isolation Isolation level. - */ - public void isolation(TransactionIsolation isolation) { - this.isolation = isolation; - } - /** * @return Read set. */ @@ -382,34 +340,6 @@ public void writes(Collection writes) { this.writes = writes; } - /** - * @return DHT version keys. - */ - public Collection dhtVersionKeys() { - return dhtVerKeys; - } - - /** - * @param dhtVerKeys DHT version keys. - */ - public void dhtVersionKeys(Collection dhtVerKeys) { - this.dhtVerKeys = dhtVerKeys; - } - - /** - * @return DHT version values. - */ - public Collection dhtVersionValues() { - return dhtVerVals; - } - - /** - * @param dhtVerVals DHT version values. - */ - public void dhtVersionValues(Collection dhtVerVals) { - this.dhtVerVals = dhtVerVals; - } - /** * @return Expected transaction size. */ @@ -417,41 +347,6 @@ public int txSize() { return txSize; } - /** - * @param txSize Expected transaction size. - */ - public void txSize(int txSize) { - this.txSize = txSize; - } - - /** - * @return Tx nodes direct marshallable message. - */ - public Map txNodesMessages() { - return txNodesMsg; - } - - /** - * @param txNodesMsg Tx nodes direct marshallable message. - */ - public void txNodesMessages(Map txNodesMsg) { - this.txNodesMsg = txNodesMsg; - } - - /** - * @return Flags. - */ - public byte flags() { - return flags; - } - - /** - * @param flags Flags. - */ - public void flags(byte flags) { - this.flags = flags; - } - /** * @return One phase commit flag. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java index 9e4a2de3b0348..152f6f75893b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java @@ -54,13 +54,6 @@ public GridNearUnlockRequest(int cacheId, int keyCnt, boolean addDepInfo) { this.cacheId = cacheId; } - /** - * Sets the keys - */ - public void keys(List keys) { - this.keys = keys; - } - /** * @return Keys. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java index 3bcb6532ec220..d2ebcb9835ba1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java @@ -69,20 +69,6 @@ public GridDhtAffinityAssignmentRequest( flags |= SND_PART_STATE_MASK; } - /** - * @return Flags. - */ - public byte flags() { - return flags; - } - - /** - * @param flags Flags. - */ - public void flags(byte flags) { - this.flags = flags; - } - /** * @return {@code True} if need send in response cache partitions state. */ @@ -97,13 +83,6 @@ public long futureId() { return futId; } - /** - * @param futId Future ID. - */ - public void futureId(long futId) { - this.futId = futId; - } - /** {@inheritDoc} */ @Override public boolean addDeploymentInfo() { return false; @@ -121,13 +100,6 @@ public void futureId(long futId) { return topVer; } - /** - * @param topVer Requested topology version. - */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - /** {@inheritDoc} */ @Override public short directType() { return 28; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index 067dc4d0d1f8c..6deb563f671d8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@ -178,13 +178,6 @@ public int taskNameHash() { return taskNameHash; } - /** - * @param taskNameHash Task name hash. - */ - public void taskNameHash(int taskNameHash) { - this.taskNameHash = taskNameHash; - } - /** * @return Topology version. */ @@ -192,69 +185,6 @@ public void taskNameHash(int taskNameHash) { return topVer; } - /** - * @param topVer Topology version. - */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - - /** - * @return Invalidate reader flags. - */ - public BitSet invalidateEntries() { - return invalidateEntries; - } - - /** - * @param invalidateEntries Invalidate reader flags. - */ - public void invalidateEntries(BitSet invalidateEntries) { - this.invalidateEntries = invalidateEntries; - } - - /** - * @return Array of keys from {@link #owned}. Used during marshalling and unmarshalling. - */ - public KeyCacheObject[] ownedKeys() { - return ownedKeys; - } - - /** - * @param ownedKeys Array of keys from {@link #owned}. Used during marshalling and unmarshalling. - */ - public void ownedKeys(KeyCacheObject[] ownedKeys) { - this.ownedKeys = ownedKeys; - } - - /** - * @return Array of values from {@link #owned}. Used during marshalling and unmarshalling. - */ - public GridCacheVersion[] ownedValues() { - return ownedValues; - } - - /** - * @param ownedValues Array of values from {@link #owned}. Used during marshalling and unmarshalling. - */ - public void ownedValues(GridCacheVersion[] ownedValues) { - this.ownedValues = ownedValues; - } - - /** - * @return Indexes of keys needed to be preloaded. - */ - public BitSet preloadKeys() { - return preloadKeys; - } - - /** - * @param preloadKeys Indexes of keys needed to be preloaded. - */ - public void preloadKeys(BitSet preloadKeys) { - this.preloadKeys = preloadKeys; - } - /** * Adds a DHT key. * @@ -315,13 +245,6 @@ public IgniteUuid miniId() { return miniId; } - /** - * @param miniId Mini ID. - */ - public void miniId(IgniteUuid miniId) { - this.miniId = miniId; - } - /** * @return TTL for read operation. */ @@ -329,13 +252,6 @@ public long accessTtl() { return accessTtl; } - /** - * @param accessTtl TTL for read operation. - */ - public void accessTtl(long accessTtl) { - this.accessTtl = accessTtl; - } - /** * @return Transaction label. */ @@ -343,13 +259,6 @@ public void accessTtl(long accessTtl) { return txLbl; } - /** - * @param txLbl Transaction label. - */ - public void txLabel(String txLbl) { - this.txLbl = txLbl; - } - /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index 409ee4f24eb41..d6e5b22b60a82 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -131,13 +131,6 @@ public int miniId() { return miniId; } - /** - * @param miniId Mini ID. - */ - public void miniId(int miniId) { - this.miniId = miniId; - } - /** * @return Near node ID. */ @@ -145,13 +138,6 @@ public UUID nearNodeId() { return nearNodeId; } - /** - * @param nearNodeId Near node ID. - */ - public void nearNodeId(UUID nearNodeId) { - this.nearNodeId = nearNodeId; - } - /** * @return System invalidate flag. */ @@ -215,13 +201,6 @@ public Collection updateCounters() { return updCntrs; } - /** - * @param updCntrs Partition counters update deferred until transaction commit. - */ - public void updateCounters(Collection updCntrs) { - this.updCntrs = updCntrs; - } - /** {@inheritDoc} */ @Override public short directType() { return 32; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java index 189b4f22b93b5..3fbd909658b67 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java @@ -55,13 +55,6 @@ public Collection versions() { return vers; } - /** - * @param vers Lock or transaction versions. - */ - public void versions(Collection vers) { - this.vers = vers; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(GridDhtTxOnePhaseCommitAckRequest.class, this, super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java index 211a662a84825..06300deeaec6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java @@ -190,13 +190,6 @@ public Collection updateCounters() { return updCntrs; } - /** - * @param updCntrs Update counters list. - */ - public void updateCounters(Collection updCntrs) { - this.updCntrs = updCntrs; - } - /** * @return Near cache writes for which cache was not found (possible if client near cache was closed). */ @@ -211,13 +204,6 @@ public GridCacheVersion nearXidVersion() { return nearXidVer; } - /** - * @param nearXidVer Near transaction ID. - */ - public void nearXidVersion(GridCacheVersion nearXidVer) { - this.nearXidVer = nearXidVer; - } - /** * @return Near node ID. */ @@ -225,27 +211,6 @@ public UUID nearNodeId() { return nearNodeId; } - /** - * @param nodeId Near node ID. - */ - public void nearNodeId(UUID nodeId) { - nearNodeId = nodeId; - } - - /** - * @return Invalidate near entries flags. - */ - public BitSet invalidateNearEntries() { - return invalidateNearEntries; - } - - /** - * @param invalidateNearEntries Invalidate near entries flags. - */ - public void invalidateNearEntries(BitSet invalidateNearEntries) { - this.invalidateNearEntries = invalidateNearEntries; - } - /** * @return Task name hash. */ @@ -253,13 +218,6 @@ public int taskNameHash() { return taskNameHash; } - /** - * @param taskNameHash Task name hash. - */ - public void taskNameHash(int taskNameHash) { - this.taskNameHash = taskNameHash; - } - /** * @return Near writes. */ @@ -267,13 +225,6 @@ public Collection nearWrites() { return nearWrites == null ? Collections.emptyList() : nearWrites; } - /** - * @param nearWrites Near writes. - */ - public void nearWrites(Collection nearWrites) { - this.nearWrites = nearWrites; - } - /** * @param idx Entry index to set invalidation flag. * @param invalidate Invalidation flag value. @@ -319,13 +270,6 @@ public IgniteUuid futureId() { return futId; } - /** - * @param futId Future ID. - */ - public void futureId(IgniteUuid futId) { - this.futId = futId; - } - /** * @return Mini future ID. */ @@ -333,13 +277,6 @@ public int miniId() { return miniId; } - /** - * @param miniId Mini future ID. - */ - public void miniId(int miniId) { - this.miniId = miniId; - } - /** * @return Topology version. */ @@ -347,55 +284,6 @@ public void miniId(int miniId) { return topVer; } - /** - * @param topVer Topology version. - */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - - /** - * @return Owned keys. - */ - public Collection ownedKeys() { - return ownedKeys; - } - - /** - * @param ownedKeys Owned keys. - */ - public void ownedKeys(Collection ownedKeys) { - this.ownedKeys = ownedKeys; - } - - /** - * @return Owned values. - */ - public Collection ownedValues() { - return ownedVals; - } - - /** - * @param ownedVals Owned values. - */ - public void ownedValues(Collection ownedVals) { - this.ownedVals = ownedVals; - } - - /** - * @return Preload keys. - */ - public BitSet preloadKeys() { - return preloadKeys; - } - - /** - * @param preloadKeys Preload keys. - */ - public void preloadKeys(BitSet preloadKeys) { - this.preloadKeys = preloadKeys; - } - /** * Sets owner and its mapped version. * @@ -423,13 +311,6 @@ public boolean skipCompletedVersion() { return skipCompletedVers; } - /** - * @param skipCompletedVers {@code True} if remote tx should skip adding itself to completed versions map on finish. - */ - public void skipCompletedVersion(boolean skipCompletedVers) { - this.skipCompletedVers = skipCompletedVers; - } - /** * @return Transaction label. */ @@ -437,13 +318,6 @@ public void skipCompletedVersion(boolean skipCompletedVers) { return txLbl; } - /** - * @param txLbl Transaction label. - */ - public void txLabel(String txLbl) { - this.txLbl = txLbl; - } - /** * {@inheritDoc} * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java index 6f6a65082d0d3..eebee53b53e87 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java @@ -50,13 +50,6 @@ public GridDhtUnlockRequest(int cacheId, int dhtCnt, boolean addDepInfo) { super(cacheId, dhtCnt, addDepInfo); } - /** - * Sets the near. - */ - public void nearKeys(List nearKeys) { - this.nearKeys = nearKeys; - } - /** * @return Near keys. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java index 189aafe36c95a..b5c01c8950802 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java @@ -55,21 +55,11 @@ public GridDistributedTxPrepareRequest payload() { return payload; } - /** @param payload Original update message. */ - public void payload(GridDistributedTxPrepareRequest payload) { - this.payload = payload; - } - /** @return Application attributes. */ public Map applicationAttributes() { return appAttrs; } - /** @param appAttrs Application attributes. */ - public void applicationAttributes(Map appAttrs) { - this.appAttrs = appAttrs; - } - /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { payload.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java index dac5d7ccde67a..6b44d9dec5ea9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java @@ -55,21 +55,11 @@ public GridNearAtomicAbstractUpdateRequest payload() { return payload; } - /** @param payload Original update message. */ - public void payload(GridNearAtomicAbstractUpdateRequest payload) { - this.payload = payload; - } - /** @return Application attributes. */ public Map applicationAttributes() { return appAttrs; } - /** @param appAttrs Application attributes. */ - public void applicationAttributes(Map appAttrs) { - this.appAttrs = appAttrs; - } - /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { payload.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java index 380c43e3854e5..b13bac3c793f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java @@ -142,13 +142,6 @@ protected GridDhtAtomicAbstractUpdateRequest(int cacheId, return topVer; } - /** - * @param topVer New topology version. - */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - /** * @param nearNodeId Near node ID. * @param nearFutId Future ID on near node. @@ -181,13 +174,6 @@ public UUID nearNodeId() { return nearNodeId; } - /** - * @param nearNodeId New near node id. - */ - public void nearNodeId(UUID nearNodeId) { - this.nearNodeId = nearNodeId; - } - /** {@inheritDoc} */ @Override public int lookupIndex() { return CACHE_MSG_IDX; @@ -207,13 +193,6 @@ public final byte flags() { return flags; } - /** - * @param flags New additional flags. - */ - public void flags(byte flags) { - this.flags = flags; - } - /** * @return Keep binary flag. */ @@ -319,13 +298,6 @@ public final int taskNameHash() { return taskNameHash; } - /** - * @param taskNameHash New task name hash. - */ - public void taskNameHash(int taskNameHash) { - this.taskNameHash = taskNameHash; - } - /** * @return Future ID on primary node. */ @@ -333,13 +305,6 @@ public final long futureId() { return futId; } - /** - * @param futId New future ID on primary node. - */ - public void futureId(long futId) { - this.futId = futId; - } - /** * @return Future ID on near node. */ @@ -347,13 +312,6 @@ public final long nearFutureId() { return nearFutId; } - /** - * @param nearFutId New near future id. - */ - public void nearFutureId(long nearFutId) { - this.nearFutId = nearFutId; - } - /** * @return Write version. */ @@ -361,13 +319,6 @@ public final GridCacheVersion writeVersion() { return writeVer; } - /** - * @param writeVer New write version. - */ - public void writeVersion(GridCacheVersion writeVer) { - this.writeVer = writeVer; - } - /** * @return Keys size. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java index 99e61a6c74b04..cc39e3a54e921 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java @@ -215,11 +215,6 @@ public boolean nearCache() { return isFlag(NEAR_CACHE_FLAG_MASK); } - /** Sets new topology version. */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - /** {@inheritDoc} */ @Override public final AffinityTopologyVersion topologyVersion() { return topVer; @@ -277,27 +272,6 @@ public int taskNameHash() { return taskNameHash; } - /** - * Sets task name hash code. - */ - public void taskNameHash(int taskNameHash) { - this.taskNameHash = taskNameHash; - } - - /** - * @return Compressed boolean flags. - */ - public short flags() { - return flags; - } - - /** - * @param flags New compressed boolean flags. - */ - public void flags(short flags) { - this.flags = flags; - } - /** * @return Cache update operation. */ @@ -305,25 +279,11 @@ public GridCacheOperation operation() { return op; } - /** - * @param op Cache update operation. - */ - public void operation(GridCacheOperation op) { - this.op = op; - } - /** @return Write synchronization mode. */ public CacheWriteSynchronizationMode writeSynchronizationMode() { return syncMode; } - /** - * @param syncMode Write synchronization mode. - */ - public void writeSynchronizationMode(CacheWriteSynchronizationMode syncMode) { - this.syncMode = syncMode; - } - /** * @return Target node ID. */ @@ -338,13 +298,6 @@ public long futureId() { return futId; } - /** - * Sets near node future ID. - */ - public void futureId(long futId) { - this.futId = futId; - } - /** * @param res Response. * @return {@code True} if current response was {@code null}. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java index e288b13eb6f73..ff6fead509a48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java @@ -67,14 +67,6 @@ public final long futureId() { return futId; } - /** - * @param futId Future ID on near node. - */ - public void futureId(long futId) { - this.futId = futId; - } - - /** * @return Related update request. */ @@ -87,13 +79,6 @@ GridNearAtomicAbstractUpdateRequest updateRequest() { return partId; } - /** - * @param partId Partition ID this message is targeted to or {@code -1} if it cannot be determined. - */ - public void partition(int partId) { - this.partId = partId; - } - /** {@inheritDoc} */ @Override public int lookupIndex() { return CACHE_MSG_IDX; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java index 8a215625f077c..32f6332305eff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java @@ -89,16 +89,6 @@ public GridNearAtomicSingleUpdateFilterRequest() { this.filter = filter; } - /** */ - public void filter(CacheEntryPredicate[] filter) { - this.filter = filter; - } - - /** {@inheritDoc} */ - @Override @Nullable public CacheEntryPredicate[] filter() { - return filter; - } - /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java index f1b329ea99e49..3110cf9e3f5ec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java @@ -162,26 +162,6 @@ public GridNearAtomicSingleUpdateInvokeRequest() { return invokeArgs; } - /** */ - public @Nullable byte[] entryProcessorBytes() { - return entryProcBytes; - } - - /** */ - public void entryProcessorBytes(@Nullable byte[] entryProcBytes) { - this.entryProcBytes = entryProcBytes; - } - - /** */ - public @Nullable List invokeArgumentsBytes() { - return invokeArgsBytes; - } - - /** */ - public void invokeArgumentsBytes(@Nullable List invokeArgsBytes) { - this.invokeArgsBytes = invokeArgsBytes; - } - /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java index 7da56fdb284fa..8c7a6fbc5e575 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java @@ -145,20 +145,6 @@ public GridNearAtomicSingleUpdateRequest() { return Collections.singletonList(key); } - /** - * @param key Key to update. - */ - public void key(KeyCacheObject key) { - this.key = key; - } - - /** - * @return Key to update. - */ - public KeyCacheObject key() { - return key; - } - /** {@inheritDoc} */ @Override public KeyCacheObject key(int idx) { assert idx == 0 : idx; @@ -171,20 +157,6 @@ public KeyCacheObject key() { return Collections.singletonList(val); } - /** - * @return Cache object value to update. - */ - public CacheObject value() { - return val; - } - - /** - * @param val Cache object value to update. - */ - public void value(CacheObject val) { - this.val = val; - } - /** {@inheritDoc} */ @Override public CacheObject value(int idx) { assert idx == 0 : idx; 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 7c323a019b77a..e780c631a2d2f 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 @@ -95,13 +95,6 @@ public IgniteUuid futureId() { return futId; } - /** - * @param futId Future ID. - */ - public void futureId(IgniteUuid futId) { - this.futId = futId; - } - /** * @return Mini-future ID. */ @@ -109,13 +102,6 @@ public IgniteUuid miniId() { return miniId; } - /** - * @param miniId Mini-future ID. - */ - public void miniId(IgniteUuid miniId) { - this.miniId = miniId; - } - /** * @return Keys. */ @@ -123,13 +109,6 @@ public Collection keys() { return keys; } - /** - * @param keys Keys. - */ - public void keys(Collection keys) { - this.keys = keys; - } - /** * @return Topology version for which keys are requested. */ @@ -137,13 +116,6 @@ public void keys(Collection keys) { return topVer; } - /** - * @param topVer Topology version for which keys are requested. - */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java index 8f6a3ab87643c..ada0395b13117 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java @@ -65,13 +65,6 @@ public GridDhtPartitionExchangeId restoreExchangeId() { return restoreExchId; } - /** - * @param restoreExchId ID of current exchange on new coordinator. - */ - public void restoreExchangeId(GridDhtPartitionExchangeId restoreExchId) { - this.restoreExchId = restoreExchId; - } - /** {@inheritDoc} */ @Override public short directType() { return 48; 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 3c17e4192a487..d5a62826e9280 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 @@ -193,13 +193,6 @@ public IgniteUuid futureId() { return futId; } - /** - * @param futId Future ID. - */ - public void futureId(IgniteUuid futId) { - this.futId = futId; - } - /** * @return Sub ID. */ @@ -207,13 +200,6 @@ public IgniteUuid miniId() { return miniId; } - /** - * @param miniId Sub ID. - */ - public void miniId(IgniteUuid miniId) { - this.miniId = miniId; - } - /** * Gets task name hash. * @@ -223,25 +209,11 @@ public int taskNameHash() { return taskNameHash; } - /** - * @param taskNameHash Task name hash. - */ - public void taskNameHash(int taskNameHash) { - this.taskNameHash = taskNameHash; - } - /** {@inheritDoc} */ @Override public GridCacheVersion version() { return ver; } - /** - * @param ver Version. - */ - public void version(GridCacheVersion ver) { - this.ver = ver; - } - /** * @return Keys. */ @@ -249,48 +221,6 @@ public LinkedHashMap keyMap() { return keyMap; } - /** - * @return Keys. - */ - public List keys() { - return keys; - } - - /** - * @param keys Keys. - */ - public void keys(List keys) { - this.keys = keys; - } - - /** - * @return Readers flags. - */ - public List readersFlags() { - return readersFlags; - } - - /** - * @param readersFlags Readers flags. - */ - public void readersFlags(List readersFlags) { - this.readersFlags = readersFlags; - } - - /** - * @return Flags. - */ - public byte flags() { - return flags; - } - - /** - * @param flags Flags. - */ - public void flags(byte flags) { - this.flags = flags; - } - /** * @return Read through flag. */ @@ -325,13 +255,6 @@ public boolean addReaders() { return topVer; } - /** - * @param topVer Topology version. - */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - /** * @return New TTL to set after entry is created, -1 to leave unchanged. */ @@ -339,13 +262,6 @@ public long createTtl() { return createTtl; } - /** - * @param createTtl New TTL to set after entry is created, -1 to leave unchanged. - */ - public void createTtl(long createTtl) { - this.createTtl = createTtl; - } - /** * @return New TTL to set after entry is accessed, -1 to leave unchanged. */ @@ -353,13 +269,6 @@ public long accessTtl() { return accessTtl; } - /** - * @param accessTtl New TTL to set after entry is accessed, -1 to leave unchanged. - */ - public void accessTtl(long accessTtl) { - this.accessTtl = accessTtl; - } - /** {@inheritDoc} */ @Override public int partition() { return keys != null && !keys.isEmpty() ? keys.get(0).partition() : -1; @@ -374,13 +283,6 @@ public void accessTtl(long accessTtl) { return txLbl; } - /** - * @param txLbl Possible transaction label. - */ - public void txLabel(String txLbl) { - this.txLbl = txLbl; - } - /** * @param ctx Cache context. * @throws IgniteCheckedException If failed. 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 8052e926d7bca..71e5187653b15 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 @@ -228,13 +228,6 @@ public int taskNameHash() { return taskNameHash; } - /** - * @param taskNameHash Task name hash. - */ - public void taskNameHash(int taskNameHash) { - this.taskNameHash = taskNameHash; - } - /** * @return Sync commit flag. */ @@ -277,20 +270,6 @@ public void addKeyBytes(KeyCacheObject key, boolean retVal, @Nullable GridCacheV addKeyBytes(key, retVal); } - /** - * @return Array of mapped DHT versions for this entry. - */ - public GridCacheVersion[] dhtVersions() { - return dhtVers; - } - - /** - * @param dhtVers Array of mapped DHT versions for this entry. - */ - public void dhtVersions(GridCacheVersion[] dhtVers) { - this.dhtVers = dhtVers; - } - /** * @param idx Index of the key. * @return DHT version for key at given index. @@ -306,13 +285,6 @@ public long createTtl() { return createTtl; } - /** - * @param createTtl New TTL to set after entry is created, -1 to leave unchanged. - */ - public void createTtl(long createTtl) { - this.createTtl = createTtl; - } - /** * @return TTL for read operation. */ @@ -320,27 +292,6 @@ public long accessTtl() { return accessTtl; } - /** - * @param accessTtl TTL for read operation. - */ - public void accessTtl(long accessTtl) { - this.accessTtl = accessTtl; - } - - /** - * @return Flags. - */ - public byte nearFlags() { - return flags; - } - - /** - * @param flags Flags. - */ - public void nearFlags(byte flags) { - this.flags = flags; - } - /** * @return Transaction label. */ @@ -348,13 +299,6 @@ public void nearFlags(byte flags) { return txLbl; } - /** - * @param txLbl Transaction label. - */ - public void txLabel(String txLbl) { - this.txLbl = txLbl; - } - /** {@inheritDoc} */ @Override public short directType() { return 51; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java index 15979629207ad..485bdc360468c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java @@ -150,13 +150,6 @@ public GridNearSingleGetRequest( flags |= RECOVERY_FLAG_MASK; } - /** - * Sets the key. - */ - public void key(KeyCacheObject key) { - this.key = key; - } - /** * @return Key. */ @@ -164,23 +157,6 @@ public KeyCacheObject key() { return key; } - /** Sets the flags. */ - public void flags(byte flags) { - this.flags = flags; - } - - /** @return Flags. */ - public byte flags() { - return flags; - } - - /** - * Sets future ID. - */ - public void futureId(long futId) { - this.futId = futId; - } - /** * @return Future ID. */ @@ -188,13 +164,6 @@ public long futureId() { return futId; } - /** - * Sets task name hash. - */ - public void taskNameHash(int taskNameHash) { - this.taskNameHash = taskNameHash; - } - /** * Gets task name hash. * @@ -204,13 +173,6 @@ public int taskNameHash() { return taskNameHash; } - /** - * Sets topology version. - */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - /** * @return Topology version. */ @@ -218,13 +180,6 @@ public void topologyVersion(AffinityTopologyVersion topVer) { return topVer; } - /** - * Sets TTL to set after entry is created, -1 to leave unchanged. - */ - public void createTtl(long createTtl) { - this.createTtl = createTtl; - } - /** * @return New TTL to set after entry is created, -1 to leave unchanged. */ @@ -232,13 +187,6 @@ public long createTtl() { return createTtl; } - /** - * Sets new TTL to set after entry is accessed, -1 to leave unchanged. - */ - public void accessTtl(long accessTtl) { - this.accessTtl = accessTtl; - } - /** * @return New TTL to set after entry is accessed, -1 to leave unchanged. */ @@ -253,13 +201,6 @@ public long accessTtl() { return key.partition(); } - /** - * Sets the transaction label. - */ - public void txLabel(String txLbl) { - this.txLbl = txLbl; - } - /** * Get transaction label (may be null). * 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 1d82458b17207..ebc08f48fe9f4 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 @@ -132,15 +132,6 @@ public int miniId() { return miniId; } - /** - * For use only in GridNearTxFinishRequestSerializer. - * - * @param miniId Mini future ID. - */ - public void miniId(int miniId) { - this.miniId = miniId; - } - /** * @param miniId Mini future ID. */ 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 940ee0f1f2aa3..700c797dc9794 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 @@ -164,20 +164,6 @@ public boolean allowWaitTopologyFuture() { return isFlag(ALLOW_WAIT_TOP_FUT_FLAG_MASK); } - /** - * @return Recovery flag. - */ - public final boolean recovery() { - return isFlag(RECOVERY_FLAG_MASK); - } - - /** - * @param val Recovery flag. - */ - public void recovery(boolean val) { - setFlag(val, RECOVERY_FLAG_MASK); - } - /** * @return {@code True} if first optimistic tx prepare request sent from client node. */ @@ -199,13 +185,6 @@ public IgniteUuid futureId() { return futId; } - /** - * @param futId Future ID. - */ - public void futureId(IgniteUuid futId) { - this.futId = futId; - } - /** * @return Mini future ID. */ @@ -227,13 +206,6 @@ public int taskNameHash() { return taskNameHash; } - /** - * @param taskNameHash Task name hash. - */ - public void taskNameHash(int taskNameHash) { - this.taskNameHash = taskNameHash; - } - /** * @return Implicit single flag. */ @@ -255,13 +227,6 @@ public final boolean explicitLock() { return topVer; } - /** - * @param topVer Topology version. - */ - public void topologyVersion(AffinityTopologyVersion topVer) { - this.topVer = topVer; - } - /** * @return Transaction label. */ @@ -269,27 +234,6 @@ public void topologyVersion(AffinityTopologyVersion topVer) { return txLbl; } - /** - * @param txLbl Transaction label. - */ - public void txLabel(String txLbl) { - this.txLbl = txLbl; - } - - /** - * @return Flags. - */ - public byte nearFlags() { - return flags; - } - - /** - * @param flags Flags. - */ - public void nearFlags(byte flags) { - this.flags = flags; - } - /** * */ 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 129bb1e4c3240..3e0c95009739d 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 @@ -524,13 +524,6 @@ public long id() { return id; } - /** - * @param id Request ID. - */ - public void id(long id) { - this.id = id; - } - /** * @return Cache name. */ @@ -538,13 +531,6 @@ public String cacheName() { return cacheName; } - /** - * @param cacheName Cache name. - */ - public void cacheName(String cacheName) { - this.cacheName = cacheName; - } - /** * @return Query type. */ @@ -552,13 +538,6 @@ public GridCacheQueryType type() { return type; } - /** - * @param type Query type. - */ - public void type(GridCacheQueryType type) { - this.type = type; - } - /** * @return Query limit. */ @@ -566,13 +545,6 @@ public int limit() { return limit; } - /** - * @param limit Limit. - */ - public void limit(int limit) { - this.limit = limit; - } - /** * @return Query clause. */ @@ -580,13 +552,6 @@ public String clause() { return clause; } - /** - * @param clause Query clause. - */ - public void clause(String clause) { - this.clause = clause; - } - /** * @return Index query description. */ @@ -601,13 +566,6 @@ public String className() { return clsName; } - /** - * @param clsName Class name. - */ - public void className(String clsName) { - this.clsName = clsName; - } - /** * @return Flag indicating whether to include backups. */ @@ -615,13 +573,6 @@ public boolean includeBackups() { return incBackups; } - /** - * @param incBackups Flag indicating whether to include backups. - */ - public void includeBackups(boolean incBackups) { - this.incBackups = incBackups; - } - /** * @return Flag indicating that this is cancel request. */ @@ -629,13 +580,6 @@ public boolean cancel() { return cancel; } - /** - * @param cancel Flag indicating that this is cancel request. - */ - public void cancel(boolean cancel) { - this.cancel = cancel; - } - /** * @return Key-value filter. */ @@ -664,13 +608,6 @@ public int pageSize() { return pageSize; } - /** - * @param pageSize Page size. - */ - public void pageSize(int pageSize) { - this.pageSize = pageSize; - } - /** * @return Arguments. */ @@ -685,13 +622,6 @@ public boolean includeMetaData() { return incMeta; } - /** - * @param incMeta Include meta data or not. - */ - public void includeMetaData(boolean incMeta) { - this.incMeta = incMeta; - } - /** * @return Whether to load all pages. */ @@ -699,13 +629,6 @@ public boolean allPages() { return all; } - /** - * @param all Whether to load all pages. - */ - public void allPages(boolean all) { - this.all = all; - } - /** * @return Whether to keep binary. */ @@ -713,13 +636,6 @@ public boolean keepBinary() { return keepBinary; } - /** - * @param keepBinary Whether to keep binary. - */ - public void keepBinary(boolean keepBinary) { - this.keepBinary = keepBinary; - } - /** * @return Task hash. */ @@ -727,13 +643,6 @@ public int taskHash() { return taskHash; } - /** - * @param taskHash Task hash. - */ - public void taskHash(int taskHash) { - this.taskHash = taskHash; - } - /** * @return Flag to enable data page scan. */ @@ -754,13 +663,6 @@ public Collection skipKeys() { return skipKeys; } - /** - * @param skipKeys Set of keys that must be skiped during iteration. - */ - public void skipKeys(Collection skipKeys) { - this.skipKeys = skipKeys; - } - /** * @return Partition. */ @@ -768,97 +670,6 @@ public void skipKeys(Collection skipKeys) { return part; } - /** - * @param part Partition. - */ - public void partition(int part) { - this.part = part; - } - - /** - * @return Index query description bytes. - */ - public byte[] indexQueryDescriptionBytes() { - return idxQryDescBytes; - } - - /** - * @param idxQryDescBytes Index query description bytes. - */ - public void indexQueryDescriptionBytes(byte[] idxQryDescBytes) { - this.idxQryDescBytes = idxQryDescBytes; - } - - /** - * @return Key-value filter bytes. - */ - public byte[] keyValueFilterBytes() { - return keyValFilterBytes; - } - - /** - * @param keyValFilterBytes Key-value filter bytes. - */ - public void keyValueFilterBytes(byte[] keyValFilterBytes) { - this.keyValFilterBytes = keyValFilterBytes; - } - - /** - * @return Reducer bytes. - */ - public byte[] reducerBytes() { - return rdcBytes; - } - - /** - * @param rdcBytes Reducer bytes. - */ - public void reducerBytes(byte[] rdcBytes) { - this.rdcBytes = rdcBytes; - } - - /** - * @return Transformer bytes. - */ - public byte[] transformerBytes() { - return transBytes; - } - - /** - * @param transBytes Transformer bytes. - */ - public void transformerBytes(byte[] transBytes) { - this.transBytes = transBytes; - } - - /** - * @return Arguments bytes. - */ - public byte[] argumentsBytes() { - return argsBytes; - } - - /** - * @param argsBytes Arguments bytes. - */ - public void argumentsBytes(byte[] argsBytes) { - this.argsBytes = argsBytes; - } - - /** - * @return Flags. - */ - public byte flags() { - return flags; - } - - /** - * @param flags Flags. - */ - public void flags(byte flags) { - this.flags = flags; - } - /** {@inheritDoc} */ @Override public short directType() { return 58; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java index c6dd3ecb52b99..ccd324a2ec432 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java @@ -71,27 +71,6 @@ public long futureId() { return futId; } - /** - * @param futId Future ID. - */ - public void futureId(long futId) { - this.futId = futId; - } - - /** - * @return Array of txKeys from {@link #txKeys}. Used during marshalling and unmarshalling. - */ - public IgniteTxKey[] txKeysArray() { - return txKeysArr; - } - - /** - * @param txKeysArr Array of txKeys from {@link #txKeys}. Used during marshalling and unmarshalling. - */ - public void txKeysArray(IgniteTxKey[] txKeysArr) { - this.txKeysArr = txKeysArr; - } - /** * @return Tx keys. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryExecuteBatchRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryExecuteBatchRequest.java index 75c2831750905..fd4ec0da89d9d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryExecuteBatchRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryExecuteBatchRequest.java @@ -94,13 +94,6 @@ public String schema() { return schema; } - /** - * @return Last page flag. - */ - public boolean last() { - return last; - } - /** * @return Timeout in seconds. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryGetTablesMetaRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryGetTablesMetaRequest.java index e7ea2cb2f41f7..3e585633460f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryGetTablesMetaRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryGetTablesMetaRequest.java @@ -50,13 +50,6 @@ public OdbcQueryGetTablesMetaRequest(String catalog, String schema, String table this.tableType = tableType; } - /** - * @return catalog search pattern. - */ - public String catalog() { - return catalog; - } - /** * @return Schema search pattern. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/datastructures/ClientIgniteSetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/datastructures/ClientIgniteSetRequest.java index 629a9f94b7da3..02b9168017170 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/datastructures/ClientIgniteSetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/datastructures/ClientIgniteSetRequest.java @@ -70,15 +70,6 @@ protected ClientResponse process(IgniteSet set) { return new ClientResponse(requestId()); } - /** - * Gets the name. - * - * @return Set name. - */ - protected String name() { - return name; - } - /** * Gets the IgniteSet. * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java index 06a267f4f876f..4e3444bb4e4c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java @@ -50,13 +50,6 @@ public long queryRequestId() { return qryReqId; } - /** - * @param qryReqId Query request ID. - */ - public void queryRequestId(long qryReqId) { - this.qryReqId = qryReqId; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(GridQueryCancelRequest.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java index b2d59d569221a..75bccd9770d51 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java @@ -74,13 +74,6 @@ public byte flags() { return flags; } - /** - * @param flags New flags. - */ - public void flags(byte flags) { - this.flags = flags; - } - /** * @return Query request ID. */ @@ -88,13 +81,6 @@ public long queryRequestId() { return qryReqId; } - /** - * @param qryReqId New query request ID. - */ - public void queryRequestId(long qryReqId) { - this.qryReqId = qryReqId; - } - /** * @return Query. */ @@ -102,25 +88,11 @@ public int query() { return qry; } - /** - * @param qry New query. - */ - public void query(int qry) { - this.qry = qry; - } - /** @return Index segment ID */ public int segmentId() { return segmentId; } - /** - * @param segmentId New index segment ID. - */ - public void segmentId(int segmentId) { - this.segmentId = segmentId; - } - /** * @return Page size. */ @@ -128,13 +100,6 @@ public int pageSize() { return pageSize; } - /** - * @param pageSize New page size. - */ - public void pageSize(int pageSize) { - this.pageSize = pageSize; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(GridQueryNextPageRequest.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java index 1adc8f4b258b5..d66085774c6a1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java @@ -66,13 +66,6 @@ public long requestId() { return reqId; } - /** - * @param reqId New request id. - */ - public void requestId(long reqId) { - this.reqId = reqId; - } - /** * @return Query id on a node. */ @@ -80,13 +73,6 @@ public long nodeQryId() { return nodeQryId; } - /** - * @param nodeQryId New query id on a node. - */ - public void nodeQryId(long nodeQryId) { - this.nodeQryId = nodeQryId; - } - /** * @return {@code true} in case response should be send back asynchronous. */ @@ -94,13 +80,6 @@ public boolean asyncResponse() { return asyncRes; } - /** - * @param asyncRes New async response flag. - */ - public void asyncResponse(boolean asyncRes) { - this.asyncRes = asyncRes; - } - /** {@inheritDoc} */ @Override public short directType() { return TYPE_CODE; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java index 76ef019287a30..55d7d1f8ab1d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java @@ -45,13 +45,6 @@ public SecurityCredentials credentials() { return cred; } - /** - * @param cred Credentials object. - */ - public void credentials(SecurityCredentials cred) { - this.cred = cred; - } - /** * @return User attributes. */ @@ -59,13 +52,6 @@ public Map userAttributes() { return userAttrs; } - /** - * @param userAttrs User attributes. - */ - public void userAttributes(Map userAttrs) { - this.userAttrs = userAttrs; - } - /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { super.writeExternal(out); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java index 24428d2801814..7b430587860e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java @@ -213,15 +213,6 @@ public void keys(Iterable keys) { vals.put(k, null); } - /** - * Set cache flags bit map. - * - * @param cacheFlagsOn Bit representation of cache flags. - */ - public void cacheFlagsOn(int cacheFlagsOn) { - this.cacheFlagsOn = cacheFlagsOn; - } - /** * Get cache flags bit map. * @return Bit representation of cache flags. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientClusterStateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientClusterStateRequest.java index 122fdebd78e0b..fff2bddde2956 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientClusterStateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientClusterStateRequest.java @@ -47,29 +47,6 @@ public ClusterState state() { return state; } - /** - * @return Current read-only mode request. - */ - public static GridClientClusterStateRequest currentState() { - GridClientClusterStateRequest msg = new GridClientClusterStateRequest(); - - msg.reqCurrentState = true; - - return msg; - } - - /** - * @param state New cluster state. - * @return Cluster state change request. - */ - public static GridClientClusterStateRequest state(ClusterState state) { - GridClientClusterStateRequest msg = new GridClientClusterStateRequest(); - - msg.state = state; - - return msg; - } - /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { super.writeExternal(out); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientStateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientStateRequest.java index 7730d1382372a..f10339361321c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientStateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientStateRequest.java @@ -42,20 +42,6 @@ public boolean active() { return active; } - /** - * - */ - public void active(boolean active) { - this.active = active; - } - - /** - * - */ - public void requestCurrentState() { - this.reqCurrentState = true; - } - /** * */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java index 497743085bbbb..d5dbe66931982 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java @@ -66,20 +66,6 @@ public void argument(Object arg) { this.arg = arg; } - /** - * @return Keep binary flag. - */ - public boolean keepBinaries() { - return keepBinaries; - } - - /** - * @param keepBinaries Keep binary flag. - */ - public void keepBinaries(boolean keepBinaries) { - this.keepBinaries = keepBinaries; - } - /** {@inheritDoc} */ @Override public boolean equals(Object o) { if (this == o) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientWarmUpRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientWarmUpRequest.java index fb03b06c9a4dd..82e8284835ea9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientWarmUpRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientWarmUpRequest.java @@ -40,18 +40,6 @@ public boolean stopWarmUp() { return stopWarmUp; } - /** - * Set need to stop warm-up. - * - * @param stopWarmUp {@code true} to stop warm-up. - * @return {@code this} instance. - */ - public GridClientWarmUpRequest stopWarmUp(boolean stopWarmUp) { - this.stopWarmUp = stopWarmUp; - - return this; - } - /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { super.writeExternal(out); 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 5fc1e166944b6..08026e764d572 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 @@ -56,15 +56,6 @@ public IgniteUuid taskId() { return taskId; } - /** - * @param taskId Task ID. - */ - public void taskId(IgniteUuid taskId) { - assert taskId != null; - - this.taskId = taskId; - } - /** * @return Topic ID. */ @@ -72,13 +63,6 @@ public long topicId() { return topicId; } - /** - * @param topicId New topic ID. - */ - public void topicId(long topicId) { - this.topicId = topicId; - } - /** {@inheritDoc} */ @Override public short directType() { return 76; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java index 500ef4881c9b5..73a4ac017e78e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java @@ -50,13 +50,6 @@ public int delta() { return delta; } - /** - * @param delta New delta. - */ - public void delta(int delta) { - this.delta = delta; - } - /** {@inheritDoc} */ @Override public short directType() { return 82; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java index cb588a765122f..729c57c404911 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java @@ -56,13 +56,6 @@ public TcpDiscoveryClientPingRequest(UUID creatorNodeId, @Nullable UUID nodeToPi return nodeToPing; } - /** - * @param nodeToPing Pinged client node ID. - */ - public void nodeToPing(@Nullable UUID nodeToPing) { - this.nodeToPing = nodeToPing; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryClientPingRequest.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java index 3e9db33564ffc..503b3e091fe2a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java @@ -56,13 +56,6 @@ public TcpDiscoveryPingRequest(UUID creatorNodeId, @Nullable UUID clientNodeId) return clientNodeId; } - /** - * @param clientNodeId New pinged client node ID. - */ - public void clientNodeId(@Nullable UUID clientNodeId) { - this.clientNodeId = clientNodeId; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryPingRequest.class, this, "super", super.toString()); diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java index 6f77facf38545..13e326c49e3f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java @@ -18,7 +18,6 @@ package org.apache.ignite.loadtests.dsi; import java.io.Serializable; -import org.apache.ignite.cache.affinity.AffinityKeyMapped; /** * @@ -27,13 +26,6 @@ public class GridDsiRequest implements Serializable { /** */ private Long id; - /** */ - @SuppressWarnings({"FieldCanBeLocal"}) - private long msgId; - - /** */ - private long txId; - /** * @param id ID. */ @@ -45,7 +37,6 @@ public GridDsiRequest(long id) { * @param msgId Message ID. */ public void setMessageId(long msgId) { - this.msgId = msgId; } /** @@ -64,17 +55,12 @@ static class RequestKey implements Serializable { /** */ private Long key; - /** */ - @AffinityKeyMapped - private String terminalId; - /** * @param key Key. * @param terminalId Terminal ID. */ RequestKey(long key, String terminalId) { this.key = key; - this.terminalId = terminalId; } /** {@inheritDoc} */ diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java index f8a1be9047ef1..0edecd70c49a5 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java @@ -254,15 +254,6 @@ public boolean isFlagSet(int flags) { return (this.flags & flags) == flags; } - /** - * Checks if data page scan enabled. - * - * @return {@code true} If data page scan enabled, {@code false} if not, and {@code null} if not set. - */ - public Boolean isDataPageScanEnabled() { - return GridH2QueryRequest.isDataPageScanEnabled(flags); - } - /** * @return Timeout. */ diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java index 649e93ba95840..1f5f7bf8d16cd 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java @@ -216,17 +216,6 @@ public GridH2QueryRequest tables(Collection tbls) { return this; } - /** - * Get tables. - *

- * N.B.: Was used in AI 1.9 for snapshots. Unused at the moment, but should be kept for compatibility reasons. - * - * @return Tables. - */ - public Collection tables() { - return tbls; - } - /** * @param reqId Request ID. * @return {@code this}. From a92e6c7e4594fc146af747e4d2d8654a3383ee29 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 19 Feb 2026 21:51:28 +0300 Subject: [PATCH 31/42] Revert "WIP" This reverts commit 96b20908f91b614649cccf2209ac87b7104d6860. --- .../calcite/message/QueryStartRequest.java | 65 ++++++ .../ignite/internal/GridJobCancelRequest.java | 21 ++ .../internal/GridJobExecuteRequest.java | 219 ++++++++++++++++++ .../internal/GridJobSiblingsRequest.java | 14 ++ .../internal/GridTaskCancelRequest.java | 7 + .../internal/GridTaskSessionRequest.java | 28 +++ .../internal/IgniteDiagnosticRequest.java | 15 ++ .../checkpoint/GridCheckpointRequest.java | 21 ++ .../deployment/GridDeploymentRequest.java | 35 +++ .../GenerateEncryptionKeyRequest.java | 14 ++ .../cache/DynamicCacheChangeRequest.java | 21 ++ .../processors/cache/StateChangeRequest.java | 8 + .../GridCacheTtlUpdateRequest.java | 52 +++++ .../GridCacheTxRecoveryRequest.java | 42 ++++ .../GridDistributedLockRequest.java | 105 +++++++++ .../GridDistributedTxFinishRequest.java | 91 ++++++++ .../GridDistributedTxPrepareRequest.java | 105 +++++++++ .../distributed/GridNearUnlockRequest.java | 7 + .../dht/GridDhtAffinityAssignmentRequest.java | 28 +++ .../distributed/dht/GridDhtLockRequest.java | 91 ++++++++ .../dht/GridDhtTxFinishRequest.java | 21 ++ .../GridDhtTxOnePhaseCommitAckRequest.java | 7 + .../dht/GridDhtTxPrepareRequest.java | 126 ++++++++++ .../distributed/dht/GridDhtUnlockRequest.java | 7 + .../TransactionAttributesAwareRequest.java | 10 + ...omicApplicationAttributesAwareRequest.java | 10 + .../GridDhtAtomicAbstractUpdateRequest.java | 49 ++++ .../GridNearAtomicAbstractUpdateRequest.java | 47 ++++ .../GridNearAtomicCheckUpdateRequest.java | 15 ++ ...idNearAtomicSingleUpdateFilterRequest.java | 10 + ...idNearAtomicSingleUpdateInvokeRequest.java | 20 ++ .../GridNearAtomicSingleUpdateRequest.java | 28 +++ .../preloader/GridDhtForceKeysRequest.java | 28 +++ .../GridDhtPartitionsSingleRequest.java | 7 + .../distributed/near/GridNearGetRequest.java | 98 ++++++++ .../distributed/near/GridNearLockRequest.java | 56 +++++ .../near/GridNearSingleGetRequest.java | 59 +++++ .../near/GridNearTxFinishRequest.java | 9 + .../near/GridNearTxPrepareRequest.java | 56 +++++ .../cache/query/GridCacheQueryRequest.java | 189 +++++++++++++++ .../cache/transactions/TxLocksRequest.java | 21 ++ .../odbc/OdbcQueryExecuteBatchRequest.java | 7 + .../odbc/OdbcQueryGetTablesMetaRequest.java | 7 + .../ClientIgniteSetRequest.java | 9 + .../messages/GridQueryCancelRequest.java | 7 + .../messages/GridQueryNextPageRequest.java | 35 +++ .../query/messages/GridQueryKillRequest.java | 21 ++ .../GridClientAuthenticationRequest.java | 14 ++ .../message/GridClientCacheRequest.java | 9 + .../GridClientClusterStateRequest.java | 23 ++ .../message/GridClientStateRequest.java | 14 ++ .../client/message/GridClientTaskRequest.java | 14 ++ .../message/GridClientWarmUpRequest.java | 12 + .../handlers/task/GridTaskResultRequest.java | 16 ++ .../jobstealing/JobStealingRequest.java | 7 + .../TcpDiscoveryClientPingRequest.java | 7 + .../tcp/messages/TcpDiscoveryPingRequest.java | 7 + .../ignite/loadtests/dsi/GridDsiRequest.java | 14 ++ .../h2/twostep/msg/GridH2DmlRequest.java | 9 + .../h2/twostep/msg/GridH2QueryRequest.java | 11 + 60 files changed, 2105 insertions(+) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java index 81d843bf3eee0..526e2d02a8f90 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java @@ -119,11 +119,21 @@ public String schema() { return schema; } + /** */ + public void schema(String schema) { + this.schema = schema; + } + /** {@inheritDoc} */ @Override public UUID queryId() { return qryId; } + /** */ + public void queryId(UUID qryId) { + this.qryId = qryId; + } + /** * @return Registered local query ID on originating node. */ @@ -131,6 +141,21 @@ public long originatingQueryId() { return originatingQryId; } + /** */ + public void originatingQueryId(long originatingQryId) { + this.originatingQryId = originatingQryId; + } + + /** */ + public @Nullable byte[] parametersBytes() { + return paramsBytes; + } + + /** */ + public void parametersBytes(@Nullable byte[] paramsBytes) { + this.paramsBytes = paramsBytes; + } + /** {@inheritDoc} */ @Override public long fragmentId() { return fragmentDesc.fragmentId(); @@ -143,6 +168,11 @@ public FragmentDescription fragmentDescription() { return fragmentDesc; } + /** */ + public void fragmentDescription(FragmentDescription fragmentDesc) { + this.fragmentDesc = fragmentDesc; + } + /** * @return Topology version. */ @@ -150,6 +180,11 @@ public AffinityTopologyVersion topologyVersion() { return ver; } + /** */ + public void topologyVersion(AffinityTopologyVersion ver) { + this.ver = ver; + } + /** * @return Fragment plan. */ @@ -157,6 +192,11 @@ public String root() { return root; } + /** */ + public void root(String root) { + this.root = root; + } + /** * @return Total count of fragments in query for this node. */ @@ -164,6 +204,11 @@ public int totalFragmentsCount() { return totalFragmentsCnt; } + /** */ + public void totalFragmentsCount(int totalFragmentsCnt) { + this.totalFragmentsCnt = totalFragmentsCnt; + } + /** * @return Query parameters. */ @@ -187,6 +232,16 @@ public long timeout() { return timeout; } + /** */ + public void timeout(long timeout) { + this.timeout = timeout; + } + + /** */ + public void parametersBytes(long timeout) { + this.timeout = timeout; + } + /** * @return Transaction entries to mixin on query processing. */ @@ -194,11 +249,21 @@ public long timeout() { return qryTxEntries; } + /** */ + public void queryTransactionEntries(@Nullable Collection qryTxEntries) { + this.qryTxEntries = qryTxEntries; + } + /** */ public @Nullable Map applicationAttributes() { return appAttrs; } + /** */ + public void applicationAttributes(@Nullable Map appAttrs) { + this.appAttrs = appAttrs; + } + /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { if (paramsBytes == null && params != null) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java index f6f77938ae7d4..25ee72e150faa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java @@ -105,6 +105,27 @@ public boolean system() { return system; } + /** + * Gets execution ID of task to be cancelled. + */ + public void sessionId(IgniteUuid sesId) { + this.sessionId = sesId; + } + + /** + * Gets session ID of job to be cancelled. If {@code null}, then + * all jobs for the specified task execution ID will be cancelled. + */ + public void jobId(IgniteUuid jobId) { + this.jobId = jobId; + } + + /** + */ + public void system(boolean system) { + this.system = system; + } + /** {@inheritDoc} */ @Override public short directType() { return 0; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java index 089b1ad209432..e46408abcd6dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java @@ -274,6 +274,13 @@ public IgniteUuid sessionId() { return sesId; } + /** + * @param sesId New task session ID. + */ + public void sessionId(IgniteUuid sesId) { + this.sesId = sesId; + } + /** * @return Job session ID. */ @@ -281,6 +288,13 @@ public IgniteUuid jobId() { return jobId; } + /** + * @param jobId New job session ID. + */ + public void jobId(IgniteUuid jobId) { + this.jobId = jobId; + } + /** * @return Task class name. */ @@ -288,6 +302,13 @@ public String taskClassName() { return taskClsName; } + /** + * @param taskClsName New task class name. + */ + public void taskClassName(String taskClsName) { + this.taskClsName = taskClsName; + } + /** * @return Task name. */ @@ -295,6 +316,13 @@ public String taskName() { return taskName; } + /** + * @param taskName New task name. + */ + public void taskName(String taskName) { + this.taskName = taskName; + } + /** * @return Task version. */ @@ -302,6 +330,27 @@ public String userVersion() { return userVer; } + /** + * @param userVer New task version. + */ + public void userVersion(String userVer) { + this.userVer = userVer; + } + + /** + * @return Serialized job bytes. + */ + public byte[] jobBytes() { + return jobBytes; + } + + /** + * @param jobBytes New serialized job bytes. + */ + public void jobBytes(byte[] jobBytes) { + this.jobBytes = jobBytes; + } + /** * @return Grid job. */ @@ -316,6 +365,13 @@ public long startTaskTime() { return startTaskTime; } + /** + * @param startTaskTime New task start time. + */ + public void startTaskTime(long startTaskTime) { + this.startTaskTime = startTaskTime; + } + /** * @return Timeout. */ @@ -323,6 +379,13 @@ public long timeout() { return timeout; } + /** + * @param timeout New timeout. + */ + public void timeout(long timeout) { + this.timeout = timeout; + } + /** * Gets this instance creation time. * @@ -332,6 +395,20 @@ public long getCreateTime() { return createTime; } + /** + * @return Serialized collection of split siblings. + */ + public byte[] siblingsBytes() { + return siblingsBytes; + } + + /** + * @param siblingsBytes New serialized collection of split siblings. + */ + public void siblingsBytes(byte[] siblingsBytes) { + this.siblingsBytes = siblingsBytes; + } + /** * @return Job siblings. */ @@ -339,6 +416,20 @@ public Collection getSiblings() { return siblings; } + /** + * @return Serialized form of session attributes. + */ + public byte[] sessionAttributesBytes() { + return sesAttrsBytes; + } + + /** + * @param sesAttrsBytes New serialized form of session attributes. + */ + public void sessionAttributesBytes(byte[] sesAttrsBytes) { + this.sesAttrsBytes = sesAttrsBytes; + } + /** * @return Session attributes. */ @@ -346,6 +437,20 @@ public Map getSessionAttributes() { return sesAttrs; } + /** + * @return Serialized form of job attributes. + */ + public byte[] jobAttributesBytes() { + return jobAttrsBytes; + } + + /** + * @param jobAttrsBytes New serialized form of job attributes. + */ + public void jobAttributesBytes(byte[] jobAttrsBytes) { + this.jobAttrsBytes = jobAttrsBytes; + } + /** * @return Job attributes. */ @@ -360,6 +465,13 @@ public String checkpointSpi() { return cpSpi; } + /** + * @param cpSpi New checkpoint SPI name. + */ + public void checkpointSpi(String cpSpi) { + this.cpSpi = cpSpi; + } + /** * @return Task local class loader id. */ @@ -367,6 +479,13 @@ public IgniteUuid classLoaderId() { return clsLdrId; } + /** + * @param clsLdrId New task local class loader id. + */ + public void classLoaderId(IgniteUuid clsLdrId) { + this.clsLdrId = clsLdrId; + } + /** * @return Deployment mode. */ @@ -374,6 +493,29 @@ public DeploymentMode deploymentMode() { return depMode; } + /** + * @param depMode New deployment mode value. + */ + public void deploymentMode(DeploymentMode depMode) { + this.depMode = depMode; + } + + /** + * Returns true if siblings list is dynamic, i.e. task is continuous. + * + * @return True if siblings list is dynamic. + */ + public boolean dynamicSiblings() { + return dynamicSiblings; + } + + /** + * @param dynamicSiblings New dynamic siblings flag. + */ + public void dynamicSiblings(boolean dynamicSiblings) { + this.dynamicSiblings = dynamicSiblings; + } + /** * @return Node class loader participant map. */ @@ -381,6 +523,13 @@ public Map loaderParticipants() { return ldrParticipants; } + /** + * @param ldrParticipants New node class loader participant map. + */ + public void loaderParticipants(Map ldrParticipants) { + this.ldrParticipants = ldrParticipants; + } + /** * @return Returns {@code true} if deployment should always be used. */ @@ -388,6 +537,13 @@ public boolean forceLocalDeployment() { return forceLocDep; } + /** + * @param forceLocDep New local deployment forcing flag. + */ + public void forceLocalDeployment(boolean forceLocDep) { + this.forceLocDep = forceLocDep; + } + /** * @return Topology. */ @@ -395,6 +551,13 @@ public boolean forceLocalDeployment() { return top; } + /** + * @param top New topology. + */ + public void topology(@Nullable Collection top) { + this.top = top; + } + /** * @return Topology predicate. */ @@ -402,6 +565,20 @@ public IgnitePredicate getTopologyPredicate() { return topPred; } + /** + * @return Marshalled topology predicate. + */ + public byte[] topologyPredicateBytes() { + return topPredBytes; + } + + /** + * @param topPredBytes New marshalled topology predicate. + */ + public void topologyPredicateBytes(byte[] topPredBytes) { + this.topPredBytes = topPredBytes; + } + /** * @return {@code True} if session attributes are enabled. */ @@ -409,6 +586,13 @@ public boolean sessionFullSupport() { return sesFullSup; } + /** + * @param sesFullSup New flag, indicating that session attributes are enabled. + */ + public void sessionFullSupport(boolean sesFullSup) { + this.sesFullSup = sesFullSup; + } + /** * @return {@code True} if internal job. */ @@ -416,6 +600,13 @@ public boolean internal() { return internal; } + /** + * @param internal New internal job flag. + */ + public void internal(boolean internal) { + this.internal = internal; + } + /** * @return Caches' identifiers to reserve specified partition for job execution. */ @@ -423,6 +614,13 @@ public int[] cacheIds() { return cacheIds; } + /** + * @param cacheIds New cache identifiers. + */ + public void cacheIds(int[] cacheIds) { + this.cacheIds = cacheIds; + } + /** * @return Partition to lock for job execution. */ @@ -430,11 +628,25 @@ public int partition() { return part; } + /** + * @param part New partition. + */ + public void partition(int part) { + this.part = part; + } + /** {@inheritDoc} */ @Override public String executorName() { return execName; } + /** + * @param execName New executor name. + */ + public void executorName(String execName) { + this.execName = execName; + } + /** * @return Affinity version which was used to map job */ @@ -442,6 +654,13 @@ public AffinityTopologyVersion topologyVersion() { return topVer; } + /** + * @param topVer New topology version. + */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + /** {@inheritDoc} */ @Override public short directType() { return 1; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java index d14a449bb5998..672450cabd8a8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java @@ -58,6 +58,13 @@ public IgniteUuid sessionId() { return sesId; } + /** + * @param sesId New session ID. + */ + public void sessionId(IgniteUuid sesId) { + this.sesId = sesId; + } + /** * @return Topic ID. */ @@ -65,6 +72,13 @@ public long topicId() { return topicId; } + /** + * @param topicId New topic ID. + */ + public void topicId(long topicId) { + this.topicId = topicId; + } + /** {@inheritDoc} */ @Override public short directType() { return 3; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java index dba1b6af737cf..ae329423720f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java @@ -54,6 +54,13 @@ public IgniteUuid sessionId() { return sesId; } + /** + * @param sesId New session ID. + */ + public void sessionId(IgniteUuid sesId) { + this.sesId = sesId; + } + /** {@inheritDoc} */ @Override public short directType() { return 5; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java index 447c4b1112d62..c1ea1fe7bb00b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java @@ -65,6 +65,20 @@ public GridTaskSessionRequest(IgniteUuid sesId, IgniteUuid jobId, Map attr this.attrs = attrs; } + /** + * @return Changed attributes (serialized). + */ + public byte[] attributesBytes() { + return attrsBytes; + } + + /** + * @param attrsBytes Changed attributes (serialized). + */ + public void attributesBytes(byte[] attrsBytes) { + this.attrsBytes = attrsBytes; + } + /** * @return Changed attributes. */ @@ -79,6 +93,13 @@ public IgniteUuid sessionId() { return sesId; } + /** + * @param sesId Task session ID. + */ + public void sessionId(IgniteUuid sesId) { + this.sesId = sesId; + } + /** * @return Job ID. */ @@ -86,6 +107,13 @@ public IgniteUuid jobId() { return jobId; } + /** + * @param jobId Job ID. + */ + public void jobId(IgniteUuid jobId) { + this.jobId = jobId; + } + /** {@inheritDoc} */ @Override public short directType() { return 6; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java index bc733db54c0d1..ddb7d134652fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticRequest.java @@ -124,6 +124,11 @@ public UUID nodeId() { return nodeId; } + /** */ + public void nodeId(UUID nodeId) { + this.nodeId = nodeId; + } + /** * @return Future ID. */ @@ -131,11 +136,21 @@ public long futureId() { return futId; } + /** */ + public void futureId(long futId) { + this.futId = futId; + } + /** @return Compound diagnostic infos. */ public @Nullable Set infos() { return infos; } + /** Sets compound diagnostic infos. */ + public void infos(@Nullable Set infos) { + this.infos = infos; + } + /** {@inheritDoc} */ @Override public short directType() { return -61; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java index 4af14a3727da4..856d609676da0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java @@ -69,6 +69,13 @@ public IgniteUuid sessionId() { return sesId; } + /** + * @param sesId Session ID. + */ + public void sessionId(IgniteUuid sesId) { + this.sesId = sesId; + } + /** * @return Checkpoint key. */ @@ -76,6 +83,13 @@ public String key() { return key; } + /** + * @param key Checkpoint key. + */ + public void key(String key) { + this.key = key; + } + /** * @return Checkpoint SPI. */ @@ -83,6 +97,13 @@ public String checkpointSpi() { return cpSpi; } + /** + * @param cpSpi Checkpoint SPI. + */ + public void checkpointSpi(String cpSpi) { + this.cpSpi = cpSpi; + } + /** {@inheritDoc} */ @Override public short directType() { return 7; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java index 00890882e0590..fd3abb429baee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java @@ -91,6 +91,20 @@ Object responseTopic() { return resTopic; } + /** + * @return Serialized topic. + */ + public byte[] responseTopicBytes() { + return resTopicBytes; + } + + /** + * @param resTopicBytes Serialized topic. + */ + public void responseTopicBytes(byte[] resTopicBytes) { + this.resTopicBytes = resTopicBytes; + } + /** * Class name/resource name that is being requested. * @@ -100,6 +114,13 @@ public String resourceName() { return rsrcName; } + /** + * @param rsrcName Resource or class name. + */ + public void resourceName(String rsrcName) { + this.rsrcName = rsrcName; + } + /** * Gets property ldrId. * @@ -109,6 +130,13 @@ public IgniteUuid classLoaderId() { return ldrId; } + /** + * @param ldrId Property class loader ID. + */ + public void classLoaderId(IgniteUuid ldrId) { + this.ldrId = ldrId; + } + /** * Gets property undeploy. * @@ -118,6 +146,13 @@ public boolean isUndeploy() { return isUndeploy; } + /** + * @param isUndeploy Property undeploy. + */ + public void isUndeploy(boolean isUndeploy) { + this.isUndeploy = isUndeploy; + } + /** * @return Node IDs chain which is updated as request jumps * from node to node. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java index b6359952bb051..fff70b5d84166 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyRequest.java @@ -53,6 +53,13 @@ public IgniteUuid id() { return id; } + /** + * @param id New request ID. + */ + public void id(IgniteUuid id) { + this.id = id; + } + /** * @return Count of encryption key to generate. */ @@ -60,6 +67,13 @@ public int keyCount() { return keyCnt; } + /** + * @param keyCnt New key count. + */ + public void keyCount(int keyCnt) { + this.keyCnt = keyCnt; + } + /** {@inheritDoc} */ @Override public short directType() { return 162; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java index 6f3bf5f11b62e..e0e6037a8568a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java @@ -331,6 +331,13 @@ public String cacheName() { return cacheName; } + /** + * @param cacheName Cache name. + */ + public void cacheName(String cacheName) { + this.cacheName = cacheName; + } + /** * @return Near node ID. */ @@ -427,6 +434,20 @@ public void sql(boolean sql) { this.sql = sql; } + /** + * @param nodeId ID of node provided cache configuration in discovery data. + */ + public void receivedFrom(UUID nodeId) { + rcvdFrom = nodeId; + } + + /** + * @return ID of node provided cache configuration in discovery data. + */ + @Nullable public UUID receivedFrom() { + return rcvdFrom; + } + /** * @return Dynamic schema. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/StateChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/StateChangeRequest.java index 75da7b8adff7d..a0ce972da8559 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/StateChangeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/StateChangeRequest.java @@ -24,6 +24,7 @@ import org.apache.ignite.internal.processors.cluster.BaselineTopologyHistoryItem; import org.apache.ignite.internal.processors.cluster.ChangeGlobalStateMessage; import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; /** @@ -73,6 +74,13 @@ public AffinityTopologyVersion topologyVersion() { return topVer; } + /** + * @return State change message ID. + */ + public IgniteUuid id() { + return msg.id(); + } + /** * @return State change request ID. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java index b7d7e6322fcc5..9ee1dc93dcaaa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java @@ -88,6 +88,13 @@ public GridCacheTtlUpdateRequest(int cacheId, AffinityTopologyVersion topVer, lo return topVer; } + /** + * @param topVer New topology version. + */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + /** * @return TTL. */ @@ -95,6 +102,13 @@ public long ttl() { return ttl; } + /** + * @param ttl New TTL. + */ + public void ttl(long ttl) { + this.ttl = ttl; + } + /** * @param key Key. * @param ver Version. @@ -134,6 +148,13 @@ public List keys() { return keys; } + /** + * @param keys New entries keys. + */ + public void keys(List keys) { + this.keys = keys; + } + /** * @return Versions. */ @@ -141,6 +162,23 @@ public List versions() { return vers; } + /** + * @param vers New entries versions. + */ + public void versions(List vers) { + this.vers = vers; + } + + /** + * @param idx Entry index. + * @return Version. + */ + public GridCacheVersion version(int idx) { + assert idx >= 0 && idx < vers.size() : idx; + + return vers.get(idx); + } + /** * @return Keys for near cache. */ @@ -148,6 +186,13 @@ public List nearKeys() { return nearKeys; } + /** + * @param nearKeys New near entries keys. + */ + public void nearKeys(List nearKeys) { + this.nearKeys = nearKeys; + } + /** * @return Versions for near cache entries. */ @@ -155,6 +200,13 @@ public List nearVersions() { return nearVers; } + /** + * @param nearVers New near entries versions. + */ + public void nearVersions(List nearVers) { + this.nearVers = nearVers; + } + /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java index 8b48490c6bd77..250a36305c8b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java @@ -93,6 +93,13 @@ public boolean nearTxCheck() { return nearTxCheck; } + /** + * @param nearTxCheck {@code True} if should check only tx on near node. + */ + public void nearTxCheck(boolean nearTxCheck) { + this.nearTxCheck = nearTxCheck; + } + /** * @return Near version. */ @@ -100,6 +107,13 @@ public GridCacheVersion nearXidVersion() { return nearXidVer; } + /** + * @param nearXidVer Near version. + */ + public void nearXidVersion(GridCacheVersion nearXidVer) { + this.nearXidVer = nearXidVer; + } + /** * @return Future ID. */ @@ -107,6 +121,13 @@ public IgniteUuid futureId() { return futId; } + /** + * @param futId Future ID. + */ + public void futureId(IgniteUuid futId) { + this.futId = futId; + } + /** * @return Mini future ID. */ @@ -114,6 +135,13 @@ public IgniteUuid miniId() { return miniId; } + /** + * @param miniId Mini future ID. + */ + public void miniId(IgniteUuid miniId) { + this.miniId = miniId; + } + /** * @return Expected number of transactions on node. */ @@ -121,6 +149,13 @@ public int transactions() { return txNum; } + /** + * @param txNum Expected number of transactions on node. + */ + public void transactions(int txNum) { + this.txNum = txNum; + } + /** * @return System transaction flag. */ @@ -128,6 +163,13 @@ public boolean system() { return sys; } + /** + * @param sys System transaction flag. + */ + public void system(boolean sys) { + this.sys = sys; + } + /** {@inheritDoc} */ @Override public IgniteLogger messageLogger(GridCacheSharedContext ctx) { return ctx.txRecoveryMessageLogger(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java index aa7eb1c8ec747..a1b0a85ba9f6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java @@ -180,6 +180,13 @@ public UUID nodeId() { return nodeId; } + /** + * @param nodeId Node ID. + */ + public void nodeId(UUID nodeId) { + this.nodeId = nodeId; + } + /** * @return Near transaction ID. */ @@ -187,6 +194,13 @@ public GridCacheVersion nearXidVersion() { return nearXidVer; } + /** + * @param nearXidVer Near transaction ID. + */ + public void nearXidVersion(GridCacheVersion nearXidVer) { + this.nearXidVer = nearXidVer; + } + /** * @return Owner node thread ID. */ @@ -194,6 +208,13 @@ public long threadId() { return threadId; } + /** + * @param threadId Owner node thread ID. + */ + public void threadId(long threadId) { + this.threadId = threadId; + } + /** * @return Future ID. */ @@ -201,6 +222,13 @@ public IgniteUuid futureId() { return futId; } + /** + * @param futId Future ID. + */ + public void futureId(IgniteUuid futId) { + this.futId = futId; + } + /** * @return {@code True} if implicit transaction lock. */ @@ -208,6 +236,13 @@ public boolean inTx() { return isInTx; } + /** + * @param isInTx {@code True} if implicit transaction lock. + */ + public void inTx(boolean isInTx) { + this.isInTx = isInTx; + } + /** * @return Invalidate flag. */ @@ -215,6 +250,13 @@ public boolean isInvalidate() { return isInvalidate; } + /** + * @param isInvalidate Invalidate flag. + */ + public void isInvalidate(boolean isInvalidate) { + this.isInvalidate = isInvalidate; + } + /** * @return {@code True} if lock is implicit and for a read operation. */ @@ -222,6 +264,13 @@ public boolean txRead() { return isRead; } + /** + * @param isRead {@code True} if lock is implicit and for a read operation. + */ + public void txRead(boolean isRead) { + this.isRead = isRead; + } + /** * @param idx Key index. * @return Flag indicating whether a value should be returned. @@ -230,6 +279,20 @@ public boolean returnValue(int idx) { return retVals[idx]; } + /** + * @return Array indicating whether value should be returned for a key. + */ + public boolean[] returnValues() { + return retVals; + } + + /** + * @param retVals Array indicating whether value should be returned for a key. + */ + public void returnValues(boolean[] retVals) { + this.retVals = retVals; + } + /** * Sets skip store flag value. * @@ -300,6 +363,13 @@ public TransactionIsolation isolation() { return isolation; } + /** + * @param isolation Transaction isolation level. + */ + public void isolation(TransactionIsolation isolation) { + this.isolation = isolation; + } + /** * @return Tx size. */ @@ -307,6 +377,13 @@ public int txSize() { return txSize; } + /** + * @param txSize Tx size. + */ + public void txSize(int txSize) { + this.txSize = txSize; + } + /** * Adds a key. * @@ -331,6 +408,13 @@ public List keys() { return keys; } + /** + * @param keys Unmarshalled keys. + */ + public void keys(List keys) { + this.keys = keys; + } + /** {@inheritDoc} */ @Override public int partition() { return keys != null && !keys.isEmpty() ? keys.get(0).partition() : -1; @@ -343,6 +427,27 @@ public long timeout() { return timeout; } + /** + * @param timeout Max lock wait time. + */ + public void timeout(long timeout) { + this.timeout = timeout; + } + + /** + * @return Flags. + */ + public byte flags() { + return flags; + } + + /** + * @param flags Flags. + */ + public void flags(byte flags) { + this.flags = flags; + } + /** {@inheritDoc} */ @Override public IgniteLogger messageLogger(GridCacheSharedContext ctx) { return ctx.txLockMessageLogger(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java index 3528473dd3f08..ad3fd2704a88b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java @@ -165,6 +165,13 @@ public GridDistributedTxFinishRequest( return syncMode; } + /** + * @param syncMode Transaction write synchronization mode. + */ + public void syncMode(CacheWriteSynchronizationMode syncMode) { + this.syncMode = syncMode; + } + /** * Sets flag mask. * @@ -185,6 +192,20 @@ protected final boolean isFlag(int mask) { return (flags & mask) != 0; } + /** + * @return Task name hash. + */ + public final int taskNameHash() { + return taskNameHash; + } + + /** + * @param taskNameHash Task name hash. + */ + public void taskNameHash(int taskNameHash) { + this.taskNameHash = taskNameHash; + } + /** * @return Topology version. */ @@ -192,6 +213,13 @@ protected final boolean isFlag(int mask) { return topVer; } + /** + * @param topVer Topology version. + */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + /** * @return IO policy. */ @@ -199,6 +227,13 @@ public byte policy() { return plc; } + /** + * @param plc IO policy. + */ + public void policy(byte plc) { + this.plc = plc; + } + /** * @return Future ID. */ @@ -206,6 +241,13 @@ public IgniteUuid futureId() { return futId; } + /** + * @param futId Future ID. + */ + public void futureId(IgniteUuid futId) { + this.futId = futId; + } + /** * @return Thread ID. */ @@ -213,6 +255,13 @@ public long threadId() { return threadId; } + /** + * @param threadId Thread ID. + */ + public void threadId(long threadId) { + this.threadId = threadId; + } + /** * @return Commit version. */ @@ -220,6 +269,13 @@ public GridCacheVersion commitVersion() { return commitVer; } + /** + * @param commitVer Commit version. + */ + public void commitVersion(GridCacheVersion commitVer) { + this.commitVer = commitVer; + } + /** * @return Commit flag. */ @@ -227,6 +283,13 @@ public boolean commit() { return commit; } + /** + * @param commit Commit flag. + */ + public void commit(boolean commit) { + this.commit = commit; + } + /** * * @return Invalidate flag. @@ -235,6 +298,13 @@ public boolean isInvalidate() { return invalidate; } + /** + * @param invalidate Invalidate flag. + */ + public void isInvalidate(boolean invalidate) { + this.invalidate = invalidate; + } + /** * @return Base version. */ @@ -242,6 +312,27 @@ public GridCacheVersion baseVersion() { return baseVer; } + /** + * @param baseVer Base version. + */ + public void baseVersion(GridCacheVersion baseVer) { + this.baseVer = baseVer; + } + + /** + * @return Flags. + */ + public byte flags() { + return flags; + } + + /** + * @param flags Flags. + */ + public void flags(byte flags) { + this.flags = flags; + } + /** * * @return {@code True} if reply is required. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index 379fc9bcd1708..6de8034d6903d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -250,6 +250,13 @@ public byte policy() { return plc; } + /** + * @param plc IO policy. + */ + public void policy(byte plc) { + this.plc = plc; + } + /** * Adds version to be verified on remote node. * @@ -277,6 +284,13 @@ public long threadId() { return threadId; } + /** + * @param threadId Thread ID. + */ + public void threadId(long threadId) { + this.threadId = threadId; + } + /** * @return Commit version. */ @@ -284,6 +298,13 @@ public GridCacheVersion writeVersion() { return writeVer; } + /** + * @param writeVer Commit version. + */ + public void writeVersion(GridCacheVersion writeVer) { + this.writeVer = writeVer; + } + /** * @return Invalidate flag. */ @@ -298,6 +319,13 @@ public long timeout() { return timeout; } + /** + * @param timeout Transaction timeout. + */ + public void timeout(long timeout) { + this.timeout = timeout; + } + /** * @return Concurrency. */ @@ -305,6 +333,13 @@ public TransactionConcurrency concurrency() { return concurrency; } + /** + * @param concurrency Concurrency. + */ + public void concurrency(TransactionConcurrency concurrency) { + this.concurrency = concurrency; + } + /** * @return Isolation level. */ @@ -312,6 +347,13 @@ public TransactionIsolation isolation() { return isolation; } + /** + * @param isolation Isolation level. + */ + public void isolation(TransactionIsolation isolation) { + this.isolation = isolation; + } + /** * @return Read set. */ @@ -340,6 +382,34 @@ public void writes(Collection writes) { this.writes = writes; } + /** + * @return DHT version keys. + */ + public Collection dhtVersionKeys() { + return dhtVerKeys; + } + + /** + * @param dhtVerKeys DHT version keys. + */ + public void dhtVersionKeys(Collection dhtVerKeys) { + this.dhtVerKeys = dhtVerKeys; + } + + /** + * @return DHT version values. + */ + public Collection dhtVersionValues() { + return dhtVerVals; + } + + /** + * @param dhtVerVals DHT version values. + */ + public void dhtVersionValues(Collection dhtVerVals) { + this.dhtVerVals = dhtVerVals; + } + /** * @return Expected transaction size. */ @@ -347,6 +417,41 @@ public int txSize() { return txSize; } + /** + * @param txSize Expected transaction size. + */ + public void txSize(int txSize) { + this.txSize = txSize; + } + + /** + * @return Tx nodes direct marshallable message. + */ + public Map txNodesMessages() { + return txNodesMsg; + } + + /** + * @param txNodesMsg Tx nodes direct marshallable message. + */ + public void txNodesMessages(Map txNodesMsg) { + this.txNodesMsg = txNodesMsg; + } + + /** + * @return Flags. + */ + public byte flags() { + return flags; + } + + /** + * @param flags Flags. + */ + public void flags(byte flags) { + this.flags = flags; + } + /** * @return One phase commit flag. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java index 152f6f75893b2..9e4a2de3b0348 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java @@ -54,6 +54,13 @@ public GridNearUnlockRequest(int cacheId, int keyCnt, boolean addDepInfo) { this.cacheId = cacheId; } + /** + * Sets the keys + */ + public void keys(List keys) { + this.keys = keys; + } + /** * @return Keys. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java index d2ebcb9835ba1..3bcb6532ec220 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java @@ -69,6 +69,20 @@ public GridDhtAffinityAssignmentRequest( flags |= SND_PART_STATE_MASK; } + /** + * @return Flags. + */ + public byte flags() { + return flags; + } + + /** + * @param flags Flags. + */ + public void flags(byte flags) { + this.flags = flags; + } + /** * @return {@code True} if need send in response cache partitions state. */ @@ -83,6 +97,13 @@ public long futureId() { return futId; } + /** + * @param futId Future ID. + */ + public void futureId(long futId) { + this.futId = futId; + } + /** {@inheritDoc} */ @Override public boolean addDeploymentInfo() { return false; @@ -100,6 +121,13 @@ public long futureId() { return topVer; } + /** + * @param topVer Requested topology version. + */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + /** {@inheritDoc} */ @Override public short directType() { return 28; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index 6deb563f671d8..067dc4d0d1f8c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@ -178,6 +178,13 @@ public int taskNameHash() { return taskNameHash; } + /** + * @param taskNameHash Task name hash. + */ + public void taskNameHash(int taskNameHash) { + this.taskNameHash = taskNameHash; + } + /** * @return Topology version. */ @@ -185,6 +192,69 @@ public int taskNameHash() { return topVer; } + /** + * @param topVer Topology version. + */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + + /** + * @return Invalidate reader flags. + */ + public BitSet invalidateEntries() { + return invalidateEntries; + } + + /** + * @param invalidateEntries Invalidate reader flags. + */ + public void invalidateEntries(BitSet invalidateEntries) { + this.invalidateEntries = invalidateEntries; + } + + /** + * @return Array of keys from {@link #owned}. Used during marshalling and unmarshalling. + */ + public KeyCacheObject[] ownedKeys() { + return ownedKeys; + } + + /** + * @param ownedKeys Array of keys from {@link #owned}. Used during marshalling and unmarshalling. + */ + public void ownedKeys(KeyCacheObject[] ownedKeys) { + this.ownedKeys = ownedKeys; + } + + /** + * @return Array of values from {@link #owned}. Used during marshalling and unmarshalling. + */ + public GridCacheVersion[] ownedValues() { + return ownedValues; + } + + /** + * @param ownedValues Array of values from {@link #owned}. Used during marshalling and unmarshalling. + */ + public void ownedValues(GridCacheVersion[] ownedValues) { + this.ownedValues = ownedValues; + } + + /** + * @return Indexes of keys needed to be preloaded. + */ + public BitSet preloadKeys() { + return preloadKeys; + } + + /** + * @param preloadKeys Indexes of keys needed to be preloaded. + */ + public void preloadKeys(BitSet preloadKeys) { + this.preloadKeys = preloadKeys; + } + /** * Adds a DHT key. * @@ -245,6 +315,13 @@ public IgniteUuid miniId() { return miniId; } + /** + * @param miniId Mini ID. + */ + public void miniId(IgniteUuid miniId) { + this.miniId = miniId; + } + /** * @return TTL for read operation. */ @@ -252,6 +329,13 @@ public long accessTtl() { return accessTtl; } + /** + * @param accessTtl TTL for read operation. + */ + public void accessTtl(long accessTtl) { + this.accessTtl = accessTtl; + } + /** * @return Transaction label. */ @@ -259,6 +343,13 @@ public long accessTtl() { return txLbl; } + /** + * @param txLbl Transaction label. + */ + public void txLabel(String txLbl) { + this.txLbl = txLbl; + } + /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index d6e5b22b60a82..409ee4f24eb41 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -131,6 +131,13 @@ public int miniId() { return miniId; } + /** + * @param miniId Mini ID. + */ + public void miniId(int miniId) { + this.miniId = miniId; + } + /** * @return Near node ID. */ @@ -138,6 +145,13 @@ public UUID nearNodeId() { return nearNodeId; } + /** + * @param nearNodeId Near node ID. + */ + public void nearNodeId(UUID nearNodeId) { + this.nearNodeId = nearNodeId; + } + /** * @return System invalidate flag. */ @@ -201,6 +215,13 @@ public Collection updateCounters() { return updCntrs; } + /** + * @param updCntrs Partition counters update deferred until transaction commit. + */ + public void updateCounters(Collection updCntrs) { + this.updCntrs = updCntrs; + } + /** {@inheritDoc} */ @Override public short directType() { return 32; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java index 3fbd909658b67..189b4f22b93b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java @@ -55,6 +55,13 @@ public Collection versions() { return vers; } + /** + * @param vers Lock or transaction versions. + */ + public void versions(Collection vers) { + this.vers = vers; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(GridDhtTxOnePhaseCommitAckRequest.class, this, super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java index 06300deeaec6a..211a662a84825 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java @@ -190,6 +190,13 @@ public Collection updateCounters() { return updCntrs; } + /** + * @param updCntrs Update counters list. + */ + public void updateCounters(Collection updCntrs) { + this.updCntrs = updCntrs; + } + /** * @return Near cache writes for which cache was not found (possible if client near cache was closed). */ @@ -204,6 +211,13 @@ public GridCacheVersion nearXidVersion() { return nearXidVer; } + /** + * @param nearXidVer Near transaction ID. + */ + public void nearXidVersion(GridCacheVersion nearXidVer) { + this.nearXidVer = nearXidVer; + } + /** * @return Near node ID. */ @@ -211,6 +225,27 @@ public UUID nearNodeId() { return nearNodeId; } + /** + * @param nodeId Near node ID. + */ + public void nearNodeId(UUID nodeId) { + nearNodeId = nodeId; + } + + /** + * @return Invalidate near entries flags. + */ + public BitSet invalidateNearEntries() { + return invalidateNearEntries; + } + + /** + * @param invalidateNearEntries Invalidate near entries flags. + */ + public void invalidateNearEntries(BitSet invalidateNearEntries) { + this.invalidateNearEntries = invalidateNearEntries; + } + /** * @return Task name hash. */ @@ -218,6 +253,13 @@ public int taskNameHash() { return taskNameHash; } + /** + * @param taskNameHash Task name hash. + */ + public void taskNameHash(int taskNameHash) { + this.taskNameHash = taskNameHash; + } + /** * @return Near writes. */ @@ -225,6 +267,13 @@ public Collection nearWrites() { return nearWrites == null ? Collections.emptyList() : nearWrites; } + /** + * @param nearWrites Near writes. + */ + public void nearWrites(Collection nearWrites) { + this.nearWrites = nearWrites; + } + /** * @param idx Entry index to set invalidation flag. * @param invalidate Invalidation flag value. @@ -270,6 +319,13 @@ public IgniteUuid futureId() { return futId; } + /** + * @param futId Future ID. + */ + public void futureId(IgniteUuid futId) { + this.futId = futId; + } + /** * @return Mini future ID. */ @@ -277,6 +333,13 @@ public int miniId() { return miniId; } + /** + * @param miniId Mini future ID. + */ + public void miniId(int miniId) { + this.miniId = miniId; + } + /** * @return Topology version. */ @@ -284,6 +347,55 @@ public int miniId() { return topVer; } + /** + * @param topVer Topology version. + */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + + /** + * @return Owned keys. + */ + public Collection ownedKeys() { + return ownedKeys; + } + + /** + * @param ownedKeys Owned keys. + */ + public void ownedKeys(Collection ownedKeys) { + this.ownedKeys = ownedKeys; + } + + /** + * @return Owned values. + */ + public Collection ownedValues() { + return ownedVals; + } + + /** + * @param ownedVals Owned values. + */ + public void ownedValues(Collection ownedVals) { + this.ownedVals = ownedVals; + } + + /** + * @return Preload keys. + */ + public BitSet preloadKeys() { + return preloadKeys; + } + + /** + * @param preloadKeys Preload keys. + */ + public void preloadKeys(BitSet preloadKeys) { + this.preloadKeys = preloadKeys; + } + /** * Sets owner and its mapped version. * @@ -311,6 +423,13 @@ public boolean skipCompletedVersion() { return skipCompletedVers; } + /** + * @param skipCompletedVers {@code True} if remote tx should skip adding itself to completed versions map on finish. + */ + public void skipCompletedVersion(boolean skipCompletedVers) { + this.skipCompletedVers = skipCompletedVers; + } + /** * @return Transaction label. */ @@ -318,6 +437,13 @@ public boolean skipCompletedVersion() { return txLbl; } + /** + * @param txLbl Transaction label. + */ + public void txLabel(String txLbl) { + this.txLbl = txLbl; + } + /** * {@inheritDoc} * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java index eebee53b53e87..6f6a65082d0d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java @@ -50,6 +50,13 @@ public GridDhtUnlockRequest(int cacheId, int dhtCnt, boolean addDepInfo) { super(cacheId, dhtCnt, addDepInfo); } + /** + * Sets the near. + */ + public void nearKeys(List nearKeys) { + this.nearKeys = nearKeys; + } + /** * @return Near keys. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java index b5c01c8950802..189aafe36c95a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/TransactionAttributesAwareRequest.java @@ -55,11 +55,21 @@ public GridDistributedTxPrepareRequest payload() { return payload; } + /** @param payload Original update message. */ + public void payload(GridDistributedTxPrepareRequest payload) { + this.payload = payload; + } + /** @return Application attributes. */ public Map applicationAttributes() { return appAttrs; } + /** @param appAttrs Application attributes. */ + public void applicationAttributes(Map appAttrs) { + this.appAttrs = appAttrs; + } + /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { payload.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java index 6b44d9dec5ea9..dac5d7ccde67a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicApplicationAttributesAwareRequest.java @@ -55,11 +55,21 @@ public GridNearAtomicAbstractUpdateRequest payload() { return payload; } + /** @param payload Original update message. */ + public void payload(GridNearAtomicAbstractUpdateRequest payload) { + this.payload = payload; + } + /** @return Application attributes. */ public Map applicationAttributes() { return appAttrs; } + /** @param appAttrs Application attributes. */ + public void applicationAttributes(Map appAttrs) { + this.appAttrs = appAttrs; + } + /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { payload.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java index b13bac3c793f7..380c43e3854e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java @@ -142,6 +142,13 @@ protected GridDhtAtomicAbstractUpdateRequest(int cacheId, return topVer; } + /** + * @param topVer New topology version. + */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + /** * @param nearNodeId Near node ID. * @param nearFutId Future ID on near node. @@ -174,6 +181,13 @@ public UUID nearNodeId() { return nearNodeId; } + /** + * @param nearNodeId New near node id. + */ + public void nearNodeId(UUID nearNodeId) { + this.nearNodeId = nearNodeId; + } + /** {@inheritDoc} */ @Override public int lookupIndex() { return CACHE_MSG_IDX; @@ -193,6 +207,13 @@ public final byte flags() { return flags; } + /** + * @param flags New additional flags. + */ + public void flags(byte flags) { + this.flags = flags; + } + /** * @return Keep binary flag. */ @@ -298,6 +319,13 @@ public final int taskNameHash() { return taskNameHash; } + /** + * @param taskNameHash New task name hash. + */ + public void taskNameHash(int taskNameHash) { + this.taskNameHash = taskNameHash; + } + /** * @return Future ID on primary node. */ @@ -305,6 +333,13 @@ public final long futureId() { return futId; } + /** + * @param futId New future ID on primary node. + */ + public void futureId(long futId) { + this.futId = futId; + } + /** * @return Future ID on near node. */ @@ -312,6 +347,13 @@ public final long nearFutureId() { return nearFutId; } + /** + * @param nearFutId New near future id. + */ + public void nearFutureId(long nearFutId) { + this.nearFutId = nearFutId; + } + /** * @return Write version. */ @@ -319,6 +361,13 @@ public final GridCacheVersion writeVersion() { return writeVer; } + /** + * @param writeVer New write version. + */ + public void writeVersion(GridCacheVersion writeVer) { + this.writeVer = writeVer; + } + /** * @return Keys size. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java index cc39e3a54e921..99e61a6c74b04 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java @@ -215,6 +215,11 @@ public boolean nearCache() { return isFlag(NEAR_CACHE_FLAG_MASK); } + /** Sets new topology version. */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + /** {@inheritDoc} */ @Override public final AffinityTopologyVersion topologyVersion() { return topVer; @@ -272,6 +277,27 @@ public int taskNameHash() { return taskNameHash; } + /** + * Sets task name hash code. + */ + public void taskNameHash(int taskNameHash) { + this.taskNameHash = taskNameHash; + } + + /** + * @return Compressed boolean flags. + */ + public short flags() { + return flags; + } + + /** + * @param flags New compressed boolean flags. + */ + public void flags(short flags) { + this.flags = flags; + } + /** * @return Cache update operation. */ @@ -279,11 +305,25 @@ public GridCacheOperation operation() { return op; } + /** + * @param op Cache update operation. + */ + public void operation(GridCacheOperation op) { + this.op = op; + } + /** @return Write synchronization mode. */ public CacheWriteSynchronizationMode writeSynchronizationMode() { return syncMode; } + /** + * @param syncMode Write synchronization mode. + */ + public void writeSynchronizationMode(CacheWriteSynchronizationMode syncMode) { + this.syncMode = syncMode; + } + /** * @return Target node ID. */ @@ -298,6 +338,13 @@ public long futureId() { return futId; } + /** + * Sets near node future ID. + */ + public void futureId(long futId) { + this.futId = futId; + } + /** * @param res Response. * @return {@code True} if current response was {@code null}. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java index ff6fead509a48..e288b13eb6f73 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java @@ -67,6 +67,14 @@ public final long futureId() { return futId; } + /** + * @param futId Future ID on near node. + */ + public void futureId(long futId) { + this.futId = futId; + } + + /** * @return Related update request. */ @@ -79,6 +87,13 @@ GridNearAtomicAbstractUpdateRequest updateRequest() { return partId; } + /** + * @param partId Partition ID this message is targeted to or {@code -1} if it cannot be determined. + */ + public void partition(int partId) { + this.partId = partId; + } + /** {@inheritDoc} */ @Override public int lookupIndex() { return CACHE_MSG_IDX; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java index 32f6332305eff..8a215625f077c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java @@ -89,6 +89,16 @@ public GridNearAtomicSingleUpdateFilterRequest() { this.filter = filter; } + /** */ + public void filter(CacheEntryPredicate[] filter) { + this.filter = filter; + } + + /** {@inheritDoc} */ + @Override @Nullable public CacheEntryPredicate[] filter() { + return filter; + } + /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java index 3110cf9e3f5ec..f1b329ea99e49 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java @@ -162,6 +162,26 @@ public GridNearAtomicSingleUpdateInvokeRequest() { return invokeArgs; } + /** */ + public @Nullable byte[] entryProcessorBytes() { + return entryProcBytes; + } + + /** */ + public void entryProcessorBytes(@Nullable byte[] entryProcBytes) { + this.entryProcBytes = entryProcBytes; + } + + /** */ + public @Nullable List invokeArgumentsBytes() { + return invokeArgsBytes; + } + + /** */ + public void invokeArgumentsBytes(@Nullable List invokeArgsBytes) { + this.invokeArgsBytes = invokeArgsBytes; + } + /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java index 8c7a6fbc5e575..7da56fdb284fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java @@ -145,6 +145,20 @@ public GridNearAtomicSingleUpdateRequest() { return Collections.singletonList(key); } + /** + * @param key Key to update. + */ + public void key(KeyCacheObject key) { + this.key = key; + } + + /** + * @return Key to update. + */ + public KeyCacheObject key() { + return key; + } + /** {@inheritDoc} */ @Override public KeyCacheObject key(int idx) { assert idx == 0 : idx; @@ -157,6 +171,20 @@ public GridNearAtomicSingleUpdateRequest() { return Collections.singletonList(val); } + /** + * @return Cache object value to update. + */ + public CacheObject value() { + return val; + } + + /** + * @param val Cache object value to update. + */ + public void value(CacheObject val) { + this.val = val; + } + /** {@inheritDoc} */ @Override public CacheObject value(int idx) { assert idx == 0 : idx; 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 e780c631a2d2f..7c323a019b77a 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 @@ -95,6 +95,13 @@ public IgniteUuid futureId() { return futId; } + /** + * @param futId Future ID. + */ + public void futureId(IgniteUuid futId) { + this.futId = futId; + } + /** * @return Mini-future ID. */ @@ -102,6 +109,13 @@ public IgniteUuid miniId() { return miniId; } + /** + * @param miniId Mini-future ID. + */ + public void miniId(IgniteUuid miniId) { + this.miniId = miniId; + } + /** * @return Keys. */ @@ -109,6 +123,13 @@ public Collection keys() { return keys; } + /** + * @param keys Keys. + */ + public void keys(Collection keys) { + this.keys = keys; + } + /** * @return Topology version for which keys are requested. */ @@ -116,6 +137,13 @@ public Collection keys() { return topVer; } + /** + * @param topVer Topology version for which keys are requested. + */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java index ada0395b13117..8f6a3ab87643c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java @@ -65,6 +65,13 @@ public GridDhtPartitionExchangeId restoreExchangeId() { return restoreExchId; } + /** + * @param restoreExchId ID of current exchange on new coordinator. + */ + public void restoreExchangeId(GridDhtPartitionExchangeId restoreExchId) { + this.restoreExchId = restoreExchId; + } + /** {@inheritDoc} */ @Override public short directType() { return 48; 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 d5a62826e9280..3c17e4192a487 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 @@ -193,6 +193,13 @@ public IgniteUuid futureId() { return futId; } + /** + * @param futId Future ID. + */ + public void futureId(IgniteUuid futId) { + this.futId = futId; + } + /** * @return Sub ID. */ @@ -200,6 +207,13 @@ public IgniteUuid miniId() { return miniId; } + /** + * @param miniId Sub ID. + */ + public void miniId(IgniteUuid miniId) { + this.miniId = miniId; + } + /** * Gets task name hash. * @@ -209,11 +223,25 @@ public int taskNameHash() { return taskNameHash; } + /** + * @param taskNameHash Task name hash. + */ + public void taskNameHash(int taskNameHash) { + this.taskNameHash = taskNameHash; + } + /** {@inheritDoc} */ @Override public GridCacheVersion version() { return ver; } + /** + * @param ver Version. + */ + public void version(GridCacheVersion ver) { + this.ver = ver; + } + /** * @return Keys. */ @@ -221,6 +249,48 @@ public LinkedHashMap keyMap() { return keyMap; } + /** + * @return Keys. + */ + public List keys() { + return keys; + } + + /** + * @param keys Keys. + */ + public void keys(List keys) { + this.keys = keys; + } + + /** + * @return Readers flags. + */ + public List readersFlags() { + return readersFlags; + } + + /** + * @param readersFlags Readers flags. + */ + public void readersFlags(List readersFlags) { + this.readersFlags = readersFlags; + } + + /** + * @return Flags. + */ + public byte flags() { + return flags; + } + + /** + * @param flags Flags. + */ + public void flags(byte flags) { + this.flags = flags; + } + /** * @return Read through flag. */ @@ -255,6 +325,13 @@ public boolean addReaders() { return topVer; } + /** + * @param topVer Topology version. + */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + /** * @return New TTL to set after entry is created, -1 to leave unchanged. */ @@ -262,6 +339,13 @@ public long createTtl() { return createTtl; } + /** + * @param createTtl New TTL to set after entry is created, -1 to leave unchanged. + */ + public void createTtl(long createTtl) { + this.createTtl = createTtl; + } + /** * @return New TTL to set after entry is accessed, -1 to leave unchanged. */ @@ -269,6 +353,13 @@ public long accessTtl() { return accessTtl; } + /** + * @param accessTtl New TTL to set after entry is accessed, -1 to leave unchanged. + */ + public void accessTtl(long accessTtl) { + this.accessTtl = accessTtl; + } + /** {@inheritDoc} */ @Override public int partition() { return keys != null && !keys.isEmpty() ? keys.get(0).partition() : -1; @@ -283,6 +374,13 @@ public long accessTtl() { return txLbl; } + /** + * @param txLbl Possible transaction label. + */ + public void txLabel(String txLbl) { + this.txLbl = txLbl; + } + /** * @param ctx Cache context. * @throws IgniteCheckedException If failed. 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 71e5187653b15..8052e926d7bca 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 @@ -228,6 +228,13 @@ public int taskNameHash() { return taskNameHash; } + /** + * @param taskNameHash Task name hash. + */ + public void taskNameHash(int taskNameHash) { + this.taskNameHash = taskNameHash; + } + /** * @return Sync commit flag. */ @@ -270,6 +277,20 @@ public void addKeyBytes(KeyCacheObject key, boolean retVal, @Nullable GridCacheV addKeyBytes(key, retVal); } + /** + * @return Array of mapped DHT versions for this entry. + */ + public GridCacheVersion[] dhtVersions() { + return dhtVers; + } + + /** + * @param dhtVers Array of mapped DHT versions for this entry. + */ + public void dhtVersions(GridCacheVersion[] dhtVers) { + this.dhtVers = dhtVers; + } + /** * @param idx Index of the key. * @return DHT version for key at given index. @@ -285,6 +306,13 @@ public long createTtl() { return createTtl; } + /** + * @param createTtl New TTL to set after entry is created, -1 to leave unchanged. + */ + public void createTtl(long createTtl) { + this.createTtl = createTtl; + } + /** * @return TTL for read operation. */ @@ -292,6 +320,27 @@ public long accessTtl() { return accessTtl; } + /** + * @param accessTtl TTL for read operation. + */ + public void accessTtl(long accessTtl) { + this.accessTtl = accessTtl; + } + + /** + * @return Flags. + */ + public byte nearFlags() { + return flags; + } + + /** + * @param flags Flags. + */ + public void nearFlags(byte flags) { + this.flags = flags; + } + /** * @return Transaction label. */ @@ -299,6 +348,13 @@ public long accessTtl() { return txLbl; } + /** + * @param txLbl Transaction label. + */ + public void txLabel(String txLbl) { + this.txLbl = txLbl; + } + /** {@inheritDoc} */ @Override public short directType() { return 51; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java index 485bdc360468c..15979629207ad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java @@ -150,6 +150,13 @@ public GridNearSingleGetRequest( flags |= RECOVERY_FLAG_MASK; } + /** + * Sets the key. + */ + public void key(KeyCacheObject key) { + this.key = key; + } + /** * @return Key. */ @@ -157,6 +164,23 @@ public KeyCacheObject key() { return key; } + /** Sets the flags. */ + public void flags(byte flags) { + this.flags = flags; + } + + /** @return Flags. */ + public byte flags() { + return flags; + } + + /** + * Sets future ID. + */ + public void futureId(long futId) { + this.futId = futId; + } + /** * @return Future ID. */ @@ -164,6 +188,13 @@ public long futureId() { return futId; } + /** + * Sets task name hash. + */ + public void taskNameHash(int taskNameHash) { + this.taskNameHash = taskNameHash; + } + /** * Gets task name hash. * @@ -173,6 +204,13 @@ public int taskNameHash() { return taskNameHash; } + /** + * Sets topology version. + */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + /** * @return Topology version. */ @@ -180,6 +218,13 @@ public int taskNameHash() { return topVer; } + /** + * Sets TTL to set after entry is created, -1 to leave unchanged. + */ + public void createTtl(long createTtl) { + this.createTtl = createTtl; + } + /** * @return New TTL to set after entry is created, -1 to leave unchanged. */ @@ -187,6 +232,13 @@ public long createTtl() { return createTtl; } + /** + * Sets new TTL to set after entry is accessed, -1 to leave unchanged. + */ + public void accessTtl(long accessTtl) { + this.accessTtl = accessTtl; + } + /** * @return New TTL to set after entry is accessed, -1 to leave unchanged. */ @@ -201,6 +253,13 @@ public long accessTtl() { return key.partition(); } + /** + * Sets the transaction label. + */ + public void txLabel(String txLbl) { + this.txLbl = txLbl; + } + /** * Get transaction label (may be null). * 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 ebc08f48fe9f4..1d82458b17207 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 @@ -132,6 +132,15 @@ public int miniId() { return miniId; } + /** + * For use only in GridNearTxFinishRequestSerializer. + * + * @param miniId Mini future ID. + */ + public void miniId(int miniId) { + this.miniId = miniId; + } + /** * @param miniId Mini future ID. */ 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 700c797dc9794..940ee0f1f2aa3 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 @@ -164,6 +164,20 @@ public boolean allowWaitTopologyFuture() { return isFlag(ALLOW_WAIT_TOP_FUT_FLAG_MASK); } + /** + * @return Recovery flag. + */ + public final boolean recovery() { + return isFlag(RECOVERY_FLAG_MASK); + } + + /** + * @param val Recovery flag. + */ + public void recovery(boolean val) { + setFlag(val, RECOVERY_FLAG_MASK); + } + /** * @return {@code True} if first optimistic tx prepare request sent from client node. */ @@ -185,6 +199,13 @@ public IgniteUuid futureId() { return futId; } + /** + * @param futId Future ID. + */ + public void futureId(IgniteUuid futId) { + this.futId = futId; + } + /** * @return Mini future ID. */ @@ -206,6 +227,13 @@ public int taskNameHash() { return taskNameHash; } + /** + * @param taskNameHash Task name hash. + */ + public void taskNameHash(int taskNameHash) { + this.taskNameHash = taskNameHash; + } + /** * @return Implicit single flag. */ @@ -227,6 +255,13 @@ public final boolean explicitLock() { return topVer; } + /** + * @param topVer Topology version. + */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + /** * @return Transaction label. */ @@ -234,6 +269,27 @@ public final boolean explicitLock() { return txLbl; } + /** + * @param txLbl Transaction label. + */ + public void txLabel(String txLbl) { + this.txLbl = txLbl; + } + + /** + * @return Flags. + */ + public byte nearFlags() { + return flags; + } + + /** + * @param flags Flags. + */ + public void nearFlags(byte flags) { + this.flags = flags; + } + /** * */ 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 3e0c95009739d..129bb1e4c3240 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 @@ -524,6 +524,13 @@ public long id() { return id; } + /** + * @param id Request ID. + */ + public void id(long id) { + this.id = id; + } + /** * @return Cache name. */ @@ -531,6 +538,13 @@ public String cacheName() { return cacheName; } + /** + * @param cacheName Cache name. + */ + public void cacheName(String cacheName) { + this.cacheName = cacheName; + } + /** * @return Query type. */ @@ -538,6 +552,13 @@ public GridCacheQueryType type() { return type; } + /** + * @param type Query type. + */ + public void type(GridCacheQueryType type) { + this.type = type; + } + /** * @return Query limit. */ @@ -545,6 +566,13 @@ public int limit() { return limit; } + /** + * @param limit Limit. + */ + public void limit(int limit) { + this.limit = limit; + } + /** * @return Query clause. */ @@ -552,6 +580,13 @@ public String clause() { return clause; } + /** + * @param clause Query clause. + */ + public void clause(String clause) { + this.clause = clause; + } + /** * @return Index query description. */ @@ -566,6 +601,13 @@ public String className() { return clsName; } + /** + * @param clsName Class name. + */ + public void className(String clsName) { + this.clsName = clsName; + } + /** * @return Flag indicating whether to include backups. */ @@ -573,6 +615,13 @@ public boolean includeBackups() { return incBackups; } + /** + * @param incBackups Flag indicating whether to include backups. + */ + public void includeBackups(boolean incBackups) { + this.incBackups = incBackups; + } + /** * @return Flag indicating that this is cancel request. */ @@ -580,6 +629,13 @@ public boolean cancel() { return cancel; } + /** + * @param cancel Flag indicating that this is cancel request. + */ + public void cancel(boolean cancel) { + this.cancel = cancel; + } + /** * @return Key-value filter. */ @@ -608,6 +664,13 @@ public int pageSize() { return pageSize; } + /** + * @param pageSize Page size. + */ + public void pageSize(int pageSize) { + this.pageSize = pageSize; + } + /** * @return Arguments. */ @@ -622,6 +685,13 @@ public boolean includeMetaData() { return incMeta; } + /** + * @param incMeta Include meta data or not. + */ + public void includeMetaData(boolean incMeta) { + this.incMeta = incMeta; + } + /** * @return Whether to load all pages. */ @@ -629,6 +699,13 @@ public boolean allPages() { return all; } + /** + * @param all Whether to load all pages. + */ + public void allPages(boolean all) { + this.all = all; + } + /** * @return Whether to keep binary. */ @@ -636,6 +713,13 @@ public boolean keepBinary() { return keepBinary; } + /** + * @param keepBinary Whether to keep binary. + */ + public void keepBinary(boolean keepBinary) { + this.keepBinary = keepBinary; + } + /** * @return Task hash. */ @@ -643,6 +727,13 @@ public int taskHash() { return taskHash; } + /** + * @param taskHash Task hash. + */ + public void taskHash(int taskHash) { + this.taskHash = taskHash; + } + /** * @return Flag to enable data page scan. */ @@ -663,6 +754,13 @@ public Collection skipKeys() { return skipKeys; } + /** + * @param skipKeys Set of keys that must be skiped during iteration. + */ + public void skipKeys(Collection skipKeys) { + this.skipKeys = skipKeys; + } + /** * @return Partition. */ @@ -670,6 +768,97 @@ public Collection skipKeys() { return part; } + /** + * @param part Partition. + */ + public void partition(int part) { + this.part = part; + } + + /** + * @return Index query description bytes. + */ + public byte[] indexQueryDescriptionBytes() { + return idxQryDescBytes; + } + + /** + * @param idxQryDescBytes Index query description bytes. + */ + public void indexQueryDescriptionBytes(byte[] idxQryDescBytes) { + this.idxQryDescBytes = idxQryDescBytes; + } + + /** + * @return Key-value filter bytes. + */ + public byte[] keyValueFilterBytes() { + return keyValFilterBytes; + } + + /** + * @param keyValFilterBytes Key-value filter bytes. + */ + public void keyValueFilterBytes(byte[] keyValFilterBytes) { + this.keyValFilterBytes = keyValFilterBytes; + } + + /** + * @return Reducer bytes. + */ + public byte[] reducerBytes() { + return rdcBytes; + } + + /** + * @param rdcBytes Reducer bytes. + */ + public void reducerBytes(byte[] rdcBytes) { + this.rdcBytes = rdcBytes; + } + + /** + * @return Transformer bytes. + */ + public byte[] transformerBytes() { + return transBytes; + } + + /** + * @param transBytes Transformer bytes. + */ + public void transformerBytes(byte[] transBytes) { + this.transBytes = transBytes; + } + + /** + * @return Arguments bytes. + */ + public byte[] argumentsBytes() { + return argsBytes; + } + + /** + * @param argsBytes Arguments bytes. + */ + public void argumentsBytes(byte[] argsBytes) { + this.argsBytes = argsBytes; + } + + /** + * @return Flags. + */ + public byte flags() { + return flags; + } + + /** + * @param flags Flags. + */ + public void flags(byte flags) { + this.flags = flags; + } + /** {@inheritDoc} */ @Override public short directType() { return 58; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java index ccd324a2ec432..c6dd3ecb52b99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java @@ -71,6 +71,27 @@ public long futureId() { return futId; } + /** + * @param futId Future ID. + */ + public void futureId(long futId) { + this.futId = futId; + } + + /** + * @return Array of txKeys from {@link #txKeys}. Used during marshalling and unmarshalling. + */ + public IgniteTxKey[] txKeysArray() { + return txKeysArr; + } + + /** + * @param txKeysArr Array of txKeys from {@link #txKeys}. Used during marshalling and unmarshalling. + */ + public void txKeysArray(IgniteTxKey[] txKeysArr) { + this.txKeysArr = txKeysArr; + } + /** * @return Tx keys. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryExecuteBatchRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryExecuteBatchRequest.java index fd4ec0da89d9d..75c2831750905 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryExecuteBatchRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryExecuteBatchRequest.java @@ -94,6 +94,13 @@ public String schema() { return schema; } + /** + * @return Last page flag. + */ + public boolean last() { + return last; + } + /** * @return Timeout in seconds. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryGetTablesMetaRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryGetTablesMetaRequest.java index 3e585633460f8..e7ea2cb2f41f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryGetTablesMetaRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQueryGetTablesMetaRequest.java @@ -50,6 +50,13 @@ public OdbcQueryGetTablesMetaRequest(String catalog, String schema, String table this.tableType = tableType; } + /** + * @return catalog search pattern. + */ + public String catalog() { + return catalog; + } + /** * @return Schema search pattern. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/datastructures/ClientIgniteSetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/datastructures/ClientIgniteSetRequest.java index 02b9168017170..629a9f94b7da3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/datastructures/ClientIgniteSetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/datastructures/ClientIgniteSetRequest.java @@ -70,6 +70,15 @@ protected ClientResponse process(IgniteSet set) { return new ClientResponse(requestId()); } + /** + * Gets the name. + * + * @return Set name. + */ + protected String name() { + return name; + } + /** * Gets the IgniteSet. * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java index 4e3444bb4e4c8..06a267f4f876f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java @@ -50,6 +50,13 @@ public long queryRequestId() { return qryReqId; } + /** + * @param qryReqId Query request ID. + */ + public void queryRequestId(long qryReqId) { + this.qryReqId = qryReqId; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(GridQueryCancelRequest.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java index 75bccd9770d51..b2d59d569221a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java @@ -74,6 +74,13 @@ public byte flags() { return flags; } + /** + * @param flags New flags. + */ + public void flags(byte flags) { + this.flags = flags; + } + /** * @return Query request ID. */ @@ -81,6 +88,13 @@ public long queryRequestId() { return qryReqId; } + /** + * @param qryReqId New query request ID. + */ + public void queryRequestId(long qryReqId) { + this.qryReqId = qryReqId; + } + /** * @return Query. */ @@ -88,11 +102,25 @@ public int query() { return qry; } + /** + * @param qry New query. + */ + public void query(int qry) { + this.qry = qry; + } + /** @return Index segment ID */ public int segmentId() { return segmentId; } + /** + * @param segmentId New index segment ID. + */ + public void segmentId(int segmentId) { + this.segmentId = segmentId; + } + /** * @return Page size. */ @@ -100,6 +128,13 @@ public int pageSize() { return pageSize; } + /** + * @param pageSize New page size. + */ + public void pageSize(int pageSize) { + this.pageSize = pageSize; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(GridQueryNextPageRequest.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java index d66085774c6a1..1adc8f4b258b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/messages/GridQueryKillRequest.java @@ -66,6 +66,13 @@ public long requestId() { return reqId; } + /** + * @param reqId New request id. + */ + public void requestId(long reqId) { + this.reqId = reqId; + } + /** * @return Query id on a node. */ @@ -73,6 +80,13 @@ public long nodeQryId() { return nodeQryId; } + /** + * @param nodeQryId New query id on a node. + */ + public void nodeQryId(long nodeQryId) { + this.nodeQryId = nodeQryId; + } + /** * @return {@code true} in case response should be send back asynchronous. */ @@ -80,6 +94,13 @@ public boolean asyncResponse() { return asyncRes; } + /** + * @param asyncRes New async response flag. + */ + public void asyncResponse(boolean asyncRes) { + this.asyncRes = asyncRes; + } + /** {@inheritDoc} */ @Override public short directType() { return TYPE_CODE; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java index 55d7d1f8ab1d1..76ef019287a30 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAuthenticationRequest.java @@ -45,6 +45,13 @@ public SecurityCredentials credentials() { return cred; } + /** + * @param cred Credentials object. + */ + public void credentials(SecurityCredentials cred) { + this.cred = cred; + } + /** * @return User attributes. */ @@ -52,6 +59,13 @@ public Map userAttributes() { return userAttrs; } + /** + * @param userAttrs User attributes. + */ + public void userAttributes(Map userAttrs) { + this.userAttrs = userAttrs; + } + /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { super.writeExternal(out); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java index 7b430587860e5..24428d2801814 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientCacheRequest.java @@ -213,6 +213,15 @@ public void keys(Iterable keys) { vals.put(k, null); } + /** + * Set cache flags bit map. + * + * @param cacheFlagsOn Bit representation of cache flags. + */ + public void cacheFlagsOn(int cacheFlagsOn) { + this.cacheFlagsOn = cacheFlagsOn; + } + /** * Get cache flags bit map. * @return Bit representation of cache flags. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientClusterStateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientClusterStateRequest.java index fff2bddde2956..122fdebd78e0b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientClusterStateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientClusterStateRequest.java @@ -47,6 +47,29 @@ public ClusterState state() { return state; } + /** + * @return Current read-only mode request. + */ + public static GridClientClusterStateRequest currentState() { + GridClientClusterStateRequest msg = new GridClientClusterStateRequest(); + + msg.reqCurrentState = true; + + return msg; + } + + /** + * @param state New cluster state. + * @return Cluster state change request. + */ + public static GridClientClusterStateRequest state(ClusterState state) { + GridClientClusterStateRequest msg = new GridClientClusterStateRequest(); + + msg.state = state; + + return msg; + } + /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { super.writeExternal(out); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientStateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientStateRequest.java index f10339361321c..7730d1382372a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientStateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientStateRequest.java @@ -42,6 +42,20 @@ public boolean active() { return active; } + /** + * + */ + public void active(boolean active) { + this.active = active; + } + + /** + * + */ + public void requestCurrentState() { + this.reqCurrentState = true; + } + /** * */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java index d5dbe66931982..497743085bbbb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java @@ -66,6 +66,20 @@ public void argument(Object arg) { this.arg = arg; } + /** + * @return Keep binary flag. + */ + public boolean keepBinaries() { + return keepBinaries; + } + + /** + * @param keepBinaries Keep binary flag. + */ + public void keepBinaries(boolean keepBinaries) { + this.keepBinaries = keepBinaries; + } + /** {@inheritDoc} */ @Override public boolean equals(Object o) { if (this == o) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientWarmUpRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientWarmUpRequest.java index 82e8284835ea9..fb03b06c9a4dd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientWarmUpRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientWarmUpRequest.java @@ -40,6 +40,18 @@ public boolean stopWarmUp() { return stopWarmUp; } + /** + * Set need to stop warm-up. + * + * @param stopWarmUp {@code true} to stop warm-up. + * @return {@code this} instance. + */ + public GridClientWarmUpRequest stopWarmUp(boolean stopWarmUp) { + this.stopWarmUp = stopWarmUp; + + return this; + } + /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { super.writeExternal(out); 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 08026e764d572..5fc1e166944b6 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 @@ -56,6 +56,15 @@ public IgniteUuid taskId() { return taskId; } + /** + * @param taskId Task ID. + */ + public void taskId(IgniteUuid taskId) { + assert taskId != null; + + this.taskId = taskId; + } + /** * @return Topic ID. */ @@ -63,6 +72,13 @@ public long topicId() { return topicId; } + /** + * @param topicId New topic ID. + */ + public void topicId(long topicId) { + this.topicId = topicId; + } + /** {@inheritDoc} */ @Override public short directType() { return 76; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java index 73a4ac017e78e..500ef4881c9b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java @@ -50,6 +50,13 @@ public int delta() { return delta; } + /** + * @param delta New delta. + */ + public void delta(int delta) { + this.delta = delta; + } + /** {@inheritDoc} */ @Override public short directType() { return 82; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java index 729c57c404911..cb588a765122f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientPingRequest.java @@ -56,6 +56,13 @@ public TcpDiscoveryClientPingRequest(UUID creatorNodeId, @Nullable UUID nodeToPi return nodeToPing; } + /** + * @param nodeToPing Pinged client node ID. + */ + public void nodeToPing(@Nullable UUID nodeToPing) { + this.nodeToPing = nodeToPing; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryClientPingRequest.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java index 503b3e091fe2a..3e9db33564ffc 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingRequest.java @@ -56,6 +56,13 @@ public TcpDiscoveryPingRequest(UUID creatorNodeId, @Nullable UUID clientNodeId) return clientNodeId; } + /** + * @param clientNodeId New pinged client node ID. + */ + public void clientNodeId(@Nullable UUID clientNodeId) { + this.clientNodeId = clientNodeId; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryPingRequest.class, this, "super", super.toString()); diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java index 13e326c49e3f2..6f77facf38545 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiRequest.java @@ -18,6 +18,7 @@ package org.apache.ignite.loadtests.dsi; import java.io.Serializable; +import org.apache.ignite.cache.affinity.AffinityKeyMapped; /** * @@ -26,6 +27,13 @@ public class GridDsiRequest implements Serializable { /** */ private Long id; + /** */ + @SuppressWarnings({"FieldCanBeLocal"}) + private long msgId; + + /** */ + private long txId; + /** * @param id ID. */ @@ -37,6 +45,7 @@ public GridDsiRequest(long id) { * @param msgId Message ID. */ public void setMessageId(long msgId) { + this.msgId = msgId; } /** @@ -55,12 +64,17 @@ static class RequestKey implements Serializable { /** */ private Long key; + /** */ + @AffinityKeyMapped + private String terminalId; + /** * @param key Key. * @param terminalId Terminal ID. */ RequestKey(long key, String terminalId) { this.key = key; + this.terminalId = terminalId; } /** {@inheritDoc} */ diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java index 0edecd70c49a5..f8a1be9047ef1 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2DmlRequest.java @@ -254,6 +254,15 @@ public boolean isFlagSet(int flags) { return (this.flags & flags) == flags; } + /** + * Checks if data page scan enabled. + * + * @return {@code true} If data page scan enabled, {@code false} if not, and {@code null} if not set. + */ + public Boolean isDataPageScanEnabled() { + return GridH2QueryRequest.isDataPageScanEnabled(flags); + } + /** * @return Timeout. */ diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java index 1f5f7bf8d16cd..649e93ba95840 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java @@ -216,6 +216,17 @@ public GridH2QueryRequest tables(Collection tbls) { return this; } + /** + * Get tables. + *

+ * N.B.: Was used in AI 1.9 for snapshots. Unused at the moment, but should be kept for compatibility reasons. + * + * @return Tables. + */ + public Collection tables() { + return tbls; + } + /** * @param reqId Request ID. * @return {@code this}. From 7fa5806411153460f5a8a45037be7ad9e6a2e417 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 19 Feb 2026 21:51:28 +0300 Subject: [PATCH 32/42] Revert "WIP" This reverts commit ef5de104c16e0e9c342449894fb64bb581cd16b0. --- .../StopRoutineAckDiscoveryMessage.java | 7 ----- .../StopRoutineDiscoveryMessage.java | 7 ----- .../TcpInverseConnectionResponseMessage.java | 26 ------------------- .../tcp/messages/HandshakeWaitMessage.java | 14 ---------- .../TcpDiscoveryConnectionCheckMessage.java | 10 ------- .../messages/TcpDiscoveryNodeLeftMessage.java | 5 ---- ...ommunicationErrorResolveFinishMessage.java | 11 -------- ...CommunicationErrorResolveStartMessage.java | 11 -------- .../zk/internal/ZkForceNodeFailMessage.java | 11 -------- 9 files changed, 102 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java index 79d8b29a24081..4363cf5279a3d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java @@ -18,9 +18,7 @@ package org.apache.ignite.internal.processors.continuous; import java.util.UUID; -import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; -import org.jetbrains.annotations.Nullable; /** * @@ -36,11 +34,6 @@ public StopRoutineAckDiscoveryMessage(UUID routineId) { super(routineId); } - /** {@inheritDoc} */ - @Nullable @Override public DiscoveryCustomMessage ackMessage() { - return null; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(StopRoutineAckDiscoveryMessage.class, this, "routineId", routineId()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java index f6b18fd1aaa76..07d867d5da15f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java @@ -18,9 +18,7 @@ package org.apache.ignite.internal.processors.continuous; import java.util.UUID; -import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; -import org.jetbrains.annotations.Nullable; /** * @@ -36,11 +34,6 @@ public StopRoutineDiscoveryMessage(UUID routineId) { super(routineId); } - /** {@inheritDoc} */ - @Nullable @Override public DiscoveryCustomMessage ackMessage() { - return new StopRoutineAckDiscoveryMessage(routineId); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(StopRoutineDiscoveryMessage.class, this, "routineId", routineId()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java index 795877a1940d0..1e0fe9ff83e61 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java @@ -32,32 +32,6 @@ public class TcpInverseConnectionResponseMessage implements TcpConnectionIndexAw @Order(0) int connIdx; - /** */ - public TcpInverseConnectionResponseMessage() { - } - - /** */ - public TcpInverseConnectionResponseMessage(int connIdx) { - this.connIdx = connIdx; - } - - /** {@inheritDoc} */ - @Override public int connectionIndex() { - return connIdx; - } - - /** - * @param connIdx New connection index. - */ - public void connectionIndex(int connIdx) { - this.connIdx = connIdx; - } - - /** {@inheritDoc} */ - @Override public short directType() { - return 177; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpInverseConnectionResponseMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java index b1f95a8fb92a3..84cc53e433560 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java @@ -20,8 +20,6 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.plugin.extensions.communication.Message; -import static org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi.HANDSHAKE_WAIT_MSG_TYPE; - /** * Message requesting to wait until node's SPI context initialize. */ @@ -29,18 +27,6 @@ public class HandshakeWaitMessage implements Message { /** Full message size (with message type) in bytes. */ public static final int MESSAGE_FULL_SIZE = DIRECT_TYPE_SIZE; - /** - * Default constructor. - */ - public HandshakeWaitMessage() { - // No-op. - } - - /** {@inheritDoc} */ - @Override public short directType() { - return HANDSHAKE_WAIT_MSG_TYPE; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(HandshakeWaitMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java index 3cf1784da5600..e38aacd7b2a4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java @@ -47,16 +47,6 @@ public TcpDiscoveryConnectionCheckMessage(TcpDiscoveryNode creatorNode) { super(creatorNode.id()); } - /** {@inheritDoc} */ - @Override public boolean traceLogLevel() { - return true; - } - - /** {@inheritDoc} */ - @Override public short directType() { - return 6; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryConnectionCheckMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java index 8e70196ab051b..949c73348c7b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java @@ -46,11 +46,6 @@ public TcpDiscoveryNodeLeftMessage(UUID creatorNodeId) { super(creatorNodeId); } - /** {@inheritDoc} */ - @Override public short directType() { - return 16; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryNodeLeftMessage.class, this, "super", super.toString()); diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java index 9b7476c5355f5..fb17594dd765d 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java @@ -20,7 +20,6 @@ import java.util.UUID; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; -import org.jetbrains.annotations.Nullable; /** * @@ -47,21 +46,11 @@ class ZkCommunicationErrorResolveFinishMessage implements DiscoverySpiCustomMess this.topVer = topVer; } - /** {@inheritDoc} */ - @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { - return null; - } - /** {@inheritDoc} */ @Override public boolean isMutable() { return false; } - /** {@inheritDoc} */ - @Override public boolean stopProcess() { - return false; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ZkCommunicationErrorResolveFinishMessage.class, this); diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java index 0c79c36aee0a9..31864fe087e02 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java @@ -20,7 +20,6 @@ import java.util.UUID; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; -import org.jetbrains.annotations.Nullable; /** * Zk Communication Error Resolve Start Message. @@ -39,21 +38,11 @@ public class ZkCommunicationErrorResolveStartMessage implements DiscoverySpiCust this.id = id; } - /** {@inheritDoc} */ - @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { - return null; - } - /** {@inheritDoc} */ @Override public boolean isMutable() { return false; } - /** {@inheritDoc} */ - @Override public boolean stopProcess() { - return false; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ZkCommunicationErrorResolveStartMessage.class, this); diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java index de7291c0d453c..e7139d39c75ca 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java @@ -19,7 +19,6 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; -import org.jetbrains.annotations.Nullable; /** * Zk Force Node Fail Message. @@ -43,21 +42,11 @@ public class ZkForceNodeFailMessage implements DiscoverySpiCustomMessage, ZkInte this.warning = warning; } - /** {@inheritDoc} */ - @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { - return null; - } - /** {@inheritDoc} */ @Override public boolean isMutable() { return false; } - /** {@inheritDoc} */ - @Override public boolean stopProcess() { - return false; - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ZkForceNodeFailMessage.class, this); From 94f45adf5757f66b4ae0725239fecc6c92bd3de8 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 19 Feb 2026 21:51:28 +0300 Subject: [PATCH 33/42] Revert "WIP" This reverts commit 6b6e98b3f10fdd15b7795ff651905dd4c15582ea. --- .../calcite/message/CalciteErrorMessage.java | 10 ++ .../calcite/message/GenericValueMessage.java | 14 +++ .../calcite/message/InboxCloseMessage.java | 21 ++++ .../message/QueryBatchAcknowledgeMessage.java | 28 +++++ .../calcite/message/QueryBatchMessage.java | 49 ++++++++ .../calcite/message/QueryCloseMessage.java | 7 ++ .../managers/communication/GridIoMessage.java | 56 ++++++++++ .../GridIoSecurityAwareMessage.java | 7 ++ .../communication/IgniteIoTestMessage.java | 14 +++ .../communication/SessionChannelMessage.java | 7 ++ .../eventstorage/GridEventStorageMessage.java | 84 ++++++++++++++ .../UserAuthenticateRequestMessage.java | 21 ++++ .../UserAuthenticateResponseMessage.java | 14 +++ ...serManagementOperationFinishedMessage.java | 14 +++ .../cache/GridCacheGroupIdMessage.java | 7 ++ .../processors/cache/GridCacheIdMessage.java | 7 ++ .../processors/cache/GridCacheMessage.java | 8 ++ .../processors/cache/WalStateAckMessage.java | 28 +++++ .../cache/WalStateProposeMessage.java | 7 ++ .../cache/binary/MetadataRequestMessage.java | 7 ++ .../cache/binary/MetadataResponseMessage.java | 7 ++ .../GridDistributedBaseMessage.java | 14 +++ .../dht/PartitionUpdateCountersMessage.java | 7 ++ .../preloader/CacheGroupAffinityMessage.java | 35 ++++++ .../GridDhtPartitionDemandMessage.java | 28 +++++ .../GridDhtPartitionSupplyMessage.java | 63 +++++++++++ .../GridDhtPartitionsAbstractMessage.java | 21 ++++ .../GridDhtPartitionsFullMessage.java | 91 +++++++++++++++ .../GridDhtPartitionsSingleMessage.java | 84 ++++++++++++++ .../dht/preloader/latch/LatchAckMessage.java | 21 ++++ .../snapshot/AbstractSnapshotMessage.java | 7 ++ .../IncrementalSnapshotAwareMessage.java | 28 +++++ .../snapshot/SnapshotFilesFailureMessage.java | 7 ++ .../snapshot/SnapshotFilesRequestMessage.java | 35 ++++++ .../cluster/CacheMetricsMessage.java | 105 ++++++++++++++++++ .../cluster/ChangeGlobalStateMessage.java | 7 ++ .../cluster/ClusterMetricsUpdateMessage.java | 14 +++ .../ContinuousRoutineStartResultMessage.java | 21 ++++ .../StopRoutineAckDiscoveryMessage.java | 7 ++ .../StopRoutineDiscoveryMessage.java | 7 ++ .../MissingMappingRequestMessage.java | 10 ++ .../MissingMappingResponseMessage.java | 15 +++ .../DistributedMetaStorageUpdateMessage.java | 5 + .../message/SchemaFinishDiscoveryMessage.java | 7 ++ .../message/SchemaOperationStatusMessage.java | 28 +++++ .../internal/util/UUIDCollectionMessage.java | 7 ++ .../TcpInverseConnectionResponseMessage.java | 26 +++++ .../tcp/messages/HandshakeMessage.java | 28 +++++ .../tcp/messages/HandshakeWaitMessage.java | 14 +++ .../tcp/messages/NodeIdMessage.java | 7 ++ .../messages/RecoveryLastReceivedMessage.java | 7 ++ .../tcp/messages/InetAddressMessage.java | 20 ++++ .../messages/InetSocketAddressMessage.java | 5 + .../messages/TcpDiscoveryAbstractMessage.java | 23 ++++ .../TcpDiscoveryAuthFailedMessage.java | 15 +++ .../TcpDiscoveryCheckFailedMessage.java | 7 ++ ...cpDiscoveryClientMetricsUpdateMessage.java | 9 ++ .../TcpDiscoveryConnectionCheckMessage.java | 10 ++ .../messages/TcpDiscoveryDiscardMessage.java | 14 +++ .../TcpDiscoveryDuplicateIdMessage.java | 7 ++ .../TcpDiscoveryLoopbackProblemMessage.java | 14 +++ .../TcpDiscoveryMetricsUpdateMessage.java | 19 ++++ .../TcpDiscoveryNodeAddFinishedMessage.java | 21 ++++ .../TcpDiscoveryNodeFailedMessage.java | 14 +++ .../messages/TcpDiscoveryNodeLeftMessage.java | 5 + .../TcpDiscoveryRingLatencyCheckMessage.java | 15 +++ .../TcpDiscoveryStatusCheckMessage.java | 27 +++++ .../communication/GridTestMessage.java | 7 ++ .../spi/communication/GridTestMessage.java | 7 ++ ...ommunicationErrorResolveFinishMessage.java | 11 ++ ...CommunicationErrorResolveStartMessage.java | 11 ++ .../zk/internal/ZkForceNodeFailMessage.java | 11 ++ .../internal/ZkInternalJoinErrorMessage.java | 4 + 73 files changed, 1449 insertions(+) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java index a766adae9206f..f6dcbc252e9cd 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteErrorMessage.java @@ -55,6 +55,11 @@ public UUID queryId() { return qryId; } + /** */ + public void queryId(UUID qryId) { + this.qryId = qryId; + } + /** * @return Fragment ID. */ @@ -62,6 +67,11 @@ public long fragmentId() { return fragmentId; } + /** */ + public void fragmentId(long fragmentId) { + this.fragmentId = fragmentId; + } + /** {@inheritDoc} */ @Override public MessageType type() { return MessageType.QUERY_ERROR_MESSAGE; diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java index b03659defa95f..90fbf297c52e2 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java @@ -48,6 +48,20 @@ public GenericValueMessage(Object val) { return val; } + /** + * @return Serialized value. + */ + public byte[] serialized() { + return serialized; + } + + /** + * @param serialized Serialized value. + */ + public void serialized(byte[] serialized) { + this.serialized = serialized; + } + /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { if (val != null && serialized == null) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java index 19638738da0a4..52b2a4c3441ec 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/InboxCloseMessage.java @@ -55,6 +55,13 @@ public UUID queryId() { return qryId; } + /** + * @param queryId New query ID. + */ + public void queryId(UUID qryId) { + this.qryId = qryId; + } + /** * @return Fragment ID. */ @@ -62,6 +69,13 @@ public long fragmentId() { return fragmentId; } + /** + * @param fragmentId New fragment ID. + */ + public void fragmentId(long fragmentId) { + this.fragmentId = fragmentId; + } + /** * @return Exchange ID. */ @@ -69,6 +83,13 @@ public long exchangeId() { return exchangeId; } + /** + * @param exchangeId New exchange ID. + */ + public void exchangeId(long exchangeId) { + this.exchangeId = exchangeId; + } + /** {@inheritDoc} */ @Override public MessageType type() { return MessageType.QUERY_INBOX_CANCEL_MESSAGE; diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java index ec7b04e05adfb..0d6b604646a67 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchAcknowledgeMessage.java @@ -58,11 +58,25 @@ public QueryBatchAcknowledgeMessage(UUID qryId, long fragmentId, long exchangeId return qryId; } + /** + * @param qryId New query ID. + */ + public void queryId(UUID qryId) { + this.qryId = qryId; + } + /** {@inheritDoc} */ @Override public long fragmentId() { return fragmentId; } + /** + * @param fragmentId New fragment ID. + */ + public void fragmentId(long fragmentId) { + this.fragmentId = fragmentId; + } + /** * @return Exchange ID. */ @@ -70,6 +84,13 @@ public long exchangeId() { return exchangeId; } + /** + * @param exchangeId New exchange ID. + */ + public void exchangeId(long exchangeId) { + this.exchangeId = exchangeId; + } + /** * @return Batch ID. */ @@ -77,6 +98,13 @@ public int batchId() { return batchId; } + /** + * @param batchId New batch ID. + */ + public void batchId(int batchId) { + this.batchId = batchId; + } + /** {@inheritDoc} */ @Override public MessageType type() { return MessageType.QUERY_ACKNOWLEDGE_MESSAGE; diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java index b722b6ccf3758..e863aebc47433 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java @@ -74,11 +74,25 @@ public QueryBatchMessage(UUID qryId, long fragmentId, long exchangeId, int batch return qryId; } + /** + * @param qryId Query ID. + */ + public void queryId(UUID qryId) { + this.qryId = qryId; + } + /** {@inheritDoc} */ @Override public long fragmentId() { return fragmentId; } + /** + * @param fragmentId Fragment ID. + */ + public void fragmentId(long fragmentId) { + this.fragmentId = fragmentId; + } + /** * @return Exchange ID. */ @@ -86,6 +100,13 @@ public long exchangeId() { return exchangeId; } + /** + * @param exchangeId Exchange ID. + */ + public void exchangeId(long exchangeId) { + this.exchangeId = exchangeId; + } + /** * @return Batch ID. */ @@ -93,6 +114,13 @@ public int batchId() { return batchId; } + /** + * @param batchId Batch ID. + */ + public void batchId(int batchId) { + this.batchId = batchId; + } + /** * @return Last batch flag. */ @@ -100,6 +128,13 @@ public boolean last() { return last; } + /** + * @param last Last batch flag. + */ + public void last(boolean last) { + this.last = last; + } + /** * @return Rows. */ @@ -107,6 +142,20 @@ public List rows() { return rows; } + /** + * @return Message rows. + */ + public List messageRows() { + return mRows; + } + + /** + * @param mRows Message rows. + */ + public void messageRows(List mRows) { + this.mRows = mRows; + } + /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { if (mRows != null || rows == null) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java index 6db451d285cc8..6c7e66113d1f8 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryCloseMessage.java @@ -45,6 +45,13 @@ public UUID queryId() { return qryId; } + /** + * @param qryId New query ID. + */ + public void queryId(UUID qryId) { + this.qryId = qryId; + } + /** {@inheritDoc} */ @Override public MessageType type() { return MessageType.QUERY_CLOSE_MESSAGE; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java index b42b8df962a7e..8e1c3ea6d9da8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java @@ -118,6 +118,13 @@ public byte policy() { return plc; } + /** + * @param plc Policy. + */ + public void policy(byte plc) { + this.plc = plc; + } + /** * @return Topic. */ @@ -132,6 +139,20 @@ void topic(Object topic) { this.topic = topic; } + /** + * @return Topic bytes. + */ + public byte[] topicBytes() { + return topicBytes; + } + + /** + * @param topicBytes Topic bytes. + */ + public void topicBytes(byte[] topicBytes) { + this.topicBytes = topicBytes; + } + /** * @return Topic ordinal. */ @@ -139,6 +160,13 @@ public int topicOrdinal() { return topicOrd; } + /** + * @param topicOrd Topic ordinal. + */ + public void topicOrdinal(int topicOrd) { + this.topicOrd = topicOrd; + } + /** * @return Message. */ @@ -146,6 +174,13 @@ public Message message() { return msg; } + /** + * @param msg Message. + */ + public void message(Message msg) { + this.msg = msg; + } + /** * @return Message timeout. */ @@ -153,6 +188,13 @@ public long timeout() { return timeout; } + /** + * @param timeout Message timeout. + */ + public void timeout(long timeout) { + this.timeout = timeout; + } + /** * @return Whether message can be skipped on timeout. */ @@ -160,6 +202,13 @@ public boolean skipOnTimeout() { return skipOnTimeout; } + /** + * @param skipOnTimeout Whether message can be skipped on timeout. + */ + public void skipOnTimeout(boolean skipOnTimeout) { + this.skipOnTimeout = skipOnTimeout; + } + /** * @return {@code True} if message is ordered, {@code false} otherwise. */ @@ -167,6 +216,13 @@ public boolean isOrdered() { return ordered; } + /** + * @param ordered {@code True} if message is ordered, {@code false} otherwise. + */ + public void isOrdered(boolean ordered) { + this.ordered = ordered; + } + /** {@inheritDoc} */ @Override public boolean equals(Object obj) { throw new AssertionError(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java index ae4c7abebab7a..65afd74f4d1b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoSecurityAwareMessage.java @@ -71,6 +71,13 @@ public UUID securitySubjectId() { return secSubjId; } + /** + * @param secSubjId Security subject ID. + */ + public void securitySubjectId(UUID secSubjId) { + this.secSubjId = secSubjId; + } + /** {@inheritDoc} */ @Override public short directType() { return TYPE_CODE; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java index 7773fb3bcbb15..9fd6a00ddca72 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java @@ -208,6 +208,13 @@ public long responseReceiveTs() { return resRcvTs; } + /** + * @return Response process timestamp. + */ + public long responseProcessTs() { + return resProcTs; + } + /** * @return Request send timestamp (millis). */ @@ -222,6 +229,13 @@ public long requestReceivedTsMillis() { return reqRcvTsMillis; } + /** + * @return Response send timestamp (millis). + */ + public long responseSendTsMillis() { + return resSndTsMillis; + } + /** * @return Response received timestamp (millis). */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java index 1afab64ee6d8f..45f46a12be32e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/SessionChannelMessage.java @@ -56,6 +56,13 @@ public IgniteUuid sesId() { return sesId; } + /** + * @param sesId The unique session id for the channel. + */ + public void sesId(IgniteUuid sesId) { + this.sesId = sesId; + } + /** {@inheritDoc} */ @Override public short directType() { return TYPE_CODE; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java index dade283bc0d1f..77ee2c0e201c1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java @@ -142,6 +142,34 @@ Object responseTopic() { return resTopic; } + /** + * @return Serialized response topic. + */ + public byte[] responseTopicBytes() { + return resTopicBytes; + } + + /** + * @param resTopicBytes Serialized response topic. + */ + public void responseTopicBytes(byte[] resTopicBytes) { + this.resTopicBytes = resTopicBytes; + } + + /** + * @return Filter. + */ + public byte[] filterBytes() { + return filterBytes; + } + + /** + * @param filterBytes Filter bytes. + */ + public void filterBytes(byte[] filterBytes) { + this.filterBytes = filterBytes; + } + /** * @return Filter. */ @@ -156,6 +184,20 @@ public IgnitePredicate filter() { return evts != null ? Collections.unmodifiableCollection(evts) : null; } + /** + * @return Serialized events. + */ + public byte[] eventsBytes() { + return evtsBytes; + } + + /** + * @param evtsBytes Serialized events. + */ + public void eventsBytes(byte[] evtsBytes) { + this.evtsBytes = evtsBytes; + } + /** * @return the Class loader ID. */ @@ -163,6 +205,13 @@ public IgniteUuid classLoaderId() { return clsLdrId; } + /** + * @param clsLdrId the Class loader ID. + */ + public void classLoaderId(IgniteUuid clsLdrId) { + this.clsLdrId = clsLdrId; + } + /** * @return Deployment mode. */ @@ -170,6 +219,13 @@ public DeploymentMode deploymentMode() { return depMode; } + /** + * @param depMode Deployment mode. + */ + public void deploymentMode(DeploymentMode depMode) { + this.depMode = depMode; + } + /** * @return Filter class name. */ @@ -177,6 +233,13 @@ public String filterClassName() { return filterClsName; } + /** + * @param filterClsName Filter class name. + */ + public void filterClassName(String filterClsName) { + this.filterClsName = filterClsName; + } + /** * @return User version. */ @@ -184,6 +247,13 @@ public String userVersion() { return userVer; } + /** + * @param userVer User version. + */ + public void userVersion(String userVer) { + this.userVer = userVer; + } + /** * @return Node class loader participant map. */ @@ -205,6 +275,20 @@ public void loaderParticipants(@Nullable Map ldrParties) { return ErrorMessage.error(errMsg); } + /** + * @return Error message. + */ + public @Nullable ErrorMessage errorMessage() { + return errMsg; + } + + /** + * @param errMsg Error message. + */ + public void errorMessage(@Nullable ErrorMessage errMsg) { + this.errMsg = errMsg; + } + /** * @param marsh Marshaller. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java index 0a33a95f63764..45c1a9561fa83 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateRequestMessage.java @@ -62,6 +62,13 @@ public String name() { return name; } + /** + * @param name New username. + */ + public void name(String name) { + this.name = name; + } + /** * @return User password. */ @@ -69,6 +76,13 @@ public String password() { return passwd; } + /** + * @param passwd New user password. + */ + public void password(String passwd) { + this.passwd = passwd; + } + /** * @return Request ID. */ @@ -76,6 +90,13 @@ public IgniteUuid id() { return id; } + /** + * @param id New request ID. + */ + public void id(IgniteUuid id) { + this.id = id; + } + /** {@inheritDoc} */ @Override public short directType() { return 131; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java index 5c9e8251ef46d..ea8fa323ae8ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java @@ -64,6 +64,13 @@ public String errorMessage() { return errMsg; } + /** + * @param errMsg New error message. + */ + public void errorMessage(String errMsg) { + this.errMsg = errMsg; + } + /** * @return Request ID. */ @@ -71,6 +78,13 @@ public IgniteUuid id() { return id; } + /** + * @param id New request ID. + */ + public void id(IgniteUuid id) { + this.id = id; + } + /** {@inheritDoc} */ @Override public short directType() { return 132; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java index d0c32b91b14f1..1132b1eca310c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserManagementOperationFinishedMessage.java @@ -58,6 +58,13 @@ public IgniteUuid operationId() { return opId; } + /** + * @param opId New operation ID. + */ + public void operationId(IgniteUuid opId) { + this.opId = opId; + } + /** * @return Success flag. */ @@ -72,6 +79,13 @@ public String errorMessage() { return errorMsg; } + /** + * @param errorMsg New error message. + */ + public void errorMessage(String errorMsg) { + this.errorMsg = errorMsg; + } + /** {@inheritDoc} */ @Override public short directType() { return 130; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java index 49f9980c4c998..b456d623f9ab9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java @@ -40,6 +40,13 @@ public int groupId() { return grpId; } + /** + * @param grpId Cache group ID. + */ + public void groupId(int grpId) { + this.grpId = grpId; + } + /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { // TODO: Safe to remove only after all inheritors have migrated to the new ser/der scheme (IGNITE-25490). diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java index 8365c22a2509e..e7aac72ec7646 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java @@ -40,6 +40,13 @@ public int cacheId() { return cacheId; } + /** + * @param cacheId Cache ID. + */ + public void cacheId(int cacheId) { + this.cacheId = cacheId; + } + /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { // TODO: Remove #writeTo() after all inheritors have migrated to the new ser/der scheme (IGNITE-25490). diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java index be7c6b6f5670a..068c0abceeab0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java @@ -265,6 +265,14 @@ public GridDeploymentInfoBean deployInfo() { return depInfo; } + /** + * @param depInfo Preset deployment info. + * @see GridCacheDeployable#deployInfo() + */ + public void deployInfo(GridDeploymentInfoBean depInfo) { + this.depInfo = depInfo; + } + /** * This method is called before the whole message is serialized * and is responsible for pre-marshalling state. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java index bd2031b6287f4..ae3fb550c6640 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java @@ -75,6 +75,13 @@ public UUID operationId() { return opId; } + /** + * @param opId New operation ID. + */ + public void operationId(UUID opId) { + this.opId = opId; + } + /** * @return Affinity node flag. */ @@ -82,6 +89,13 @@ public boolean affNode() { return affNode; } + /** + * @param affNode New affinity node flag. + */ + public void affNode(boolean affNode) { + this.affNode = affNode; + } + /** * @return Result. */ @@ -89,6 +103,13 @@ public boolean changed() { return changed; } + /** + * @param changed New operation result. + */ + public void changed(boolean changed) { + this.changed = changed; + } + /** * @return Error message. */ @@ -96,6 +117,13 @@ public boolean changed() { return errMsg; } + /** + * @param errMsg New error message. + */ + public void errorMessage(String errMsg) { + this.errMsg = errMsg; + } + /** * @return Sender node ID. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java index 442b67968e58c..b7c4e34092e62 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateProposeMessage.java @@ -61,6 +61,13 @@ public WalStateProposeMessage(UUID opId, int grpId, IgniteUuid grpDepId, UUID no this.enable = enable; } + /** + * @return Node ID. + */ + public UUID nodeId() { + return nodeId; + } + /** * @return Caches. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java index 143f731de6dab..99ad492481b82 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRequestMessage.java @@ -61,6 +61,13 @@ public int typeId() { return typeId; } + /** + * @param typeId Type ID. + */ + public void typeId(int typeId) { + this.typeId = typeId; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(MetadataRequestMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java index 13c49a1d53eba..5d75c7a280df9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataResponseMessage.java @@ -70,6 +70,13 @@ public int typeId() { return typeId; } + /** + * @param typeId Type ID. + */ + public void typeId(int typeId) { + this.typeId = typeId; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(MetadataResponseMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java index 8d8d045ffdace..83d6dba9c0b5a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java @@ -118,6 +118,13 @@ public void completedVersions(@Nullable Collection committedVe return committedVers; } + /** + * @param committedVers Committed versions. + */ + public void committedVersions(@Nullable Collection committedVers) { + this.committedVers = committedVers; + } + /** * @return Rolled back versions. */ @@ -125,6 +132,13 @@ public void completedVersions(@Nullable Collection committedVe return rolledbackVers; } + /** + * @param rolledbackVers Rolled back versions. + */ + public void rolledbackVersions(@Nullable Collection rolledbackVers) { + this.rolledbackVers = rolledbackVers; + } + /** * @return Count of keys referenced in candidates array (needed only locally for optimization). */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java index 363abf815ec30..c599082caa60f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java @@ -83,6 +83,13 @@ public int cacheId() { return cacheId; } + /** + * @param cacheId New cache id. + */ + public void cacheId(int cacheId) { + this.cacheId = cacheId; + } + /** * @return Size. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java index 540e56e5156f6..00b88604a51fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java @@ -234,6 +234,34 @@ private List> createAssignments(List assigns, return assignments0; } + /** + * @return Assignment. + */ + public List assignments() { + return assigns; + } + + /** + * @param assigns Assignment. + */ + public void assignments(List assigns) { + this.assigns = assigns; + } + + /** + * @return Ideal assignment. + */ + public List idealAssignments() { + return idealAssigns; + } + + /** + * @param idealAssigns Ideal assignment. + */ + public void idealAssignments(List idealAssigns) { + this.idealAssigns = idealAssigns; + } + /** * @return Difference with ideal affinity assignment. */ @@ -241,6 +269,13 @@ public Map assignmentsDiff() { return assignsDiff; } + /** + * @param assignsDiff Difference with ideal affinity assignment. + */ + public void assignmentsDiff(Map assignsDiff) { + this.assignsDiff = assignsDiff; + } + /** {@inheritDoc} */ @Override public short directType() { return 128; 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 b299f431afd37..3b074137445ee 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 @@ -101,6 +101,13 @@ public IgniteDhtDemandedPartitionsMap partitions() { return parts; } + /** + * @param parts Partitions. + */ + public void partitions(IgniteDhtDemandedPartitionsMap parts) { + this.parts = parts; + } + /** * @param updateSeq Update sequence. */ @@ -129,6 +136,20 @@ public void timeout(long timeout) { this.timeout = timeout; } + /** + * @return Worker ID. + */ + public int workerId() { + return workerId; + } + + /** + * @param workerId Worker ID. + */ + public void workerId(int workerId) { + this.workerId = workerId; + } + /** * @return Topology version for which demand message is sent. */ @@ -136,6 +157,13 @@ public void timeout(long timeout) { return topVer; } + /** + * @param topVer Topology version for which demand message is sent. + */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + /** {@inheritDoc} */ @Override public boolean addDeploymentInfo() { return false; 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 d697eb90b6c9e..fe44d824938ca 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 @@ -130,6 +130,13 @@ public long rebalanceId() { return rebalanceId; } + /** + * @param rebalanceId New unique (per demander) rebalance id. + */ + public void rebalanceId(long rebalanceId) { + this.rebalanceId = rebalanceId; + } + /** * @return Topology version for which demand message is sent. */ @@ -137,6 +144,13 @@ public long rebalanceId() { return topVer; } + /** + * @param topVer New topology version for which demand message is sent. + */ + public void topologyVersion(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + /** * @return Partitions that have been fully sent. */ @@ -144,6 +158,13 @@ public Map last() { return last; } + /** + * @param last New map of partitions that have been fully sent. + */ + public void last(Map last) { + this.last = last; + } + /** * @param p Partition which was fully sent. */ @@ -178,6 +199,13 @@ public Collection missed() { return missed; } + /** + * @param missed New partitions which were not found. + */ + public void missed(Collection missed) { + this.missed = missed; + } + /** * @return Entries. */ @@ -188,11 +216,39 @@ public Map getInfosSafe() { return infos; } + /** + * @return Entries. + */ + public Map infos() { + return infos; + } + + /** + * @param infos New entries. + */ + public void infos(Map infos) { + this.infos = infos; + } + /** Supplying process error. */ @Nullable @Override public Throwable error() { return ErrorMessage.error(errMsg); } + /** + * @return Supplying process error message. + */ + @Nullable public ErrorMessage errorMessage() { + return errMsg; + } + + /** + * @param errMsg New supplying process error message. + */ + public void errorMessage(@Nullable ErrorMessage errMsg) { + this.errMsg = errMsg; + } + /** * @return Message size. */ @@ -200,6 +256,13 @@ public int messageSize() { return msgSize; } + /** + * @param msgSize New message size. + */ + public void messageSize(int msgSize) { + this.msgSize = msgSize; + } + /** * @param p Partition. * @param historical {@code True} if partition rebalancing using WAL history. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java index c03ef06bac717..023683fc1cb3c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java @@ -107,6 +107,27 @@ public void exchangeId(GridDhtPartitionExchangeId exchId) { return lastVer; } + /** + * @param lastVer Last used version among all nodes. + */ + public void lastVersion(GridCacheVersion lastVer) { + this.lastVer = lastVer; + } + + /** + * @return Flags. + */ + public byte flags() { + return flags; + } + + /** + * @param flags Flags. + */ + public void flags(byte flags) { + this.flags = flags; + } + /** * @return {@code True} if message data is compressed. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index 0a6da4ecc8838..47a581b4a5689 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -257,6 +257,20 @@ public Map partitions() { return parts; } + /** + * @return Serialized local partitions. + */ + public byte[] partitionBytes() { + return partsBytes; + } + + /** + * @param partsBytes Serialized local partitions. + */ + public void partitionBytes(byte[] partsBytes) { + this.partsBytes = partsBytes; + } + /** * @param grpId Cache group ID. * @return {@code True} if message contains full map for given cache. @@ -347,6 +361,13 @@ public IgniteDhtPartitionHistorySuppliersMap partitionHistorySuppliers() { return partHistSuppliers; } + /** + * @param partHistSuppliers Partitions history suppliers. + */ + public void partitionHistorySuppliers(IgniteDhtPartitionHistorySuppliersMap partHistSuppliers) { + this.partHistSuppliers = partHistSuppliers; + } + /** * */ @@ -415,6 +436,76 @@ public void rebalanced(boolean rebalanced) { flags = rebalanced ? (byte)(flags | REBALANCED_FLAG_MASK) : (byte)(flags & ~REBALANCED_FLAG_MASK); } + /** + * @return Duplicated partitions data. + */ + public Map duplicatedPartitionsData() { + return dupPartsData; + } + + /** + * @param dupPartsData Duplicated partitions data. + */ + public void duplicatedPartitionsData(Map dupPartsData) { + this.dupPartsData = dupPartsData; + } + + /** + * @return Partitions update counters. + */ + public IgniteDhtPartitionCountersMap partitionCounters() { + return partCntrs; + } + + /** + * @param partCntrs Partitions update counters. + */ + public void partitionCounters(IgniteDhtPartitionCountersMap partCntrs) { + this.partCntrs = partCntrs; + } + + /** + * @return Partitions that must be cleared and re-loaded. + */ + public IgniteDhtPartitionsToReloadMap partitionsToReload() { + return partsToReload; + } + + /** + * @param partsToReload Partitions that must be cleared and re-loaded. + */ + public void partitionsToReload(IgniteDhtPartitionsToReloadMap partsToReload) { + this.partsToReload = partsToReload; + } + + /** + * @return Rebalanced flags. + */ + public byte rebalancedFlags() { + return flags; + } + + /** + * @param flags Rebalanced flags. + */ + public void rebalancedFlags(byte flags) { + this.flags = flags; + } + + /** + * @return Lost partitions. + */ + public Map lostPartitions() { + return lostParts; + } + + /** + * @param lostParts Lost partitions. + */ + public void lostPartitions(Map lostParts) { + this.lostParts = lostParts; + } + /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java index 53d9918569ad2..17ef40ee2b333 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java @@ -147,6 +147,13 @@ public void cacheGroupsAffinityRequest(Collection grpsAffReq) { return grpsAffReq; } + /** + * @param client {@code True} if sent from client node. + */ + public void client(boolean client) { + this.client = client; + } + /** * @return {@code True} if sent from client node. */ @@ -154,6 +161,20 @@ public boolean client() { return client; } + /** + * @return Duplicated partitions data. + */ + public Map duplicatedPartitionsData() { + return dupPartsData; + } + + /** + * @param dupPartsData Duplicated partitions data. + */ + public void duplicatedPartitionsData(Map dupPartsData) { + this.dupPartsData = dupPartsData; + } + /** * @param cacheId Cache ID to add local partition for. * @param locMap Local partition map. @@ -188,6 +209,13 @@ public void addPartitionUpdateCounters(int grpId, CachePartitionPartialCountersM partCntrs.put(grpId, cntrMap); } + /** + * @param partCntrs Partition update counters per cache group. + */ + public void partitionUpdateCounters(Map partCntrs) { + this.partCntrs = partCntrs; + } + /** @return Partition update counters per cache group. */ public Map partitionUpdateCounters() { return partCntrs; @@ -234,6 +262,34 @@ public Map partitionSizes(int grpId) { return sizesMap != null ? F.emptyIfNull(sizesMap.map()) : Collections.emptyMap(); } + /** + * @return Partitions sizes. + */ + public Map partitionSizesMap() { + return partsSizes; + } + + /** + * @param partsSizes Partitions sizes. + */ + public void partitionSizesMap(Map partsSizes) { + this.partsSizes = partsSizes; + } + + /** + * @return Partitions history reservation counters. + */ + public Map partitionHistoryCountersMap() { + return partHistCntrs; + } + + /** + * @param partHistCntrs Partitions history reservation counters. + */ + public void partitionHistoryCountersMap(Map partHistCntrs) { + this.partHistCntrs = partHistCntrs; + } + /** * @param cntrMap Partition history counters. */ @@ -275,6 +331,34 @@ public Map partitions() { return parts; } + /** + * @return Serialized local partitions. + */ + public byte[] partitionBytes() { + return partsBytes; + } + + /** + * @param partsBytes Serialized local partitions. + */ + public void partitionBytes(byte[] partsBytes) { + this.partsBytes = partsBytes; + } + + /** + * @return Error message. + */ + public ErrorMessage errorMessage() { + return errMsg; + } + + /** + * @param errMsg Error message. + */ + public void errorMessage(ErrorMessage errMsg) { + this.errMsg = errMsg; + } + /** * @param ex Exception. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java index 32e3618603b2a..31f402a598f73 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java @@ -62,6 +62,13 @@ public String latchId() { return latchId; } + /** + * @param latchId New latch id. + */ + public void latchId(String latchId) { + this.latchId = latchId; + } + /** * @return Latch topology version. */ @@ -69,6 +76,13 @@ public AffinityTopologyVersion topVer() { return topVer; } + /** + * @param topVer New latch topology version. + */ + public void topVer(AffinityTopologyVersion topVer) { + this.topVer = topVer; + } + /** * @return {@code} if ack is final. */ @@ -76,6 +90,13 @@ public boolean isFinal() { return isFinal; } + /** + * @param isFinal New flag indicates that ack is final. + */ + public void isFinal(boolean isFinal) { + this.isFinal = isFinal; + } + /** {@inheritDoc} */ @Override public short directType() { return 135; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java index 002d179deca2c..5fe0213a7a5e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotMessage.java @@ -54,6 +54,13 @@ public String id() { return id; } + /** + * @param id Unique message ID. + */ + public void id(String id) { + this.id = id; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(AbstractSnapshotMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java index 0c257a6dc6c72..07e15193a5a66 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotAwareMessage.java @@ -69,21 +69,49 @@ public UUID id() { return id; } + /** + * @param id Incremental snapshot ID. + */ + public void id(UUID id) { + this.id = id; + } + /** ID of the latest incremental snapshot after which this transaction committed. */ public UUID txIncrementalSnapshotId() { return txSnpId; } + /** + * @param txSnpId ID of the latest incremental snapshot after which this transaction committed. + */ + public void txIncrementalSnapshotId(UUID txSnpId) { + this.txSnpId = txSnpId; + } + /** */ public GridCacheMessage payload() { return payload; } + /** + * @param payload Original transaction message. + */ + public void payload(GridCacheMessage payload) { + this.payload = payload; + } + /** @return Incremental snapshot topology version. */ public long snapshotTopologyVersion() { return topVer; } + /** + * @param topVer Incremental snapshot topology version. + */ + public void snapshotTopologyVersion(long topVer) { + this.topVer = topVer; + } + /** {@inheritDoc} */ @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { payload.prepareMarshal(ctx); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java index 4e0416e959f01..a362743884c07 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesFailureMessage.java @@ -56,6 +56,13 @@ public String errorMessage() { return errMsg; } + /** + * @param errMsg Response error message. + */ + public void errorMessage(String errMsg) { + this.errMsg = errMsg; + } + /** {@inheritDoc} */ @Override public short directType() { return TYPE_CODE; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java index b084b6cb9a599..8df0715bcf51e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotFilesRequestMessage.java @@ -99,6 +99,20 @@ public Map> parts() { return res; } + /** + * @return The demanded cache group partitions per each cache group. + */ + public Map partitions() { + return parts; + } + + /** + * @param parts The demanded cache group partitions per each cache group. + */ + public void partitions(Map parts) { + this.parts = parts; + } + /** * @return Requested snapshot name. */ @@ -106,6 +120,13 @@ public String snapshotName() { return snpName; } + /** + * @param snpName Requested snapshot name. + */ + public void snapshotName(String snpName) { + this.snpName = snpName; + } + /** * @return Snapshot directory path. */ @@ -113,6 +134,13 @@ public String snapshotPath() { return snpPath; } + /** + * @param snpPath Snapshot directory path. + */ + public void snapshotPath(String snpPath) { + this.snpPath = snpPath; + } + /** * @return Snapshot operation request ID. */ @@ -120,6 +148,13 @@ public UUID requestId() { return reqId; } + /** + * @param reqId Snapshot operation request ID. + */ + public void requestId(UUID reqId) { + this.reqId = reqId; + } + /** {@inheritDoc} */ @Override public short directType() { return TYPE_CODE; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java index e8e98ae20b245..bbd8617c43053 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/CacheMetricsMessage.java @@ -1009,6 +1009,11 @@ public long rebalancingBytesRate() { return rebalancingBytesRate; } + /** */ + public long estimateRebalancingFinishTime() { + return rebalanceFinishTime; + } + /** */ public long rebalancingStartTime() { return rebalanceStartTime; @@ -1149,6 +1154,11 @@ public void cacheGets(long reads) { cacheGets = reads; } + /** */ + public void cacheName(String cacheName) { + this.cacheName = cacheName; + } + /** */ public void cacheSize(long cacheSize) { this.cacheSize = cacheSize; @@ -1244,11 +1254,61 @@ public void indexBuildPartitionsLeftCount(int idxBuildPartitionsLeftCnt) { idxBuildPartitionsLeftCount = idxBuildPartitionsLeftCnt; } + /** */ + public void indexRebuildInProgress(boolean idxRebuildInProgress) { + this.idxRebuildInProgress = idxRebuildInProgress; + } + + /** */ + public void indexRebuildKeysProcessed(long idxRebuildKeyProcessed) { + this.idxRebuildKeyProcessed = idxRebuildKeyProcessed; + } + /** */ public void empty(boolean empty) { this.empty = empty; } + /** */ + public void managementEnabled(boolean managementEnabled) { + this.managementEnabled = managementEnabled; + } + + /** */ + public void readThrough(boolean readThrough) { + this.readThrough = readThrough; + } + + /** */ + public void statisticsEnabled(boolean statisticsEnabled) { + this.statisticsEnabled = statisticsEnabled; + } + + /** */ + public void storeByValue(boolean storeByVal) { + this.storeByVal = storeByVal; + } + + /** */ + public void validForReading(boolean validForReading) { + this.validForReading = validForReading; + } + + /** */ + public void validForWriting(boolean validForWriting) { + this.validForWriting = validForWriting; + } + + /** */ + public void writeBehindEnabled(boolean writeBehindEnabled) { + this.writeBehindEnabled = writeBehindEnabled; + } + + /** */ + public void writeThrough(boolean writeThrough) { + this.writeThrough = writeThrough; + } + /** */ public void keySize(int keySize) { this.keySize = keySize; @@ -1259,6 +1319,11 @@ public void keysToRebalanceLeft(long keysToRebalanceLeft) { this.keysToRebalanceLeft = keysToRebalanceLeft; } + /** */ + public void keyType(String keyType) { + this.keyType = keyType; + } + /** */ public void cacheMisses(long misses) { cacheMisses = misses; @@ -1319,6 +1384,16 @@ public void averagePutTime(float putAvgTimeNanos) { averagePutTime = putAvgTimeNanos; } + /** */ + public void puts(long puts) { + cachePuts = puts; + } + + /** */ + public void reads(long reads) { + cacheGets = reads; + } + /** */ public void rebalanceClearingPartitionsLeft(long rebalanceClearingPartitionsLeft) { this.rebalanceClearingPartitionsLeft = rebalanceClearingPartitionsLeft; @@ -1464,6 +1539,16 @@ public void txXidMapSize(int txXidMapSize) { this.txXidMapSize = txXidMapSize; } + /** */ + public void valueType(String valType) { + this.valType = valType; + } + + /** */ + public void writeBehindBufferSize(int writeBehindBufSize) { + this.writeBehindBufSize = writeBehindBufSize; + } + /** */ public void writeBehindCriticalOverflowCount(int writeBehindCriticalOverflowCnt) { this.writeBehindCriticalOverflowCnt = writeBehindCriticalOverflowCnt; @@ -1474,6 +1559,26 @@ public void writeBehindErrorRetryCount(int writeBehindErrorRetryCnt) { this.writeBehindErrorRetryCnt = writeBehindErrorRetryCnt; } + /** */ + public void writeBehindFlushFrequency(long writeBehindFlushFreq) { + this.writeBehindFlushFreq = writeBehindFlushFreq; + } + + /** */ + public void writeBehindFlushSize(int writeBehindFlushSize) { + this.writeBehindFlushSize = writeBehindFlushSize; + } + + /** */ + public void writeBehindFlushThreadCount(int writeBehindFlushThreadCnt) { + this.writeBehindFlushThreadCnt = writeBehindFlushThreadCnt; + } + + /** */ + public void writeBehindStoreBatchSize(int writeBehindStoreBatchSize) { + this.writeBehindStoreBatchSize = writeBehindStoreBatchSize; + } + /** */ public void writeBehindTotalCriticalOverflowCount(int writeBehindTotalCriticalOverflowCnt) { this.writeBehindTotalCriticalOverflowCnt = writeBehindTotalCriticalOverflowCnt; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java index 1810a9f9982fe..19049695dcf1a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java @@ -213,6 +213,13 @@ public boolean forceDeactivation() { return forceDeactivation; } + /** + * @return Timestamp. + */ + public long timestamp() { + return timestamp; + } + /** * @return State change request ID. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java index 051f5f28fc717..25aff5029324d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterMetricsUpdateMessage.java @@ -63,11 +63,25 @@ public ClusterMetricsUpdateMessage(Map allNodesMetrics return allNodesMetrics; } + /** */ + public void allNodesMetrics(@Nullable Map allNodesMetrics) { + assert allNodesMetrics == null || singleNodeMetricsMsg == null; + + this.allNodesMetrics = allNodesMetrics; + } + /** */ public @Nullable NodeFullMetricsMessage singleNodeMetricsMsg() { return singleNodeMetricsMsg; } + /** */ + public void singleNodeMetricsMsg(@Nullable NodeFullMetricsMessage singleNodeMetricsMsg) { + assert singleNodeMetricsMsg == null || allNodesMetrics == null; + + this.singleNodeMetricsMsg = singleNodeMetricsMsg; + } + /** */ public boolean singleNodeMetrics() { assert (singleNodeMetricsMsg == null && allNodesMetrics != null) || (singleNodeMetricsMsg != null && allNodesMetrics == null); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java index 9a77b3870193e..90e91aa2a5ef9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineStartResultMessage.java @@ -72,6 +72,13 @@ public ContinuousRoutineStartResultMessage() { return cntrsMap; } + /** + * @param cntrsMap Counters map. + */ + public void countersMap(@Nullable CachePartitionPartialCountersMap cntrsMap) { + this.cntrsMap = cntrsMap; + } + /** * @return Routine ID. */ @@ -79,6 +86,13 @@ public UUID routineId() { return routineId; } + /** + * @param routineId Routine ID. + */ + public void routineId(UUID routineId) { + this.routineId = routineId; + } + /** * @return Error message. */ @@ -86,6 +100,13 @@ public UUID routineId() { return errMsg; } + /** + * @param errMsg Error message. + */ + public void errorMessage(@Nullable ErrorMessage errMsg) { + this.errMsg = errMsg; + } + /** {@inheritDoc} */ @Override public short directType() { return 134; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java index 4363cf5279a3d..79d8b29a24081 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java @@ -18,7 +18,9 @@ package org.apache.ignite.internal.processors.continuous; import java.util.UUID; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; /** * @@ -34,6 +36,11 @@ public StopRoutineAckDiscoveryMessage(UUID routineId) { super(routineId); } + /** {@inheritDoc} */ + @Nullable @Override public DiscoveryCustomMessage ackMessage() { + return null; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(StopRoutineAckDiscoveryMessage.class, this, "routineId", routineId()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java index 07d867d5da15f..f6b18fd1aaa76 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java @@ -18,7 +18,9 @@ package org.apache.ignite.internal.processors.continuous; import java.util.UUID; +import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; /** * @@ -34,6 +36,11 @@ public StopRoutineDiscoveryMessage(UUID routineId) { super(routineId); } + /** {@inheritDoc} */ + @Nullable @Override public DiscoveryCustomMessage ackMessage() { + return new StopRoutineAckDiscoveryMessage(routineId); + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(StopRoutineDiscoveryMessage.class, this, "routineId", routineId()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java index 7703f7e45e4a6..f6669e3c4aa3c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java @@ -67,11 +67,21 @@ public byte platformId() { return platformId; } + /** */ + public void platformId(byte platformId) { + this.platformId = platformId; + } + /** */ public int typeId() { return typeId; } + /** */ + public void typeId(int typeId) { + this.typeId = typeId; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(MissingMappingRequestMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java index 9ce70f900a461..9423b141a0fbb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java @@ -67,6 +67,11 @@ public byte platformId() { return platformId; } + /** */ + public void platformId(byte platformId) { + this.platformId = platformId; + } + /** * */ @@ -74,6 +79,11 @@ public int typeId() { return typeId; } + /** */ + public void typeId(int typeId) { + this.typeId = typeId; + } + /** * */ @@ -81,6 +91,11 @@ public String className() { return clsName; } + /** */ + public void className(String clsName) { + this.clsName = clsName; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(MissingMappingResponseMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java index ad9dfa4270e4a..74dc88f6ade34 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageUpdateMessage.java @@ -81,6 +81,11 @@ public boolean isAckMessage() { return false; } + /** */ + public void errorMessage(String errorMsg) { + this.errorMsg = errorMsg; + } + /** */ protected String errorMessage() { return errorMsg; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java index 78237036f0891..3ae253cb1d715 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaFinishDiscoveryMessage.java @@ -82,6 +82,13 @@ public boolean hasError() { return err; } + /** + * @return Propose message. + */ + public SchemaProposeDiscoveryMessage proposeMessage() { + return proposeMsg; + } + /** * @param proposeMsg Propose message. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java index 7758f1b686cc4..f29669057ea97 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/message/SchemaOperationStatusMessage.java @@ -75,6 +75,13 @@ public UUID operationId() { return opId; } + /** + * @param opId Operation ID. + */ + public void operationId(UUID opId) { + this.opId = opId; + } + /** * @return Error code. */ @@ -82,6 +89,13 @@ public int errorCode() { return errCode; } + /** + * @param errCode Error code. + */ + public void errorCode(int errCode) { + this.errCode = errCode; + } + /** * @return Error message. */ @@ -89,6 +103,13 @@ public int errorCode() { return errMsg; } + /** + * @param errMsg Error message. + */ + public void errorMessage(String errMsg) { + this.errMsg = errMsg; + } + /** * @return Sender node ID. */ @@ -110,6 +131,13 @@ public boolean nop() { return nop; } + /** + * @param nop True if message is no-op. + */ + public void nop(boolean nop) { + this.nop = nop; + } + /** {@inheritDoc} */ @Override public short directType() { return -53; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java index 0b4841db8c744..bd77f4db9406d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java @@ -52,6 +52,13 @@ public Collection uuids() { return uuids; } + /** + * @param uuids The collection of UUIDs that was wrapped. + */ + public void uuids(Collection uuids) { + this.uuids = uuids; + } + /** {@inheritDoc} */ @Override public short directType() { return 115; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java index 1e0fe9ff83e61..795877a1940d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/TcpInverseConnectionResponseMessage.java @@ -32,6 +32,32 @@ public class TcpInverseConnectionResponseMessage implements TcpConnectionIndexAw @Order(0) int connIdx; + /** */ + public TcpInverseConnectionResponseMessage() { + } + + /** */ + public TcpInverseConnectionResponseMessage(int connIdx) { + this.connIdx = connIdx; + } + + /** {@inheritDoc} */ + @Override public int connectionIndex() { + return connIdx; + } + + /** + * @param connIdx New connection index. + */ + public void connectionIndex(int connIdx) { + this.connIdx = connIdx; + } + + /** {@inheritDoc} */ + @Override public short directType() { + return 177; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpInverseConnectionResponseMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java index fd82f326fe0e6..a39a0d38d506e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeMessage.java @@ -100,6 +100,34 @@ public UUID nodeId() { return nodeId; } + /** + * @param connIdx Connection index. + */ + public void connectionIndex(int connIdx) { + this.connIdx = connIdx; + } + + /** + * @param connectCnt Connect count. + */ + public void connectCount(long connectCnt) { + this.connectCnt = connectCnt; + } + + /** + * @param rcvCnt Number of received messages. + */ + public void received(long rcvCnt) { + this.rcvCnt = rcvCnt; + } + + /** + * @param nodeId Node ID. + */ + public void nodeId(UUID nodeId) { + this.nodeId = nodeId; + } + /** * @return Message size in bytes. */ diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java index 84cc53e433560..b1f95a8fb92a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/HandshakeWaitMessage.java @@ -20,6 +20,8 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.plugin.extensions.communication.Message; +import static org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi.HANDSHAKE_WAIT_MSG_TYPE; + /** * Message requesting to wait until node's SPI context initialize. */ @@ -27,6 +29,18 @@ public class HandshakeWaitMessage implements Message { /** Full message size (with message type) in bytes. */ public static final int MESSAGE_FULL_SIZE = DIRECT_TYPE_SIZE; + /** + * Default constructor. + */ + public HandshakeWaitMessage() { + // No-op. + } + + /** {@inheritDoc} */ + @Override public short directType() { + return HANDSHAKE_WAIT_MSG_TYPE; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(HandshakeWaitMessage.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java index 224f8d5397416..6adb5d5fb8fb9 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/NodeIdMessage.java @@ -58,6 +58,13 @@ public UUID nodeId() { return nodeId; } + /** + * @param nodeId Node ID bytes. + */ + public void nodeId(UUID nodeId) { + this.nodeId = nodeId; + } + /** {@inheritDoc} */ @Override public short directType() { return TcpCommunicationSpi.NODE_ID_MSG_TYPE; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java index 05a13078110c9..3d48933edf484 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/messages/RecoveryLastReceivedMessage.java @@ -74,6 +74,13 @@ public long received() { return rcvCnt; } + /** + * @param rcvCnt Number of received messages. + */ + public void received(long rcvCnt) { + this.rcvCnt = rcvCnt; + } + /** {@inheritDoc} */ @Override public short directType() { return TcpCommunicationSpi.RECOVERY_LAST_ID_MSG_TYPE; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java index 74981891c3803..d24b4bba61d99 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetAddressMessage.java @@ -46,6 +46,16 @@ public InetAddressMessage(InetAddress addr) { addrBytes = addr.getAddress(); } + /** @return {@link InetAddress#getAddress()} */ + public byte[] addressBytes() { + return addrBytes; + } + + /** @param addrBytes {@link InetAddress#getAddress()} */ + public void addressBytes(byte[] addrBytes) { + this.addrBytes = addrBytes; + } + /** @return {@link InetAddress#getByAddress(String, byte[])} */ public InetAddress address() { try { @@ -56,6 +66,16 @@ public InetAddress address() { } } + /** @return Host name. */ + public String hostName() { + return hostName; + } + + /** @param hostName Host name. */ + public void hostName(String hostName) { + this.hostName = hostName; + } + /** {@inheritDoc} */ @Override public short directType() { return -100; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java index f23d7d7cf80f4..bcc535e9df1f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/InetSocketAddressMessage.java @@ -52,6 +52,11 @@ public int port() { return port; } + /** @param port Port. */ + public void port(int port) { + this.port = port; + } + /** {@inheritDoc} */ @Override public short directType() { return -101; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java index d5653d3d78b25..6408fc2b06c90 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java @@ -130,6 +130,15 @@ public IgniteUuid id() { return id; } + /** + * Sets message ID. + * + * @param id Message ID. + */ + public void id(IgniteUuid id) { + this.id = id; + } + /** * Gets sender node ID. * @@ -291,6 +300,20 @@ public void failedNodes(@Nullable Set failedNodes) { return failedNodes; } + /** + * @return Flags. + */ + public int flags() { + return flags; + } + + /** + * @param flags New flags. + */ + public void flags(int flags) { + this.flags = flags; + } + /** {@inheritDoc} */ @Override public boolean equals(Object obj) { if (this == obj) diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java index c05cda06e4888..694eaf6c97697 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAuthFailedMessage.java @@ -63,6 +63,21 @@ public UUID targetNodeId() { return targetNodeId; } + /** @param targetNodeId Node for which authentication was failed. */ + public void targetNodeId(UUID targetNodeId) { + this.targetNodeId = targetNodeId; + } + + /** @return Creator address message. */ + public InetAddressMessage creatorAddressMessage() { + return creatorAddrMsg; + } + + /** @param addr Creator address message. */ + public void creatorAddressMessage(InetAddressMessage addr) { + this.creatorAddrMsg = addr; + } + /** @return Creator address. */ public InetAddress creatorAddress() { return creatorAddrMsg.address(); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java index 46d5531d1785b..b72f0dd57d72d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCheckFailedMessage.java @@ -56,6 +56,13 @@ public String error() { return err; } + /** + * @param err message from coordinator. + */ + public void error(String err) { + this.err = err; + } + /** {@inheritDoc} */ @Override public short directType() { return 0; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java index 61cb68449e7fd..49db31403bf33 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientMetricsUpdateMessage.java @@ -63,6 +63,15 @@ public TcpDiscoveryNodeMetricsMessage metricsMessage() { return metricsMsg; } + /** + * Sets the metrics message. + * + * @param metricsMsg Metrics holder message. + */ + public void metricsMessage(TcpDiscoveryNodeMetricsMessage metricsMsg) { + this.metricsMsg = metricsMsg; + } + /** {@inheritDoc} */ @Override public short directType() { return 13; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java index e38aacd7b2a4f..3cf1784da5600 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryConnectionCheckMessage.java @@ -47,6 +47,16 @@ public TcpDiscoveryConnectionCheckMessage(TcpDiscoveryNode creatorNode) { super(creatorNode.id()); } + /** {@inheritDoc} */ + @Override public boolean traceLogLevel() { + return true; + } + + /** {@inheritDoc} */ + @Override public short directType() { + return 6; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryConnectionCheckMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java index a82beeaa4d4ea..1e212a2e9b554 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDiscardMessage.java @@ -67,6 +67,13 @@ public IgniteUuid messageId() { return msgId; } + /** + * @param msgId Message ID. + */ + public void messageId(IgniteUuid msgId) { + this.msgId = msgId; + } + /** * Flag indicating whether the ID to discard is for a custom message or not. * @@ -76,6 +83,13 @@ public boolean customMessageDiscard() { return customMsgDiscard; } + /** + * @param customMsgDiscard Custom message flag. + */ + public void customMessageDiscard(boolean customMsgDiscard) { + this.customMsgDiscard = customMsgDiscard; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryDiscardMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java index 9e0e249ea5fae..93966689201df 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryDuplicateIdMessage.java @@ -60,6 +60,13 @@ public UUID nodeId() { return nodeId; } + /** + * @param nodeId Node with duplicate ID. + */ + public void nodeId(UUID nodeId) { + this.nodeId = nodeId; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryDuplicateIdMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java index 6193b7726910a..50e4e1efcf187 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryLoopbackProblemMessage.java @@ -66,6 +66,13 @@ public Collection addresses() { return addrs; } + /** + * @param addrs Remote node addresses. + */ + public void addresses(Collection addrs) { + this.addrs = addrs; + } + /** * @return Remote node host names. */ @@ -73,6 +80,13 @@ public Collection hostNames() { return hostNames; } + /** + * @param hostNames Remote node host names. + */ + public void hostNames(Collection hostNames) { + this.hostNames = hostNames; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryLoopbackProblemMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java index 33e7a0e4fa87f..b11b9e77a4835 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryMetricsUpdateMessage.java @@ -182,11 +182,21 @@ public Map serversFullMetricsMessages( return serversFullMetricsMsgs; } + /** @param serversFullMetricsMsgs Map of server full metrics messages. */ + public void serversFullMetricsMessages(Map serversFullMetricsMsgs) { + this.serversFullMetricsMsgs = serversFullMetricsMsgs; + } + /** @return Map of nodes metrics messages. */ public @Nullable Map connectedClientsMetricsMessages() { return connectedClientsMetricsMsgs; } + /** @param connectedClientsMetricsMsgs Map of nodes metrics messages. */ + public void connectedClientsMetricsMessages(Map connectedClientsMetricsMsgs) { + this.connectedClientsMetricsMsgs = connectedClientsMetricsMsgs; + } + /** * Gets client node IDs. * @@ -196,6 +206,15 @@ public Map serversFullMetricsMessages( return clientNodeIds; } + /** + * Sets client node IDs. + * + * @param clientNodeIds Client node IDs. + */ + public void clientNodeIds(@Nullable Set clientNodeIds) { + this.clientNodeIds = clientNodeIds; + } + /** * Adds client node ID. * diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java index e8bd7c7ad2a73..96a9b1582af60 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddFinishedMessage.java @@ -96,6 +96,13 @@ public UUID nodeId() { return nodeId; } + /** + * @param nodeId ID of the node added. + */ + public void nodeId(UUID nodeId) { + this.nodeId = nodeId; + } + /** * @return Discovery data for joined client. */ @@ -126,6 +133,20 @@ public void clientNodeAttributes(Map clientNodeAttrs) { this.clientNodeAttrs = clientNodeAttrs; } + /** + * @return Serialized client node attributes. + */ + public @Nullable byte[] clientNodeAttributesBytes() { + return clientNodeAttrsBytes; + } + + /** + * @param clientNodeAttrsBytes Serialized client node attributes. + */ + public void clientNodeAttributesBytes(@Nullable byte[] clientNodeAttrsBytes) { + this.clientNodeAttrsBytes = clientNodeAttrsBytes; + } + /** * @param marsh Marshaller. */ diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java index 14cd0fcafc24f..db9789966ce52 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeFailedMessage.java @@ -90,6 +90,13 @@ public UUID failedNodeId() { return failedNodeId; } + /** + * @param failedNodeId ID of the failed node. + */ + public void failedNodeId(UUID failedNodeId) { + this.failedNodeId = failedNodeId; + } + /** * @return Internal order of the failed node. */ @@ -97,6 +104,13 @@ public long internalOrder() { return order; } + /** + * @param order Internal order of the failed node. + */ + public void internalOrder(long order) { + this.order = order; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryNodeFailedMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java index 949c73348c7b0..8e70196ab051b 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeLeftMessage.java @@ -46,6 +46,11 @@ public TcpDiscoveryNodeLeftMessage(UUID creatorNodeId) { super(creatorNodeId); } + /** {@inheritDoc} */ + @Override public short directType() { + return 16; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(TcpDiscoveryNodeLeftMessage.class, this, "super", super.toString()); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java index 4dc212ff0c677..b9db8228b9c4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryRingLatencyCheckMessage.java @@ -62,6 +62,16 @@ public void onRead() { curHops++; } + /** @return Current hops reached. */ + public int currentHops() { + return curHops; + } + + /** @param curHop Current hops reached. */ + public void currentHops(int curHop) { + curHops = curHop; + } + /** * @return Maximal hops number. */ @@ -69,6 +79,11 @@ public int maximalHops() { return maxHops; } + /** @param maxHops Maximal hops. */ + public void maximalHops(int maxHops) { + this.maxHops = maxHops; + } + /** * @return {@code True} if max hops reached. */ diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java index 2cd673ebaf587..914065189ed45 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryStatusCheckMessage.java @@ -98,6 +98,24 @@ public TcpDiscoveryStatusCheckMessage( .collect(Collectors.toList()); } + /** + * Gets creator node addresses. + * + * @return Creator node addresses. + */ + public @Nullable Collection creatorNodeAddressesMessages() { + return creatorNodeAddrsMsgs; + } + + /** + * Sets creator node addresses. + * + * @param creatorNodeAddrsMsgs Creator node addresses. + */ + public void creatorNodeAddressesMessages(@Nullable Collection creatorNodeAddrsMsgs) { + this.creatorNodeAddrsMsgs = creatorNodeAddrsMsgs; + } + /** * Gets failed node id. * @@ -107,6 +125,15 @@ public TcpDiscoveryStatusCheckMessage( return failedNodeId; } + /** + * Sets failed node id. + * + * @param failedNodeId Failed node id. + */ + public void failedNodeId(@Nullable UUID failedNodeId) { + this.failedNodeId = failedNodeId; + } + /** * Gets creator status. * diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java index 335f36922cf7d..33e4a69cefe18 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java @@ -79,6 +79,13 @@ public IgniteUuid id() { return id; } + /** + * @return Bytes. + */ + public byte[] bytes() { + return bytes; + } + /** * @param bytes Bytes. */ diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java index 6cd5be51f1859..ca1efba8e77ce 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java @@ -87,6 +87,13 @@ public void payload(byte[] payload) { this.payload = payload; } + /** + * @return Network payload. + */ + public byte[] payload() { + return payload; + } + /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java index fb17594dd765d..9b7476c5355f5 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveFinishMessage.java @@ -20,6 +20,7 @@ import java.util.UUID; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; +import org.jetbrains.annotations.Nullable; /** * @@ -46,11 +47,21 @@ class ZkCommunicationErrorResolveFinishMessage implements DiscoverySpiCustomMess this.topVer = topVer; } + /** {@inheritDoc} */ + @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { + return null; + } + /** {@inheritDoc} */ @Override public boolean isMutable() { return false; } + /** {@inheritDoc} */ + @Override public boolean stopProcess() { + return false; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(ZkCommunicationErrorResolveFinishMessage.class, this); diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java index 31864fe087e02..0c79c36aee0a9 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkCommunicationErrorResolveStartMessage.java @@ -20,6 +20,7 @@ import java.util.UUID; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; +import org.jetbrains.annotations.Nullable; /** * Zk Communication Error Resolve Start Message. @@ -38,11 +39,21 @@ public class ZkCommunicationErrorResolveStartMessage implements DiscoverySpiCust this.id = id; } + /** {@inheritDoc} */ + @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { + return null; + } + /** {@inheritDoc} */ @Override public boolean isMutable() { return false; } + /** {@inheritDoc} */ + @Override public boolean stopProcess() { + return false; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(ZkCommunicationErrorResolveStartMessage.class, this); diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java index e7139d39c75ca..de7291c0d453c 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkForceNodeFailMessage.java @@ -19,6 +19,7 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; +import org.jetbrains.annotations.Nullable; /** * Zk Force Node Fail Message. @@ -42,11 +43,21 @@ public class ZkForceNodeFailMessage implements DiscoverySpiCustomMessage, ZkInte this.warning = warning; } + /** {@inheritDoc} */ + @Nullable @Override public DiscoverySpiCustomMessage ackMessage() { + return null; + } + /** {@inheritDoc} */ @Override public boolean isMutable() { return false; } + /** {@inheritDoc} */ + @Override public boolean stopProcess() { + return false; + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(ZkForceNodeFailMessage.class, this); diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkInternalJoinErrorMessage.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkInternalJoinErrorMessage.java index 7e2f9dab12011..a73312cfecf05 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkInternalJoinErrorMessage.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkInternalJoinErrorMessage.java @@ -27,6 +27,9 @@ class ZkInternalJoinErrorMessage implements ZkInternalMessage { /** */ transient boolean notifyNode = true; + /** */ + final long nodeInternalId; + /** */ final String err; @@ -35,6 +38,7 @@ class ZkInternalJoinErrorMessage implements ZkInternalMessage { * @param err Error message. */ ZkInternalJoinErrorMessage(long nodeInternalId, String err) { + this.nodeInternalId = nodeInternalId; this.err = err; } } From a4b9ff302c3c0b7d4181f595fac639997178cc06 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Fri, 20 Feb 2026 18:36:09 +0300 Subject: [PATCH 34/42] Update modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java Co-authored-by: Ilya Shishkov --- .../org/apache/ignite/internal/MessageSerializerGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java index a003c0d004559..8b20f64228b6a 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java @@ -316,7 +316,7 @@ private void readField(VariableElement field, int opt) throws Exception { private void returnFalseIfWriteFailed(VariableElement field) throws Exception { String methodName = field.getAnnotation(Order.class).method(); - String getExpr = (F.isEmpty(methodName) ? field.getSimpleName().toString() : methodName + "()"); + String getExpr = F.isEmpty(methodName) ? field.getSimpleName().toString() : methodName + "()"; TypeMirror type = field.asType(); From 9c703e27e7bacd55a37f1804a72f8eaa36f0f3e4 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Fri, 20 Feb 2026 18:36:22 +0300 Subject: [PATCH 35/42] Update modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java Co-authored-by: Ilya Shishkov --- .../org/apache/ignite/internal/MessageSerializerGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java index 8b20f64228b6a..3cf91d3b0b523 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java @@ -460,7 +460,7 @@ private String typeNameToFieldName(String typeName) { } /** - * Generate code of writing header: + * Generate code of writing header. * 
      * if (!writer.writeHeader(msg.directType()))
      *     return false;

From 99b6f100479e83ca575f2f0e762ec9902302971f Mon Sep 17 00:00:00 2001
From: Anton Vinogradov 
Date: Fri, 20 Feb 2026 18:36:30 +0300
Subject: [PATCH 36/42] Update
 modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java

Co-authored-by: Ilya Shishkov 
---
 .../org/apache/ignite/internal/MessageSerializerGenerator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
index 3cf91d3b0b523..269407c73eeac 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java
@@ -728,7 +728,7 @@ private PrimitiveType unboxedType(TypeMirror type) {
     }
 
     /**
-     * Generate code of reading single field:
+     * Generate code of reading single field.
      *
      * @param field Field.
      * @param mtd Method name.

From 85d55128854adadaa99f80143904e5c1970273a9 Mon Sep 17 00:00:00 2001
From: Mikhail Petrov <32207922+petrov-mg@users.noreply.github.com>
Date: Fri, 20 Feb 2026 00:54:27 +0300
Subject: [PATCH 37/42] IGNITE-17836 Fixed flaky GridCache*FailoverSelfTests
 (#12763)

---
 .../cache/GridCacheAbstractFailoverSelfTest.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index e9c7db06a7a85..fac3ccf9978c6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@ -29,7 +29,6 @@
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
-import org.apache.ignite.internal.util.lang.GridAbsPredicate;
 import org.apache.ignite.internal.util.typedef.CA;
 import org.apache.ignite.internal.util.typedef.CIX1;
 import org.apache.ignite.internal.util.typedef.G;
@@ -156,6 +155,12 @@ protected void testTopologyChange(@Nullable TransactionConcurrency concurrency,
 
         Ignite g = startGrid(NEW_IGNITE_INSTANCE_NAME);
 
+        // We need to wait for the local Cache Affinity Version to be updated on each node after the rebalance is complete.
+        // Otherwise, the IgniteCache#size() call may be made while the Cache Affinity Version change is still in process.
+        // It can lead to the situation when some nodes calculate the local cache size based on the updated Affinity version,
+        // while others relies on the old one. As a result, the IgniteCache#size() value will not match the expected value.
+        awaitPartitionMapExchange();
+
         check(cache(g), ENTRY_CNT);
 
         int half = ENTRY_CNT / 2;
@@ -374,11 +379,7 @@ private void remove(Ignite ignite, IgniteCache cache, final int
      * @throws Exception If failed.
      */
     private void check(final IgniteCache cache, final int expSize) throws Exception {
-        GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override public boolean apply() {
-                return cache.size() >= expSize;
-            }
-        }, 5000);
+        GridTestUtils.waitForCondition(() -> cache.size() >= expSize, 5000);
 
         int size = cache.size();
 

From 029ca55012cbaf3cfa8dfea37f95a3e00b5c19cb Mon Sep 17 00:00:00 2001
From: Mikhail Petrov <32207922+petrov-mg@users.noreply.github.com>
Date: Fri, 20 Feb 2026 00:57:59 +0300
Subject: [PATCH 38/42] IGNITE-27911 Fixed flaky
 ContinuousQueryBuffersCleanupTest (#12769)

---
 ...ava => TestCacheContinuousQueryUtils.java} |  2 +-
 .../ContinuousQueryBuffersCleanupTest.java    | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)
 rename modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/{TestCacheConrinuousQueryUtils.java => TestCacheContinuousQueryUtils.java} (97%)

diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/TestCacheConrinuousQueryUtils.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/TestCacheContinuousQueryUtils.java
similarity index 97%
rename from modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/TestCacheConrinuousQueryUtils.java
rename to modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/TestCacheContinuousQueryUtils.java
index 9f1882005614c..61d1bfba4ca9a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/TestCacheConrinuousQueryUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/TestCacheContinuousQueryUtils.java
@@ -21,7 +21,7 @@
 import org.apache.ignite.internal.util.GridAtomicLong;
 
 /** */
-public class TestCacheConrinuousQueryUtils {
+public class TestCacheContinuousQueryUtils {
     /** */
     public static Map partitionContinuesQueryEntryBuffers(
         CacheContinuousQueryHandler hnd
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/ContinuousQueryBuffersCleanupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/ContinuousQueryBuffersCleanupTest.java
index 26187fe8050e4..8f453ca4a876e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/ContinuousQueryBuffersCleanupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/ContinuousQueryBuffersCleanupTest.java
@@ -29,7 +29,6 @@
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.Ignition;
-import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
 import org.apache.ignite.cache.query.ContinuousQuery;
 import org.apache.ignite.cache.query.Query;
 import org.apache.ignite.cache.query.QueryCursor;
@@ -39,6 +38,7 @@
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.TestRecordingCommunicationSpi;
+import org.apache.ignite.internal.processors.cache.distributed.GridCacheModuloAffinityFunction;
 import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicSingleUpdateRequest;
 import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEntry;
 import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEventBuffer;
@@ -48,14 +48,16 @@
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
 
+import static java.util.Collections.singletonMap;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 import static org.apache.ignite.internal.TestRecordingCommunicationSpi.spi;
+import static org.apache.ignite.internal.processors.cache.distributed.GridCacheModuloAffinityFunction.IDX_ATTR;
 import static org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler.DFLT_CONTINUOUS_QUERY_BACKUP_ACK_THRESHOLD;
-import static org.apache.ignite.internal.processors.cache.query.continuous.TestCacheConrinuousQueryUtils.backupQueueSize;
-import static org.apache.ignite.internal.processors.cache.query.continuous.TestCacheConrinuousQueryUtils.bufferedEntries;
-import static org.apache.ignite.internal.processors.cache.query.continuous.TestCacheConrinuousQueryUtils.maxReceivedBackupAcknowledgeUpdateCounter;
-import static org.apache.ignite.internal.processors.cache.query.continuous.TestCacheConrinuousQueryUtils.partitionContinuesQueryEntryBuffers;
+import static org.apache.ignite.internal.processors.cache.query.continuous.TestCacheContinuousQueryUtils.backupQueueSize;
+import static org.apache.ignite.internal.processors.cache.query.continuous.TestCacheContinuousQueryUtils.bufferedEntries;
+import static org.apache.ignite.internal.processors.cache.query.continuous.TestCacheContinuousQueryUtils.maxReceivedBackupAcknowledgeUpdateCounter;
+import static org.apache.ignite.internal.processors.cache.query.continuous.TestCacheContinuousQueryUtils.partitionContinuesQueryEntryBuffers;
 import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;
 
 /** */
@@ -66,6 +68,7 @@ public class ContinuousQueryBuffersCleanupTest extends GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         return super.getConfiguration(igniteInstanceName)
+            .setUserAttributes(singletonMap(IDX_ATTR, getTestIgniteInstanceIndex(igniteInstanceName)))
             .setCommunicationSpi(new TestRecordingCommunicationSpi()
                 .setAckSendThreshold(1));
     }
@@ -77,11 +80,11 @@ public class ContinuousQueryBuffersCleanupTest extends GridCommonAbstractTest {
 
     /** */
     @Test
-    public void testBackupUpdateAndBackupContinuusQueryAcknowledgmentReordered() throws Exception {
+    public void testBackupUpdateAndBackupContinuousQueryAcknowledgmentReordered() throws Exception {
         startGrids(2);
 
         IgniteCache cache = grid(0).createCache(new CacheConfiguration<>()
-            .setAffinity(new RendezvousAffinityFunction().setPartitions(2))
+            .setAffinity(new GridCacheModuloAffinityFunction(2, 1))
             .setName(DEFAULT_CACHE_NAME)
             .setBackups(1));
 
@@ -97,7 +100,7 @@ public void testBackupUpdateAndBackupContinuusQueryAcknowledgmentReordered() thr
 
         // Here we are waiting for initialization of CQ entry buffers on backup node, otherwise backup node will ignore
         // acknowledgements.
-        assertTrue(waitForCondition(() -> !continuosQueryEntryBuffers(grid(1)).isEmpty(), getTestTimeout()));
+        assertTrue(waitForCondition(() -> !continuousQueryEntryBuffers(grid(1)).isEmpty(), getTestTimeout()));
 
         spi(grid(0)).blockMessages(GridDhtAtomicSingleUpdateRequest.class, grid(1).name());
 
@@ -111,7 +114,7 @@ public void testBackupUpdateAndBackupContinuusQueryAcknowledgmentReordered() thr
 
         assertTrue(cqListenerNotifiedLatch.await(getTestTimeout(), MILLISECONDS));
 
-        CacheContinuousQueryEventBuffer buf = continuosQueryEntryBuffers(grid(1)).get(part);
+        CacheContinuousQueryEventBuffer buf = continuousQueryEntryBuffers(grid(1)).get(part);
 
         assertTrue(waitForCondition(() -> maxReceivedBackupAcknowledgeUpdateCounter(buf).get() == 2, getTestTimeout()));
 
@@ -129,7 +132,7 @@ public void testContinuousQueryBuffersCleanup() throws Exception {
 
         try (IgniteClient thinCli = Ignition.startClient(new ClientConfiguration().setAddresses("127.0.0.1:10800"))) {
             grid(0).createCache(new CacheConfiguration()
-                .setAffinity(new RendezvousAffinityFunction().setPartitions(2))
+                .setAffinity(new GridCacheModuloAffinityFunction(2, 1))
                 .setName(DEFAULT_CACHE_NAME)
                 .setWriteSynchronizationMode(FULL_SYNC)
                 .setBackups(1));
@@ -149,7 +152,7 @@ private void checkBuffersCleared(int primaryNodeIdx, Function, QueryCur
 
         int cacheOpRounds = Math.round(DFLT_CONTINUOUS_QUERY_BACKUP_ACK_THRESHOLD * 0.3f);
 
-        // We repeatedly perform 5 cache operations that raise CREATE, UPDATE, REMOVED, EXPIRIED events.
+        // We repeatedly perform 5 cache operations that raise CREATE, UPDATE, REMOVED, EXPIRED events.
         // The total number of events is selected in a such way as to check for a backup notification due to a
         // buffer overflow, and then by timeout.
         int expEvtsCnt = cacheOpRounds * 5;
@@ -215,7 +218,7 @@ private boolean isContinuesQueryBufferEmpty(Ignite ignite) {
     }
 
     /** */
-    private Map continuosQueryEntryBuffers(IgniteEx ignite) {
+    private Map continuousQueryEntryBuffers(IgniteEx ignite) {
         GridContinuousProcessor contProc = ignite.context().continuous();
 
         return partitionContinuesQueryEntryBuffers(

From ba6dfc5fd791d0f9174799244a992fbf9f224ae0 Mon Sep 17 00:00:00 2001
From: Mikhail Petrov <32207922+petrov-mg@users.noreply.github.com>
Date: Fri, 20 Feb 2026 01:00:40 +0300
Subject: [PATCH 39/42] IGNITE-27913 Fixed flaky MultipleSSLContextsTest
 (#12772)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thank you for submitting the pull request to the Apache Ignite.

In order to streamline the review of the contribution
we ask you to ensure the following steps have been taken:

### The Contribution Checklist
- [ ] There is a single JIRA ticket related to the pull request.
- [ ] The web-link to the pull request is attached to the JIRA ticket.
- [ ] The JIRA ticket has the _Patch Available_ state.
- [ ] The pull request body describes changes that have been made.
The description explains _WHAT_ and _WHY_ was made instead of _HOW_.
- [ ] The pull request title is treated as the final commit message.
The following pattern must be used: `IGNITE-XXXX Change summary` where
`XXXX` - number of JIRA issue.
- [ ] A reviewer has been mentioned through the JIRA comments
(see [the Maintainers
list](https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute#HowtoContribute-ReviewProcessandMaintainers))
- [ ] The pull request has been checked by the Teamcity Bot and
the `green visa` attached to the JIRA ticket (see [TC.Bot: Check
PR](https://mtcga.gridgain.com/prs.html))

### Notes
- [How to
Contribute](https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute)
- [Coding abbreviation
rules](https://cwiki.apache.org/confluence/display/IGNITE/Abbreviation+Rules)
- [Coding
Guidelines](https://cwiki.apache.org/confluence/display/IGNITE/Coding+Guidelines)
- [Apache Ignite Teamcity
Bot](https://cwiki.apache.org/confluence/display/IGNITE/Apache+Ignite+Teamcity+Bot)

If you need any help, please email dev@ignite.apache.org or ask anу
advice on http://asf.slack.com _#ignite_ channel.
---
 .../ignite/ssl/MultipleSSLContextsTest.java   | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/ignite/ssl/MultipleSSLContextsTest.java b/modules/core/src/test/java/org/apache/ignite/ssl/MultipleSSLContextsTest.java
index 2054438757274..53de153133baa 100644
--- a/modules/core/src/test/java/org/apache/ignite/ssl/MultipleSSLContextsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/ssl/MultipleSSLContextsTest.java
@@ -34,6 +34,7 @@
 import org.apache.ignite.configuration.ClientConnectorConfiguration;
 import org.apache.ignite.configuration.ConnectorConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
@@ -43,6 +44,9 @@
  * trust stores. SSL for all three transports are enabled at the same time.
  */
 public class MultipleSSLContextsTest extends GridCommonAbstractTest {
+    /** */
+    private static final int SRV_NODES_CNT = 3;
+
     /** */
     private boolean clientMode = false;
 
@@ -102,15 +106,14 @@ private Factory thinClientSSLFactory() {
     }
 
     /**
-     * @param addr Address of a node to connect to.
+     * @param port Port to connect to.
      * @return {@link ClientConfiguration} that can be used to start a thin client.
      */
-    private ClientConfiguration clientConfiguration(String addr) {
-        ClientConfiguration clientCfg = new ClientConfiguration().setAddresses(addr);
-        clientCfg.setSslContextFactory(thinClientSSLFactory());
-        clientCfg.setSslMode(SslMode.REQUIRED);
-
-        return clientCfg;
+    private ClientConfiguration clientConfiguration(int port) {
+        return new ClientConfiguration()
+            .setAddresses("127.0.0.1:" + port)
+            .setSslContextFactory(thinClientSSLFactory())
+            .setSslMode(SslMode.REQUIRED);
     }
 
     /**
@@ -123,7 +126,8 @@ private Factory connectorSSLFactory() {
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
         clientMode = false;
-        startGrids(3);
+
+        startGrids(SRV_NODES_CNT);
     }
 
     /**
@@ -171,14 +175,10 @@ public void testThickClients() throws Exception {
         }
     }
 
-    /**
-     * Checks that thin clients with SSL enabled can join the cluster and perform some work on it.
-     *
-     * @throws Exception If failed.
-     */
+    /** Checks that thin clients with SSL enabled can join the cluster and perform some work on it. */
     @Test
-    public void testThinClients() throws Exception {
-        int clientsNum = 3;
+    public void testThinClients() {
+        int clientsNum = SRV_NODES_CNT;
         int keysNum = 1000;
         String cacheName = "thinClientCache";
 
@@ -186,7 +186,7 @@ public void testThinClients() throws Exception {
 
         try {
             for (int i = 0; i < clientsNum; i++) {
-                IgniteClient client = Ignition.startClient(clientConfiguration("127.0.0.1:1080" + i));
+                IgniteClient client = connectIgniteClientTo(grid(i));
 
                 clients.add(client);
             }
@@ -239,4 +239,9 @@ private void assertCacheContent(Map exp, IgniteCache
Date: Fri, 20 Feb 2026 18:40:05 +0300
Subject: [PATCH 41/42] WIP

---
 .../core/src/test/resources/codegen/TestMessage.java | 12 ++++++++++--
 .../resources/codegen/TestMessageSerializer.java     |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/core/src/test/resources/codegen/TestMessage.java b/modules/core/src/test/resources/codegen/TestMessage.java
index 104f64c324d4c..3e9812f905d40 100644
--- a/modules/core/src/test/resources/codegen/TestMessage.java
+++ b/modules/core/src/test/resources/codegen/TestMessage.java
@@ -62,8 +62,8 @@ public class TestMessage implements Message {
     @Order(10)
     BitSet bitSet;
 
-    @Order(11)
-    String field;
+    @Order(value = 11, method = "overridenFieldMethod")
+    private String field;
 
     @Order(12)
     KeyCacheObject keyCacheObject;
@@ -74,6 +74,14 @@ public class TestMessage implements Message {
     @Order(14)
     GridLongList gridLongList;
 
+    public String overridenFieldMethod() {
+        return field;
+    }
+
+    public void overridenFieldMethod(String field) {
+        this.field = field;
+    }
+
     public short directType() {
         return 0;
     }
diff --git a/modules/core/src/test/resources/codegen/TestMessageSerializer.java b/modules/core/src/test/resources/codegen/TestMessageSerializer.java
index 0d567043c5625..10a7eb4a8a884 100644
--- a/modules/core/src/test/resources/codegen/TestMessageSerializer.java
+++ b/modules/core/src/test/resources/codegen/TestMessageSerializer.java
@@ -110,7 +110,7 @@ public class TestMessageSerializer implements MessageSerializer {
                 writer.incrementState();
 
             case 11:
-                if (!writer.writeString(((TestMessage)msg).field))
+                if (!writer.writeString(msg.overridenFieldMethod()))
                     return false;
 
                 writer.incrementState();
@@ -231,7 +231,7 @@ public class TestMessageSerializer implements MessageSerializer {
                 reader.incrementState();
 
             case 11:
-                ((TestMessage)msg).field = reader.readString();
+                msg.overridenFieldMethod(reader.readString());
 
                 if (!reader.isLastRead())
                     return false;

From 379b012ee020545fe55fa16cb1307468e4de8108 Mon Sep 17 00:00:00 2001
From: Anton Vinogradov 
Date: Fri, 20 Feb 2026 18:47:58 +0300
Subject: [PATCH 42/42] WIP

---
 .../java/org/apache/ignite/internal/MessageProcessor.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java
index 933ee9cffa77a..30cd08f930f1c 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java
@@ -48,15 +48,12 @@
  * 

  * The generated serializer follows the naming convention: {@code [MessageClassName]Serializer}.
  * 

- * Only fields annotated with {@link Order} and accessed through matching accessor methods
- * (i.e., {@code fieldName()} and {@code fieldName(value)}) are included in the serialization logic.
+ * Only fields annotated with {@link Order} are included in the serialization logic.
  * 

  * Usage Requirements:
  * 
    
  *   
  • The target class must implement the {@code Message} interface.
    • 
  *   
  • Each field to be serialized must be annotated with {@code @Order}.
    • 
- *   
  • By default, each serializing field must have a getter named {@code fieldName()} and
- *   a setter named {@code fieldName(value)}.
    • 
  *   
  • If {@link Order#method()} attribute was set, then each serializing field
  *   must have a getter named {@code method()} and a setter named {@code method(value)}.
    • 
  *