diff --git a/src/main/java/org/openepics/names/rest/controller/VerificationController.java b/src/main/java/org/openepics/names/rest/controller/VerificationController.java
index 197315ba122ad40c49a9765e7929912b0ad3e923..c698f9090779a4abd31d29cc545886580af5d7f8 100644
--- a/src/main/java/org/openepics/names/rest/controller/VerificationController.java
+++ b/src/main/java/org/openepics/names/rest/controller/VerificationController.java
@@ -173,7 +173,7 @@ public class VerificationController {
// device names
// name part revisions
- List<Name> names = holderIRepositories.getNameRepository().findAll();
+ List<Name> names = holderIRepositories.nameRepository().findAll();
List<DeviceRevision> deviceNames = deviceRevisionRepository.findAll();
List<NamePartRevision> namePartRevisions = namePartRevisionRepository.findAll();
@@ -362,12 +362,12 @@ public class VerificationController {
// to support
// name part revisions
- List<SystemGroup> systemGroups = holderIRepositories.getSystemGroupRepository().findAll();
- List<System> systems = holderIRepositories.getSystemRepository().findAll();
- List<Subsystem> subsystems = holderIRepositories.getSubsystemRepository().findAll();
- List<Discipline> disciplines = holderIRepositories.getDisciplineRepository().findAll();
- List<DeviceGroup> deviceGroups = holderIRepositories.getDeviceGroupRepository().findAll();
- List<DeviceType> deviceTypes = holderIRepositories.getDeviceTypeRepository().findAll();
+ List<SystemGroup> systemGroups = holderIRepositories.systemGroupRepository().findAll();
+ List<System> systems = holderIRepositories.systemRepository().findAll();
+ List<Subsystem> subsystems = holderIRepositories.subsystemRepository().findAll();
+ List<Discipline> disciplines = holderIRepositories.disciplineRepository().findAll();
+ List<DeviceGroup> deviceGroups = holderIRepositories.deviceGroupRepository().findAll();
+ List<DeviceType> deviceTypes = holderIRepositories.deviceTypeRepository().findAll();
List<NamePartRevision> namePartRevisions = namePartRevisionRepository.findAll();
prepareLogReport("readMigrationNamePartRevision, find data, systemGroups.size: " + systemGroups.size(), reportHtml);
@@ -783,13 +783,13 @@ public class VerificationController {
public String readDataReachable() {
StringBuilder reportHtml = new StringBuilder();
- List<Name> names = holderIRepositories.getNameRepository().findAll();
- List<SystemGroup> systemGroups = holderIRepositories.getSystemGroupRepository().findAll();
- List<System> systems = holderIRepositories.getSystemRepository().findAll();
- List<Subsystem> subsystems = holderIRepositories.getSubsystemRepository().findAll();
- List<Discipline> disciplines = holderIRepositories.getDisciplineRepository().findAll();
- List<DeviceGroup> deviceGroups = holderIRepositories.getDeviceGroupRepository().findAll();
- List<DeviceType> deviceTypes = holderIRepositories.getDeviceTypeRepository().findAll();
+ List<Name> names = holderIRepositories.nameRepository().findAll();
+ List<SystemGroup> systemGroups = holderIRepositories.systemGroupRepository().findAll();
+ List<System> systems = holderIRepositories.systemRepository().findAll();
+ List<Subsystem> subsystems = holderIRepositories.subsystemRepository().findAll();
+ List<Discipline> disciplines = holderIRepositories.disciplineRepository().findAll();
+ List<DeviceGroup> deviceGroups = holderIRepositories.deviceGroupRepository().findAll();
+ List<DeviceType> deviceTypes = holderIRepositories.deviceTypeRepository().findAll();
prepareLogReport("readDataReachable, find data, names.size: " + names.size(), reportHtml);
prepareLogReport("readDataReachable, find data, systemGroups.size: " + systemGroups.size(), reportHtml);
@@ -826,7 +826,7 @@ public class VerificationController {
for (Name name : names) {
// to mimic - Find history for name by uuid
- namesByUuid = holderIRepositories.getNameRepository().findByUuid(name.getUuid().toString());
+ namesByUuid = holderIRepositories.nameRepository().findByUuid(name.getUuid().toString());
for (Name nameByUuid : namesByUuid) {
setIdName.add(nameByUuid.getId());
}
@@ -836,7 +836,7 @@ public class VerificationController {
for (SystemGroup systemGroup : systemGroups) {
// to mimic - Find history for system group by uuid
- systemGroupsByUuid = holderIRepositories.getSystemGroupRepository().findByUuid(systemGroup.getUuid().toString());
+ systemGroupsByUuid = holderIRepositories.systemGroupRepository().findByUuid(systemGroup.getUuid().toString());
for (SystemGroup systemGroupByUuid : systemGroupsByUuid) {
setIdSystemGroup.add(systemGroupByUuid.getId());
}
@@ -846,7 +846,7 @@ public class VerificationController {
for (System system : systems) {
// to mimic - Find history for system by uuid
- systemsByUuid = holderIRepositories.getSystemRepository().findByUuid(system.getUuid().toString());
+ systemsByUuid = holderIRepositories.systemRepository().findByUuid(system.getUuid().toString());
for (System systemByUuid : systemsByUuid) {
setIdSystem.add(systemByUuid.getId());
}
@@ -856,7 +856,7 @@ public class VerificationController {
for (Subsystem subsystem : subsystems) {
// to mimic - Find history for subsystem by uuid
- subsystemsByUuid = holderIRepositories.getSubsystemRepository().findByUuid(subsystem.getUuid().toString());
+ subsystemsByUuid = holderIRepositories.subsystemRepository().findByUuid(subsystem.getUuid().toString());
for (Subsystem subsystemByUuid : subsystemsByUuid) {
setIdSubsystem.add(subsystemByUuid.getId());
}
@@ -866,7 +866,7 @@ public class VerificationController {
for (Discipline discipline : disciplines) {
// to mimic - Find history for discipline by uuid
- disciplinesByUuid = holderIRepositories.getDisciplineRepository().findByUuid(discipline.getUuid().toString());
+ disciplinesByUuid = holderIRepositories.disciplineRepository().findByUuid(discipline.getUuid().toString());
for (Discipline disciplineByUuid : disciplinesByUuid) {
setIdDiscipline.add(disciplineByUuid.getId());
}
@@ -876,7 +876,7 @@ public class VerificationController {
for (DeviceGroup deviceGroup : deviceGroups) {
// to mimic - Find history for device group by uuid
- deviceGroupsByUuid = holderIRepositories.getDeviceGroupRepository().findByUuid(deviceGroup.getUuid().toString());
+ deviceGroupsByUuid = holderIRepositories.deviceGroupRepository().findByUuid(deviceGroup.getUuid().toString());
for (DeviceGroup deviceGroupByUuid : deviceGroupsByUuid) {
setIdDeviceGroup.add(deviceGroupByUuid.getId());
}
@@ -886,7 +886,7 @@ public class VerificationController {
for (DeviceType deviceType : deviceTypes) {
// to mimic - Find history for device type by uuid
- deviceTypesByUuid = holderIRepositories.getDeviceTypeRepository().findByUuid(deviceType.getUuid().toString());
+ deviceTypesByUuid = holderIRepositories.deviceTypeRepository().findByUuid(deviceType.getUuid().toString());
for (DeviceType deviceTypeByUuid : deviceTypesByUuid) {
setIdDeviceType.add(deviceTypeByUuid.getId());
}
@@ -928,8 +928,8 @@ public class VerificationController {
// prepare new REST API
- List<Name> names = holderIRepositories.getNameRepository().findLatestNotDeleted();
- List<Name> namesLatest = holderIRepositories.getNameRepository().findLatest();
+ List<Name> names = holderIRepositories.nameRepository().findLatestNotDeleted();
+ List<Name> namesLatest = holderIRepositories.nameRepository().findLatest();
prepareLogReport("readRestApiOldVsNew, find data, deviceRevisions.size: " + deviceRevisions.size(), reportHtml);
prepareLogReport("readRestApiOldVsNew, find data, nameViewProvider.getNameRevisions.entrySet.size: " + nameViewProvider.getNameRevisions().entrySet().size(), reportHtml);
diff --git a/src/main/java/org/openepics/names/rest/controller/old/DeviceNamesControllerV0.java b/src/main/java/org/openepics/names/rest/controller/old/DeviceNamesControllerV0.java
index 2cf766d3640b6d44bebb23bc979e50827ae1ec9b..be3c4b44ab34a9593aa45f6270b0b14a71dc6314 100644
--- a/src/main/java/org/openepics/names/rest/controller/old/DeviceNamesControllerV0.java
+++ b/src/main/java/org/openepics/names/rest/controller/old/DeviceNamesControllerV0.java
@@ -111,7 +111,7 @@ public class DeviceNamesControllerV0 {
*/
@GetMapping
public List<DeviceNameElement> findNames() {
- List<Name> names = holderIRepositories.getNameRepository().findLatestNotDeleted();
+ List<Name> names = holderIRepositories.nameRepository().findLatestNotDeleted();
// create collection with known initial capacity
final List<DeviceNameElement> deviceNameElements = new ArrayList<>(names.size());
@@ -156,7 +156,7 @@ public class DeviceNamesControllerV0 {
return deviceNameElements;
}
- List<Name> names = holderIRepositories.getNameRepository().findLatestNotDeleted();
+ List<Name> names = holderIRepositories.nameRepository().findLatestNotDeleted();
// initiate holder of system and device structure content, for performance reasons
HolderSystemDeviceStructure holderStructure = new HolderSystemDeviceStructure(holderIRepositories);
@@ -190,12 +190,12 @@ public class DeviceNamesControllerV0 {
HolderSystemDeviceStructure holderStructure = new HolderSystemDeviceStructure(holderIRepositories);
final List<DeviceNameElement> deviceNameElements = Lists.newArrayList();
- List<Name> namesSystemGroup = holderIRepositories.getNameRepository().findLatestBySystemGroupMnemonic(system);
+ List<Name> namesSystemGroup = holderIRepositories.nameRepository().findLatestBySystemGroupMnemonic(system);
for (Name name : namesSystemGroup) {
deviceNameElements.add(DeviceNameElementUtil.getDeviceNameElement(name, holderStructure));
}
- List<Name> namesSystem = holderIRepositories.getNameRepository().findLatestBySystemMnemonic(system);
- List<Name> namesSystemThroughSubsystem = holderIRepositories.getNameRepository().findLatestBySystemMnemonicThroughSubsystem(system);
+ List<Name> namesSystem = holderIRepositories.nameRepository().findLatestBySystemMnemonic(system);
+ List<Name> namesSystemThroughSubsystem = holderIRepositories.nameRepository().findLatestBySystemMnemonicThroughSubsystem(system);
for (Name name : namesSystem) {
deviceNameElements.add(DeviceNameElementUtil.getDeviceNameElement(name, holderStructure));
}
@@ -232,7 +232,7 @@ public class DeviceNamesControllerV0 {
return deviceNameElements;
}
- List<Name> names = holderIRepositories.getNameRepository().findLatestNotDeleted();
+ List<Name> names = holderIRepositories.nameRepository().findLatestNotDeleted();
// initiate holder of system and device structure content, for performance reasons
HolderSystemDeviceStructure holderStructure = new HolderSystemDeviceStructure(holderIRepositories);
@@ -263,7 +263,7 @@ public class DeviceNamesControllerV0 {
// exact match
// case sensitive
- List<Name> names = holderIRepositories.getNameRepository().findLatestBySubsystemMnemonic(subsystem);
+ List<Name> names = holderIRepositories.nameRepository().findLatestBySubsystemMnemonic(subsystem);
// create collection with known initial capacity
final List<DeviceNameElement> deviceNameElements = new ArrayList<>(names.size());
@@ -306,7 +306,7 @@ public class DeviceNamesControllerV0 {
return deviceNameElements;
}
- List<Name> names = holderIRepositories.getNameRepository().findLatestNotDeleted();
+ List<Name> names = holderIRepositories.nameRepository().findLatestNotDeleted();
// initiate holder of system and device structure content, for performance reasons
HolderSystemDeviceStructure holderStructure = new HolderSystemDeviceStructure(holderIRepositories);
@@ -337,7 +337,7 @@ public class DeviceNamesControllerV0 {
// exact match
// case sensitive
- List<Name> names = holderIRepositories.getNameRepository().findLatestByDisciplineMnemonic(discipline);
+ List<Name> names = holderIRepositories.nameRepository().findLatestByDisciplineMnemonic(discipline);
// create collection with known initial capacity
final List<DeviceNameElement> deviceNameElements = new ArrayList<>(names.size());
@@ -380,7 +380,7 @@ public class DeviceNamesControllerV0 {
return deviceNameElements;
}
- List<Name> names = holderIRepositories.getNameRepository().findLatestNotDeleted();
+ List<Name> names = holderIRepositories.nameRepository().findLatestNotDeleted();
// initiate holder of system and device structure content, for performance reasons
HolderSystemDeviceStructure holderStructure = new HolderSystemDeviceStructure(holderIRepositories);
@@ -411,7 +411,7 @@ public class DeviceNamesControllerV0 {
// exact match
// case sensitive
- List<Name> names = holderIRepositories.getNameRepository().findLatestByDeviceTypeMnemonic(deviceType);
+ List<Name> names = holderIRepositories.nameRepository().findLatestByDeviceTypeMnemonic(deviceType);
// create collection with known initial capacity
final List<DeviceNameElement> deviceNameElements = new ArrayList<>(names.size());
@@ -454,7 +454,7 @@ public class DeviceNamesControllerV0 {
return deviceNameElements;
}
- List<Name> names = holderIRepositories.getNameRepository().findLatestNotDeleted();
+ List<Name> names = holderIRepositories.nameRepository().findLatestNotDeleted();
// initiate holder of system and device structure content, for performance reasons
HolderSystemDeviceStructure holderStructure = new HolderSystemDeviceStructure(holderIRepositories);
@@ -487,9 +487,9 @@ public class DeviceNamesControllerV0 {
Name name = null;
try {
UUID.fromString(uuid);
- name = holderIRepositories.getNameRepository().findLatestByUuid(uuid);
+ name = holderIRepositories.nameRepository().findLatestByUuid(uuid);
} catch (IllegalArgumentException e) {
- name = holderIRepositories.getNameRepository().findLatestByConventionName(uuid);
+ name = holderIRepositories.nameRepository().findLatestByConventionName(uuid);
}
DeviceNameElement deviceNameElement = DeviceNameElementUtil.getDeviceNameElement(name, holderIRepositories);
diff --git a/src/main/java/org/openepics/names/rest/controller/old/HistoryControllerV0.java b/src/main/java/org/openepics/names/rest/controller/old/HistoryControllerV0.java
index e467d40a50e1f22c6aa3cf1edd1b391aac2efe57..1d5f6856d382428c7fd5945823cf292727b23884 100644
--- a/src/main/java/org/openepics/names/rest/controller/old/HistoryControllerV0.java
+++ b/src/main/java/org/openepics/names/rest/controller/old/HistoryControllerV0.java
@@ -118,13 +118,13 @@ public class HistoryControllerV0 {
return historyElements;
}
- List<SystemGroup> systemGroups = holderIRepositories.getSystemGroupRepository().findByUuid(uuid);
- List<System> systems = holderIRepositories.getSystemRepository().findByUuid(uuid);
- List<Subsystem> subsystems = holderIRepositories.getSubsystemRepository().findByUuid(uuid);
+ List<SystemGroup> systemGroups = holderIRepositories.systemGroupRepository().findByUuid(uuid);
+ List<System> systems = holderIRepositories.systemRepository().findByUuid(uuid);
+ List<Subsystem> subsystems = holderIRepositories.subsystemRepository().findByUuid(uuid);
- List<Discipline> disciplines = holderIRepositories.getDisciplineRepository().findByUuid(uuid);
- List<DeviceGroup> deviceGroups = holderIRepositories.getDeviceGroupRepository().findByUuid(uuid);
- List<DeviceType> deviceTypes = holderIRepositories.getDeviceTypeRepository().findByUuid(uuid);
+ List<Discipline> disciplines = holderIRepositories.disciplineRepository().findByUuid(uuid);
+ List<DeviceGroup> deviceGroups = holderIRepositories.deviceGroupRepository().findByUuid(uuid);
+ List<DeviceType> deviceTypes = holderIRepositories.deviceTypeRepository().findByUuid(uuid);
if (!systemGroups.isEmpty()) {
for (SystemGroup systemGroup : systemGroups) {
@@ -251,7 +251,7 @@ public class HistoryControllerV0 {
return historyElements;
}
- List<Name> names = holderIRepositories.getNameRepository().findByUuid(uuid);
+ List<Name> names = holderIRepositories.nameRepository().findByUuid(uuid);
for (Name name : names) {
historyElements.add(HistoryElementUtil.getHistoryElement(name));
}
diff --git a/src/main/java/org/openepics/names/rest/controller/old/PartControllerV0.java b/src/main/java/org/openepics/names/rest/controller/old/PartControllerV0.java
index 69ed32034b941252f3d795502f3a17a573cfb06e..35f9ad1db1e148aeabf50c78b5fc577b9a086c7a 100644
--- a/src/main/java/org/openepics/names/rest/controller/old/PartControllerV0.java
+++ b/src/main/java/org/openepics/names/rest/controller/old/PartControllerV0.java
@@ -115,9 +115,9 @@ public class PartControllerV0 {
// find in system structure
- List<SystemGroup> systemGroups = holderIRepositories.getSystemGroupRepository().findLatestByMnemonic(mnemonic);
- List<System> systems = holderIRepositories.getSystemRepository().findLatestByMnemonic(mnemonic);
- List<Subsystem> subsystems = holderIRepositories.getSubsystemRepository().findLatestByMnemonic(mnemonic);
+ List<SystemGroup> systemGroups = holderIRepositories.systemGroupRepository().findLatestByMnemonic(mnemonic);
+ List<System> systems = holderIRepositories.systemRepository().findLatestByMnemonic(mnemonic);
+ List<Subsystem> subsystems = holderIRepositories.subsystemRepository().findLatestByMnemonic(mnemonic);
for (SystemGroup systemGroup : systemGroups) {
partElements.add(PartElementUtil.getPartElement(systemGroup));
@@ -131,8 +131,8 @@ public class PartControllerV0 {
// find in system structure
- List<Discipline> disciplines = holderIRepositories.getDisciplineRepository().findLatestByMnemonic(mnemonic);
- List<DeviceType> deviceTypes = holderIRepositories.getDeviceTypeRepository().findLatestByMnemonic(mnemonic);
+ List<Discipline> disciplines = holderIRepositories.disciplineRepository().findLatestByMnemonic(mnemonic);
+ List<DeviceType> deviceTypes = holderIRepositories.deviceTypeRepository().findLatestByMnemonic(mnemonic);
for (Discipline discipline : disciplines) {
partElements.add(PartElementUtil.getPartElement(discipline));
@@ -172,9 +172,9 @@ public class PartControllerV0 {
// find in system structure
- List<SystemGroup> systemGroups = holderIRepositories.getSystemGroupRepository().findLatest();
- List<System> systems = holderIRepositories.getSystemRepository().findLatest();
- List<Subsystem> subsystems = holderIRepositories.getSubsystemRepository().findLatest();
+ List<SystemGroup> systemGroups = holderIRepositories.systemGroupRepository().findLatest();
+ List<System> systems = holderIRepositories.systemRepository().findLatest();
+ List<Subsystem> subsystems = holderIRepositories.subsystemRepository().findLatest();
for (SystemGroup systemGroup : systemGroups) {
String sub = systemGroup.getMnemonic();
@@ -197,8 +197,8 @@ public class PartControllerV0 {
// find in device structure
- List<Discipline> disciplines = holderIRepositories.getDisciplineRepository().findLatest();
- List<DeviceType> deviceTypes = holderIRepositories.getDeviceTypeRepository().findLatest();
+ List<Discipline> disciplines = holderIRepositories.disciplineRepository().findLatest();
+ List<DeviceType> deviceTypes = holderIRepositories.deviceTypeRepository().findLatest();
for (Discipline discipline : disciplines) {
String sub = discipline.getMnemonic();
@@ -244,9 +244,9 @@ public class PartControllerV0 {
// find in system structure
- List<SystemGroup> systemGroups = holderIRepositories.getSystemGroupRepository().findLatest();
- List<System> systems = holderIRepositories.getSystemRepository().findLatest();
- List<Subsystem> subsystems = holderIRepositories.getSubsystemRepository().findLatest();
+ List<SystemGroup> systemGroups = holderIRepositories.systemGroupRepository().findLatest();
+ List<System> systems = holderIRepositories.systemRepository().findLatest();
+ List<Subsystem> subsystems = holderIRepositories.subsystemRepository().findLatest();
for (SystemGroup systemGroup : systemGroups) {
String sub = systemGroup.getMnemonic();
@@ -255,7 +255,7 @@ public class PartControllerV0 {
}
}
for (System system : systems) {
- SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestByUuid(system.getParentUuid().toString());
+ SystemGroup systemGroup = holderIRepositories.systemGroupRepository().findLatestByUuid(system.getParentUuid().toString());
String sub = NamingConventionUtil.mnemonicPath2String(systemGroup.getName(), system.getName());
if (!StringUtils.isEmpty(sub) && pattern.matcher(sub).find()) {
@@ -263,8 +263,8 @@ public class PartControllerV0 {
}
}
for (Subsystem subsystem : subsystems) {
- System system = holderIRepositories.getSystemRepository().findLatestByUuid(subsystem.getParentUuid().toString());
- SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestByUuid(system.getParentUuid().toString());
+ System system = holderIRepositories.systemRepository().findLatestByUuid(subsystem.getParentUuid().toString());
+ SystemGroup systemGroup = holderIRepositories.systemGroupRepository().findLatestByUuid(system.getParentUuid().toString());
String sub = NamingConventionUtil.mnemonicPath2String(systemGroup.getMnemonic(), system.getMnemonic(), subsystem.getMnemonic());
if (!StringUtils.isEmpty(sub) && pattern.matcher(sub).find()) {
@@ -274,8 +274,8 @@ public class PartControllerV0 {
// find in device structure
- List<Discipline> disciplines = holderIRepositories.getDisciplineRepository().findLatest();
- List<DeviceType> deviceTypes = holderIRepositories.getDeviceTypeRepository().findLatest();
+ List<Discipline> disciplines = holderIRepositories.disciplineRepository().findLatest();
+ List<DeviceType> deviceTypes = holderIRepositories.deviceTypeRepository().findLatest();
for (Discipline discipline : disciplines) {
String sub = discipline.getMnemonic();
@@ -284,8 +284,8 @@ public class PartControllerV0 {
}
}
for (DeviceType deviceType : deviceTypes) {
- DeviceGroup deviceGroup = holderIRepositories.getDeviceGroupRepository().findLatestByUuid(deviceType.getParentUuid().toString());
- Discipline discipline = holderIRepositories.getDisciplineRepository().findLatestByUuid(deviceGroup.getParentUuid().toString());
+ DeviceGroup deviceGroup = holderIRepositories.deviceGroupRepository().findLatestByUuid(deviceType.getParentUuid().toString());
+ Discipline discipline = holderIRepositories.disciplineRepository().findLatestByUuid(deviceGroup.getParentUuid().toString());
String sub = NamingConventionUtil.mnemonicPath2String(discipline.getMnemonic(), deviceType.getMnemonic());
if (!StringUtils.isEmpty(sub) && pattern.matcher(sub).find()) {
diff --git a/src/main/java/org/openepics/names/service/NamesService.java b/src/main/java/org/openepics/names/service/NamesService.java
index 36e227be164bc67c7d6fd69fd5dac632f99419a6..6a6751f379b435a41671274a62744bf9596f3cc9 100644
--- a/src/main/java/org/openepics/names/service/NamesService.java
+++ b/src/main/java/org/openepics/names/service/NamesService.java
@@ -194,12 +194,12 @@ public class NamesService {
// find
// system structure - system group, system, subsystem - one of the three expected to be non-null, other two expected to be null
// device structure - device type - may be null
- SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestByUuid(parentSystemStructure.toString());
- System system = holderIRepositories.getSystemRepository().findLatestByUuid(parentSystemStructure.toString());
- Subsystem subsystem = holderIRepositories.getSubsystemRepository().findLatestByUuid(parentSystemStructure.toString());
+ SystemGroup systemGroup = holderIRepositories.systemGroupRepository().findLatestByUuid(parentSystemStructure.toString());
+ System system = holderIRepositories.systemRepository().findLatestByUuid(parentSystemStructure.toString());
+ Subsystem subsystem = holderIRepositories.subsystemRepository().findLatestByUuid(parentSystemStructure.toString());
DeviceType deviceType = null;
if (parentDeviceStructure != null) {
- deviceType = holderIRepositories.getDeviceTypeRepository().findLatestByUuid(parentDeviceStructure.toString());
+ deviceType = holderIRepositories.deviceTypeRepository().findLatestByUuid(parentDeviceStructure.toString());
}
String derivedName = null;
@@ -283,7 +283,7 @@ public class NamesService {
final List<NameElement> nameElements = Lists.newArrayList();
try {
UUID.fromString(name);
- Name latestByUuid = holderIRepositories.getNameRepository().findLatestByUuid(name);
+ Name latestByUuid = holderIRepositories.nameRepository().findLatestByUuid(name);
if (latestByUuid != null) {
nameElements.add(NameElementUtil.getNameElement(latestByUuid));
return new ResponsePageNameElements(nameElements, Long.valueOf(nameElements.size()), nameElements.size(), offset, limit);
@@ -375,7 +375,7 @@ public class NamesService {
if (toBeChecked.getSystemGroupUuid() != null) {
// system group
- SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestNotDeletedByUuid(toBeChecked.getSystemGroupUuid().toString());
+ SystemGroup systemGroup = holderIRepositories.systemGroupRepository().findLatestNotDeletedByUuid(toBeChecked.getSystemGroupUuid().toString());
if (systemGroup == null) {
return Boolean.TRUE;
}
@@ -383,12 +383,12 @@ public class NamesService {
// system
// system group
- org.openepics.names.repository.model.System system = holderIRepositories.getSystemRepository().findLatestNotDeletedByUuid(toBeChecked.getSystemUuid().toString());
+ org.openepics.names.repository.model.System system = holderIRepositories.systemRepository().findLatestNotDeletedByUuid(toBeChecked.getSystemUuid().toString());
if (system == null) {
return Boolean.TRUE;
}
- SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestNotDeletedByUuid(system.getParentUuid().toString());
+ SystemGroup systemGroup = holderIRepositories.systemGroupRepository().findLatestNotDeletedByUuid(system.getParentUuid().toString());
if (systemGroup == null) {
return Boolean.TRUE;
}
@@ -397,17 +397,17 @@ public class NamesService {
// system
// system group
- Subsystem subsystem = holderIRepositories.getSubsystemRepository().findLatestNotDeletedByUuid(toBeChecked.getSubsystemUuid().toString());
+ Subsystem subsystem = holderIRepositories.subsystemRepository().findLatestNotDeletedByUuid(toBeChecked.getSubsystemUuid().toString());
if (subsystem == null) {
return Boolean.TRUE;
}
- org.openepics.names.repository.model.System system = holderIRepositories.getSystemRepository().findLatestNotDeletedByUuid(subsystem.getParentUuid().toString());
+ org.openepics.names.repository.model.System system = holderIRepositories.systemRepository().findLatestNotDeletedByUuid(subsystem.getParentUuid().toString());
if (system == null) {
return Boolean.TRUE;
}
- SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestNotDeletedByUuid(system.getParentUuid().toString());
+ SystemGroup systemGroup = holderIRepositories.systemGroupRepository().findLatestNotDeletedByUuid(system.getParentUuid().toString());
if (systemGroup == null) {
return Boolean.TRUE;
}
@@ -418,17 +418,17 @@ public class NamesService {
// device group
// discipline
- DeviceType deviceType = holderIRepositories.getDeviceTypeRepository().findLatestNotDeletedByUuid(toBeChecked.getDeviceTypeUuid().toString());
+ DeviceType deviceType = holderIRepositories.deviceTypeRepository().findLatestNotDeletedByUuid(toBeChecked.getDeviceTypeUuid().toString());
if (deviceType == null) {
return Boolean.TRUE;
}
- DeviceGroup deviceGroup = holderIRepositories.getDeviceGroupRepository().findLatestNotDeletedByUuid(deviceType.getParentUuid().toString());
+ DeviceGroup deviceGroup = holderIRepositories.deviceGroupRepository().findLatestNotDeletedByUuid(deviceType.getParentUuid().toString());
if (deviceGroup == null) {
return Boolean.TRUE;
}
- Discipline discipline = holderIRepositories.getDisciplineRepository().findLatestNotDeletedByUuid(deviceGroup.getParentUuid().toString());
+ Discipline discipline = holderIRepositories.disciplineRepository().findLatestNotDeletedByUuid(deviceGroup.getParentUuid().toString());
if (discipline == null) {
return Boolean.TRUE;
}
@@ -567,7 +567,7 @@ public class NamesService {
String description = nameElementCommand.getDescription();
String comment = nameElementCommand.getComment();
- Name name = holderIRepositories.getNameRepository().findLatestByUuid(uuid.toString());
+ Name name = holderIRepositories.nameRepository().findLatestByUuid(uuid.toString());
if (name == null) {
continue;
}
@@ -584,12 +584,12 @@ public class NamesService {
// find out system group, system, subsystem
// one of the three expected to be non-null, other two expected to be null
- SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestByUuid(parentSystemStructure.toString());
- System system = holderIRepositories.getSystemRepository().findLatestByUuid(parentSystemStructure.toString());
- Subsystem subsystem = holderIRepositories.getSubsystemRepository().findLatestByUuid(parentSystemStructure.toString());
+ SystemGroup systemGroup = holderIRepositories.systemGroupRepository().findLatestByUuid(parentSystemStructure.toString());
+ System system = holderIRepositories.systemRepository().findLatestByUuid(parentSystemStructure.toString());
+ Subsystem subsystem = holderIRepositories.subsystemRepository().findLatestByUuid(parentSystemStructure.toString());
DeviceType deviceType = null;
if (parentDeviceStructure != null) {
- deviceType = holderIRepositories.getDeviceTypeRepository().findLatestByUuid(parentDeviceStructure.toString());
+ deviceType = holderIRepositories.deviceTypeRepository().findLatestByUuid(parentDeviceStructure.toString());
}
String derivedName = null;
@@ -653,7 +653,7 @@ public class NamesService {
if (previousStructure instanceof SystemGroup && structure instanceof SystemGroup) {
// find
// prepare
- names = holderIRepositories.getNameRepository().findLatestBySystemGroupUuid(structure.getUuid().toString());
+ names = holderIRepositories.nameRepository().findLatestBySystemGroupUuid(structure.getUuid().toString());
for (Name name : names) {
nameElements.add(
new NameElementCommand(
@@ -663,7 +663,7 @@ public class NamesService {
} else if (previousStructure instanceof System && structure instanceof System) {
// find
// prepare
- names = holderIRepositories.getNameRepository().findLatestBySystemUuid(structure.getUuid().toString());
+ names = holderIRepositories.nameRepository().findLatestBySystemUuid(structure.getUuid().toString());
for (Name name : names) {
nameElements.add(
new NameElementCommand(
@@ -671,7 +671,7 @@ public class NamesService {
name.getInstanceIndex(), name.getDescription(), UPDATE_AFTER_APPROVE_STRUCTURE_CHANGE));
}
- names = holderIRepositories.getNameRepository().findLatestBySystemUuidThroughSubsystem(structure.getUuid().toString());
+ names = holderIRepositories.nameRepository().findLatestBySystemUuidThroughSubsystem(structure.getUuid().toString());
for (Name name : names) {
nameElements.add(
new NameElementCommand(
@@ -681,7 +681,7 @@ public class NamesService {
} else if (previousStructure instanceof Subsystem && structure instanceof Subsystem) {
// find
// prepare
- names = holderIRepositories.getNameRepository().findLatestBySubsystemUuid(structure.getUuid().toString());
+ names = holderIRepositories.nameRepository().findLatestBySubsystemUuid(structure.getUuid().toString());
for (Name name : names) {
nameElements.add(
new NameElementCommand(
@@ -691,7 +691,7 @@ public class NamesService {
} else if (previousStructure instanceof Discipline && structure instanceof Discipline) {
// find
// prepare
- names = holderIRepositories.getNameRepository().findLatestByDisciplineUuid(structure.getUuid().toString());
+ names = holderIRepositories.nameRepository().findLatestByDisciplineUuid(structure.getUuid().toString());
for (Name name : names) {
parentSystemStructure = name.getSubsystemUuid() != null
? name.getSubsystemUuid()
@@ -708,7 +708,7 @@ public class NamesService {
} else if (previousStructure instanceof DeviceType && structure instanceof DeviceType) {
// find
// prepare
- names = holderIRepositories.getNameRepository().findLatestByDeviceTypeUuid(structure.getUuid().toString());
+ names = holderIRepositories.nameRepository().findLatestByDeviceTypeUuid(structure.getUuid().toString());
for (Name name : names) {
parentSystemStructure = name.getSubsystemUuid() != null
? name.getSubsystemUuid()
@@ -755,7 +755,7 @@ public class NamesService {
UUID uuid = nameElementCommand.getUuid();
String comment = nameElementCommand.getComment();
- Name name = holderIRepositories.getNameRepository().findLatestByUuid(uuid.toString());
+ Name name = holderIRepositories.nameRepository().findLatestByUuid(uuid.toString());
if (name == null) {
continue;
}
diff --git a/src/main/java/org/openepics/names/service/StructuresService.java b/src/main/java/org/openepics/names/service/StructuresService.java
index 6016b56ff990688cde168a921a88ae0444014ce8..79eccbc6692b10e09d02ed0579e9ed2e7fec58ee 100644
--- a/src/main/java/org/openepics/names/service/StructuresService.java
+++ b/src/main/java/org/openepics/names/service/StructuresService.java
@@ -266,10 +266,10 @@ public class StructuresService {
// system group has no parent uuid
List<SystemGroup> systemGroups = null;
if (StringUtils.isEmpty(parent)) {
- systemGroups = holderRepositories.getSystemGroupRepository().readSystemGroups(statuses, deleted,
+ systemGroups = holderRepositories.systemGroupRepository().readSystemGroups(statuses, deleted,
uuid, name, mnemonic, mnemonicEquivalence, mnemonicPath, description,
includeHistory, orderBy, isAsc, offset, limit);
- totalCount = holderRepositories.getSystemGroupRepository().countSystemGroups(statuses, deleted,
+ totalCount = holderRepositories.systemGroupRepository().countSystemGroups(statuses, deleted,
uuid, name, mnemonic, mnemonicEquivalence, mnemonicPath, description,
includeHistory);
} else {
@@ -278,18 +278,18 @@ public class StructuresService {
}
structureElements.addAll(StructureElementUtil.getStructureElementsForSystemGroups(systemGroups, holderStructure, structureChoice));
} else if (Type.SYSTEM.equals(type)) {
- List<System> systems = holderRepositories.getSystemRepository().readSystems(statuses, deleted,
+ List<System> systems = holderRepositories.systemRepository().readSystems(statuses, deleted,
uuid, parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description,
includeHistory, orderBy, isAsc, offset, limit);
- totalCount = holderRepositories.getSystemRepository().countSystems(statuses, deleted,
+ totalCount = holderRepositories.systemRepository().countSystems(statuses, deleted,
uuid, parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description,
includeHistory);
structureElements.addAll(StructureElementUtil.getStructureElementsForSystems(systems, holderStructure, structureChoice));
} else if (Type.SUBSYSTEM.equals(type)) {
- List<Subsystem> subsystems = holderRepositories.getSubsystemRepository().readSubsystems(statuses, deleted,
+ List<Subsystem> subsystems = holderRepositories.subsystemRepository().readSubsystems(statuses, deleted,
uuid, parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description,
includeHistory, orderBy, isAsc, offset, limit);
- totalCount = holderRepositories.getSubsystemRepository().countSubsystems(statuses, deleted,
+ totalCount = holderRepositories.subsystemRepository().countSubsystems(statuses, deleted,
uuid, parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description,
includeHistory);
structureElements.addAll(StructureElementUtil.getStructureElementsForSubsystems(subsystems, holderStructure, structureChoice));
@@ -297,10 +297,10 @@ public class StructuresService {
// discipline has no parent uuid
List<Discipline> disciplines = null;
if (StringUtils.isEmpty(parent)) {
- disciplines = holderRepositories.getDisciplineRepository().readDisciplines(statuses, deleted,
+ disciplines = holderRepositories.disciplineRepository().readDisciplines(statuses, deleted,
uuid, name, mnemonic, mnemonicEquivalence, mnemonicPath, description,
includeHistory, orderBy, isAsc, offset, limit);
- totalCount = holderRepositories.getDisciplineRepository().countDisciplines(statuses, deleted,
+ totalCount = holderRepositories.disciplineRepository().countDisciplines(statuses, deleted,
uuid, name, mnemonic, mnemonicEquivalence, mnemonicPath, description,
includeHistory);
} else {
@@ -309,18 +309,18 @@ public class StructuresService {
}
structureElements.addAll(StructureElementUtil.getStructureElementsForDisciplines(disciplines, holderStructure, structureChoice));
} else if (Type.DEVICEGROUP.equals(type)) {
- List<DeviceGroup> deviceGroups = holderRepositories.getDeviceGroupRepository().readDeviceGroups(statuses, deleted,
+ List<DeviceGroup> deviceGroups = holderRepositories.deviceGroupRepository().readDeviceGroups(statuses, deleted,
uuid, parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description,
includeHistory, orderBy, isAsc, offset, limit);
- totalCount = holderRepositories.getDeviceGroupRepository().countDeviceGroups(statuses, deleted,
+ totalCount = holderRepositories.deviceGroupRepository().countDeviceGroups(statuses, deleted,
uuid, parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description,
includeHistory);
structureElements.addAll(StructureElementUtil.getStructureElementsForDeviceGroups(deviceGroups, holderStructure, structureChoice));
} else if (Type.DEVICETYPE.equals(type)) {
- List<DeviceType> deviceTypes = holderRepositories.getDeviceTypeRepository().readDeviceTypes(statuses, deleted,
+ List<DeviceType> deviceTypes = holderRepositories.deviceTypeRepository().readDeviceTypes(statuses, deleted,
uuid, parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description,
includeHistory, orderBy, isAsc, offset, limit);
- totalCount = holderRepositories.getDeviceTypeRepository().countDeviceTypes(statuses, deleted,
+ totalCount = holderRepositories.deviceTypeRepository().countDeviceTypes(statuses, deleted,
uuid, parent, name, mnemonic, mnemonicEquivalence, mnemonicPath, description,
includeHistory);
structureElements.addAll(StructureElementUtil.getStructureElementsForDeviceTypes(deviceTypes, holderStructure, structureChoice));
@@ -541,21 +541,21 @@ public class StructuresService {
}
if (Type.SYSTEMGROUP.equals(type)) {
- List<SystemGroup> systemGroups = holderRepositories.getSystemGroupRepository().readSystemGroups(Status.APPROVED, false, null, null, null, null, mnemonicPath, null);
+ List<SystemGroup> systemGroups = holderRepositories.systemGroupRepository().readSystemGroups(Status.APPROVED, false, null, null, null, null, mnemonicPath, null);
return !systemGroups.isEmpty();
} else if (Type.SYSTEM.equals(type)) {
- List<System> systems = holderRepositories.getSystemRepository().readSystems(Status.APPROVED, false, null, null, null, null, null, mnemonicPath, null);
+ List<System> systems = holderRepositories.systemRepository().readSystems(Status.APPROVED, false, null, null, null, null, null, mnemonicPath, null);
return !systems.isEmpty();
} else if (Type.SUBSYSTEM.equals(type)) {
- List<Subsystem> subsystems = holderRepositories.getSubsystemRepository().readSubsystems(Status.APPROVED, false, null, null, null, null, null, mnemonicPath, null);
+ List<Subsystem> subsystems = holderRepositories.subsystemRepository().readSubsystems(Status.APPROVED, false, null, null, null, null, null, mnemonicPath, null);
return !subsystems.isEmpty();
} else if (Type.DISCIPLINE.equals(type)) {
- List<Discipline> disciplines = holderRepositories.getDisciplineRepository().readDisciplines(Status.APPROVED, false, null, null, null, null, mnemonicPath, null);
+ List<Discipline> disciplines = holderRepositories.disciplineRepository().readDisciplines(Status.APPROVED, false, null, null, null, null, mnemonicPath, null);
return !disciplines.isEmpty();
} else if (Type.DEVICEGROUP.equals(type)) {
return Boolean.FALSE;
} else if (Type.DEVICETYPE.equals(type)) {
- List<DeviceType> deviceTypes = holderRepositories.getDeviceTypeRepository().readDeviceTypes(Status.APPROVED, false, null, null, null, null, null, mnemonicPath, null);
+ List<DeviceType> deviceTypes = holderRepositories.deviceTypeRepository().readDeviceTypes(Status.APPROVED, false, null, null, null, null, null, mnemonicPath, null);
return !deviceTypes.isEmpty();
}
diff --git a/src/main/java/org/openepics/names/util/HolderIRepositories.java b/src/main/java/org/openepics/names/util/HolderIRepositories.java
index f168c14120bac197e255c67c2f99ebc5888b16ad..855fe2a52e08866dad742c4b527f94a29cd49b7f 100644
--- a/src/main/java/org/openepics/names/util/HolderIRepositories.java
+++ b/src/main/java/org/openepics/names/util/HolderIRepositories.java
@@ -27,107 +27,15 @@ import org.openepics.names.repository.ISystemGroupRepository;
import org.openepics.names.repository.ISystemRepository;
/**
- * Utility class and holder of references to repositories (interfaces).
+ * Utility record to collect references to repositories (interfaces).
*
* @author Lars Johansson
*/
-public class HolderIRepositories {
-
- private INameRepository nameRepository;
-
- private ISystemGroupRepository systemGroupRepository;
- private ISystemRepository systemRepository;
- private ISubsystemRepository subsystemRepository;
-
- private IDisciplineRepository disciplineRepository;
- private IDeviceGroupRepository deviceGroupRepository;
- private IDeviceTypeRepository deviceTypeRepository;
-
- /**
- * Public constructor to populate references to repositories.
- *
- * @param nameRepository reference to name repository
- * @param systemGroupRepository reference to system group repository
- * @param systemRepository reference to system repository
- * @param subsystemRepository reference to subsystem repository
- * @param disciplineRepository reference to discipline repository
- * @param deviceGroupRepository reference to device group repository
- * @param deviceTypeRepository reference to device type repository
- */
- public HolderIRepositories(
- INameRepository nameRepository,
- ISystemGroupRepository systemGroupRepository,
- ISystemRepository systemRepository,
- ISubsystemRepository subsystemRepository,
- IDisciplineRepository disciplineRepository,
- IDeviceGroupRepository deviceGroupRepository,
- IDeviceTypeRepository deviceTypeRepository) {
- this.nameRepository = nameRepository;
- this.systemGroupRepository = systemGroupRepository;
- this.systemRepository = systemRepository;
- this.subsystemRepository = subsystemRepository;
- this.disciplineRepository = disciplineRepository;
- this.deviceGroupRepository = deviceGroupRepository;
- this.deviceTypeRepository = deviceTypeRepository;
- }
-
- /**
- * Return reference to name repository.
- *
- * @return reference to name repository
- */
- public INameRepository getNameRepository() {
- return nameRepository;
- }
-
- /**
- * Return reference to system group repository.
- *
- * @return reference to system group repository
- */
- public ISystemGroupRepository getSystemGroupRepository() {
- return systemGroupRepository;
- }
- /**
- * Return reference to system repository.
- *
- * @return reference to system repository
- */
- public ISystemRepository getSystemRepository() {
- return systemRepository;
- }
- /**
- * Return reference to subsystem repository.
- *
- * @return reference to subsystem repository
- */
- public ISubsystemRepository getSubsystemRepository() {
- return subsystemRepository;
- }
-
- /**
- * Return reference to discipline repository.
- *
- * @return reference to discipline repository
- */
- public IDisciplineRepository getDisciplineRepository() {
- return disciplineRepository;
- }
- /**
- * Return reference to device group repository.
- *
- * @return reference to device group repository
- */
- public IDeviceGroupRepository getDeviceGroupRepository() {
- return deviceGroupRepository;
- }
- /**
- * Return reference to device type repository.
- *
- * @return reference to device type repository
- */
- public IDeviceTypeRepository getDeviceTypeRepository() {
- return deviceTypeRepository;
- }
-
-}
+public record HolderIRepositories (
+ INameRepository nameRepository,
+ ISystemGroupRepository systemGroupRepository,
+ ISystemRepository systemRepository,
+ ISubsystemRepository subsystemRepository,
+ IDisciplineRepository disciplineRepository,
+ IDeviceGroupRepository deviceGroupRepository,
+ IDeviceTypeRepository deviceTypeRepository) {}
diff --git a/src/main/java/org/openepics/names/util/HolderRepositories.java b/src/main/java/org/openepics/names/util/HolderRepositories.java
index 3d73915a6fe98e61618ca579be831bbb5ed10a82..11d2697d6edd0fd167ef79cddfe11923e933a9ee 100644
--- a/src/main/java/org/openepics/names/util/HolderRepositories.java
+++ b/src/main/java/org/openepics/names/util/HolderRepositories.java
@@ -27,107 +27,15 @@ import org.openepics.names.repository.SystemGroupRepository;
import org.openepics.names.repository.SystemRepository;
/**
- * Utility class and holder of references to repositories.
+ * Utility record to collect references to repositories.
*
* @author Lars Johansson
*/
-public class HolderRepositories {
-
- private NameRepository nameRepository;
-
- private SystemGroupRepository systemGroupRepository;
- private SystemRepository systemRepository;
- private SubsystemRepository subsystemRepository;
-
- private DisciplineRepository disciplineRepository;
- private DeviceGroupRepository deviceGroupRepository;
- private DeviceTypeRepository deviceTypeRepository;
-
- /**
- * Public constructor to populate references to repositories.
- *
- * @param nameRepository reference to name repository
- * @param systemGroupRepository reference to system group repository
- * @param systemRepository reference to system repository
- * @param subsystemRepository reference to subsystem repository
- * @param disciplineRepository reference to discipline repository
- * @param deviceGroupRepository reference to device group repository
- * @param deviceTypeRepository reference to device type repository
- */
- public HolderRepositories(
- NameRepository nameRepository,
- SystemGroupRepository systemGroupRepository,
- SystemRepository systemRepository,
- SubsystemRepository subsystemRepository,
- DisciplineRepository disciplineRepository,
- DeviceGroupRepository deviceGroupRepository,
- DeviceTypeRepository deviceTypeRepository) {
- this.nameRepository = nameRepository;
- this.systemGroupRepository = systemGroupRepository;
- this.systemRepository = systemRepository;
- this.subsystemRepository = subsystemRepository;
- this.disciplineRepository = disciplineRepository;
- this.deviceGroupRepository = deviceGroupRepository;
- this.deviceTypeRepository = deviceTypeRepository;
- }
-
- /**
- * Return reference to name repository.
- *
- * @return reference to name repository
- */
- public NameRepository getNameRepository() {
- return nameRepository;
- }
-
- /**
- * Return reference to system group repository.
- *
- * @return reference to system group repository
- */
- public SystemGroupRepository getSystemGroupRepository() {
- return systemGroupRepository;
- }
- /**
- * Return reference to system repository.
- *
- * @return reference to system repository
- */
- public SystemRepository getSystemRepository() {
- return systemRepository;
- }
- /**
- * Return reference to subsystem repository.
- *
- * @return reference to subsystem repository
- */
- public SubsystemRepository getSubsystemRepository() {
- return subsystemRepository;
- }
-
- /**
- * Return reference to discipline repository.
- *
- * @return reference to discipline repository
- */
- public DisciplineRepository getDisciplineRepository() {
- return disciplineRepository;
- }
- /**
- * Return reference to device group repository.
- *
- * @return reference to device group repository
- */
- public DeviceGroupRepository getDeviceGroupRepository() {
- return deviceGroupRepository;
- }
- /**
- * Return reference to device type repository.
- *
- * @return reference to device type repository
- */
- public DeviceTypeRepository getDeviceTypeRepository() {
- return deviceTypeRepository;
- }
-
-}
+public record HolderRepositories (
+ NameRepository nameRepository,
+ SystemGroupRepository systemGroupRepository,
+ SystemRepository systemRepository,
+ SubsystemRepository subsystemRepository,
+ DisciplineRepository disciplineRepository,
+ DeviceGroupRepository deviceGroupRepository,
+ DeviceTypeRepository deviceTypeRepository) {}
diff --git a/src/main/java/org/openepics/names/util/HolderSystemDeviceStructure.java b/src/main/java/org/openepics/names/util/HolderSystemDeviceStructure.java
index 3801249c87ca1df7246004da88fd5f6fdd22b908..2be8214287faca2ad3f35e807e8d7a198056fc6c 100644
--- a/src/main/java/org/openepics/names/util/HolderSystemDeviceStructure.java
+++ b/src/main/java/org/openepics/names/util/HolderSystemDeviceStructure.java
@@ -74,19 +74,19 @@ public class HolderSystemDeviceStructure {
List<DeviceType> deviceTypesRead = null;
if (includeDeleted) {
- systemGroupsRead = holderIRepositories.getSystemGroupRepository().findLatest();
- systemsRead = holderIRepositories.getSystemRepository().findLatest();
- subsystemsRead = holderIRepositories.getSubsystemRepository().findLatest();
- disciplinesRead = holderIRepositories.getDisciplineRepository().findLatest();
- deviceGroupsRead = holderIRepositories.getDeviceGroupRepository().findLatest();
- deviceTypesRead = holderIRepositories.getDeviceTypeRepository().findLatest();
+ systemGroupsRead = holderIRepositories.systemGroupRepository().findLatest();
+ systemsRead = holderIRepositories.systemRepository().findLatest();
+ subsystemsRead = holderIRepositories.subsystemRepository().findLatest();
+ disciplinesRead = holderIRepositories.disciplineRepository().findLatest();
+ deviceGroupsRead = holderIRepositories.deviceGroupRepository().findLatest();
+ deviceTypesRead = holderIRepositories.deviceTypeRepository().findLatest();
} else {
- systemGroupsRead = holderIRepositories.getSystemGroupRepository().findLatestNotDeleted();
- systemsRead = holderIRepositories.getSystemRepository().findLatestNotDeleted();
- subsystemsRead = holderIRepositories.getSubsystemRepository().findLatestNotDeleted();
- disciplinesRead = holderIRepositories.getDisciplineRepository().findLatestNotDeleted();
- deviceGroupsRead = holderIRepositories.getDeviceGroupRepository().findLatestNotDeleted();
- deviceTypesRead = holderIRepositories.getDeviceTypeRepository().findLatestNotDeleted();
+ systemGroupsRead = holderIRepositories.systemGroupRepository().findLatestNotDeleted();
+ systemsRead = holderIRepositories.systemRepository().findLatestNotDeleted();
+ subsystemsRead = holderIRepositories.subsystemRepository().findLatestNotDeleted();
+ disciplinesRead = holderIRepositories.disciplineRepository().findLatestNotDeleted();
+ deviceGroupsRead = holderIRepositories.deviceGroupRepository().findLatestNotDeleted();
+ deviceTypesRead = holderIRepositories.deviceTypeRepository().findLatestNotDeleted();
}
// initial capacity
diff --git a/src/main/java/org/openepics/names/util/NameElementUtil.java b/src/main/java/org/openepics/names/util/NameElementUtil.java
index 8f0e1955ba6c9b1701bdf794b0c21bdcb30a87d2..d625fef5de0b24712a40c2edc15b8ad61ce69985 100644
--- a/src/main/java/org/openepics/names/util/NameElementUtil.java
+++ b/src/main/java/org/openepics/names/util/NameElementUtil.java
@@ -169,12 +169,12 @@ public class NameElementUtil {
// find out system group, system, subsystem
// one of the three expected to be non-null, other two expected to be null
- SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestByUuid(nameElement.getParentSystemStructure().toString());
- System system = holderIRepositories.getSystemRepository().findLatestByUuid(nameElement.getParentSystemStructure().toString());
- Subsystem subsystem = holderIRepositories.getSubsystemRepository().findLatestByUuid(nameElement.getParentSystemStructure().toString());
+ SystemGroup systemGroup = holderIRepositories.systemGroupRepository().findLatestByUuid(nameElement.getParentSystemStructure().toString());
+ System system = holderIRepositories.systemRepository().findLatestByUuid(nameElement.getParentSystemStructure().toString());
+ Subsystem subsystem = holderIRepositories.subsystemRepository().findLatestByUuid(nameElement.getParentSystemStructure().toString());
DeviceType deviceType = null;
if (nameElement.getParentDeviceStructure() != null) {
- deviceType = holderIRepositories.getDeviceTypeRepository().findLatestByUuid(nameElement.getParentDeviceStructure().toString());
+ deviceType = holderIRepositories.deviceTypeRepository().findLatestByUuid(nameElement.getParentDeviceStructure().toString());
}
String derivedName = null;
diff --git a/src/main/java/org/openepics/names/util/ValidateNameElementUtil.java b/src/main/java/org/openepics/names/util/ValidateNameElementUtil.java
index 44da60ce610b919b4da98c0ed538493f3d50523d..4d2362c2cd6934009e55311a71b33d819c985f19 100644
--- a/src/main/java/org/openepics/names/util/ValidateNameElementUtil.java
+++ b/src/main/java/org/openepics/names/util/ValidateNameElementUtil.java
@@ -282,14 +282,14 @@ public class ValidateNameElementUtil {
// find out system group, system, subsystem
// one of the three expected to be non-null, other two expected to be null
- systemGroup = holderIRepositories.getSystemGroupRepository().findLatestByUuid(parentSystemstructure.toString());
- system = holderIRepositories.getSystemRepository().findLatestByUuid(parentSystemstructure.toString());
- subsystem = holderIRepositories.getSubsystemRepository().findLatestByUuid(parentSystemstructure.toString());
+ systemGroup = holderIRepositories.systemGroupRepository().findLatestByUuid(parentSystemstructure.toString());
+ system = holderIRepositories.systemRepository().findLatestByUuid(parentSystemstructure.toString());
+ subsystem = holderIRepositories.subsystemRepository().findLatestByUuid(parentSystemstructure.toString());
// device structure
if (parentDevicestructure != null) {
countDevicestructureIndex++;
- deviceType = holderIRepositories.getDeviceTypeRepository().findLatestByUuid(parentDevicestructure.toString());
+ deviceType = holderIRepositories.deviceTypeRepository().findLatestByUuid(parentDevicestructure.toString());
ExceptionUtil.validateConditionDataNotFoundException(deviceType != null,
TextUtil.DATA_IS_NOT_FOUND, details, TextUtil.PARENTDEVICESTRUCTURE);
ExceptionUtil.validateConditionDataDeletedException(!deviceType.isDeleted(),
@@ -429,16 +429,16 @@ public class ValidateNameElementUtil {
// device structure
if (!StringUtils.isEmpty(dt)) {
- List<DeviceType> deviceTypes = holderRepositories.getDeviceTypeRepository().readDeviceTypes(Status.APPROVED, false, null, null, null, null, null, mnemonicPathDeviceStructure, null);
+ List<DeviceType> deviceTypes = holderRepositories.deviceTypeRepository().readDeviceTypes(Status.APPROVED, false, null, null, null, null, null, mnemonicPathDeviceStructure, null);
ExceptionUtil.validateConditionDataNotFoundException(ValidateUtil.isSize(deviceTypes, 1),
TextUtil.DEVICE_STRUCTURE_IS_NOT_FOUND, details, field);
deviceType = deviceTypes.get(0);
}
// system structure
- List<Subsystem> subsystems = holderRepositories.getSubsystemRepository().readSubsystems(Status.APPROVED, false, null, null, null, null, null, mnemonicPathSystemStructure, null);
- List<System> systems = holderRepositories.getSystemRepository().readSystems(Status.APPROVED, false, null, null, null, null, null, mnemonicPathSystemStructure, null);
- List<SystemGroup> systemGroups = holderRepositories.getSystemGroupRepository().readSystemGroups(Status.APPROVED, false, null, null, null, null, mnemonicPathSystemStructure, null);
+ List<Subsystem> subsystems = holderRepositories.subsystemRepository().readSubsystems(Status.APPROVED, false, null, null, null, null, null, mnemonicPathSystemStructure, null);
+ List<System> systems = holderRepositories.systemRepository().readSystems(Status.APPROVED, false, null, null, null, null, null, mnemonicPathSystemStructure, null);
+ List<SystemGroup> systemGroups = holderRepositories.systemGroupRepository().readSystemGroups(Status.APPROVED, false, null, null, null, null, mnemonicPathSystemStructure, null);
if (ValidateUtil.isSize(subsystems, 1)) {
subsystem = subsystems.get(0);
@@ -467,11 +467,11 @@ public class ValidateNameElementUtil {
ExceptionUtil.validateConditionDataNotCorrectException(StringUtils.equals(name, derivedName),
TextUtil.CONVENTION_NAME_IS_NOT_CORRECT, details, field);
- List<Name> names = holderRepositories.getNameRepository().readNames(false, null, name, null, null, null, null, null);
+ List<Name> names = holderRepositories.nameRepository().readNames(false, null, name, null, null, null, null, null);
ExceptionUtil.validateConditionDataConflictException(names.isEmpty(),
TextUtil.CONVENTION_NAME_EXISTS, details, field);
- names = holderRepositories.getNameRepository().readNames(false, null, null, namingConvention.equivalenceClassRepresentative(name), null, null, null, null);
+ names = holderRepositories.nameRepository().readNames(false, null, null, namingConvention.equivalenceClassRepresentative(name), null, null, null, null);
ExceptionUtil.validateConditionDataConflictException(names.isEmpty(),
TextUtil.CONVENTION_NAME_EQUIVALENCE_EXISTS, details, field);
}
diff --git a/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java b/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java
index e79a9d79036a59fbfebb0e8d23da6d05da8b43ed..790793c750847d297470360db0d8ac83a0447949 100644
--- a/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java
+++ b/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java
@@ -378,17 +378,17 @@ public class ValidateStructureElementUtil {
private static int getStructuresSize(UUID uuid, Type type, Status status, Boolean deleted,
HolderRepositories holderRepositories) {
if (Type.SYSTEMGROUP.equals(type)) {
- return holderRepositories.getSystemGroupRepository().readSystemGroups(status, deleted, uuid.toString(), null, null, null, null, null).size();
+ return holderRepositories.systemGroupRepository().readSystemGroups(status, deleted, uuid.toString(), null, null, null, null, null).size();
} else if (Type.SYSTEM.equals(type)) {
- return holderRepositories.getSystemRepository().readSystems(status, deleted, uuid.toString(), null, null, null, null, null, null).size();
+ return holderRepositories.systemRepository().readSystems(status, deleted, uuid.toString(), null, null, null, null, null, null).size();
} else if (Type.SUBSYSTEM.equals(type)) {
- return holderRepositories.getSubsystemRepository().readSubsystems(status, deleted, uuid.toString(), null, null, null, null, null, null).size();
+ return holderRepositories.subsystemRepository().readSubsystems(status, deleted, uuid.toString(), null, null, null, null, null, null).size();
} else if (Type.DISCIPLINE.equals(type)) {
- return holderRepositories.getDisciplineRepository().readDisciplines(status, deleted, uuid.toString(), null, null, null, null, null).size();
+ return holderRepositories.disciplineRepository().readDisciplines(status, deleted, uuid.toString(), null, null, null, null, null).size();
} else if (Type.DEVICEGROUP.equals(type)) {
- return holderRepositories.getDeviceGroupRepository().readDeviceGroups(status, deleted, uuid.toString(), null, null, null, null, null, null).size();
+ return holderRepositories.deviceGroupRepository().readDeviceGroups(status, deleted, uuid.toString(), null, null, null, null, null, null).size();
} else if (Type.DEVICETYPE.equals(type)) {
- return holderRepositories.getDeviceTypeRepository().readDeviceTypes(status, deleted, uuid.toString(), null, null, null, null, null, null).size();
+ return holderRepositories.deviceTypeRepository().readDeviceTypes(status, deleted, uuid.toString(), null, null, null, null, null, null).size();
}
return 0;
}
@@ -502,7 +502,7 @@ public class ValidateStructureElementUtil {
} else if (Type.DEVICEGROUP.equals(type)) {
// status, parent
message = TextUtil.DISCIPLINE_IS_NOT_CORRECT;
- List<Discipline> disciplines = holderRepositories.getDisciplineRepository().readDisciplines(Status.APPROVED, false, parent.toString(), null, null, null, null, null);
+ List<Discipline> disciplines = holderRepositories.disciplineRepository().readDisciplines(Status.APPROVED, false, parent.toString(), null, null, null, null, null);
ExceptionUtil.validateConditionDataNotFoundException(ValidateUtil.isSize(disciplines, 1),
message, details, TextUtil.PARENT);
@@ -545,7 +545,7 @@ public class ValidateStructureElementUtil {
validateStructuresValidSize1(uuid, type, Status.PENDING, null,
holderRepositories, message, details, field);
- List<System> systems = holderRepositories.getSystemRepository().readSystems(Status.PENDING, null, uuid.toString(), null, null, null, null, null, null);
+ List<System> systems = holderRepositories.systemRepository().readSystems(Status.PENDING, null, uuid.toString(), null, null, null, null, null, null);
// status, parent
message = TextUtil.SYSTEMGROUP_IS_NOT_CORRECT;
@@ -561,7 +561,7 @@ public class ValidateStructureElementUtil {
validateStructuresValidSize1(uuid, type, Status.PENDING, null,
holderRepositories, message, details, field);
- List<Subsystem> subsystems = holderRepositories.getSubsystemRepository().readSubsystems(Status.PENDING, null, uuid.toString(), null, null, null, null, null, null);
+ List<Subsystem> subsystems = holderRepositories.subsystemRepository().readSubsystems(Status.PENDING, null, uuid.toString(), null, null, null, null, null, null);
// status, parent
message = TextUtil.SYSTEM_IS_NOT_CORRECT;
@@ -584,7 +584,7 @@ public class ValidateStructureElementUtil {
validateStructuresValidSize1(uuid, type, Status.PENDING, null,
holderRepositories, message, details, field);
- List<DeviceGroup> deviceGroups = holderRepositories.getDeviceGroupRepository().readDeviceGroups(Status.PENDING, null, uuid.toString(), null, null, null, null, null, null);
+ List<DeviceGroup> deviceGroups = holderRepositories.deviceGroupRepository().readDeviceGroups(Status.PENDING, null, uuid.toString(), null, null, null, null, null, null);
// status, parent
message = TextUtil.DISCIPLINE_IS_NOT_CORRECT;
@@ -600,7 +600,7 @@ public class ValidateStructureElementUtil {
validateStructuresValidSize1(uuid, type, Status.PENDING, null,
holderRepositories, message, details, field);
- List<DeviceType> deviceTypes = holderRepositories.getDeviceTypeRepository().readDeviceTypes(Status.PENDING, null, uuid.toString(), null, null, null, null, null, null);
+ List<DeviceType> deviceTypes = holderRepositories.deviceTypeRepository().readDeviceTypes(Status.PENDING, null, uuid.toString(), null, null, null, null, null, null);
// status, parent
message = TextUtil.DISCIPLINE_IS_NOT_CORRECT;
@@ -655,13 +655,13 @@ public class ValidateStructureElementUtil {
HolderRepositories holderRepositories) {
String queryValue = parent.toString();
if (Type.SYSTEM.equals(type)) {
- return holderRepositories.getSystemGroupRepository().readSystemGroups(status, deleted, queryValue, null, null, null, null, null).size();
+ return holderRepositories.systemGroupRepository().readSystemGroups(status, deleted, queryValue, null, null, null, null, null).size();
} else if (Type.SUBSYSTEM.equals(type)) {
- return holderRepositories.getSystemRepository().readSystems(status, deleted, queryValue, null, null, null, null, null, null).size();
+ return holderRepositories.systemRepository().readSystems(status, deleted, queryValue, null, null, null, null, null, null).size();
} else if (Type.DEVICEGROUP.equals(type)) {
- return holderRepositories.getDisciplineRepository().readDisciplines(status, deleted, queryValue, null, null, null, null, null).size();
+ return holderRepositories.disciplineRepository().readDisciplines(status, deleted, queryValue, null, null, null, null, null).size();
} else if (Type.DEVICETYPE.equals(type)) {
- return holderRepositories.getDeviceGroupRepository().readDeviceGroups(status, deleted, queryValue, null, null, null, null, null, null).size();
+ return holderRepositories.deviceGroupRepository().readDeviceGroups(status, deleted, queryValue, null, null, null, null, null, null).size();
}
return 0;
}
@@ -711,31 +711,31 @@ public class ValidateStructureElementUtil {
// query table and return list with uuid
if (Type.SYSTEMGROUP.equals(type)) {
return StructureUtil.listSystemGroup2Uuid(
- holderRepositories.getSystemGroupRepository().readSystemGroups(status, deleted, queryUuid, null, queryMnemonic, queryMnemonicEquivalence, null, null));
+ holderRepositories.systemGroupRepository().readSystemGroups(status, deleted, queryUuid, null, queryMnemonic, queryMnemonicEquivalence, null, null));
} else if (Type.SYSTEM.equals(type)) {
if (queryParentTable) {
- return StructureUtil.listSystemGroup2Uuid(holderRepositories.getSystemGroupRepository().readSystemGroups(status, deleted, queryUuid, null, queryMnemonic, queryMnemonicEquivalence, null, null));
+ return StructureUtil.listSystemGroup2Uuid(holderRepositories.systemGroupRepository().readSystemGroups(status, deleted, queryUuid, null, queryMnemonic, queryMnemonicEquivalence, null, null));
} else {
- return StructureUtil.listSystem2Uuid(holderRepositories.getSystemRepository().readSystems(status, deleted, queryUuid, queryParent, null, queryMnemonic, queryMnemonicEquivalence, null, null));
+ return StructureUtil.listSystem2Uuid(holderRepositories.systemRepository().readSystems(status, deleted, queryUuid, queryParent, null, queryMnemonic, queryMnemonicEquivalence, null, null));
}
} else if (Type.SUBSYSTEM.equals(type)) {
if (queryParentTable) {
- return StructureUtil.listSystem2Uuid(holderRepositories.getSystemRepository().readSystems(status, deleted, queryUuid, queryParent, null, queryMnemonic, queryMnemonicEquivalence, null, null));
+ return StructureUtil.listSystem2Uuid(holderRepositories.systemRepository().readSystems(status, deleted, queryUuid, queryParent, null, queryMnemonic, queryMnemonicEquivalence, null, null));
} else {
- return StructureUtil.listSubsystem2Uuid(holderRepositories.getSubsystemRepository().readSubsystems(status, deleted, queryUuid, queryParent, null, queryMnemonic, queryMnemonicEquivalence, null, null));
+ return StructureUtil.listSubsystem2Uuid(holderRepositories.subsystemRepository().readSubsystems(status, deleted, queryUuid, queryParent, null, queryMnemonic, queryMnemonicEquivalence, null, null));
}
} else if (Type.DISCIPLINE.equals(type)) {
- return StructureUtil.listDiscipline2Uuid(holderRepositories.getDisciplineRepository().readDisciplines(status, deleted, queryUuid, null, queryMnemonic, queryMnemonicEquivalence, null, null));
+ return StructureUtil.listDiscipline2Uuid(holderRepositories.disciplineRepository().readDisciplines(status, deleted, queryUuid, null, queryMnemonic, queryMnemonicEquivalence, null, null));
} else if (Type.DEVICEGROUP.equals(type)) {
if (queryParentTable) {
- return StructureUtil.listDiscipline2Uuid(holderRepositories.getDisciplineRepository().readDisciplines(status, deleted, queryUuid, null, queryMnemonic, queryMnemonicEquivalence, null, null));
+ return StructureUtil.listDiscipline2Uuid(holderRepositories.disciplineRepository().readDisciplines(status, deleted, queryUuid, null, queryMnemonic, queryMnemonicEquivalence, null, null));
} else {
- return StructureUtil.listDeviceGroup2Uuid(holderRepositories.getDeviceGroupRepository().readDeviceGroups(status, deleted, queryUuid, queryParent, null, queryMnemonic, queryMnemonicEquivalence, null, null)); }
+ return StructureUtil.listDeviceGroup2Uuid(holderRepositories.deviceGroupRepository().readDeviceGroups(status, deleted, queryUuid, queryParent, null, queryMnemonic, queryMnemonicEquivalence, null, null)); }
} else if (Type.DEVICETYPE.equals(type)) {
if (queryParentTable) {
- return StructureUtil.listDeviceGroup2Uuid(holderRepositories.getDeviceGroupRepository().readDeviceGroups(status, deleted, queryUuid, queryParent, null, queryMnemonic, queryMnemonicEquivalence, null, null));
+ return StructureUtil.listDeviceGroup2Uuid(holderRepositories.deviceGroupRepository().readDeviceGroups(status, deleted, queryUuid, queryParent, null, queryMnemonic, queryMnemonicEquivalence, null, null));
} else {
- return StructureUtil.listDeviceType2Uuid(holderRepositories.getDeviceTypeRepository().readDeviceTypes(status, deleted, queryUuid, queryParent, null, queryMnemonic, queryMnemonicEquivalence, null, null));
+ return StructureUtil.listDeviceType2Uuid(holderRepositories.deviceTypeRepository().readDeviceTypes(status, deleted, queryUuid, queryParent, null, queryMnemonic, queryMnemonicEquivalence, null, null));
}
}
return Lists.newArrayList();
@@ -774,11 +774,11 @@ public class ValidateStructureElementUtil {
// system group may have empty path but there will be mnemonic path in this context
// mnemonic path
- SystemGroup sg = holderIRepositories.getSystemGroupRepository().findLatestNotDeletedByMnemonic(path[0]);
+ SystemGroup sg = holderIRepositories.systemGroupRepository().findLatestNotDeletedByMnemonic(path[0]);
validateStructuresMnemonicpathDuplicate(sg == null, type, details, field);
// mnemonic path equivalence
- List<SystemGroup> systemGroups = holderIRepositories.getSystemGroupRepository().findLatestNotDeleted();
+ List<SystemGroup> systemGroups = holderIRepositories.systemGroupRepository().findLatestNotDeleted();
for (SystemGroup systemGroup : systemGroups) {
validateStructuresMnemonicpathequivalenceDuplicate(
!StringUtils.equals(systemGroup.getMnemonicEquivalence(), namingConvention.equivalenceClassRepresentative(path[0])),
@@ -824,9 +824,9 @@ public class ValidateStructureElementUtil {
} else if (Type.SUBSYSTEM.equals(type)) {
validateStructuresMnemonicpathNotValid(path.length == 2, type, details, field);
- System sys = holderIRepositories.getSystemRepository().findLatestNotDeletedByMnemonic(path[0]);
+ System sys = holderIRepositories.systemRepository().findLatestNotDeletedByMnemonic(path[0]);
validateStructuresMnemonicpathNotFound(sys != null, type, details, field);
- SystemGroup sg = holderIRepositories.getSystemGroupRepository().findLatestNotDeletedByUuid(sys.getParentUuid().toString());
+ SystemGroup sg = holderIRepositories.systemGroupRepository().findLatestNotDeletedByUuid(sys.getParentUuid().toString());
// mnemonic path
validateStructuresMnemonicpathDuplicate(!StringUtils.equals(path[0], path[1]), type, details, field);
@@ -863,11 +863,11 @@ public class ValidateStructureElementUtil {
validateStructuresMnemonicpathNotValid(path.length == 1, type, details, field);
// mnemonic path
- Discipline di = holderIRepositories.getDisciplineRepository().findLatestNotDeletedByMnemonic(path[0]);
+ Discipline di = holderIRepositories.disciplineRepository().findLatestNotDeletedByMnemonic(path[0]);
validateStructuresMnemonicpathDuplicate(di == null, type, details, field);
// mnemonic path equivalence
- List<Discipline> disciplines = holderIRepositories.getDisciplineRepository().findLatestNotDeleted();
+ List<Discipline> disciplines = holderIRepositories.disciplineRepository().findLatestNotDeleted();
for (Discipline discipline : disciplines) {
validateStructuresMnemonicpathequivalenceDuplicate(
!StringUtils.equals(discipline.getMnemonicEquivalence(), namingConvention.equivalenceClassRepresentative(path[0])),
@@ -886,7 +886,7 @@ public class ValidateStructureElementUtil {
validateStructuresMnemonicpathNotValid(path.length == 2, type, details, field);
// discipline
- Discipline discipline = holderIRepositories.getDisciplineRepository().findLatestNotDeletedByMnemonic(path[0]);
+ Discipline discipline = holderIRepositories.disciplineRepository().findLatestNotDeletedByMnemonic(path[0]);
ExceptionUtil.validateConditionDataNotFoundException(discipline != null,
TextUtil.DISCIPLINE_IS_NOT_FOUND, details, field);
diff --git a/src/main/java/org/openepics/names/util/old/DeviceNameElementUtil.java b/src/main/java/org/openepics/names/util/old/DeviceNameElementUtil.java
index 83fd67036bb9730afa7c16de4a0f713340bc84c8..9a940c312b2b925b35fb2429d5e5d61371a7a385 100644
--- a/src/main/java/org/openepics/names/util/old/DeviceNameElementUtil.java
+++ b/src/main/java/org/openepics/names/util/old/DeviceNameElementUtil.java
@@ -151,9 +151,9 @@ public class DeviceNameElementUtil {
// populate return element for system structure
switch (levelSystemStructure) {
case 3: {
- Subsystem subsystem = holderIRepositories.getSubsystemRepository().findLatestByUuid(name.getSubsystemUuid().toString());
- System system = holderIRepositories.getSystemRepository().findLatestByUuid(subsystem.getParentUuid().toString());
- SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestByUuid(system.getParentUuid().toString());
+ Subsystem subsystem = holderIRepositories.subsystemRepository().findLatestByUuid(name.getSubsystemUuid().toString());
+ System system = holderIRepositories.systemRepository().findLatestByUuid(subsystem.getParentUuid().toString());
+ SystemGroup systemGroup = holderIRepositories.systemGroupRepository().findLatestByUuid(system.getParentUuid().toString());
deviceNameElement.setSubsystem(subsystem.getMnemonic());
deviceNameElement.setSystem(system.getMnemonic());
@@ -161,15 +161,15 @@ public class DeviceNameElementUtil {
break;
}
case 2: {
- System system = holderIRepositories.getSystemRepository().findLatestByUuid(name.getSystemUuid().toString());
- SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestByUuid(system.getParentUuid().toString());
+ System system = holderIRepositories.systemRepository().findLatestByUuid(name.getSystemUuid().toString());
+ SystemGroup systemGroup = holderIRepositories.systemGroupRepository().findLatestByUuid(system.getParentUuid().toString());
deviceNameElement.setSystem(system.getMnemonic());
deviceNameElement.setSystemGroup(systemGroup.getMnemonic());
break;
}
case 1: {
- SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestByUuid(name.getSystemGroupUuid().toString());
+ SystemGroup systemGroup = holderIRepositories.systemGroupRepository().findLatestByUuid(name.getSystemGroupUuid().toString());
deviceNameElement.setSystemGroup(systemGroup.getMnemonic());
break;
@@ -182,9 +182,9 @@ public class DeviceNameElementUtil {
// populate return element for device structure
switch (levelDeviceStructure) {
case 3: {
- DeviceType deviceType = holderIRepositories.getDeviceTypeRepository().findLatestByUuid(name.getDeviceTypeUuid().toString());
- DeviceGroup deviceGroup = holderIRepositories.getDeviceGroupRepository().findLatestByUuid(deviceType.getParentUuid().toString());
- Discipline discipline = holderIRepositories.getDisciplineRepository().findLatestByUuid(deviceGroup.getParentUuid().toString());
+ DeviceType deviceType = holderIRepositories.deviceTypeRepository().findLatestByUuid(name.getDeviceTypeUuid().toString());
+ DeviceGroup deviceGroup = holderIRepositories.deviceGroupRepository().findLatestByUuid(deviceType.getParentUuid().toString());
+ Discipline discipline = holderIRepositories.disciplineRepository().findLatestByUuid(deviceGroup.getParentUuid().toString());
deviceNameElement.setDeviceType(deviceType.getMnemonic());
deviceNameElement.setDiscipline(discipline.getMnemonic());
diff --git a/src/main/java/org/openepics/names/util/old/PartElementUtil.java b/src/main/java/org/openepics/names/util/old/PartElementUtil.java
index a62ad5bf11d024238a01c2ce6f2a3007d056c980..06410f4ce94734491e75442f8684354409aedcb8 100644
--- a/src/main/java/org/openepics/names/util/old/PartElementUtil.java
+++ b/src/main/java/org/openepics/names/util/old/PartElementUtil.java
@@ -84,7 +84,7 @@ public class PartElementUtil {
return null;
}
- SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestByUuid(system.getParentUuid().toString());
+ SystemGroup systemGroup = holderIRepositories.systemGroupRepository().findLatestByUuid(system.getParentUuid().toString());
return new PartElement(
SYSTEM_STRUCTURE,
@@ -109,8 +109,8 @@ public class PartElementUtil {
return null;
}
- System system = holderIRepositories.getSystemRepository().findLatestByUuid(subsystem.getParentUuid().toString());
- SystemGroup systemGroup = holderIRepositories.getSystemGroupRepository().findLatestByUuid(system.getParentUuid().toString());
+ System system = holderIRepositories.systemRepository().findLatestByUuid(subsystem.getParentUuid().toString());
+ SystemGroup systemGroup = holderIRepositories.systemGroupRepository().findLatestByUuid(system.getParentUuid().toString());
return new PartElement(
SYSTEM_STRUCTURE,
@@ -158,8 +158,8 @@ public class PartElementUtil {
return null;
}
- DeviceGroup deviceGroup = holderIRepositories.getDeviceGroupRepository().findLatestByUuid(deviceType.getParentUuid().toString());
- Discipline discipline = holderIRepositories.getDisciplineRepository().findLatestByUuid(deviceGroup.getParentUuid().toString());
+ DeviceGroup deviceGroup = holderIRepositories.deviceGroupRepository().findLatestByUuid(deviceType.getParentUuid().toString());
+ Discipline discipline = holderIRepositories.disciplineRepository().findLatestByUuid(deviceGroup.getParentUuid().toString());
return new PartElement(
DEVICE_STRUCTURE,