remove event overloads on Plan

NASA-AMMOS · Nov 4, 2024 · 05da212 · 05da212
1 parent e6515a7
commit 05da212
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...ava/gov/nasa/jpl/aerie/e2e/procedural/scheduling/procedures/ExternalEventsSimpleGoal.java b/...ava/gov/nasa/jpl/aerie/e2e/procedural/scheduling/procedures/ExternalEventsSimpleGoal.java
@@ -4,6 +4,7 @@
 import gov.nasa.ammos.aerie.procedural.scheduling.Goal;
 import gov.nasa.ammos.aerie.procedural.scheduling.plan.EditablePlan;
 import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.DirectiveStart;
+import gov.nasa.ammos.aerie.procedural.timeline.plan.EventQuery;
 import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
 import org.jetbrains.annotations.NotNull;
 
@@ -13,7 +14,9 @@
 public record ExternalEventsSimpleGoal() implements Goal {
   @Override
   public void run(@NotNull final EditablePlan plan) {
-    for (final var e: plan.events("TestGroup")) {
+    EventQuery eventQuery = new EventQuery("TestGroup", null, null);
+
+    for (final var e: plan.events(eventQuery)) {
       plan.create("BiteBanana", new DirectiveStart.Absolute(e.getInterval().start), Map.of("biteSize", SerializedValue.of(1)));
     }
     plan.commit();

diff --git a/procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/plan/Plan.kt b/procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/plan/Plan.kt
@@ -45,10 +45,6 @@ interface Plan {
 
   /** Get external events associated with this plan. */
   fun events(query: EventQuery): ExternalEvents
-  /** Get external events belonging to a given derivation group and external event type associated with this plan. */
-  fun events(derivationGroup: String, eventType: String) = events(EventQuery(derivationGroup, eventType, null))
-  /** Get external events belonging to a given derivation group associated with this plan. */
-  fun events(derivationGroup: String) = events(EventQuery(derivationGroup, null, null))
   /** Get all external events across all derivation groups associated with this plan. */
   fun events() = events(EventQuery())
 }