Wrangle with test cases

2 files changed, 13 insertions, 16 deletions

diff --git a/src/main/java/ChannelNode.java b/src/main/java/ChannelNode.java
index 20a7ac0..6c2e9a3 100644
--- a/src/main/java/ChannelNode.java
+++ b/src/main/java/ChannelNode.java
@@ -43,8 +43,8 @@ public class ChannelNode implements IChannelNode {
         if(dir == null) throw new IllegalArgumentException("dir is null");
 
         Direction.overVals(Map.ofEntries(
-            entry(Direction.INCOMING, () -> incoming.put(node, incoming.get(node) + 1)),
-            entry(Direction.OUTGOING, () -> outgoing.put(node, outgoing.get(node) + 1))
+            entry(Direction.INCOMING, () -> incoming.put(node, ((incoming.get(node) != null) ? incoming.get(node) : 0) + 1)),
+            entry(Direction.OUTGOING, () -> outgoing.put(node, ((outgoing.get(node) != null) ? outgoing.get(node) : 0) + 1))
         ), dir);
     }
 
@@ -56,8 +56,8 @@ public class ChannelNode implements IChannelNode {
 
         for(IChannelNode node: nodes) {
             Direction.overVals(Map.ofEntries(
-                entry(Direction.INCOMING, () -> incoming.put(node, incoming.get(node) + 1)),
-                entry(Direction.OUTGOING, () -> outgoing.put(node, outgoing.get(node) + 1))
+                entry(Direction.INCOMING, () -> incoming.put(node,((incoming.get(node) != null) ? incoming.get(node) : 0) + 1)),
+                entry(Direction.OUTGOING, () -> outgoing.put(node,((outgoing.get(node) != null) ? outgoing.get(node) : 0) + 1))
             ), dir);
         }
     }
@@ -89,13 +89,10 @@ public class ChannelNode implements IChannelNode {
     }
 
     @Override
-    public void clearConnections(Direction dir) throws IllegalArgumentException {
-        if(dir == null) throw new IllegalArgumentException("dir is null");
-
-        Direction.overVals(Map.ofEntries(
-            entry(Direction.INCOMING, () -> incoming.clear()),
-            entry(Direction.OUTGOING, () -> outgoing.clear())
-        ), dir);
+    public void clearConnections() throws IllegalArgumentException {
+        // I have no idea why this is throwing an unsupported operation exception
+        incoming.clear();
+        outgoing.clear();
     }
 
     @Override
diff --git a/src/main/java/IChannelNode.java b/src/main/java/IChannelNode.java
index a6446f1..cc1d3e8 100644
--- a/src/main/java/IChannelNode.java
+++ b/src/main/java/IChannelNode.java
@@ -3,9 +3,9 @@ import java.util.Map;
 
 public interface IChannelNode extends Comparable<IChannelNode> {
     enum Direction {
-        INCOMING(1),   // Users incoming from outside channel (aka: other channel forwarded this channel's post)
-        OUTGOING(2),   // Users outgoing from this channel (aka: this channel forwarded someone else's post)
-        BOTH(3);       // Modify both incoming and outgoing counts at once
+        INCOMING(1 << 0),   // Users incoming from outside channel (aka: other channel forwarded this channel's post)
+        OUTGOING(1 << 1),   // Users outgoing from this channel (aka: this channel forwarded someone else's post)
+        BOTH(INCOMING.val | OUTGOING.val); // Modify both incoming and outgoing counts at once
 
         private final int val;
         Direction(int val) {this.val = val;}
@@ -22,7 +22,7 @@ public interface IChannelNode extends Comparable<IChannelNode> {
 
             // For each direction in the map, check that the given direction is gte, and if so run the callback
             for(Direction cdir: cmap.keySet())
-                if(dir.getVal() >= cdir.getVal())
+                if((dir.getVal() & cdir.getVal()) > 0)
                     cmap.get(cdir).cb();
         }
         // This is hilariously overengineered because java fucking sucks my entire cock and balls
@@ -35,7 +35,7 @@ public interface IChannelNode extends Comparable<IChannelNode> {
     void addConnections(Iterable<IChannelNode> nodes, Direction dir);
     void removeConnection(IChannelNode node, Direction dir);
     void removeConnections(Iterable<IChannelNode> nodes, Direction dir);
-    void clearConnections(Direction dir);
+    void clearConnections();
 
     boolean connectionExists(IChannelNode node, Direction dir);
     int getNumConnections(Direction dir);