Refactor organization statement implementations

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java
index 400ab7f368d06465102b1832ff07ec06e403e7fe..08ee7cf3042e0f618f31fc55e1a9a95ec862686f 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java
@@ -7,15 +7,18 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.organization;
 
+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.OrganizationEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.OrganizationStatement;
-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 OrganizationStatementSupport extends
-        AbstractStatementSupport<String, OrganizationStatement, EffectiveStatement<String, OrganizationStatement>> {
+public final class OrganizationStatementSupport
+        extends BaseStringStatementSupport<OrganizationStatement, OrganizationEffectiveStatement> {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
         YangStmtMapping.ORGANIZATION)
         .build();
@@ -35,20 +38,33 @@ public final class OrganizationStatementSupport extends
     }
 
     @Override
-    public OrganizationStatement createDeclared(
-            final StmtContext<String, OrganizationStatement, ?> ctx) {
-        return new OrganizationStatementImpl(ctx);
+    protected SubstatementValidator getSubstatementValidator() {
+        return SUBSTATEMENT_VALIDATOR;
     }
 
     @Override
-    public EffectiveStatement<String, OrganizationStatement> createEffective(
-            final StmtContext<String, OrganizationStatement,
-            EffectiveStatement<String, OrganizationStatement>> ctx) {
-        return new OrganizationEffectiveStatementImpl(ctx);
+    protected OrganizationStatement createDeclared(final StmtContext<String, OrganizationStatement, ?> ctx,
+            final ImmutableList<? extends DeclaredStatement<?>> substatements) {
+        return new RegularOrganizationStatement(ctx, substatements);
     }
 
     @Override
-    protected SubstatementValidator getSubstatementValidator() {
-        return SUBSTATEMENT_VALIDATOR;
+    protected OrganizationStatement createEmptyDeclared(final StmtContext<String, OrganizationStatement, ?> ctx) {
+        return new EmptyOrganizationStatement(ctx);
+    }
+
+    @Override
+    protected OrganizationEffectiveStatement createEffective(
+            final StmtContext<String, OrganizationStatement, OrganizationEffectiveStatement> ctx,
+            final OrganizationStatement declared,
+            final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        return new RegularOrganizationEffectiveStatement(declared, substatements);
+    }
+
+    @Override
+    protected OrganizationEffectiveStatement createEmptyEffective(
+            final StmtContext<String, OrganizationStatement, OrganizationEffectiveStatement> ctx,
+            final OrganizationStatement declared) {
+        return new EmptyOrganizationEffectiveStatement(declared);
     }
 }
\ No newline at end of file