Shorten code.

It is less effort to attempt the removal w/o knowing the set contains the string
to be removed.
Make use of the toArray method in Collection.

1 files changed, 9 insertions, 25 deletions

diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
index 299779f..dfa0026 100644
--- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
@@ -19,6 +19,7 @@ import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 public class NodeStatus extends Document {
 
@@ -56,45 +57,28 @@ public class NodeStatus extends Document {
 
   @SuppressWarnings("checkstyle:javadocmethod")
   public void setDeclaredFamily(SortedSet<String> declaredFamily) {
-    if (declaredFamily.contains(this.fingerprint)) {
-      SortedSet<String> declaredFamilyWithoutSelf =
-          new TreeSet<>(declaredFamily);
-      declaredFamilyWithoutSelf.remove(this.fingerprint);
-      this.declaredFamily = collectionToStringArray(declaredFamilyWithoutSelf);
-    } else {
-      this.declaredFamily = collectionToStringArray(declaredFamily);
-    }
+    SortedSet<String> declaredFamilyWithoutSelf = new TreeSet<>(declaredFamily);
+    declaredFamilyWithoutSelf.remove(this.fingerprint);
+    this.declaredFamily = collectionToStringArray(declaredFamilyWithoutSelf);
   }
 
   @SuppressWarnings("checkstyle:javadocmethod")
   public SortedSet<String> getDeclaredFamily() {
     SortedSet<String> declaredFamilyWithoutSelf =
         stringArrayToSortedSet(this.declaredFamily);
-    if (declaredFamilyWithoutSelf.contains(this.fingerprint)) {
-      declaredFamilyWithoutSelf.remove(this.fingerprint);
-    }
+    declaredFamilyWithoutSelf.remove(this.fingerprint);
     return declaredFamilyWithoutSelf;
   }
 
   private static String[] collectionToStringArray(
       Collection<String> collection) {
-    String[] stringArray = null;
-    if (collection != null && !collection.isEmpty()) {
-      stringArray = new String[collection.size()];
-      int index = 0;
-      for (String string : collection) {
-        stringArray[index++] = string;
-      }
-    }
-    return stringArray;
+    return (null == collection || collection.isEmpty()) ? null
+        : collection.toArray(new String[collection.size()]);
   }
 
   private SortedSet<String> stringArrayToSortedSet(String[] stringArray) {
-    SortedSet<String> sortedSet = new TreeSet<>();
-    if (stringArray != null) {
-      sortedSet.addAll(Arrays.asList(stringArray));
-    }
-    return sortedSet;
+    return stringArray == null ? new TreeSet<>() : Arrays.stream(stringArray)
+        .collect(Collectors.toCollection(TreeSet::new));
   }
 
   /* From network status entries: */