remove Optional.of wrapping to implictly use constructor wrapper in…

…stead
NASA-AMMOS · Sep 9, 2024 · 67c2be0 · 67c2be0
1 parent 23e4755
commit 67c2be0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...java/gov/nasa/jpl/aerie/scheduler/server/remotes/postgres/GetCreatedActivitiesAction.java b/...java/gov/nasa/jpl/aerie/scheduler/server/remotes/postgres/GetCreatedActivitiesAction.java
@@ -40,7 +40,7 @@ public Map<GoalId, List<ActivityDirectiveId>> get(final long analysisId) throws
       final var goalId = new GoalId(
           resultSet.getLong("goal_id"),
           resultSet.getLong("goal_revision"),
-          Optional.of(resultSet.getLong("goal_invocation_id"))
+          resultSet.getLong("goal_invocation_id")
       );
       final var activityId = new ActivityDirectiveId(resultSet.getLong("activity_id"));
 

diff --git a/...ava/gov/nasa/jpl/aerie/scheduler/server/remotes/postgres/GetSpecificationGoalsAction.java b/...ava/gov/nasa/jpl/aerie/scheduler/server/remotes/postgres/GetSpecificationGoalsAction.java
@@ -61,7 +61,7 @@ public List<GoalInvocationRecord> get(final long specificationId) throws SQLExce
         final var args = parseJson(resultSet.getString("arguments"), new SerializedValueJsonParser());
 
         goals.add(new GoalInvocationRecord(
-            new GoalId(id, revision, Optional.of(goalInvocationId)),
+            new GoalId(id, revision, goalInvocationId),
             name,
             type.equals("JAR") ? new GoalType.JAR(Path.of(path)) : new GoalType.EDSL(new GoalSource(definition)),
             args.asMap().get(),