Fix warning and usage of ByteArraySet.toArray (#79)

* Use ByteArraySet * Simplified equals logic * Update MultiIndex * Update ByteArray * Revert ByteArraySet changes (#82) Co-authored-by: Quentin LeCorre <quentin@jwplayer.com> * Revert cache update changes * Addressed comments Co-authored-by: Quentin LeCorre <quentin@jwplayer.com> Co-authored-by: Eric Weaver <eweaver@jwplayer.com>
jwplayer · Nov 17, 2020 · 0fde4f7 · 0fde4f7
1 parent 35bf288
commit 0fde4f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/jwplayer/southpaw/index/MultiIndex.java b/src/main/java/com/jwplayer/southpaw/index/MultiIndex.java
@@ -296,7 +296,7 @@ public Set<String> verifyIndexState() {
             AbstractMap.SimpleEntry<byte[], byte[]> pair = iter.next();
             ByteArray revIndexPrimaryKey = new ByteArray(pair.getKey());
             ByteArraySet revIndexForeignKeySet = ByteArraySet.deserialize(pair.getValue());
-            for (ByteArray indexPrimaryKey : revIndexForeignKeySet.toArray()) {
+            for (ByteArray indexPrimaryKey : revIndexForeignKeySet) {
                 ByteArraySet indexForeignKeySet = getIndexEntry(indexPrimaryKey);
 
                 if(indexForeignKeySet != null) {
@@ -323,7 +323,7 @@ public Set<String> verifyReverseIndexState() {
             AbstractMap.SimpleEntry<byte[], byte[]> pair = iter.next();
             ByteArray indexPrimaryKey = new ByteArray(pair.getKey());
             ByteArraySet indexForeignKeySet = ByteArraySet.deserialize(pair.getValue());
-            for (ByteArray revIndexPrimaryKey : indexForeignKeySet.toArray()) {
+            for (ByteArray revIndexPrimaryKey : indexForeignKeySet) {
                 ByteArraySet revIndexforeignKeySet = getForeignKeys(revIndexPrimaryKey);
 
                 if(revIndexforeignKeySet != null) {

diff --git a/src/main/java/com/jwplayer/southpaw/util/ByteArray.java b/src/main/java/com/jwplayer/southpaw/util/ByteArray.java
@@ -31,6 +31,7 @@
  * Wrapper class for byte arrays so we can use them as keys in maps.
  */
 public class ByteArray implements Comparable<ByteArray>, Serializable {
+    private static final long serialVersionUID = -6277178128299377659L;
     private static final Bytes.ByteArrayComparator comparator = Bytes.BYTES_LEXICO_COMPARATOR;
     private byte[] bytes;
 
@@ -108,7 +109,6 @@ public boolean equals(Object object) {
      * @param bytes - The bytes to convert
      * @return - A collection of ByteArrays
      */
-    @SuppressWarnings("unchecked")
     public static Set<ByteArray> fromBytes(byte[] bytes) {
         Set<ByteArray> set = new HashSet<>();
         int index = 0;