Bug 4456 - StackOverflowError on recursive extension definition

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / rfc6020 / SubmoduleStatementImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java
index 19f77ecd0ebac6580b54654a60fe6d3188a1ea8d..803b5e48e0bf6f2f91e57c06c420c543b226b2a4 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java
@@ -10,15 +10,15 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 import static org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils.findFirstDeclaredSubstatement;
 import static org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils.firstAttributeOf;
 
+import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
+
 import java.net.URI;
 import java.util.Date;
-
 import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
 import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.BelongsToStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.RevisionStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.SubmoduleStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionStatement;
 import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleIdentifierImpl;
@@ -29,16 +29,18 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
 import org.opendaylight.yangtools.yang.parser.spi.source.BelongsToPrefixToModuleName;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.SubmoduleEffectiveStatementImpl;
-
 import com.google.common.base.Optional;
 
-public class SubmoduleStatementImpl extends AbstractRootStatement<SubmoduleStatement> implements SubmoduleStatement {
+public class SubmoduleStatementImpl extends
+        AbstractRootStatement<SubmoduleStatement> implements SubmoduleStatement {
 
-    protected SubmoduleStatementImpl(StmtContext<String, SubmoduleStatement, ?> context) {
+    protected SubmoduleStatementImpl(
+            StmtContext<String, SubmoduleStatement, ?> context) {
         super(context);
     }
 
-    public static class Definition extends
+    public static class Definition
+            extends
             AbstractStatementSupport<String, SubmoduleStatement, EffectiveStatement<String, SubmoduleStatement>> {
 
         public Definition() {
@@ -51,7 +53,8 @@ public class SubmoduleStatementImpl extends AbstractRootStatement<SubmoduleState
         }
 
         @Override
-        public SubmoduleStatement createDeclared(StmtContext<String, SubmoduleStatement, ?> ctx) {
+        public SubmoduleStatement createDeclared(
+                StmtContext<String, SubmoduleStatement, ?> ctx) {
             return new SubmoduleStatementImpl(ctx);
         }
 
@@ -66,26 +69,32 @@ public class SubmoduleStatementImpl extends AbstractRootStatement<SubmoduleState
                 Mutable<String, SubmoduleStatement, EffectiveStatement<String, SubmoduleStatement>> stmt)
                 throws SourceException {
 
-            Optional<Date> revisionDate = Optional.fromNullable(firstAttributeOf(stmt.declaredSubstatements(),
-                    RevisionStatement.class));
+            Optional<Date> revisionDate = Optional.fromNullable(Utils.getLatestRevision(stmt.declaredSubstatements()));
+            if (!revisionDate.isPresent()) {
+                revisionDate = Optional.of(SimpleDateFormatUtil.DEFAULT_DATE_REV);
+            }
 
-            ModuleIdentifier submoduleIdentifier = new ModuleIdentifierImpl(stmt.getStatementArgument(),
-                    Optional.<URI> absent(), revisionDate);
+            ModuleIdentifier submoduleIdentifier = new ModuleIdentifierImpl(
+                    stmt.getStatementArgument(), Optional.<URI> absent(),
+                    revisionDate);
 
             stmt.addContext(SubmoduleNamespace.class, submoduleIdentifier, stmt);
 
-            String belongsToModuleName = firstAttributeOf(stmt.declaredSubstatements(), BelongsToStatement.class);
-            StmtContext<?, ?, ?> prefixSubStmtCtx = findFirstDeclaredSubstatement(stmt, 0, BelongsToStatement.class,
-                    PrefixStatement.class);
+            String belongsToModuleName = firstAttributeOf(
+                    stmt.declaredSubstatements(), BelongsToStatement.class);
+            StmtContext<?, ?, ?> prefixSubStmtCtx = findFirstDeclaredSubstatement(
+                    stmt, 0, BelongsToStatement.class, PrefixStatement.class);
 
             if (prefixSubStmtCtx == null) {
-                throw new IllegalArgumentException("Prefix of belongsTo statement is missing in submodule ["
-                        + stmt.getStatementArgument() + "].");
+                throw new IllegalArgumentException(
+                        "Prefix of belongsTo statement is missing in submodule ["
+                                + stmt.getStatementArgument() + "].");
             }
 
             String prefix = (String) prefixSubStmtCtx.getStatementArgument();
 
-            stmt.addToNs(BelongsToPrefixToModuleName.class, prefix, belongsToModuleName);
+            stmt.addToNs(BelongsToPrefixToModuleName.class, prefix,
+                    belongsToModuleName);
         }
     }