Remote Job API and DSV export fixes (#207)

* [core] return IStatus specified by the request where applicable * [dsv] propagate exception when dsv export request doesn't succeed
b2ihealthcare · Mar 2, 2018 · cfdcbac · cfdcbac
1 parent 56ec475
commit cfdcbac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...nal.snowowl.datastore/src/com/b2international/snowowl/datastore/remotejobs/RemoteJob.java b/...nal.snowowl.datastore/src/com/b2international/snowowl/datastore/remotejobs/RemoteJob.java
@@ -21,6 +21,7 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.jobs.Job;
 
 import com.b2international.commons.status.Statuses;
@@ -38,6 +39,7 @@
  */
 public final class RemoteJob extends Job {
 
+ public static final QualifiedName REQUEST_STATUS = new QualifiedName(null, "requestStatus");
  private final String id;
  private final ServiceProvider context;
  private final Request<ServiceProvider, ?> request;
@@ -77,7 +79,9 @@ protected final IStatus run(IProgressMonitor monitor) {
  this.response = mapper.writeValueAsString(response);
  }
  }
- return (response instanceof IStatus) ? (IStatus) response : Statuses.ok();
+
+ IStatus status = (IStatus) getProperty(REQUEST_STATUS);
+ return (status != null) ? status : Statuses.ok();
  } catch (OperationCanceledException e) {
  return Statuses.cancel();
  } catch (Throwable e) {

diff --git a/.../src/com/b2international/snowowl/snomed/datastore/request/dsv/SnomedDSVExportRequest.java b/.../src/com/b2international/snowowl/snomed/datastore/request/dsv/SnomedDSVExportRequest.java
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.rmi.server.ExportException;
 import java.util.List;
 import java.util.UUID;
 
@@ -85,11 +86,14 @@ public UUID execute(BranchContext context) {
 
  private File doExport(SnomedRefSetDSVExportModel exportModel) throws Exception {
  SnomedRefSetDSVExportClientRequest dsvRequest = new SnomedRefSetDSVExportClientRequest(SnomedClientProtocol.getInstance(), exportModel);
- File exportFile = dsvRequest.send(new Monitor());
 
+ File exportFile = dsvRequest.send(new Monitor());
  SnomedExportResult result = dsvRequest.getExportResult();
- exportModel.getExportResult().setResultAndMessage(result.getResult(), result.getMessage());
+ if (result.getResult().equals(SnomedExportResult.Result.CANCELED) || result.getResult().equals(SnomedExportResult.Result.EXCEPTION)) {
+ throw new ExportException(result.getMessage());
+ }
 
+ exportModel.getExportResult().setResultAndMessage(result.getResult(), result.getMessage());
  return exportFile;
  }