From 9e34d61bbf94d7734634eaf373ce66a46cbac64e Mon Sep 17 00:00:00 2001 From: kem Date: Wed, 19 Apr 2023 11:08:37 +0100 Subject: [PATCH] #10: Remove exportOntologies (/ontologies endpoint) from DomainModelController, and corresponding unit test. TODO: remove "download ontologies.json" link from UI that calls this. --- .../rest/DomainModelController.java | 9 -------- .../rest/DomainModelControllerTest.java | 23 ------------------- 2 files changed, 32 deletions(-) diff --git a/src/main/java/uk/ac/soton/itinnovation/security/systemmodeller/rest/DomainModelController.java b/src/main/java/uk/ac/soton/itinnovation/security/systemmodeller/rest/DomainModelController.java index 252ab7e9..4a9b991d 100644 --- a/src/main/java/uk/ac/soton/itinnovation/security/systemmodeller/rest/DomainModelController.java +++ b/src/main/java/uk/ac/soton/itinnovation/security/systemmodeller/rest/DomainModelController.java @@ -365,15 +365,6 @@ public ResponseEntity export(@PathVariable String graphName) throws Unexpecte return ResponseEntity.status(HttpStatus.OK).headers(headers).contentType(MediaType.TEXT_PLAIN).body(resource); } - @RequestMapping(value = "/ontologies", method = RequestMethod.GET) - public ResponseEntity exportOntologies() throws UnexpectedException { - - logger.info("Called REST method to GET serialised ontologies.json"); - File f = new File(this.getClass().getResource("/static/data/ontologies.json").getPath()); - - return returnFile(Paths.get(f.getAbsolutePath()), f.getName()); - } - private ResponseEntity returnFile(Path p, String filename) { try { diff --git a/src/test/java/uk/ac/soton/itinnovation/security/systemmodeller/rest/DomainModelControllerTest.java b/src/test/java/uk/ac/soton/itinnovation/security/systemmodeller/rest/DomainModelControllerTest.java index b3936375..b3703461 100644 --- a/src/test/java/uk/ac/soton/itinnovation/security/systemmodeller/rest/DomainModelControllerTest.java +++ b/src/test/java/uk/ac/soton/itinnovation/security/systemmodeller/rest/DomainModelControllerTest.java @@ -610,27 +610,4 @@ public void testExportInvalidModel() { assertThat().statusCode(HttpStatus.SC_NOT_FOUND); } - /** - * Testing exporting ontologies.json - * Asserts OK 200 status - * Asserts domain-network, domain-network-testing ontologies returned only - * test is dependent on static/data/ontologies.json - */ - @Test - public void testExportOntologies() { - String[] domainModels = { - "domain-network.nq" - }; - - given(). - filter(adminSession). - when(). - get("/domains/ontologies"). - then(). - assertThat().statusCode(HttpStatus.SC_OK). - and(). - parser("text/plain", Parser.JSON). - and(). - assertThat().body("ontology", contains(domainModels)); - } }