Optimize simple declared statements

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / default_ / DefaultStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java
index 9f1976b9200c72f4cf8148e837703f763058272a..43ad0acf68e38ae641f07db837d012abc982224e 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java
@@ -7,40 +7,62 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.default_;
 
+import com.google.common.collect.ImmutableList;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
+import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.DefaultEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.DefaultStatement;
-import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStringStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 
 public final class DefaultStatementSupport
-        extends AbstractStatementSupport<String, DefaultStatement, EffectiveStatement<String, DefaultStatement>> {
+        extends BaseStringStatementSupport<DefaultStatement, DefaultEffectiveStatement> {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
         YangStmtMapping.DEFAULT).build();
+    private static final DefaultStatementSupport INSTANCE = new DefaultStatementSupport();
 
-    public DefaultStatementSupport() {
+    private DefaultStatementSupport() {
         super(YangStmtMapping.DEFAULT);
     }
 
+    public static DefaultStatementSupport getInstance() {
+        return INSTANCE;
+    }
+
     @Override
     public String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
         return value;
     }
 
     @Override
-    public DefaultStatement createDeclared(final StmtContext<String, DefaultStatement, ?> ctx) {
-        return new DefaultStatementImpl(ctx);
+    protected SubstatementValidator getSubstatementValidator() {
+        return SUBSTATEMENT_VALIDATOR;
     }
 
     @Override
-    public EffectiveStatement<String, DefaultStatement> createEffective(
-            final StmtContext<String, DefaultStatement, EffectiveStatement<String, DefaultStatement>> ctx) {
-        return new DefaultEffectiveStatementImpl(ctx);
+    protected DefaultStatement createDeclared(final StmtContext<String, DefaultStatement, ?> ctx,
+            final ImmutableList<? extends DeclaredStatement<?>> substatements) {
+        return new RegularDefaultStatement(ctx, substatements);
     }
 
     @Override
-    protected SubstatementValidator getSubstatementValidator() {
-        return SUBSTATEMENT_VALIDATOR;
+    protected DefaultStatement createEmptyDeclared(final StmtContext<String, DefaultStatement, ?> ctx) {
+        return new EmptyDefaultStatement(ctx);
+    }
+
+    @Override
+    protected DefaultEffectiveStatement createEffective(
+            final StmtContext<String, DefaultStatement, DefaultEffectiveStatement> ctx,
+            final DefaultStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        return new RegularDefaultEffectiveStatement(declared, substatements);
+    }
+
+    @Override
+    protected DefaultEffectiveStatement createEmptyEffective(
+            final StmtContext<String, DefaultStatement, DefaultEffectiveStatement> ctx,
+            final DefaultStatement declared) {
+        return new EmptyDefaultEffectiveStatement(declared);
     }
 }
\ No newline at end of file