Merge branch 'master' into 3.0.0

# Conflicts:
#	redisson/src/main/java/org/redisson/reactive/MapReactiveIterator.java
#	redisson/src/main/java/org/redisson/reactive/RedissonMapCacheReactive.java
#	redisson/src/main/java/org/redisson/reactive/RedissonMapReactive.java
pull/1833/head
Nikita Koksharov 6 years ago
commit be8cff49b4

@ -224,7 +224,9 @@
<configuration>
<source>${source.version}</source>
<target>${source.version}</target>
<!--
<release>${release.version}</release>
-->
<optimize>true</optimize>
<showDeprecations>true</showDeprecations>
</configuration>

@ -324,7 +324,7 @@ public class RedissonConnection extends AbstractRedisConnection {
}
Set<byte[]> results = new HashSet<byte[]>();
RFuture<Set<byte[]>> f = (RFuture<Set<byte[]>>)(Object)(executorService.readAllAsync(results, KEYS, pattern));
RFuture<Set<byte[]>> f = (RFuture<Set<byte[]>>)(Object)(executorService.readAllAsync(results, ByteArrayCodec.INSTANCE, KEYS, pattern));
return sync(f);
}

@ -326,7 +326,7 @@ public class RedissonConnection extends AbstractRedisConnection {
}
Set<byte[]> results = new HashSet<byte[]>();
RFuture<Set<byte[]>> f = (RFuture<Set<byte[]>>)(Object)(executorService.readAllAsync(results, KEYS, pattern));
RFuture<Set<byte[]>> f = (RFuture<Set<byte[]>>)(Object)(executorService.readAllAsync(results, ByteArrayCodec.INSTANCE, KEYS, pattern));
return sync(f);
}

@ -335,7 +335,7 @@ public class RedissonConnection extends AbstractRedisConnection {
}
Set<byte[]> results = new HashSet<byte[]>();
RFuture<Set<byte[]>> f = (RFuture<Set<byte[]>>)(Object)(executorService.readAllAsync(results, KEYS, pattern));
RFuture<Set<byte[]>> f = (RFuture<Set<byte[]>>)(Object)(executorService.readAllAsync(results, ByteArrayCodec.INSTANCE, KEYS, pattern));
return sync(f);
}

@ -336,7 +336,7 @@ public class RedissonConnection extends AbstractRedisConnection {
}
Set<byte[]> results = new HashSet<byte[]>();
RFuture<Set<byte[]>> f = (RFuture<Set<byte[]>>)(Object)(executorService.readAllAsync(results, KEYS, pattern));
RFuture<Set<byte[]>> f = (RFuture<Set<byte[]>>)(Object)(executorService.readAllAsync(results, ByteArrayCodec.INSTANCE, KEYS, pattern));
return sync(f);
}

@ -336,7 +336,7 @@ public class RedissonConnection extends AbstractRedisConnection {
}
Set<byte[]> results = new HashSet<byte[]>();
RFuture<Set<byte[]>> f = (RFuture<Set<byte[]>>)(Object)(executorService.readAllAsync(results, KEYS, pattern));
RFuture<Set<byte[]>> f = (RFuture<Set<byte[]>>)(Object)(executorService.readAllAsync(results, ByteArrayCodec.INSTANCE, KEYS, pattern));
return sync(f);
}

Loading…
Cancel
Save