From f54c4622982e542b574f15558ad9c66e88575fb3 Mon Sep 17 00:00:00 2001 From: Nikita Date: Mon, 8 May 2017 11:26:07 +0300 Subject: [PATCH] Fixed empty result handling for RGeo.radiusStoreTo methods --- .../main/java/org/redisson/RedissonGeo.java | 36 +++++++++--------- .../src/main/java/org/redisson/api/RGeo.java | 12 +++--- .../main/java/org/redisson/api/RGeoAsync.java | 12 +++--- .../client/protocol/RedisCommands.java | 6 ++- .../client/protocol/decoder/DecoderState.java | 5 +++ .../protocol/decoder/GeoDistanceDecoder.java | 6 ++- .../decoder/GeoDistanceMapDecoder.java | 5 +++ .../protocol/decoder/GeoMapReplayDecoder.java | 5 +++ .../protocol/decoder/GeoPositionDecoder.java | 5 +++ .../decoder/GeoPositionMapDecoder.java | 5 +++ .../protocol/decoder/KeyValueMessage.java | 7 ++++ .../decoder/KeyValueObjectDecoder.java | 5 +++ .../decoder/ListFirstObjectDecoder.java | 5 +++ .../decoder/ListIteratorReplayDecoder.java | 5 +++ .../protocol/decoder/ListIteratorResult.java | 6 +++ .../protocol/decoder/ListMultiDecoder.java | 6 +++ .../decoder/ListResultReplayDecoder.java | 5 +++ .../protocol/decoder/ListScanResult.java | 6 +++ .../decoder/ListScanResultReplayDecoder.java | 5 +++ .../protocol/decoder/Long2MultiDecoder.java | 37 +++++++++++++++++++ .../protocol/decoder/LongMultiDecoder.java | 5 +++ .../protocol/decoder/MapCacheScanResult.java | 7 ++++ .../MapCacheScanResultReplayDecoder.java | 5 +++ .../protocol/decoder/MapScanResult.java | 7 ++++ .../decoder/MapScanResultReplayDecoder.java | 5 +++ .../ObjectFirstResultReplayDecoder.java | 6 +++ .../protocol/decoder/ObjectListDecoder.java | 6 +++ .../protocol/decoder/ScanObjectEntry.java | 5 +++ .../decoder/ScoredSortedSetReplayDecoder.java | 6 +++ .../decoder/ScoredSortedSetScanDecoder.java | 6 +++ .../ScoredSortedSetScanReplayDecoder.java | 5 +++ .../client/protocol/decoder/SlotsDecoder.java | 5 +++ .../protocol/decoder/StringDataDecoder.java | 5 +++ .../decoder/StringListReplayDecoder.java | 5 +++ .../decoder/StringMapDataDecoder.java | 5 +++ .../protocol/decoder/StringReplayDecoder.java | 5 +++ .../decoder/TTLMapValueReplayDecoder.java | 6 +++ 37 files changed, 245 insertions(+), 33 deletions(-) create mode 100644 redisson/src/main/java/org/redisson/client/protocol/decoder/Long2MultiDecoder.java diff --git a/redisson/src/main/java/org/redisson/RedissonGeo.java b/redisson/src/main/java/org/redisson/RedissonGeo.java index e7992e007..28c4b4546 100644 --- a/redisson/src/main/java/org/redisson/RedissonGeo.java +++ b/redisson/src/main/java/org/redisson/RedissonGeo.java @@ -407,63 +407,63 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit) { - return commandExecutor.writeAsync(getName(), LongCodec.INSTANCE, RedisCommands.GEORADIUS_STORE_INT, getName(), convert(longitude), convert(latitude), radius, geoUnit, "STORE", destName); + public RFuture radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit) { + return commandExecutor.writeAsync(getName(), LongCodec.INSTANCE, RedisCommands.GEORADIUS_STORE, getName(), convert(longitude), convert(latitude), radius, geoUnit, "STORE", destName); } @Override - public int radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count) { + public long radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count) { return get(radiusStoreToAsync(destName, longitude, latitude, radius, geoUnit, count)); } @Override - public RFuture radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count) { - return commandExecutor.writeAsync(getName(), LongCodec.INSTANCE, RedisCommands.GEORADIUS_STORE_INT, getName(), convert(longitude), convert(latitude), radius, geoUnit, "COUNT", count, "STORE", destName); + public RFuture radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count) { + return commandExecutor.writeAsync(getName(), LongCodec.INSTANCE, RedisCommands.GEORADIUS_STORE, getName(), convert(longitude), convert(latitude), radius, geoUnit, "COUNT", count, "STORE", destName); } @Override - public int radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { + public long radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { return get(radiusStoreToAsync(destName, longitude, latitude, radius, geoUnit, geoOrder, count)); } @Override - public RFuture radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { - return commandExecutor.writeAsync(getName(), LongCodec.INSTANCE, RedisCommands.GEORADIUS_STORE_INT, getName(), convert(longitude), convert(latitude), radius, geoUnit, geoOrder, "COUNT", count, "STORE", destName); + public RFuture radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { + return commandExecutor.writeAsync(getName(), LongCodec.INSTANCE, RedisCommands.GEORADIUS_STORE, getName(), convert(longitude), convert(latitude), radius, geoUnit, geoOrder, "COUNT", count, "STORE", destName); } @Override - public int radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit) { + public long radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit) { return get(radiusStoreToAsync(destName, member, radius, geoUnit)); } @Override - public RFuture radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit) { - return commandExecutor.writeAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_STORE_INT, getName(), member, radius, geoUnit, "STORE", destName); + public RFuture radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit) { + return commandExecutor.writeAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_STORE, getName(), member, radius, geoUnit, "STORE", destName); } @Override - public int radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, int count) { + public long radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, int count) { return get(radiusStoreToAsync(destName, member, radius, geoUnit, count)); } @Override - public RFuture radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, int count) { - return commandExecutor.writeAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_STORE_INT, getName(), member, radius, geoUnit, "COUNT", count, "STORE", destName); + public RFuture radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, int count) { + return commandExecutor.writeAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_STORE, getName(), member, radius, geoUnit, "COUNT", count, "STORE", destName); } @Override - public int radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { + public long radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { return get(radiusStoreToAsync(destName, member, radius, geoUnit, geoOrder, count)); } @Override - public RFuture radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { - return commandExecutor.writeAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_STORE_INT, getName(), member, radius, geoUnit, geoOrder, "COUNT", count, "STORE", destName); + public RFuture radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count) { + return commandExecutor.writeAsync(getName(), codec, RedisCommands.GEORADIUSBYMEMBER_STORE, getName(), member, radius, geoUnit, geoOrder, "COUNT", count, "STORE", destName); } } diff --git a/redisson/src/main/java/org/redisson/api/RGeo.java b/redisson/src/main/java/org/redisson/api/RGeo.java index 610cfd7fa..0b29cce5f 100644 --- a/redisson/src/main/java/org/redisson/api/RGeo.java +++ b/redisson/src/main/java/org/redisson/api/RGeo.java @@ -459,7 +459,7 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * @param geoUnit - geo unit * @return length of result */ - int radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit); + long radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit); /** * Finds the members of a sorted set, which are within the @@ -476,7 +476,7 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * @param count - result limit * @return length of result */ - int radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count); + long radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count); /** * Finds the members of a sorted set, which are within the @@ -495,7 +495,7 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * @param count - result limit * @return length of result */ - int radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count); + long radiusStoreTo(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count); /** * Finds the members of a sorted set, which are within the @@ -510,7 +510,7 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * @param geoUnit - geo unit * @return length of result */ - int radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit); + long radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit); /** * Finds the members of a sorted set, which are within the @@ -526,7 +526,7 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * @param count - result limit * @return length of result */ - int radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, int count); + long radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, int count); /** * Finds the members of a sorted set, which are within the @@ -543,6 +543,6 @@ public interface RGeo extends RScoredSortedSet, RGeoAsync { * @param count - result limit * @return length of result */ - int radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count); + long radiusStoreTo(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count); } diff --git a/redisson/src/main/java/org/redisson/api/RGeoAsync.java b/redisson/src/main/java/org/redisson/api/RGeoAsync.java index 8f9750a02..6d1700ed1 100644 --- a/redisson/src/main/java/org/redisson/api/RGeoAsync.java +++ b/redisson/src/main/java/org/redisson/api/RGeoAsync.java @@ -457,7 +457,7 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * @param geoUnit - geo unit * @return length of result */ - RFuture radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit); + RFuture radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit); /** * Finds the members of a sorted set, which are within the @@ -474,7 +474,7 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * @param count - result limit * @return length of result */ - RFuture radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count); + RFuture radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, int count); /** * Finds the members of a sorted set, which are within the @@ -493,7 +493,7 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * @param count - result limit * @return length of result */ - RFuture radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count); + RFuture radiusStoreToAsync(String destName, double longitude, double latitude, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count); /** * Finds the members of a sorted set, which are within the @@ -508,7 +508,7 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * @param geoUnit - geo unit * @return length of result */ - RFuture radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit); + RFuture radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit); /** * Finds the members of a sorted set, which are within the @@ -524,7 +524,7 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * @param count - result limit * @return length of result */ - RFuture radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, int count); + RFuture radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, int count); /** * Finds the members of a sorted set, which are within the @@ -541,6 +541,6 @@ public interface RGeoAsync extends RScoredSortedSetAsync { * @param count - result limit * @return length of result */ - RFuture radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count); + RFuture radiusStoreToAsync(String destName, V member, double radius, GeoUnit geoUnit, GeoOrder geoOrder, int count); } diff --git a/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java b/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java index c155aecc0..a91c4dda6 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java +++ b/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java @@ -45,6 +45,8 @@ import org.redisson.client.protocol.decoder.KeyValueObjectDecoder; import org.redisson.client.protocol.decoder.ListResultReplayDecoder; import org.redisson.client.protocol.decoder.ListScanResult; import org.redisson.client.protocol.decoder.ListScanResultReplayDecoder; +import org.redisson.client.protocol.decoder.Long2MultiDecoder; +import org.redisson.client.protocol.decoder.LongMultiDecoder; import org.redisson.client.protocol.decoder.MapScanResult; import org.redisson.client.protocol.decoder.MapScanResultReplayDecoder; import org.redisson.client.protocol.decoder.NestedMultiDecoder; @@ -76,8 +78,8 @@ public interface RedisCommands { RedisCommand GEODIST = new RedisCommand("GEODIST", new DoubleReplayConvertor(), 2, Arrays.asList(ValueType.OBJECT, ValueType.OBJECT, ValueType.STRING)); RedisCommand> GEORADIUS = new RedisCommand>("GEORADIUS", new ObjectListReplayDecoder()); RedisCommand> GEORADIUSBYMEMBER = new RedisCommand>("GEORADIUSBYMEMBER", new ObjectListReplayDecoder(), 2); - RedisStrictCommand GEORADIUS_STORE_INT = new RedisStrictCommand("GEORADIUS", new IntegerReplayConvertor()); - RedisStrictCommand GEORADIUSBYMEMBER_STORE_INT = new RedisStrictCommand("GEORADIUSBYMEMBER", new IntegerReplayConvertor(), 2); + RedisCommand GEORADIUS_STORE = new RedisCommand("GEORADIUS", new Long2MultiDecoder()); + RedisCommand GEORADIUSBYMEMBER_STORE = new RedisCommand("GEORADIUSBYMEMBER", new Long2MultiDecoder(), 2); RedisStrictCommand KEYSLOT = new RedisStrictCommand("CLUSTER", "KEYSLOT", new IntegerReplayConvertor()); RedisStrictCommand TYPE = new RedisStrictCommand("TYPE", new TypeConvertor()); diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/DecoderState.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/DecoderState.java index 10c3768f8..6c257f8a1 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/DecoderState.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/DecoderState.java @@ -15,6 +15,11 @@ */ package org.redisson.client.protocol.decoder; +/** + * + * @author Nikita Koksharov + * + */ public interface DecoderState { DecoderState copy(); diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceDecoder.java index 12dac9242..970c99b89 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceDecoder.java @@ -23,8 +23,12 @@ import org.redisson.client.codec.DoubleCodec; import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; -import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + */ public class GeoDistanceDecoder implements MultiDecoder> { private final ThreadLocal pos = new ThreadLocal(); diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceMapDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceMapDecoder.java index 0745b04c0..9d5bc3193 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceMapDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoDistanceMapDecoder.java @@ -26,6 +26,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; +/** + * + * @author Nikita Koksharov + * + */ public class GeoDistanceMapDecoder implements MultiDecoder> { private final ThreadLocal pos = new ThreadLocal(); diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoMapReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoMapReplayDecoder.java index 418643b29..523b0225c 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoMapReplayDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoMapReplayDecoder.java @@ -23,6 +23,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; +/** + * + * @author Nikita Koksharov + * + */ public class GeoMapReplayDecoder implements MultiDecoder> { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionDecoder.java index de373303a..54f756602 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionDecoder.java @@ -24,6 +24,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; +/** + * + * @author Nikita Koksharov + * + */ public class GeoPositionDecoder implements MultiDecoder { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionMapDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionMapDecoder.java index def4343c1..907d218be 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionMapDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/GeoPositionMapDecoder.java @@ -25,6 +25,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; +/** + * + * @author Nikita Koksharov + * + */ public class GeoPositionMapDecoder implements MultiDecoder> { private final List args; diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueMessage.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueMessage.java index 1a52e1057..74b52886f 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueMessage.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueMessage.java @@ -15,6 +15,13 @@ */ package org.redisson.client.protocol.decoder; +/** + * + * @author Nikita Koksharov + * + * @param key type + * @param value type + */ public class KeyValueMessage { private K key; diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueObjectDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueObjectDecoder.java index 42ca5e798..5ac2d0c65 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueObjectDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/KeyValueObjectDecoder.java @@ -22,6 +22,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + */ public class KeyValueObjectDecoder implements MultiDecoder { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListFirstObjectDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListFirstObjectDecoder.java index ded8a9144..cffa3aa42 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListFirstObjectDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListFirstObjectDecoder.java @@ -21,6 +21,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; +/** + * + * @author Nikita Koksharov + * + */ public class ListFirstObjectDecoder implements MultiDecoder { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorReplayDecoder.java index 473a46ed1..8278cde72 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorReplayDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorReplayDecoder.java @@ -21,6 +21,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; +/** + * + * @author Nikita Koksharov + * + */ public class ListIteratorReplayDecoder implements MultiDecoder> { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorResult.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorResult.java index 4fc4ffb66..2ae392fa4 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorResult.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListIteratorResult.java @@ -15,6 +15,12 @@ */ package org.redisson.client.protocol.decoder; +/** + * + * @author Nikita Koksharov + * + * @param value type + */ public class ListIteratorResult { private final V element; diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListMultiDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListMultiDecoder.java index 48072d8cb..0ccbd404e 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListMultiDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListMultiDecoder.java @@ -22,6 +22,12 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; +/** + * + * @author Nikita Koksharov + * + * @param type + */ public class ListMultiDecoder implements MultiDecoder { private final MultiDecoder[] decoders; diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListResultReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListResultReplayDecoder.java index ab75de8f0..75ef13dde 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListResultReplayDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListResultReplayDecoder.java @@ -24,6 +24,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + */ public class ListResultReplayDecoder implements MultiDecoder>> { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResult.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResult.java index 75a97dd3a..269b86e64 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResult.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResult.java @@ -20,6 +20,12 @@ import java.util.List; import org.redisson.RedisClientResult; +/** + * + * @author Nikita Koksharov + * + * @param value type + */ public class ListScanResult implements RedisClientResult { private final Long pos; diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResultReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResultReplayDecoder.java index b47af1ed0..a03e8dd02 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResultReplayDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/ListScanResultReplayDecoder.java @@ -22,6 +22,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + */ public class ListScanResultReplayDecoder implements MultiDecoder> { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/Long2MultiDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/Long2MultiDecoder.java new file mode 100644 index 000000000..a82d236b1 --- /dev/null +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/Long2MultiDecoder.java @@ -0,0 +1,37 @@ +/** + * Copyright 2016 Nikita Koksharov + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.redisson.client.protocol.decoder; + +import java.util.List; + +import org.redisson.client.handler.State; + +/** + * + * @author Nikita Koksharov + * + */ +public class Long2MultiDecoder extends LongMultiDecoder { + + @Override + public Object decode(List parts, State state) { + if (parts.isEmpty()) { + return 0L; + } + return null; + } + +} diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/LongMultiDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/LongMultiDecoder.java index 0db640e7e..e8eca802b 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/LongMultiDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/LongMultiDecoder.java @@ -23,6 +23,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; +/** + * + * @author Nikita Koksharov + * + */ public class LongMultiDecoder implements MultiDecoder { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResult.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResult.java index 0aa07d843..e657207a0 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResult.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResult.java @@ -18,6 +18,13 @@ package org.redisson.client.protocol.decoder; import java.util.List; import java.util.Map; +/** + * + * @author Nikita Koksharov + * + * @param key type + * @param value type + */ public class MapCacheScanResult extends MapScanResult { private final List idleKeys; diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResultReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResultReplayDecoder.java index a459a723c..5016751a9 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResultReplayDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/MapCacheScanResultReplayDecoder.java @@ -23,6 +23,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; +/** + * + * @author Nikita Koksharov + * + */ public class MapCacheScanResultReplayDecoder implements MultiDecoder> { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/MapScanResult.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/MapScanResult.java index f83c53ecb..d50c6b846 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/MapScanResult.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/MapScanResult.java @@ -20,6 +20,13 @@ import java.util.Map; import org.redisson.RedisClientResult; +/** + * + * @author Nikita Koksharov + * + * @param key type + * @param value type + */ public class MapScanResult implements RedisClientResult { private final Long pos; diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/MapScanResultReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/MapScanResultReplayDecoder.java index 577f95feb..d7b5ff505 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/MapScanResultReplayDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/MapScanResultReplayDecoder.java @@ -23,6 +23,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + */ public class MapScanResultReplayDecoder implements MultiDecoder> { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectFirstResultReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectFirstResultReplayDecoder.java index e3c443d8a..de3b819be 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectFirstResultReplayDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectFirstResultReplayDecoder.java @@ -21,6 +21,12 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; +/** + * + * @author Nikita Koksharov + * + * @param type + */ public class ObjectFirstResultReplayDecoder implements MultiDecoder { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectListDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectListDecoder.java index a77636054..0cd24c467 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectListDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectListDecoder.java @@ -23,6 +23,12 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; +/** + * + * @author Nikita Koksharov + * + * @param type + */ public class ObjectListDecoder implements MultiDecoder> { private Codec codec; diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ScanObjectEntry.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ScanObjectEntry.java index 624fcfce9..b1bae6ab8 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/ScanObjectEntry.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/ScanObjectEntry.java @@ -17,6 +17,11 @@ package org.redisson.client.protocol.decoder; import io.netty.buffer.ByteBuf; +/** + * + * @author Nikita Koksharov + * + */ public class ScanObjectEntry { private final ByteBuf buf; diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetReplayDecoder.java index ed46da066..6f9411e34 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetReplayDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetReplayDecoder.java @@ -25,6 +25,12 @@ import org.redisson.client.protocol.ScoredEntry; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + * @param type + */ public class ScoredSortedSetReplayDecoder implements MultiDecoder>> { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanDecoder.java index ba9c76caf..e9226e5df 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanDecoder.java @@ -22,6 +22,12 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + * @param type + */ public class ScoredSortedSetScanDecoder extends ObjectListReplayDecoder { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanReplayDecoder.java index 4145e9825..b92061fd2 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanReplayDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/ScoredSortedSetScanReplayDecoder.java @@ -22,6 +22,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + */ public class ScoredSortedSetScanReplayDecoder implements MultiDecoder> { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/SlotsDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/SlotsDecoder.java index cbd28efb1..8248a1106 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/SlotsDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/SlotsDecoder.java @@ -28,6 +28,11 @@ import org.redisson.cluster.ClusterSlotRange; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + */ public class SlotsDecoder implements MultiDecoder { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/StringDataDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/StringDataDecoder.java index 4a4298ba4..c5f70a20a 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/StringDataDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/StringDataDecoder.java @@ -21,6 +21,11 @@ import org.redisson.client.protocol.Decoder; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + */ public class StringDataDecoder implements Decoder { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/StringListReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/StringListReplayDecoder.java index dc42489f4..89be7cdc8 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/StringListReplayDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/StringListReplayDecoder.java @@ -23,6 +23,11 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + */ public class StringListReplayDecoder implements MultiDecoder> { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/StringMapDataDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/StringMapDataDecoder.java index 2d0c20e73..a7fe8e3fe 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/StringMapDataDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/StringMapDataDecoder.java @@ -24,6 +24,11 @@ import org.redisson.client.protocol.Decoder; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + */ public class StringMapDataDecoder implements Decoder> { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/StringReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/StringReplayDecoder.java index b0b796af9..480d820e3 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/StringReplayDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/StringReplayDecoder.java @@ -21,6 +21,11 @@ import org.redisson.client.protocol.Decoder; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + */ public class StringReplayDecoder implements Decoder { @Override diff --git a/redisson/src/main/java/org/redisson/client/protocol/decoder/TTLMapValueReplayDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/decoder/TTLMapValueReplayDecoder.java index 7d7cff0ec..038b28bf3 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/decoder/TTLMapValueReplayDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/decoder/TTLMapValueReplayDecoder.java @@ -22,6 +22,12 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; +/** + * + * @author Nikita Koksharov + * + * @param type + */ public class TTLMapValueReplayDecoder implements MultiDecoder> { @Override