From 284505d9f66574a694b044137da04c93d1c7b13b Mon Sep 17 00:00:00 2001 From: massifben <105049157+massifben@users.noreply.github.com> Date: Wed, 22 Jan 2025 16:44:13 +0100 Subject: [PATCH] simplify getDaiModStVal Signed-off-by: massifben <105049157+massifben@users.noreply.github.com> --- .../org/lfenergy/compas/sct/commons/LnService.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LnService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LnService.java index 50d55c585..74aef2e46 100644 --- a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LnService.java +++ b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LnService.java @@ -24,6 +24,8 @@ @Slf4j public class LnService implements LnEditor { + private static final DoLinkedToDaFilter DAI_FILTER_MOD_STVAL = DoLinkedToDaFilter.from(MOD_DO_NAME, STVAL_DA_NAME); + public Stream getAnylns(TLDevice tlDevice) { return Stream.concat(Stream.of(tlDevice.getLN0()), tlDevice.getLN().stream()); } @@ -73,15 +75,7 @@ public Optional getDaiModStValValue(TAnyLN tAnyLN) { } public Optional getDaiModStVal(TAnyLN tAnyLN) { - return tAnyLN - .getDOI() - .stream() - .filter(tdoi -> MOD_DO_NAME.equals(tdoi.getName())) - .flatMap(tdoi -> tdoi.getSDIOrDAI().stream()) - .filter(TDAI.class::isInstance) - .map(TDAI.class::cast) - .filter(tdai -> STVAL_DA_NAME.equals(tdai.getName())) - .findFirst(); + return getDOAndDAInstances(tAnyLN, DAI_FILTER_MOD_STVAL); } public Stream getActiveLns(TLDevice tlDevice) {