Rewrite and refactor core cluster controller state generation logic

Cluster controller will now generate the new cluster state on-demand in a "pure functional" way instead of conditionally patching a working state over time. This makes understanding (and changing) the state generation logic vastly easier than it previously was.

1 files changed, 39 insertions, 0 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/matchers/NodeEventWithDescription.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/matchers/NodeEventWithDescription.java
new file mode 100644
index 00000000000..5ac89030c23
--- /dev/null
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/matchers/NodeEventWithDescription.java
@@ -0,0 +1,39 @@
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.clustercontroller.core.matchers;
+
+import com.yahoo.vespa.clustercontroller.core.NodeEvent;
+import org.hamcrest.Description;
+import org.hamcrest.Factory;
+import org.mockito.ArgumentMatcher;
+
+public class NodeEventWithDescription extends ArgumentMatcher<NodeEvent> {
+    private final String expected;
+
+    public NodeEventWithDescription(String expected) {
+        this.expected = expected;
+    }
+
+    @Override
+    public boolean matches(Object o) {
+        if (!(o instanceof NodeEvent)) {
+            return false;
+        }
+        return expected.equals(((NodeEvent) o).getDescription());
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText(String.format("NodeEvent with description '%s'", expected));
+    }
+
+    @Override
+    public void describeMismatch(Object item, Description description) {
+        NodeEvent other = (NodeEvent)item;
+        description.appendText(String.format("got description '%s'", other.getDescription()));
+    }
+
+    @Factory
+    public static NodeEventWithDescription nodeEventWithDescription(String description) {
+        return new NodeEventWithDescription(description);
+    }
+}