Skip to content

Commit

Permalink
use AnalysisOutputType in analysisTypes
Browse files Browse the repository at this point in the history
  • Loading branch information
grapigeau committed Feb 14, 2025
1 parent f2b7410 commit d997507
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package ca.on.oicr.gsi.shesmu.vidarr;

import ca.on.oicr.gsi.vidarr.api.AnalysisOutputType;
import java.util.List;

public class Configuration {
private Long defaultMaxSubmissionDelay;
private String url;
private List<String> analysisTypes;
private List<AnalysisOutputType> analysisTypes;
private List<String> versionTypes;

public Long getDefaultMaxSubmissionDelay() {
Expand All @@ -16,7 +17,7 @@ public String getUrl() {
return url;
}

public List<String> getAnalysisTypes() {
public List<AnalysisOutputType> getAnalysisTypes() {
return analysisTypes;
}

Expand All @@ -32,7 +33,7 @@ public void setUrl(String url) {
this.url = url;
}

public void setAnalysisTypes(List<String> analysisTypes) {
public void setAnalysisTypes(List<AnalysisOutputType> analysisTypes) {
this.analysisTypes = analysisTypes;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,7 @@
import ca.on.oicr.gsi.vidarr.BasicType;
import ca.on.oicr.gsi.vidarr.BasicType.Visitor;
import ca.on.oicr.gsi.vidarr.JsonBodyHandler;
import ca.on.oicr.gsi.vidarr.api.AnalysisProvenanceResponse;
import ca.on.oicr.gsi.vidarr.api.ExternalKey;
import ca.on.oicr.gsi.vidarr.api.ExternalMultiVersionKey;
import ca.on.oicr.gsi.vidarr.api.MaxInFlightDeclaration;
import ca.on.oicr.gsi.vidarr.api.ProvenanceWorkflowRun;
import ca.on.oicr.gsi.vidarr.api.TargetDeclaration;
import ca.on.oicr.gsi.vidarr.api.WorkflowDeclaration;
import ca.on.oicr.gsi.vidarr.api.*;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down Expand Up @@ -60,11 +54,11 @@ public AnalysisCache(Path fileName) {
}

private String createVidarrProvenanceRequestBody(
List<String> analysisTypes, List<String> versionTypes) {
List<AnalysisOutputType> analysisTypes, List<String> versionTypes) {
return "{"
+ "\"analysisTypes\": ["
+ analysisTypes.stream()
.map(name -> ("\"" + name + "\""))
.map(name -> ("\"" + name.toString() + "\""))
.collect(Collectors.joining(","))
+ "],"
+ "\"epoch\": 0,"
Expand Down

0 comments on commit d997507

Please sign in to comment.