Skip to content

Commit 3afb96f

Browse files
mpeelsMichael Peels
andauthored
Update base path to /nbs/api/deduplication. Remove /api from controllers (#331)
Co-authored-by: Michael Peels <michaelpeels@Michael-Peels.local>
1 parent 27cb3bc commit 3afb96f

9 files changed

Lines changed: 11 additions & 11 deletions

File tree

deduplication/src/main/java/gov/cdc/nbs/deduplication/algorithm/AlgorithmController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import gov.cdc.nbs.deduplication.algorithm.pass.model.ui.Algorithm;
2525

2626
@RestController
27-
@RequestMapping("/api/configuration")
27+
@RequestMapping("/configuration")
2828
public class AlgorithmController {
2929

3030
private final PassService passService;

deduplication/src/main/java/gov/cdc/nbs/deduplication/algorithm/dataelements/DataElementsController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import gov.cdc.nbs.deduplication.algorithm.pass.PassService;
1111

1212
@RestController
13-
@RequestMapping("/api/configuration/data-elements")
13+
@RequestMapping("/configuration/data-elements")
1414
public class DataElementsController {
1515

1616
private final DataElementsService service;

deduplication/src/main/java/gov/cdc/nbs/deduplication/algorithm/pass/PassController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import gov.cdc.nbs.deduplication.algorithm.pass.model.ui.Algorithm.Pass;
1313

1414
@RestController
15-
@RequestMapping("/api/configuration/pass")
15+
@RequestMapping("/configuration/pass")
1616
public class PassController {
1717

1818
private final PassService passService;

deduplication/src/main/java/gov/cdc/nbs/deduplication/duplicates/controller/MergeGroupController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111

1212
@RestController
13-
@RequestMapping("/api/deduplication")
13+
@RequestMapping("/deduplication")
1414
public class MergeGroupController {
1515

1616
private final MergeGroupHandler mergeGroupHandler;

deduplication/src/main/java/gov/cdc/nbs/deduplication/duplicates/controller/TestController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.springframework.web.bind.annotation.RestController;
1414

1515
@RestController
16-
@RequestMapping("/api/batch-job/test")
16+
@RequestMapping("/batch-job/test")
1717
public class TestController {
1818

1919
private final JobLauncher jobLauncher;

deduplication/src/main/java/gov/cdc/nbs/deduplication/matching/MatchController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import gov.cdc.nbs.deduplication.matching.model.RelateRequest;
88

99
@RestController
10-
@RequestMapping("/api/deduplication")
10+
@RequestMapping("/deduplication")
1111
public class MatchController {
1212

1313
private final MatchService matchService;

deduplication/src/main/java/gov/cdc/nbs/deduplication/seed/SeedController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.springframework.web.bind.annotation.RestController;
1515

1616
@RestController
17-
@RequestMapping("/api/deduplication/seed")
17+
@RequestMapping("/deduplication/seed")
1818
public class SeedController {
1919

2020
private final JobLauncher launcher;

deduplication/src/main/resources/application.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
server:
22
port: 8083
33
servlet:
4-
context-path: /nbs/deduplication
4+
context-path: /nbs/api/deduplication
55

66
spring:
77
application.name: deduplication

deduplication/src/test/java/gov/cdc/nbs/deduplication/duplicates/controller/MergeGroupControllerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void testGetPossibleMatchGroups() throws Exception {
4444

4545

4646
// Act & Assert
47-
mockMvc.perform(get("/api/deduplication/merge-groups")
47+
mockMvc.perform(get("/deduplication/merge-groups")
4848
.param("page", String.valueOf(page))
4949
.param("size", String.valueOf(size)))
5050
.andExpect(status().isOk())
@@ -56,7 +56,7 @@ void testUpdateMergeStatus() throws Exception {
5656
MergeStatusRequest request = new MergeStatusRequest(100L, false);
5757

5858
// Act & Assert
59-
mockMvc.perform(post("/api/deduplication/merge-status")
59+
mockMvc.perform(post("/deduplication/merge-status")
6060
.contentType("application/json")
6161
.content("{\"personUid\": 100, \"status\": \"false\"}"))
6262
.andExpect(status().isOk())
@@ -72,7 +72,7 @@ void testUpdateMergeStatus_Error() throws Exception {
7272
doThrow(new RuntimeException("Some error")).when(mergeGroupHandler).updateMergeStatus(request);
7373

7474
// Act & Assert
75-
mockMvc.perform(post("/api/deduplication/merge-status")
75+
mockMvc.perform(post("/deduplication/merge-status")
7676
.contentType("application/json")
7777
.content("{\"personUid\": 100, \"status\": \"false\"}"))
7878
.andExpect(status().isInternalServerError())

0 commit comments

Comments
 (0)