Consolidated binarySearch calls into one method, cleaned up generics

moquette-io · Jun 19, 2023 · a8d102e · a8d102e
1 parent 86095c7
commit a8d102e
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/broker/src/main/java/io/moquette/broker/subscriptions/CNode.java b/broker/src/main/java/io/moquette/broker/subscriptions/CNode.java
@@ -45,12 +45,18 @@ List<INode> allChildren() {
     }
 
     INode childOf(Token token) {
-        int idx = Collections.binarySearch(children, token, (Object node, Object token1) -> ((INode) node).mainNode().token.compareTo((Token) token1));
-        if (idx < 0)
+        int idx = findIndexForToken(token);
+        if (idx < 0) {
             return null;
+        }
         return children.get(idx);
     }
 
+    private int findIndexForToken(Token token) {
+        final INode tempTokenNode = new INode(new CNode(token));
+        return Collections.binarySearch(children, tempTokenNode, (INode node, INode tokenHolder) -> node.mainNode().token.compareTo(tokenHolder.mainNode().token));
+    }
+
     private boolean equalsToken(Token token) {
         return token != null && this.token != null && this.token.equals(token);
     }
@@ -65,7 +71,7 @@ CNode copy() {
     }
 
     public void add(INode newINode) {
-        int idx = Collections.binarySearch(children, newINode.mainNode().token, (Object node, Object token1) -> ((INode) node).mainNode().token.compareTo((Token) token1));
+        int idx = findIndexForToken(newINode.mainNode().token);
         if (idx < 0) {
             children.add(-1 - idx, newINode);
         } else {
@@ -74,7 +80,7 @@ public void add(INode newINode) {
     }
 
     public void remove(INode node) {
-        int idx = Collections.binarySearch(children, node.mainNode().token, (Object node1, Object token1) -> ((INode) node1).mainNode().token.compareTo((Token) token1));
+        int idx = findIndexForToken(node.mainNode().token);
         this.children.remove(idx);
     }