Rebase after stateless aerie

constraints/src/main/java/gov/nasa/jpl/aerie/constraints/model/ActivityInstance.java

@@ -1,7 +1,7 @@
 package gov.nasa.jpl.aerie.constraints.model;
 
 import gov.nasa.jpl.aerie.constraints.time.Interval;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstanceId;
+import gov.nasa.jpl.aerie.types.ActivityInstanceId;
 import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
 import gov.nasa.jpl.aerie.types.ActivityDirectiveId;
 

e2e-tests/build.gradle

@@ -59,6 +59,7 @@ dependencies {
   testImplementation "com.zaxxer:HikariCP:5.1.0"
   testImplementation("org.postgresql:postgresql:42.6.0")
   testImplementation project(':merlin-driver')
+  testImplementation project(':type-utils')
 
   testImplementation 'com.microsoft.playwright:playwright:1.37.0'
 

merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/SimulationResults.java

@@ -7,7 +7,8 @@
 import gov.nasa.jpl.aerie.merlin.protocol.types.RealDynamics;
 import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
 import gov.nasa.jpl.aerie.merlin.protocol.types.ValueSchema;
-import org.apache.commons.lang3.tuple.Pair;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstanceId;
 import org.apache.commons.lang3.tuple.Triple;
 
 import java.time.Instant;

merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/UnfinishedActivity.java

@@ -2,6 +2,7 @@
 
 import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
 import gov.nasa.jpl.aerie.types.ActivityDirectiveId;
+import gov.nasa.jpl.aerie.types.ActivityInstanceId;
 
 import java.time.Instant;
 import java.util.List;

merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/engine/SimulationEngine.java

@@ -1,8 +1,8 @@
 package gov.nasa.jpl.aerie.merlin.driver.engine;
 
 import gov.nasa.jpl.aerie.merlin.driver.MissionModel.SerializableTopic;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstance;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstanceId;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstanceId;
 import gov.nasa.jpl.aerie.merlin.driver.resources.SimulationResourceManager;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationResults;
 import gov.nasa.jpl.aerie.merlin.driver.UnfinishedActivity;

merlin-driver/src/test/java/gov/nasa/jpl/aerie/merlin/driver/AnchorSimulationTest.java

@@ -4,6 +4,8 @@
 import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
 import gov.nasa.jpl.aerie.types.ActivityDirective;
 import gov.nasa.jpl.aerie.types.ActivityDirectiveId;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstanceId;
 import gov.nasa.jpl.aerie.types.SerializedActivity;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.DisplayName;

merlin-driver/src/test/java/gov/nasa/jpl/aerie/merlin/driver/TemporalSubsetSimulationTests.java

@@ -4,6 +4,8 @@
 import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
 import gov.nasa.jpl.aerie.types.ActivityDirective;
 import gov.nasa.jpl.aerie.types.ActivityDirectiveId;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstanceId;
 import gov.nasa.jpl.aerie.types.SerializedActivity;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

merlin-server/src/main/java/gov/nasa/jpl/aerie/merlin/server/http/ResponseSerializers.java

@@ -5,7 +5,7 @@
 import gov.nasa.jpl.aerie.constraints.model.ConstraintResult;
 import gov.nasa.jpl.aerie.constraints.time.Interval;
 import gov.nasa.jpl.aerie.json.JsonParseResult.FailureReason;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
 import gov.nasa.jpl.aerie.merlin.driver.UnfinishedActivity;
 import gov.nasa.jpl.aerie.merlin.driver.json.ValueSchemaJsonParser;
 import gov.nasa.jpl.aerie.merlin.protocol.model.InputType.Parameter;

merlin-server/src/main/java/gov/nasa/jpl/aerie/merlin/server/models/SimulationResultsHandle.java

@@ -1,7 +1,7 @@
 package gov.nasa.jpl.aerie.merlin.server.models;
 
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstance;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstanceId;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstanceId;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationResults;
 import gov.nasa.jpl.aerie.merlin.protocol.types.Duration;
 

merlin-server/src/main/java/gov/nasa/jpl/aerie/merlin/server/remotes/InMemoryResultsCellRepository.java

@@ -1,7 +1,7 @@
 package gov.nasa.jpl.aerie.merlin.server.remotes;
 
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstance;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstanceId;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstanceId;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationFailure;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationResults;
 import gov.nasa.jpl.aerie.merlin.driver.resources.ResourceProfile;

merlin-server/src/main/java/gov/nasa/jpl/aerie/merlin/server/remotes/postgres/PostgresResultsCellRepository.java

@@ -1,7 +1,7 @@
 package gov.nasa.jpl.aerie.merlin.server.remotes.postgres;
 
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstance;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstanceId;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstanceId;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationException;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationFailure;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationResults;

orchestration-utils/src/main/java/gov/nasa/jpl/aerie/orchestration/simulation/SimulationResultsWriter.java

@@ -1,7 +1,7 @@
 package gov.nasa.jpl.aerie.orchestration.simulation;
 
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstance;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstanceId;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstanceId;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationResults;
 import gov.nasa.jpl.aerie.merlin.driver.UnfinishedActivity;
 import gov.nasa.jpl.aerie.merlin.driver.engine.EventRecord;

procedural/constraints/build.gradle

@@ -15,6 +15,7 @@ repositories {
 dependencies {
   implementation project(':procedural:timeline')
   implementation project(':merlin-driver')
+  implementation project(':type-utils')
 
   testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
   testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'

procedural/constraints/src/main/kotlin/gov/nasa/ammos/aerie/procedural/constraints/Violation.kt

@@ -2,7 +2,7 @@ package gov.nasa.ammos.aerie.procedural.constraints
 
 import gov.nasa.ammos.aerie.procedural.timeline.Interval
 import gov.nasa.ammos.aerie.procedural.timeline.payloads.IntervalLike
-import gov.nasa.jpl.aerie.merlin.driver.ActivityId
+import gov.nasa.jpl.aerie.types.ActivityId
 
 /** A single violation of a constraint. */
 data class Violation(

procedural/constraints/src/main/kotlin/gov/nasa/ammos/aerie/procedural/constraints/Violations.kt

@@ -12,7 +12,7 @@ import gov.nasa.ammos.aerie.procedural.timeline.payloads.IntervalLike
 import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.Directive
 import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.Instance
 import gov.nasa.ammos.aerie.procedural.timeline.util.preprocessList
-import gov.nasa.jpl.aerie.merlin.driver.ActivityId
+import gov.nasa.jpl.aerie.types.ActivityId
 
 /** A timeline of [Violations][Violation]. */
 data class Violations(private val timeline: Timeline<Violation, Violations>):

procedural/examples/foo-procedures/build.gradle

@@ -20,8 +20,8 @@ dependencies {
   implementation project(':procedural:constraints')
   implementation project(':procedural:scheduling')
   implementation project(':procedural:timeline')
-  implementation project(':merlin-framework')
   implementation project(':merlin-driver')
+  implementation project(':type-utils')
   implementation project(':contrib')
 
   testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.0'

procedural/remote/build.gradle

@@ -18,6 +18,7 @@ dependencies {
   implementation project(':merlin-driver')
   implementation project(':scheduler-driver')
   implementation project(':parsing-utilities')
+  implementation project(':type-utils')
 
   testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
   testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'

procedural/remote/src/main/kotlin/gov/nasa/ammos/aerie/procedural/remote/AeriePostgresPlan.kt

@@ -12,7 +12,7 @@ import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.DirectiveSta
 import gov.nasa.ammos.aerie.procedural.timeline.plan.Plan
 import gov.nasa.ammos.aerie.procedural.timeline.util.duration.plus
 import gov.nasa.ammos.aerie.procedural.timeline.util.duration.minus
-import gov.nasa.jpl.aerie.merlin.driver.ActivityDirectiveId
+import gov.nasa.jpl.aerie.types.ActivityDirectiveId
 import java.io.StringReader
 import java.sql.Connection
 import java.time.Instant

procedural/remote/src/main/kotlin/gov/nasa/ammos/aerie/procedural/remote/AeriePostgresSimulationResults.kt

@@ -12,8 +12,7 @@ import gov.nasa.ammos.aerie.procedural.timeline.payloads.Segment
 import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.Instance
 import gov.nasa.ammos.aerie.procedural.timeline.plan.Plan
 import gov.nasa.ammos.aerie.procedural.timeline.plan.SimulationResults
-import gov.nasa.jpl.aerie.merlin.driver.ActivityDirectiveId
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstanceId
+import gov.nasa.jpl.aerie.types.ActivityDirectiveId
 import java.io.StringReader
 import java.sql.Connection
 import javax.json.Json
@@ -166,7 +165,7 @@ data class AeriePostgresSimulationResults(
       result.add(Instance(
           deserializer(attributes),
           response.getString(4),
-          ActivityInstanceId(id),
+        gov.nasa.jpl.aerie.types.ActivityInstanceId(id),
           directiveId?.let { ActivityDirectiveId(it) },
           between(start, start.plus(Duration.parseISO8601(response.getString(2))))
       ))

procedural/scheduling/build.gradle

@@ -16,6 +16,7 @@ repositories {
 dependencies {
   implementation project(':procedural:timeline')
   implementation project(':merlin-driver')
+  implementation project(':type-utils')
 
   testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
   testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'

procedural/scheduling/src/main/kotlin/gov/nasa/ammos/aerie/procedural/scheduling/plan/EditablePlan.kt

@@ -6,7 +6,7 @@ import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.AnyDirective
 import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.DirectiveStart
 import gov.nasa.ammos.aerie.procedural.timeline.plan.Plan
 import gov.nasa.ammos.aerie.procedural.timeline.plan.SimulationResults
-import gov.nasa.jpl.aerie.merlin.driver.ActivityDirectiveId
+import gov.nasa.jpl.aerie.types.ActivityDirectiveId
 
 /** A plan representation that can be edited and simulated. */
 interface EditablePlan: Plan {

procedural/scheduling/src/main/kotlin/gov/nasa/ammos/aerie/procedural/scheduling/plan/NewDirective.kt

@@ -3,7 +3,7 @@ package gov.nasa.ammos.aerie.procedural.scheduling.plan
 import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.AnyDirective
 import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.Directive
 import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.DirectiveStart
-import gov.nasa.jpl.aerie.merlin.driver.ActivityDirectiveId
+import gov.nasa.jpl.aerie.types.ActivityDirectiveId
 
 /** A new directive to be created, which doesn't have an id yet. */
 data class NewDirective(

procedural/timeline/build.gradle

@@ -15,6 +15,7 @@ repositories {
 
 dependencies {
   implementation project(':merlin-driver')
+  implementation project(':type-utils')
 
   testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
   testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'

procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/payloads/activities/Directive.kt

@@ -2,7 +2,7 @@ package gov.nasa.ammos.aerie.procedural.timeline.payloads.activities
 
 import gov.nasa.jpl.aerie.merlin.protocol.types.Duration
 import gov.nasa.ammos.aerie.procedural.timeline.Interval
-import gov.nasa.jpl.aerie.merlin.driver.ActivityDirectiveId
+import gov.nasa.jpl.aerie.types.ActivityDirectiveId
 
 /** A wrapper of any type of activity directive containing common data. */
 data class Directive<A: Any>(

procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/payloads/activities/DirectiveStart.kt

@@ -1,7 +1,7 @@
 package gov.nasa.ammos.aerie.procedural.timeline.payloads.activities
 
-import gov.nasa.jpl.aerie.merlin.driver.ActivityDirectiveId
 import gov.nasa.jpl.aerie.merlin.protocol.types.Duration
+import gov.nasa.jpl.aerie.types.ActivityDirectiveId
 
 /** Start behavior for an activity directive. */
 sealed interface DirectiveStart {

procedural/timeline/src/main/kotlin/gov/nasa/ammos/aerie/procedural/timeline/payloads/activities/Instance.kt

@@ -1,9 +1,8 @@
 package gov.nasa.ammos.aerie.procedural.timeline.payloads.activities
 
-import gov.nasa.jpl.aerie.merlin.protocol.types.Duration
 import gov.nasa.ammos.aerie.procedural.timeline.Interval
-import gov.nasa.jpl.aerie.merlin.driver.ActivityDirectiveId
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstanceId
+import gov.nasa.jpl.aerie.merlin.protocol.types.Duration
+import gov.nasa.jpl.aerie.types.ActivityDirectiveId
 
 /** A wrapper of any type of activity instance containing common data. */
 data class Instance<A: Any>(
@@ -12,7 +11,7 @@ data class Instance<A: Any>(
   override val type: String,
 
   /** The instance id. */
-  @JvmField val id: ActivityInstanceId,
+  @JvmField val id: gov.nasa.jpl.aerie.types.ActivityInstanceId,
 
   /**
    * The maybe-null id of the directive associated with this instance.

scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/simulation/SimulationFacadeUtils.java

@@ -1,7 +1,7 @@
 package gov.nasa.jpl.aerie.scheduler.simulation;
 
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstance;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstanceId;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstanceId;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationResultsComputerInputs;
 import gov.nasa.jpl.aerie.merlin.driver.engine.SimulationEngine;
 import gov.nasa.jpl.aerie.merlin.protocol.model.SchedulerModel;

scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/simulation/SimulationResultsConverter.java

@@ -4,7 +4,7 @@
 import gov.nasa.jpl.aerie.constraints.model.DiscreteProfile;
 import gov.nasa.jpl.aerie.constraints.model.LinearProfile;
 import gov.nasa.jpl.aerie.constraints.time.Interval;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationResults;
 import gov.nasa.jpl.aerie.merlin.protocol.types.Duration;
 

scheduler-driver/src/main/kotlin/gov/nasa/jpl/aerie/scheduler/plan/InMemoryEditablePlan.kt

@@ -2,25 +2,21 @@ package gov.nasa.jpl.aerie.scheduler.plan
 
 import gov.nasa.jpl.aerie.merlin.driver.MissionModel
 import gov.nasa.jpl.aerie.merlin.protocol.types.Duration
-import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue
 import gov.nasa.ammos.aerie.procedural.scheduling.plan.Edit
 import gov.nasa.ammos.aerie.procedural.scheduling.plan.EditablePlan
 import gov.nasa.ammos.aerie.procedural.scheduling.plan.NewDirective
 import gov.nasa.ammos.aerie.procedural.scheduling.simulation.SimulateOptions
 import gov.nasa.jpl.aerie.scheduler.simulation.SimulationFacade
-import gov.nasa.ammos.aerie.procedural.timeline.collections.Directives
 import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.AnyDirective
 import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.Directive
 import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.DirectiveStart
 import gov.nasa.ammos.aerie.procedural.timeline.plan.Plan
-import gov.nasa.jpl.aerie.merlin.driver.ActivityDirectiveId
 import gov.nasa.jpl.aerie.merlin.protocol.types.DurationType
 import gov.nasa.jpl.aerie.scheduler.DirectiveIdGenerator
 import gov.nasa.jpl.aerie.scheduler.model.*
-import gov.nasa.jpl.aerie.scheduler.plan.InMemoryEditablePlan.Companion.validateArguments
+import gov.nasa.jpl.aerie.types.ActivityDirectiveId
 import java.time.Instant
 import kotlin.jvm.optionals.getOrNull
-import kotlin.math.absoluteValue
 import gov.nasa.ammos.aerie.procedural.timeline.plan.SimulationResults as TimelineSimResults
 
 data class InMemoryEditablePlan(

scheduler-driver/src/main/kotlin/gov/nasa/jpl/aerie/scheduler/plan/MerlinToProcedureSimulationResultsAdapter.kt

@@ -1,6 +1,5 @@
 package gov.nasa.jpl.aerie.scheduler.plan
 
-import gov.nasa.jpl.aerie.merlin.driver.ActivityDirectiveId
 import gov.nasa.jpl.aerie.merlin.driver.engine.ProfileSegment
 import gov.nasa.jpl.aerie.merlin.protocol.types.Duration
 import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue
@@ -12,7 +11,8 @@ import gov.nasa.ammos.aerie.procedural.timeline.payloads.Segment
 import gov.nasa.ammos.aerie.procedural.timeline.payloads.activities.Instance
 import gov.nasa.ammos.aerie.procedural.timeline.plan.Plan
 import gov.nasa.ammos.aerie.procedural.timeline.plan.SimulationResults
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstanceId
+import gov.nasa.jpl.aerie.types.ActivityDirectiveId
+import gov.nasa.jpl.aerie.types.ActivityInstanceId
 import java.time.Instant
 import kotlin.jvm.optionals.getOrNull
 
@@ -108,7 +108,7 @@ class MerlinToProcedureSimulationResultsAdapter(
       instances.add(Instance(
           deserializer(serializedActivity),
           a.type,
-          ActivityInstanceId(a.spanId),
+        ActivityInstanceId(a.spanId),
           a.directiveId?.let { ActivityDirectiveId(it) },
           Interval(startTime, endTime)
       ))

scheduler-driver/src/test/java/gov/nasa/jpl/aerie/scheduler/simulation/AnchorSchedulerTest.java

@@ -5,8 +5,8 @@
 import gov.nasa.jpl.aerie.merlin.driver.DirectiveTypeRegistry;
 import gov.nasa.jpl.aerie.merlin.driver.MissionModel;
 import gov.nasa.jpl.aerie.merlin.driver.OneStepTask;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstance;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstanceId;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstanceId;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationEngineConfiguration;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationResults;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationResultsComputerInputs;

scheduler-driver/src/test/java/gov/nasa/jpl/aerie/scheduler/simulation/SimulationResultsComparisonUtils.java

@@ -1,6 +1,6 @@
 package gov.nasa.jpl.aerie.scheduler.simulation;
 
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationResults;
 import gov.nasa.jpl.aerie.merlin.driver.engine.ProfileSegment;
 import gov.nasa.jpl.aerie.merlin.protocol.types.Duration;

scheduler-server/src/main/java/gov/nasa/jpl/aerie/scheduler/server/services/GraphQLMerlinDatabaseService.java

@@ -4,8 +4,8 @@
 import gov.nasa.jpl.aerie.constraints.model.LinearProfile;
 import gov.nasa.jpl.aerie.json.BasicParsers;
 import gov.nasa.jpl.aerie.json.JsonParser;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstance;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityInstanceId;
+import gov.nasa.jpl.aerie.types.ActivityInstance;
+import gov.nasa.jpl.aerie.types.ActivityInstanceId;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationResults;
 import gov.nasa.jpl.aerie.merlin.driver.UnfinishedActivity;
 import gov.nasa.jpl.aerie.merlin.driver.engine.EventRecord;

scheduler-worker/src/main/java/gov/nasa/jpl/aerie/scheduler/worker/services/SynchronousSchedulerAgent.java

@@ -22,7 +22,6 @@
 import java.util.stream.Collectors;
 
 import gov.nasa.jpl.aerie.json.JsonParser;
-import gov.nasa.jpl.aerie.merlin.driver.ActivityDirectiveId;
 import gov.nasa.jpl.aerie.merlin.driver.MissionModel;
 import gov.nasa.jpl.aerie.merlin.driver.MissionModelLoader;
 import gov.nasa.jpl.aerie.merlin.driver.SimulationEngineConfiguration;

type-utils/src/main/java/gov/nasa/jpl/aerie/types/ActivityId.java

@@ -0,0 +1,4 @@
+package gov.nasa.jpl.aerie.types;
+
+public interface ActivityId {
+}

merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/ActivityInstance.java → type-utils/src/main/java/gov/nasa/jpl/aerie/types/ActivityInstance.java

@@ -1,8 +1,7 @@
-package gov.nasa.jpl.aerie.merlin.driver;
+package gov.nasa.jpl.aerie.types;
 
 import gov.nasa.jpl.aerie.merlin.protocol.types.Duration;
 import gov.nasa.jpl.aerie.merlin.protocol.types.SerializedValue;
-import gov.nasa.jpl.aerie.types.ActivityDirectiveId;
 
 import java.time.Instant;
 import java.util.List;

merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/ActivityInstanceId.java → type-utils/src/main/java/gov/nasa/jpl/aerie/types/ActivityInstanceId.java

@@ -1,3 +1,3 @@
-package gov.nasa.jpl.aerie.merlin.driver;
+package gov.nasa.jpl.aerie.types;
 
 public record ActivityInstanceId(long id) implements ActivityId {}