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..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 @@ -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; @@ -60,8 +60,8 @@ public class ColocationGroup implements CalciteMessage { private boolean primaryAssignment; /** Marshalled assignments serialization call holder. */ - @Order(2) - private int[] marshalledAssignments; + @Order(value = 2, method = "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/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)}.
    • *
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..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 @@ -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; @@ -50,6 +51,7 @@ 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; @@ -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,11 @@ public class MessageSerializerGenerator { void generate(TypeElement type, List fields) throws Exception { generateMethods(type, fields); - imports.add(type.getQualifiedName().toString()); + SystemViewRowAttributeWalkerProcessor.superclasses(env, type).forEach(el -> imports.add(el.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); @@ -148,9 +147,9 @@ void generate(TypeElement type, List fields) throws Exception { } /** 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); @@ -212,34 +211,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")); } /** @@ -268,14 +267,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--; @@ -296,14 +295,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--; @@ -317,14 +316,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 +335,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 +350,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 +371,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 +399,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 +439,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,37 +460,64 @@ 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;
      *
*/ 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--; + } + + /** + * 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(identedLine("if (!%s(((%s)msg).%s))", accessor, field.getEnclosingElement().getSimpleName(), argsStr)); + else + code.add(identedLine("if (!%s(msg.%s))", accessor, argsStr)); + + indent++; + + code.add(identedLine(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(identedLine("if (!%s(%s(((%s)msg).%s)))", + writerCall, mapperCall, field.getEnclosingElement().getSimpleName(), fieldGetterCall)); + else + 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--; } @@ -505,14 +530,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 +545,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 +555,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 +567,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 +583,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 +628,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 +639,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 @@ -707,58 +728,61 @@ private PrimitiveType unboxedType(TypeMirror type) { } /** - * Generate code of reading single field: - * 
-     * msg.id(reader.readInt());
-     *
-     * if (!reader.isLastRead())
-     *     return false;
-     *
+ * Generate code of reading single field. * - * @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(identedLine("((%s)msg).%s = %s(%s);", + field.getEnclosingElement().getSimpleName(), field.getSimpleName().toString(), mtd, argsStr)); + else + 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--; } /** * 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 - read.add(line("msg.%s(%s(%s, reader.readByte()));", msgSetterName, mapperDecodeCallStmnt, enumValuesFieldName)); + readOp = line("%s(%s, reader.readByte())", mapperDecodeCallStmnt, enumValuesFieldName); + + 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)); + else + 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--; } @@ -770,10 +794,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;")); } /** @@ -781,7 +805,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++) @@ -792,6 +816,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()) @@ -800,9 +837,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/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/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..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 @@ -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; @@ -58,34 +58,34 @@ public class GridJobExecuteResponse implements Message { * Wraps also possible serialization error. */ @Order(value = 3, method = "exceptionMessage") - private @Nullable ErrorMessage gridExMsg; + @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..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,8 +35,8 @@ public class IndexKeyTypeMessage implements Message { private @Nullable IndexKeyType val; /** Code. */ - @Order(0) - private byte code = NULL_VALUE_CODE; + @Order(value = 0, method = "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 1dc8af2d28d26..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 @@ -18,297 +18,280 @@ 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.DataStreamerResponseSerializer; -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.GenerateEncryptionKeyResponseSerializer; -import org.apache.ignite.internal.codegen.GridByteArrayListSerializer; -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.GridDeploymentRequestSerializer; -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.ServiceSingleNodeDeploymentResultSerializer; -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.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; +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.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; +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; @@ -316,22 +299,35 @@ 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.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; 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/GridDeploymentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java index 1014b8c990c47..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,25 +36,25 @@ 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) - 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/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/encryption/GenerateEncryptionKeyResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GenerateEncryptionKeyResponse.java index ab012dee3e1c5..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,16 +28,16 @@ */ 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) - private byte[] masterKeyDigest; + byte[] masterKeyDigest; /** */ public GenerateEncryptionKeyResponse() { 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..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 @@ -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; + 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..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,13 +41,13 @@ public class CacheEntryPredicateAdapter implements CacheEntryPredicate { private PredicateType type; /** Type value serialization holder. */ - @Order(0) + @Order(value = 0, method = "code") protected transient byte code; /** */ @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..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 @@ -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; + @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..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,12 +32,12 @@ 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) - private byte[] data; + @Order(value = 0, method = "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..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 @@ -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 @@ -105,28 +105,28 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa */ @Order(value = 13, method = "errorMessages") @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..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 @@ -42,12 +42,12 @@ public class IgniteDhtDemandedPartitionsMap implements Serializable, Message { /** Map of partitions that will be preloaded from history. (partId -> (fromCntr, toCntr)). */ @Order(value = 0, method = "historicalMap") - private CachePartitionPartialCountersMap historical; + CachePartitionPartialCountersMap historical; /** Set of partitions that require full rebalancing. */ @Order(value = 1, method = "fullSet") @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..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 @@ -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; + @Order(value = 7, method = "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..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 @@ -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; + 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..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 @@ -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; + 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..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 @@ -42,17 +42,17 @@ public class TxEntryValueHolder implements Message { /** Stored value. */ @Order(value = 0, method = "storedValue") @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/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/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/ServiceSingleNodeDeploymentResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceSingleNodeDeploymentResult.java index 024567fa214f1..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,12 +35,12 @@ 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) - private Collection errors; + Collection errors; /** * 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/GridByteArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java index 3e31658599b4e..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,13 +37,13 @@ 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) - private int size; + int size; /** * No-op constructor that creates uninitialized list. This method is meant 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..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 @@ -34,7 +34,7 @@ public abstract class TcpDiscoveryAbstractTraceableMessage extends TcpDiscoveryA /** Serialization holder of {@link #spanContainer}'s bytes. */ @SuppressWarnings("unused") @Order(value = 5, method = "spanBytes") - private @Nullable byte[] spanBytesHolder; + @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/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..f7989a079c7ef 100644 --- a/modules/core/src/test/resources/codegen/ChildMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/ChildMessageSerializer.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package org.apache.ignite.internal.codegen; +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; @@ -26,7 +27,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 +43,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 +64,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 +72,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 +82,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..180f067c2f185 100644 --- a/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/CustomMapperEnumFieldsMessageSerializer.java @@ -15,7 +15,7 @@ * 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; @@ -48,7 +48,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 +63,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..ce0dfcfab17ad 100644 --- a/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/DefaultMapperEnumFieldsMessageSerializer.java @@ -15,7 +15,7 @@ * 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; @@ -34,11 +34,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 +50,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 +65,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 +79,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..00335f38db649 100644 --- a/modules/core/src/test/resources/codegen/TestCollectionsMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/TestCollectionsMessageSerializer.java @@ -15,7 +15,7 @@ * 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; @@ -43,151 +43,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 +202,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 +210,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 +218,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 +226,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 +234,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 +242,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 +250,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 +258,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 +266,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 +274,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 +282,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 +290,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 +298,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 +306,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 +314,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 +322,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 +330,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 +338,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 +346,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 +354,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 +362,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 +370,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 +378,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 +386,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 +394,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..9753dd90e53e0 100644 --- a/modules/core/src/test/resources/codegen/TestMapMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/TestMapMessageSerializer.java @@ -15,7 +15,7 @@ * 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; @@ -43,145 +43,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 +196,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 +204,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 +212,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 +220,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 +228,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 +236,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 +244,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 +252,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 +260,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 +268,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 +276,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 +284,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 +292,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 +300,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 +308,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 +316,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 +324,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 +332,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 +340,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 +348,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 +356,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 +364,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 +372,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 +380,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 edc66e73e9b7e..3e9812f905d40 100644 --- a/modules/core/src/test/resources/codegen/TestMessage.java +++ b/modules/core/src/test/resources/codegen/TestMessage.java @@ -30,137 +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(value = 11, method = "overridenFieldMethod") private String field; - @Order(value = 12) - private KeyCacheObject keyCacheObject; + @Order(12) + KeyCacheObject keyCacheObject; - @Order(value = 13) - private CacheObject cacheObject; + @Order(13) + CacheObject cacheObject; - @Order(value = 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; - } + @Order(14) + GridLongList gridLongList; public String overridenFieldMethod() { return field; @@ -170,31 +82,6 @@ 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; - } - - 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..10a7eb4a8a884 100644 --- a/modules/core/src/test/resources/codegen/TestMessageSerializer.java +++ b/modules/core/src/test/resources/codegen/TestMessageSerializer.java @@ -15,7 +15,7 @@ * 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; @@ -28,7 +28,7 @@ /** * This class is generated automatically. * - * @see org.apache.ignite.codegen.MessageSerializer + * @see org.apache.ignite.internal.MessageProcessor */ public class TestMessageSerializer implements MessageSerializer { /** */ @@ -44,67 +44,67 @@ 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(); @@ -116,19 +116,19 @@ public class TestMessageSerializer implements MessageSerializer { 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 +143,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 +151,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 +159,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 +167,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 +175,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 +183,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 +191,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 +199,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 +207,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 +215,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 +223,7 @@ public class TestMessageSerializer implements MessageSerializer { reader.incrementState(); case 10: - msg.bitSet(reader.readBitSet()); + ((TestMessage)msg).bitSet = reader.readBitSet(); if (!reader.isLastRead()) return false; @@ -239,7 +239,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 +247,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 +255,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 +265,4 @@ public class TestMessageSerializer implements MessageSerializer { return true; } -} +} \ No newline at end of file