Fixing squid: S1168 Empty arrays and collections should be returned instead of null Jedis.java class part 1 (redis#1308)

devFozgul · marcosnils · commit aa3a06b5e3b3 · 2016-06-03T16:12:49.000-03:00
diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
@@ -1180,7 +1180,7 @@ public Set<String> smembers(final String key) {
     client.smembers(key);
     final List<String> members = client.getMultiBulkReply();
     if (members == null) {
-      return null;
+      return Collections.emptySet();
     }
     return SetFromList.of(members);
   }
@@ -1226,7 +1226,7 @@ public Set<String> spop(final String key, final long count) {
     client.spop(key, count);
     final List<String> members = client.getMultiBulkReply();
     if (members == null) {
-      return null;
+      return Collections.emptySet();
     }
     return SetFromList.of(members);
   }

Original file line number	Diff line number	Diff line change
`@@ -1180,7 +1180,7 @@ public Set<String> smembers(final String key) {`
`1180`	`1180`	`client.smembers(key);`
`1181`	`1181`	`final List<String> members = client.getMultiBulkReply();`
`1182`	`1182`	`if (members == null) {`
`1183`		`- return null;`
	`1183`	`+ return Collections.emptySet();`
`1184`	`1184`	`}`
`1185`	`1185`	`return SetFromList.of(members);`
`1186`	`1186`	`}`
`@@ -1226,7 +1226,7 @@ public Set<String> spop(final String key, final long count) {`
`1226`	`1226`	`client.spop(key, count);`
`1227`	`1227`	`final List<String> members = client.getMultiBulkReply();`
`1228`	`1228`	`if (members == null) {`
`1229`		`- return null;`
	`1229`	`+ return Collections.emptySet();`
`1230`	`1230`	`}`
`1231`	`1231`	`return SetFromList.of(members);`
`1232`	`1232`	`}`