Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Type inference for generic instance creation #2100

Merged
merged 7 commits into from Nov 25, 2019
Merged

Type inference for generic instance creation #2100

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
da56fb3
Type inference for generic instance creation:
ullenius Nov 20, 2019
73e88b4
Type inference <>
ullenius Nov 20, 2019
52b6fbe
Removing unused method parameter
ullenius Nov 20, 2019
5f01d7b
Minor. Declaring modifiers in correct order:
ullenius Nov 20, 2019
ac80586
Removing unused variable
ullenius Nov 25, 2019
8dfb8ac
Type inference <>
ullenius Nov 25, 2019
2980434
Removing assignment to unused local variable
ullenius Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/main/java/redis/clients/jedis/BinaryClient.java
View file
Open in desktop
Expand Up @@ -283,7 +283,7 @@ public void hsetnx(final byte[] key, final byte[] field, final byte[] value) {
}

public void hmset(final byte[] key, final Map<byte[], byte[]> hash) {
final List<byte[]> params = new ArrayList<byte[]>();
final List<byte[]> params = new ArrayList<>();
params.add(key);

for (final Entry<byte[], byte[]> entry : hash.entrySet()) {
Expand Down Expand Up @@ -439,7 +439,7 @@ public void zadd(final byte[] key, final double score, final byte[] member,
}

public void zadd(final byte[] key, final Map<byte[], Double> scoreMembers) {
ArrayList<byte[]> args = new ArrayList<byte[]>(scoreMembers.size() * 2 + 1);
ArrayList<byte[]> args = new ArrayList<>(scoreMembers.size() * 2 + 1);
args.add(key);
args.addAll(convertScoreMembersToByteArrays(scoreMembers));

Expand Down Expand Up @@ -543,7 +543,7 @@ public void sort(final byte[] key) {
}

public void sort(final byte[] key, final SortingParams sortingParameters) {
final List<byte[]> args = new ArrayList<byte[]>();
final List<byte[]> args = new ArrayList<>();
args.add(key);
args.addAll(sortingParameters.getParams());
sendCommand(SORT, args.toArray(new byte[args.size()][]));
Expand All @@ -554,7 +554,7 @@ public void blpop(final byte[][] args) {
}

public void blpop(final int timeout, final byte[]... keys) {
final List<byte[]> args = new ArrayList<byte[]>();
final List<byte[]> args = new ArrayList<>();
for (final byte[] arg : keys) {
args.add(arg);
}
Expand All @@ -563,7 +563,7 @@ public void blpop(final int timeout, final byte[]... keys) {
}

public void sort(final byte[] key, final SortingParams sortingParameters, final byte[] dstkey) {
final List<byte[]> args = new ArrayList<byte[]>();
final List<byte[]> args = new ArrayList<>();
args.add(key);
args.addAll(sortingParameters.getParams());
args.add(STORE.raw);
Expand All @@ -580,7 +580,7 @@ public void brpop(final byte[][] args) {
}

public void brpop(final int timeout, final byte[]... keys) {
final List<byte[]> args = new ArrayList<byte[]>();
final List<byte[]> args = new ArrayList<>();
for (final byte[] arg : keys) {
args.add(arg);
}
Expand Down Expand Up @@ -728,7 +728,7 @@ public void zunionstore(final byte[] dstkey, final byte[]... sets) {
}

public void zunionstore(final byte[] dstkey, final ZParams params, final byte[]... sets) {
final List<byte[]> args = new ArrayList<byte[]>();
final List<byte[]> args = new ArrayList<>();
args.add(dstkey);
args.add(Protocol.toByteArray(sets.length));
for (final byte[] set : sets) {
Expand All @@ -743,7 +743,7 @@ public void zinterstore(final byte[] dstkey, final byte[]... sets) {
}

public void zinterstore(final byte[] dstkey, final ZParams params, final byte[]... sets) {
final List<byte[]> args = new ArrayList<byte[]>();
final List<byte[]> args = new ArrayList<>();
args.add(dstkey);
args.add(Protocol.toByteArray(sets.length));
for (final byte[] set : sets) {
Expand Down Expand Up @@ -885,7 +885,7 @@ public void getbit(final byte[] key, final long offset) {
}

public void bitpos(final byte[] key, final boolean value, final BitPosParams params) {
final List<byte[]> args = new ArrayList<byte[]>();
final List<byte[]> args = new ArrayList<>();
args.add(key);
args.add(toByteArray(value));
args.addAll(params.getParams());
Expand Down Expand Up @@ -1096,30 +1096,30 @@ public void hincrByFloat(final byte[] key, final byte[] field, final double incr
}

public void scan(final byte[] cursor, final ScanParams params) {
final List<byte[]> args = new ArrayList<byte[]>();
final List<byte[]> args = new ArrayList<>();
args.add(cursor);
args.addAll(params.getParams());
sendCommand(SCAN, args.toArray(new byte[args.size()][]));
}

public void hscan(final byte[] key, final byte[] cursor, final ScanParams params) {
final List<byte[]> args = new ArrayList<byte[]>();
final List<byte[]> args = new ArrayList<>();
args.add(key);
args.add(cursor);
args.addAll(params.getParams());
sendCommand(HSCAN, args.toArray(new byte[args.size()][]));
}

public void sscan(final byte[] key, final byte[] cursor, final ScanParams params) {
final List<byte[]> args = new ArrayList<byte[]>();
final List<byte[]> args = new ArrayList<>();
args.add(key);
args.add(cursor);
args.addAll(params.getParams());
sendCommand(SSCAN, args.toArray(new byte[args.size()][]));
}

public void zscan(final byte[] key, final byte[] cursor, final ScanParams params) {
final List<byte[]> args = new ArrayList<byte[]>();
final List<byte[]> args = new ArrayList<>();
args.add(key);
args.add(cursor);
args.addAll(params.getParams());
Expand Down Expand Up @@ -1163,7 +1163,7 @@ public void geoadd(final byte[] key, final double longitude, final double latitu
}

public void geoadd(final byte[] key, final Map<byte[], GeoCoordinate> memberCoordinateMap) {
List<byte[]> args = new ArrayList<byte[]>(memberCoordinateMap.size() * 3 + 1);
List<byte[]> args = new ArrayList<>(memberCoordinateMap.size() * 3 + 1);
args.add(key);
args.addAll(convertGeoCoordinateMapToByteArrays(memberCoordinateMap));

Expand Down Expand Up @@ -1242,7 +1242,7 @@ public void moduleUnload(final byte[] name) {
}

private ArrayList<byte[]> convertScoreMembersToByteArrays(final Map<byte[], Double> scoreMembers) {
ArrayList<byte[]> args = new ArrayList<byte[]>(scoreMembers.size() * 2);
ArrayList<byte[]> args = new ArrayList<>(scoreMembers.size() * 2);

for (Map.Entry<byte[], Double> entry : scoreMembers.entrySet()) {
args.add(toByteArray(entry.getValue()));
Expand All @@ -1254,7 +1254,7 @@ private ArrayList<byte[]> convertScoreMembersToByteArrays(final Map<byte[], Doub

private List<byte[]> convertGeoCoordinateMapToByteArrays(
final Map<byte[], GeoCoordinate> memberCoordinateMap) {
List<byte[]> args = new ArrayList<byte[]>(memberCoordinateMap.size() * 3);
List<byte[]> args = new ArrayList<>(memberCoordinateMap.size() * 3);

for (Entry<byte[], GeoCoordinate> entry : memberCoordinateMap.entrySet()) {
GeoCoordinate coordinate = entry.getValue();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/redis/clients/jedis/BinaryJedis.java
View file
Open in desktop
Expand Up @@ -3673,7 +3673,7 @@ public ScanResult<byte[]> scan(final byte[] cursor, final ScanParams params) {
List<Object> result = client.getObjectMultiBulkReply();
byte[] newcursor = (byte[]) result.get(0);
List<byte[]> rawResults = (List<byte[]>) result.get(1);
return new ScanResult<byte[]>(newcursor, rawResults);
return new ScanResult<>(newcursor, rawResults);
}

@Override
Expand All @@ -3688,7 +3688,7 @@ public ScanResult<Map.Entry<byte[], byte[]>> hscan(final byte[] key, final byte[
client.hscan(key, cursor, params);
List<Object> result = client.getObjectMultiBulkReply();
byte[] newcursor = (byte[]) result.get(0);
List<Map.Entry<byte[], byte[]>> results = new ArrayList<Map.Entry<byte[], byte[]>>();
List<Map.Entry<byte[], byte[]>> results = new ArrayList<>();
List<byte[]> rawResults = (List<byte[]>) result.get(1);
Iterator<byte[]> iterator = rawResults.iterator();
while (iterator.hasNext()) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/redis/clients/jedis/BitPosParams.java
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
import java.util.List;

public class BitPosParams {
private List<byte[]> params = new ArrayList<byte[]>();
private List<byte[]> params = new ArrayList<>();

protected BitPosParams() {
}
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/redis/clients/jedis/BuilderFactory.java
View file
Open in desktop
Expand Up @@ -87,7 +87,7 @@ public List<String> build(Object data) {
return null;
}
List<byte[]> l = (List<byte[]>) data;
final ArrayList<String> result = new ArrayList<String>(l.size());
final ArrayList<String> result = new ArrayList<>(l.size());
for (final byte[] barray : l) {
if (barray == null) {
result.add(null);
Expand All @@ -109,7 +109,7 @@ public String toString() {
@SuppressWarnings("unchecked")
public Map<String, String> build(Object data) {
final List<byte[]> flatHash = (List<byte[]>) data;
final Map<String, String> hash = new HashMap<String, String>(flatHash.size()/2, 1);
final Map<String, String> hash = new HashMap<>(flatHash.size()/2, 1);
final Iterator<byte[]> iterator = flatHash.iterator();
while (iterator.hasNext()) {
hash.put(SafeEncoder.encode(iterator.next()), SafeEncoder.encode(iterator.next()));
Expand All @@ -130,7 +130,7 @@ public String toString() {
@SuppressWarnings("unchecked")
public Map<String, String> build(Object data) {
final List<Object> flatHash = (List<Object>) data;
final Map<String, String> hash = new HashMap<String, String>(flatHash.size()/2, 1);
final Map<String, String> hash = new HashMap<>(flatHash.size()/2, 1);
final Iterator<Object> iterator = flatHash.iterator();
while (iterator.hasNext()) {
hash.put(SafeEncoder.encode((byte[]) iterator.next()),
Expand All @@ -155,7 +155,7 @@ public Set<String> build(Object data) {
return null;
}
List<byte[]> l = (List<byte[]>) data;
final Set<String> result = new HashSet<String>(l.size(), 1);
final Set<String> result = new HashSet<>(l.size(), 1);
for (final byte[] barray : l) {
if (barray == null) {
result.add(null);
Expand Down Expand Up @@ -199,7 +199,7 @@ public Set<byte[]> build(Object data) {
return null;
}
List<byte[]> l = (List<byte[]>) data;
final Set<byte[]> result = new LinkedHashSet<byte[]>(l);
final Set<byte[]> result = new LinkedHashSet<>(l);
for (final byte[] barray : l) {
if (barray == null) {
result.add(null);
Expand Down Expand Up @@ -244,7 +244,7 @@ public Set<String> build(Object data) {
return null;
}
List<byte[]> l = (List<byte[]>) data;
final Set<String> result = new LinkedHashSet<String>(l.size(), 1);
final Set<String> result = new LinkedHashSet<>(l.size(), 1);
for (final byte[] barray : l) {
if (barray == null) {
result.add(null);
Expand All @@ -270,7 +270,7 @@ public Set<Tuple> build(Object data) {
return null;
}
List<byte[]> l = (List<byte[]>) data;
final Set<Tuple> result = new LinkedHashSet<Tuple>(l.size()/2, 1);
final Set<Tuple> result = new LinkedHashSet<>(l.size()/2, 1);
Iterator<byte[]> iterator = l.iterator();
while (iterator.hasNext()) {
result.add(new Tuple(iterator.next(), DOUBLE.build(iterator.next())));
Expand Down Expand Up @@ -302,7 +302,7 @@ private Object evalResult(Object result) {

if (result instanceof List<?>) {
List<?> list = (List<?>) result;
List<Object> listResult = new ArrayList<Object>(list.size());
List<Object> listResult = new ArrayList<>(list.size());
for (Object bin : list) {
listResult.add(evalResult(bin));
}
Expand Down Expand Up @@ -330,7 +330,7 @@ public String toString() {
private Object evalResult(Object result) {
if (result instanceof List<?>) {
List<?> list = (List<?>) result;
List<Object> listResult = new ArrayList<Object>(list.size());
List<Object> listResult = new ArrayList<>(list.size());
for (Object bin : list) {
listResult.add(evalResult(bin));
}
Expand Down Expand Up @@ -358,7 +358,7 @@ public String toString() {
}

private List<GeoCoordinate> interpretGeoposResult(List<Object> responses) {
List<GeoCoordinate> responseCoordinate = new ArrayList<GeoCoordinate>(responses.size());
List<GeoCoordinate> responseCoordinate = new ArrayList<>(responses.size());
for (Object response : responses) {
if (response == null) {
responseCoordinate.add(null);
Expand All @@ -382,7 +382,7 @@ public List<GeoRadiusResponse> build(Object data) {

List<Object> objectList = (List<Object>) data;

List<GeoRadiusResponse> responses = new ArrayList<GeoRadiusResponse>(objectList.size());
List<GeoRadiusResponse> responses = new ArrayList<>(objectList.size());
if (objectList.isEmpty()) {
return responses;
}
Expand Down Expand Up @@ -438,7 +438,7 @@ public List<Module> build(Object data) {

List<List<Object>> objectList = (List<List<Object>>) data;

List<Module> responses = new ArrayList<Module>(objectList.size());
List<Module> responses = new ArrayList<>(objectList.size());
if (objectList.isEmpty()) {
return responses;
}
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/redis/clients/jedis/Client.java
View file
Open in desktop
Expand Up @@ -191,7 +191,7 @@ public void hset(final String key, final String field, final String value) {

@Override
public void hset(final String key, final Map<String, String> hash) {
final Map<byte[], byte[]> bhash = new HashMap<byte[], byte[]>(hash.size());
final Map<byte[], byte[]> bhash = new HashMap<>(hash.size());
for (final Entry<String, String> entry : hash.entrySet()) {
bhash.put(SafeEncoder.encode(entry.getKey()), SafeEncoder.encode(entry.getValue()));
}
Expand All @@ -210,7 +210,7 @@ public void hsetnx(final String key, final String field, final String value) {

@Override
public void hmset(final String key, final Map<String, String> hash) {
final Map<byte[], byte[]> bhash = new HashMap<byte[], byte[]>(hash.size());
final Map<byte[], byte[]> bhash = new HashMap<>(hash.size());
for (final Entry<String, String> entry : hash.entrySet()) {
bhash.put(SafeEncoder.encode(entry.getKey()), SafeEncoder.encode(entry.getValue()));
}
Expand Down Expand Up @@ -497,7 +497,7 @@ public void blpop(final String[] args) {

public void blpop(final int timeout, final String... keys) {
final int size = keys.length + 1;
List<String> args = new ArrayList<String>(size);
List<String> args = new ArrayList<>(size);
for (String arg : keys) {
args.add(arg);
}
Expand All @@ -522,7 +522,7 @@ public void brpop(final String[] args) {

public void brpop(final int timeout, final String... keys) {
final int size = keys.length + 1;
List<String> args = new ArrayList<String>(size);
List<String> args = new ArrayList<>(size);
for (String arg : keys) {
args.add(arg);
}
Expand Down Expand Up @@ -1142,7 +1142,7 @@ public void moduleUnload(final String name) {
}

private HashMap<byte[], Double> convertScoreMembersToBinary(final Map<String, Double> scoreMembers) {
HashMap<byte[], Double> binaryScoreMembers = new HashMap<byte[], Double>();
HashMap<byte[], Double> binaryScoreMembers = new HashMap<>();
for (Entry<String, Double> entry : scoreMembers.entrySet()) {
binaryScoreMembers.put(SafeEncoder.encode(entry.getKey()), entry.getValue());
}
Expand All @@ -1151,7 +1151,7 @@ private HashMap<byte[], Double> convertScoreMembersToBinary(final Map<String, Do

private HashMap<byte[], GeoCoordinate> convertMemberCoordinateMapToBinary(
final Map<String, GeoCoordinate> memberCoordinateMap) {
HashMap<byte[], GeoCoordinate> binaryMemberCoordinateMap = new HashMap<byte[], GeoCoordinate>();
HashMap<byte[], GeoCoordinate> binaryMemberCoordinateMap = new HashMap<>();
for (Entry<String, GeoCoordinate> entry : memberCoordinateMap.entrySet()) {
binaryMemberCoordinateMap.put(SafeEncoder.encode(entry.getKey()), entry.getValue());
}
Expand Down Expand Up @@ -1194,7 +1194,7 @@ public void xrevrange(String key, StreamEntryID end, StreamEntryID start, int co

@Override
public void xread(final int count, final long block, final Entry<String, StreamEntryID>... streams) {
final Map<byte[], byte[]> bhash = new HashMap<byte[], byte[]>(streams.length);
final Map<byte[], byte[]> bhash = new HashMap<>(streams.length);
for (final Entry<String, StreamEntryID> entry : streams) {
bhash.put(SafeEncoder.encode(entry.getKey()), SafeEncoder.encode(entry.getValue()==null ? "0-0" : entry.getValue().toString()));
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/redis/clients/jedis/Jedis.java
View file
Open in desktop
Expand Up @@ -2870,7 +2870,7 @@ private Object evalResult(Object result) {

if (result instanceof List<?>) {
List<?> list = (List<?>) result;
List<Object> listResult = new ArrayList<Object>(list.size());
List<Object> listResult = new ArrayList<>(list.size());
for (Object bin : list) {
listResult.add(evalResult(bin));
}
Expand Down Expand Up @@ -3240,7 +3240,7 @@ public ScanResult<String> scan(final String cursor, final ScanParams params) {
client.scan(cursor, params);
List<Object> result = client.getObjectMultiBulkReply();
String newcursor = new String((byte[]) result.get(0));
List<String> results = new ArrayList<String>();
List<String> results = new ArrayList<>();
List<byte[]> rawResults = (List<byte[]>) result.get(1);
for (byte[] bs : rawResults) {
results.add(SafeEncoder.encode(bs));
Expand Down Expand Up @@ -3281,7 +3281,7 @@ public ScanResult<String> sscan(final String key, final String cursor, final Sca
client.sscan(key, cursor, params);
List<Object> result = client.getObjectMultiBulkReply();
String newcursor = new String((byte[]) result.get(0));
List<String> results = new ArrayList<String>();
List<String> results = new ArrayList<>();
List<byte[]> rawResults = (List<byte[]>) result.get(1);
for (byte[] bs : rawResults) {
results.add(SafeEncoder.encode(bs));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ public JedisClusterConnectionHandler(Set<HostAndPort> nodes,
HostnameVerifier hostnameVerifier, JedisClusterHostAndPortMap portMap) {
this.cache = new JedisClusterInfoCache(poolConfig, connectionTimeout, soTimeout, password, clientName,
ssl, sslSocketFactory, sslParameters, hostnameVerifier, portMap);
initializeSlotsCache(nodes, poolConfig, connectionTimeout, soTimeout, password, clientName, ssl, sslSocketFactory, sslParameters, hostnameVerifier);
initializeSlotsCache(nodes, connectionTimeout, soTimeout, password, clientName, ssl, sslSocketFactory, sslParameters, hostnameVerifier);
}

abstract Jedis getConnection();
Expand All @@ -45,7 +45,7 @@ public Map<String, JedisPool> getNodes() {
return cache.getNodes();
}

private void initializeSlotsCache(Set<HostAndPort> startNodes, GenericObjectPoolConfig poolConfig,
private void initializeSlotsCache(Set<HostAndPort> startNodes,
int connectionTimeout, int soTimeout, String password, String clientName,
boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters, HostnameVerifier hostnameVerifier) {
for (HostAndPort hostAndPort : startNodes) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/redis/clients/jedis/ScanParams.java
View file
Open in desktop
Expand Up @@ -19,8 +19,8 @@ public class ScanParams {

private final Map<Keyword, ByteBuffer> params = new EnumMap<Keyword, ByteBuffer>(Keyword.class);

public final static String SCAN_POINTER_START = String.valueOf(0);
public final static byte[] SCAN_POINTER_START_BINARY = SafeEncoder.encode(SCAN_POINTER_START);
public static final String SCAN_POINTER_START = String.valueOf(0);
public static final byte[] SCAN_POINTER_START_BINARY = SafeEncoder.encode(SCAN_POINTER_START);

public ScanParams match(final byte[] pattern) {
params.put(MATCH, ByteBuffer.wrap(pattern));
Expand Down