Fix builder

Author: a-TODO-rov

src/main/java/redis/clients/jedis/BuilderFactory.java

@@ -1408,31 +1408,26 @@ public List<StreamEntry> build(Object data) {
         String entryIdString = SafeEncoder.encode((byte[]) res.get(0));
         StreamEntryID entryID = new StreamEntryID(entryIdString);
         List<byte[]> hash = (List<byte[]>) res.get(1);
-        if (hash == null) {
-          responses.add(new StreamEntry(entryID, null));
-          continue;
-        }
 
-        Iterator<byte[]> hashIterator = hash.iterator();
-        Map<String, String> map = new HashMap<>(hash.size() / 2, 1f);
+        Map<String, String> fieldsMap = null;
 
-        while (hashIterator.hasNext()) {
-          map.put(SafeEncoder.encode(hashIterator.next()), SafeEncoder.encode(hashIterator.next()));
-        }
+        if (hash != null) {
+          Iterator<byte[]> hashIterator = hash.iterator();
+          fieldsMap = new HashMap<>(hash.size() / 2, 1f);
 
-        Long millisElapsedFromDelivery = null;
-        Long deliveredCount = null;
+          while (hashIterator.hasNext()) {
+            fieldsMap.put(SafeEncoder.encode(hashIterator.next()), SafeEncoder.encode(hashIterator.next()));
+          }
+        }
 
         if (res.size() >= 4) {
-          Object idleObj = res.get(2);
-          Object timesObj = res.get(3);
-          millisElapsedFromDelivery = LONG.build(idleObj);
-          deliveredCount = LONG.build(timesObj);
+          Long millisElapsedFromDelivery = LONG.build(res.get(2));
+          Long deliveredCount = LONG.build(res.get(3));
+          responses.add(new StreamEntry(entryID, fieldsMap, millisElapsedFromDelivery, deliveredCount));
+          continue;
         }
 
-        if (Objects.nonNull(millisElapsedFromDelivery) && Objects.nonNull(deliveredCount)) {
-          responses.add(new StreamEntry(entryID, map, millisElapsedFromDelivery, deliveredCount));
-        }
+        responses.add(new StreamEntry(entryID, fieldsMap));
       }
 
       return responses;
@@ -1973,32 +1968,26 @@ public List<StreamEntryBinary> build(Object data) {
         String entryIdString = SafeEncoder.encode((byte[]) res.get(0));
         StreamEntryID entryID = new StreamEntryID(entryIdString);
         List<byte[]> hash = (List<byte[]>) res.get(1);
-        if (hash == null) {
-          responses.add(new StreamEntryBinary(entryID, null));
-          continue;
-        }
 
-        Iterator<byte[]> hashIterator = hash.iterator();
-        Map<byte[], byte[]> map = new JedisByteHashMap();
+        Map<byte[], byte[]> map = null;
 
-        while (hashIterator.hasNext()) {
-          map.put(BINARY.build(hashIterator.next()), BINARY.build(hashIterator.next()));
-        }
+        if (hash != null) {
+          Iterator<byte[]> hashIterator = hash.iterator();
+          map = new JedisByteHashMap();
 
-        Long millisElapsedFromDelivery = null;
-        Long deliveredCount = null;
+          while (hashIterator.hasNext()) {
+            map.put(BINARY.build(hashIterator.next()), BINARY.build(hashIterator.next()));
+          }
+        }
 
         if (res.size() >= 4) {
-          Object idleObj = res.get(2);
-          Object timesObj = res.get(3);
-          millisElapsedFromDelivery = LONG.build(idleObj);
-          deliveredCount = LONG.build(timesObj);
+          Long millisElapsedFromDelivery = LONG.build(res.get(2));
+          Long deliveredCount = LONG.build(res.get(3));
+          responses.add(new StreamEntryBinary(entryID, map, millisElapsedFromDelivery, deliveredCount));
+          continue;
         }
 
-        if (Objects.nonNull(millisElapsedFromDelivery) && Objects.nonNull(deliveredCount)) {
-          responses.add(
-              new StreamEntryBinary(entryID, map, millisElapsedFromDelivery, deliveredCount));
-        }
+        responses.add(new StreamEntryBinary(entryID, map));
       }
 
       return responses;