#ignite-51: IgniteTxEntry implements Message.

modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java

@@ -533,14 +533,17 @@ public GridIoMessageFactory(MessageFactory[] ext) {
                 msg = new CacheContinuousQueryEntry();
 
                 break;
+
             case 97:
                 msg = new IgniteTxEntry();
 
                 break;
+
             case 98:
                 msg = new IgniteTxEntry.TxEntryValueHolder();
 
                 break;
+
             case 99:
                 msg = new GridNearTxPrepareResponse.OwnedValue();
 

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java

@@ -58,7 +58,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
 
     /** Near writes. */
     @GridToStringInclude
-    @GridDirectTransient
+    @GridDirectCollection(IgniteTxEntry.class)
     private Collection<IgniteTxEntry> nearWrites;
 
     /** Owned versions by key. */
@@ -67,9 +67,11 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
     private Map<IgniteTxKey, GridCacheVersion> owned;
 
     /** Owned keys. */
+    @GridDirectCollection(IgniteTxKey.class)
     private Collection<IgniteTxKey> ownedKeys;
 
     /** Owned values. */
+    @GridDirectCollection(GridCacheVersion.class)
     private Collection<GridCacheVersion> ownedVals;
 
     /** Near transaction ID. */
@@ -294,10 +296,10 @@ public Map<IgniteTxKey, GridCacheVersion> owned() {
         super.finishUnmarshal(ctx, ldr);
 
         if (ownedKeys != null && owned == null) {
-            owned = new HashMap<>();
-
             assert ownedKeys.size() == ownedVals.size();
 
+            owned = U.newHashMap(ownedKeys.size());
+
             Iterator<IgniteTxKey> keyIter = ownedKeys.iterator();
 
             Iterator<GridCacheVersion> valIter = ownedVals.iterator();
@@ -313,7 +315,6 @@ public Map<IgniteTxKey, GridCacheVersion> owned() {
         }
 
         unmarshalTx(nearWrites, true, ctx, ldr);
-
     }
 
     /** {@inheritDoc} */

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java

@@ -174,9 +174,7 @@ public void addOwnedValue(IgniteTxKey key, GridCacheVersion ver, CacheObject val
         if (ownedVals == null)
             ownedVals = new HashMap<>();
 
-        OwnedValue oVal = new OwnedValue();
-
-        oVal.init(ver, val);
+        OwnedValue oVal = new OwnedValue(ver, val);
 
         ownedVals.put(key, oVal);
     }
@@ -486,13 +484,17 @@ public static class OwnedValue implements Message {
         /** Cache object. */
         private CacheObject obj;
 
+        public OwnedValue() {
+            // No-op.
+        }
+
         /**
          * Initialize OwnedValues.
          *
           * @param vers Cache version.
          * @param obj Cache object.
          */
-        void init(GridCacheVersion vers, CacheObject obj) {
+        OwnedValue(GridCacheVersion vers, CacheObject obj) {
             this.vers = vers;
             this.obj = obj;
         }

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java

@@ -19,7 +19,6 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.*;
 import org.apache.ignite.internal.processors.cache.version.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.tostring.*;

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java

@@ -31,9 +31,6 @@
  * for multiple caches.
  */
 public class IgniteTxKey implements Message {
-    /** */
-    private static final long serialVersionUID = 0L;
-
     /** Key. */
     @GridToStringInclude
     private KeyCacheObject key;