fix(181): resolve conflicts between main and develop after rebase and for merge

Signed-off-by: Aliou DIAITE <[email protected]>

Author: AliouDIAITE

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

@@ -65,18 +65,6 @@ protected String elementXPath() {
                 Utils.xpathAttributeFilter("type", currentElem.isSetType() ? currentElem.getType() : null));
     }
 
-    /**
-     * Updates DA Type Name
-     * @param daTypeName DA Type Name to update
-     * @throws ScdException
-     */
-    @Override
-    protected String elementXPath() {
-        return String.format("DA[name=%s and type=%s]",
-                Utils.xpathAttributeFilter("name", currentElem.isSetName() ? currentElem.getName() : null),
-                Utils.xpathAttributeFilter("type", currentElem.isSetType() ? currentElem.getType() : null));
-    }
-
     /**
      * Updates DA Type Name
      * @param daTypeName DA Type Name to update

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

@@ -61,17 +61,6 @@ protected String elementXPath() {
                 Utils.xpathAttributeFilter("type", currentElem.isSetType() ? currentElem.getType() : null));
     }
 
-    /**
-     * Gets linked DataTypeTemplateAdapter as parent
-     * @return <em>DataTypeTemplateAdapter</em> object
-     */
-    @Override
-    protected String elementXPath() {
-        return String.format("DO[%s and %s]",
-                Utils.xpathAttributeFilter("name", currentElem.isSetName() ? currentElem.getName() : null),
-                Utils.xpathAttributeFilter("type", currentElem.isSetType() ? currentElem.getType() : null));
-    }
-
     /**
      * Gets linked DataTypeTemplateAdapter as parent
      * @return <em>DataTypeTemplateAdapter</em> object

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

@@ -79,18 +79,6 @@ protected String elementXPath() {
                 Utils.xpathAttributeFilter("lnClass", currentElem.isSetLnClass() ? currentElem.getLnClass() : null));
     }
 
-    /**
-     * Compares current LNodeType and given LNodeType
-     * @param tlNodeType LNodeType to compare with
-     * @return <em>Boolean</em> value of comparison result
-     */
-    @Override
-    protected String elementXPath() {
-        return String.format("LNodeType[%s and %s]",
-                Utils.xpathAttributeFilter("id", currentElem.isSetId() ? currentElem.getId() : null),
-                Utils.xpathAttributeFilter("lnClass", currentElem.isSetLnClass() ? currentElem.getLnClass() : null));
-    }
-
     /**
      * Compares current LNodeType and given LNodeType
      * @param tlNodeType LNodeType to compare with

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

@@ -63,18 +63,6 @@ protected String elementXPath() {
                 Utils.xpathAttributeFilter("name", currentElem.isSetName() ? currentElem.getName() : null));
     }
 
-    /**
-     * Gets SDI by name from current DOI
-     * @param sName name of SDI to get
-     * @return <em>RootSDIAdapter</em> object
-     * @throws ScdException throws when specified name of SDI not present in current DOI
-     */
-    @Override
-    protected String elementXPath() {
-        return String.format("DOI[%s]",
-                Utils.xpathAttributeFilter("name", currentElem.isSetName() ? currentElem.getName() : null));
-    }
-
     /**
      * Gets SDI by name from current DOI
      * @param sName name of SDI to get

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

@@ -64,18 +64,6 @@ protected String elementXPath() {
                 Utils.xpathAttributeFilter("name", currentElem.isSetName() ? currentElem.getName() : null));
     }
 
-    /**
-     * Gets in current SDI specific SDI by its name
-     * @param sName name of SDI to get
-     * @return <em>SDIAdapter</em> object
-     * @throws ScdException throws when DAI unknown in current SDI
-     */
-    @Override
-    protected String elementXPath() {
-        return String.format("SDI[%s]",
-                Utils.xpathAttributeFilter("name", currentElem.isSetName() ? currentElem.getName() : null));
-    }
-
     /**
      * Gets in current SDI specific SDI by its name
      * @param sName name of SDI to get