Fix after review feedback

4 files changed, 10 insertions, 26 deletions

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java
index 078df5264a1..74fe5800e89 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java
@@ -185,7 +185,7 @@ public class NodeRepositoryTest {
         tester.clock().advance(Duration.ofSeconds(1));
         tester.addHost("id1", "host1", "default", NodeType.host);
         tester.addHost("id2", "host2", "default", NodeType.host);
-        assertFalse(tester.nodeRepository().nodes().node("host1").get().history().hasEventAfter(History.Event.Type.deprovisioned, testStart));
+        assertFalse(tester.nodeRepository().nodes().node("host1").get().history().hasLastEventAfter(testStart, History.Event.Type.deprovisioned));
 
         // Set host 1 properties and deprovision it
         try (var lock = tester.nodeRepository().nodes().lockAndGetRequired("host1")) {
@@ -208,7 +208,7 @@ public class NodeRepositoryTest {
         Node host1 = tester.nodeRepository().nodes().node("host1").get();
         Node host2 = tester.nodeRepository().nodes().node("host2").get();
         assertEquals(Node.State.deprovisioned, host1.state());
-        assertTrue(host1.history().hasEventAfter(History.Event.Type.deprovisioned, testStart));
+        assertTrue(host1.history().hasLastEventAfter(testStart, History.Event.Type.deprovisioned));
 
         // Adding it again preserves some information from the deprovisioned host and removes it
         tester.addHost("id2", "host1", "default", NodeType.host);
@@ -218,7 +218,7 @@ public class NodeRepositoryTest {
                     tester.nodeRepository().nodes().node("host1", Node.State.deprovisioned).isPresent());
         assertFalse("Not transferred from deprovisioned host", host1.status().wantToRetire());
         assertFalse("Not transferred from deprovisioned host", host1.status().wantToDeprovision());
-        assertTrue("Transferred from deprovisioned host", host1.history().hasEventAfter(History.Event.Type.deprovisioned, testStart));
+        assertTrue("Transferred from deprovisioned host", host1.history().hasLastEventAfter(testStart, History.Event.Type.deprovisioned));
         assertTrue("Transferred from deprovisioned host", host1.status().firmwareVerifiedAt().isPresent());
         assertEquals("Transferred from deprovisioned host", 1, host1.status().failCount());
         assertEquals("Transferred from deprovisioned host", 1, host1.reports().getReports().size());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/HistoryTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/HistoryTest.java
index 90162cc3ea3..62c5dda51a7 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/HistoryTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/HistoryTest.java
@@ -30,22 +30,6 @@ public class HistoryTest {
                      history.asList().stream().map(e -> e.at().toEpochMilli()).collect(Collectors.toList()));
     }
 
-    @Test
-    public void repeating_event_overwrites_existing() {
-        Instant i0 = Instant.ofEpochMilli(1);
-        History history = new History(List.of(new Event(Event.Type.readied, Agent.system, i0)));
-
-        Instant i1 = Instant.ofEpochMilli(2);
-        history = history.with(new Event(Event.Type.reserved, Agent.system, i1));
-        assertEquals(2, history.asList().size());
-
-        Instant i2 = Instant.ofEpochMilli(3);
-        history = history.with(new Event(Event.Type.reserved, Agent.system, i2));
-
-        assertEquals(2, history.asList().size());
-        assertEquals(i2, history.asList().get(1).at());
-    }
-
     private static List<Event> shuffledEvents(int count) {
         Instant start = Instant.ofEpochMilli(0);
         List<Event> events = new ArrayList<>();
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
index af3b5dc69f2..f14675d1536 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
@@ -113,7 +113,7 @@ public class NodeSerializerTest {
         assertEquals(node.allocation().get().requestedResources(), copy.allocation().get().requestedResources());
         assertEquals(node.allocation().get().isRemovable(), copy.allocation().get().isRemovable());
         assertEquals(2, copy.history().asList().size());
-        assertEquals(clock.instant().truncatedTo(MILLIS), copy.history().event(History.Event.Type.reserved).get().at());
+        assertEquals(clock.instant().truncatedTo(MILLIS), copy.history().lastEvent(History.Event.Type.reserved).get().at());
         assertEquals(NodeType.tenant, copy.type());
     }
 
@@ -182,9 +182,9 @@ public class NodeSerializerTest {
         node = node.retire(Agent.application, clock.instant());
         Node copy = nodeSerializer.fromJson(Node.State.provisioned, nodeSerializer.toJson(node));
         assertEquals(2, copy.history().asList().size());
-        assertEquals(clock.instant().truncatedTo(MILLIS), copy.history().event(History.Event.Type.retired).get().at());
+        assertEquals(clock.instant().truncatedTo(MILLIS), copy.history().lastEvent(History.Event.Type.retired).get().at());
         assertEquals(Agent.application,
-                     (copy.history().event(History.Event.Type.retired).get()).agent());
+                     (copy.history().lastEvent(History.Event.Type.retired).get()).agent());
         assertTrue(copy.allocation().get().membership().retired());
 
         Node removable = copy.with(node.allocation().get().removable(true));
@@ -296,7 +296,7 @@ public class NodeSerializerTest {
         Node copy = nodeSerializer.fromJson(Node.State.provisioned, nodeSerializer.toJson(node));
         assertEquals(1234, copy.flavor().resources().diskGb(), 0);
         assertEquals(node, copy);
-        assertTrue(node.history().event(History.Event.Type.resized).isPresent());
+        assertTrue(node.history().lastEvent(History.Event.Type.resized).isPresent());
     }
 
     @Test
@@ -372,7 +372,7 @@ public class NodeSerializerTest {
         node = node.withFirmwareVerifiedAt(Instant.ofEpochMilli(100));
         node = nodeSerializer.fromJson(State.active, nodeSerializer.toJson(node));
         assertEquals(100, node.status().firmwareVerifiedAt().get().toEpochMilli());
-        assertEquals(Instant.ofEpochMilli(100), node.history().event(History.Event.Type.firmwareVerified).get().at());
+        assertEquals(Instant.ofEpochMilli(100), node.history().lastEvent(History.Event.Type.firmwareVerified).get().at());
     }
 
     @Test
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
index 94822c85a03..a74eaf32bf8 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
@@ -880,7 +880,7 @@ public class ProvisioningTest {
         assertTrue("Time of event is updated for all nodes",
                    reserved.stream()
                            .allMatch(n -> n.history()
-                           .event(History.Event.Type.reserved)
+                           .lastEvent(History.Event.Type.reserved)
                            .get().at()
                            .equals(tester.clock().instant().truncatedTo(MILLIS))));
 
@@ -1167,7 +1167,7 @@ public class ProvisioningTest {
 
     /** A predicate that returns whether a node has been retired by the given agent */
     private static Predicate<Node> retiredBy(Agent agent) {
-        return (node) -> node.history().event(History.Event.Type.retired)
+        return (node) -> node.history().lastEvent(History.Event.Type.retired)
                 .filter(e -> e.type() == History.Event.Type.retired)
                 .filter(e -> e.agent() == agent)
                 .isPresent();