handle both restart and replace params

cryostatio · Aug 29, 2023 · e566c57 · e566c57
1 parent 6de65f7
commit e566c57
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/main/java/io/cryostat/recordings/Recordings.java b/src/main/java/io/cryostat/recordings/Recordings.java
@@ -511,6 +511,9 @@ public LinkedRecordingDescriptor createRecording(
             @RestForm String recordingName,
             @RestForm String events,
             @RestForm Optional<String> replace,
+            // restart param is deprecated, only 'replace' should be used and takes priority if both
+            // are provided
+            @RestForm Optional<Boolean> restart,
             @RestForm Optional<Long> duration,
             @RestForm Optional<Boolean> toDisk,
             @RestForm Optional<Long> maxAge,
@@ -554,6 +557,15 @@ public LinkedRecordingDescriptor createRecording(
                                 labels.putAll(
                                         mapper.readValue(rawMetadata.get(), Metadata.class).labels);
                             }
+                            RecordingReplace replacement = RecordingReplace.ALWAYS;
+                            if (replace.isPresent()) {
+                                replacement = RecordingReplace.fromString(replace.get());
+                            } else if (restart.isPresent()) {
+                                replacement =
+                                        restart.get()
+                                                ? RecordingReplace.ALWAYS
+                                                : RecordingReplace.NEVER;
+                            }
                             IConstrainedMap<String> recordingOptions = optionsBuilder.build();
                             return recordingHelper.startRecording(
                                     target,
@@ -562,7 +574,7 @@ public LinkedRecordingDescriptor createRecording(
                                     template.getRight(),
                                     new Metadata(labels),
                                     archiveOnStop.orElse(false),
-                                    RecordingReplace.fromString(replace.orElse("always")),
+                                    replacement,
                                     connection);
                         });