Skip to content

Commit ad0f1fe

Browse files
Change function names and comments for clarity
1. Make the related function names for the reverse operator singular 2. Revert the incorrect change of the comment for the repeat api.
1 parent 73dee64 commit ad0f1fe

File tree

4 files changed

+16
-22
lines changed

4 files changed

+16
-22
lines changed

src/main/java/knox/spring/data/neo4j/controller/KnoxController.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
import java.io.InputStream;
55
import java.util.*;
66

7-
import knox.spring.data.neo4j.domain.DesignSpace;
87
import knox.spring.data.neo4j.exception.*;
98
import knox.spring.data.neo4j.sample.DesignSampler.EnumerateType;
10-
import knox.spring.data.neo4j.sbol.SBOLConversion;
119
import knox.spring.data.neo4j.services.DesignSpaceService;
1210

1311
import org.sbolstandard.core2.SBOLConversionException;
@@ -277,7 +275,7 @@ public ResponseEntity<String> orBranches(@RequestParam(value = "targetSpaceID",
277275
}
278276

279277
/**
280-
* @api {post} /branch/Repeat
278+
* @api {post} /branch/repeat Repeat
281279
* @apiName repeatBranches
282280
* @apiGroup Branch
283281
*
@@ -524,25 +522,25 @@ public ResponseEntity<String> mergeDesignSpaces(@RequestParam(value = "inputSpac
524522

525523
/**
526524
* @api {post} /designSpace/reverse Reverse
527-
* @apiName reverseDesignSpaces
525+
* @apiName reverseDesignSpace
528526
* @apiGroup DesignSpace
529527
*
530-
* @apiParam {String[]} inputSpaceIDs IDs for the input design spaces to be reversed.
531-
* @apiParam {String} [outputSpaceID] ID for the output design space resulting from reverse. If omitted, then the result is
532-
* stored in the first input design space.
528+
* @apiParam {String} inputSpaceID ID for the input design space to be reversed.
529+
* @apiParam {String} outputSpaceID ID for the output design space resulting from reverse. If omitted, then the result is
530+
* stored in the input design space.
533531
*
534-
* @apiDescription Reverse the edges from input design spaces.
532+
* @apiDescription Reverse the edges from the input design space.
535533
*/
536534
@RequestMapping(value = "/designSpace/reverse", method = RequestMethod.POST)
537-
public ResponseEntity<String> reverseDesignSpaces(@RequestParam(value = "inputSpaceID", required = true) String inputSpaceID,
538-
@RequestParam(value = "outputSpaceID", required = false) String outputSpaceID) {
535+
public ResponseEntity<String> reverseDesignSpace(@RequestParam(value = "inputSpaceID", required = true) String inputSpaceID,
536+
@RequestParam(value = "outputSpaceID", required = false) String outputSpaceID) {
539537
try {
540538
long startTime = System.nanoTime();
541539

542540
if (outputSpaceID == null) {
543-
designSpaceService.reverseDesignSpaces(inputSpaceID);
541+
designSpaceService.reverseDesignSpace(inputSpaceID);
544542
} else {
545-
designSpaceService.reverseDesignSpaces(inputSpaceID, outputSpaceID);
543+
designSpaceService.reverseDesignSpace(inputSpaceID, outputSpaceID);
546544
}
547545

548546
return new ResponseEntity<String>("{\"message\": \"Design space was successfully reversed after " +

src/main/java/knox/spring/data/neo4j/services/DesignSpaceService.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@
99
import knox.spring.data.neo4j.domain.Snapshot;
1010
import knox.spring.data.neo4j.exception.*;
1111
import knox.spring.data.neo4j.operations.ANDOperator;
12-
import knox.spring.data.neo4j.operations.Concatenation;
1312
import knox.spring.data.neo4j.operations.JoinOperator;
1413
import knox.spring.data.neo4j.operations.MergeOperator;
1514
import knox.spring.data.neo4j.operations.OROperator;
1615
import knox.spring.data.neo4j.operations.ReverseOperator;
17-
import knox.spring.data.neo4j.operations.Product;
1816
import knox.spring.data.neo4j.operations.RepeatOperator;
19-
import knox.spring.data.neo4j.operations.Star;
20-
import knox.spring.data.neo4j.operations.Union;
2117
import knox.spring.data.neo4j.repositories.BranchRepository;
2218
import knox.spring.data.neo4j.repositories.CommitRepository;
2319
import knox.spring.data.neo4j.repositories.DesignSpaceRepository;
@@ -327,11 +323,11 @@ public void mergeBranches(String targetSpaceID, List<String> inputBranchIDs,
327323
saveDesignSpace(targetSpace);
328324
}
329325

330-
public void reverseDesignSpaces(String inputSpaceID) {
331-
reverseDesignSpaces(inputSpaceID, inputSpaceID);
326+
public void reverseDesignSpace(String inputSpaceID) {
327+
reverseDesignSpace(inputSpaceID, inputSpaceID);
332328
}
333329

334-
public void reverseDesignSpaces(String inputSpaceID, String outputSpaceID) {
330+
public void reverseDesignSpace(String inputSpaceID, String outputSpaceID) {
335331
List<String> inputSpaceIDs = new ArrayList<>();
336332
inputSpaceIDs.add(inputSpaceID);
337333
List<NodeSpace> inputSpaces = new ArrayList<NodeSpace>(inputSpaceIDs.size());

src/main/resources/static/js/endpoints.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,9 @@ export function designSpaceMerge(inputSpaces, outputSpace, tolerance){
291291
}
292292
}
293293

294-
export function designSpaceReverse(inputSpaces, outputSpace, tolerance){
294+
export function designSpaceReverse(inputSpace, outputSpace, tolerance){
295295
let query = "?";
296-
query += encodeQueryParameter("inputSpaceID", inputSpaces, query);
296+
query += encodeQueryParameter("inputSpaceID", inputSpace, query);
297297
query += encodeQueryParameter("outputSpaceID", outputSpace, query);
298298

299299
let request = new XMLHttpRequest();

src/main/resources/static/js/knox.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ $('#apply-operators-tooltip').click(() => {
559559
break;
560560

561561
case endpoint.operators.REVERSE:
562-
endpoint.designSpaceReverse(inputSpaces, outputSpace);
562+
endpoint.designSpaceReverse(inputSpaces.get(0), outputSpace);
563563
break;
564564
}
565565
}

0 commit comments

Comments
 (0)