Skip to content

Commit 8887160

Browse files
committed
changed signature for dnaVerification method
1 parent b5685bd commit 8887160

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

src/main/java/gov/doe/jgi/boost/client/BOOSTClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,14 @@ public String codonJuggle(
228228
*/
229229
public String dnaVarification(
230230
final String filenameSequences,
231-
final String constraintsFilename,
231+
Vendor vendor,
232232
final String sequencePatternsFilename)
233233
throws BOOSTClientException, BOOSTBackEndException, IOException {
234234

235235
// represent the request data in JSON and
236236
// submit it to BOOST's Job Queue Management System (JQMS)
237237
return submitJob(RequestBuilder.buildVerify(
238-
filenameSequences, constraintsFilename, sequencePatternsFilename));
238+
filenameSequences, vendor, sequencePatternsFilename));
239239
}
240240

241241
/**

src/main/java/gov/doe/jgi/boost/client/RequestBuilder.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,14 @@ public static JSONObject buildCodonJuggle(
165165
*/
166166
public static JSONObject buildVerify(
167167
final String filenameSequences,
168-
final String constraintsFilename,
168+
Vendor vendor,
169169
final String sequencePatternsFilename)
170170
throws BOOSTClientException, IOException {
171171

172172
//---------------------------------
173173
// verify the given values
174174
ParameterValueVerifier.verifyFilename(JSONKeys.SEQUENCE_INFORMATION, filenameSequences);
175-
ParameterValueVerifier.verifyFilename(JSONKeys.CONSTRAINTS_INFORMATION, constraintsFilename);
175+
ParameterValueVerifier.verifyNull(BOOSTConstants.VENDOR, vendor);
176176
// the sequence patterns filename is optional
177177
if(null != sequencePatternsFilename && !sequencePatternsFilename.trim().isEmpty()) {
178178
ParameterValueVerifier.verifyFilename(JSONKeys.PATTERN_INFORMATION, sequencePatternsFilename);
@@ -202,8 +202,7 @@ public static JSONObject buildVerify(
202202

203203
//---------------------------------
204204
// CONSTRAINTS
205-
requestData.put(JSONKeys.CONSTRAINTS_INFORMATION,
206-
RequestBuilder.buildConstraints(constraintsFilename));
205+
requestData.put(JSONKeys.VENDOR_NAME, vendor);
207206
//---------------------------------
208207

209208

src/test/java/gov/doe/jgi/boost/client/DemoClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static void main(String[] args)
6767
// verify against DNA synthesis constraints and sequence patterns
6868
String dnaVarificationJobUUID = client.dnaVarification(
6969
"./data/dna.fasta", // input sequence
70-
"./data/constraints.scl", // synthesis constraints
70+
Vendor.GEN9, // vendor
7171
"./data/patterns.fasta"); // sequence patterns
7272
if (null != dnaVarificationJobUUID) {
7373
jobUUIDs.add(dnaVarificationJobUUID);

0 commit comments

Comments
 (0)