From 76dde9333f968af4cc01add3b56090fd54fb36af Mon Sep 17 00:00:00 2001
From: Lars Johansson <lars.johansson@ess.eu>
Date: Wed, 23 Aug 2023 18:25:05 +0200
Subject: [PATCH] Remove uuid parameter from structures endpoints for searching
Remove uuid parameter from structures endpoints for searching as there is endpoint for exact match with uuid
---
.../names/rest/api/v1/IStructures.java | 4 ----
.../rest/controller/StructuresController.java | 10 ++++-----
.../names/docker/StructuresDeviceGroupIT.java | 20 ------------------
.../names/docker/StructuresDeviceTypeIT.java | 21 -------------------
.../names/docker/StructuresDisciplineIT.java | 20 ------------------
.../names/docker/StructuresSubsystemIT.java | 21 -------------------
.../names/docker/StructuresSystemGroupIT.java | 20 ------------------
.../names/docker/StructuresSystemIT.java | 20 ------------------
.../docker/complex/StructuresCUDDeleteIT.java | 12 +++++------
.../complex/StructuresCUDNamesLegacyIT.java | 12 +++++------
.../docker/complex/StructuresCUDUpdateIT.java | 12 +++++------
11 files changed, 23 insertions(+), 149 deletions(-)
diff --git a/src/main/java/org/openepics/names/rest/api/v1/IStructures.java b/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
index afff5780..c4243f14 100644
--- a/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
+++ b/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
@@ -303,7 +303,6 @@ public interface IStructures {
* @param statuses statuses for structures
* @param deleted if deleted-only structures are to be included
* (false for non-deleted-only structures, true for deleted-only structures, not used for both cases)
- * @param uuid uuid
* @param parent parent uuid
* @param name name
* @param mnemonic mnemonic
@@ -357,7 +356,6 @@ public interface IStructures {
@Parameter(in = ParameterIn.PATH, description = "search by type of structure") @PathVariable("type") Type type,
@Parameter(in = ParameterIn.QUERY, description = "search by statuses") @RequestParam(required = false) Status[] statuses,
@Parameter(in = ParameterIn.QUERY, description = "if deleted structures are to be included or not, omitted for both deleted and not deleted structures") @RequestParam(required = false) Boolean deleted,
- @Parameter(in = ParameterIn.QUERY, description = "find by uuid") @RequestParam(required = false) String uuid,
@Parameter(in = ParameterIn.QUERY, description = "search by parent uuid") @RequestParam(required = false) String parent,
@Parameter(in = ParameterIn.QUERY, description = "search by name") @RequestParam(required = false) String name,
@Parameter(in = ParameterIn.QUERY, description = "search by mnemonic") @RequestParam(required = false) String mnemonic,
@@ -378,7 +376,6 @@ public interface IStructures {
* @param statuses statuses for structures
* @param deleted if deleted-only structures are to be included
* (false for non-deleted-only structures, true for deleted-only structures, not used for both cases)
- * @param uuid uuid
* @param parent parent uuid
* @param name name
* @param mnemonic mnemonic
@@ -430,7 +427,6 @@ public interface IStructures {
@Parameter(in = ParameterIn.PATH, description = "search by type of structure") @PathVariable("type") Type type,
@Parameter(in = ParameterIn.QUERY, description = "search by statuses") @RequestParam(required = false) Status[] statuses,
@Parameter(in = ParameterIn.QUERY, description = "if deleted structures are to be included or not, omitted for both deleted and not deleted structures") @RequestParam(required = false) Boolean deleted,
- @Parameter(in = ParameterIn.QUERY, description = "find by uuid") @RequestParam(required = false) String uuid,
@Parameter(in = ParameterIn.QUERY, description = "search by parent uuid") @RequestParam(required = false) String parent,
@Parameter(in = ParameterIn.QUERY, description = "search by name") @RequestParam(required = false) String name,
@Parameter(in = ParameterIn.QUERY, description = "search by mnemonic") @RequestParam(required = false) String mnemonic,
diff --git a/src/main/java/org/openepics/names/rest/controller/StructuresController.java b/src/main/java/org/openepics/names/rest/controller/StructuresController.java
index 0d671ec1..c69b9dc2 100644
--- a/src/main/java/org/openepics/names/rest/controller/StructuresController.java
+++ b/src/main/java/org/openepics/names/rest/controller/StructuresController.java
@@ -153,17 +153,17 @@ public class StructuresController implements IStructures {
@Override
public ResponsePageStructureElements readStructures(Type type, Status[] statuses, Boolean deleted,
- String uuid, String parent, String name, String mnemonic, String mnemonicEquivalence, String mnemonicPath, String description, String who,
+ String parent, String name, String mnemonic, String mnemonicEquivalence, String mnemonicPath, String description, String who,
FieldStructure orderBy, Boolean isAsc, Integer page, Integer pageSize) {
// validate
// read structures
try {
ValidateStructureElementUtil.validateStructuresInputRead(type, statuses, deleted,
- uuid, parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description, who,
+ null, parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description, who,
null, orderBy, isAsc, page, pageSize);
return structuresService.readStructures(type, statuses, deleted,
- uuid, parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description, who,
+ null, parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description, who,
orderBy, isAsc, page, pageSize);
} catch (ServiceException e) {
logService.logServiceException(LOGGER, Level.WARNING, e);
@@ -177,14 +177,14 @@ public class StructuresController implements IStructures {
@Override
public ResponseEntity<Resource> readStructuresDownload(Type type, Status[] statuses, Boolean deleted,
- String uuid, String parent, String name, String mnemonic, String mnemonicEquivalence, String mnemonicPath, String description, String who,
+ String parent, String name, String mnemonic, String mnemonicEquivalence, String mnemonicPath, String description, String who,
FieldStructure orderBy, Boolean isAsc, Integer page, Integer pageSize) {
// validate
// read structures
// convert to output
ResponsePageStructureElements structureElements = readStructures(type, statuses, deleted,
- uuid, parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description, who,
+ parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description, who,
orderBy, isAsc, page, pageSize);
InputStreamResource isr = new InputStreamResource(ExcelUtil.structureElementsToExcel(structureElements));
return ResponseEntity.ok()
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
index 44490ada..adc7e173 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
@@ -1106,7 +1106,6 @@ class StructuresDeviceGroupIT {
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DEVICEGROUP/" + createdStructureElement.getUuid().toString());
@@ -1136,7 +1135,6 @@ class StructuresDeviceGroupIT {
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + approvedStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DEVICEGROUP/" + approvedStructureElement.getUuid().toString());
@@ -1194,7 +1192,6 @@ class StructuresDeviceGroupIT {
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DEVICEGROUP/" + createdStructureElement.getUuid().toString());
@@ -1224,7 +1221,6 @@ class StructuresDeviceGroupIT {
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DEVICEGROUP/" + cancelledStructureElement.getUuid().toString());
@@ -1282,7 +1278,6 @@ class StructuresDeviceGroupIT {
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DEVICEGROUP/" + createdStructureElement.getUuid().toString());
@@ -1312,7 +1307,6 @@ class StructuresDeviceGroupIT {
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/DEVICEGROUP?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DEVICEGROUP/" + rejectedStructureElement.getUuid().toString());
@@ -1407,11 +1401,6 @@ class StructuresDeviceGroupIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid.toString(), 1);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid2.toString(), 1);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid3.toString(), 1);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid4.toString(), 1);
-
ITUtilStructures.assertFind("/DEVICEGROUP/" + uuid.toString());
ITUtilStructures.assertFind("/DEVICEGROUP/" + uuid2.toString());
ITUtilStructures.assertFind("/DEVICEGROUP/" + uuid3.toString());
@@ -1585,11 +1574,6 @@ class StructuresDeviceGroupIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid.toString(), 2);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid2.toString(), 2);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid3.toString(), 2);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid4.toString(), 1);
-
ITUtilStructures.assertFind("/DEVICEGROUP/" + uuid.toString());
ITUtilStructures.assertFind("/DEVICEGROUP/" + uuid2.toString());
ITUtilStructures.assertFind("/DEVICEGROUP/" + uuid3.toString());
@@ -1952,10 +1936,6 @@ class StructuresDeviceGroupIT {
ITUtilStructures.assertRead("/DEVICEGROUP?deleted=true&statuses=REJECTED&mnemonicPath=Di2", 5);
ITUtilStructures.assertRead("/DEVICEGROUP?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonicPath=Di2", 10);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + discipline2Uuid.toString(), 0);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid.toString(), 1);
- ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + uuid2.toString(), 2);
-
ITUtilStructures.assertRead("/DEVICEGROUP?parent=" + discipline2Uuid.toString(), 45, -1);
ITUtilStructures.assertRead("/DEVICEGROUP?parent=" + uuid.toString(), 0);
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
index 9a38ff0f..0a19f4d4 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
@@ -1102,7 +1102,6 @@ class StructuresDeviceTypeIT {
ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DEVICETYPE/" + createdStructureElement.getUuid().toString());
@@ -1133,7 +1132,6 @@ class StructuresDeviceTypeIT {
ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rsha", 1);
ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + approvedStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DEVICETYPE/" + approvedStructureElement.getUuid().toString());
@@ -1192,7 +1190,6 @@ class StructuresDeviceTypeIT {
ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DEVICETYPE/" + createdStructureElement.getUuid().toString());
@@ -1223,7 +1220,6 @@ class StructuresDeviceTypeIT {
ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshc", 1);
ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DEVICETYPE/" + cancelledStructureElement.getUuid().toString());
@@ -1282,7 +1278,6 @@ class StructuresDeviceTypeIT {
ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DEVICETYPE/" + createdStructureElement.getUuid().toString());
@@ -1313,7 +1308,6 @@ class StructuresDeviceTypeIT {
ITUtilStructures.assertRead("/DEVICETYPE?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/DEVICETYPE?statuses=CANCELLED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/DEVICETYPE?statuses=REJECTED&mnemonic=Rshr", 1);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DEVICETYPE/" + rejectedStructureElement.getUuid().toString());
@@ -1409,11 +1403,6 @@ class StructuresDeviceTypeIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid.toString(), 1);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid2.toString(), 1);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid3.toString(), 1);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid4.toString(), 1);
-
ITUtilStructures.assertFind("/DEVICETYPE/" + uuid.toString());
ITUtilStructures.assertFind("/DEVICETYPE/" + uuid2.toString());
ITUtilStructures.assertFind("/DEVICETYPE/" + uuid3.toString());
@@ -1590,11 +1579,6 @@ class StructuresDeviceTypeIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid.toString(), 2);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid2.toString(), 2);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid3.toString(), 2);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid4.toString(), 1);
-
ITUtilStructures.assertFind("/DEVICETYPE/" + uuid.toString());
ITUtilStructures.assertFind("/DEVICETYPE/" + uuid2.toString());
ITUtilStructures.assertFind("/DEVICETYPE/" + uuid3.toString());
@@ -1960,11 +1944,6 @@ class StructuresDeviceTypeIT {
ITUtilStructures.assertRead("/DEVICETYPE?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
ITUtilStructures.assertRead("/DEVICETYPE?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + disciplineUuid.toString(), 0);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + deviceGroupUuid.toString(), 0);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid.toString(), 1);
- ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + uuid2.toString(), 2);
-
ITUtilStructures.assertRead("/DEVICETYPE?parent=" + disciplineUuid.toString(), 0);
ITUtilStructures.assertRead("/DEVICETYPE?parent=" + deviceGroupUuid.toString(), 45, -1);
ITUtilStructures.assertRead("/DEVICETYPE?parent=" + uuid.toString(), 0);
diff --git a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
index 2ea05cde..2d8c4ffd 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
@@ -1037,7 +1037,6 @@ class StructuresDisciplineIT {
ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DISCIPLINE/" + createdStructureElement.getUuid().toString());
@@ -1063,7 +1062,6 @@ class StructuresDisciplineIT {
ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rsha", 1);
ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + approvedStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DISCIPLINE/" + approvedStructureElement.getUuid().toString());
@@ -1117,7 +1115,6 @@ class StructuresDisciplineIT {
ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DISCIPLINE/" + createdStructureElement.getUuid().toString());
@@ -1143,7 +1140,6 @@ class StructuresDisciplineIT {
ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshc", 1);
ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DISCIPLINE/" + cancelledStructureElement.getUuid().toString());
@@ -1197,7 +1193,6 @@ class StructuresDisciplineIT {
ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DISCIPLINE/" + createdStructureElement.getUuid().toString());
@@ -1223,7 +1218,6 @@ class StructuresDisciplineIT {
ITUtilStructures.assertRead("/DISCIPLINE?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/DISCIPLINE?statuses=CANCELLED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/DISCIPLINE?statuses=REJECTED&mnemonic=Rshr", 1);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/DISCIPLINE/" + rejectedStructureElement.getUuid().toString());
@@ -1314,11 +1308,6 @@ class StructuresDisciplineIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid.toString(), 1);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid2.toString(), 1);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid3.toString(), 1);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid4.toString(), 1);
-
ITUtilStructures.assertFind("/DISCIPLINE/" + uuid.toString());
ITUtilStructures.assertFind("/DISCIPLINE/" + uuid2.toString());
ITUtilStructures.assertFind("/DISCIPLINE/" + uuid3.toString());
@@ -1491,11 +1480,6 @@ class StructuresDisciplineIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid.toString(), 2);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid2.toString(), 2);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid3.toString(), 2);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid4.toString(), 1);
-
ITUtilStructures.assertFind("/DISCIPLINE/" + uuid.toString());
ITUtilStructures.assertFind("/DISCIPLINE/" + uuid2.toString());
ITUtilStructures.assertFind("/DISCIPLINE/" + uuid3.toString());
@@ -1858,10 +1842,6 @@ class StructuresDisciplineIT {
ITUtilStructures.assertRead("/DISCIPLINE?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
ITUtilStructures.assertRead("/DISCIPLINE?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuidRandom.toString(), 0);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid.toString(), 1);
- ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + uuid2.toString(), 2);
-
ITUtilStructures.assertRead("/DISCIPLINE?parent=" + uuid.toString(), 0);
ITUtilStructures.assertRead("/DISCIPLINE?name=na", 0);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
index cdb1d31e..72f8816d 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
@@ -1100,7 +1100,6 @@ class StructuresSubsystemIT {
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SUBSYSTEM/" + createdStructureElement.getUuid().toString());
@@ -1138,7 +1137,6 @@ class StructuresSubsystemIT {
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rsha", 1);
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + approvedStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SUBSYSTEM/" + approvedStructureElement.getUuid().toString());
@@ -1204,7 +1202,6 @@ class StructuresSubsystemIT {
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SUBSYSTEM/" + createdStructureElement.getUuid().toString());
@@ -1242,7 +1239,6 @@ class StructuresSubsystemIT {
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshc", 1);
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SUBSYSTEM/" + cancelledStructureElement.getUuid().toString());
@@ -1308,7 +1304,6 @@ class StructuresSubsystemIT {
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SUBSYSTEM/" + createdStructureElement.getUuid().toString());
@@ -1346,7 +1341,6 @@ class StructuresSubsystemIT {
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/SUBSYSTEM?statuses=REJECTED&mnemonic=Rshr", 1);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SUBSYSTEM/" + rejectedStructureElement.getUuid().toString());
@@ -1449,11 +1443,6 @@ class StructuresSubsystemIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid.toString(), 1);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid2.toString(), 1);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid3.toString(), 1);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid4.toString(), 1);
-
ITUtilStructures.assertFind("/SUBSYSTEM/" + uuid.toString());
ITUtilStructures.assertFind("/SUBSYSTEM/" + uuid2.toString());
ITUtilStructures.assertFind("/SUBSYSTEM/" + uuid3.toString());
@@ -1634,11 +1623,6 @@ class StructuresSubsystemIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid.toString(), 2);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid2.toString(), 2);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid3.toString(), 2);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid4.toString(), 1);
-
ITUtilStructures.assertFind("/SUBSYSTEM/" + uuid.toString());
ITUtilStructures.assertFind("/SUBSYSTEM/" + uuid2.toString());
ITUtilStructures.assertFind("/SUBSYSTEM/" + uuid3.toString());
@@ -2008,11 +1992,6 @@ class StructuresSubsystemIT {
ITUtilStructures.assertRead("/SUBSYSTEM?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
ITUtilStructures.assertRead("/SUBSYSTEM?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + systemGroupUuid.toString(), 0);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + systemUuid.toString(), 0);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid.toString(), 1);
- ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + uuid2.toString(), 2);
-
ITUtilStructures.assertRead("/SUBSYSTEM?parent=" + systemGroupUuid.toString(), 0);
ITUtilStructures.assertRead("/SUBSYSTEM?parent=" + systemUuid.toString(), 45, -1);
ITUtilStructures.assertRead("/SUBSYSTEM?parent=" + uuid.toString(), 0);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
index e0a70f7a..fb630b58 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
@@ -1099,7 +1099,6 @@ class StructuresSystemGroupIT {
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SYSTEMGROUP/" + createdStructureElement.getUuid().toString());
@@ -1125,7 +1124,6 @@ class StructuresSystemGroupIT {
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rsha", 1);
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + approvedStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SYSTEMGROUP/" + approvedStructureElement.getUuid().toString());
@@ -1179,7 +1177,6 @@ class StructuresSystemGroupIT {
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SYSTEMGROUP/" + createdStructureElement.getUuid().toString());
@@ -1205,7 +1202,6 @@ class StructuresSystemGroupIT {
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshc", 1);
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SYSTEMGROUP/" + cancelledStructureElement.getUuid().toString());
@@ -1259,7 +1255,6 @@ class StructuresSystemGroupIT {
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SYSTEMGROUP/" + createdStructureElement.getUuid().toString());
@@ -1285,7 +1280,6 @@ class StructuresSystemGroupIT {
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=CANCELLED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/SYSTEMGROUP?statuses=REJECTED&mnemonic=Rshr", 1);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SYSTEMGROUP/" + rejectedStructureElement.getUuid().toString());
@@ -1376,11 +1370,6 @@ class StructuresSystemGroupIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid.toString(), 1);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid2.toString(), 1);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid3.toString(), 1);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid4.toString(), 1);
-
ITUtilStructures.assertFind("/SYSTEMGROUP/" + uuid.toString());
ITUtilStructures.assertFind("/SYSTEMGROUP/" + uuid2.toString());
ITUtilStructures.assertFind("/SYSTEMGROUP/" + uuid3.toString());
@@ -1553,11 +1542,6 @@ class StructuresSystemGroupIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid.toString(), 2);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid2.toString(), 2);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid3.toString(), 2);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid4.toString(), 1);
-
ITUtilStructures.assertFind("/SYSTEMGROUP/" + uuid.toString());
ITUtilStructures.assertFind("/SYSTEMGROUP/" + uuid2.toString());
ITUtilStructures.assertFind("/SYSTEMGROUP/" + uuid3.toString());
@@ -1920,10 +1904,6 @@ class StructuresSystemGroupIT {
ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
ITUtilStructures.assertRead("/SYSTEMGROUP?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuidRandom.toString(), 0);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid.toString(), 1);
- ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + uuid2.toString(), 2);
-
ITUtilStructures.assertRead("/SYSTEMGROUP?parent=" + uuid.toString(), 0);
ITUtilStructures.assertRead("/SYSTEMGROUP?name=na", 0);
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
index d975918b..1c193aff 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
@@ -1083,7 +1083,6 @@ class StructuresSystemIT {
ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SYSTEM/" + createdStructureElement.getUuid().toString());
@@ -1114,7 +1113,6 @@ class StructuresSystemIT {
ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rsha", 1);
ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rsha", 0);
ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rsha", 0);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + approvedStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SYSTEM/" + approvedStructureElement.getUuid().toString());
@@ -1173,7 +1171,6 @@ class StructuresSystemIT {
ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SYSTEM/" + createdStructureElement.getUuid().toString());
@@ -1204,7 +1201,6 @@ class StructuresSystemIT {
ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshc", 0);
ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshc", 1);
ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rshc", 0);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + cancelledStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SYSTEM/" + cancelledStructureElement.getUuid().toString());
@@ -1263,7 +1259,6 @@ class StructuresSystemIT {
ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rshr", 0);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + createdStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SYSTEM/" + createdStructureElement.getUuid().toString());
@@ -1294,7 +1289,6 @@ class StructuresSystemIT {
ITUtilStructures.assertRead("/SYSTEM?statuses=APPROVED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/SYSTEM?statuses=CANCELLED&mnemonic=Rshr", 0);
ITUtilStructures.assertRead("/SYSTEM?statuses=REJECTED&mnemonic=Rshr", 1);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + rejectedStructureElement.getUuid().toString(), 1);
ITUtilStructures.assertFind("/SYSTEM/" + rejectedStructureElement.getUuid().toString());
@@ -1390,11 +1384,6 @@ class StructuresSystemIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid.toString(), 1);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid2.toString(), 1);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid3.toString(), 1);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid4.toString(), 1);
-
ITUtilStructures.assertFind("/SYSTEM/" + uuid.toString());
ITUtilStructures.assertFind("/SYSTEM/" + uuid2.toString());
ITUtilStructures.assertFind("/SYSTEM/" + uuid3.toString());
@@ -1571,11 +1560,6 @@ class StructuresSystemIT {
// ( include if latest )
// include if latest not exists (considered present + future)
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid.toString(), 2);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid2.toString(), 2);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid3.toString(), 2);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid4.toString(), 1);
-
ITUtilStructures.assertFind("/SYSTEM/" + uuid.toString());
ITUtilStructures.assertFind("/SYSTEM/" + uuid2.toString());
ITUtilStructures.assertFind("/SYSTEM/" + uuid3.toString());
@@ -1941,10 +1925,6 @@ class StructuresSystemIT {
ITUtilStructures.assertRead("/SYSTEM?deleted=true&statuses=REJECTED&mnemonic=A__", 5);
ITUtilStructures.assertRead("/SYSTEM?deleted=true&statuses=PENDING&statuses=APPROVED&mnemonic=A__", 10);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + systemGroupUuid.toString(), 0);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid.toString(), 1);
- ITUtilStructures.assertRead("/SYSTEM?uuid=" + uuid2.toString(), 2);
-
ITUtilStructures.assertRead("/SYSTEM?parent=" + systemGroupUuid.toString(), 45, -1);
ITUtilStructures.assertRead("/SYSTEM?parent=" + uuid.toString(), 0);
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java
index 18965cfd..808212f5 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java
@@ -446,7 +446,7 @@ class StructuresCUDDeleteIT {
ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys13-Sub132", Boolean.TRUE);
ITUtilNames.assertExists("Sys13-Sub132", Boolean.TRUE);
- responsePage = ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + sub132, 1);
+ responsePage = ITUtilStructures.assertFind("/SUBSYSTEM/" + sub132);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
@@ -464,7 +464,7 @@ class StructuresCUDDeleteIT {
ITUtilNames.assertExists("Sys12-Sub122", Boolean.TRUE);
ITUtilNames.assertExists("Sys12-Sub123", Boolean.TRUE);
- responsePage = ITUtilStructures.assertRead("/SYSTEM?uuid=" + sys12, 1);
+ responsePage = ITUtilStructures.assertFind("/SYSTEM/" + sys12);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
@@ -494,7 +494,7 @@ class StructuresCUDDeleteIT {
ITUtilStructures.assertExists(Type.SUBSYSTEM, "Sys13-Sub133", Boolean.TRUE);
ITUtilNames.assertExists("Sg1", Boolean.TRUE);
- responsePage = ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + sg1, 1);
+ responsePage = ITUtilStructures.assertFind("/SYSTEMGROUP/" + sg1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
@@ -525,7 +525,7 @@ class StructuresCUDDeleteIT {
ITUtilStructures.assertExists(Type.DEVICETYPE, "Di2-Dt232", Boolean.TRUE);
ITUtilNames.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
- responsePage = ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + dt232, 1);
+ responsePage = ITUtilStructures.assertFind("/DEVICETYPE/" + dt232);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
@@ -541,7 +541,7 @@ class StructuresCUDDeleteIT {
ITUtilNames.assertExists("Sys22:Di2-Dt222-222", Boolean.TRUE);
ITUtilNames.assertExists("Sys22:Di2-Dt223-223", Boolean.TRUE);
- responsePage = ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + dg22, 1);
+ responsePage = ITUtilStructures.assertFind("/DEVICEGROUP/" + dg22);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
@@ -573,7 +573,7 @@ class StructuresCUDDeleteIT {
ITUtilNames.assertExists("Sys23-Sub232:Di2-Dt232-232", Boolean.TRUE);
ITUtilNames.assertExists("Sys23-Sub233:Di2-Dt233-233", Boolean.TRUE);
- responsePage = ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + di2, 1);
+ responsePage = ITUtilStructures.assertFind("/DISCIPLINE/" + di2);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
ITUtilStructures.assertDeleteApprove(structureElementCommandConfirm);
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java
index 9b18fb10..58f28a9f 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java
@@ -454,7 +454,7 @@ class StructuresCUDNamesLegacyIT {
ITUtilNames.assertRead("/legacy", legacyCount, legacyCount);
- responsePage = ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + sub132, 1);
+ responsePage = ITUtilStructures.assertFind("/SUBSYSTEM/" + sub132);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
ITUtilStructures.assertDelete(structureElementCommandConfirm);
@@ -493,7 +493,7 @@ class StructuresCUDNamesLegacyIT {
ITUtilNames.assertRead("/legacy", legacyCount + 1, legacyCount + 1);
- responsePage = ITUtilStructures.assertRead("/SYSTEM?uuid=" + sys12, 1);
+ responsePage = ITUtilStructures.assertFind("/SYSTEM/" + sys12);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
ITUtilStructures.assertDelete(structureElementCommandConfirm);
@@ -532,7 +532,7 @@ class StructuresCUDNamesLegacyIT {
ITUtilNames.assertRead("/legacy", legacyCount + 5, legacyCount + 5);
- responsePage = ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + sg1, 1);
+ responsePage = ITUtilStructures.assertFind("/SYSTEMGROUP/" + sg1);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
ITUtilStructures.assertDelete(structureElementCommandConfirm);
@@ -620,7 +620,7 @@ class StructuresCUDNamesLegacyIT {
ITUtilNames.assertRead("/legacy", legacyCount, legacyCount);
ITUtilNames.assertRead("/legacy?name=%D%", 0, 0);
- responsePage = ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + dt232, 1);
+ responsePage = ITUtilStructures.assertFind("/DEVICETYPE/" + dt232);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
ITUtilStructures.assertDelete(structureElementCommandConfirm);
@@ -653,7 +653,7 @@ class StructuresCUDNamesLegacyIT {
ITUtilNames.assertRead("/legacy", legacyCount + 1, legacyCount + 1);
ITUtilNames.assertRead("/legacy?name=%D%", 1, 1);
- responsePage = ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + dg22, 1);
+ responsePage = ITUtilStructures.assertFind("/DEVICEGROUP/" + dg22);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
ITUtilStructures.assertDelete(structureElementCommandConfirm);
@@ -686,7 +686,7 @@ class StructuresCUDNamesLegacyIT {
ITUtilNames.assertRead("/legacy", legacyCount + 4, legacyCount + 4);
ITUtilNames.assertRead("/legacy?name=%D%", 4, 4);
- responsePage = ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + di2, 1);
+ responsePage = ITUtilStructures.assertFind("/DISCIPLINE/" + di2);
structureElementCommandConfirm = StructureElementUtil.convertElement2CommandConfirm(responsePage.getList().get(0));
ITUtilStructures.assertDelete(structureElementCommandConfirm);
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java
index 6059fda7..0b1f655d 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java
@@ -444,7 +444,7 @@ class StructuresCUDUpdateIT {
ResponsePageStructureElements responsePage = null;
StructureElementCommandUpdate structureElementCommandUpdate = null;
- responsePage = ITUtilStructures.assertRead("/SUBSYSTEM?uuid=" + sub132, 1);
+ responsePage = ITUtilStructures.assertFind("/SUBSYSTEM/" + sub132);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
structureElementCommandUpdate.setDescription("asdf");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
@@ -460,7 +460,7 @@ class StructuresCUDUpdateIT {
// ----------------------------------------
- responsePage = ITUtilStructures.assertRead("/SYSTEM?uuid=" + sys12, 1);
+ responsePage = ITUtilStructures.assertFind("/SYSTEM/" + sys12);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
structureElementCommandUpdate.setDescription("asdf");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
@@ -488,7 +488,7 @@ class StructuresCUDUpdateIT {
// ----------------------------------------
- responsePage = ITUtilStructures.assertRead("/SYSTEMGROUP?uuid=" + sg1, 1);
+ responsePage = ITUtilStructures.assertFind("/SYSTEMGROUP/" + sg1);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
structureElementCommandUpdate.setDescription("asdf");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
@@ -511,7 +511,7 @@ class StructuresCUDUpdateIT {
ResponsePageStructureElements responsePage = null;
StructureElementCommandUpdate structureElementCommandUpdate = null;
- responsePage = ITUtilStructures.assertRead("/DEVICETYPE?uuid=" + dt232, 1);
+ responsePage = ITUtilStructures.assertFind("/DEVICETYPE/" + dt232);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
structureElementCommandUpdate.setDescription("asdf");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
@@ -527,7 +527,7 @@ class StructuresCUDUpdateIT {
// ----------------------------------------
- responsePage = ITUtilStructures.assertRead("/DEVICEGROUP?uuid=" + dg22, 1);
+ responsePage = ITUtilStructures.assertFind("/DEVICEGROUP/" + dg22);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
structureElementCommandUpdate.setDescription("asdf");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
@@ -554,7 +554,7 @@ class StructuresCUDUpdateIT {
// ----------------------------------------
- responsePage = ITUtilStructures.assertRead("/DISCIPLINE?uuid=" + di2, 1);
+ responsePage = ITUtilStructures.assertFind("/DISCIPLINE/" + di2);
structureElementCommandUpdate = StructureElementUtil.convertElement2CommandUpdate(responsePage.getList().get(0));
structureElementCommandUpdate.setDescription("asdf");
ITUtilStructures.assertUpdateApprove(structureElementCommandUpdate);
--
GitLab