http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java ---------------------------------------------------------------------- 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 468861b..ef12edb 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 @@ -35,7 +35,7 @@ import java.util.concurrent.*; /** * DHT atomic cache near update response. */ -public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> implements GridCacheDeployable { +public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage implements GridCacheDeployable { /** */ private static final long serialVersionUID = 0L; @@ -380,7 +380,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (err != null) @@ -399,7 +399,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (errBytes != null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java index 387c027..1f2cfb1 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 @@ -34,7 +34,7 @@ import java.util.*; * Force keys request. This message is sent by node while preloading to force * another node to put given keys into the next batch of transmitting entries. */ -public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implements GridCacheDeployable { +public class GridDhtForceKeysRequest extends GridCacheMessage implements GridCacheDeployable { /** */ private static final long serialVersionUID = 0L; @@ -51,7 +51,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem /** Keys to request. */ @GridToStringInclude @GridDirectTransient - private Collection<K> keys; + private Collection<KeyCacheObject> keys; /** Topology version for which keys are requested. */ private long topVer; @@ -67,7 +67,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem int cacheId, IgniteUuid futId, IgniteUuid miniId, - Collection<K> keys, + Collection<KeyCacheObject> keys, long topVer ) { assert futId != null; @@ -96,7 +96,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem /** * @param keys Collection of keys. */ - public GridDhtForceKeysRequest(Collection<K> keys) { + public GridDhtForceKeysRequest(Collection<KeyCacheObject> keys) { assert !F.isEmpty(keys); this.keys = keys; @@ -126,7 +126,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem /** * @return Keys. */ - public Collection<K> keys() { + public Collection<KeyCacheObject> keys() { return keys; } @@ -139,7 +139,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (keyBytes == null) @@ -147,7 +147,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (keys == null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java index a20ce51..b9c2a0a 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 @@ -32,7 +32,7 @@ import java.util.*; /** * Force keys response. Contains absent keys. */ -public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> implements GridCacheDeployable { +public class GridDhtForceKeysResponse extends GridCacheMessage implements GridCacheDeployable { /** */ private static final long serialVersionUID = 0L; @@ -49,12 +49,12 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple /** Missed (not found) keys. */ @GridToStringInclude @GridDirectTransient - private Collection<K> missedKeys; + private Collection<KeyCacheObject> missedKeys; /** Cache entries. */ @GridToStringInclude @GridDirectTransient - private List<GridCacheEntryInfo<K, V>> infos; + private List<GridCacheEntryInfo> infos; /** */ private byte[] infosBytes; @@ -88,15 +88,15 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple /** * @return Keys. */ - public Collection<K> missedKeys() { - return missedKeys == null ? Collections.<K>emptyList() : missedKeys; + public Collection<KeyCacheObject> missedKeys() { + return missedKeys == null ? Collections.<KeyCacheObject>emptyList() : missedKeys; } /** * @return Forced entries. */ - public Collection<GridCacheEntryInfo<K, V>> forcedInfos() { - return infos == null ? Collections.<GridCacheEntryInfo<K,V>>emptyList() : infos; + public Collection<GridCacheEntryInfo> forcedInfos() { + return infos == null ? Collections.<GridCacheEntryInfo>emptyList() : infos; } /** @@ -116,7 +116,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple /** * @param key Key. */ - public void addMissed(K key) { + public void addMissed(KeyCacheObject key) { if (missedKeys == null) missedKeys = new ArrayList<>(); @@ -126,7 +126,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple /** * @param info Entry info to add. */ - public void addInfo(GridCacheEntryInfo<K, V> info) { + public void addInfo(GridCacheEntryInfo info) { assert info != null; if (infos == null) @@ -137,7 +137,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (missedKeys != null && missedKeyBytes == null) @@ -151,7 +151,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (missedKeys == null && missedKeyBytes != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java index 25d5d19..e786ca9 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 @@ -31,7 +31,7 @@ import java.util.*; /** * Partition demand request. */ -public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> { +public class GridDhtPartitionDemandMessage extends GridCacheMessage { /** */ private static final long serialVersionUID = 0L; @@ -74,7 +74,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> /** * @param cp Message to copy from. */ - GridDhtPartitionDemandMessage(GridDhtPartitionDemandMessage<K, V> cp, Collection<Integer> parts) { + GridDhtPartitionDemandMessage(GridDhtPartitionDemandMessage cp, Collection<Integer> parts) { cacheId = cp.cacheId; updateSeq = cp.updateSeq; topic = cp.topic; @@ -174,7 +174,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (topic != null) @@ -182,7 +182,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (topicBytes != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java index d703186..7bd22fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java @@ -31,7 +31,7 @@ import java.util.*; /** * Partition supply message. */ -public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> implements GridCacheDeployable { +public class GridDhtPartitionSupplyMessage extends GridCacheMessage implements GridCacheDeployable { /** */ private static final long serialVersionUID = 0L; @@ -55,7 +55,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> /** Entries. */ @GridDirectTransient - private Map<Integer, Collection<GridCacheEntryInfo<K, V>>> infos = new HashMap<>(); + private Map<Integer, Collection<GridCacheEntryInfo>> infos = new HashMap<>(); /** Cache entries in serialized form. */ @GridToStringExclude @@ -173,7 +173,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> /** * @return Entries. */ - Map<Integer, Collection<GridCacheEntryInfo<K, V>>> infos() { + Map<Integer, Collection<GridCacheEntryInfo>> infos() { return infos; } @@ -190,7 +190,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> * @param ctx Cache context. * @throws IgniteCheckedException If failed. */ - void addEntry(int p, GridCacheEntryInfo<K, V> info, GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + void addEntry(int p, GridCacheEntryInfo info, GridCacheSharedContext ctx) throws IgniteCheckedException { assert info != null; marshalInfo(info, ctx); @@ -216,11 +216,10 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> * @param ctx Cache context. * @throws IgniteCheckedException If failed. */ - void addEntry0(int p, GridCacheEntryInfo<K, V> info, GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + void addEntry0(int p, GridCacheEntryInfo info, GridCacheSharedContext ctx) throws IgniteCheckedException { assert info != null; - assert info.keyBytes() != null; - assert info.valueBytes() != null || info.value() instanceof byte[] : - "Missing value bytes with invalid value: " + info.value(); + assert info.key() != null; + assert info.value() != null; // Need to call this method to initialize info properly. marshalInfo(info, ctx); @@ -242,22 +241,22 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); infoBytes = ctx.marshaller().marshal(infoBytesMap); } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); infoBytesMap = ctx.marshaller().unmarshal(infoBytes, ldr); - GridCacheContext<K, V> cacheCtx = ctx.cacheContext(cacheId); + GridCacheContext cacheCtx = ctx.cacheContext(cacheId); for (Map.Entry<Integer, Collection<byte[]>> e : infoBytesMap.entrySet()) { - Collection<GridCacheEntryInfo<K, V>> entries = unmarshalCollection(e.getValue(), ctx, ldr); + Collection<GridCacheEntryInfo> entries = unmarshalCollection(e.getValue(), ctx, ldr); unmarshalInfos(entries, cacheCtx, ldr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java ---------------------------------------------------------------------- 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 60bea32..6c30425 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 @@ -29,7 +29,7 @@ import java.nio.*; /** * Request for single partition info. */ -abstract class GridDhtPartitionsAbstractMessage<K, V> extends GridCacheMessage<K, V> { +abstract class GridDhtPartitionsAbstractMessage extends GridCacheMessage { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java ---------------------------------------------------------------------- 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 d4b8a14..38a5888 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 @@ -33,7 +33,7 @@ import java.util.*; /** * Information about partitions of all nodes in topology. */ -public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstractMessage<K, V> { +public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessage { /** */ private static final long serialVersionUID = 0L; @@ -86,7 +86,7 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (parts != null) @@ -108,7 +108,7 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (partsBytes != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java ---------------------------------------------------------------------- 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 0c477c1..afa5ab5 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 @@ -33,7 +33,7 @@ import java.util.*; /** * Information about partitions of a single node. */ -public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstractMessage<K, V> { +public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMessage { /** */ private static final long serialVersionUID = 0L; @@ -79,7 +79,7 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (parts != null) @@ -87,7 +87,7 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (partsBytes != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java ---------------------------------------------------------------------- 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 2599c95..3cdcd98 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 @@ -26,7 +26,7 @@ import java.nio.*; /** * Request for single partition info. */ -public class GridDhtPartitionsSingleRequest<K, V> extends GridDhtPartitionsAbstractMessage<K, V> { +public class GridDhtPartitionsSingleRequest extends GridDhtPartitionsAbstractMessage { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java index 44ef152..3d338d6 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 @@ -34,7 +34,7 @@ import java.util.*; /** * Get request. */ -public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements GridCacheDeployable, +public class GridNearGetRequest extends GridCacheMessage implements GridCacheDeployable, GridCacheVersionable { /** */ private static final long serialVersionUID = 0L; @@ -51,7 +51,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements /** */ @GridToStringInclude @GridDirectTransient - private LinkedHashMap<K, Boolean> keys; + private LinkedHashMap<KeyCacheObject, Boolean> keys; /** Reload flag. */ private boolean reload; @@ -106,7 +106,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements IgniteUuid futId, IgniteUuid miniId, GridCacheVersion ver, - LinkedHashMap<K, Boolean> keys, + LinkedHashMap<KeyCacheObject, Boolean> keys, boolean readThrough, boolean reload, long topVer, @@ -172,7 +172,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements /** * @return Keys */ - public LinkedHashMap<K, Boolean> keys() { + public LinkedHashMap<KeyCacheObject, Boolean> keys() { return keys; } @@ -216,7 +216,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements * @param ctx Cache context. * @throws IgniteCheckedException If failed. */ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); assert ctx != null; @@ -231,7 +231,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements * @param ldr Loader. * @throws IgniteCheckedException If failed. */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (keys == null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java index 3518915..319036c 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 @@ -34,7 +34,7 @@ import java.util.*; /** * Get response. */ -public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements GridCacheDeployable, +public class GridNearGetResponse extends GridCacheMessage implements GridCacheDeployable, GridCacheVersionable { /** */ private static final long serialVersionUID = 0L; @@ -51,7 +51,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements /** Result. */ @GridToStringInclude @GridDirectTransient - private Collection<GridCacheEntryInfo<K, V>> entries; + private Collection<GridCacheEntryInfo> entries; /** */ private byte[] entriesBytes; @@ -122,14 +122,14 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements /** * @return Entries. */ - public Collection<GridCacheEntryInfo<K, V>> entries() { + public Collection<GridCacheEntryInfo> entries() { return entries; } /** * @param entries Entries. */ - public void entries(Collection<GridCacheEntryInfo<K, V>> entries) { + public void entries(Collection<GridCacheEntryInfo> entries) { this.entries = entries; } @@ -172,7 +172,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (entries != null) { @@ -186,7 +186,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (entriesBytes != null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java index f640815..94caadb 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 @@ -38,7 +38,7 @@ import java.util.*; /** * Near cache lock request. */ -public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> { +public class GridNearLockRequest extends GridDistributedLockRequest { /** */ private static final long serialVersionUID = 0L; @@ -53,7 +53,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> /** Filter. */ @GridDirectTransient - private IgnitePredicate<Cache.Entry<K, V>>[] filter; + private IgnitePredicate<Cache.Entry<Object, Object>>[] filter; /** Implicit flag. */ private boolean implicitTx; @@ -225,7 +225,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> /** * @return Filter. */ - public IgnitePredicate<Cache.Entry<K, V>>[] filter() { + public IgnitePredicate<Cache.Entry<Object, Object>>[] filter() { return filter; } @@ -234,7 +234,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> * @param ctx Context. * @throws IgniteCheckedException If failed. */ - public void filter(IgnitePredicate<Cache.Entry<K, V>>[] filter, GridCacheContext<K, V> ctx) + public void filter(IgnitePredicate<Cache.Entry<Object, Object>>[] filter, GridCacheContext ctx) throws IgniteCheckedException { this.filter = filter; } @@ -278,16 +278,16 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> * @throws IgniteCheckedException If failed. */ public void addKeyBytes( - K key, + KeyCacheObject key, byte[] keyBytes, boolean retVal, @Nullable GridCacheVersion dhtVer, - GridCacheContext<K, V> ctx + GridCacheContext ctx ) throws IgniteCheckedException { dhtVers[idx] = dhtVer; // Delegate to super. - addKeyBytes(key, keyBytes, retVal, (Collection<GridCacheMvccCandidate<K>>)null, ctx); + addKeyBytes(key, keyBytes, retVal, (Collection<GridCacheMvccCandidate>)null, ctx); } /** @@ -306,7 +306,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> } /** {@inheritDoc} */ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (filterBytes == null) @@ -314,7 +314,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (filter == null && filterBytes != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java index 8919465..eebb9b2 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 @@ -35,7 +35,7 @@ import java.util.*; /** * Near cache lock response. */ -public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V> { +public class GridNearLockResponse extends GridDistributedLockResponse { /** */ private static final long serialVersionUID = 0L; @@ -161,12 +161,12 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V * @throws IgniteCheckedException If failed. */ public void addValueBytes( - @Nullable V val, + @Nullable CacheObject val, @Nullable byte[] valBytes, boolean filterPassed, @Nullable GridCacheVersion dhtVer, @Nullable GridCacheVersion mappedVer, - GridCacheContext<K, V> ctx + GridCacheContext ctx ) throws IgniteCheckedException { int idx = valuesSize(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java index 012a48f..80282b9 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 @@ -31,7 +31,7 @@ import java.util.*; /** * Near transaction finish request. */ -public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishRequest<K, V> { +public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java index 0c8b7c2..86a58bc 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 @@ -33,7 +33,7 @@ import java.nio.*; /** * Reply for synchronous phase 2. */ -public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishResponse<K, V> { +public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { /** */ private static final long serialVersionUID = 0L; @@ -98,7 +98,7 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (err != null) @@ -106,7 +106,7 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (errBytes != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java index cbf906e..a64d9fa 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 @@ -35,7 +35,7 @@ import java.util.*; /** * Near transaction prepare request. */ -public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequest<K, V> { +public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { /** */ private static final long serialVersionUID = 0L; @@ -96,9 +96,9 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ public GridNearTxPrepareRequest( IgniteUuid futId, long topVer, - IgniteInternalTx<K, V> tx, - Collection<IgniteTxEntry<K, V>> reads, - Collection<IgniteTxEntry<K, V>> writes, + IgniteInternalTx tx, + Collection<IgniteTxEntry> reads, + Collection<IgniteTxEntry> writes, IgniteTxKey grpLockKey, boolean partLock, boolean near, @@ -218,14 +218,14 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ * @param c Collection of entries to clone. * @return Cloned collection. */ - private Collection<IgniteTxEntry<K, V>> cloneEntries(Collection<IgniteTxEntry<K, V>> c) { + private Collection<IgniteTxEntry> cloneEntries(Collection<IgniteTxEntry> c) { if (F.isEmpty(c)) return c; - Collection<IgniteTxEntry<K, V>> cp = new ArrayList<>(c.size()); + Collection<IgniteTxEntry> cp = new ArrayList<>(c.size()); - for (IgniteTxEntry<K, V> e : c) { - GridCacheContext<K, V> cacheCtx = e.context(); + for (IgniteTxEntry e : c) { + GridCacheContext cacheCtx = e.context(); // Clone only if it is a near cache. if (cacheCtx.isNear()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java index 5106f94..151e92d 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 @@ -37,7 +37,7 @@ import java.util.*; /** * Near cache prepare response. */ -public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareResponse<K, V> { +public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse { /** */ private static final long serialVersionUID = 0L; @@ -63,7 +63,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes /** Map of owned values to set on near node. */ @GridToStringInclude @GridDirectTransient - private Map<IgniteTxKey<K>, GridTuple3<GridCacheVersion, V, byte[]>> ownedVals; + private Map<IgniteTxKey, GridTuple3<GridCacheVersion, CacheObject, byte[]>> ownedVals; /** Marshalled owned bytes. */ @GridToStringExclude @@ -72,14 +72,14 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes /** Cache return value. */ @GridDirectTransient - private GridCacheReturn<V> retVal; + private GridCacheReturn<CacheObject> retVal; /** Return value bytes. */ private byte[] retValBytes; /** Filter failed keys. */ @GridDirectTransient - private Collection<IgniteTxKey<K>> filterFailedKeys; + private Collection<IgniteTxKey> filterFailedKeys; /** Filter failed key bytes. */ private byte[] filterFailedKeyBytes; @@ -105,7 +105,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes IgniteUuid miniId, GridCacheVersion dhtVer, Collection<Integer> invalidParts, - GridCacheReturn<V> retVal, + GridCacheReturn<CacheObject> retVal, Throwable err ) { super(xid, err); @@ -168,7 +168,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes * @param val Value. * @param valBytes Value bytes. */ - public void addOwnedValue(IgniteTxKey<K> key, GridCacheVersion ver, V val, byte[] valBytes) { + public void addOwnedValue(IgniteTxKey key, GridCacheVersion ver, CacheObject val, byte[] valBytes) { if (val == null && valBytes == null) return; @@ -181,37 +181,38 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes /** * @return Owned values map. */ - public Map<IgniteTxKey<K>, GridTuple3<GridCacheVersion, V, byte[]>> ownedValues() { - return ownedVals == null ? Collections.<IgniteTxKey<K>, GridTuple3<GridCacheVersion,V,byte[]>>emptyMap() : + public Map<IgniteTxKey, GridTuple3<GridCacheVersion, CacheObject, byte[]>> ownedValues() { + return ownedVals == null ? + Collections.<IgniteTxKey, GridTuple3<GridCacheVersion, CacheObject, byte[]>>emptyMap() : Collections.unmodifiableMap(ownedVals); } /** * @return Return value. */ - public GridCacheReturn<V> returnValue() { + public GridCacheReturn<CacheObject> returnValue() { return retVal; } /** * @param filterFailedKeys Collection of keys that did not pass the filter. */ - public void filterFailedKeys(Collection<IgniteTxKey<K>> filterFailedKeys) { + public void filterFailedKeys(Collection<IgniteTxKey> filterFailedKeys) { this.filterFailedKeys = filterFailedKeys; } /** * @return Collection of keys that did not pass the filter. */ - public Collection<IgniteTxKey<K>> filterFailedKeys() { - return filterFailedKeys == null ? Collections.<IgniteTxKey<K>>emptyList() : filterFailedKeys; + public Collection<IgniteTxKey> filterFailedKeys() { + return filterFailedKeys == null ? Collections.<IgniteTxKey>emptyList() : filterFailedKeys; } /** * @param key Key. * @return {@code True} if response has owned value for given key. */ - public boolean hasOwnedValue(IgniteTxKey<K> key) { + public boolean hasOwnedValue(IgniteTxKey key) { return ownedVals != null && ownedVals.containsKey(key); } @@ -224,31 +225,31 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (ownedVals != null && ownedValsBytes == null) { - ownedValsBytes = new ArrayList<>(ownedVals.size()); - - for (Map.Entry<IgniteTxKey<K>, GridTuple3<GridCacheVersion, V, byte[]>> entry : ownedVals.entrySet()) { - GridTuple3<GridCacheVersion, V, byte[]> tup = entry.getValue(); - - boolean rawBytes = false; - - byte[] valBytes = tup.get3(); - - if (valBytes == null) { - if (tup.get2() != null && tup.get2() instanceof byte[]) { - rawBytes = true; - - valBytes = (byte[])tup.get2(); - } - else - valBytes = ctx.marshaller().marshal(tup.get2()); - } - - ownedValsBytes.add(ctx.marshaller().marshal(F.t(entry.getKey(), tup.get1(), valBytes, rawBytes))); - } +// TODO IGNITE-51. +// ownedValsBytes = new ArrayList<>(ownedVals.size()); +// for (Map.Entry<IgniteTxKey, GridTuple3<GridCacheVersion, CacheObject, byte[]>> entry : ownedVals.entrySet()) { +// GridTuple3<GridCacheVersion, CacheObject, byte[]> tup = entry.getValue(); +// +// boolean rawBytes = false; +// +// byte[] valBytes = tup.get3(); +// +// if (valBytes == null) { +// if (tup.get2() != null && tup.get2() instanceof byte[]) { +// rawBytes = true; +// +// valBytes = (byte[])tup.get2(); +// } +// else +// valBytes = ctx.marshaller().marshal(tup.get2()); +// } +// +// ownedValsBytes.add(ctx.marshaller().marshal(F.t(entry.getKey(), tup.get1(), valBytes, rawBytes))); +// } } @@ -260,19 +261,20 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (ownedValsBytes != null && ownedVals == null) { - ownedVals = new HashMap<>(); - - for (byte[] bytes : ownedValsBytes) { - GridTuple4<IgniteTxKey<K>, GridCacheVersion, byte[], Boolean> tup = ctx.marshaller().unmarshal(bytes, ldr); - - V val = tup.get4() ? (V)tup.get3() : ctx.marshaller().<V>unmarshal(tup.get3(), ldr); - - ownedVals.put(tup.get1(), F.t(tup.get2(), val, tup.get4() ? null : tup.get3())); - } +// TODO IGNITE-51. +// ownedVals = new HashMap<>(); +// +// for (byte[] bytes : ownedValsBytes) { +// GridTuple4<IgniteTxKey, GridCacheVersion, byte[], Boolean> tup = ctx.marshaller().unmarshal(bytes, ldr); +// +// V val = tup.get4() ? (V)tup.get3() : ctx.marshaller().<V>unmarshal(tup.get3(), ldr); +// +// ownedVals.put(tup.get1(), F.t(tup.get2(), val, tup.get4() ? null : tup.get3())); +// } } if (retVal == null && retValBytes != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java index 266bf97..54898fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java @@ -27,7 +27,7 @@ import java.nio.*; /** * Near cache unlock request. */ -public class GridNearUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, V> { +public class GridNearUnlockRequest extends GridDistributedUnlockRequest { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java index ddfd359..6d124f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesEntryExtras.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.*; /** * Extras where attributes are set. */ -public class GridCacheAttributesEntryExtras<K> extends GridCacheEntryExtrasAdapter<K> { +public class GridCacheAttributesEntryExtras extends GridCacheEntryExtrasAdapter { /** Attributes data. */ private GridLeanMap<String, Object> attrData; @@ -47,7 +47,7 @@ public class GridCacheAttributesEntryExtras<K> extends GridCacheEntryExtrasAdapt } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> attributesData(@Nullable GridLeanMap<String, Object> attrData) { + @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<String, Object> attrData) { if (attrData != null) { this.attrData = attrData; @@ -58,18 +58,18 @@ public class GridCacheAttributesEntryExtras<K> extends GridCacheEntryExtrasAdapt } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> mvcc(GridCacheMvcc<K> mvcc) { - return mvcc != null ? new GridCacheAttributesMvccEntryExtras<>(attrData, mvcc) : this; + @Override public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc) { + return mvcc != null ? new GridCacheAttributesMvccEntryExtras(attrData, mvcc) : this; } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> obsoleteVersion(GridCacheVersion obsoleteVer) { - return obsoleteVer != null ? new GridCacheAttributesObsoleteEntryExtras<K>(attrData, obsoleteVer) : this; + @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { + return obsoleteVer != null ? new GridCacheAttributesObsoleteEntryExtras(attrData, obsoleteVer) : this; } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> ttlAndExpireTime(long ttl, long expireTime) { - return ttl != 0 ? new GridCacheAttributesTtlEntryExtras<K>(attrData, ttl, expireTime) : this; + @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { + return ttl != 0 ? new GridCacheAttributesTtlEntryExtras(attrData, ttl, expireTime) : this; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java index 31d4805..232bbdb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccEntryExtras.java @@ -26,12 +26,12 @@ import org.jetbrains.annotations.*; /** * Extras where attributes and MVCC are set. */ -public class GridCacheAttributesMvccEntryExtras<K> extends GridCacheEntryExtrasAdapter<K> { +public class GridCacheAttributesMvccEntryExtras extends GridCacheEntryExtrasAdapter { /** Attributes data. */ private GridLeanMap<String, Object> attrData; /** MVCC. */ - private GridCacheMvcc<K> mvcc; + private GridCacheMvcc mvcc; /** * Constructor. @@ -39,7 +39,7 @@ public class GridCacheAttributesMvccEntryExtras<K> extends GridCacheEntryExtrasA * @param attrData Attributes data. * @param mvcc MVCC. */ - public GridCacheAttributesMvccEntryExtras(GridLeanMap<String, Object> attrData, GridCacheMvcc<K> mvcc) { + public GridCacheAttributesMvccEntryExtras(GridLeanMap<String, Object> attrData, GridCacheMvcc mvcc) { assert attrData != null; assert mvcc != null; @@ -53,23 +53,23 @@ public class GridCacheAttributesMvccEntryExtras<K> extends GridCacheEntryExtrasA } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> attributesData(@Nullable GridLeanMap<String, Object> attrData) { + @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<String, Object> attrData) { if (attrData != null) { this.attrData = attrData; return this; } else - return new GridCacheMvccEntryExtras<>(mvcc); + return new GridCacheMvccEntryExtras(mvcc); } /** {@inheritDoc} */ - @Override public GridCacheMvcc<K> mvcc() { + @Override public GridCacheMvcc mvcc() { return mvcc; } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> mvcc(@Nullable GridCacheMvcc<K> mvcc) { + @Override public GridCacheEntryExtras mvcc(@Nullable GridCacheMvcc mvcc) { if (mvcc != null) { this.mvcc = mvcc; @@ -80,13 +80,13 @@ public class GridCacheAttributesMvccEntryExtras<K> extends GridCacheEntryExtrasA } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> obsoleteVersion(GridCacheVersion obsoleteVer) { + @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { return obsoleteVer != null ? new GridCacheAttributesMvccObsoleteEntryExtras<>(attrData, mvcc, obsoleteVer) : this; } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> ttlAndExpireTime(long ttl, long expireTime) { + @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { return ttl != 0 ? new GridCacheAttributesMvccTtlEntryExtras<>(attrData, mvcc, ttl, expireTime) : this; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java index 4c0b72a..be4d728 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteEntryExtras.java @@ -26,12 +26,12 @@ import org.jetbrains.annotations.*; /** * Extras where attributes, MVCC and obsolete version are set. */ -public class GridCacheAttributesMvccObsoleteEntryExtras<K> extends GridCacheEntryExtrasAdapter<K> { +public class GridCacheAttributesMvccObsoleteEntryExtras extends GridCacheEntryExtrasAdapter { /** Attributes data. */ private GridLeanMap<String, Object> attrData; /** MVCC. */ - private GridCacheMvcc<K> mvcc; + private GridCacheMvcc mvcc; /** Obsolete version. */ private GridCacheVersion obsoleteVer; @@ -43,7 +43,7 @@ public class GridCacheAttributesMvccObsoleteEntryExtras<K> extends GridCacheEntr * @param mvcc MVCC. * @param obsoleteVer Obsolete version. */ - public GridCacheAttributesMvccObsoleteEntryExtras(GridLeanMap<String, Object> attrData, GridCacheMvcc<K> mvcc, + public GridCacheAttributesMvccObsoleteEntryExtras(GridLeanMap<String, Object> attrData, GridCacheMvcc mvcc, GridCacheVersion obsoleteVer) { assert attrData != null; assert mvcc != null; @@ -60,30 +60,30 @@ public class GridCacheAttributesMvccObsoleteEntryExtras<K> extends GridCacheEntr } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> attributesData(@Nullable GridLeanMap<String, Object> attrData) { + @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<String, Object> attrData) { if (attrData != null) { this.attrData = attrData; return this; } else - return new GridCacheMvccObsoleteEntryExtras<>(mvcc, obsoleteVer); + return new GridCacheMvccObsoleteEntryExtras(mvcc, obsoleteVer); } /** {@inheritDoc} */ - @Override public GridCacheMvcc<K> mvcc() { + @Override public GridCacheMvcc mvcc() { return mvcc; } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> mvcc(@Nullable GridCacheMvcc<K> mvcc) { + @Override public GridCacheEntryExtras mvcc(@Nullable GridCacheMvcc mvcc) { if (mvcc != null) { this.mvcc = mvcc; return this; } else - return new GridCacheAttributesObsoleteEntryExtras<>(attrData, obsoleteVer); + return new GridCacheAttributesObsoleteEntryExtras(attrData, obsoleteVer); } /** {@inheritDoc} */ @@ -92,19 +92,19 @@ public class GridCacheAttributesMvccObsoleteEntryExtras<K> extends GridCacheEntr } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> obsoleteVersion(GridCacheVersion obsoleteVer) { + @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { if (obsoleteVer != null) { this.obsoleteVer = obsoleteVer; return this; } else - return new GridCacheAttributesMvccEntryExtras<>(attrData, mvcc); + return new GridCacheAttributesMvccEntryExtras(attrData, mvcc); } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> ttlAndExpireTime(long ttl, long expireTime) { - return ttl != 0 ? new GridCacheAttributesMvccObsoleteTtlEntryExtras<>(attrData, mvcc, obsoleteVer, ttl, + @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { + return ttl != 0 ? new GridCacheAttributesMvccObsoleteTtlEntryExtras(attrData, mvcc, obsoleteVer, ttl, expireTime) : this; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java index 0474c2c..04774b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccObsoleteTtlEntryExtras.java @@ -26,12 +26,12 @@ import org.jetbrains.annotations.*; /** * Extras where attributes, MVCC, obsolete version and TTL are set. */ -public class GridCacheAttributesMvccObsoleteTtlEntryExtras<K> extends GridCacheEntryExtrasAdapter<K> { +public class GridCacheAttributesMvccObsoleteTtlEntryExtras extends GridCacheEntryExtrasAdapter { /** Attributes data. */ private GridLeanMap<String, Object> attrData; /** MVCC. */ - private GridCacheMvcc<K> mvcc; + private GridCacheMvcc mvcc; /** Obsolete version. */ private GridCacheVersion obsoleteVer; @@ -51,7 +51,7 @@ public class GridCacheAttributesMvccObsoleteTtlEntryExtras<K> extends GridCacheE * @param ttl TTL. * @param expireTime Expire time. */ - public GridCacheAttributesMvccObsoleteTtlEntryExtras(GridLeanMap<String, Object> attrData, GridCacheMvcc<K> mvcc, + public GridCacheAttributesMvccObsoleteTtlEntryExtras(GridLeanMap<String, Object> attrData, GridCacheMvcc mvcc, GridCacheVersion obsoleteVer, long ttl, long expireTime) { assert attrData != null; assert mvcc != null; @@ -71,30 +71,30 @@ public class GridCacheAttributesMvccObsoleteTtlEntryExtras<K> extends GridCacheE } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> attributesData(@Nullable GridLeanMap<String, Object> attrData) { + @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<String, Object> attrData) { if (attrData != null) { this.attrData = attrData; return this; } else - return new GridCacheMvccObsoleteTtlEntryExtras<>(mvcc, obsoleteVer, ttl ,expireTime); + return new GridCacheMvccObsoleteTtlEntryExtras(mvcc, obsoleteVer, ttl ,expireTime); } /** {@inheritDoc} */ - @Override public GridCacheMvcc<K> mvcc() { + @Override public GridCacheMvcc mvcc() { return mvcc; } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> mvcc(@Nullable GridCacheMvcc<K> mvcc) { + @Override public GridCacheEntryExtras mvcc(@Nullable GridCacheMvcc mvcc) { if (mvcc != null) { this.mvcc = mvcc; return this; } else - return new GridCacheAttributesObsoleteTtlEntryExtras<>(attrData, obsoleteVer, ttl, expireTime); + return new GridCacheAttributesObsoleteTtlEntryExtras(attrData, obsoleteVer, ttl, expireTime); } /** {@inheritDoc} */ @@ -103,14 +103,14 @@ public class GridCacheAttributesMvccObsoleteTtlEntryExtras<K> extends GridCacheE } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> obsoleteVersion(GridCacheVersion obsoleteVer) { + @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { if (obsoleteVer != null) { this.obsoleteVer = obsoleteVer; return this; } else - return new GridCacheAttributesMvccTtlEntryExtras<>(attrData, mvcc, ttl, expireTime); + return new GridCacheAttributesMvccTtlEntryExtras(attrData, mvcc, ttl, expireTime); } /** {@inheritDoc} */ @@ -124,7 +124,7 @@ public class GridCacheAttributesMvccObsoleteTtlEntryExtras<K> extends GridCacheE } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> ttlAndExpireTime(long ttl, long expireTime) { + @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { if (ttl != 0) { this.ttl = ttl; this.expireTime = expireTime; @@ -132,7 +132,7 @@ public class GridCacheAttributesMvccObsoleteTtlEntryExtras<K> extends GridCacheE return this; } else - return new GridCacheAttributesMvccObsoleteEntryExtras<>(attrData, mvcc, obsoleteVer); + return new GridCacheAttributesMvccObsoleteEntryExtras(attrData, mvcc, obsoleteVer); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java index cf6e05f..41b4c71 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesMvccTtlEntryExtras.java @@ -26,12 +26,12 @@ import org.jetbrains.annotations.*; /** * Extras where attributes, MVCC and TTL are set. */ -public class GridCacheAttributesMvccTtlEntryExtras<K> extends GridCacheEntryExtrasAdapter<K> { +public class GridCacheAttributesMvccTtlEntryExtras extends GridCacheEntryExtrasAdapter { /** Attributes data. */ private GridLeanMap<String, Object> attrData; /** MVCC. */ - private GridCacheMvcc<K> mvcc; + private GridCacheMvcc mvcc; /** TTL. */ private long ttl; @@ -47,7 +47,7 @@ public class GridCacheAttributesMvccTtlEntryExtras<K> extends GridCacheEntryExtr * @param ttl TTL. * @param expireTime Expire time. */ - public GridCacheAttributesMvccTtlEntryExtras(GridLeanMap<String, Object> attrData, GridCacheMvcc<K> mvcc, long ttl, + public GridCacheAttributesMvccTtlEntryExtras(GridLeanMap<String, Object> attrData, GridCacheMvcc mvcc, long ttl, long expireTime) { assert attrData != null; assert mvcc != null; @@ -65,7 +65,7 @@ public class GridCacheAttributesMvccTtlEntryExtras<K> extends GridCacheEntryExtr } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> attributesData(@Nullable GridLeanMap<String, Object> attrData) { + @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<String, Object> attrData) { if (attrData != null) { this.attrData = attrData; @@ -76,12 +76,12 @@ public class GridCacheAttributesMvccTtlEntryExtras<K> extends GridCacheEntryExtr } /** {@inheritDoc} */ - @Override public GridCacheMvcc<K> mvcc() { + @Override public GridCacheMvcc mvcc() { return mvcc; } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> mvcc(@Nullable GridCacheMvcc<K> mvcc) { + @Override public GridCacheEntryExtras mvcc(@Nullable GridCacheMvcc mvcc) { if (mvcc != null) { this.mvcc = mvcc; @@ -92,7 +92,7 @@ public class GridCacheAttributesMvccTtlEntryExtras<K> extends GridCacheEntryExtr } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> obsoleteVersion(GridCacheVersion obsoleteVer) { + @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { return obsoleteVer != null ? new GridCacheAttributesMvccObsoleteTtlEntryExtras<>(attrData, mvcc, obsoleteVer, ttl, expireTime) : this; } @@ -108,7 +108,7 @@ public class GridCacheAttributesMvccTtlEntryExtras<K> extends GridCacheEntryExtr } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> ttlAndExpireTime(long ttl, long expireTime) { + @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { if (ttl != 0) { this.ttl = ttl; this.expireTime = expireTime; @@ -116,7 +116,7 @@ public class GridCacheAttributesMvccTtlEntryExtras<K> extends GridCacheEntryExtr return this; } else - return new GridCacheAttributesMvccEntryExtras<>(attrData, mvcc); + return new GridCacheAttributesMvccEntryExtras(attrData, mvcc); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java index 5f7b9f4..789a139 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteEntryExtras.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.*; /** * Extras where attributes and obsolete version are set. */ -public class GridCacheAttributesObsoleteEntryExtras<K> extends GridCacheEntryExtrasAdapter<K> { +public class GridCacheAttributesObsoleteEntryExtras extends GridCacheEntryExtrasAdapter { /** Attributes data. */ private GridLeanMap<String, Object> attrData; @@ -53,19 +53,19 @@ public class GridCacheAttributesObsoleteEntryExtras<K> extends GridCacheEntryExt } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> attributesData(@Nullable GridLeanMap<String, Object> attrData) { + @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<String, Object> attrData) { if (attrData != null) { this.attrData = attrData; return this; } else - return new GridCacheObsoleteEntryExtras<>(obsoleteVer); + return new GridCacheObsoleteEntryExtras(obsoleteVer); } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> mvcc(GridCacheMvcc<K> mvcc) { - return mvcc != null ? new GridCacheAttributesMvccObsoleteEntryExtras<>(attrData, mvcc, obsoleteVer) : this; + @Override public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc) { + return mvcc != null ? new GridCacheAttributesMvccObsoleteEntryExtras(attrData, mvcc, obsoleteVer) : this; } /** {@inheritDoc} */ @@ -74,19 +74,19 @@ public class GridCacheAttributesObsoleteEntryExtras<K> extends GridCacheEntryExt } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> obsoleteVersion(GridCacheVersion obsoleteVer) { + @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { if (obsoleteVer != null) { this.obsoleteVer = obsoleteVer; return this; } else - return new GridCacheAttributesEntryExtras<>(attrData); + return new GridCacheAttributesEntryExtras(attrData); } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> ttlAndExpireTime(long ttl, long expireTime) { - return ttl != 0 ? new GridCacheAttributesObsoleteTtlEntryExtras<K>(attrData, obsoleteVer, ttl, expireTime) : + @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { + return ttl != 0 ? new GridCacheAttributesObsoleteTtlEntryExtras(attrData, obsoleteVer, ttl, expireTime) : this; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java index 8a16f0d..a859064 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesObsoleteTtlEntryExtras.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.*; /** * Extras where attributes, obsolete version and TTL are set. */ -public class GridCacheAttributesObsoleteTtlEntryExtras<K> extends GridCacheEntryExtrasAdapter<K> { +public class GridCacheAttributesObsoleteTtlEntryExtras extends GridCacheEntryExtrasAdapter { /** Attributes data. */ private GridLeanMap<String, Object> attrData; @@ -65,7 +65,7 @@ public class GridCacheAttributesObsoleteTtlEntryExtras<K> extends GridCacheEntry } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> attributesData(@Nullable GridLeanMap<String, Object> attrData) { + @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<String, Object> attrData) { if (attrData != null) { this.attrData = attrData; @@ -76,7 +76,7 @@ public class GridCacheAttributesObsoleteTtlEntryExtras<K> extends GridCacheEntry } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> mvcc(GridCacheMvcc<K> mvcc) { + @Override public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc) { return mvcc != null ? new GridCacheAttributesMvccObsoleteTtlEntryExtras<>(attrData, mvcc, obsoleteVer, ttl, expireTime) : this; } @@ -87,7 +87,7 @@ public class GridCacheAttributesObsoleteTtlEntryExtras<K> extends GridCacheEntry } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> obsoleteVersion(GridCacheVersion obsoleteVer) { + @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { if (obsoleteVer != null) { this.obsoleteVer = obsoleteVer; @@ -108,7 +108,7 @@ public class GridCacheAttributesObsoleteTtlEntryExtras<K> extends GridCacheEntry } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> ttlAndExpireTime(long ttl, long expireTime) { + @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { if (ttl != 0) { this.ttl = ttl; this.expireTime = expireTime; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java index 108e81b..baaee7c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheAttributesTtlEntryExtras.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.*; /** * Extras where attributes and TTL are set. */ -public class GridCacheAttributesTtlEntryExtras<K> extends GridCacheEntryExtrasAdapter<K> { +public class GridCacheAttributesTtlEntryExtras extends GridCacheEntryExtrasAdapter { /** Attributes data. */ private GridLeanMap<String, Object> attrData; @@ -58,24 +58,24 @@ public class GridCacheAttributesTtlEntryExtras<K> extends GridCacheEntryExtrasAd } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> attributesData(@Nullable GridLeanMap<String, Object> attrData) { + @Override public GridCacheEntryExtras attributesData(@Nullable GridLeanMap<String, Object> attrData) { if (attrData != null) { this.attrData = attrData; return this; } else - return new GridCacheTtlEntryExtras<>(ttl, expireTime); + return new GridCacheTtlEntryExtras(ttl, expireTime); } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> mvcc(GridCacheMvcc<K> mvcc) { - return mvcc != null ? new GridCacheAttributesMvccTtlEntryExtras<>(attrData, mvcc, ttl, expireTime) : this; + @Override public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc) { + return mvcc != null ? new GridCacheAttributesMvccTtlEntryExtras(attrData, mvcc, ttl, expireTime) : this; } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> obsoleteVersion(GridCacheVersion obsoleteVer) { - return obsoleteVer != null ? new GridCacheAttributesObsoleteTtlEntryExtras<K>(attrData, obsoleteVer, ttl, + @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { + return obsoleteVer != null ? new GridCacheAttributesObsoleteTtlEntryExtras(attrData, obsoleteVer, ttl, expireTime) : this; } @@ -90,7 +90,7 @@ public class GridCacheAttributesTtlEntryExtras<K> extends GridCacheEntryExtrasAd } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> ttlAndExpireTime(long ttl, long expireTime) { + @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { if (ttl != 0) { this.ttl = ttl; this.expireTime = expireTime; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java index b0d1d2b..9d2b6fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtras.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.*; /** * Cache extras. */ -public interface GridCacheEntryExtras<K> { +public interface GridCacheEntryExtras { /** * @return Attributes data. */ @@ -35,18 +35,18 @@ public interface GridCacheEntryExtras<K> { * @param attrData Attributes data. * @return Updated extras. */ - public GridCacheEntryExtras<K> attributesData(GridLeanMap<String, Object> attrData); + public GridCacheEntryExtras attributesData(GridLeanMap<String, Object> attrData); /** * @return MVCC. */ - @Nullable public GridCacheMvcc<K> mvcc(); + @Nullable public GridCacheMvcc mvcc(); /** * @param mvcc NVCC. * @return Updated extras. */ - public GridCacheEntryExtras<K> mvcc(GridCacheMvcc<K> mvcc); + public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc); /** * @return Obsolete version. @@ -57,7 +57,7 @@ public interface GridCacheEntryExtras<K> { * @param obsoleteVer Obsolete version. * @return Updated extras. */ - public GridCacheEntryExtras<K> obsoleteVersion(GridCacheVersion obsoleteVer); + public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer); /** * @return TTL. @@ -74,7 +74,7 @@ public interface GridCacheEntryExtras<K> { * @param expireTime Expire time. * @return Updated extras. */ - public GridCacheEntryExtras<K> ttlAndExpireTime(long ttl, long expireTime); + public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime); /** * @return Extras size. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java index 6945a31..76c49e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheEntryExtrasAdapter.java @@ -24,14 +24,14 @@ import org.apache.ignite.internal.util.*; /** * Cache extras adapter. */ -public abstract class GridCacheEntryExtrasAdapter<K> implements GridCacheEntryExtras<K> { +public abstract class GridCacheEntryExtrasAdapter implements GridCacheEntryExtras { /** {@inheritDoc} */ @Override public GridLeanMap<String, Object> attributesData() { return null; } /** {@inheritDoc} */ - @Override public GridCacheMvcc<K> mvcc() { + @Override public GridCacheMvcc mvcc() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java index 369307d..56fe584 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccEntryExtras.java @@ -25,33 +25,33 @@ import org.apache.ignite.internal.util.typedef.internal.*; /** * Extras where MVCC is set. */ -public class GridCacheMvccEntryExtras<K> extends GridCacheEntryExtrasAdapter<K> { +public class GridCacheMvccEntryExtras extends GridCacheEntryExtrasAdapter { /** MVCC. */ - private GridCacheMvcc<K> mvcc; + private GridCacheMvcc mvcc; /** * Constructor. * * @param mvcc MVCC. */ - public GridCacheMvccEntryExtras(GridCacheMvcc<K> mvcc) { + public GridCacheMvccEntryExtras(GridCacheMvcc mvcc) { assert mvcc != null; this.mvcc = mvcc; } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> attributesData(GridLeanMap<String, Object> attrData) { + @Override public GridCacheEntryExtras attributesData(GridLeanMap<String, Object> attrData) { return attrData != null ? new GridCacheAttributesMvccEntryExtras<>(attrData, mvcc) : this; } /** {@inheritDoc} */ - @Override public GridCacheMvcc<K> mvcc() { + @Override public GridCacheMvcc mvcc() { return mvcc; } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> mvcc(GridCacheMvcc<K> mvcc) { + @Override public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc) { if (mvcc != null) { this.mvcc = mvcc; @@ -62,12 +62,12 @@ public class GridCacheMvccEntryExtras<K> extends GridCacheEntryExtrasAdapter<K> } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> obsoleteVersion(GridCacheVersion obsoleteVer) { + @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { return obsoleteVer != null ? new GridCacheMvccObsoleteEntryExtras<>(mvcc, obsoleteVer) : this; } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> ttlAndExpireTime(long ttl, long expireTime) { + @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { return ttl != 0 ? new GridCacheMvccTtlEntryExtras<>(mvcc, ttl, expireTime) : this; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7ea910f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java index 78c07e0..d90d94c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheMvccObsoleteEntryExtras.java @@ -25,9 +25,9 @@ import org.apache.ignite.internal.util.typedef.internal.*; /** * Extras where MVCC and obsolete version are set. */ -public class GridCacheMvccObsoleteEntryExtras<K> extends GridCacheEntryExtrasAdapter<K> { +public class GridCacheMvccObsoleteEntryExtras extends GridCacheEntryExtrasAdapter { /** MVCC. */ - private GridCacheMvcc<K> mvcc; + private GridCacheMvcc mvcc; /** Obsolete version. */ private GridCacheVersion obsoleteVer; @@ -38,7 +38,7 @@ public class GridCacheMvccObsoleteEntryExtras<K> extends GridCacheEntryExtrasAda * @param mvcc MVCC. * @param obsoleteVer Obsolete version. */ - public GridCacheMvccObsoleteEntryExtras(GridCacheMvcc<K> mvcc, GridCacheVersion obsoleteVer) { + public GridCacheMvccObsoleteEntryExtras(GridCacheMvcc mvcc, GridCacheVersion obsoleteVer) { assert mvcc != null; assert obsoleteVer != null; @@ -47,24 +47,24 @@ public class GridCacheMvccObsoleteEntryExtras<K> extends GridCacheEntryExtrasAda } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> attributesData(GridLeanMap<String, Object> attrData) { - return attrData != null ? new GridCacheAttributesMvccObsoleteEntryExtras<>(attrData, mvcc, obsoleteVer) : this; + @Override public GridCacheEntryExtras attributesData(GridLeanMap<String, Object> attrData) { + return attrData != null ? new GridCacheAttributesMvccObsoleteEntryExtras(attrData, mvcc, obsoleteVer) : this; } /** {@inheritDoc} */ - @Override public GridCacheMvcc<K> mvcc() { + @Override public GridCacheMvcc mvcc() { return mvcc; } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> mvcc(GridCacheMvcc<K> mvcc) { + @Override public GridCacheEntryExtras mvcc(GridCacheMvcc mvcc) { if (mvcc != null) { this.mvcc = mvcc; return this; } else - return new GridCacheObsoleteEntryExtras<>(obsoleteVer); + return new GridCacheObsoleteEntryExtras(obsoleteVer); } /** {@inheritDoc} */ @@ -73,19 +73,19 @@ public class GridCacheMvccObsoleteEntryExtras<K> extends GridCacheEntryExtrasAda } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> obsoleteVersion(GridCacheVersion obsoleteVer) { + @Override public GridCacheEntryExtras obsoleteVersion(GridCacheVersion obsoleteVer) { if (obsoleteVer != null) { this.obsoleteVer = obsoleteVer; return this; } else - return new GridCacheMvccEntryExtras<>(mvcc); + return new GridCacheMvccEntryExtras(mvcc); } /** {@inheritDoc} */ - @Override public GridCacheEntryExtras<K> ttlAndExpireTime(long ttl, long expireTime) { - return ttl != 0 ? new GridCacheMvccObsoleteTtlEntryExtras<>(mvcc, obsoleteVer, ttl, expireTime) : this; + @Override public GridCacheEntryExtras ttlAndExpireTime(long ttl, long expireTime) { + return ttl != 0 ? new GridCacheMvccObsoleteTtlEntryExtras(mvcc, obsoleteVer, ttl, expireTime) : this; } /** {@inheritDoc} */
