Merge pull request #328 from com-pas/feat/refactor_doiadapter_method_type_to_public

refactor: make methods public

Author: AliouDIAITE

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DOTypeAdapter.java

@@ -252,21 +252,22 @@ public Pair<String,DOTypeAdapter> findPathDoTypeToDA(String daName) throws ScdEx
 
     /**
      * Find path from a SDO to DA (defined by names)
+     *
      * @param sdoName SDO from which find a path
-     * @param daName DA for which find a path to
+     * @param daName  DA for which find a path to
      * @return pair of DO/SDO and DoType. DO/SDO references the DOType
      * @throws ScdException when inconsistency are found in th SCL's
-     *                     DataTypeTemplate (unknown reference for example). Which should normally not happens.
+     *                      DataTypeTemplate (unknown reference for example). Which should normally not happens.
      */
-    Pair<String,DOTypeAdapter> findPathSDOToDA(String sdoName, String daName) throws ScdException {
-        String errMsg = String.format("No coherence or path between DO/SDO(%s) and DA(%s)", sdoName,daName);
+    public Pair<String, DOTypeAdapter> findPathSDOToDA(String sdoName, String daName) throws ScdException {
+        String errMsg = String.format("No coherence or path between DO/SDO(%s) and DA(%s)", sdoName, daName);
         Optional<TSDO> opSdo = getSDOByName(sdoName);
-        if(opSdo.isEmpty()) {
+        if (opSdo.isEmpty()) {
             throw new ScdException(errMsg);
         }
 
         DOTypeAdapter doTypeAdapter = parentAdapter.getDOTypeAdapterById(opSdo.get().getType()).orElse(null);
-        if(doTypeAdapter == null) {
+        if (doTypeAdapter == null) {
             throw new ScdException(errMsg);
         }
         if(doTypeAdapter.containsDAWithDAName(daName)){

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ied/AbstractLNAdapter.java

@@ -731,7 +731,7 @@ public void updateDAI(@NonNull DataAttributeRef dataAttributeRef) throws ScdExce
             return;
         }
 
-        AbstractDAIAdapter<?> daiAdapter = createDoiSdiDaiChainIfNotExists(dataAttributeRef.getDataAttributes(), dataAttributeRef.isUpdatable());
+        AbstractDAIAdapter<?> daiAdapter = (AbstractDAIAdapter<?>) createDoiSdiDaiChainIfNotExists(dataAttributeRef.getDataAttributes(), dataAttributeRef.isUpdatable());
         daiAdapter.update(dataAttributeRef.getDaName().getDaiValues());
     }
 
@@ -752,7 +752,7 @@ public void updateDAI(@NonNull DataAttributeRef dataAttributeRef) throws ScdExce
      * @param setValImportOnCreate when this method creates the DAI, it will set DAI.valImport attribute with this parameter
      * @return adapter for existing DAI or created DAI.
      */
-    private AbstractDAIAdapter<?> createDoiSdiDaiChainIfNotExists(String dataTypeRef, boolean setValImportOnCreate) {
+    public Object createDoiSdiDaiChainIfNotExists(String dataTypeRef, boolean setValImportOnCreate) {
         String[] names = dataTypeRef.split("\\.");
         if (names.length < 2 || Arrays.stream(names).anyMatch(StringUtils::isBlank)) {
             throw new IllegalArgumentException("dataTypeRef must be valid with at least a DO and a DA, but got: " + dataTypeRef);

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/dtt/DOTypeAdapterTest.java

@@ -4,6 +4,7 @@
 
 package org.lfenergy.compas.sct.commons.scl.dtt;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -240,7 +241,29 @@ void getDAByName_should_not_throw_exception(String daName, String fc, String typ
         // Then
         assertThat(result).isNotNull()
                 .extracting(TDA::getName, TDA::getFc, TDA::getType)
-                .containsExactlyInAnyOrder(daName,TFCEnum.fromValue(fc),type);
+                .containsExactlyInAnyOrder(daName, TFCEnum.fromValue(fc), type);
     }
 
+    @Test
+    void findPathSDOToDA_should_return_pair_of_sdo_doType() {
+        // Given
+        DataTypeTemplateAdapter dttAdapter = initDttAdapterFromFile(SCD_DTT_DIFF_CONTENT_SAME_ID);
+        DOTypeAdapter doTypeAdapter = dttAdapter.getDOTypeAdapterById("DO1").get();
+        // When
+        Pair<String, DOTypeAdapter> result = doTypeAdapter.findPathSDOToDA("origin", "origin");
+        //Then
+        assertThat(result.getLeft()).isEqualTo("origin");
+        assertThat(result.getRight().getCurrentElem().getId()).isEqualTo("DO4");
+    }
+
+    @Test
+    void findPathSDOToDA_should_throw_exception() {
+        // Given
+        DataTypeTemplateAdapter dttAdapter = initDttAdapterFromFile(SCD_DTT_DIFF_CONTENT_SAME_ID);
+        DOTypeAdapter doTypeAdapter = dttAdapter.getDOTypeAdapterById("DO2").get();
+        // When Then
+        assertThatCode(() -> doTypeAdapter.findPathSDOToDA("origin", "ctVal"))
+                .isInstanceOf(ScdException.class)
+                .hasMessage("No coherence or path between DOType(DO3) and DA(ctVal)");
+    }
 }

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/ied/LNAdapterTest.java

@@ -4,9 +4,12 @@
 
 package org.lfenergy.compas.sct.commons.scl.ied;
 
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.lfenergy.compas.scl2007b4.model.*;
@@ -867,4 +870,16 @@ private static Stream<Arguments> provideGetTControlsByTypeException() {
         );
     }
 
+    @ParameterizedTest
+    @CsvSource(value = {"ARtgHigh1.d:d", "ARtgHigh1.units.multiplier:multiplier", "Beh.d:d"}, delimiter = ':')
+    void createDoiSdiDaiChainIfNotExists_should_create_dai_if_not_exist(String dataTypeRef, String expected) {
+        // Given
+        SCL scd = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/std.xml");
+        LNAdapter lnAdapter = findLn(scd, "IED4d4fe1a8cda64cf88a5ee4176a1a0eef", "LDSUIED", "LPAI", "1", null);
+        // When
+        AbstractDAIAdapter<?> daiAdapter = (AbstractDAIAdapter<?>) lnAdapter.createDoiSdiDaiChainIfNotExists(dataTypeRef, true);
+        //Then
+        assertThat(daiAdapter.getCurrentElem().getName()).isEqualTo(expected);
+    }
+
 }