diff --git a/src/main/java/org/openepics/names/util/StructureElementUtil.java b/src/main/java/org/openepics/names/util/StructureElementUtil.java index 9d5c87515acaa42051b56ccd4c5bd3b13c2df368..d18a09fcf08fe3d28dba2ea512979e734ae123a3 100644 --- a/src/main/java/org/openepics/names/util/StructureElementUtil.java +++ b/src/main/java/org/openepics/names/util/StructureElementUtil.java @@ -60,7 +60,7 @@ public class StructureElementUtil { * @param holderSystemDeviceStructure holder of containers for system and device structure content * @param structureChoice whether to consider content from structure perspective or history perspective. * Structure perspective gives one StructureElement object (processed). - * History perspective gives two StructureElement objects (processed, requested). + * History perspective gives two StructureElement objects (requested, processed). * If choice not given then default as structure perspective (processed). * @return list of structure elements */ @@ -68,14 +68,14 @@ public class StructureElementUtil { List<StructureElement> structureElements = Lists.newArrayList(); for (SystemGroup systemGroup : systemGroups) { // one or two return elements - // processed != null and processed != requested (> 1s difference) --> two entries (processed, requested) + // processed != null and processed != requested (> 1s difference) --> two entries (requested, processed) // processed != null and processed == requested (<= 1s difference) --> one entry (processed initial) // processed == null --> one entry (requested) if (StructureChoice.HISTORY.equals(structureChoice)) { if (systemGroup.getProcessed() != null && ((systemGroup.getProcessed().getTime() - systemGroup.getRequested().getTime()) > THOUSAND_MILLISECONDS)) { - structureElements.add(getStructureElementProcessed(systemGroup, holderSystemDeviceStructure)); structureElements.add(getStructureElementRequested(systemGroup, holderSystemDeviceStructure)); + structureElements.add(getStructureElementProcessed(systemGroup, holderSystemDeviceStructure)); } else if (systemGroup.getProcessed() != null && ((systemGroup.getProcessed().getTime() - systemGroup.getRequested().getTime()) <= THOUSAND_MILLISECONDS)) { structureElements.add(getStructureElementProcessed(systemGroup, holderSystemDeviceStructure)); } else { @@ -96,20 +96,24 @@ public class StructureElementUtil { * * @param systems systems * @param holderSystemDeviceStructure holder of containers for system and device structure content + * @param structureChoice whether to consider content from structure perspective or history perspective. + * Structure perspective gives one StructureElement object (processed). + * History perspective gives two StructureElement objects (requested, processed). + * If choice not given then default as structure perspective (processed). * @return list of structure elements */ public static List<StructureElement> getStructureElementsForSystems(List<System> systems, HolderSystemDeviceStructure holderSystemDeviceStructure, StructureChoice structureChoice) { List<StructureElement> structureElements = Lists.newArrayList(); for (System system : systems) { // one or two return elements - // processed != null and processed != requested (> 1s difference) --> two entries (processed, requested) + // processed != null and processed != requested (> 1s difference) --> two entries (requested, processed) // processed != null and processed == requested (<= 1s difference) --> one entry (processed initial) // processed == null --> one entry (requested) if (StructureChoice.HISTORY.equals(structureChoice)) { if (system.getProcessed() != null && ((system.getProcessed().getTime() - system.getRequested().getTime()) > THOUSAND_MILLISECONDS)) { - structureElements.add(getStructureElementProcessed(system, holderSystemDeviceStructure)); structureElements.add(getStructureElementRequested(system, holderSystemDeviceStructure)); + structureElements.add(getStructureElementProcessed(system, holderSystemDeviceStructure)); } else if (system.getProcessed() != null && ((system.getProcessed().getTime() - system.getRequested().getTime()) <= THOUSAND_MILLISECONDS)) { structureElements.add(getStructureElementProcessed(system, holderSystemDeviceStructure)); } else { @@ -130,20 +134,24 @@ public class StructureElementUtil { * * @param subsystems subsystems * @param holderSystemDeviceStructure holder of containers for system and device structure content + * @param structureChoice whether to consider content from structure perspective or history perspective. + * Structure perspective gives one StructureElement object (processed). + * History perspective gives two StructureElement objects (requested, processed). + * If choice not given then default as structure perspective (processed). * @return list of structure elements */ public static List<StructureElement> getStructureElementsForSubsystems(List<Subsystem> subsystems, HolderSystemDeviceStructure holderSystemDeviceStructure, StructureChoice structureChoice) { List<StructureElement> structureElements = Lists.newArrayList(); for (Subsystem subsystem : subsystems) { // one or two return elements - // processed != null and processed != requested (> 1s difference) --> two entries (processed, requested) + // processed != null and processed != requested (> 1s difference) --> two entries (requested, processed) // processed != null and processed == requested (<= 1s difference) --> one entry (processed initial) // processed == null --> one entry (requested) if (StructureChoice.HISTORY.equals(structureChoice)) { if (subsystem.getProcessed() != null && ((subsystem.getProcessed().getTime() - subsystem.getRequested().getTime()) > THOUSAND_MILLISECONDS)) { - structureElements.add(getStructureElementProcessed(subsystem, holderSystemDeviceStructure)); structureElements.add(getStructureElementRequested(subsystem, holderSystemDeviceStructure)); + structureElements.add(getStructureElementProcessed(subsystem, holderSystemDeviceStructure)); } else if (subsystem.getProcessed() != null && ((subsystem.getProcessed().getTime() - subsystem.getRequested().getTime()) <= THOUSAND_MILLISECONDS)) { structureElements.add(getStructureElementProcessed(subsystem, holderSystemDeviceStructure)); } else { @@ -165,20 +173,24 @@ public class StructureElementUtil { * * @param disciplines disciplines * @param holderSystemDeviceStructure holder of containers for system and device structure content + * @param structureChoice whether to consider content from structure perspective or history perspective. + * Structure perspective gives one StructureElement object (processed). + * History perspective gives two StructureElement objects (requested, processed). + * If choice not given then default as structure perspective (processed). * @return list of structure elements */ public static List<StructureElement> getStructureElementsForDisciplines(List<Discipline> disciplines, HolderSystemDeviceStructure holderSystemDeviceStructure, StructureChoice structureChoice) { List<StructureElement> structureElements = Lists.newArrayList(); for (Discipline discipline : disciplines) { // one or two return elements - // processed != null and processed != requested (> 1s difference) --> two entries (processed, requested) + // processed != null and processed != requested (> 1s difference) --> two entries (requested, processed) // processed != null and processed == requested (<= 1s difference) --> one entry (processed initial) // processed == null --> one entry (requested) if (StructureChoice.HISTORY.equals(structureChoice)) { if (discipline.getProcessed() != null && ((discipline.getProcessed().getTime() - discipline.getRequested().getTime()) > THOUSAND_MILLISECONDS)) { - structureElements.add(getStructureElementProcessed(discipline, holderSystemDeviceStructure)); structureElements.add(getStructureElementRequested(discipline, holderSystemDeviceStructure)); + structureElements.add(getStructureElementProcessed(discipline, holderSystemDeviceStructure)); } else if (discipline.getProcessed() != null && ((discipline.getProcessed().getTime() - discipline.getRequested().getTime()) <= THOUSAND_MILLISECONDS)) { structureElements.add(getStructureElementProcessed(discipline, holderSystemDeviceStructure)); } else { @@ -199,20 +211,24 @@ public class StructureElementUtil { * * @param deviceGroups device groups * @param holderSystemDeviceStructure holder of containers for system and device structure content + * @param structureChoice whether to consider content from structure perspective or history perspective. + * Structure perspective gives one StructureElement object (processed). + * History perspective gives two StructureElement objects (requested, processed). + * If choice not given then default as structure perspective (processed). * @return list of structure elements */ public static List<StructureElement> getStructureElementsForDeviceGroups(List<DeviceGroup> deviceGroups, HolderSystemDeviceStructure holderSystemDeviceStructure, StructureChoice structureChoice) { List<StructureElement> structureElements = Lists.newArrayList(); for (DeviceGroup deviceGroup : deviceGroups) { // one or two return elements - // processed != null and processed != requested (> 1s difference) --> two entries (processed, requested) + // processed != null and processed != requested (> 1s difference) --> two entries (requested, processed) // processed != null and processed == requested (<= 1s difference) --> one entry (processed initial) // processed == null --> one entry (requested) if (StructureChoice.HISTORY.equals(structureChoice)) { if (deviceGroup.getProcessed() != null && ((deviceGroup.getProcessed().getTime() - deviceGroup.getRequested().getTime()) > THOUSAND_MILLISECONDS)) { - structureElements.add(getStructureElementProcessed(deviceGroup, holderSystemDeviceStructure)); structureElements.add(getStructureElementRequested(deviceGroup, holderSystemDeviceStructure)); + structureElements.add(getStructureElementProcessed(deviceGroup, holderSystemDeviceStructure)); } else if (deviceGroup.getProcessed() != null && ((deviceGroup.getProcessed().getTime() - deviceGroup.getRequested().getTime()) <= THOUSAND_MILLISECONDS)) { structureElements.add(getStructureElementProcessed(deviceGroup, holderSystemDeviceStructure)); } else { @@ -233,20 +249,24 @@ public class StructureElementUtil { * * @param deviceTypes device types * @param holderSystemDeviceStructure holder of containers for system and device structure content + * @param structureChoice whether to consider content from structure perspective or history perspective. + * Structure perspective gives one StructureElement object (processed). + * History perspective gives two StructureElement objects (requested, processed). + * If choice not given then default as structure perspective (processed). * @return list of structure elements */ public static List<StructureElement> getStructureElementsForDeviceTypes(List<DeviceType> deviceTypes, HolderSystemDeviceStructure holderSystemDeviceStructure, StructureChoice structureChoice) { List<StructureElement> structureElements = Lists.newArrayList(); for (DeviceType deviceType : deviceTypes) { // one or two return elements - // processed != null and processed != requested (> 1s difference) --> two entries (processed, requested) + // processed != null and processed != requested (> 1s difference) --> two entries (requested, processed) // processed != null and processed == requested (<= 1s difference) --> one entry (processed initial) // processed == null --> one entry (requested) if (StructureChoice.HISTORY.equals(structureChoice)) { if (deviceType.getProcessed() != null && ((deviceType.getProcessed().getTime() - deviceType.getRequested().getTime()) > THOUSAND_MILLISECONDS)) { - structureElements.add(getStructureElementProcessed(deviceType, holderSystemDeviceStructure)); structureElements.add(getStructureElementRequested(deviceType, holderSystemDeviceStructure)); + structureElements.add(getStructureElementProcessed(deviceType, holderSystemDeviceStructure)); } else if (deviceType.getProcessed() != null && ((deviceType.getProcessed().getTime() - deviceType.getRequested().getTime()) <= THOUSAND_MILLISECONDS)) { structureElements.add(getStructureElementProcessed(deviceType, holderSystemDeviceStructure)); } else { @@ -264,13 +284,13 @@ public class StructureElementUtil { } /** - * Populate and return structure element for system group with focus on processed. + * Populate and return structure element for system group with focus on requested. * * @param systemGroup system group * @param holderSystemDeviceStructure holder of containers for system and device structure content * @return structure element */ - public static StructureElement getStructureElementProcessed(SystemGroup systemGroup, HolderSystemDeviceStructure holderSystemDeviceStructure) { + public static StructureElement getStructureElementRequested(SystemGroup systemGroup, HolderSystemDeviceStructure holderSystemDeviceStructure) { if (systemGroup == null) { return null; } @@ -282,17 +302,17 @@ public class StructureElementUtil { systemGroup.getUuid(), null, systemGroup.getName(), systemGroup.getMnemonic(), mnemonicpath, 1, - systemGroup.getDescription(), systemGroup.getStatus(), systemGroup.isLatest(), systemGroup.isDeleted(), - systemGroup.getProcessed(), systemGroup.getProcessedBy(), systemGroup.getProcessedComment()); + systemGroup.getDescription(), Status.PENDING, Boolean.FALSE, systemGroup.isDeleted(), + systemGroup.getRequested(), systemGroup.getRequestedBy(), systemGroup.getRequestedComment()); } /** - * Populate and return structure element for system group with focus on requested. + * Populate and return structure element for system group with focus on processed. * * @param systemGroup system group * @param holderSystemDeviceStructure holder of containers for system and device structure content * @return structure element */ - public static StructureElement getStructureElementRequested(SystemGroup systemGroup, HolderSystemDeviceStructure holderSystemDeviceStructure) { + public static StructureElement getStructureElementProcessed(SystemGroup systemGroup, HolderSystemDeviceStructure holderSystemDeviceStructure) { if (systemGroup == null) { return null; } @@ -304,17 +324,17 @@ public class StructureElementUtil { systemGroup.getUuid(), null, systemGroup.getName(), systemGroup.getMnemonic(), mnemonicpath, 1, - systemGroup.getDescription(), Status.PENDING, Boolean.FALSE, systemGroup.isDeleted(), - systemGroup.getRequested(), systemGroup.getRequestedBy(), systemGroup.getRequestedComment()); + systemGroup.getDescription(), systemGroup.getStatus(), systemGroup.isLatest(), systemGroup.isDeleted(), + systemGroup.getProcessed(), systemGroup.getProcessedBy(), systemGroup.getProcessedComment()); } /** - * Populate and return structure element for system with focus on processed. + * Populate and return structure element for system group with focus on requested. * * @param system system * @param holderSystemDeviceStructure holder of containers for system and device structure content * @return structure element */ - public static StructureElement getStructureElementProcessed(System system, HolderSystemDeviceStructure holderSystemDeviceStructure) { + public static StructureElement getStructureElementRequested(System system, HolderSystemDeviceStructure holderSystemDeviceStructure) { if (system == null) { return null; } @@ -326,17 +346,17 @@ public class StructureElementUtil { system.getUuid(), system.getParentUuid(), system.getName(), system.getMnemonic(), mnemonicpath, 2, - system.getDescription(), system.getStatus(), system.isLatest(), system.isDeleted(), - system.getProcessed(), system.getProcessedBy(), system.getProcessedComment()); + system.getDescription(), Status.PENDING, Boolean.FALSE, system.isDeleted(), + system.getRequested(), system.getRequestedBy(), system.getRequestedComment()); } /** - * Populate and return structure element for system group with focus on requested. + * Populate and return structure element for system with focus on processed. * * @param system system * @param holderSystemDeviceStructure holder of containers for system and device structure content * @return structure element */ - public static StructureElement getStructureElementRequested(System system, HolderSystemDeviceStructure holderSystemDeviceStructure) { + public static StructureElement getStructureElementProcessed(System system, HolderSystemDeviceStructure holderSystemDeviceStructure) { if (system == null) { return null; } @@ -348,17 +368,17 @@ public class StructureElementUtil { system.getUuid(), system.getParentUuid(), system.getName(), system.getMnemonic(), mnemonicpath, 2, - system.getDescription(), Status.PENDING, Boolean.FALSE, system.isDeleted(), - system.getRequested(), system.getRequestedBy(), system.getRequestedComment()); + system.getDescription(), system.getStatus(), system.isLatest(), system.isDeleted(), + system.getProcessed(), system.getProcessedBy(), system.getProcessedComment()); } /** - * Populate and return structure element for subsystem with focus on processed. + * Populate and return structure element for subsystem with focus on requested. * * @param subsystem subsystem * @param holderSystemDeviceStructure holder of containers for system and device structure content * @return structure element */ - public static StructureElement getStructureElementProcessed(Subsystem subsystem, HolderSystemDeviceStructure holderSystemDeviceStructure) { + public static StructureElement getStructureElementRequested(Subsystem subsystem, HolderSystemDeviceStructure holderSystemDeviceStructure) { if (subsystem == null) { return null; } @@ -370,17 +390,17 @@ public class StructureElementUtil { subsystem.getUuid(), subsystem.getParentUuid(), subsystem.getName(), subsystem.getMnemonic(), mnemonicpath, 3, - subsystem.getDescription(), subsystem.getStatus(), subsystem.isLatest(), subsystem.isDeleted(), - subsystem.getProcessed(), subsystem.getProcessedBy(), subsystem.getProcessedComment()); + subsystem.getDescription(), Status.PENDING, Boolean.FALSE, subsystem.isDeleted(), + subsystem.getRequested(), subsystem.getRequestedBy(), subsystem.getRequestedComment()); } /** - * Populate and return structure element for subsystem with focus on requested. + * Populate and return structure element for subsystem with focus on processed. * * @param subsystem subsystem * @param holderSystemDeviceStructure holder of containers for system and device structure content * @return structure element */ - public static StructureElement getStructureElementRequested(Subsystem subsystem, HolderSystemDeviceStructure holderSystemDeviceStructure) { + public static StructureElement getStructureElementProcessed(Subsystem subsystem, HolderSystemDeviceStructure holderSystemDeviceStructure) { if (subsystem == null) { return null; } @@ -392,18 +412,18 @@ public class StructureElementUtil { subsystem.getUuid(), subsystem.getParentUuid(), subsystem.getName(), subsystem.getMnemonic(), mnemonicpath, 3, - subsystem.getDescription(), Status.PENDING, Boolean.FALSE, subsystem.isDeleted(), - subsystem.getRequested(), subsystem.getRequestedBy(), subsystem.getRequestedComment()); + subsystem.getDescription(), subsystem.getStatus(), subsystem.isLatest(), subsystem.isDeleted(), + subsystem.getProcessed(), subsystem.getProcessedBy(), subsystem.getProcessedComment()); } /** - * Populate and return structure element for discipline with focus on processed. + * Populate and return structure element for discipline with focus on requested. * * @param discipline discipline * @param holderSystemDeviceStructure holder of containers for system and device structure content * @return structure element */ - public static StructureElement getStructureElementProcessed(Discipline discipline, HolderSystemDeviceStructure holderSystemDeviceStructure) { + public static StructureElement getStructureElementRequested(Discipline discipline, HolderSystemDeviceStructure holderSystemDeviceStructure) { if (discipline == null) { return null; } @@ -415,17 +435,17 @@ public class StructureElementUtil { discipline.getUuid(), null, discipline.getName(), discipline.getMnemonic(), mnemonicpath, 1, - discipline.getDescription(), discipline.getStatus(), discipline.isLatest(), discipline.isDeleted(), - discipline.getProcessed(), discipline.getProcessedBy(), discipline.getProcessedComment()); + discipline.getDescription(), Status.PENDING, Boolean.FALSE, discipline.isDeleted(), + discipline.getRequested(), discipline.getRequestedBy(), discipline.getRequestedComment()); } /** - * Populate and return structure element for discipline with focus on requested. + * Populate and return structure element for discipline with focus on processed. * * @param discipline discipline * @param holderSystemDeviceStructure holder of containers for system and device structure content * @return structure element */ - public static StructureElement getStructureElementRequested(Discipline discipline, HolderSystemDeviceStructure holderSystemDeviceStructure) { + public static StructureElement getStructureElementProcessed(Discipline discipline, HolderSystemDeviceStructure holderSystemDeviceStructure) { if (discipline == null) { return null; } @@ -437,17 +457,17 @@ public class StructureElementUtil { discipline.getUuid(), null, discipline.getName(), discipline.getMnemonic(), mnemonicpath, 1, - discipline.getDescription(), Status.PENDING, Boolean.FALSE, discipline.isDeleted(), - discipline.getRequested(), discipline.getRequestedBy(), discipline.getRequestedComment()); + discipline.getDescription(), discipline.getStatus(), discipline.isLatest(), discipline.isDeleted(), + discipline.getProcessed(), discipline.getProcessedBy(), discipline.getProcessedComment()); } /** - * Populate and return structure element for device group with focus on processed. + * Populate and return structure element for device group with focus on requested. * * @param deviceGroup device group * @param holderSystemDeviceStructure holder of containers for system and device structure content * @return structure element */ - public static StructureElement getStructureElementProcessed(DeviceGroup deviceGroup, HolderSystemDeviceStructure holderSystemDeviceStructure) { + public static StructureElement getStructureElementRequested(DeviceGroup deviceGroup, HolderSystemDeviceStructure holderSystemDeviceStructure) { if (deviceGroup == null) { return null; } @@ -459,17 +479,17 @@ public class StructureElementUtil { deviceGroup.getUuid(), deviceGroup.getParentUuid(), deviceGroup.getName(), deviceGroup.getMnemonic(), mnemonicpath, 2, - deviceGroup.getDescription(), deviceGroup.getStatus(), deviceGroup.isLatest(), deviceGroup.isDeleted(), - deviceGroup.getProcessed(), deviceGroup.getProcessedBy(), deviceGroup.getProcessedComment()); + deviceGroup.getDescription(), Status.PENDING, Boolean.FALSE, deviceGroup.isDeleted(), + deviceGroup.getRequested(), deviceGroup.getRequestedBy(), deviceGroup.getRequestedComment()); } /** - * Populate and return structure element for device group with focus on requested. + * Populate and return structure element for device group with focus on processed. * * @param deviceGroup device group * @param holderSystemDeviceStructure holder of containers for system and device structure content * @return structure element */ - public static StructureElement getStructureElementRequested(DeviceGroup deviceGroup, HolderSystemDeviceStructure holderSystemDeviceStructure) { + public static StructureElement getStructureElementProcessed(DeviceGroup deviceGroup, HolderSystemDeviceStructure holderSystemDeviceStructure) { if (deviceGroup == null) { return null; } @@ -481,17 +501,17 @@ public class StructureElementUtil { deviceGroup.getUuid(), deviceGroup.getParentUuid(), deviceGroup.getName(), deviceGroup.getMnemonic(), mnemonicpath, 2, - deviceGroup.getDescription(), Status.PENDING, Boolean.FALSE, deviceGroup.isDeleted(), - deviceGroup.getRequested(), deviceGroup.getRequestedBy(), deviceGroup.getRequestedComment()); + deviceGroup.getDescription(), deviceGroup.getStatus(), deviceGroup.isLatest(), deviceGroup.isDeleted(), + deviceGroup.getProcessed(), deviceGroup.getProcessedBy(), deviceGroup.getProcessedComment()); } /** - * Populate and return structure element for device type with focus on processed. + * Populate and return structure element for device type with focus on requested. * * @param deviceType device type * @param holderSystemDeviceStructure holder of containers for system and device structure content - * @return structure element + * @return structure element */ - public static StructureElement getStructureElementProcessed(DeviceType deviceType, HolderSystemDeviceStructure holderSystemDeviceStructure) { + public static StructureElement getStructureElementRequested(DeviceType deviceType, HolderSystemDeviceStructure holderSystemDeviceStructure) { if (deviceType == null) { return null; } @@ -503,17 +523,17 @@ public class StructureElementUtil { deviceType.getUuid(), deviceType.getParentUuid(), deviceType.getName(), deviceType.getMnemonic(), mnemonicpath, 3, - deviceType.getDescription(), deviceType.getStatus(), deviceType.isLatest(), deviceType.isDeleted(), - deviceType.getProcessed(), deviceType.getProcessedBy(), deviceType.getProcessedComment()); + deviceType.getDescription(), Status.PENDING, Boolean.FALSE, deviceType.isDeleted(), + deviceType.getRequested(), deviceType.getRequestedBy(), deviceType.getRequestedComment()); } /** - * Populate and return structure element for device type with focus on requested. + * Populate and return structure element for device type with focus on processed. * * @param deviceType device type * @param holderSystemDeviceStructure holder of containers for system and device structure content - * @return structure element + * @return structure element */ - public static StructureElement getStructureElementRequested(DeviceType deviceType, HolderSystemDeviceStructure holderSystemDeviceStructure) { + public static StructureElement getStructureElementProcessed(DeviceType deviceType, HolderSystemDeviceStructure holderSystemDeviceStructure) { if (deviceType == null) { return null; } @@ -525,8 +545,8 @@ public class StructureElementUtil { deviceType.getUuid(), deviceType.getParentUuid(), deviceType.getName(), deviceType.getMnemonic(), mnemonicpath, 3, - deviceType.getDescription(), Status.PENDING, Boolean.FALSE, deviceType.isDeleted(), - deviceType.getRequested(), deviceType.getRequestedBy(), deviceType.getRequestedComment()); + deviceType.getDescription(), deviceType.getStatus(), deviceType.isLatest(), deviceType.isDeleted(), + deviceType.getProcessed(), deviceType.getProcessedBy(), deviceType.getProcessedComment()); } /**