Address a bunch of codacity complaints about genie

Mostly removing never used features Signed-off-by: Tom Flynn <tom.flynn@gmail.com>
noironetworks · Aug 13, 2020 · a525ca3 · a525ca3
1 parent e61683c
commit a525ca3
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 382 deletions.
diff --git a/genie/MODEL/SYNTAX/member/member-validate.meta b/genie/MODEL/SYNTAX/member/member-validate.meta
diff --git a/genie/MODEL/SYNTAX/type/primitive-validate.meta b/genie/MODEL/SYNTAX/type/primitive-validate.meta
diff --git a/genie/MODEL/SYNTAX/type/type-validate.meta b/genie/MODEL/SYNTAX/type/type-validate.meta
diff --git a/genie/MODEL/TEST2/type-test.testmdl b/genie/MODEL/TEST2/type-test.testmdl
@@ -31,29 +31,6 @@ module[testo]
 
         const[crazy; value=777]
 
-        validate[crazy]
-        {
-            range[default;
-                  min="222";
-                  max="33";
-                  size="12"]
-
-            content[default;
-                    regex=jhjdshjasd&63636
-                    ]
-        }
-
-        validate[supah]
-        {
-            range[default;
-                  min="222";
-                  max="33";
-                  size="12"]
-
-            content[default;
-                    regex=jhjdshjasd&63636
-                    ]
-        }
     }
 
     type[derint; super=scalar/int]
@@ -74,38 +51,6 @@ module[testo]
                 target=someconst
                 ]
 
-        clobber-validate[default]
-        {
-
-            range[blah;
-                  min="222";
-                  max="33";
-                  size="12"]
-
-            content[blah;
-                    regex=jhjdshjasd&63636
-                    ]
-        }
-
-        validate[supah]
-        {
-
-            range[blah;
-                  min="222";
-                  max="33";
-                  size="12"]
-
-            range[blahblah;
-                  min="333";
-                  max="44";
-                  size="32"]
-
-            content[blah;
-                    regex=poshel&63636
-                    ]
-
-
-        }
     }
 }
 

diff --git a/...src/main/java/org/opendaylight/opflex/genie/content/model/mvalidation/ValidatorScope.java b/...src/main/java/org/opendaylight/opflex/genie/content/model/mvalidation/ValidatorScope.java
diff --git a/genie/src/main/java/org/opendaylight/opflex/genie/content/parse/pconst/PConstNode.java b/genie/src/main/java/org/opendaylight/opflex/genie/content/parse/pconst/PConstNode.java
@@ -4,7 +4,6 @@
 import org.opendaylight.opflex.genie.engine.model.Item;
 import org.opendaylight.opflex.genie.engine.model.Pair;
 import org.opendaylight.opflex.genie.engine.parse.model.ParseNode;
-import org.opendaylight.opflex.genie.engine.parse.model.ProcessorNode;
 import org.opendaylight.opflex.genie.engine.parse.modlan.Node;
 import org.opendaylight.opflex.genie.engine.parse.modlan.ParseDirective;
 import org.opendaylight.opflex.modlan.utils.Strings;
@@ -24,12 +23,6 @@ public PConstNode(String aInName)
         action = ConstAction.get(aInName);
     }
 
-    protected void addParent(ProcessorNode aInParent)
-    {
-        super.addParent(aInParent);
-        ConstScope scope = ConstScope.get(aInParent.getName());
-    }
-
     public Pair<ParseDirective,Item> beginCB(Node aInData, Item aInParentItem)
     {
         String lName = (action == ConstAction.DEFAULT) ?

diff --git a/genie/src/main/java/org/opendaylight/opflex/genie/content/parse/pdataowner/PGroupNode.java b/genie/src/main/java/org/opendaylight/opflex/genie/content/parse/pdataowner/PGroupNode.java
@@ -1,10 +1,8 @@
 package org.opendaylight.opflex.genie.content.parse.pdataowner;
 
-import org.opendaylight.opflex.genie.content.model.mownership.DefinitionScope;
 import org.opendaylight.opflex.genie.engine.model.Item;
 import org.opendaylight.opflex.genie.engine.model.Pair;
 import org.opendaylight.opflex.genie.engine.parse.model.ParseNode;
-import org.opendaylight.opflex.genie.engine.parse.model.ProcessorNode;
 import org.opendaylight.opflex.genie.engine.parse.modlan.Node;
 import org.opendaylight.opflex.genie.engine.parse.modlan.ParseDirective;
 
@@ -22,11 +20,4 @@ public Pair<ParseDirective,Item> beginCB(Node aInData, Item aInParentItem)
     {
         return null;
     }
-
-    protected void addParent(ProcessorNode aInParent)
-    {
-        super.addParent(aInParent);
-        DefinitionScope scope = DefinitionScope.get(aInParent.getName());
-    }
-
 }
