Next round of checkstyle fixes in yang-parser-impl 92/63192/2
authorRobert Varga <robert.varga@pantheon.tech>
Sat, 16 Sep 2017 11:09:41 +0000 (13:09 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Sat, 16 Sep 2017 18:48:20 +0000 (20:48 +0200)
Another batch, bringing the number of violation to under 800.

Change-Id: I2d39b73747c952f07f633822d46f79326f9355e0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
41 files changed:
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CustomStatementParserBuilder.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SimpleNamespaceContext.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/VirtualNamespaceContext.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Decimal64SpecificationImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DefaultStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DescriptionStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviationStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumSpecificationImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorMessageStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ExtensionStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IfFeatureStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InputStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/InstanceIdentifierSpecificationImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafListStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/LeafStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ListStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MinElementsStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/MustStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NamespaceStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/NumericalRestrictionsImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OpenconfigVersionStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OrganizationStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/OutputStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PathStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ReferenceStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RefineStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RequireInstanceStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/RpcStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SupportedExtensionsMapping.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UsesStatementImpl.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangInferencePipeline.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java

index d85044b7b14abfd6f3e5119dc7ec5fa9f66eb513..a1c76c151a6e3cd162b63244c20a62294407735e 100644 (file)
@@ -49,7 +49,7 @@ public class CustomStatementParserBuilder {
      *            bundle of supported verions
      */
     public CustomStatementParserBuilder(final Set<YangVersion> supportedVersions) {
-        reactorSupportBundles = ImmutableMap.<ModelProcessingPhase, StatementSupportBundle.Builder> builder()
+        reactorSupportBundles = ImmutableMap.<ModelProcessingPhase, StatementSupportBundle.Builder>builder()
                 .put(ModelProcessingPhase.INIT, StatementSupportBundle.builder(supportedVersions))
                 .put(ModelProcessingPhase.SOURCE_PRE_LINKAGE, StatementSupportBundle.builder(supportedVersions))
                 .put(ModelProcessingPhase.SOURCE_LINKAGE, StatementSupportBundle.builder(supportedVersions))
index 2e4822d6234cb580f3e296bec811950516232663..463411d853e3dd203663fe3c726b720abc0607ae 100644 (file)
@@ -16,24 +16,26 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour;
 final class SimpleNamespaceContext<K, V, N extends IdentifierNamespace<K, V>>
         extends NamespaceBehaviourWithListeners<K, V, N> {
 
-    // FIXME: Change this to Multimap, once issue with modules
-    // is resolved.
-    private final List<NamespaceBehaviourWithListeners.ValueAddedListener<K>> listeners = new ArrayList<>();
-    public SimpleNamespaceContext(NamespaceBehaviour<K, V, N> delegate) {
+    // FIXME: Change this to Multimap, once issue with modules is resolved.
+    private final List<ValueAddedListener<K>> listeners = new ArrayList<>();
+
+    SimpleNamespaceContext(final NamespaceBehaviour<K, V, N> delegate) {
         super(delegate);
     }
 
-    protected boolean isRequestedValue(NamespaceBehaviourWithListeners.ValueAddedListener<K> listener, NamespaceStorageNode storage, V value) {
+    @Override
+    protected boolean isRequestedValue(final ValueAddedListener<K> listener, final NamespaceStorageNode storage,
+            final V value) {
         NamespaceStorageNode listenerCtx = listener.getCtxNode();
         return value == getFrom(listenerCtx, listener.getKey());
     }
 
     @Override
-    protected void addListener(K key, NamespaceBehaviourWithListeners.ValueAddedListener<K> listener) {
+    protected void addListener(final K key, final ValueAddedListener<K> listener) {
         listeners.add(listener);
     }
 
-    private Iterator<NamespaceBehaviourWithListeners.ValueAddedListener<K>> getMutableListeners(K key) {
+    private Iterator<ValueAddedListener<K>> getMutableListeners(final K key) {
         return listeners.iterator();
     }
 
@@ -43,4 +45,4 @@ final class SimpleNamespaceContext<K, V, N extends IdentifierNamespace<K, V>>
         notifyListeners(storage, getMutableListeners(key), value);
         notifyDerivedNamespaces(storage, key, value);
     }
-}
\ No newline at end of file
+}
index 51762b6ef6c5b203939edcd0ca6b9894a6e0724d..7db50e0199f57112e33516bc6aeb0671a580aa98 100644 (file)
@@ -16,25 +16,26 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour;
 final class VirtualNamespaceContext<K, V, N extends IdentifierNamespace<K, V>, DK>
         extends NamespaceBehaviourWithListeners<K, V, N> {
 
-    private final Multimap<DK, NamespaceBehaviourWithListeners.ValueAddedListener<K>> listeners = HashMultimap.create();
+    private final Multimap<DK, ValueAddedListener<K>> listeners = HashMultimap.create();
     private final DerivedNamespaceBehaviour<K, V, DK, N, ?> derivedDelegate;
 
-    public VirtualNamespaceContext(DerivedNamespaceBehaviour<K, V, DK, N, ?> delegate) {
+    VirtualNamespaceContext(final DerivedNamespaceBehaviour<K, V, DK, N, ?> delegate) {
         super(delegate);
         this.derivedDelegate = delegate;
     }
 
-    protected boolean isRequestedValue(NamespaceBehaviourWithListeners.ValueAddedListener<K> listener, NamespaceStorageNode storage, V value) {
+    @Override
+    protected boolean isRequestedValue(final ValueAddedListener<K> listener, final NamespaceStorageNode storage,
+            final V value) {
         return value == getFrom(listener.getCtxNode(), listener.getKey());
     }
 
     @Override
-    protected void addListener(K key, NamespaceBehaviourWithListeners.ValueAddedListener<K> listener) {
+    protected void addListener(final K key, final ValueAddedListener<K> listener) {
         listeners.put(derivedDelegate.getSignificantKey(key), listener);
     }
 
-
-    void addedToSourceNamespace(NamespaceBehaviour.NamespaceStorageNode storage, DK key, V value) {
+    void addedToSourceNamespace(final NamespaceBehaviour.NamespaceStorageNode storage, final DK key, final V value) {
         notifyListeners(storage, listeners.get(key).iterator(), value);
     }
 
@@ -44,4 +45,4 @@ final class VirtualNamespaceContext<K, V, N extends IdentifierNamespace<K, V>, D
         notifyListeners(storage, listeners.get(derivedDelegate.getSignificantKey(key)).iterator(), value);
         notifyDerivedNamespaces(storage, key, value);
     }
-}
\ No newline at end of file
+}
index bb68a58c12edebe3374e597187cd41647dd1d31b..4b7f559869aa97af0d1514d36ab562f6e268e3b0 100644 (file)
@@ -30,8 +30,8 @@ public class Decimal64SpecificationImpl extends AbstractDeclaredStatement<String
         super(context);
     }
 
-    public static class Definition extends
-            AbstractStatementSupport<String, Decimal64Specification, EffectiveStatement<String, Decimal64Specification>> {
+    public static class Definition extends AbstractStatementSupport<String, Decimal64Specification,
+            EffectiveStatement<String, Decimal64Specification>> {
 
         public Definition() {
             super(YangStmtMapping.TYPE);
@@ -48,8 +48,8 @@ public class Decimal64SpecificationImpl extends AbstractDeclaredStatement<String
         }
 
         @Override
-        public EffectiveStatement<String, Decimal64Specification> createEffective(
-                final StmtContext<String, Decimal64Specification, EffectiveStatement<String, Decimal64Specification>> ctx) {
+        public EffectiveStatement<String, Decimal64Specification> createEffective(final StmtContext<String,
+                Decimal64Specification, EffectiveStatement<String, Decimal64Specification>> ctx) {
             return new Decimal64SpecificationEffectiveStatementImpl(ctx);
         }
 
@@ -75,5 +75,4 @@ public class Decimal64SpecificationImpl extends AbstractDeclaredStatement<String
     public RangeStatement getRange() {
         return firstDeclared(RangeStatement.class);
     }
-
 }
index 5ca6c880da3afaaaec5db96a50c139819da164f7..329dfe6ecfe689453ade5f75d4c8131710a8d4ec 100644 (file)
@@ -28,7 +28,8 @@ public class DefaultStatementImpl extends AbstractDeclaredStatement<String> impl
         super(context);
     }
 
-    public static class Definition extends AbstractStatementSupport<String,DefaultStatement,EffectiveStatement<String,DefaultStatement>> {
+    public static class Definition
+            extends AbstractStatementSupport<String, DefaultStatement, EffectiveStatement<String, DefaultStatement>> {
 
         public Definition() {
             super(YangStmtMapping.DEFAULT);
@@ -56,7 +57,8 @@ public class DefaultStatementImpl extends AbstractDeclaredStatement<String> impl
         }
     }
 
-    @Nonnull @Override
+    @Nonnull
+    @Override
     public String getValue() {
         return rawArgument();
     }
index 868788f6209b0cb9df0c5bcc0d1d5e43e876f012..77dc41bf22aa364047b0c774d3d5ea5dc50c530c 100644 (file)
@@ -22,12 +22,12 @@ public class DescriptionStatementImpl extends AbstractDeclaredStatement<String>
             .DESCRIPTION)
             .build();
 
-    protected DescriptionStatementImpl(
-            final StmtContext<String, DescriptionStatement, ?> context) {
+    protected DescriptionStatementImpl(final StmtContext<String, DescriptionStatement, ?> context) {
         super(context);
     }
 
-    public static class Definition extends AbstractStatementSupport<String,DescriptionStatement,EffectiveStatement<String,DescriptionStatement>> {
+    public static class Definition extends AbstractStatementSupport<String, DescriptionStatement,
+            EffectiveStatement<String, DescriptionStatement>> {
 
         public Definition() {
             super(YangStmtMapping.DESCRIPTION);
@@ -44,7 +44,8 @@ public class DescriptionStatementImpl extends AbstractDeclaredStatement<String>
         }
 
         @Override
-        public EffectiveStatement<String, DescriptionStatement> createEffective(final StmtContext<String, DescriptionStatement, EffectiveStatement<String, DescriptionStatement>> ctx) {
+        public EffectiveStatement<String, DescriptionStatement> createEffective(
+                final StmtContext<String, DescriptionStatement, EffectiveStatement<String, DescriptionStatement>> ctx) {
             return new DescriptionEffectiveStatementImpl(ctx);
         }
 
@@ -54,7 +55,8 @@ public class DescriptionStatementImpl extends AbstractDeclaredStatement<String>
         }
     }
 
-    @Nonnull @Override
+    @Nonnull
+    @Override
     public String getText() {
         return rawArgument();
     }
index fda3df0b6beef35c9d2613e2c4beb2274579b284..c5eabed9f71c1123964627c63f7ec6d2c33b0102 100644 (file)
@@ -89,6 +89,7 @@ public class DeviateStatementImpl extends AbstractDeclaredStatement<DeviateKind>
     public static class Definition extends AbstractStatementSupport<DeviateKind, DeviateStatement,
             EffectiveStatement<DeviateKind, DeviateStatement>> {
         private static final Map<String, DeviateKind> KEYWORD_TO_DEVIATE_MAP;
+
         static {
             final Builder<String, DeviateKind> keywordToDeviateMapBuilder = ImmutableMap.builder();
             for (final DeviateKind deviate : DeviateKind.values()) {
@@ -216,9 +217,10 @@ public class DeviateStatementImpl extends AbstractDeclaredStatement<DeviateKind>
                         && YangStmtMapping.LEAF.equals(targetCtx.getPublicDefinition())) {
                     for (final StmtContext<?, ?, ?> targetCtxSubstatement : targetCtx.allSubstatements()) {
                         InferenceException.throwIf(stmtToBeAdded.equals(targetCtxSubstatement.getPublicDefinition()),
-                            stmtCtxToBeAdded.getStatementSourceReference(), "Deviation cannot add substatement %s "
-                        + "to target node %s because it is already defined in target and can appear only once.",
-                        stmtToBeAdded.getStatementName(), targetCtx.getStatementArgument());
+                            stmtCtxToBeAdded.getStatementSourceReference(),
+                            "Deviation cannot add substatement %s to target node %s because it is already defined "
+                            + "in target and can appear only once.",
+                            stmtToBeAdded.getStatementName(), targetCtx.getStatementArgument());
                     }
                 }
             }
@@ -240,8 +242,8 @@ public class DeviateStatementImpl extends AbstractDeclaredStatement<DeviateKind>
 
             if (YangStmtMapping.DEFAULT.equals(stmtToBeReplaced)
                     && YangStmtMapping.LEAF_LIST.equals(targetCtx.getPublicDefinition())) {
-                LOG.error("Deviation cannot replace substatement {} in target leaf-list {} because a leaf-list can " +
-                        "have multiple default statements. At line: {}", stmtToBeReplaced.getStatementName(),
+                LOG.error("Deviation cannot replace substatement {} in target leaf-list {} because a leaf-list can "
+                        "have multiple default statements. At line: {}", stmtToBeReplaced.getStatementName(),
                         targetCtx.getStatementArgument(), stmtCtxToBeReplaced.getStatementSourceReference());
                 return;
             }
@@ -262,8 +264,8 @@ public class DeviateStatementImpl extends AbstractDeclaredStatement<DeviateKind>
                 }
             }
 
-            throw new InferenceException(stmtCtxToBeReplaced.getStatementSourceReference(), "Deviation cannot " +
-                    "replace substatement %s in target node %s because it does not exist in target node.",
+            throw new InferenceException(stmtCtxToBeReplaced.getStatementSourceReference(), "Deviation cannot replace "
+                    + "substatement %s in target node %s because it does not exist in target node.",
                     stmtToBeReplaced.getStatementName(), targetCtx.getStatementArgument());
         }
 
@@ -296,8 +298,8 @@ public class DeviateStatementImpl extends AbstractDeclaredStatement<DeviateKind>
                 }
             }
 
-            LOG.error("Deviation cannot delete substatement {} with argument '{}' in target node {} because it does " +
-                    "not exist in the target node. At line: {}", stmtToBeDeleted.getStatementName(), stmtArgument,
+            LOG.error("Deviation cannot delete substatement {} with argument '{}' in target node {} because it does "
+                    "not exist in the target node. At line: {}", stmtToBeDeleted.getStatementName(), stmtArgument,
                     targetCtx.getStatementArgument(), stmtCtxToBeDeleted.getStatementSourceReference());
         }
 
@@ -352,7 +354,8 @@ public class DeviateStatementImpl extends AbstractDeclaredStatement<DeviateKind>
         }
     }
 
-    @Nonnull @Override
+    @Nonnull
+    @Override
     public DeviateKind getValue() {
         return argument();
     }
index d156674226c45dc77ee57428ca1f99861589e8d2..7b819af88655aacd9946af0f7d511e973b6db96e 100644 (file)
@@ -21,7 +21,8 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.source.ModuleCtxToModuleQName;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.DeviationEffectiveStatementImpl;
 
-public class DeviationStatementImpl extends AbstractDeclaredStatement<SchemaNodeIdentifier> implements DeviationStatement {
+public class DeviationStatementImpl extends AbstractDeclaredStatement<SchemaNodeIdentifier>
+        implements DeviationStatement {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .DEVIATION)
             .addOptional(YangStmtMapping.DESCRIPTION)
@@ -33,7 +34,8 @@ public class DeviationStatementImpl extends AbstractDeclaredStatement<SchemaNode
         super(context);
     }
 
-    public static class Definition extends AbstractStatementSupport<SchemaNodeIdentifier,DeviationStatement,EffectiveStatement<SchemaNodeIdentifier,DeviationStatement>> {
+    public static class Definition extends AbstractStatementSupport<SchemaNodeIdentifier, DeviationStatement,
+            EffectiveStatement<SchemaNodeIdentifier, DeviationStatement>> {
 
         public Definition() {
             super(YangStmtMapping.DEVIATION);
@@ -51,7 +53,8 @@ public class DeviationStatementImpl extends AbstractDeclaredStatement<SchemaNode
 
         @Override
         public EffectiveStatement<SchemaNodeIdentifier, DeviationStatement> createEffective(
-                final StmtContext<SchemaNodeIdentifier, DeviationStatement, EffectiveStatement<SchemaNodeIdentifier, DeviationStatement>> ctx) {
+                final StmtContext<SchemaNodeIdentifier, DeviationStatement,
+                EffectiveStatement<SchemaNodeIdentifier, DeviationStatement>> ctx) {
             return new DeviationEffectiveStatementImpl(ctx);
         }
 
@@ -74,7 +77,8 @@ public class DeviationStatementImpl extends AbstractDeclaredStatement<SchemaNode
         }
     }
 
-    @Nonnull @Override
+    @Nonnull
+    @Override
     public SchemaNodeIdentifier getTargetNode() {
         return argument();
     }
index 9f6ff3881fc83930a67b464a82569688f04b0bb2..f4442e02b5e57019cede2a39a9f3ac05981402ed 100644 (file)
@@ -12,26 +12,25 @@ import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.EnumStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.EnumSpecification;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.EnumSpecificationEffectiveStatementImpl;
 
-public class EnumSpecificationImpl extends AbstractDeclaredStatement<String> implements TypeStatement.EnumSpecification {
+public class EnumSpecificationImpl extends AbstractDeclaredStatement<String> implements EnumSpecification {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .TYPE)
             .addMultiple(YangStmtMapping.ENUM)
             .build();
 
-    protected EnumSpecificationImpl(final StmtContext<String, TypeStatement.EnumSpecification, ?> context) {
+    protected EnumSpecificationImpl(final StmtContext<String, EnumSpecification, ?> context) {
         super(context);
     }
 
     public static class Definition
-            extends
-            AbstractStatementSupport<String, TypeStatement.EnumSpecification, EffectiveStatement<String, TypeStatement.EnumSpecification>> {
+            extends AbstractStatementSupport<String, EnumSpecification, EffectiveStatement<String, EnumSpecification>> {
 
         public Definition() {
             super(YangStmtMapping.TYPE);
@@ -43,14 +42,13 @@ public class EnumSpecificationImpl extends AbstractDeclaredStatement<String> imp
         }
 
         @Override
-        public TypeStatement.EnumSpecification createDeclared(
-                final StmtContext<String, TypeStatement.EnumSpecification, ?> ctx) {
+        public EnumSpecification createDeclared(final StmtContext<String, EnumSpecification, ?> ctx) {
             return new EnumSpecificationImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String, TypeStatement.EnumSpecification> createEffective(
-                final StmtContext<String, TypeStatement.EnumSpecification, EffectiveStatement<String, TypeStatement.EnumSpecification>> ctx) {
+        public EffectiveStatement<String, EnumSpecification> createEffective(
+                final StmtContext<String, EnumSpecification, EffectiveStatement<String, EnumSpecification>> ctx) {
             return new EnumSpecificationEffectiveStatementImpl(ctx);
         }
 
@@ -71,5 +69,4 @@ public class EnumSpecificationImpl extends AbstractDeclaredStatement<String> imp
     public Collection<? extends EnumStatement> getEnums() {
         return allDeclared(EnumStatement.class);
     }
-
 }
index d1114967c50678354d6d6c572e149b7728d52894..817f1b4234a656ebc189a1b2647d5fa07d0d88b0 100644 (file)
@@ -23,13 +23,11 @@ public class ErrorMessageStatementImpl extends
             .ERROR_MESSAGE)
             .build();
 
-    protected ErrorMessageStatementImpl(
-            final StmtContext<String, ErrorMessageStatement, ?> context) {
+    protected ErrorMessageStatementImpl(final StmtContext<String, ErrorMessageStatement, ?> context) {
         super(context);
     }
 
-    public static class Definition
-            extends
+    public static class Definition extends
             AbstractStatementSupport<String, ErrorMessageStatement, EffectiveStatement<String, ErrorMessageStatement>> {
 
         public Definition() {
@@ -42,14 +40,14 @@ public class ErrorMessageStatementImpl extends
         }
 
         @Override
-        public ErrorMessageStatement createDeclared(
-                final StmtContext<String, ErrorMessageStatement, ?> ctx) {
+        public ErrorMessageStatement createDeclared(final StmtContext<String, ErrorMessageStatement, ?> ctx) {
             return new ErrorMessageStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<String, ErrorMessageStatement> createEffective(
-                final StmtContext<String, ErrorMessageStatement, EffectiveStatement<String, ErrorMessageStatement>> ctx) {
+                final StmtContext<String, ErrorMessageStatement,
+                EffectiveStatement<String, ErrorMessageStatement>> ctx) {
             return new ErrorMessageEffectiveStatementImpl(ctx);
         }
 
index 1e9e9a0ed85bc218ec1ddb1f618aa574e399497a..b883bd33e701e5d5323d75bd048fd286d66143c1 100644 (file)
@@ -21,6 +21,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractQNameStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StatementDefinitionNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
+import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ExtensionEffectiveStatementImpl;
@@ -55,13 +56,14 @@ public class ExtensionStatementImpl extends AbstractDeclaredStatement<QName> imp
         }
 
         @Override
-        public EffectiveStatement<QName,ExtensionStatement> createEffective(
-                final StmtContext<QName,ExtensionStatement ,EffectiveStatement<QName,ExtensionStatement>> ctx) {
+        public EffectiveStatement<QName, ExtensionStatement> createEffective(
+                final StmtContext<QName, ExtensionStatement, EffectiveStatement<QName,ExtensionStatement>> ctx) {
             return ExtensionEffectiveStatementImpl.create(ctx);
         }
 
         @Override
-        public void onStatementDefinitionDeclared(final StmtContext.Mutable<QName, ExtensionStatement, EffectiveStatement<QName, ExtensionStatement>> stmt) {
+        public void onStatementDefinitionDeclared(
+                final Mutable<QName, ExtensionStatement, EffectiveStatement<QName, ExtensionStatement>> stmt) {
             super.onStatementDefinitionDeclared(stmt);
 
             QName stmtName = stmt.getStatementArgument();
@@ -107,5 +109,4 @@ public class ExtensionStatementImpl extends AbstractDeclaredStatement<QName> imp
     public ArgumentStatement getArgument() {
         return firstDeclared(ArgumentStatement.class);
     }
-
 }
index cec917ffe4cc19272e0cb58dfb05c02cb2df6f4c..86066ea0331f0eb54b61221d3cf9603817dad935 100644 (file)
@@ -26,8 +26,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.IdentityEffectiveStatementImpl;
 
-public class IdentityStatementImpl extends AbstractDeclaredStatement<QName>
-        implements IdentityStatement {
+public class IdentityStatementImpl extends AbstractDeclaredStatement<QName> implements IdentityStatement {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .IDENTITY)
             .addOptional(YangStmtMapping.BASE)
@@ -36,8 +35,7 @@ public class IdentityStatementImpl extends AbstractDeclaredStatement<QName>
             .addOptional(YangStmtMapping.STATUS)
             .build();
 
-    protected IdentityStatementImpl(
-            final StmtContext<QName, IdentityStatement, ?> context) {
+    protected IdentityStatementImpl(final StmtContext<QName, IdentityStatement, ?> context) {
         super(context);
     }
 
@@ -54,8 +52,7 @@ public class IdentityStatementImpl extends AbstractDeclaredStatement<QName>
         }
 
         @Override
-        public IdentityStatement createDeclared(
-                final StmtContext<QName, IdentityStatement, ?> ctx) {
+        public IdentityStatement createDeclared(final StmtContext<QName, IdentityStatement, ?> ctx) {
             return new IdentityStatementImpl(ctx);
         }
 
@@ -66,7 +63,8 @@ public class IdentityStatementImpl extends AbstractDeclaredStatement<QName>
         }
 
         @Override
-        public void onStatementDefinitionDeclared(final StmtContext.Mutable<QName, IdentityStatement, EffectiveStatement<QName, IdentityStatement>> stmt) {
+        public void onStatementDefinitionDeclared(final StmtContext.Mutable<QName, IdentityStatement,
+                EffectiveStatement<QName, IdentityStatement>> stmt) {
             stmt.addToNs(IdentityNamespace.class, stmt.getStatementArgument(), stmt);
         }
 
@@ -113,5 +111,4 @@ public class IdentityStatementImpl extends AbstractDeclaredStatement<QName>
     public QName getName() {
         return argument();
     }
-
 }
index 1392e3cc0878677e54adb374cf25dad3c830ec13..9ae892af3969d669cf3753ec579a6fd91fc6609f 100644 (file)
@@ -38,14 +38,12 @@ public class IfFeatureStatementImpl extends AbstractDeclaredStatement<Predicate<
             .IF_FEATURE)
             .build();
 
-    protected IfFeatureStatementImpl(
-            final StmtContext<Predicate<Set<QName>>, IfFeatureStatement, ?> context) {
+    protected IfFeatureStatementImpl(final StmtContext<Predicate<Set<QName>>, IfFeatureStatement, ?> context) {
         super(context);
     }
 
-    public static class Definition
-            extends
-            AbstractStatementSupport<Predicate<Set<QName>>, IfFeatureStatement, EffectiveStatement<Predicate<Set<QName>>, IfFeatureStatement>> {
+    public static class Definition extends AbstractStatementSupport<Predicate<Set<QName>>, IfFeatureStatement,
+            EffectiveStatement<Predicate<Set<QName>>, IfFeatureStatement>> {
 
         public Definition() {
             super(YangStmtMapping.IF_FEATURE);
@@ -53,23 +51,23 @@ public class IfFeatureStatementImpl extends AbstractDeclaredStatement<Predicate<
 
         @Override
         public Predicate<Set<QName>> parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
-            if(YangVersion.VERSION_1_1.equals(ctx.getRootVersion())) {
+            if (YangVersion.VERSION_1_1.equals(ctx.getRootVersion())) {
                 return parseIfFeatureExpression(ctx, value);
-            } else {
-                final QName qName = StmtContextUtils.qnameFromArgument(ctx, value);
-                return setQNames -> setQNames.contains(qName);
             }
+
+            final QName qname = StmtContextUtils.qnameFromArgument(ctx, value);
+            return setQNames -> setQNames.contains(qname);
         }
 
         @Override
-        public IfFeatureStatement createDeclared(
-                final StmtContext<Predicate<Set<QName>>, IfFeatureStatement, ?> ctx) {
+        public IfFeatureStatement createDeclared(final StmtContext<Predicate<Set<QName>>, IfFeatureStatement, ?> ctx) {
             return new IfFeatureStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<Predicate<Set<QName>>, IfFeatureStatement> createEffective(
-                final StmtContext<Predicate<Set<QName>>, IfFeatureStatement, EffectiveStatement<Predicate<Set<QName>>, IfFeatureStatement>> ctx) {
+                final StmtContext<Predicate<Set<QName>>, IfFeatureStatement,
+                EffectiveStatement<Predicate<Set<QName>>, IfFeatureStatement>> ctx) {
             return new IfFeatureEffectiveStatementImpl(ctx);
         }
 
@@ -78,7 +76,8 @@ public class IfFeatureStatementImpl extends AbstractDeclaredStatement<Predicate<
             return SUBSTATEMENT_VALIDATOR;
         }
 
-        private static Predicate<Set<QName>> parseIfFeatureExpression(final StmtContext<?, ?, ?> ctx, final String value) {
+        private static Predicate<Set<QName>> parseIfFeatureExpression(final StmtContext<?, ?, ?> ctx,
+                final String value) {
             final IfFeatureExpressionLexer lexer = new IfFeatureExpressionLexer(CharStreams.fromString(value));
             final CommonTokenStream tokens = new CommonTokenStream(lexer);
             final IfFeatureExpressionParser parser = new IfFeatureExpressionParser(tokens);
@@ -86,29 +85,30 @@ public class IfFeatureStatementImpl extends AbstractDeclaredStatement<Predicate<
             return new IfFeaturePredicateVisitor(ctx).visit(parser.if_feature_expr());
         }
 
-        private static class IfFeaturePredicateVisitor extends IfFeatureExpressionParserBaseVisitor<Predicate<Set<QName>>> {
+        private static class IfFeaturePredicateVisitor
+                extends IfFeatureExpressionParserBaseVisitor<Predicate<Set<QName>>> {
             private final StmtContext<?, ?, ?> stmtCtx;
 
-            public IfFeaturePredicateVisitor(final StmtContext<?, ?, ?> ctx) {
+            IfFeaturePredicateVisitor(final StmtContext<?, ?, ?> ctx) {
                 this.stmtCtx = Preconditions.checkNotNull(ctx);
             }
 
             @Override
             public Predicate<Set<QName>> visitIf_feature_expr(final If_feature_exprContext ctx) {
-                if (ctx.if_feature_expr() != null) {
-                    return visitIf_feature_term(ctx.if_feature_term()).or(visitIf_feature_expr(ctx.if_feature_expr()));
-                } else {
+                if (ctx.if_feature_expr() == null) {
                     return visitIf_feature_term(ctx.if_feature_term());
                 }
+
+                return visitIf_feature_term(ctx.if_feature_term()).or(visitIf_feature_expr(ctx.if_feature_expr()));
             }
 
             @Override
             public Predicate<Set<QName>> visitIf_feature_term(final If_feature_termContext ctx) {
-                if (ctx.if_feature_term() != null) {
-                    return visitIf_feature_factor(ctx.if_feature_factor()).and(visitIf_feature_term(ctx.if_feature_term()));
-                } else {
+                if (ctx.if_feature_term() == null) {
                     return visitIf_feature_factor(ctx.if_feature_factor());
                 }
+
+                return visitIf_feature_factor(ctx.if_feature_factor()).and(visitIf_feature_term(ctx.if_feature_term()));
             }
 
             @Override
index 8c329e82f8d568fa0ea402f7016421012c266821..66754445b4d9e86694b779a3583dca0df2b2aeda 100644 (file)
@@ -42,8 +42,8 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.Prereq
 import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionModuleNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
-import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
+import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToModuleIdentifier;
 import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToSemVerModuleIdentifier;
@@ -83,7 +83,8 @@ public class ImportStatementDefinition extends
     }
 
     @Override
-    public void onPreLinkageDeclared(final Mutable<String, ImportStatement, EffectiveStatement<String, ImportStatement>> stmt) {
+    public void onPreLinkageDeclared(final Mutable<String, ImportStatement,
+            EffectiveStatement<String, ImportStatement>> stmt) {
         /*
          * Add ModuleIdentifier of a module which is required by this module.
          * Based on this information, required modules are searched from library
@@ -157,8 +158,9 @@ public class ImportStatementDefinition extends
                     StmtContext<?, ?, ?> importedModule = null;
                     ModuleIdentifier importedModuleIdentifier = null;
                     if (impIdentifier.getRevision() == SimpleDateFormatUtil.DEFAULT_DATE_IMP) {
-                        final Entry<ModuleIdentifier, StmtContext<?, ModuleStatement, EffectiveStatement<String, ModuleStatement>>> recentModuleEntry = findRecentModule(
-                                impIdentifier, stmt.getAllFromNamespace(ModuleNamespace.class));
+                        final Entry<ModuleIdentifier, StmtContext<?, ModuleStatement,
+                                EffectiveStatement<String, ModuleStatement>>> recentModuleEntry = findRecentModule(
+                                    impIdentifier, stmt.getAllFromNamespace(ModuleNamespace.class));
                         if (recentModuleEntry != null) {
                             importedModuleIdentifier = recentModuleEntry.getKey();
                             importedModule = recentModuleEntry.getValue();
@@ -170,11 +172,13 @@ public class ImportStatementDefinition extends
                         importedModuleIdentifier = impIdentifier;
                     }
 
-                    linkageTarget.resolve(ctx).addToNs(ImportedModuleContext.class, importedModuleIdentifier, importedModule);
+                    linkageTarget.resolve(ctx).addToNs(ImportedModuleContext.class, importedModuleIdentifier,
+                        importedModule);
                     final String impPrefix = firstAttributeOf(stmt.declaredSubstatements(), PrefixStatement.class);
                     stmt.addToNs(ImpPrefixToModuleIdentifier.class, impPrefix, importedModuleIdentifier);
 
-                    final URI modNs = firstAttributeOf(importedModule.declaredSubstatements(), NamespaceStatement.class);
+                    final URI modNs = firstAttributeOf(importedModule.declaredSubstatements(),
+                        NamespaceStatement.class);
                     stmt.addToNs(URIStringToImpPrefix.class, modNs.toString(), impPrefix);
                 }
 
@@ -186,18 +190,19 @@ public class ImportStatementDefinition extends
                     }
                 }
             });
-
         }
 
-        private static Entry<ModuleIdentifier, StmtContext<?, ModuleStatement, EffectiveStatement<String, ModuleStatement>>> findRecentModule(
-                final ModuleIdentifier impIdentifier,
-                final Map<ModuleIdentifier, StmtContext<?, ModuleStatement, EffectiveStatement<String, ModuleStatement>>> allModules) {
+        private static Entry<ModuleIdentifier, StmtContext<?, ModuleStatement,
+                EffectiveStatement<String, ModuleStatement>>> findRecentModule(final ModuleIdentifier impIdentifier,
+                final Map<ModuleIdentifier, StmtContext<?, ModuleStatement,
+                        EffectiveStatement<String, ModuleStatement>>> allModules) {
 
             ModuleIdentifier recentModuleIdentifier = impIdentifier;
-            Entry<ModuleIdentifier, StmtContext<?, ModuleStatement, EffectiveStatement<String, ModuleStatement>>> recentModuleEntry = null;
+            Entry<ModuleIdentifier, StmtContext<?, ModuleStatement, EffectiveStatement<String, ModuleStatement>>>
+                recentModuleEntry = null;
 
-            for (final Entry<ModuleIdentifier, StmtContext<?, ModuleStatement, EffectiveStatement<String, ModuleStatement>>> moduleEntry : allModules
-                    .entrySet()) {
+            for (final Entry<ModuleIdentifier, StmtContext<?, ModuleStatement,
+                    EffectiveStatement<String, ModuleStatement>>> moduleEntry : allModules.entrySet()) {
                 final ModuleIdentifier id = moduleEntry.getKey();
 
                 if (id.getName().equals(impIdentifier.getName())
@@ -210,7 +215,8 @@ public class ImportStatementDefinition extends
             return recentModuleEntry;
         }
 
-        private static ModuleIdentifier getImportedModuleIdentifier(final StmtContext<String, ImportStatement, ?> stmt) {
+        private static ModuleIdentifier getImportedModuleIdentifier(
+                final StmtContext<String, ImportStatement, ?> stmt) {
             Date revision = firstAttributeOf(stmt.declaredSubstatements(), RevisionDateStatement.class);
             if (revision == null) {
                 revision = SimpleDateFormatUtil.DEFAULT_DATE_IMP;
@@ -237,28 +243,28 @@ public class ImportStatementDefinition extends
             importAction.apply(new InferenceAction() {
                 @Override
                 public void apply(final InferenceContext ctx) {
-                    final Entry<SemVer, StmtContext<?, ?, ?>> importedModuleEntry= findRecentCompatibleModuleEntry(
+                    final Entry<SemVer, StmtContext<?, ?, ?>> importedModuleEntry = findRecentCompatibleModuleEntry(
                             impIdentifier.getName(), stmt);
-
-                    StmtContext<?, ?, ?> importedModule = null;
-                    ModuleIdentifier importedModuleIdentifier = null;
-                    ModuleIdentifier semVerModuleIdentifier = null;
-                    if (importedModuleEntry != null) {
-                        importedModule = importedModuleEntry.getValue();
-                        importedModuleIdentifier = importedModule.getFromNamespace(ModuleCtxToModuleIdentifier.class, importedModule);
-                        semVerModuleIdentifier = createSemVerModuleIdentifier(importedModuleIdentifier, importedModuleEntry.getKey());
-                    } else {
+                    if (importedModuleEntry == null) {
                         throw new InferenceException(stmt.getStatementSourceReference(),
-                                "Unable to find module compatible with requested import [%s(%s)].", impIdentifier
-                                        .getName(), getRequestedImportVersion(stmt));
+                            "Unable to find module compatible with requested import [%s(%s)].",
+                            impIdentifier.getName(), getRequestedImportVersion(stmt));
                     }
 
-                    linkageTarget.resolve(ctx).addToNs(ImportedModuleContext.class, importedModuleIdentifier, importedModule);
+                    final StmtContext<?, ?, ?> importedModule = importedModuleEntry.getValue();
+                    final ModuleIdentifier importedModuleIdentifier = importedModule.getFromNamespace(
+                        ModuleCtxToModuleIdentifier.class, importedModule);
+                    final ModuleIdentifier semVerModuleIdentifier = createSemVerModuleIdentifier(
+                        importedModuleIdentifier, importedModuleEntry.getKey());
+
+                    linkageTarget.resolve(ctx).addToNs(ImportedModuleContext.class, importedModuleIdentifier,
+                        importedModule);
                     final String impPrefix = firstAttributeOf(stmt.declaredSubstatements(), PrefixStatement.class);
                     stmt.addToNs(ImpPrefixToModuleIdentifier.class, impPrefix, importedModuleIdentifier);
                     stmt.addToNs(ImpPrefixToSemVerModuleIdentifier.class, impPrefix, semVerModuleIdentifier);
 
-                    final URI modNs = firstAttributeOf(importedModule.declaredSubstatements(), NamespaceStatement.class);
+                    final URI modNs = firstAttributeOf(importedModule.declaredSubstatements(),
+                        NamespaceStatement.class);
                     stmt.addToNs(URIStringToImpPrefix.class, modNs.toString(), impPrefix);
                 }
 
@@ -266,8 +272,8 @@ public class ImportStatementDefinition extends
                 public void prerequisiteFailed(final Collection<? extends Prerequisite<?>> failed) {
                     if (failed.contains(imported)) {
                         throw new InferenceException(stmt.getStatementSourceReference(),
-                                "Unable to find module compatible with requested import [%s(%s)].", impIdentifier
-                                        .getName(), getRequestedImportVersion(stmt));
+                                "Unable to find module compatible with requested import [%s(%s)].",
+                                impIdentifier.getName(), getRequestedImportVersion(stmt));
                     }
                 }
             });
@@ -299,7 +305,8 @@ public class ImportStatementDefinition extends
             return null;
         }
 
-        private static ModuleIdentifier getImportedModuleIdentifier(final StmtContext<String, ImportStatement, ?> impStmt) {
+        private static ModuleIdentifier getImportedModuleIdentifier(
+                final StmtContext<String, ImportStatement, ?> impStmt) {
             return ModuleIdentifierImpl.create(impStmt.getStatementArgument(), Optional.empty(),
                     Optional.of(SimpleDateFormatUtil.DEFAULT_DATE_IMP));
         }
index 3fe74665bdd5182b7e933cb4067ae006b5ded08f..3e411257b43bde7cead6b5b894eaa245c4561922 100644 (file)
@@ -33,8 +33,8 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.Infere
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.InferenceContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.Prerequisite;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
-import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
+import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.source.IncludedModuleContext;
 import org.opendaylight.yangtools.yang.parser.spi.source.IncludedSubmoduleNameToIdentifier;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.IncludeEffectiveStatementImpl;
@@ -72,7 +72,7 @@ public class IncludeStatementImpl extends AbstractDeclaredStatement<String> impl
 
         @Override
         public void onPreLinkageDeclared(
-                final StmtContext.Mutable<String, IncludeStatement, EffectiveStatement<String, IncludeStatement>> stmt) {
+                final Mutable<String, IncludeStatement, EffectiveStatement<String, IncludeStatement>> stmt) {
             stmt.addRequiredModule(getIncludeSubmoduleIdentifier(stmt));
         }
 
@@ -105,8 +105,8 @@ public class IncludeStatementImpl extends AbstractDeclaredStatement<String> impl
             });
         }
 
-        private static ModuleIdentifier getIncludeSubmoduleIdentifier(final StmtContext<String, IncludeStatement, ?> stmt) {
-
+        private static ModuleIdentifier getIncludeSubmoduleIdentifier(
+                final StmtContext<String, IncludeStatement, ?> stmt) {
             final String subModuleName = stmt.getStatementArgument();
 
             Date revisionDate = firstAttributeOf(stmt.declaredSubstatements(), RevisionDateStatement.class);
index 38df7c08e797285e1aaf856a8f641a508a571a98..27f4180e235a4aeb10666f6802f1c4680f9f1d59 100644 (file)
@@ -57,7 +57,8 @@ public class InputStatementImpl extends AbstractDeclaredStatement<QName>
         }
 
         @Override
-        public void onStatementAdded(final Mutable<QName, InputStatement, EffectiveStatement<QName, InputStatement>> stmt) {
+        public void onStatementAdded(final Mutable<QName, InputStatement,
+                EffectiveStatement<QName, InputStatement>> stmt) {
             stmt.getParentContext().addToNs(ChildSchemaNodes.class, stmt.getStatementArgument(), stmt);
         }
 
index d0f2e8f5269a634d3a21add2f092e01496f9c8cf..a8b447da941a84242d87013f301988c13b309d33 100644 (file)
@@ -18,21 +18,19 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.InstanceIdentifierSpecificationEffectiveStatementImpl;
 
-public class InstanceIdentifierSpecificationImpl extends
-        AbstractDeclaredStatement<String> implements InstanceIdentifierSpecification {
+public class InstanceIdentifierSpecificationImpl extends AbstractDeclaredStatement<String>
+        implements InstanceIdentifierSpecification {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .TYPE)
             .addOptional(YangStmtMapping.REQUIRE_INSTANCE)
             .build();
 
-    protected InstanceIdentifierSpecificationImpl(
-            final StmtContext<String, InstanceIdentifierSpecification, ?> ctx) {
+    protected InstanceIdentifierSpecificationImpl(final StmtContext<String, InstanceIdentifierSpecification, ?> ctx) {
         super(ctx);
     }
 
-    public static class Definition
-            extends
-            AbstractStatementSupport<String, InstanceIdentifierSpecification, EffectiveStatement<String, InstanceIdentifierSpecification>> {
+    public static class Definition extends AbstractStatementSupport<String, InstanceIdentifierSpecification,
+            EffectiveStatement<String, InstanceIdentifierSpecification>> {
 
         public Definition() {
             super(YangStmtMapping.TYPE);
@@ -51,7 +49,8 @@ public class InstanceIdentifierSpecificationImpl extends
 
         @Override
         public EffectiveStatement<String, InstanceIdentifierSpecification> createEffective(
-                final StmtContext<String, InstanceIdentifierSpecification, EffectiveStatement<String, InstanceIdentifierSpecification>> ctx) {
+                final StmtContext<String, InstanceIdentifierSpecification,
+                EffectiveStatement<String, InstanceIdentifierSpecification>> ctx) {
             return new InstanceIdentifierSpecificationEffectiveStatementImpl(ctx);
         }
 
@@ -71,5 +70,4 @@ public class InstanceIdentifierSpecificationImpl extends
     public RequireInstanceStatement getRequireInstance() {
         return firstDeclared(RequireInstanceStatement.class);
     }
-
 }
index 0212b517203af663b16c33a73f627cd41cfe1829..78815feb6ccd21803f6b8fcbf112cfbc4fd8784f 100644 (file)
@@ -35,8 +35,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.LeafListEffectiveStatementImpl;
 
-public class LeafListStatementImpl extends AbstractDeclaredStatement<QName>
-        implements LeafListStatement {
+public class LeafListStatementImpl extends AbstractDeclaredStatement<QName> implements LeafListStatement {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .LEAF_LIST)
             .addOptional(YangStmtMapping.CONFIG)
@@ -53,8 +52,7 @@ public class LeafListStatementImpl extends AbstractDeclaredStatement<QName>
             .addOptional(YangStmtMapping.WHEN)
             .build();
 
-    protected LeafListStatementImpl(
-            final StmtContext<QName, LeafListStatement, ?> context) {
+    protected LeafListStatementImpl(final StmtContext<QName, LeafListStatement, ?> context) {
         super(context);
     }
 
@@ -72,14 +70,12 @@ public class LeafListStatementImpl extends AbstractDeclaredStatement<QName>
         }
 
         @Override
-        public QName parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value)
-                {
+        public QName parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
             return StmtContextUtils.qnameFromArgument(ctx, value);
         }
 
         @Override
-        public LeafListStatement createDeclared(
-                final StmtContext<QName, LeafListStatement, ?> ctx) {
+        public LeafListStatement createDeclared(final StmtContext<QName, LeafListStatement, ?> ctx) {
             return new LeafListStatementImpl(ctx);
         }
 
index 955b7f6a91886fb08056717aa21e0d6c96a98eda..2816f45008a48ed45e0eada69e457e6dd427401d 100644 (file)
@@ -65,7 +65,8 @@ public class LeafStatementImpl extends AbstractDeclaredStatement<QName> implemen
         }
 
         @Override
-        public void onStatementAdded(final Mutable<QName, LeafStatement, EffectiveStatement<QName, LeafStatement>> stmt) {
+        public void onStatementAdded(final Mutable<QName, LeafStatement,
+                EffectiveStatement<QName, LeafStatement>> stmt) {
             stmt.getParentContext().addToNs(ChildSchemaNodes.class, stmt.getStatementArgument(), stmt);
         }
 
@@ -87,33 +88,38 @@ public class LeafStatementImpl extends AbstractDeclaredStatement<QName> implemen
 
         @Override
         public void onFullDefinitionDeclared(
-                final StmtContext.Mutable<QName, LeafStatement, EffectiveStatement<QName, LeafStatement>> ctx) {
+                final Mutable<QName, LeafStatement, EffectiveStatement<QName, LeafStatement>> ctx) {
             super.onFullDefinitionDeclared(ctx);
             StmtContextUtils.validateIfFeatureAndWhenOnListKeys(ctx);
         }
     }
 
-    @Nullable @Override
+    @Nullable
+    @Override
     public Collection<? extends MustStatement> getMusts() {
         return allDeclared(MustStatement.class);
     }
 
-    @Nullable @Override
+    @Nullable
+    @Override
     public DefaultStatement getDefault() {
         return firstDeclared(DefaultStatement.class);
     }
 
-    @Nullable @Override
+    @Nullable
+    @Override
     public ConfigStatement getConfig() {
         return firstDeclared(ConfigStatement.class);
     }
 
-    @Nullable @Override
+    @Nullable
+    @Override
     public MandatoryStatement getMandatory() {
         return firstDeclared(MandatoryStatement.class);
     }
 
-    @Nonnull @Override
+    @Nonnull
+    @Override
     public QName getName() {
         return argument();
     }
@@ -123,32 +129,38 @@ public class LeafStatementImpl extends AbstractDeclaredStatement<QName> implemen
         return firstDeclared(WhenStatement.class);
     }
 
-    @Nonnull @Override
+    @Nonnull
+    @Override
     public Collection<? extends IfFeatureStatement> getIfFeatures() {
         return allDeclared(IfFeatureStatement.class);
     }
 
-    @Nullable @Override
+    @Nullable
+    @Override
     public DescriptionStatement getDescription() {
         return firstDeclared(DescriptionStatement.class);
     }
 
-    @Nullable @Override
+    @Nullable
+    @Override
     public ReferenceStatement getReference() {
         return firstDeclared(ReferenceStatement.class);
     }
 
-    @Nonnull @Override
+    @Nonnull
+    @Override
     public TypeStatement getType() {
         return firstDeclared(TypeStatement.class);
     }
 
-    @Nullable @Override
+    @Nullable
+    @Override
     public UnitsStatement getUnits() {
         return firstDeclared(UnitsStatement.class);
     }
 
-    @Nullable @Override
+    @Nullable
+    @Override
     public StatusStatement getStatus() {
         return firstDeclared(StatusStatement.class);
     }
index c5ff3029505fbb05067ad0f9de023e3f7f2b58a8..92c0b3f92242290b4c7cba13af3169c6447f6b65 100644 (file)
@@ -39,8 +39,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ListEffectiveStatementImpl;
 
-public class ListStatementImpl extends AbstractDeclaredStatement<QName>
-        implements ListStatement {
+public class ListStatementImpl extends AbstractDeclaredStatement<QName> implements ListStatement {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .LIST)
             .addAny(YangStmtMapping.ANYXML)
@@ -71,8 +70,7 @@ public class ListStatementImpl extends AbstractDeclaredStatement<QName>
     }
 
     public static class Definition
-            extends
-            AbstractQNameStatementSupport<ListStatement, EffectiveStatement<QName, ListStatement>> {
+            extends AbstractQNameStatementSupport<ListStatement, EffectiveStatement<QName, ListStatement>> {
 
         public Definition() {
             super(YangStmtMapping.LIST);
@@ -84,7 +82,8 @@ public class ListStatementImpl extends AbstractDeclaredStatement<QName>
         }
 
         @Override
-        public void onStatementAdded(final Mutable<QName, ListStatement, EffectiveStatement<QName, ListStatement>> stmt) {
+        public void onStatementAdded(
+                final Mutable<QName, ListStatement, EffectiveStatement<QName, ListStatement>> stmt) {
             stmt.getParentContext().addToNs(ChildSchemaNodes.class, stmt.getStatementArgument(), stmt);
         }
 
index 362f08ed9f5e2cbb6f314ffcbdeac5e6d9112d72..3baf09e0a61564d8a0ecbbe37b091982eab16dd3 100644 (file)
@@ -49,7 +49,8 @@ public class MinElementsStatementImpl extends
 
         @Override
         public EffectiveStatement<Integer, MinElementsStatement> createEffective(
-                final StmtContext<Integer, MinElementsStatement, EffectiveStatement<Integer, MinElementsStatement>> ctx) {
+                final StmtContext<Integer, MinElementsStatement,
+                EffectiveStatement<Integer, MinElementsStatement>> ctx) {
             return new MinElementsEffectiveStatementImpl(ctx);
         }
 
@@ -64,5 +65,4 @@ public class MinElementsStatementImpl extends
     public Integer getValue() {
         return argument();
     }
-
 }
index f4798f64f340a765f071d2af2cfe4a32bfdf631c..aff0e0d6c8fbc3322ba4d19777e65c69fe04e223 100644 (file)
@@ -102,7 +102,8 @@ public class ModuleStatementSupport extends
     }
 
     @Override
-    public void onPreLinkageDeclared(final Mutable<String, ModuleStatement, EffectiveStatement<String, ModuleStatement>> stmt) {
+    public void onPreLinkageDeclared(final Mutable<String, ModuleStatement,
+            EffectiveStatement<String, ModuleStatement>> stmt) {
         final String moduleName = stmt.getStatementArgument();
 
         final URI moduleNs = firstAttributeOf(stmt.declaredSubstatements(), NamespaceStatement.class);
@@ -131,7 +132,8 @@ public class ModuleStatementSupport extends
     }
 
     @Override
-    public void onLinkageDeclared(final Mutable<String, ModuleStatement, EffectiveStatement<String, ModuleStatement>> stmt) {
+    public void onLinkageDeclared(final Mutable<String, ModuleStatement,
+            EffectiveStatement<String, ModuleStatement>> stmt) {
 
         final Optional<URI> moduleNs = Optional.ofNullable(firstAttributeOf(stmt.declaredSubstatements(),
                 NamespaceStatement.class));
@@ -145,7 +147,6 @@ public class ModuleStatementSupport extends
         }
 
         final QNameModule qNameModule = QNameModule.create(moduleNs.get(), revisionDate.orElse(null)).intern();
-
         final StmtContext<?, ModuleStatement, EffectiveStatement<String, ModuleStatement>> possibleDuplicateModule =
                 stmt.getFromNamespace(NamespaceToModule.class, qNameModule);
         if (possibleDuplicateModule != null && possibleDuplicateModule != stmt) {
@@ -186,7 +187,7 @@ public class ModuleStatementSupport extends
             modulesMap = new TreeMap<>();
         }
         SemVer moduleSemVer = stmt.getFromNamespace(SemanticVersionNamespace.class, stmt);
-        if(moduleSemVer == null) {
+        if (moduleSemVer == null) {
             moduleSemVer = Module.DEFAULT_SEMANTIC_VERSION;
         }
         modulesMap.put(moduleSemVer, stmt);
index 4d5aa50acc5306499161d88ff02920c4ff61289e..80ad665eba304d5f3be2f6a3196ff438b27fe827 100644 (file)
@@ -36,8 +36,8 @@ public class MustStatementImpl extends AbstractDeclaredStatement<RevisionAwareXP
         super(context);
     }
 
-    public static class Definition extends
-            AbstractStatementSupport<RevisionAwareXPath, MustStatement, EffectiveStatement<RevisionAwareXPath, MustStatement>> {
+    public static class Definition extends AbstractStatementSupport<RevisionAwareXPath, MustStatement,
+            EffectiveStatement<RevisionAwareXPath, MustStatement>> {
 
         public Definition() {
             super(YangStmtMapping.MUST);
@@ -55,7 +55,8 @@ public class MustStatementImpl extends AbstractDeclaredStatement<RevisionAwareXP
 
         @Override
         public EffectiveStatement<RevisionAwareXPath, MustStatement> createEffective(
-                final StmtContext<RevisionAwareXPath, MustStatement, EffectiveStatement<RevisionAwareXPath, MustStatement>> ctx) {
+                final StmtContext<RevisionAwareXPath, MustStatement,
+                EffectiveStatement<RevisionAwareXPath, MustStatement>> ctx) {
             return new MustEffectiveStatementImpl(ctx);
         }
 
index 9aaa737e13e0f46ad8d53462f0099adb1cf8dbee..4a28591581a39af717c393f5423020a9e35bf36f 100644 (file)
@@ -23,7 +23,8 @@ public class NamespaceStatementImpl extends AbstractDeclaredStatement<URI> imple
             .NAMESPACE)
             .build();
 
-    public static class Definition extends AbstractStatementSupport<URI,NamespaceStatement,EffectiveStatement<URI,NamespaceStatement>> {
+    public static class Definition extends AbstractStatementSupport<URI, NamespaceStatement,
+            EffectiveStatement<URI, NamespaceStatement>> {
 
         public Definition() {
             super(org.opendaylight.yangtools.yang.model.api.YangStmtMapping.NAMESPACE);
@@ -40,7 +41,8 @@ public class NamespaceStatementImpl extends AbstractDeclaredStatement<URI> imple
         }
 
         @Override
-        public EffectiveStatement<URI,NamespaceStatement> createEffective(final StmtContext<URI, NamespaceStatement,EffectiveStatement<URI,NamespaceStatement>> ctx) {
+        public EffectiveStatement<URI,NamespaceStatement> createEffective(
+                final StmtContext<URI, NamespaceStatement, EffectiveStatement<URI, NamespaceStatement>> ctx) {
             return new NamespaceEffectiveStatementImpl(ctx);
         }
 
index a0b47e73f7c8f04dbdaeeee09f455f4cdd04a310..0e0ccb29c19d35e97bdcc7dedf456184857d71be 100644 (file)
@@ -47,7 +47,8 @@ public class NumericalRestrictionsImpl extends AbstractDeclaredStatement<String>
 
         @Override
         public EffectiveStatement<String, NumericalRestrictions> createEffective(
-                final StmtContext<String, NumericalRestrictions, EffectiveStatement<String, NumericalRestrictions>> ctx) {
+                final StmtContext<String, NumericalRestrictions,
+                EffectiveStatement<String, NumericalRestrictions>> ctx) {
             return new NumericalRestrictionsEffectiveStatementImpl(ctx);
         }
 
@@ -68,5 +69,4 @@ public class NumericalRestrictionsImpl extends AbstractDeclaredStatement<String>
     public RangeStatement getRange() {
         return firstDeclared(RangeStatement.class);
     }
-
 }
index 48931bceaf64285336eb4c38582df1c9188a49cc..1a4a13e7f31cb149366deefb471ad4e6ef98a536 100644 (file)
@@ -15,12 +15,13 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
+import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.OpenconfigVersionEffectiveStatementImpl;
 
 @Beta
-public final class OpenconfigVersionStatementImpl extends AbstractDeclaredStatement<SemVer> implements
-        UnknownStatement<SemVer> {
+public final class OpenconfigVersionStatementImpl extends AbstractDeclaredStatement<SemVer>
+        implements UnknownStatement<SemVer> {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
             SupportedExtensionsMapping.OPENCONFIG_VERSION).build();
 
@@ -29,9 +30,8 @@ public final class OpenconfigVersionStatementImpl extends AbstractDeclaredStatem
         super(context);
     }
 
-    public static class OpenconfigVersionSupport
-            extends
-            AbstractStatementSupport<SemVer, UnknownStatement<SemVer>, EffectiveStatement<SemVer, UnknownStatement<SemVer>>> {
+    public static class OpenconfigVersionSupport extends AbstractStatementSupport<SemVer, UnknownStatement<SemVer>,
+            EffectiveStatement<SemVer, UnknownStatement<SemVer>>> {
 
         public OpenconfigVersionSupport() {
             super(SupportedExtensionsMapping.OPENCONFIG_VERSION);
@@ -43,19 +43,20 @@ public final class OpenconfigVersionStatementImpl extends AbstractDeclaredStatem
         }
 
         @Override
-        public void onLinkageDeclared(final StmtContext.Mutable<SemVer,UnknownStatement<SemVer>,EffectiveStatement<SemVer,UnknownStatement<SemVer>>> stmt) {
+        public void onLinkageDeclared(final Mutable<SemVer, UnknownStatement<SemVer>,
+                EffectiveStatement<SemVer, UnknownStatement<SemVer>>> stmt) {
             stmt.addToNs(SemanticVersionNamespace.class, stmt.getParentContext(), stmt.getStatementArgument());
         }
 
         @Override
-        public UnknownStatement<SemVer> createDeclared(
-                final StmtContext<SemVer, UnknownStatement<SemVer>, ?> ctx) {
+        public UnknownStatement<SemVer> createDeclared(final StmtContext<SemVer, UnknownStatement<SemVer>, ?> ctx) {
             return new OpenconfigVersionStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<SemVer, UnknownStatement<SemVer>> createEffective(
-                final StmtContext<SemVer, UnknownStatement<SemVer>, EffectiveStatement<SemVer, UnknownStatement<SemVer>>> ctx) {
+                final StmtContext<SemVer, UnknownStatement<SemVer>,
+                EffectiveStatement<SemVer, UnknownStatement<SemVer>>> ctx) {
             return new OpenconfigVersionEffectiveStatementImpl(ctx);
         }
 
index 95924988a390ac04ccb69c718e6dfd7ca58c1a58..c67e5b8e166c8ea7ed44456e533d3f71661887fc 100644 (file)
@@ -48,7 +48,8 @@ public class OrganizationStatementImpl extends AbstractDeclaredStatement<String>
 
         @Override
         public EffectiveStatement<String, OrganizationStatement> createEffective(
-                final StmtContext<String, OrganizationStatement, EffectiveStatement<String, OrganizationStatement>> ctx) {
+                final StmtContext<String, OrganizationStatement,
+                EffectiveStatement<String, OrganizationStatement>> ctx) {
             return new OrganizationEffectiveStatementImpl(ctx);
         }
 
@@ -63,5 +64,4 @@ public class OrganizationStatementImpl extends AbstractDeclaredStatement<String>
     public String getText() {
         return argument();
     }
-
 }
index 53e2b2878cde11be8365a18f13061d87b59dbb4d..a4c1041847939c7de533a99ed2265e62e5674bba 100644 (file)
@@ -56,7 +56,8 @@ public class OutputStatementImpl extends AbstractDeclaredStatement<QName> implem
         }
 
         @Override
-        public void onStatementAdded(final Mutable<QName, OutputStatement, EffectiveStatement<QName, OutputStatement>> stmt) {
+        public void onStatementAdded(final Mutable<QName, OutputStatement,
+                EffectiveStatement<QName, OutputStatement>> stmt) {
             stmt.getParentContext().addToNs(ChildSchemaNodes.class, stmt.getStatementArgument(), stmt);
         }
 
@@ -101,4 +102,3 @@ public class OutputStatementImpl extends AbstractDeclaredStatement<QName> implem
         return allDeclared(MustStatement.class);
     }
 }
-
index ca713e5f0afb794ae9c28bd29ca76ca168060aa6..334b93836eac0cf71bacef8ba57f165e508c05b8 100644 (file)
@@ -27,8 +27,8 @@ public class PathStatementImpl extends AbstractDeclaredStatement<RevisionAwareXP
         super(context);
     }
 
-    public static class Definition extends
-            AbstractStatementSupport<RevisionAwareXPath, PathStatement, EffectiveStatement<RevisionAwareXPath, PathStatement>> {
+    public static class Definition extends AbstractStatementSupport<RevisionAwareXPath, PathStatement,
+            EffectiveStatement<RevisionAwareXPath, PathStatement>> {
 
         public Definition() {
             super(YangStmtMapping.PATH);
@@ -46,7 +46,8 @@ public class PathStatementImpl extends AbstractDeclaredStatement<RevisionAwareXP
 
         @Override
         public EffectiveStatement<RevisionAwareXPath, PathStatement> createEffective(
-                final StmtContext<RevisionAwareXPath, PathStatement, EffectiveStatement<RevisionAwareXPath, PathStatement>> ctx) {
+                final StmtContext<RevisionAwareXPath, PathStatement,
+                EffectiveStatement<RevisionAwareXPath, PathStatement>> ctx) {
             return new PathEffectiveStatementImpl(ctx);
         }
 
index bdef2c6fd5ed82e108e18ab881e91f2333367921..e0b08470292bbbf59851aedf13af18aeb9467476 100644 (file)
@@ -44,9 +44,8 @@ public class PatternStatementImpl extends AbstractDeclaredStatement<PatternConst
         super(context);
     }
 
-    public static class Definition
-            extends
-            AbstractStatementSupport<PatternConstraint, PatternStatement, EffectiveStatement<PatternConstraint, PatternStatement>> {
+    public static class Definition extends AbstractStatementSupport<PatternConstraint, PatternStatement,
+            EffectiveStatement<PatternConstraint, PatternStatement>> {
 
         public Definition() {
             super(YangStmtMapping.PATTERN);
@@ -73,7 +72,8 @@ public class PatternStatementImpl extends AbstractDeclaredStatement<PatternConst
 
         @Override
         public EffectiveStatement<PatternConstraint, PatternStatement> createEffective(
-                final StmtContext<PatternConstraint, PatternStatement, EffectiveStatement<PatternConstraint, PatternStatement>> ctx) {
+                final StmtContext<PatternConstraint, PatternStatement,
+                EffectiveStatement<PatternConstraint, PatternStatement>> ctx) {
             return new PatternEffectiveStatementImpl(ctx);
         }
 
index 2e5785101556a7f986ef8b3de22e7008a53a4543..b0739a0ec2c8c1b20ceb4855d8f07ae60d1020e2 100644 (file)
@@ -26,7 +26,8 @@ public class ReferenceStatementImpl extends AbstractDeclaredStatement<String> im
         super(context);
     }
 
-    public static class Definition extends AbstractStatementSupport<String,ReferenceStatement,EffectiveStatement<String,ReferenceStatement>> {
+    public static class Definition extends AbstractStatementSupport<String, ReferenceStatement,
+            EffectiveStatement<String, ReferenceStatement>> {
 
         public Definition() {
             super(YangStmtMapping.REFERENCE);
@@ -54,7 +55,8 @@ public class ReferenceStatementImpl extends AbstractDeclaredStatement<String> im
         }
     }
 
-    @Nonnull @Override
+    @Nonnull
+    @Override
     public String getText() {
         return rawArgument();
     }
index 11f596113cc8dc75adcc7dc5f013edc82006791e..12cc40e91d31b8286ccfa89795da9b88c88ab6fc 100644 (file)
@@ -42,8 +42,8 @@ public class RefineStatementImpl extends AbstractDeclaredStatement<SchemaNodeIde
         super(context);
     }
 
-    public static class Definition extends
-            AbstractStatementSupport<SchemaNodeIdentifier, RefineStatement, EffectiveStatement<SchemaNodeIdentifier, RefineStatement>> {
+    public static class Definition extends AbstractStatementSupport<SchemaNodeIdentifier, RefineStatement,
+            EffectiveStatement<SchemaNodeIdentifier, RefineStatement>> {
 
         public Definition() {
             super(YangStmtMapping.REFINE);
@@ -61,7 +61,8 @@ public class RefineStatementImpl extends AbstractDeclaredStatement<SchemaNodeIde
 
         @Override
         public EffectiveStatement<SchemaNodeIdentifier, RefineStatement> createEffective(
-                final StmtContext<SchemaNodeIdentifier, RefineStatement, EffectiveStatement<SchemaNodeIdentifier, RefineStatement>> ctx) {
+                final StmtContext<SchemaNodeIdentifier, RefineStatement,
+                EffectiveStatement<SchemaNodeIdentifier, RefineStatement>> ctx) {
             return new RefineEffectiveStatementImpl(ctx);
         }
 
index 55a929bd9b316f727981cf4e36b18af8cf9cde0a..8f84250d9919f7c25d21c113dddfac6e1502821d 100644 (file)
@@ -16,8 +16,8 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.RequireInstanceEffectiveStatementImpl;
 
-public class RequireInstanceStatementImpl extends
-        AbstractDeclaredStatement<Boolean> implements RequireInstanceStatement {
+public class RequireInstanceStatementImpl extends AbstractDeclaredStatement<Boolean>
+        implements RequireInstanceStatement {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
         YangStmtMapping.REQUIRE_INSTANCE).build();
 
@@ -25,8 +25,8 @@ public class RequireInstanceStatementImpl extends
         super(context);
     }
 
-    public static class Definition extends
-            AbstractStatementSupport<Boolean, RequireInstanceStatement, EffectiveStatement<Boolean, RequireInstanceStatement>> {
+    public static class Definition extends AbstractStatementSupport<Boolean, RequireInstanceStatement,
+            EffectiveStatement<Boolean, RequireInstanceStatement>> {
 
         public Definition() {
             super(YangStmtMapping.REQUIRE_INSTANCE);
@@ -44,7 +44,8 @@ public class RequireInstanceStatementImpl extends
 
         @Override
         public EffectiveStatement<Boolean, RequireInstanceStatement> createEffective(
-                final StmtContext<Boolean, RequireInstanceStatement, EffectiveStatement<Boolean, RequireInstanceStatement>> ctx) {
+                final StmtContext<Boolean, RequireInstanceStatement,
+                EffectiveStatement<Boolean, RequireInstanceStatement>> ctx) {
             return new RequireInstanceEffectiveStatementImpl(ctx);
         }
 
index 2e1085221994c082290d6be3640c8d7a90124589..53c55195b3807583cfb50095cd7a0286f7ce0c69 100644 (file)
@@ -34,8 +34,7 @@ import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementDefinitionContext;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.RpcEffectiveStatementImpl;
 
-public class RpcStatementImpl extends AbstractDeclaredStatement<QName>
-        implements RpcStatement {
+public class RpcStatementImpl extends AbstractDeclaredStatement<QName> implements RpcStatement {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .RPC)
             .addOptional(YangStmtMapping.DESCRIPTION)
@@ -85,7 +84,8 @@ public class RpcStatementImpl extends AbstractDeclaredStatement<QName>
         }
 
         @Override
-        public void onFullDefinitionDeclared(final Mutable<QName, RpcStatement, EffectiveStatement<QName, RpcStatement>> stmt) {
+        public void onFullDefinitionDeclared(
+                final Mutable<QName, RpcStatement, EffectiveStatement<QName, RpcStatement>> stmt) {
             super.onFullDefinitionDeclared(stmt);
 
             if (StmtContextUtils.findFirstDeclaredSubstatement(stmt, InputStatement.class) == null) {
index 5a4d1c164fb125f1a7eee2ce11042879af226961..21845247c1eb38d535ec86387134b1a12dbc1473 100644 (file)
@@ -21,9 +21,8 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
 
-public class SchemaNodeIdentifierBuildNamespace extends
-        DerivedNamespaceBehaviour<SchemaNodeIdentifier, StmtContext.Mutable<?, ?,
-                EffectiveStatement<?, ?>>, QName, SchemaNodeIdentifierBuildNamespace, ChildSchemaNodes<?, ?>>
+public class SchemaNodeIdentifierBuildNamespace extends DerivedNamespaceBehaviour<SchemaNodeIdentifier, Mutable<?, ?,
+        EffectiveStatement<?, ?>>, QName, SchemaNodeIdentifierBuildNamespace, ChildSchemaNodes<?, ?>>
         implements IdentifierNamespace<SchemaNodeIdentifier, StmtContext.Mutable<?, ?, EffectiveStatement<?, ?>>> {
 
     @SuppressWarnings({"unchecked", "rawtypes"})
@@ -39,7 +38,7 @@ public class SchemaNodeIdentifierBuildNamespace extends
 
     @SuppressWarnings("unchecked")
     @Override
-    public StmtContext.Mutable<?, ?, EffectiveStatement<?, ?>> getFrom(final NamespaceStorageNode storage,
+    public Mutable<?, ?, EffectiveStatement<?, ?>> getFrom(final NamespaceStorageNode storage,
             final SchemaNodeIdentifier key) {
         final NamespaceStorageNode lookupStartStorage;
         if (key.isAbsolute() || storage.getStorageNodeType() == StorageNodeType.ROOT_STATEMENT_LOCAL) {
@@ -50,15 +49,16 @@ public class SchemaNodeIdentifierBuildNamespace extends
         final Iterator<QName> iterator = key.getPathFromRoot().iterator();
         if (!iterator.hasNext()) {
             if (lookupStartStorage instanceof StmtContext<?, ?, ?>) {
-                return (StmtContext.Mutable<?, ?, EffectiveStatement<?, ?>>) lookupStartStorage;
+                return (Mutable<?, ?, EffectiveStatement<?, ?>>) lookupStartStorage;
             }
             return null;
         }
         QName nextPath = iterator.next();
-        StmtContext.Mutable<?, ?, EffectiveStatement<?, ?>> current = lookupStartStorage
-                .getFromLocalStorage(ChildSchemaNodes.class, nextPath);
+        Mutable<?, ?, EffectiveStatement<?, ?>> current = lookupStartStorage.getFromLocalStorage(ChildSchemaNodes.class,
+            nextPath);
         if (current == null && lookupStartStorage instanceof StmtContext<?, ?, ?>) {
-            return tryToFindUnknownStatement(nextPath.getLocalName(), (Mutable<?, ?, EffectiveStatement<?, ?>>) lookupStartStorage);
+            return tryToFindUnknownStatement(nextPath.getLocalName(),
+                (Mutable<?, ?, EffectiveStatement<?, ?>>) lookupStartStorage);
         }
         while (current != null && iterator.hasNext()) {
             nextPath = iterator.next();
index f887a8ae29308d276a44afac03092228a40cd4b7..b57125fc936852f5093ccbb3214322ac108bda75 100644 (file)
@@ -102,8 +102,8 @@ public class SubmoduleStatementImpl extends AbstractRootStatement<SubmoduleState
                 final Mutable<String, SubmoduleStatement, EffectiveStatement<String, SubmoduleStatement>> stmt) {
             final ModuleIdentifier submoduleIdentifier = getSubmoduleIdentifier(stmt);
 
-            final StmtContext<?, SubmoduleStatement, EffectiveStatement<String, SubmoduleStatement>> possibleDuplicateSubmodule =
-                    stmt.getFromNamespace(SubmoduleNamespace.class, submoduleIdentifier);
+            final StmtContext<?, SubmoduleStatement, EffectiveStatement<String, SubmoduleStatement>>
+                possibleDuplicateSubmodule = stmt.getFromNamespace(SubmoduleNamespace.class, submoduleIdentifier);
             if (possibleDuplicateSubmodule != null && possibleDuplicateSubmodule != stmt) {
                 throw new SourceException(stmt.getStatementSourceReference(), "Submodule name collision: %s. At %s",
                         stmt.getStatementArgument(), possibleDuplicateSubmodule.getStatementSourceReference());
@@ -154,5 +154,4 @@ public class SubmoduleStatementImpl extends AbstractRootStatement<SubmoduleState
     public BelongsToStatement getBelongsTo() {
         return firstDeclared(BelongsToStatement.class);
     }
-
 }
index 2f60d7f7dfbd0a6969a4b922ca589b58f8a4c996..e59a4dc63cbd1c583e1acb4375b5b9d92108a663 100644 (file)
@@ -48,7 +48,7 @@ public enum SupportedExtensionsMapping implements StatementDefinition {
         this.yinElement = yinElement;
     }
 
-    private SupportedExtensionsMapping(final String namespace, final Class<? extends DeclaredStatement<?>> declared,
+    SupportedExtensionsMapping(final String namespace, final Class<? extends DeclaredStatement<?>> declared,
             final Class<? extends EffectiveStatement<?, ?>> effective, final String nameStr, final String argumentStr,
             final boolean yinElement) {
         type = Preconditions.checkNotNull(declared);
index 74034345e4a60ffa9501620d884b4ac506c2f919..7a7d08986fd2fd7d36895aed8cc2fdb94cce6165 100644 (file)
@@ -27,8 +27,8 @@ public class UnknownStatementImpl extends AbstractDeclaredStatement<String> impl
         super(context);
     }
 
-    public static class Definition extends
-            AbstractStatementSupport<String, UnknownStatement<String>, EffectiveStatement<String, UnknownStatement<String>>> {
+    public static class Definition extends AbstractStatementSupport<String, UnknownStatement<String>,
+            EffectiveStatement<String, UnknownStatement<String>>> {
 
         public Definition(final StatementDefinition publicDefinition) {
             super(publicDefinition);
@@ -46,7 +46,8 @@ public class UnknownStatementImpl extends AbstractDeclaredStatement<String> impl
 
         @Override
         public EffectiveStatement<String, UnknownStatement<String>> createEffective(
-                final StmtContext<String, UnknownStatement<String>, EffectiveStatement<String, UnknownStatement<String>>> ctx) {
+                final StmtContext<String, UnknownStatement<String>,
+                EffectiveStatement<String, UnknownStatement<String>>> ctx) {
             return new UnknownEffectiveStatementImpl(ctx);
         }
 
index 7e39d918d5e61975e4c620eb2065e94a708b2b18..a5166b80da48c5e1106bfd45428429cfcb530adf 100644 (file)
@@ -100,8 +100,10 @@ public class UsesStatementImpl extends AbstractDeclaredStatement<QName> implemen
 
                 @Override
                 public void apply(final InferenceContext ctx) {
-                    final StatementContextBase<?, ?, ?> targetNodeStmtCtx = (StatementContextBase<?, ?, ?>) targetNodePre.resolve(ctx);
-                    final StatementContextBase<?, ?, ?> sourceGrpStmtCtx = (StatementContextBase<?, ?, ?>) sourceGroupingPre.resolve(ctx);
+                    final StatementContextBase<?, ?, ?> targetNodeStmtCtx =
+                            (StatementContextBase<?, ?, ?>) targetNodePre.resolve(ctx);
+                    final StatementContextBase<?, ?, ?> sourceGrpStmtCtx =
+                            (StatementContextBase<?, ?, ?>) sourceGroupingPre.resolve(ctx);
 
                     try {
                         copyFromSourceToTarget(sourceGrpStmtCtx, targetNodeStmtCtx, usesNode);
@@ -185,6 +187,8 @@ public class UsesStatementImpl extends AbstractDeclaredStatement<QName> implemen
     }
 
     /**
+     * Copy statements from a grouping to a target node.
+     *
      * @param sourceGrpStmtCtx
      *            source grouping statement context
      * @param targetCtx
@@ -196,7 +200,7 @@ public class UsesStatementImpl extends AbstractDeclaredStatement<QName> implemen
      */
     static void copyFromSourceToTarget(final Mutable<?, ?, ?> sourceGrpStmtCtx,
             final StatementContextBase<?, ?, ?> targetCtx,
-            final StmtContext.Mutable<QName, UsesStatement, EffectiveStatement<QName, UsesStatement>> usesNode) {
+            final Mutable<QName, UsesStatement, EffectiveStatement<QName, UsesStatement>> usesNode) {
         final Collection<? extends Mutable<?, ?, ?>> declared = sourceGrpStmtCtx.mutableDeclaredSubstatements();
         final Collection<? extends Mutable<?, ?, ?>> effective = sourceGrpStmtCtx.mutableEffectiveSubstatements();
         final Collection<Mutable<?, ?, ?>> buffer = new ArrayList<>(declared.size() + effective.size());
@@ -374,5 +378,4 @@ public class UsesStatementImpl extends AbstractDeclaredStatement<QName> implemen
 
         return null;
     }
-
 }
index 7ea5ea888532819a7766e12bf2469503c4fa4a3b..a43a3f3338d55a5c4e6b71d0bf7f270a264e8e6b 100644 (file)
@@ -243,8 +243,8 @@ public final class YangInferencePipeline {
             .addSupport(global(StmtOrderingNamespace.class))
             .build();
 
-    public static final Map<ModelProcessingPhase, StatementSupportBundle> RFC6020_BUNDLES = ImmutableMap
-            .<ModelProcessingPhase, StatementSupportBundle> builder()
+    public static final Map<ModelProcessingPhase, StatementSupportBundle> RFC6020_BUNDLES =
+            ImmutableMap.<ModelProcessingPhase, StatementSupportBundle>builder()
             .put(ModelProcessingPhase.INIT, INIT_BUNDLE)
             .put(ModelProcessingPhase.SOURCE_PRE_LINKAGE, PRE_LINKAGE_BUNDLE)
             .put(ModelProcessingPhase.SOURCE_LINKAGE, LINKAGE_BUNDLE)
@@ -253,25 +253,23 @@ public final class YangInferencePipeline {
             .put(ModelProcessingPhase.EFFECTIVE_MODEL, FULL_DECL_BUNDLE)
             .build();
 
-    public static final Map<ValidationBundleType, Collection<StatementDefinition>> RFC6020_VALIDATION_BUNDLE = ImmutableMap
-            .<ValidationBundleType, Collection<StatementDefinition>> builder()
-            .put(ValidationBundleType.SUPPORTED_REFINE_SUBSTATEMENTS, YangValidationBundles.SUPPORTED_REFINE_SUBSTATEMENTS)
+    public static final Map<ValidationBundleType, Collection<StatementDefinition>> RFC6020_VALIDATION_BUNDLE =
+            ImmutableMap.<ValidationBundleType, Collection<StatementDefinition>>builder()
+            .put(ValidationBundleType.SUPPORTED_REFINE_SUBSTATEMENTS,
+                YangValidationBundles.SUPPORTED_REFINE_SUBSTATEMENTS)
             .put(ValidationBundleType.SUPPORTED_AUGMENT_TARGETS, YangValidationBundles.SUPPORTED_AUGMENT_TARGETS)
             .put(ValidationBundleType.SUPPORTED_CASE_SHORTHANDS, YangValidationBundles.SUPPORTED_CASE_SHORTHANDS)
             .put(ValidationBundleType.SUPPORTED_DATA_NODES, YangValidationBundles.SUPPORTED_DATA_NODES)
             .build();
 
-    public static final CrossSourceStatementReactor RFC6020_REACTOR = CrossSourceStatementReactor
-            .builder()
+    public static final CrossSourceStatementReactor RFC6020_REACTOR = CrossSourceStatementReactor.builder()
             .setBundle(ModelProcessingPhase.INIT, INIT_BUNDLE)
             .setBundle(ModelProcessingPhase.SOURCE_PRE_LINKAGE, PRE_LINKAGE_BUNDLE)
             .setBundle(ModelProcessingPhase.SOURCE_LINKAGE, LINKAGE_BUNDLE)
-            .setBundle(ModelProcessingPhase.STATEMENT_DEFINITION,
-                    STMT_DEF_BUNDLE)
+            .setBundle(ModelProcessingPhase.STATEMENT_DEFINITION, STMT_DEF_BUNDLE)
             .setBundle(ModelProcessingPhase.FULL_DECLARATION, FULL_DECL_BUNDLE)
             .setBundle(ModelProcessingPhase.EFFECTIVE_MODEL, FULL_DECL_BUNDLE)
-            .setValidationBundle(
-                    ValidationBundleType.SUPPORTED_REFINE_SUBSTATEMENTS,
+            .setValidationBundle(ValidationBundleType.SUPPORTED_REFINE_SUBSTATEMENTS,
                     YangValidationBundles.SUPPORTED_REFINE_SUBSTATEMENTS)
             .setValidationBundle(ValidationBundleType.SUPPORTED_AUGMENT_TARGETS,
                     YangValidationBundles.SUPPORTED_AUGMENT_TARGETS)
index 725096bed4d459cbc8260ae78132a7ef161cfc84..f1cad558eb9617c5a68c6098288ee2e4eb5e6fc0 100644 (file)
@@ -65,7 +65,8 @@ public class YangVersionStatementImpl extends AbstractDeclaredStatement<YangVers
         }
     }
 
-    @Nonnull @Override
+    @Nonnull
+    @Override
     public YangVersion getValue() {
         return argument();
     }