Skip to content

Commit 6e8198f

Browse files
committed
Fix Obtain command
1 parent 209d457 commit 6e8198f

1 file changed

Lines changed: 16 additions & 1 deletion

File tree

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/services/JobService.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.roda.core.data.exceptions.NotFoundException;
2222
import org.roda.core.data.exceptions.RequestNotValidException;
2323
import org.roda.core.data.utils.JsonUtils;
24+
import org.roda.core.data.utils.SelectedItemsUtils;
2425
import org.roda.core.data.v2.ConsumesOutputStream;
2526
import org.roda.core.data.v2.IsRODAObject;
2627
import org.roda.core.data.v2.StreamResponse;
@@ -32,6 +33,7 @@
3233
import org.roda.core.data.v2.index.select.SelectedItemsNone;
3334
import org.roda.core.data.v2.index.sort.Sorter;
3435
import org.roda.core.data.v2.index.sublist.Sublist;
36+
import org.roda.core.data.v2.jobs.CreateJobRequest;
3537
import org.roda.core.data.v2.jobs.IndexedJob;
3638
import org.roda.core.data.v2.jobs.IndexedReport;
3739
import org.roda.core.data.v2.jobs.Job;
@@ -69,7 +71,7 @@ public String buildCurlCommand(String path, Job job) {
6971
String command = RodaCoreFactory.getRodaConfiguration().getString("ui.createJob.curl");
7072
if (command != null) {
7173
command = command.replace("{{jsonObject}}",
72-
StringEscapeUtils.escapeJava(JsonUtils.getJsonFromObject(job, JobMixIn.class)));
74+
StringEscapeUtils.escapeJava(JsonUtils.getJsonFromObject(transformJobToCreateJobRequest(job), JobMixIn.class)));
7375

7476
command = command.replace("{{RODA_CONTEXT_PATH}}", StringEscapeUtils.escapeJava(path));
7577
return command;
@@ -78,6 +80,19 @@ public String buildCurlCommand(String path, Job job) {
7880
}
7981
}
8082

83+
private CreateJobRequest transformJobToCreateJobRequest(Job job) {
84+
CreateJobRequest createJobRequest = new CreateJobRequest();
85+
createJobRequest.setName(job.getName());
86+
createJobRequest.setPlugin(job.getPlugin());
87+
createJobRequest.setPluginParameters(job.getPluginParameters());
88+
createJobRequest.setSourceObjects(SelectedItemsUtils.convertToRESTRequest(job.getSourceObjects()));
89+
createJobRequest.setSourceObjectsClass(job.getSourceObjects().getSelectedClass());
90+
createJobRequest.setPriority(job.getPriority().toString());
91+
createJobRequest.setParallelism(job.getParallelism().toString());
92+
93+
return createJobRequest;
94+
}
95+
8196
public Job createJob(Job job, boolean async) throws NotFoundException, GenericException, JobAlreadyStartedException,
8297
RequestNotValidException, AuthorizationDeniedException {
8398
Job updatedJob = new Job(job);

0 commit comments

Comments
 (0)