From eaeedd7c54381a24c89fb0d231b2178801bbed6a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 16 Jul 2018 01:38:16 +0200 Subject: [PATCH] Add ConfigStatementContainerDeclaredStatement The missing link between ConfigContainerStatement and DeclaredStatement is filled in, providing a default implementation getConfig(). Change-Id: Icc9c65b0d74bcb0a8a8d1db13514c3ffca86038d Signed-off-by: Robert Varga --- .../yang/model/api/stmt/AnydataStatement.java | 4 ++-- .../yang/model/api/stmt/AnyxmlStatement.java | 6 ++++-- .../yang/model/api/stmt/ChoiceStatement.java | 5 +++-- .../api/stmt/ConfigStatementContainer.java | 3 +++ ...igStatementContainerDeclaredStatement.java | 21 +++++++++++++++++++ .../model/api/stmt/ContainerStatement.java | 4 +++- .../model/api/stmt/LeafListStatement.java | 3 ++- .../yang/model/api/stmt/LeafStatement.java | 7 +++++-- .../yang/model/api/stmt/ListStatement.java | 5 +++-- .../yang/model/api/stmt/RefineStatement.java | 5 ++--- .../stmt/anydata/AnydataStatementImpl.java | 6 ------ .../stmt/anyxml/AnyxmlStatementImpl.java | 6 ------ .../stmt/choice/ChoiceStatementImpl.java | 7 ------- .../container/ContainerStatementImpl.java | 6 ------ .../rfc7950/stmt/leaf/LeafStatementImpl.java | 7 ------- .../stmt/leaf_list/LeafListStatementImpl.java | 7 ------- .../rfc7950/stmt/list/ListStatementImpl.java | 7 ------- .../stmt/refine/RefineStatementImpl.java | 7 ------- 18 files changed, 48 insertions(+), 68 deletions(-) create mode 100644 yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementContainerDeclaredStatement.java diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataStatement.java index fa7aa8aa57..326d31fd94 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataStatement.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataStatement.java @@ -5,10 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.yangtools.yang.model.api.stmt; import com.google.common.annotations.Beta; +import org.opendaylight.yangtools.yang.common.QName; /** * The "anydata" statement defines an interior node in the schema tree. It takes one argument, which is an identifier, @@ -21,7 +21,7 @@ import com.google.common.annotations.Beta; * of this document. */ @Beta -public interface AnydataStatement extends DataDefinitionStatement, ConfigStatementContainer, +public interface AnydataStatement extends DataDefinitionStatement, ConfigStatementContainerDeclaredStatement, MandatoryStatementContainer, MustStatementContainer { } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlStatement.java index 951492f601..b16cb00e24 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlStatement.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlStatement.java @@ -7,7 +7,9 @@ */ package org.opendaylight.yangtools.yang.model.api.stmt; -public interface AnyxmlStatement extends DataDefinitionStatement, ConfigStatementContainer, MandatoryStatementContainer, - MustStatementContainer { +import org.opendaylight.yangtools.yang.common.QName; + +public interface AnyxmlStatement extends DataDefinitionStatement, ConfigStatementContainerDeclaredStatement, + MandatoryStatementContainer, MustStatementContainer { } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceStatement.java index 5ecc60440d..5750a3ae14 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceStatement.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceStatement.java @@ -9,9 +9,10 @@ package org.opendaylight.yangtools.yang.model.api.stmt; import java.util.Collection; import javax.annotation.Nonnull; +import org.opendaylight.yangtools.yang.common.QName; -public interface ChoiceStatement extends DataDefinitionStatement, ConfigStatementContainer, DefaultStatementContainer, - MandatoryStatementContainer { +public interface ChoiceStatement extends DataDefinitionStatement, ConfigStatementContainerDeclaredStatement, + DefaultStatementContainer, MandatoryStatementContainer { @Nonnull Collection getCases(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementContainer.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementContainer.java index d1c80b1300..a8ecdc6952 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementContainer.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementContainer.java @@ -11,7 +11,10 @@ import javax.annotation.Nullable; /** * Marker interface for statements which may contain a 'config' statement, as defined in RFC7950. + * + * @deprecated Use {@link ConfigStatementContainerDeclaredStatement} instead. */ +@Deprecated public interface ConfigStatementContainer { /** * Return a {@link ConfigStatement} child, if present. diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementContainerDeclaredStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementContainerDeclaredStatement.java new file mode 100644 index 0000000000..336c743718 --- /dev/null +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigStatementContainerDeclaredStatement.java @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2018 Pantheon Technologies, s.r.o. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.yangtools.yang.model.api.stmt; + +import com.google.common.annotations.Beta; +import java.util.Optional; +import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; + +@Beta +public interface ConfigStatementContainerDeclaredStatement extends DeclaredStatement, ConfigStatementContainer { + @Override + default ConfigStatement getConfig() { + final Optional opt = findFirstDeclaredSubstatement(ConfigStatement.class); + return opt.isPresent() ? opt.get() : null; + } +} diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerStatement.java index 67834c7f8f..be68439e4e 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerStatement.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerStatement.java @@ -8,9 +8,11 @@ package org.opendaylight.yangtools.yang.model.api.stmt; import javax.annotation.Nullable; +import org.opendaylight.yangtools.yang.common.QName; public interface ContainerStatement extends DataDefinitionStatement, DataDefinitionContainer.WithReusableDefinitions, - ActionStatementContainer, ConfigStatementContainer, NotificationStatementContainer, MustStatementContainer { + ActionStatementContainer, ConfigStatementContainerDeclaredStatement, NotificationStatementContainer, + MustStatementContainer { @Nullable PresenceStatement getPresence(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListStatement.java index 1907dfa563..3e20a19fb6 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListStatement.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListStatement.java @@ -9,9 +9,10 @@ package org.opendaylight.yangtools.yang.model.api.stmt; import java.util.Collection; import javax.annotation.Nonnull; +import org.opendaylight.yangtools.yang.common.QName; public interface LeafListStatement extends DataDefinitionStatement, MultipleElementsGroup, TypeGroup, - ConfigStatementContainer, MustStatementContainer { + ConfigStatementContainerDeclaredStatement, MustStatementContainer { /** * Return default statements defined in this leaf-list. For RFC6020 semantics, this method returns an empty * collection. diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafStatement.java index 92a8c786fa..70dff3ec93 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafStatement.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafStatement.java @@ -7,7 +7,10 @@ */ package org.opendaylight.yangtools.yang.model.api.stmt; -public interface LeafStatement extends DataDefinitionStatement, TypeGroup, ConfigStatementContainer, - DefaultStatementContainer, MandatoryStatementContainer, MustStatementContainer { +import org.opendaylight.yangtools.yang.common.QName; + +public interface LeafStatement extends DataDefinitionStatement, TypeGroup, + ConfigStatementContainerDeclaredStatement, DefaultStatementContainer, MandatoryStatementContainer, + MustStatementContainer { } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListStatement.java index 4838b643ea..f2598bc4b0 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListStatement.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListStatement.java @@ -10,10 +10,11 @@ package org.opendaylight.yangtools.yang.model.api.stmt; import java.util.Collection; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.opendaylight.yangtools.yang.common.QName; public interface ListStatement extends DataDefinitionStatement, MultipleElementsGroup, - DataDefinitionContainer.WithReusableDefinitions, ConfigStatementContainer, ActionStatementContainer, - MustStatementContainer, NotificationStatementContainer { + DataDefinitionContainer.WithReusableDefinitions, ConfigStatementContainerDeclaredStatement, + ActionStatementContainer, MustStatementContainer, NotificationStatementContainer { @Nullable KeyStatement getKey(); diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineStatement.java index d288ddaf6b..376d5b8c80 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineStatement.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineStatement.java @@ -10,10 +10,9 @@ package org.opendaylight.yangtools.yang.model.api.stmt; import java.util.Collection; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; -public interface RefineStatement extends DeclaredStatement, DocumentationGroup, - ConditionalFeature, ConfigStatementContainer, MandatoryStatementContainer, MustStatementContainer { +public interface RefineStatement extends ConfigStatementContainerDeclaredStatement, + DocumentationGroup, ConditionalFeature, MandatoryStatementContainer, MustStatementContainer { String getTargetNode(); @Nonnull diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataStatementImpl.java index 5f81a2fb3f..e7b61a9914 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataStatementImpl.java @@ -11,7 +11,6 @@ import com.google.common.annotations.Beta; import java.util.Collection; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.AnydataStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.ConfigStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryStatement; @@ -51,11 +50,6 @@ final class AnydataStatementImpl extends AbstractDeclaredStatement implem return allDeclared(MustStatement.class); } - @Override - public ConfigStatement getConfig() { - return firstDeclared(ConfigStatement.class); - } - @Override public StatusStatement getStatus() { return firstDeclared(StatusStatement.class); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementImpl.java index ff7c98b1c4..930c802b4f 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementImpl.java @@ -11,7 +11,6 @@ import java.util.Collection; import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.ConfigStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryStatement; @@ -50,11 +49,6 @@ final class AnyxmlStatementImpl extends AbstractDeclaredStatement impleme return allDeclared(MustStatement.class); } - @Override - public ConfigStatement getConfig() { - return firstDeclared(ConfigStatement.class); - } - @Override public StatusStatement getStatus() { return firstDeclared(StatusStatement.class); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceStatementImpl.java index 132ea7d84f..4fa2b09d10 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceStatementImpl.java @@ -13,7 +13,6 @@ import javax.annotation.Nullable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.CaseStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.ConfigStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DefaultStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureStatement; @@ -42,12 +41,6 @@ final class ChoiceStatementImpl extends AbstractDeclaredStatement return firstDeclared(DefaultStatement.class); } - @Nullable - @Override - public ConfigStatement getConfig() { - return firstDeclared(ConfigStatement.class); - } - @Nullable @Override public MandatoryStatement getMandatory() { diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/ContainerStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/ContainerStatementImpl.java index ecdca9761a..42e6e48e0b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/ContainerStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/ContainerStatementImpl.java @@ -11,7 +11,6 @@ import java.util.Collection; import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ActionStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.ConfigStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ContainerStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DataDefinitionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; @@ -59,11 +58,6 @@ final class ContainerStatementImpl extends AbstractDeclaredStatement impl return firstDeclared(PresenceStatement.class); } - @Override - public ConfigStatement getConfig() { - return firstDeclared(ConfigStatement.class); - } - @Override public StatusStatement getStatus() { return firstDeclared(StatusStatement.class); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementImpl.java index 389429c6aa..b1b137e654 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementImpl.java @@ -11,7 +11,6 @@ import java.util.Collection; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.stmt.ConfigStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DefaultStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureStatement; @@ -43,12 +42,6 @@ final class LeafStatementImpl extends AbstractDeclaredStatement implement return firstDeclared(DefaultStatement.class); } - @Nullable - @Override - public ConfigStatement getConfig() { - return firstDeclared(ConfigStatement.class); - } - @Nullable @Override public MandatoryStatement getMandatory() { diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListStatementImpl.java index 0a720f7f2b..9c4d0cea0e 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/LeafListStatementImpl.java @@ -11,7 +11,6 @@ import java.util.Collection; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.stmt.ConfigStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DefaultStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureStatement; @@ -39,12 +38,6 @@ final class LeafListStatementImpl extends AbstractDeclaredStatement imple return argument(); } - @Nullable - @Override - public ConfigStatement getConfig() { - return firstDeclared(ConfigStatement.class); - } - @Override public WhenStatement getWhenStatement() { return firstDeclared(WhenStatement.class); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListStatementImpl.java index 26b7d75bc9..f00e33ff4c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/ListStatementImpl.java @@ -12,7 +12,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.ActionStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.ConfigStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DataDefinitionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.GroupingStatement; @@ -43,12 +42,6 @@ final class ListStatementImpl extends AbstractDeclaredStatement implement return argument(); } - @Nullable - @Override - public ConfigStatement getConfig() { - return firstDeclared(ConfigStatement.class); - } - @Override public WhenStatement getWhenStatement() { return firstDeclared(WhenStatement.class); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineStatementImpl.java index 61b7a52d5e..597e9e99bc 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineStatementImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/RefineStatementImpl.java @@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.refine; import java.util.Collection; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.opendaylight.yangtools.yang.model.api.stmt.ConfigStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DefaultStatement; import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IfFeatureStatement; @@ -65,12 +64,6 @@ final class RefineStatementImpl extends AbstractDeclaredStatement