Support for Multiple xpath queries in single api query

Issue-ID: CPS-510
Signed-off-by: Niranjana <niranjana.y60@wipro.com>
Change-Id: I79c41d8028355a205d6d1e7808f64447dd94a28b

2 files changed, 15 insertions, 17 deletions

diff --git a/cps-tbdmt-rest/src/main/java/org/onap/cps/tbdmt/rest/TemplateController.java b/cps-tbdmt-rest/src/main/java/org/onap/cps/tbdmt/rest/TemplateController.java
index 15efdc5..a17130f 100644
--- a/cps-tbdmt-rest/src/main/java/org/onap/cps/tbdmt/rest/TemplateController.java
+++ b/cps-tbdmt-rest/src/main/java/org/onap/cps/tbdmt/rest/TemplateController.java
@@ -64,29 +64,26 @@ public class TemplateController {
     }
 
     /**
-     * Get Template by model and templateId.
+     * Get Template by templateId.
      *
      * @param templateId Id to find the template
-     * @param model schema set to find the template
      * @return template
      */
-    @GetMapping(path = "/templates/{model}/{templateId}")
-    public ResponseEntity<Template> getTemplate(@PathVariable final String templateId,
-        @PathVariable final String model) {
+    @GetMapping(path = "/templates/{templateId}")
+    public ResponseEntity<Template> getTemplate(@PathVariable final String templateId) {
         return new ResponseEntity<>(
-            templateBusinessLogic.getTemplate(new TemplateKey(templateId, model)),
+            templateBusinessLogic.getTemplate(new TemplateKey(templateId)),
             HttpStatus.OK);
 
     }
 
     /**
-     * Delete Template by model and templateId.
+     * Delete Template by templateId.
      *
      * @param templateId Id to find the template
-     * @param model schema set to find the template
      */
-    @DeleteMapping(path = "/templates/{model}/{templateId}")
-    public void deleteTemplate(@PathVariable final String templateId, @PathVariable final String model) {
-        templateBusinessLogic.deleteTemplate(new TemplateKey(templateId, model));
+    @DeleteMapping(path = "/templates/{templateId}")
+    public void deleteTemplate(@PathVariable final String templateId) {
+        templateBusinessLogic.deleteTemplate(new TemplateKey(templateId));
     }
 }
diff --git a/cps-tbdmt-rest/src/test/java/org/onap/cps/tbdmt/rest/TemplateControllerTest.java b/cps-tbdmt-rest/src/test/java/org/onap/cps/tbdmt/rest/TemplateControllerTest.java
index bb8c872..f68c724 100644
--- a/cps-tbdmt-rest/src/test/java/org/onap/cps/tbdmt/rest/TemplateControllerTest.java
+++ b/cps-tbdmt-rest/src/test/java/org/onap/cps/tbdmt/rest/TemplateControllerTest.java
@@ -65,12 +65,13 @@ public class TemplateControllerTest {
     @Before
     public void setup() {
         objectMapper = new ObjectMapper();
-        template = new Template("getNbr", "ran-network", "sample", "get", true);
+        template = new Template("getNbr", "ran-network", "sample", "get", true, "sample", "getRIC");
     }
 
     @Test
     public void testCreateTemplate() throws Exception {
-        final TemplateRequest templateRequest = new TemplateRequest("getNbr", "ran-network", "sample", "get", true);
+        final TemplateRequest templateRequest = new TemplateRequest("getNbr", "ran-network", "sample", "get",
+                        true, "sample", "getRIC");
         final String templateJson = objectMapper.writeValueAsString(templateRequest);
         Mockito.when(templateBusinessLogic.createTemplate(ArgumentMatchers.any()))
             .thenReturn(template);
@@ -116,7 +117,7 @@ public class TemplateControllerTest {
         final String templateJson = objectMapper.writeValueAsString(template);
         Mockito.when(templateBusinessLogic.getTemplate(ArgumentMatchers.any()))
             .thenReturn(template);
-        mockMvc.perform(get("/templates/ran-network/getNbr").accept(MediaType.APPLICATION_JSON))
+        mockMvc.perform(get("/templates/getNbr").accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().json(templateJson));
     }
@@ -125,20 +126,20 @@ public class TemplateControllerTest {
     public void testGetTemplateNotFound() throws Exception {
         Mockito.when(templateBusinessLogic.getTemplate(ArgumentMatchers.any()))
             .thenThrow(new TemplateNotFoundException("Template not found"));
-        mockMvc.perform(get("/templates/ran-network/getNbr").accept(MediaType.APPLICATION_JSON))
+        mockMvc.perform(get("/templates/getNbr").accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isNotFound());
     }
 
     @Test
     public void testDeleteTemplate() throws Exception {
         Mockito.doNothing().when(templateBusinessLogic).deleteTemplate(ArgumentMatchers.any());
-        mockMvc.perform(delete("/templates/ran-network/getNbr").accept(MediaType.APPLICATION_JSON))
+        mockMvc.perform(delete("/templates/getNbr").accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk());
 
         Mockito.doThrow(new TemplateNotFoundException("Template not found"))
             .when(templateBusinessLogic)
             .deleteTemplate(ArgumentMatchers.any());
-        mockMvc.perform(delete("/templates/ran-network/getNbr").accept(MediaType.APPLICATION_JSON))
+        mockMvc.perform(delete("/templates/getNbr").accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isNotFound());
     }