suppression des interfaces et quelques retours

Signed-off-by: gleizesDor <115622893+gleizesDor@users.noreply.github.com>
com-pas · Nov 24, 2023 · 1a59232 · 1a59232
1 parent af5e275
commit 1a59232
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 167 deletions.
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/DataSetService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/DataSetService.java
@@ -8,13 +8,12 @@
 import org.lfenergy.compas.scl2007b4.model.TAnyLN;
 import org.lfenergy.compas.scl2007b4.model.TDataSet;
 import org.lfenergy.compas.scl2007b4.model.TLN;
-import org.lfenergy.compas.sct.commons.api.DataSetReader;
 
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-public class DataSetService implements DataSetReader {
+public class DataSetService {
 
     public Stream<TDataSet> getDataSets(TAnyLN tAnyLN) {
         return switch (tAnyLN) {

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/DoService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/DoService.java
@@ -6,13 +6,12 @@
 
 import org.lfenergy.compas.scl2007b4.model.TDO;
 import org.lfenergy.compas.scl2007b4.model.TLNodeType;
-import org.lfenergy.compas.sct.commons.api.DoReader;
 
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-public class DoService implements DoReader {
+public class DoService {
 
     public Stream<TDO> getDos(TLNodeType tlNodeType) {
         return tlNodeType.getDO().stream();

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/DoTypeService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/DoTypeService.java
@@ -6,13 +6,12 @@
 
 import org.lfenergy.compas.scl2007b4.model.TDataTypeTemplates;
 import org.lfenergy.compas.scl2007b4.model.TDOType;
-import org.lfenergy.compas.sct.commons.api.DoTypeReader;
 
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-public class DoTypeService implements DoTypeReader {
+public class DoTypeService {
 
     public Stream<TDOType> getDoTypes(TDataTypeTemplates tDataTypeTemplates) {
         return tDataTypeTemplates.getDOType().stream();

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/IedService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/IedService.java
@@ -6,13 +6,12 @@
 
 import org.lfenergy.compas.scl2007b4.model.SCL;
 import org.lfenergy.compas.scl2007b4.model.TIED;
-import org.lfenergy.compas.sct.commons.api.IedReader;
 
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-public class IedService implements IedReader {
+public class IedService {
 
     public Stream<TIED> getFilteredIeds(SCL scd, Predicate<TIED> iedPredicate) {
         return scd.getIED().stream().filter(iedPredicate);

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LdeviceService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LdeviceService.java
@@ -5,15 +5,14 @@
 package org.lfenergy.compas.sct.commons;
 
 import org.lfenergy.compas.scl2007b4.model.*;
-import org.lfenergy.compas.sct.commons.api.LdeviceReader;
 import org.lfenergy.compas.sct.commons.util.ActiveStatus;
 
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-public class LdeviceService implements LdeviceReader {
+public class LdeviceService {
 
     public Stream<TLDevice> getLdevices(TIED tied) {
         if (!tied.isSetAccessPoint()) {

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
@@ -5,7 +5,6 @@
 package org.lfenergy.compas.sct.commons;
 
 import org.lfenergy.compas.scl2007b4.model.*;
-import org.lfenergy.compas.sct.commons.api.LnReader;
 import org.lfenergy.compas.sct.commons.util.ActiveStatus;
 
 import java.util.Collection;
@@ -15,7 +14,7 @@
 import static org.lfenergy.compas.sct.commons.util.CommonConstants.MOD_DO_NAME;
 import static org.lfenergy.compas.sct.commons.util.CommonConstants.STVAL_DA_NAME;
 
-public class LnService implements LnReader {
+public class LnService {
 
     public Stream<TAnyLN> getAnylns(TLDevice tlDevice) {
         return Stream.concat(Stream.of(tlDevice.getLN0()), tlDevice.getLN().stream());

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LnodeTypeService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LnodeTypeService.java
@@ -6,13 +6,12 @@
 
 import org.lfenergy.compas.scl2007b4.model.TDataTypeTemplates;
 import org.lfenergy.compas.scl2007b4.model.TLNodeType;
-import org.lfenergy.compas.sct.commons.api.LnodeTypeReader;
 
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-public class LnodeTypeService implements LnodeTypeReader {
+public class LnodeTypeService {
 
     public Stream<TLNodeType> getLnodeTypes(TDataTypeTemplates tDataTypeTemplates) {
         return tDataTypeTemplates.getLNodeType().stream();

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/DataSetReader.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/DataSetReader.java
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/DoReader.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/DoReader.java
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/DoTypeReader.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/DoTypeReader.java
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/IedReader.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/IedReader.java
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/LdeviceReader.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/LdeviceReader.java
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/LnReader.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/LnReader.java
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/LnodeTypeReader.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/LnodeTypeReader.java
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/LNodeDTO.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/LNodeDTO.java
@@ -159,7 +159,7 @@ public static LNodeDTO from(TAnyLN tAnyLN, LogicalNodeOptions options, String ie
         };
         String inst = lnKey.getInst();
         String lnClass = lnKey.getLnClass();
-        String prefix = lnKey.getPrefix().orElse("");
+        String prefix = lnKey.getPrefix();
         String lnType = tAnyLN.getLnType();
         LNodeDTO lNodeDTO = new LNodeDTO(inst, lnClass, prefix, lnType);
         if (options.isWithExtRef()) {

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ln/AbstractLNAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ln/AbstractLNAdapter.java
@@ -345,7 +345,6 @@ public Stream<ControlBlock> getControlBlocksByDataSetRef(String dataSetRef, TSer
 
         if (isLN0()) {
             LN0 ln0 = (LN0) currentElem;
-            //GOOSE et SMV
             if (serviceType == null || serviceType == TServiceType.GOOSE) {
                 streamGSEControl = ln0.getGSEControl()
                         .stream()

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ln/LnKey.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ln/LnKey.java
@@ -5,11 +5,10 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
 import org.lfenergy.compas.scl2007b4.model.LN0;
 import org.lfenergy.compas.scl2007b4.model.TLN;
 
-import java.util.Optional;
-
 @Getter
 @EqualsAndHashCode
 public class LnKey {
@@ -18,21 +17,21 @@ public class LnKey {
     @EqualsAndHashCode.Exclude
     private final String lnType;
     private final String lnClass;
-    /** empty pour les LN0 */
-    private final Optional<String> prefix;
+    /** empty for LN0 */
+    private final String prefix;
 
     public LnKey(LN0 ln0) {
         this.inst = ln0.getInst();
         this.lnType = ln0.getLnType();
         this.lnClass = ln0.getLnClass().get(0);
-        this.prefix = Optional.empty();
+        this.prefix = StringUtils.EMPTY;
     }
 
     public LnKey(TLN tln) {
         this.inst = tln.getInst();
         this.lnType = tln.getLnType();
         this.lnClass = tln.getLnClass().get(0);
-        this.prefix = Optional.of(tln.getPrefix());
+        this.prefix = tln.getPrefix();
     }
 }
 
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/util/Utils.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/util/Utils.java
@@ -456,7 +456,7 @@ public static boolean isValidDataTypeTemplate(AbstractLNAdapter<?> lnAdapter,LDE
                 .filter(lNodeTypeAdapter -> {
                     try {
                         lNodeTypeAdapter.checkDoAndDaTypeName(doTypeName, daTypeName);
-                    } catch (Exception ex) {
+                    } catch (ScdException ex) {
                         return false;
                     }
                     return true;