WIP

Initial design for checking presence conditions

fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/META-INF/MANIFEST.MF

@@ -22,4 +22,5 @@ Require-Bundle: org.eclipse.core.runtime,
  fr.centralesupelec.edf.riseclipse.iec61850.nsd,
  fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit,
  fr.centralesupelec.edf.riseclipse.iec61850.nsd.utilities,
- org.eclipse.ocl.xtext.oclinecore
+ org.eclipse.ocl.xtext.oclinecore,
+ org.apache.commons.lang3

fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/LNodeTypeValidator.java

@@ -18,156 +18,29 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.nsd;
 
-import java.util.HashMap;
-import java.util.HashSet;
-
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AbstractLNClass;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.DataObject;
-import fr.centralesupelec.edf.riseclipse.iec61850.nsd.LNClass;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AnyLNClass;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.DO;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.LNodeType;
-import fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.RiseClipseValidatorSCL;
 import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseConsole;
 
 public class LNodeTypeValidator {
 
-    private String lnClassName;
-    private HashMap< String, DataObject > dataObjectMap;
-    private HashMap< String, DOValidator > doValidatorMap;
-
-    public LNodeTypeValidator( LNClass lnClass ) {
-        this.lnClassName = lnClass.getName();
-        this.dataObjectMap = new HashMap<>(); // link between DOI (name) and its respective DataObject
-        this.doValidatorMap = new HashMap<>(); // link between CDC (name) and its respective DOIValidator
-        
-        generateValidators( lnClass );
-
-        // LNClass hierarchy taken into account
-        AbstractLNClass parent = lnClass.getRefersToAbstractLNClass();
-        while( parent != null ) {
-            generateValidators( parent );
-            parent = parent.getRefersToAbstractLNClass();
-        }
-
-    }
+    private PresenceConditionValidator presenceConditionValidator;
 
-    private void generateValidators( AnyLNClass lnClass ) {
-        for( DataObject dObj : lnClass.getDataObject() ) {
-            dataObjectMap.put( dObj.getName(), dObj );
-            if( dObj.getRefersToCDC() != null ) {
-                if( ! doValidatorMap.containsKey( dObj.getRefersToCDC().getName() )) {
-                    doValidatorMap.put( dObj.getRefersToCDC().getName(), new DOValidator( dObj.getRefersToCDC() ));
-                }
-            }
-        }
+    public LNodeTypeValidator( AnyLNClass lnClass ) {
+        presenceConditionValidator = PresenceConditionValidator.get( lnClass );
     }
 
     public boolean validateLNodeType( LNodeType lNodeType, DiagnosticChain diagnostics ) {
         AbstractRiseClipseConsole.getConsole().verbose( "[NSD] validateLNodeType( " + lNodeType.getId() + " )" );
-        boolean res = true;
-
-        HashSet< String > checkedDO = new HashSet<>();
-
+        presenceConditionValidator.reset();
         for( DO do_ : lNodeType.getDO() ) {
-            AbstractRiseClipseConsole.getConsole().verbose( "[NSD] validateDO( " + do_.getName() + " )" );
-
-            // Test if DOI is a possible DOI in this LN
-            if( ! dataObjectMap.containsKey( do_.getName() ) ) {
-                diagnostics.add( new BasicDiagnostic(
-                        Diagnostic.ERROR,
-                        RiseClipseValidatorSCL.DIAGNOSTIC_SOURCE,
-                        0,
-                        "[NSD] DO " + do_.getName() + " in LN at line " + lNodeType.getLineNumber() + " not found in LNClass " + lNodeType.getLnClass(),
-                        new Object[] { lNodeType } ));
-                continue;
-            }
-
-            // Control of DOI presence in LN  
-            updateCompulsory( do_, checkedDO, diagnostics );
-
-            // Validation of DOI content
-            if( ! validateDO( do_, diagnostics ) ) {
-                res = false;
-            }
-
-        }
-
-        // Verify all necessary DOI were present
-        if( ! dataObjectMap.values().stream()
-                .map( x -> checkCompulsory( lNodeType, x, checkedDO, diagnostics ))
-                .reduce( ( a, b ) -> a && b ).get() ) {
-            diagnostics.add( new BasicDiagnostic(
-                    Diagnostic.ERROR,
-                    RiseClipseValidatorSCL.DIAGNOSTIC_SOURCE,
-                    0,
-                    "[NSD] LNodeType at line " + lNodeType.getLineNumber() + " does not contain all mandatory DO from class " + lNodeType.getLnClass(),
-                    new Object[] { lNodeType } ));
-            res = false;
-        }
-        return res;
-    }
-
-    private boolean checkCompulsory( LNodeType lNodeType, DataObject dataObject, HashSet< String > checkedDO, DiagnosticChain diagnostics ) {
-        switch( dataObject.getPresCond() ) {
-        case "M":
-            if( ! checkedDO.contains( dataObject.getName() ) ) {
-                diagnostics.add( new BasicDiagnostic(
-                        Diagnostic.ERROR,
-                        RiseClipseValidatorSCL.DIAGNOSTIC_SOURCE,
-                        0,
-                        "[NSD] DO " + dataObject.getName() + " is missing in LN at line " + lNodeType.getLineNumber(),
-                        new Object[] { lNodeType } ));
-                return false;
-            }
-            break;
-        default:
-            AbstractRiseClipseConsole.getConsole().info( "NOT IMPLEMENTED: AnyLNValidator.checkCompulsory( " + dataObject.getPresCond() + " )" );
-            break;
+            presenceConditionValidator.addDO( do_, diagnostics );
         }
-        return true;
-    }
-
-    private boolean updateCompulsory( DO do_, HashSet< String > checkedDO, DiagnosticChain diagnostics ) {
-        switch( dataObjectMap.get( do_.getName() ).getPresCond() ) {
-        case "M":
-        case "O":
-            if( checkedDO.contains( do_.getName() )) {
-                diagnostics.add( new BasicDiagnostic(
-                        Diagnostic.ERROR,
-                        RiseClipseValidatorSCL.DIAGNOSTIC_SOURCE,
-                        0,
-                        "[NSD] DO " + do_ + " cannot appear more than once in LN at line " + do_.getParentLNodeType().getLineNumber(),
-                        new Object[] { do_ } ));
-                return false;
-            }
-            checkedDO.add( do_.getName() );
-            break;
-        case "F":
-            diagnostics.add( new BasicDiagnostic(
-                    Diagnostic.ERROR,
-                    RiseClipseValidatorSCL.DIAGNOSTIC_SOURCE,
-                    0,
-                    "[NSD] DO " + do_ + " is forbidden in LN at line " + do_.getParentLNodeType().getLineNumber(),
-                    new Object[] { do_ } ));
-            return false;
-        default:
-            AbstractRiseClipseConsole.getConsole().info( "NOT IMPLEMENTED: AnyLNValidator.updateCompulsory( " + dataObjectMap.get( do_.getName() ).getPresCond() + " )" );
-            break;
-        }
-        return true;
-    }
-
-    private boolean validateDO( DO do_, DiagnosticChain diagnostics ) {
-        AbstractRiseClipseConsole.getConsole().verbose( "[NSD] found DO " + do_.getName() + " in LNClass " + lnClassName );
-
-        // DOIValidator validates DOI content
-        String cdc = dataObjectMap.get( do_.getName() ).getRefersToCDC().getName();
-        return doValidatorMap.get( cdc ).validateDO( do_, diagnostics );
+      
+        return presenceConditionValidator.validate( lNodeType, diagnostics );
     }
 
 }

fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/NsdEObjectValidator.java

@@ -90,7 +90,7 @@ public class NsdEObjectValidator implements EValidator {
 
             @Override
             public Boolean caseAnyLN( AnyLN anyLN ) {
-                return validateAnyLN( anyLN, diagnostics );
+                return true;//validateAnyLN( anyLN, diagnostics );
             }
 
             @Override