diff --git a/genie/src/main/java/org/opendaylight/opflex/genie/content/parse/pdataowner/PMemberNode.java b/genie/src/main/java/org/opendaylight/opflex/genie/content/parse/pdataowner/PMemberNode.java
@@ -1,10 +1,8 @@
 package org.opendaylight.opflex.genie.content.parse.pdataowner;
 
-import org.opendaylight.opflex.genie.content.model.mownership.DefinitionScope;
 import org.opendaylight.opflex.genie.engine.model.Item;
 import org.opendaylight.opflex.genie.engine.model.Pair;
 import org.opendaylight.opflex.genie.engine.parse.model.ParseNode;
-import org.opendaylight.opflex.genie.engine.parse.model.ProcessorNode;
 import org.opendaylight.opflex.genie.engine.parse.modlan.Node;
 import org.opendaylight.opflex.genie.engine.parse.modlan.ParseDirective;
 
@@ -22,12 +20,4 @@ public Pair<ParseDirective,Item> beginCB(Node aInData, Item aInParentItem)
     {
         return null;
     }
-
-    protected void addParent(ProcessorNode aInParent)
-    {
-        super.addParent(aInParent);
-        scope = DefinitionScope.get(aInParent.getName());
-    }
-
-    private DefinitionScope scope = null;
 }
diff --git a/genie/src/main/java/org/opendaylight/opflex/genie/content/parse/pdataowner/PModuleNode.java b/genie/src/main/java/org/opendaylight/opflex/genie/content/parse/pdataowner/PModuleNode.java
@@ -1,12 +1,10 @@
 package org.opendaylight.opflex.genie.content.parse.pdataowner;
 
-import org.opendaylight.opflex.genie.content.model.mownership.DefinitionScope;
 import org.opendaylight.opflex.genie.content.model.mownership.MModuleRule;
 import org.opendaylight.opflex.genie.content.model.mownership.MOwner;
 import org.opendaylight.opflex.genie.engine.model.Item;
 import org.opendaylight.opflex.genie.engine.model.Pair;
 import org.opendaylight.opflex.genie.engine.parse.model.ParseNode;
-import org.opendaylight.opflex.genie.engine.parse.model.ProcessorNode;
 import org.opendaylight.opflex.genie.engine.parse.modlan.Node;
 import org.opendaylight.opflex.genie.engine.parse.modlan.ParseDirective;
 import org.opendaylight.opflex.modlan.utils.Strings;
@@ -28,12 +26,4 @@ public Pair<ParseDirective,Item> beginCB(Node aInData, Item aInParentItem)
             new MModuleRule((MOwner) aInParentItem,
                 aInData.getNamedValue(Strings.NAME, Strings.ASTERISK, true)));
     }
-
-    protected void addParent(ProcessorNode aInParent)
-    {
-        super.addParent(aInParent);
-        scope = DefinitionScope.get(aInParent.getName());
-    }
-
-    private DefinitionScope scope = null;
 }
diff --git a/genie/src/main/java/org/opendaylight/opflex/genie/content/parse/pdataowner/POwnerNode.java b/genie/src/main/java/org/opendaylight/opflex/genie/content/parse/pdataowner/POwnerNode.java
@@ -1,11 +1,9 @@
 package org.opendaylight.opflex.genie.content.parse.pdataowner;
 
-import org.opendaylight.opflex.genie.content.model.mownership.DefinitionScope;
 import org.opendaylight.opflex.genie.content.model.mownership.MOwner;
 import org.opendaylight.opflex.genie.engine.model.Item;
 import org.opendaylight.opflex.genie.engine.model.Pair;
 import org.opendaylight.opflex.genie.engine.parse.model.ParseNode;
-import org.opendaylight.opflex.genie.engine.parse.model.ProcessorNode;
 import org.opendaylight.opflex.genie.engine.parse.modlan.Node;
 import org.opendaylight.opflex.genie.engine.parse.modlan.ParseDirective;
 import org.opendaylight.opflex.modlan.utils.Strings;
@@ -26,12 +24,4 @@ public Pair<ParseDirective,Item> beginCB(Node aInData, Item aInParentItem)
             ParseDirective.CONTINUE,
             MOwner.get(aInData.getNamedValue(Strings.NAME, "", true), true));
     }
-
-    protected void addParent(ProcessorNode aInParent)
-    {
-        super.addParent(aInParent);
-        scope = DefinitionScope.get(aInParent.getName());
-    }
-
-    private DefinitionScope scope = null;
 }